diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 00000000..2922bb63
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Formatting repository
+b48ffb6d541ae3665c4ee4e705fd2969be748f6b
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 599dfc19..bc831e94 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -15,6 +15,7 @@ jobs:
   tests:
     name: Test
     uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
+    needs: [soundness, space-format-check]
     with:
       linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
       linux_pre_build_command: ./.github/scripts/prebuild.sh
@@ -38,6 +39,7 @@ jobs:
   cmake-smoke-test:
     name: cmake-smoke-test
     uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
+    needs: [soundness, space-format-check]
     with:
       linux_os_versions: '["noble"]'
       linux_pre_build_command: SKIP_ANDROID=1 INSTALL_CMAKE=1 ./.github/scripts/prebuild.sh
@@ -57,7 +59,7 @@ jobs:
     with:
       license_header_check_project_name: "Swift"
       api_breakage_check_enabled: false
-      format_check_enabled: false
+      format_check_enabled: true
 
   space-format-check:
     name: Space format check
diff --git a/.licenseignore b/.licenseignore
index e7babf0c..132672c8 100644
--- a/.licenseignore
+++ b/.licenseignore
@@ -8,3 +8,4 @@
 .swift-version
 CODEOWNERS
 Package.swift
+.git-blame-ignore-revs
diff --git a/.swift-format b/.swift-format
index c2fb7509..3d02fb82 100644
--- a/.swift-format
+++ b/.swift-format
@@ -1,10 +1,13 @@
 {
-	"version": 1,
-	"lineLength": 10000,
-	"indentation": {
-		"spaces": 4
-	},
-	"rules": {
-	},
-	"tabWidth": 4
+    "version": 1,
+    "lineLength": 10000,
+    "indentation": {
+        "spaces": 4
+    },
+    "lineBreakBeforeEachArgument": true,
+    "maximumBlankLines" : 1,
+    "multiElementCollectionTrailingCommas" : true,
+    "rules": {
+    },
+    "tabWidth": 4
 }
diff --git a/Package.swift b/Package.swift
index 63989112..49d96ac1 100644
--- a/Package.swift
+++ b/Package.swift
@@ -15,9 +15,9 @@
 import PackageDescription
 
 #if canImport(Darwin)
-let appleOS = true
+    let appleOS = true
 #else
-let appleOS = false
+    let appleOS = false
 #endif
 
 let isStaticBuild = Context.environment["SWIFTBUILD_STATIC_LINK"] != nil
@@ -91,24 +91,27 @@ let package = Package(
             name: "swbuild",
             dependencies: [
                 "SwiftBuild",
-                "SWBBuildServiceBundle", // the CLI needs to launch the service bundle
+                "SWBBuildServiceBundle",  // the CLI needs to launch the service bundle
             ],
             exclude: ["CMakeLists.txt"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .executableTarget(
             name: "SWBBuildServiceBundle",
             dependencies: [
                 "SWBBuildService", "SWBBuildSystem", "SWBServiceCore", "SWBUtil", "SWBCore",
             ],
             exclude: ["CMakeLists.txt"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
 
         // Libraries
         .target(
             name: "SwiftBuild",
             dependencies: ["SWBCSupport", "SWBCore", "SWBProtocol", "SWBUtil", "SWBProjectModel"],
             exclude: ["CMakeLists.txt"],
-            swiftSettings: swiftSettings(languageMode: .v5)),
+            swiftSettings: swiftSettings(languageMode: .v5)
+        ),
         .target(
             name: "SWBBuildService",
             dependencies: [
@@ -118,12 +121,14 @@ let package = Package(
                 .product(name: "SystemPackage", package: "swift-system", condition: .when(platforms: [.linux, .openbsd, .android, .windows, .custom("freebsd")])),
             ],
             exclude: ["CMakeLists.txt"],
-            swiftSettings: swiftSettings(languageMode: .v5)),
+            swiftSettings: swiftSettings(languageMode: .v5)
+        ),
         .target(
             name: "SWBBuildSystem",
             dependencies: ["SWBCore", "SWBTaskConstruction", "SWBTaskExecution"],
             exclude: ["CMakeLists.txt"],
-            swiftSettings: swiftSettings(languageMode: .v5)),
+            swiftSettings: swiftSettings(languageMode: .v5)
+        ),
         .target(
             name: "SWBCore",
             dependencies: [
@@ -137,7 +142,8 @@ let package = Package(
             ],
             exclude: ["CMakeLists.txt"],
             resources: [.process("Specs")],
-            swiftSettings: swiftSettings(languageMode: .v5)),
+            swiftSettings: swiftSettings(languageMode: .v5)
+        ),
         .target(
             name: "SWBCSupport",
             exclude: ["empty.swift"],
@@ -146,27 +152,34 @@ let package = Package(
                 .define("_CRT_SECURE_NO_WARNINGS", .when(platforms: [.windows])),
                 .define("_CRT_NONSTDC_NO_WARNINGS", .when(platforms: [.windows])),
             ],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .target(
             name: "SWBCLibc",
             exclude: ["CMakeLists.txt", "README.md"],
             publicHeadersPath: ".",
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .target(
             name: "SWBLibc",
             dependencies: ["SWBCLibc"],
             exclude: ["CMakeLists.txt"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .target(
             name: "SWBLLBuild",
             dependencies: [
                 "SWBUtil"
-            ] + (useLLBuildFramework ? [] : [
-                .product(name: "libllbuild", package: useLocalDependencies ? "llbuild" : "swift-llbuild"),
-                .product(name: "llbuildSwift", package: useLocalDependencies ? "llbuild" : "swift-llbuild"),
-            ]),
+            ]
+                + (useLLBuildFramework
+                    ? []
+                    : [
+                        .product(name: "libllbuild", package: useLocalDependencies ? "llbuild" : "swift-llbuild"),
+                        .product(name: "llbuildSwift", package: useLocalDependencies ? "llbuild" : "swift-llbuild"),
+                    ]),
             exclude: ["CMakeLists.txt"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .target(
             name: "SWBMacro",
             dependencies: [
@@ -174,36 +187,42 @@ let package = Package(
                 .product(name: "SwiftDriver", package: "swift-driver"),
             ],
             exclude: ["CMakeLists.txt"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .target(
             name: "SWBProjectModel",
             dependencies: ["SWBProtocol"],
             exclude: ["CMakeLists.txt"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .target(
             name: "SWBProtocol",
             dependencies: ["SWBUtil"],
             exclude: ["CMakeLists.txt"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .target(
             name: "SWBServiceCore",
             dependencies: ["SWBProtocol"],
             exclude: ["CMakeLists.txt"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .target(
             name: "SWBTaskConstruction",
             dependencies: [
                 "SWBCore",
                 "SWBUtil",
-                .product(name: "SwiftDriver", package: "swift-driver")
+                .product(name: "SwiftDriver", package: "swift-driver"),
             ],
             exclude: ["CMakeLists.txt"],
-            swiftSettings: swiftSettings(languageMode: .v5)),
+            swiftSettings: swiftSettings(languageMode: .v5)
+        ),
         .target(
             name: "SWBTaskExecution",
             dependencies: ["SWBCore", "SWBUtil", "SWBCAS", "SWBLLBuild", "SWBTaskConstruction"],
             exclude: ["CMakeLists.txt"],
-            swiftSettings: swiftSettings(languageMode: .v5)),
+            swiftSettings: swiftSettings(languageMode: .v5)
+        ),
         .target(
             name: "SWBUtil",
             dependencies: [
@@ -214,37 +233,43 @@ let package = Package(
                 .product(name: "SystemPackage", package: "swift-system", condition: .when(platforms: [.linux, .openbsd, .android, .windows, .custom("freebsd")])),
             ],
             exclude: ["CMakeLists.txt"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .target(
             name: "SWBCAS",
             dependencies: ["SWBUtil", "SWBCSupport"],
             exclude: ["CMakeLists.txt"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
 
         .target(
             name: "SWBAndroidPlatform",
             dependencies: ["SWBCore", "SWBMacro", "SWBUtil"],
             exclude: ["CMakeLists.txt"],
             resources: [.process("Specs")],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .target(
             name: "SWBApplePlatform",
             dependencies: ["SWBCore", "SWBMacro", "SWBUtil", "SWBTaskConstruction"],
             exclude: ["CMakeLists.txt"],
             resources: [.process("Specs")],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .target(
             name: "SWBGenericUnixPlatform",
             dependencies: ["SWBCore", "SWBUtil"],
             exclude: ["CMakeLists.txt"],
             resources: [.process("Specs")],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .target(
             name: "SWBQNXPlatform",
             dependencies: ["SWBCore", "SWBMacro", "SWBUtil"],
             exclude: ["CMakeLists.txt"],
             resources: [.process("Specs")],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .target(
             name: "SWBUniversalPlatform",
             dependencies: [
@@ -257,180 +282,220 @@ let package = Package(
             ],
             exclude: ["CMakeLists.txt"],
             resources: [.process("Specs")],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .target(
             name: "SWBWebAssemblyPlatform",
             dependencies: ["SWBCore", "SWBMacro", "SWBUtil"],
             exclude: ["CMakeLists.txt"],
             resources: [.process("Specs")],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .target(
             name: "SWBWindowsPlatform",
             dependencies: ["SWBCore", "SWBMacro", "SWBUtil"],
             exclude: ["CMakeLists.txt", "README.md"],
             resources: [.process("Specs")],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
 
         // Test support
         .target(
             name: "SwiftBuildTestSupport",
             dependencies: ["SwiftBuild", "SWBTestSupport", "SWBUtil"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .target(
             name: "SWBTestSupport",
             dependencies: ["SwiftBuild", "SWBBuildSystem", "SWBCore", "SWBTaskConstruction", "SWBTaskExecution", "SWBUtil", "SWBLLBuild", "SWBMacro"],
-            swiftSettings: swiftSettings(languageMode: .v5)),
+            swiftSettings: swiftSettings(languageMode: .v5)
+        ),
 
         // Tests
         .testTarget(
             name: "SWBAndroidPlatformTests",
             dependencies: ["SWBAndroidPlatform", "SWBTestSupport"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBApplePlatformTests",
             dependencies: ["SWBApplePlatform", "SWBTestSupport"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBGenericUnixPlatformTests",
             dependencies: ["SWBGenericUnixPlatform", "SWBTestSupport"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBQNXPlatformTests",
             dependencies: ["SWBQNXPlatform", "SWBTestSupport"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBUniversalPlatformTests",
             dependencies: ["SWBUniversalPlatform", "SWBTestSupport"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBWebAssemblyPlatformTests",
             dependencies: ["SWBWebAssemblyPlatform", "SWBTestSupport"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBWindowsPlatformTests",
             dependencies: ["SWBWindowsPlatform", "SWBTestSupport"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SwiftBuildTests",
             dependencies: ["SwiftBuild", "SWBBuildService", "SwiftBuildTestSupport"],
             resources: [
                 .copy("TestData")
             ],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBProjectModelTests",
             dependencies: ["SWBProjectModel"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBProtocolTests",
             dependencies: ["SWBProtocol", "SWBUtil"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBUtilTests",
             dependencies: ["SWBTestSupport", "SWBUtil"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBCASTests",
             dependencies: ["SWBTestSupport", "SWBCAS", "SWBUtil"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBMacroTests",
             dependencies: ["SWBTestSupport", "SWBMacro"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBServiceCoreTests",
             dependencies: ["SWBServiceCore"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBCoreTests",
             dependencies: ["SWBCore", "SWBTestSupport", "SWBUtil", "SWBLLBuild"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBTaskConstructionTests",
             dependencies: ["SWBTaskConstruction", "SWBCore", "SWBTestSupport", "SWBProtocol", "SWBUtil"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBTaskExecutionTests",
             dependencies: ["SWBTaskExecution", "SWBTestSupport"],
             resources: [
                 .copy("TestData")
             ],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBLLBuildTests",
             dependencies: ["SWBLLBuild", "SWBTestSupport"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBBuildSystemTests",
             dependencies: ["SWBBuildService", "SWBBuildSystem", "SwiftBuildTestSupport", "SWBTestSupport"],
             resources: [
                 .copy("TestData")
             ],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBBuildServiceTests",
             dependencies: ["SwiftBuild", "SWBBuildService", "SWBTestSupport"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBTestSupportTests",
             dependencies: ["SWBTestSupport"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
 
         // Perf tests
         .testTarget(
             name: "SWBBuildSystemPerfTests",
             dependencies: ["SWBBuildSystem", "SWBTestSupport", "SwiftBuildTestSupport"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBCASPerfTests",
             dependencies: ["SWBCAS", "SWBTestSupport"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBCorePerfTests",
             dependencies: ["SWBCore", "SWBTestSupport"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBTaskConstructionPerfTests",
             dependencies: ["SWBTaskConstruction", "SWBTestSupport"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SWBUtilPerfTests",
             dependencies: ["SWBUtil", "SWBTestSupport"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
         .testTarget(
             name: "SwiftBuildPerfTests",
             dependencies: ["SwiftBuild", "SWBTestSupport", "SwiftBuildTestSupport"],
-            swiftSettings: swiftSettings(languageMode: .v6)),
+            swiftSettings: swiftSettings(languageMode: .v6)
+        ),
 
         // Commands
         .plugin(
             name: "launch-xcode",
-            capability: .command(intent: .custom(
-                verb: "launch-xcode",
-                description: "Launch the currently selected Xcode configured to use the just-built build service"
-            ))
+            capability: .command(
+                intent: .custom(
+                    verb: "launch-xcode",
+                    description: "Launch the currently selected Xcode configured to use the just-built build service"
+                )
+            )
         ),
         .plugin(
             name: "run-xcodebuild",
-            capability: .command(intent: .custom(
-                verb: "run-xcodebuild",
-                description: "Run xcodebuild from the currently selected Xcode configured to use the just-built build service"
-            ))
+            capability: .command(
+                intent: .custom(
+                    verb: "run-xcodebuild",
+                    description: "Run xcodebuild from the currently selected Xcode configured to use the just-built build service"
+                )
+            )
         ),
         .plugin(
             name: "cmake-smoke-test",
-            capability: .command(intent: .custom(
-                verb: "cmake-smoke-test",
-                description: "Build Swift Build using CMake for validation purposes"
-            ))
+            capability: .command(
+                intent: .custom(
+                    verb: "cmake-smoke-test",
+                    description: "Build Swift Build using CMake for validation purposes"
+                )
+            )
         ),
         .plugin(
             name: "generate-windows-installer-component-groups",
-            capability: .command(intent: .custom(
-                verb: "generate-windows-installer-component-groups",
-                description: "Generate XML fragments for cli.wxs in swift-installer-scripts"
-            ))
-        )
+            capability: .command(
+                intent: .custom(
+                    verb: "generate-windows-installer-component-groups",
+                    description: "Generate XML fragments for cli.wxs in swift-installer-scripts"
+                )
+            )
+        ),
     ],
     swiftLanguageModes: [.v5, .v6],
     cxxLanguageStandard: .cxx20
@@ -467,7 +532,7 @@ if useLocalDependencies {
         .package(path: "../swift-argument-parser"),
     ]
     if !useLLBuildFramework {
-        package.dependencies +=  [.package(path: "../llbuild"),]
+        package.dependencies += [.package(path: "../llbuild")]
     }
 } else {
     package.dependencies += [
@@ -476,6 +541,6 @@ if useLocalDependencies {
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.0.3"),
     ]
     if !useLLBuildFramework {
-        package.dependencies += [.package(url: "https://github.com/swiftlang/swift-llbuild.git", branch: "main"),]
+        package.dependencies += [.package(url: "https://github.com/swiftlang/swift-llbuild.git", branch: "main")]
     }
 }
diff --git a/Plugins/cmake-smoke-test/cmake-smoke-test.swift b/Plugins/cmake-smoke-test/cmake-smoke-test.swift
index fcba09f3..a6fda901 100644
--- a/Plugins/cmake-smoke-test/cmake-smoke-test.swift
+++ b/Plugins/cmake-smoke-test/cmake-smoke-test.swift
@@ -63,7 +63,7 @@ struct CMakeSmokeTest: CommandPlugin {
         }
 
         var sharedSwiftFlags = [
-            "-module-cache-path", moduleCachePath
+            "-module-cache-path", moduleCachePath,
         ]
 
         if let sysrootPath {
@@ -75,15 +75,16 @@ struct CMakeSmokeTest: CommandPlugin {
             "-DLLBuild_DIR=\(llbuildBuildURL.appending(components: "cmake", "modules").filePath)",
             "-DTSC_DIR=\(swiftToolsSupportCoreBuildURL.appending(components: "cmake", "modules").filePath)",
             "-DSwiftDriver_DIR=\(swiftDriverBuildURL.appending(components: "cmake", "modules").filePath)",
-            "-DSwiftSystem_DIR=\(swiftSystemBuildURL.appending(components: "cmake", "modules").filePath)"
+            "-DSwiftSystem_DIR=\(swiftSystemBuildURL.appending(components: "cmake", "modules").filePath)",
         ]
 
-        let sharedCMakeArgs = [
-            "-G", "Ninja",
-            "-DCMAKE_MAKE_PROGRAM=\(ninjaPath)",
-            "-DCMAKE_BUILD_TYPE:=Debug",
-            "-DCMAKE_Swift_FLAGS='\(sharedSwiftFlags.joined(separator: " "))'"
-        ] + cMakeProjectArgs + extraCMakeArgs
+        let sharedCMakeArgs =
+            [
+                "-G", "Ninja",
+                "-DCMAKE_MAKE_PROGRAM=\(ninjaPath)",
+                "-DCMAKE_BUILD_TYPE:=Debug",
+                "-DCMAKE_Swift_FLAGS='\(sharedSwiftFlags.joined(separator: " "))'",
+            ] + cMakeProjectArgs + extraCMakeArgs
 
         Diagnostics.progress("Building swift-tools-support-core")
         try await Process.checkNonZeroExit(url: cmakeURL, arguments: sharedCMakeArgs + [swiftToolsSupportCoreURL.filePath], workingDirectory: swiftToolsSupportCoreBuildURL)
@@ -159,13 +160,13 @@ enum OS {
 
     static func host() throws -> Self {
         #if os(macOS)
-        return .macOS
+            return .macOS
         #elseif os(Linux)
-        return .linux
+            return .linux
         #elseif os(Windows)
-        return .windows
+            return .windows
         #else
-        throw Errors.unimplementedForHostOS
+            throw Errors.unimplementedForHostOS
         #endif
     }
 }
@@ -202,100 +203,104 @@ extension Process {
     static func checkNonZeroExit(url: URL, arguments: [String], workingDirectory: URL, environment: [String: String]? = nil) async throws {
         try Diagnostics.progress("\(url.filePath) \(arguments.joined(separator: " "))")
         #if USE_PROCESS_SPAWNING_WORKAROUND && !os(Windows)
-        Diagnostics.progress("Using process spawning workaround")
-        // Linux workaround for https://github.com/swiftlang/swift-corelibs-foundation/issues/4772
-        // Foundation.Process on Linux seems to inherit the Process.run()-calling thread's signal mask, creating processes that even have SIGTERM blocked
-        // This manifests as CMake getting stuck when invoking 'uname' with incorrectly configured signal handlers.
-        var fileActions = posix_spawn_file_actions_t()
-        defer { posix_spawn_file_actions_destroy(&fileActions) }
-        var attrs: posix_spawnattr_t = posix_spawnattr_t()
-        defer { posix_spawnattr_destroy(&attrs) }
-        posix_spawn_file_actions_init(&fileActions)
-        try posix_spawn_file_actions_addchdir_np(&fileActions, workingDirectory.filePath)
-
-        posix_spawnattr_init(&attrs)
-        posix_spawnattr_setpgroup(&attrs, 0)
-        var noSignals = sigset_t()
-        sigemptyset(&noSignals)
-        posix_spawnattr_setsigmask(&attrs, &noSignals)
-
-        var mostSignals = sigset_t()
-        sigemptyset(&mostSignals)
-        for i in 1 ..< SIGSYS {
-            if i == SIGKILL || i == SIGSTOP {
-                continue
-            }
-            sigaddset(&mostSignals, i)
-        }
-        posix_spawnattr_setsigdefault(&attrs, &mostSignals)
-        posix_spawnattr_setflags(&attrs, numericCast(POSIX_SPAWN_SETPGROUP | POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK))
-        var pid: pid_t = -1
-        try withArrayOfCStrings([url.filePath] + arguments) { arguments in
-            try withArrayOfCStrings((environment ?? [:]).map { key, value in "\(key)=\(value)" }) { environment in
-                let spawnResult = try posix_spawn(&pid, url.filePath, /*file_actions=*/&fileActions, /*attrp=*/&attrs, arguments, nil);
-                var exitCode: Int32 = -1
-                var result = wait4(pid, &exitCode, 0, nil);
-                while (result == -1 && errno == EINTR) {
-                    result = wait4(pid, &exitCode, 0, nil)
-                }
-                guard result != -1 else {
-                    throw Errors.miscError("wait failed")
+            Diagnostics.progress("Using process spawning workaround")
+            // Linux workaround for https://github.com/swiftlang/swift-corelibs-foundation/issues/4772
+            // Foundation.Process on Linux seems to inherit the Process.run()-calling thread's signal mask, creating processes that even have SIGTERM blocked
+            // This manifests as CMake getting stuck when invoking 'uname' with incorrectly configured signal handlers.
+            var fileActions = posix_spawn_file_actions_t()
+            defer { posix_spawn_file_actions_destroy(&fileActions) }
+            var attrs: posix_spawnattr_t = posix_spawnattr_t()
+            defer { posix_spawnattr_destroy(&attrs) }
+            posix_spawn_file_actions_init(&fileActions)
+            try posix_spawn_file_actions_addchdir_np(&fileActions, workingDirectory.filePath)
+
+            posix_spawnattr_init(&attrs)
+            posix_spawnattr_setpgroup(&attrs, 0)
+            var noSignals = sigset_t()
+            sigemptyset(&noSignals)
+            posix_spawnattr_setsigmask(&attrs, &noSignals)
+
+            var mostSignals = sigset_t()
+            sigemptyset(&mostSignals)
+            for i in 1..<SIGSYS {
+                if i == SIGKILL || i == SIGSTOP {
+                    continue
                 }
-                guard exitCode == 0 else {
-                    throw Errors.miscError("exit code nonzero")
+                sigaddset(&mostSignals, i)
+            }
+            posix_spawnattr_setsigdefault(&attrs, &mostSignals)
+            posix_spawnattr_setflags(&attrs, numericCast(POSIX_SPAWN_SETPGROUP | POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK))
+            var pid: pid_t = -1
+            try withArrayOfCStrings([url.filePath] + arguments) { arguments in
+                try withArrayOfCStrings((environment ?? [:]).map { key, value in "\(key)=\(value)" }) { environment in
+                    let spawnResult = try posix_spawn(&pid, url.filePath, /*file_actions=*/ &fileActions, /*attrp=*/ &attrs, arguments, nil);
+                    var exitCode: Int32 = -1
+                    var result = wait4(pid, &exitCode, 0, nil);
+                    while (result == -1 && errno == EINTR) {
+                        result = wait4(pid, &exitCode, 0, nil)
+                    }
+                    guard result != -1 else {
+                        throw Errors.miscError("wait failed")
+                    }
+                    guard exitCode == 0 else {
+                        throw Errors.miscError("exit code nonzero")
+                    }
                 }
             }
-        }
         #else
-        let process = Process()
-        process.executableURL = url
-        process.arguments = arguments
-        process.currentDirectoryURL = workingDirectory
-        process.environment = environment
-        try await process.run()
-        if process.terminationStatus != 0 {
-            throw Errors.processError(terminationReason: process.terminationReason, terminationStatus: process.terminationStatus)
-        }
+            let process = Process()
+            process.executableURL = url
+            process.arguments = arguments
+            process.currentDirectoryURL = workingDirectory
+            process.environment = environment
+            try await process.run()
+            if process.terminationStatus != 0 {
+                throw Errors.processError(terminationReason: process.terminationReason, terminationStatus: process.terminationStatus)
+            }
         #endif
     }
 }
 
 #if USE_PROCESS_SPAWNING_WORKAROUND && !os(Windows)
-func scan<S: Sequence, U>(_ seq: S, _ initial: U, _ combine: (U, S.Element) -> U) -> [U] {
-  var result: [U] = []
-  result.reserveCapacity(seq.underestimatedCount)
-  var runningResult = initial
-  for element in seq {
-    runningResult = combine(runningResult, element)
-    result.append(runningResult)
-  }
-  return result
-}
+    func scan<S: Sequence, U>(_ seq: S, _ initial: U, _ combine: (U, S.Element) -> U) -> [U] {
+        var result: [U] = []
+        result.reserveCapacity(seq.underestimatedCount)
+        var runningResult = initial
+        for element in seq {
+            runningResult = combine(runningResult, element)
+            result.append(runningResult)
+        }
+        return result
+    }
 
-func withArrayOfCStrings<T>(
-  _ args: [String],
-  _ body: (UnsafePointer<UnsafeMutablePointer<Int8>?>) throws -> T
-) throws -> T {
-  let argsCounts = Array(args.map { $0.utf8.count + 1 })
-  let argsOffsets = [0] + scan(argsCounts, 0, +)
-  let argsBufferSize = argsOffsets.last!
-  var argsBuffer: [UInt8] = []
-  argsBuffer.reserveCapacity(argsBufferSize)
-  for arg in args {
-    argsBuffer.append(contentsOf: arg.utf8)
-    argsBuffer.append(0)
-  }
-  return try argsBuffer.withUnsafeMutableBufferPointer {
-    (argsBuffer) in
-    let ptr = UnsafeRawPointer(argsBuffer.baseAddress!).bindMemory(
-      to: Int8.self, capacity: argsBuffer.count)
-    var cStrings: [UnsafePointer<Int8>?] = argsOffsets.map { ptr + $0 }
-    cStrings[cStrings.count - 1] = nil
-    return try cStrings.withUnsafeMutableBufferPointer {
-      let unsafeString = UnsafeMutableRawPointer($0.baseAddress!).bindMemory(
-        to: UnsafeMutablePointer<Int8>?.self, capacity: $0.count)
-      return try body(unsafeString)
+    func withArrayOfCStrings<T>(
+        _ args: [String],
+        _ body: (UnsafePointer<UnsafeMutablePointer<Int8>?>) throws -> T
+    ) throws -> T {
+        let argsCounts = Array(args.map { $0.utf8.count + 1 })
+        let argsOffsets = [0] + scan(argsCounts, 0, +)
+        let argsBufferSize = argsOffsets.last!
+        var argsBuffer: [UInt8] = []
+        argsBuffer.reserveCapacity(argsBufferSize)
+        for arg in args {
+            argsBuffer.append(contentsOf: arg.utf8)
+            argsBuffer.append(0)
+        }
+        return try argsBuffer.withUnsafeMutableBufferPointer {
+            (argsBuffer) in
+            let ptr = UnsafeRawPointer(argsBuffer.baseAddress!).bindMemory(
+                to: Int8.self,
+                capacity: argsBuffer.count
+            )
+            var cStrings: [UnsafePointer<Int8>?] = argsOffsets.map { ptr + $0 }
+            cStrings[cStrings.count - 1] = nil
+            return try cStrings.withUnsafeMutableBufferPointer {
+                let unsafeString = UnsafeMutableRawPointer($0.baseAddress!).bindMemory(
+                    to: UnsafeMutablePointer<Int8>?.self,
+                    capacity: $0.count
+                )
+                return try body(unsafeString)
+            }
+        }
     }
-  }
-}
 #endif
diff --git a/Plugins/generate-windows-installer-component-groups/generate-windows-installer-component-groups.swift b/Plugins/generate-windows-installer-component-groups/generate-windows-installer-component-groups.swift
index a2b4150f..317e1472 100644
--- a/Plugins/generate-windows-installer-component-groups/generate-windows-installer-component-groups.swift
+++ b/Plugins/generate-windows-installer-component-groups/generate-windows-installer-component-groups.swift
@@ -25,24 +25,24 @@ struct GenerateWindowsInstallerComponentGroups: CommandPlugin {
                 continue
             }
             librariesComponent += #"""
-                  <Component>
-                    <File Source="$(ToolchainRoot)\usr\bin\\#(sourceModule.name).dll" />
-                  </Component>
+                      <Component>
+                        <File Source="$(ToolchainRoot)\usr\bin\\#(sourceModule.name).dll" />
+                      </Component>
 
-            """#
+                """#
 
             let resources = sourceModule.sourceFiles.filter { resource in resource.type == .resource && ["xcspec", "xcbuildrules"].contains(resource.url.pathExtension) }
             if !resources.isEmpty {
                 groupRefs += #"      <ComponentGroupRef Id="\#(sourceModule.name)Resources" />\#n"#
                 directories += #"                  <Directory Id="_usr_share_pm_\#(sourceModule.name)" Name="SwiftBuild_\#(sourceModule.name).resources" />\#n"#
                 resourcesComponents += #"    <ComponentGroup Id="\#(sourceModule.name)Resources" Directory="_usr_share_pm_\#(sourceModule.name)">\#n"#
-                for resource in resources  {
+                for resource in resources {
                     resourcesComponents += #"""
-                      <Component>
-                        <File Source="$(ToolchainRoot)\usr\share\pm\SwiftBuild_\#(sourceModule.name).resources\\#(resource.url.lastPathComponent)" />
-                      </Component>
+                              <Component>
+                                <File Source="$(ToolchainRoot)\usr\share\pm\SwiftBuild_\#(sourceModule.name).resources\\#(resource.url.lastPathComponent)" />
+                              </Component>
 
-                """#
+                        """#
                 }
                 resourcesComponents += "    </ComponentGroup>\n"
             }
diff --git a/Plugins/launch-xcode/launch-xcode.swift b/Plugins/launch-xcode/launch-xcode.swift
index 674b8be7..ac67bcd3 100644
--- a/Plugins/launch-xcode/launch-xcode.swift
+++ b/Plugins/launch-xcode/launch-xcode.swift
@@ -17,37 +17,37 @@ import Foundation
 struct LaunchXcode: CommandPlugin {
     func performCommand(context: PluginContext, arguments: [String]) async throws {
         #if !os(macOS)
-        throw LaunchXcodeError.unsupportedPlatform
+            throw LaunchXcodeError.unsupportedPlatform
         #else
-        var args = ArgumentExtractor(arguments)
-        var configuration: PackageManager.BuildConfiguration = .debug
-        // --release
-        if args.extractFlag(named: "release") > 0 {
-            configuration = .release
-        } else {
-            // --configuration release
-            let configurationOptions = args.extractOption(named: "configuration")
-            if configurationOptions.contains("release") {
+            var args = ArgumentExtractor(arguments)
+            var configuration: PackageManager.BuildConfiguration = .debug
+            // --release
+            if args.extractFlag(named: "release") > 0 {
                 configuration = .release
+            } else {
+                // --configuration release
+                let configurationOptions = args.extractOption(named: "configuration")
+                if configurationOptions.contains("release") {
+                    configuration = .release
+                }
             }
-        }
 
-        let buildResult = try packageManager.build(.all(includingTests: false), parameters: .init(configuration: configuration, echoLogs: true))
-        guard buildResult.succeeded else { return }
-        guard let buildServiceURL = buildResult.builtArtifacts.map({ $0.url }).filter({ $0.lastPathComponent == "SWBBuildServiceBundle" }).first else {
-            throw LaunchXcodeError.buildServiceURLNotFound
-        }
+            let buildResult = try packageManager.build(.all(includingTests: false), parameters: .init(configuration: configuration, echoLogs: true))
+            guard buildResult.succeeded else { return }
+            guard let buildServiceURL = buildResult.builtArtifacts.map({ $0.url }).filter({ $0.lastPathComponent == "SWBBuildServiceBundle" }).first else {
+                throw LaunchXcodeError.buildServiceURLNotFound
+            }
 
-        print("Launching Xcode...")
-        let process = Process()
-        process.executableURL = URL(fileURLWithPath: "/usr/bin/open")
-        process.arguments = ["-n", "-F", "-W", "--env", "XCBBUILDSERVICE_PATH=\(buildServiceURL.path())", "-b", "com.apple.dt.Xcode"]
-        process.standardOutput = nil
-        process.standardError = nil
-        try await process.run()
-        if process.terminationStatus != 0 {
-            throw LaunchXcodeError.launchFailed
-        }
+            print("Launching Xcode...")
+            let process = Process()
+            process.executableURL = URL(fileURLWithPath: "/usr/bin/open")
+            process.arguments = ["-n", "-F", "-W", "--env", "XCBBUILDSERVICE_PATH=\(buildServiceURL.path())", "-b", "com.apple.dt.Xcode"]
+            process.standardOutput = nil
+            process.standardError = nil
+            try await process.run()
+            if process.terminationStatus != 0 {
+                throw LaunchXcodeError.launchFailed
+            }
         #endif
     }
 }
diff --git a/Plugins/run-xcodebuild/run-xcodebuild.swift b/Plugins/run-xcodebuild/run-xcodebuild.swift
index 710a84a2..814345a5 100644
--- a/Plugins/run-xcodebuild/run-xcodebuild.swift
+++ b/Plugins/run-xcodebuild/run-xcodebuild.swift
@@ -17,35 +17,35 @@ import Foundation
 struct RunXcodebuild: CommandPlugin {
     func performCommand(context: PluginContext, arguments: [String]) async throws {
         #if !os(macOS)
-        throw RunXcodebuildError.unsupportedPlatform
+            throw RunXcodebuildError.unsupportedPlatform
         #else
-        var args = ArgumentExtractor(arguments)
-        var configuration: PackageManager.BuildConfiguration = .debug
-        // --release
-        if args.extractFlag(named: "release") > 0 {
-            configuration = .release
-        } else {
-            // --configuration release
-            let configurationOptions = args.extractOption(named: "configuration")
-            if configurationOptions.contains("release") {
+            var args = ArgumentExtractor(arguments)
+            var configuration: PackageManager.BuildConfiguration = .debug
+            // --release
+            if args.extractFlag(named: "release") > 0 {
                 configuration = .release
+            } else {
+                // --configuration release
+                let configurationOptions = args.extractOption(named: "configuration")
+                if configurationOptions.contains("release") {
+                    configuration = .release
+                }
             }
-        }
 
-        let buildResult = try packageManager.build(.all(includingTests: false), parameters: .init(configuration: configuration, echoLogs: true))
-        guard buildResult.succeeded else { return }
-        guard let buildServiceURL = buildResult.builtArtifacts.map({ $0.url }).filter({ $0.lastPathComponent == "SWBBuildServiceBundle" }).first else {
-            throw RunXcodebuildError.buildServiceURLNotFound
-        }
+            let buildResult = try packageManager.build(.all(includingTests: false), parameters: .init(configuration: configuration, echoLogs: true))
+            guard buildResult.succeeded else { return }
+            guard let buildServiceURL = buildResult.builtArtifacts.map({ $0.url }).filter({ $0.lastPathComponent == "SWBBuildServiceBundle" }).first else {
+                throw RunXcodebuildError.buildServiceURLNotFound
+            }
 
-        let process = Process()
-        process.executableURL = URL(fileURLWithPath: "/usr/bin/xcrun")
-        process.arguments = ["xcodebuild"] + args.remainingArguments
-        process.environment = ProcessInfo.processInfo.environment.merging(["XCBBUILDSERVICE_PATH": buildServiceURL.path()]) { _, new in new }
-        try await process.run()
-        if process.terminationStatus != 0 {
-            throw RunXcodebuildError.xcodebuildError(terminationReason: process.terminationReason, terminationStatus: process.terminationStatus)
-        }
+            let process = Process()
+            process.executableURL = URL(fileURLWithPath: "/usr/bin/xcrun")
+            process.arguments = ["xcodebuild"] + args.remainingArguments
+            process.environment = ProcessInfo.processInfo.environment.merging(["XCBBUILDSERVICE_PATH": buildServiceURL.path()]) { _, new in new }
+            try await process.run()
+            if process.terminationStatus != 0 {
+                throw RunXcodebuildError.xcodebuildError(terminationReason: process.terminationReason, terminationStatus: process.terminationStatus)
+            }
         #endif
     }
 }
@@ -62,14 +62,15 @@ enum RunXcodebuildError: Error, CustomStringConvertible {
         case .buildServiceURLNotFound:
             return "Failed to determine path to built SWBBuildServiceBundle"
         case let .xcodebuildError(terminationReason, terminationStatus):
-            let reason = switch terminationReason {
-            case .exit:
-                "status code"
-            case .uncaughtSignal:
-                "uncaught signal"
-            @unknown default:
-                preconditionFailure()
-            }
+            let reason =
+                switch terminationReason {
+                case .exit:
+                    "status code"
+                case .uncaughtSignal:
+                    "uncaught signal"
+                @unknown default:
+                    preconditionFailure()
+                }
             return "xcodebuild exited with \(reason) \(terminationStatus), did you remember to pass `--disable-sandbox`?"
         }
     }
diff --git a/README.md b/README.md
index 504b53d8..3ccd862d 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,13 @@ code of conduct defined by the Contributor Covenant. This document is used
 across many open source communities, and we think it articulates our values
 well. For more, see the [Code of Conduct](https://swift.org/code-of-conduct/).
 
+Once the repository is clone, configure your local repository so blame ignores some commits:
+
+```
+git config blame.ignoreRevsFile .git-blame-ignore-revs
+```
+
+
 License
 -------
 See https://swift.org/LICENSE.txt for license information.
diff --git a/Sources/SWBAndroidPlatform/AndroidSDK.swift b/Sources/SWBAndroidPlatform/AndroidSDK.swift
index f5342ed9..e7cc3886 100644
--- a/Sources/SWBAndroidPlatform/AndroidSDK.swift
+++ b/Sources/SWBAndroidPlatform/AndroidSDK.swift
@@ -159,13 +159,15 @@ public import Foundation
                 self.arch = try container.decode(String.self, forKey: .arch)
                 self.triple = try container.decode(String.self, forKey: .triple)
                 self.llvm_triple = try container.decode(LLVMTriple.self, forKey: .llvm_triple)
-                self.min_os_version = try container.decodeIfPresent(Int.self, forKey: .min_os_version) ?? {
-                    if ndkVersion < Version(27) {
-                        return 21 // min_os_version wasn't present prior to NDKr27, fill it in with 21, which is the appropriate value
-                    } else {
-                        throw DecodingError.valueNotFound(Int.self, .init(codingPath: container.codingPath, debugDescription: "No value associated with key \(CodingKeys.min_os_version) (\"\(CodingKeys.min_os_version.rawValue)\")."))
-                    }
-                }()
+                self.min_os_version =
+                    try container.decodeIfPresent(Int.self, forKey: .min_os_version)
+                    ?? {
+                        if ndkVersion < Version(27) {
+                            return 21  // min_os_version wasn't present prior to NDKr27, fill it in with 21, which is the appropriate value
+                        } else {
+                            throw DecodingError.valueNotFound(Int.self, .init(codingPath: container.codingPath, debugDescription: "No value associated with key \(CodingKeys.min_os_version) (\"\(CodingKeys.min_os_version.rawValue)\")."))
+                        }
+                    }()
             }
         }
 
@@ -189,7 +191,7 @@ public import Foundation
                 // Also works on non-x86 archs via binfmt support and qemu (or Rosetta on Apple-hosted VMs).
                 "linux-x86_64"
             default:
-                nil // unsupported host
+                nil  // unsupported host
             }
         }
 
diff --git a/Sources/SWBAndroidPlatform/JavaProperties.swift b/Sources/SWBAndroidPlatform/JavaProperties.swift
index 0a6059d7..4eb7ea86 100644
--- a/Sources/SWBAndroidPlatform/JavaProperties.swift
+++ b/Sources/SWBAndroidPlatform/JavaProperties.swift
@@ -20,10 +20,12 @@ struct JavaProperties {
     private let properties: [String: String]
 
     init(data: Data) throws {
-        properties = Dictionary(uniqueKeysWithValues: String(decoding: data, as: UTF8.self).split(whereSeparator: { $0.isNewline }).map(String.init).map {
-            let (key, value) = $0.split("=")
-            return (key.trimmingCharacters(in: .whitespaces), value.trimmingCharacters(in: .whitespaces))
-        })
+        properties = Dictionary(
+            uniqueKeysWithValues: String(decoding: data, as: UTF8.self).split(whereSeparator: { $0.isNewline }).map(String.init).map {
+                let (key, value) = $0.split("=")
+                return (key.trimmingCharacters(in: .whitespaces), value.trimmingCharacters(in: .whitespaces))
+            }
+        )
     }
 
     subscript(_ propertyName: String) -> String? {
diff --git a/Sources/SWBAndroidPlatform/Plugin.swift b/Sources/SWBAndroidPlatform/Plugin.swift
index f282f26e..72b451e0 100644
--- a/Sources/SWBAndroidPlatform/Plugin.swift
+++ b/Sources/SWBAndroidPlatform/Plugin.swift
@@ -67,7 +67,7 @@ struct AndroidPlatformSpecsExtension: SpecificationsExtension {
         findResourceBundle(nameWhenInstalledInToolchain: "SwiftBuild_SWBAndroidPlatform", resourceSearchPaths: resourceSearchPaths, defaultBundle: Bundle.module)
     }
 
-    func specificationDomains() -> [String : [String]] {
+    func specificationDomains() -> [String: [String]] {
         ["android": ["linux"]]
     }
 }
@@ -98,15 +98,18 @@ struct AndroidEnvironmentExtension: EnvironmentExtension {
 struct AndroidPlatformExtension: PlatformInfoExtension {
     func additionalPlatforms(context: any PlatformInfoExtensionAdditionalPlatformsContext) throws -> [(path: Path, data: [String: PropertyListItem])] {
         [
-            (.root, [
-                "Type": .plString("Platform"),
-                "Name": .plString("android"),
-                "Identifier": .plString("android"),
-                "Description": .plString("android"),
-                "FamilyName": .plString("Android"),
-                "FamilyIdentifier": .plString("android"),
-                "IsDeploymentPlatform": .plString("YES"),
-            ])
+            (
+                .root,
+                [
+                    "Type": .plString("Platform"),
+                    "Name": .plString("android"),
+                    "Identifier": .plString("android"),
+                    "Description": .plString("android"),
+                    "FamilyName": .plString("Android"),
+                    "FamilyIdentifier": .plString("android"),
+                    "IsDeploymentPlatform": .plString("YES"),
+                ]
+            )
         ]
     }
 }
@@ -147,7 +150,7 @@ struct AndroidPlatformExtension: PlatformInfoExtension {
         let allPossibleTriples = try abis.values.flatMap { abi in
             try (max(deploymentTargetRange.min, abi.min_os_version)...deploymentTargetRange.max).map { deploymentTarget in
                 var triple = abi.llvm_triple
-                triple.vendor = "unknown" // Android NDK uses "none", Swift SDKs use "unknown"
+                triple.vendor = "unknown"  // Android NDK uses "none", Swift SDKs use "unknown"
                 guard let env = triple.environment else {
                     throw StubError.error("Android triples must have an environment")
                 }
@@ -156,11 +159,12 @@ struct AndroidPlatformExtension: PlatformInfoExtension {
             }
         }.map(\.description)
 
-        let androidSwiftSDKs = (try? SwiftSDK.findSDKs(
-            targetTriples: allPossibleTriples,
-            fs: context.fs,
-            hostOperatingSystem: context.hostOperatingSystem
-        )) ?? []
+        let androidSwiftSDKs =
+            (try? SwiftSDK.findSDKs(
+                targetTriples: allPossibleTriples,
+                fs: context.fs,
+                hostOperatingSystem: context.hostOperatingSystem
+            )) ?? []
 
         return try androidSwiftSDKs.map { androidSwiftSDK in
             let perArchSwiftResourceDirs = try Dictionary(grouping: androidSwiftSDK.targetTriples, by: { try LLVMTriple($0.key).arch }).mapValues {
@@ -179,14 +183,21 @@ struct AndroidPlatformExtension: PlatformInfoExtension {
                 customProperties: [
                     "SWIFT_TARGET_TRIPLE": .plString("$(CURRENT_ARCH)-unknown-$(SWIFT_PLATFORM_TARGET_PREFIX)$(LLVM_TARGET_TRIPLE_SUFFIX)"),
                     "LIBRARY_SEARCH_PATHS": "$(inherited) $(SWIFT_RESOURCE_DIR)/../$(__ANDROID_TRIPLE_$(CURRENT_ARCH))",
-                ].merging(perArchSwiftResourceDirs.map {
-                    [
-                        ("SWIFT_LIBRARY_PATH[arch=\($0.key)]", .plString($0.value.join("android").str)),
-                        ("SWIFT_RESOURCE_DIR[arch=\($0.key)]", .plString($0.value.str)),
-                    ]
-                }.flatMap { $0 }, uniquingKeysWith: { _, new in new }).merging(abis.map {
-                    ("__ANDROID_TRIPLE_\($0.value.llvm_triple.arch)", .plString($0.value.triple))
-                }, uniquingKeysWith: { _, new in new }))
+                ].merging(
+                    perArchSwiftResourceDirs.map {
+                        [
+                            ("SWIFT_LIBRARY_PATH[arch=\($0.key)]", .plString($0.value.join("android").str)),
+                            ("SWIFT_RESOURCE_DIR[arch=\($0.key)]", .plString($0.value.str)),
+                        ]
+                    }.flatMap { $0 },
+                    uniquingKeysWith: { _, new in new }
+                ).merging(
+                    abis.map {
+                        ("__ANDROID_TRIPLE_\($0.value.llvm_triple.arch)", .plString($0.value.triple))
+                    },
+                    uniquingKeysWith: { _, new in new }
+                )
+            )
         } + [
             // Fallback SDK for when there are no Swift SDKs (Android SDK is still usable for C/C++-only code)
             sdk(androidPlatform: androidPlatform, androidNdk: androidNdk, defaultProperties: defaultProperties)
@@ -194,38 +205,45 @@ struct AndroidPlatformExtension: PlatformInfoExtension {
     }
 
     private func sdk(canonicalName: String? = nil, androidPlatform: Platform, androidNdk: AndroidSDK.NDK, defaultProperties: [String: PropertyListItem], customProperties: [String: PropertyListItem] = [:]) -> (path: Path, platform: SWBCore.Platform?, data: [String: PropertyListItem]) {
-        return (androidNdk.sysroot.path, androidPlatform, [
-            "Type": .plString("SDK"),
-            "Version": .plString(androidNdk.version.description),
-            "CanonicalName": .plString(canonicalName ?? "android\(androidNdk.version.description)"),
-            // "android.ndk" is an alias for the "Android SDK without a Swift SDK" scenario in order for tests to deterministically pick a single Android destination regardless of how many Android Swift SDKs may be installed.
-            "Aliases": .plArray([.plString("android")] + (canonicalName == nil ? [.plString("android.ndk")] : [])),
-            "IsBaseSDK": .plBool(true),
-            "DefaultProperties": .plDict([
-                "PLATFORM_NAME": .plString("android"),
-            ].merging(defaultProperties, uniquingKeysWith: { _, new in new })),
-            "CustomProperties": .plDict([
-                // Unlike most platforms, the Android version goes on the environment field rather than the system field
-                // FIXME: Make this configurable in a better way so we don't need to push build settings at the SDK definition level
-                "LLVM_TARGET_TRIPLE_OS_VERSION": .plString("$(SWIFT_PLATFORM_TARGET_PREFIX)"),
-                "LLVM_TARGET_TRIPLE_SUFFIX": .plString("-android$($(DEPLOYMENT_TARGET_SETTING_NAME))"),
-            ].merging(customProperties, uniquingKeysWith: { _, new in new })),
-            "SupportedTargets": .plDict([
-                "android": .plDict([
-                    "Archs": .plArray(androidNdk.abis.map { .plString($0.value.llvm_triple.arch) }),
-                    "DeploymentTargetSettingName": .plString("ANDROID_DEPLOYMENT_TARGET"),
-                    "DefaultDeploymentTarget": .plString("\(androidNdk.deploymentTargetRange.min)"),
-                    "MinimumDeploymentTarget": .plString("\(androidNdk.deploymentTargetRange.min)"),
-                    "MaximumDeploymentTarget": .plString("\(androidNdk.deploymentTargetRange.max)"),
-                    "LLVMTargetTripleEnvironment": .plString("android"), // FIXME: androideabi for armv7!
-                    "LLVMTargetTripleSys": .plString("linux"),
-                    "LLVMTargetTripleVendor": .plString("none"),
-                ])
-            ]),
-            "Toolchains": .plArray([
-                .plString("android")
-            ])
-        ])
+        return (
+            androidNdk.sysroot.path, androidPlatform,
+            [
+                "Type": .plString("SDK"),
+                "Version": .plString(androidNdk.version.description),
+                "CanonicalName": .plString(canonicalName ?? "android\(androidNdk.version.description)"),
+                // "android.ndk" is an alias for the "Android SDK without a Swift SDK" scenario in order for tests to deterministically pick a single Android destination regardless of how many Android Swift SDKs may be installed.
+                "Aliases": .plArray([.plString("android")] + (canonicalName == nil ? [.plString("android.ndk")] : [])),
+                "IsBaseSDK": .plBool(true),
+                "DefaultProperties": .plDict(
+                    [
+                        "PLATFORM_NAME": .plString("android")
+                    ].merging(defaultProperties, uniquingKeysWith: { _, new in new })
+                ),
+                "CustomProperties": .plDict(
+                    [
+                        // Unlike most platforms, the Android version goes on the environment field rather than the system field
+                        // FIXME: Make this configurable in a better way so we don't need to push build settings at the SDK definition level
+                        "LLVM_TARGET_TRIPLE_OS_VERSION": .plString("$(SWIFT_PLATFORM_TARGET_PREFIX)"),
+                        "LLVM_TARGET_TRIPLE_SUFFIX": .plString("-android$($(DEPLOYMENT_TARGET_SETTING_NAME))"),
+                    ].merging(customProperties, uniquingKeysWith: { _, new in new })
+                ),
+                "SupportedTargets": .plDict([
+                    "android": .plDict([
+                        "Archs": .plArray(androidNdk.abis.map { .plString($0.value.llvm_triple.arch) }),
+                        "DeploymentTargetSettingName": .plString("ANDROID_DEPLOYMENT_TARGET"),
+                        "DefaultDeploymentTarget": .plString("\(androidNdk.deploymentTargetRange.min)"),
+                        "MinimumDeploymentTarget": .plString("\(androidNdk.deploymentTargetRange.min)"),
+                        "MaximumDeploymentTarget": .plString("\(androidNdk.deploymentTargetRange.max)"),
+                        "LLVMTargetTripleEnvironment": .plString("android"),  // FIXME: androideabi for armv7!
+                        "LLVMTargetTripleSys": .plString("linux"),
+                        "LLVMTargetTripleVendor": .plString("none"),
+                    ])
+                ]),
+                "Toolchains": .plArray([
+                    .plString("android")
+                ]),
+            ]
+        )
     }
 }
 
@@ -251,7 +269,8 @@ struct AndroidToolchainRegistryExtension: ToolchainRegistryExtension {
                 defaultSettingsWhenPrimary: [:],
                 executableSearchPaths: [toolchainPath.path.join("bin")],
                 testingLibraryPlatformNames: [],
-                fs: context.fs)
+                fs: context.fs
+            )
         ]
     }
 }
diff --git a/Sources/SWBApplePlatform/ActoolInputFileGroupingStrategy.swift b/Sources/SWBApplePlatform/ActoolInputFileGroupingStrategy.swift
index daf36099..4658d2da 100644
--- a/Sources/SWBApplePlatform/ActoolInputFileGroupingStrategy.swift
+++ b/Sources/SWBApplePlatform/ActoolInputFileGroupingStrategy.swift
@@ -49,8 +49,7 @@ import Foundation
                     file.fileType.conformsTo(stringsFileType) && file.absolutePath.basenameWithoutSuffix == stickerPackName
                 }
             }
-        }
-        catch {
+        } catch {
             context.error("\(error)", location: .unknown, component: .default)
             return []
         }
diff --git a/Sources/SWBApplePlatform/AppIntentsMetadataCompiler.swift b/Sources/SWBApplePlatform/AppIntentsMetadataCompiler.swift
index 76bc843c..61ff5ed6 100644
--- a/Sources/SWBApplePlatform/AppIntentsMetadataCompiler.swift
+++ b/Sources/SWBApplePlatform/AppIntentsMetadataCompiler.swift
@@ -27,7 +27,7 @@ private struct AppIntentsLocalizationPayload: TaskPayload {
             self.path = path
         }
 
-        func serialize<T>(to serializer: T) where T : Serializer {
+        func serialize<T>(to serializer: T) where T: Serializer {
             serializer.serializeAggregate(3) {
                 serializer.serialize(buildVariant)
                 serializer.serialize(architecture)
@@ -51,7 +51,7 @@ private struct AppIntentsLocalizationPayload: TaskPayload {
         self.stringsdata = stringsdata
     }
 
-    func serialize<T>(to serializer: T) where T : Serializer {
+    func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serializeAggregate(2) {
             serializer.serialize(effectivePlatformName)
             serializer.serialize(stringsdata)
@@ -68,9 +68,7 @@ private struct AppIntentsLocalizationPayload: TaskPayload {
 final public class AppIntentsMetadataCompilerSpec: GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.compilers.appintentsmetadata"
     public func shouldConstructAppIntentsMetadataTask(_ cbc: CommandBuildContext) -> Bool {
-        return cbc.scope.evaluate(BuiltinMacros.CURRENT_VARIANT) == "normal" &&
-        cbc.producer.canConstructAppIntentsMetadataTask &&
-        !cbc.inputs.filter({ $0.fileType.extensions.contains("swift") }).isEmpty
+        return cbc.scope.evaluate(BuiltinMacros.CURRENT_VARIANT) == "normal" && cbc.producer.canConstructAppIntentsMetadataTask && !cbc.inputs.filter({ $0.fileType.extensions.contains("swift") }).isEmpty
     }
 
     override public func constructTasks(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate) async {
@@ -185,8 +183,9 @@ final public class AppIntentsMetadataCompilerSpec: GenericCommandLineToolSpec, S
                 return cbc.scope.table.namespace.parseLiteralStringList(stringDataFiles.map(\.path.str))
             case BuiltinMacros.LM_COMPILE_TIME_EXTRACTION:
                 if cbc.scope.evaluate(BuiltinMacros.LM_COMPILE_TIME_EXTRACTION),
-                   let toolSpecInfo,
-                   toolSpecInfo.hasFeature(DiscoveredSwiftCompilerToolSpecInfo.FeatureFlag.constExtractCompleteMetadata.rawValue) {
+                    let toolSpecInfo,
+                    toolSpecInfo.hasFeature(DiscoveredSwiftCompilerToolSpecInfo.FeatureFlag.constExtractCompleteMetadata.rawValue)
+                {
                     return cbc.scope.table.namespace.parseLiteralString("YES")
                 }
                 return cbc.scope.table.namespace.parseLiteralString("NO")
@@ -210,17 +209,19 @@ final public class AppIntentsMetadataCompilerSpec: GenericCommandLineToolSpec, S
         let nodeName = (isObject || isStaticLibrary) ? "ExtractAppIntentsMetadata \(cbc.scope.evaluate(BuiltinMacros.TARGET_BUILD_DIR)) \(cbc.scope.evaluate(BuiltinMacros.PRODUCT_MODULE_NAME) + "/Metadata.appintents")" : "ExtractAppIntentsMetadata \(cbc.resourcesDir?.join("Metadata.appintents").str ?? "")"
         let orderingNode = delegate.createVirtualNode(nodeName)
         let commandLine = await commandLineFromTemplate(cbc, delegate, optionContext: discoveredCommandLineToolSpecInfo(cbc.producer, cbc.scope, delegate), lookup: lookup).map(\.asString)
-        delegate.createTask(type: self,
-                            payload: payload,
-                            ruleInfo: defaultRuleInfo(cbc, delegate),
-                            commandLine: commandLine,
-                            environment: environmentFromSpec(cbc, delegate),
-                            workingDirectory: cbc.producer.defaultWorkingDirectory,
-                            inputs: allInputs,
-                            outputs: outputs + [orderingNode],
-                            action: nil,
-                            execDescription: resolveExecutionDescription(cbc, delegate),
-                            enableSandboxing: enableSandboxing)
+        delegate.createTask(
+            type: self,
+            payload: payload,
+            ruleInfo: defaultRuleInfo(cbc, delegate),
+            commandLine: commandLine,
+            environment: environmentFromSpec(cbc, delegate),
+            workingDirectory: cbc.producer.defaultWorkingDirectory,
+            inputs: allInputs,
+            outputs: outputs + [orderingNode],
+            action: nil,
+            execDescription: resolveExecutionDescription(cbc, delegate),
+            enableSandboxing: enableSandboxing
+        )
     }
 
     public override var payloadType: (any TaskPayload.Type)? { return AppIntentsLocalizationPayload.self }
diff --git a/Sources/SWBApplePlatform/AppIntentsMetadataTaskProducer.swift b/Sources/SWBApplePlatform/AppIntentsMetadataTaskProducer.swift
index cf8b9a03..e864c88e 100644
--- a/Sources/SWBApplePlatform/AppIntentsMetadataTaskProducer.swift
+++ b/Sources/SWBApplePlatform/AppIntentsMetadataTaskProducer.swift
@@ -37,8 +37,9 @@ final class AppIntentsMetadataTaskProducer: PhasedTaskProducer, TaskProducer {
         return fileTypes.flatMap { fileType in
             buildFiles.compactMap { buildFile in
                 guard let resolvedBuildFileInfo = try? self.context.resolveBuildFileReference(buildFile),
-                      !buildFilesProcessingContext.isExcluded(resolvedBuildFileInfo.absolutePath, filters: buildFile.platformFilters),
-                      resolvedBuildFileInfo.fileType.conformsTo(fileType) else {
+                    !buildFilesProcessingContext.isExcluded(resolvedBuildFileInfo.absolutePath, filters: buildFile.platformFilters),
+                    resolvedBuildFileInfo.fileType.conformsTo(fileType)
+                else {
                     return nil
                 }
 
@@ -69,8 +70,9 @@ final class AppIntentsMetadataTaskProducer: PhasedTaskProducer, TaskProducer {
                 let dependencies = transitiveClosure([configuredTarget], successors: self.targetContext.globalProductPlan.dependencies(of:))
                 for dependency in dependencies.0 {
                     if let standardTarget = dependency.target as? StandardTarget,
-                       let bundleProductType = self.context.getSpec(standardTarget.productTypeIdentifier),
-                       bundleProductType.conformsTo(identifier: "com.apple.product-type.bundle") {
+                        let bundleProductType = self.context.getSpec(standardTarget.productTypeIdentifier),
+                        bundleProductType.conformsTo(identifier: "com.apple.product-type.bundle")
+                    {
                         let targetScope = self.targetContext.globalProductPlan.getTargetSettings(dependency).globalScope
                         let dependencyMetadataPath = targetScope.evaluate(BuiltinMacros.TARGET_BUILD_DIR)
                             .join(targetScope.evaluate(BuiltinMacros.UNLOCALIZED_RESOURCES_FOLDER_PATH))
@@ -80,7 +82,7 @@ final class AppIntentsMetadataTaskProducer: PhasedTaskProducer, TaskProducer {
                     }
                     let targetScope = self.targetContext.globalProductPlan.getTargetSettings(dependency).globalScope
                     let machOType = targetScope.evaluate(BuiltinMacros.MACH_O_TYPE)
-                    if  machOType == "staticlib" || machOType == "mh_object" {
+                    if machOType == "staticlib" || machOType == "mh_object" {
                         let dependencyMetadataPath = targetScope.evaluate(BuiltinMacros.TARGET_BUILD_DIR)
                             .join(targetScope.evaluate(BuiltinMacros.PRODUCT_MODULE_NAME) + ".appintents")
                             .join("Metadata.appintents/extract.actionsdata")
@@ -141,7 +143,6 @@ final class AppIntentsMetadataTaskProducer: PhasedTaskProducer, TaskProducer {
 
             let cbc = CommandBuildContext(producer: self.context, scope: scope, inputs: swiftSources + constMetadataFilesToBuild + appShortcutStringsSources, resourcesDir: buildFilesProcessingContext.resourcesDir)
 
-
             let assistantIntentsStringsSources: [FileToBuild] = self.filterBuildFiles(buildPhaseTarget.resourcesBuildPhase?.buildFiles, identifiers: ["text.plist.strings", "text.json.xcstrings"], buildFilesProcessingContext: buildFilesProcessingContext).filter { ["AssistantIntents.strings", "AssistantIntents.xcstrings"].contains($0.absolutePath.basename) }
             await self.appendGeneratedTasks(&deferredTasks) { delegate in
                 let shouldConstructAppIntentsMetadataTask = self.context.appIntentsMetadataCompilerSpec.shouldConstructAppIntentsMetadataTask(cbc)
@@ -156,10 +157,7 @@ final class AppIntentsMetadataTaskProducer: PhasedTaskProducer, TaskProducer {
 
                 // Only construct SSU task by default for public SDK clients. Internal default behavior should skip SSU task construction.
                 let isSSUEnabled = scope.evaluate(BuiltinMacros.APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING)
-                if isSSUEnabled &&
-                    self.context.settings.platform?.familyName == "iOS" &&
-                    self.context.productType?.hasInfoPlist == true &&
-                    ((!scope.effectiveInputInfoPlistPath().isEmpty && shouldConstructAppIntentsMetadataTask) || isInstallLoc) {
+                if isSSUEnabled && self.context.settings.platform?.familyName == "iOS" && self.context.productType?.hasInfoPlist == true && ((!scope.effectiveInputInfoPlistPath().isEmpty && shouldConstructAppIntentsMetadataTask) || isInstallLoc) {
                     var infoPlistSources: [FileToBuild]
                     if isInstallLoc {
                         infoPlistSources = self.filterBuildFiles(buildPhaseTarget.resourcesBuildPhase?.buildFiles, identifiers: ["text.plist.strings", "text.json.xcstrings"], buildFilesProcessingContext: buildFilesProcessingContext).filter { $0.absolutePath.basename.hasSuffix("InfoPlist.strings") || $0.absolutePath.basename.hasSuffix("InfoPlist.xcstrings") }
diff --git a/Sources/SWBApplePlatform/AppIntentsSSUTrainingCompiler.swift b/Sources/SWBApplePlatform/AppIntentsSSUTrainingCompiler.swift
index 19796296..309108b5 100644
--- a/Sources/SWBApplePlatform/AppIntentsSSUTrainingCompiler.swift
+++ b/Sources/SWBApplePlatform/AppIntentsSSUTrainingCompiler.swift
@@ -46,21 +46,23 @@ final public class AppIntentsSSUTrainingCompilerSpec: GenericCommandLineToolSpec
 
         if cbc.scope.evaluate(BuiltinMacros.BUILD_COMPONENTS).contains("installLoc") {
             guard cbc.inputs[0].fileType.conformsTo(stringsFileType) || cbc.inputs[0].fileType.conformsTo(xcstringsFileType),
-                  cbc.inputs[0].absolutePath.basename.hasSuffix("InfoPlist.strings") ||
-                    cbc.inputs[0].absolutePath.basename.hasSuffix("InfoPlist.xcstrings") else {
+                cbc.inputs[0].absolutePath.basename.hasSuffix("InfoPlist.strings") || cbc.inputs[0].absolutePath.basename.hasSuffix("InfoPlist.xcstrings")
+            else {
                 assertionFailure("AppIntents YAML Generation task construction was passed context without InfoPlist.strings file.")
                 return false
             }
         } else {
             guard cbc.inputs[0].fileType.conformsTo(plistFileType),
-                  cbc.inputs[0].absolutePath.basename == "Info.plist" else {
+                cbc.inputs[0].absolutePath.basename == "Info.plist"
+            else {
                 assertionFailure("AppIntents YAML Generation task construction was passed context without Info.plist file.")
                 return false
             }
         }
         if cbc.inputs.count == 2 {
             guard cbc.inputs[1].fileType.conformsTo(stringsFileType) || cbc.inputs[1].fileType.conformsTo(xcstringsFileType),
-                  ["AppShortcuts.strings", "AppShortcuts.xcstrings"].contains(cbc.inputs[1].absolutePath.basename) else {
+                ["AppShortcuts.strings", "AppShortcuts.xcstrings"].contains(cbc.inputs[1].absolutePath.basename)
+            else {
                 assertionFailure("AppIntents YAML Generation task construction was passed context without AppShortcuts.strings file.")
                 return false
             }
@@ -92,7 +94,7 @@ final public class AppIntentsSSUTrainingCompilerSpec: GenericCommandLineToolSpec
             } else {
                 inputNodeIdentifier = "ValidateAppShortcutStringsMetadata \(cbc.inputs[1].absolutePath.str)"
             }
-            let inputOrderingNode = delegate.createVirtualNode(inputNodeIdentifier) // Create the NL training task only if AppShortcuts.strings is validated
+            let inputOrderingNode = delegate.createVirtualNode(inputNodeIdentifier)  // Create the NL training task only if AppShortcuts.strings is validated
             inputs.append(inputOrderingNode)
         }
 
@@ -118,16 +120,17 @@ final public class AppIntentsSSUTrainingCompilerSpec: GenericCommandLineToolSpec
         }
 
         let commandLine = await commandLineFromTemplate(cbc, delegate, optionContext: discoveredCommandLineToolSpecInfo(cbc.producer, cbc.scope, delegate), lookup: lookup).map(\.asString)
-        delegate.createTask(type: self,
-                            ruleInfo: defaultRuleInfo(cbc, delegate),
-                            commandLine: commandLine,
-                            environment: environmentFromSpec(cbc, delegate),
-                            workingDirectory: cbc.producer.defaultWorkingDirectory,
-                            inputs: inputs,
-                            outputs: outputs,
-                            action: nil,
-                            execDescription: resolveExecutionDescription(cbc, delegate),
-                            enableSandboxing: enableSandboxing)
+        delegate.createTask(
+            type: self,
+            ruleInfo: defaultRuleInfo(cbc, delegate),
+            commandLine: commandLine,
+            environment: environmentFromSpec(cbc, delegate),
+            workingDirectory: cbc.producer.defaultWorkingDirectory,
+            inputs: inputs,
+            outputs: outputs,
+            action: nil,
+            execDescription: resolveExecutionDescription(cbc, delegate),
+            enableSandboxing: enableSandboxing
+        )
     }
 }
-
diff --git a/Sources/SWBApplePlatform/AssetCatalogCompiler.swift b/Sources/SWBApplePlatform/AssetCatalogCompiler.swift
index a0e1117c..6bb45d7b 100644
--- a/Sources/SWBApplePlatform/AssetCatalogCompiler.swift
+++ b/Sources/SWBApplePlatform/AssetCatalogCompiler.swift
@@ -16,7 +16,7 @@ public import SWBCore
 import SWBTaskConstruction
 public import SWBMacro
 
-public final class ActoolCompilerSpec : GenericCompilerSpec, SpecIdentifierType, IbtoolCompilerSupport, @unchecked Sendable {
+public final class ActoolCompilerSpec: GenericCompilerSpec, SpecIdentifierType, IbtoolCompilerSupport, @unchecked Sendable {
     public static let identifier = "com.apple.compilers.assetcatalog"
 
     private func constructAssetPackOutputSpecificationsTask(catalogInputs inputs: [FileToBuild], _ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate) async -> Path? {
@@ -44,8 +44,7 @@ public final class ActoolCompilerSpec : GenericCompilerSpec, SpecIdentifierType,
         let data: [UInt8]
         do {
             data = try plist.asBytes(.xml)
-        }
-        catch {
+        } catch {
             delegate.error("failed to format plist for \(path): \(plist): \(error)")
             return nil
         }
@@ -158,7 +157,7 @@ public final class ActoolCompilerSpec : GenericCompilerSpec, SpecIdentifierType,
         if let assetPackInfoFile = await constructAssetPackOutputSpecificationsTask(catalogInputs: catalogInputs, cbc, delegate) {
             specialArgs += [
                 "--asset-pack-output-specifications",
-                assetPackInfoFile.str
+                assetPackInfoFile.str,
             ]
 
             odrInputs.append(delegate.createNode(assetPackInfoFile))
@@ -170,12 +169,14 @@ public final class ActoolCompilerSpec : GenericCompilerSpec, SpecIdentifierType,
                 return cbc.scope.table.namespace.parseLiteralStringList(catalogInputPaths.map({ $0.str }))
 
             case BuiltinMacros.ASSETCATALOG_COMPILER_STICKER_PACK_STRINGS:
-                return cbc.scope.table.namespace.parseLiteralStringList(stringsInputPaths.map({ stringsFile in
-                    let base = stringsFile.absolutePath.basenameWithoutSuffix
-                    let region = stringsFile.regionVariantName ?? ""
-                    let path = stringsFile.absolutePath.str
-                    return [base, region, path].joined(separator: ":")
-                }))
+                return cbc.scope.table.namespace.parseLiteralStringList(
+                    stringsInputPaths.map({ stringsFile in
+                        let base = stringsFile.absolutePath.basenameWithoutSuffix
+                        let region = stringsFile.regionVariantName ?? ""
+                        let path = stringsFile.absolutePath.str
+                        return [base, region, path].joined(separator: ":")
+                    })
+                )
 
             default:
                 return nil
@@ -239,12 +240,14 @@ public final class ActoolCompilerSpec : GenericCompilerSpec, SpecIdentifierType,
         // which it currently receives a listing of via the assetcatalog_dependencies file produced by actool.
         let carFiles = [cbc.resourcesDir?.join("Assets.car")].compactMap { $0 }.map(delegate.createNode)
 
-        let outputs = evaluatedOutputsResult + (additionalEvaluatedOutputsResult.outputs).map { output in
-            if let fileTypeIdentifier = output.fileType, let fileType = cbc.producer.lookupFileType(identifier: fileTypeIdentifier) {
-                delegate.declareOutput(FileToBuild(absolutePath: output.path, fileType: fileType))
+        let outputs =
+            evaluatedOutputsResult
+            + (additionalEvaluatedOutputsResult.outputs).map { output in
+                if let fileTypeIdentifier = output.fileType, let fileType = cbc.producer.lookupFileType(identifier: fileTypeIdentifier) {
+                    delegate.declareOutput(FileToBuild(absolutePath: output.path, fileType: fileType))
+                }
+                return delegate.createNode(output.path)
             }
-            return delegate.createNode(output.path)
-        }
         guard !outputs.isEmpty else { preconditionFailure("ActoolCompilerSpec.constructTasks() invoked with no outputs defined") }
 
         let assetSymbolInputs = cbc.inputs
@@ -414,13 +417,13 @@ public final class ActoolCompilerSpec : GenericCompilerSpec, SpecIdentifierType,
         // Only compile asset catalogs during the build action, not installapi or installhdrs.
         // Never compile asset catalogs in main package targets with synthesized resource bundles since they're compiled in the latter.
         if buildComponents.contains("build") && !isMainPackageWithResourceBundle {
-                let variants: [(variant: AssetCatalogVariant, node: PlannedDirectoryTreeNode)] = await [.thinned, .unthinned].asyncMap { variant in
-                    await createAssetCatalogTask(variant: variant).map { (variant, $0) }
-                }.compactMap { $0 }
+            let variants: [(variant: AssetCatalogVariant, node: PlannedDirectoryTreeNode)] = await [.thinned, .unthinned].asyncMap { variant in
+                await createAssetCatalogTask(variant: variant).map { (variant, $0) }
+            }.compactMap { $0 }
 
-                let signaturePath = cbc.scope.evaluate(BuiltinMacros.TARGET_TEMP_DIR).join("assetcatalog_signature")
+            let signaturePath = cbc.scope.evaluate(BuiltinMacros.TARGET_TEMP_DIR).join("assetcatalog_signature")
 
-                delegate.createTask(type: self, ruleInfo: ["LinkAssetCatalogSignature"], commandLine: ["builtin-linkAssetCatalogSignature", signaturePath.str], environment: EnvironmentBindings(), workingDirectory: cbc.producer.defaultWorkingDirectory, inputs: [], outputs: [signaturePath], action: delegate.taskActionCreationDelegate.createLinkAssetCatalogTaskAction(), enableSandboxing: false, alwaysExecuteTask: true, showInLog: false)
+            delegate.createTask(type: self, ruleInfo: ["LinkAssetCatalogSignature"], commandLine: ["builtin-linkAssetCatalogSignature", signaturePath.str], environment: EnvironmentBindings(), workingDirectory: cbc.producer.defaultWorkingDirectory, inputs: [], outputs: [signaturePath], action: delegate.taskActionCreationDelegate.createLinkAssetCatalogTaskAction(), enableSandboxing: false, alwaysExecuteTask: true, showInLog: false)
 
             guard let plistOutputPath = await additionalEvaluatedOutputs(cbc, delegate).generatedInfoPlistContent else {
                 delegate.error("Unable to determine output path for asset catalog Info.plist content")
diff --git a/Sources/SWBApplePlatform/AssetCatalogCompilerOutputParser.swift b/Sources/SWBApplePlatform/AssetCatalogCompilerOutputParser.swift
index e7413dc2..4ea48586 100644
--- a/Sources/SWBApplePlatform/AssetCatalogCompilerOutputParser.swift
+++ b/Sources/SWBApplePlatform/AssetCatalogCompilerOutputParser.swift
@@ -13,7 +13,7 @@
 public import SWBCore
 public import SWBUtil
 
-public final class AssetCatalogCompilerOutputParser : GenericOutputParser {
+public final class AssetCatalogCompilerOutputParser: GenericOutputParser {
     /// Regex to extract location information from a diagnostic prefix (capture group 0 is the name, 1 is the line number or the object identifier).
     static let locRegex = RegEx(patternLiteral: "^([^:]+):(?:([^:]+):)? +$")
 
diff --git a/Sources/SWBApplePlatform/CoreDataCompiler.swift b/Sources/SWBApplePlatform/CoreDataCompiler.swift
index 9e3bc3ea..99cab72c 100644
--- a/Sources/SWBApplePlatform/CoreDataCompiler.swift
+++ b/Sources/SWBApplePlatform/CoreDataCompiler.swift
@@ -14,7 +14,7 @@ import SWBUtil
 public import SWBCore
 import SWBMacro
 
-public final class CoreDataModelCompilerSpec : GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
+public final class CoreDataModelCompilerSpec: GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.compilers.model.coredata"
 
     public override var supportsInstallHeaders: Bool {
diff --git a/Sources/SWBApplePlatform/CoreMLCompiler.swift b/Sources/SWBApplePlatform/CoreMLCompiler.swift
index 1fd193d2..2fdb0e20 100644
--- a/Sources/SWBApplePlatform/CoreMLCompiler.swift
+++ b/Sources/SWBApplePlatform/CoreMLCompiler.swift
@@ -92,23 +92,23 @@ fileprivate enum CoreMLIndexingInfo: Serializable, SourceFileIndexingInfo, Encod
         var dict = [String: PropertyListItem]()
 
         switch self {
-            case .success(let generatedFilePaths, let languageToGenerate, let notice):
-                if let generatedFilePaths {
-                    dict["COREMLCOMPILER_GENERATED_FILE_PATHS"] = PropertyListItem(generatedFilePaths.map({ $0.str }))
-                }
-                dict["COREMLCOMPILER_LANGUAGE_TO_GENERATE"] = PropertyListItem(languageToGenerate)
-                if let notice {
-                    dict["COREMLCOMPILER_GENERATOR_NOTICE"] = PropertyListItem(notice)
-                }
-            case .failure(let error):
-                dict["COREMLCOMPILER_GENERATOR_ERROR"] = PropertyListItem(error)
+        case .success(let generatedFilePaths, let languageToGenerate, let notice):
+            if let generatedFilePaths {
+                dict["COREMLCOMPILER_GENERATED_FILE_PATHS"] = PropertyListItem(generatedFilePaths.map({ $0.str }))
+            }
+            dict["COREMLCOMPILER_LANGUAGE_TO_GENERATE"] = PropertyListItem(languageToGenerate)
+            if let notice {
+                dict["COREMLCOMPILER_GENERATOR_NOTICE"] = PropertyListItem(notice)
+            }
+        case .failure(let error):
+            dict["COREMLCOMPILER_GENERATOR_ERROR"] = PropertyListItem(error)
         }
 
         return .plDict(dict)
     }
 }
 
-public final class CoreMLCompilerSpec : GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
+public final class CoreMLCompilerSpec: GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.compilers.coreml"
 
     public override var supportsInstallHeaders: Bool {
@@ -178,8 +178,7 @@ public final class CoreMLCompilerSpec : GenericCompilerSpec, SpecIdentifierType,
                 delegate.warning("\(input.absolutePath.basename): Target's predominant language \"\(languageString)\" is not supported for CoreML code generation.  Selecting Objective-C by default.  Set COREML_CODEGEN_LANGUAGE to preferred language.")
                 codegenLanguage = "Objective-C"
             }
-        }
-        else {
+        } else {
             guard Set<String>(["Swift", "Objective-C", "None"]).contains(languageSettingValue) else {
                 // If the setting is set to an unexpected value, then emit an error and return.
                 delegate.error("\(input.absolutePath.basename): COREML_CODEGEN_LANGUAGE set to unsupported language \"\(languageSettingValue)\".  Set COREML_CODEGEN_LANGUAGE to preferred language.")
@@ -227,10 +226,10 @@ public final class CoreMLCompilerSpec : GenericCompilerSpec, SpecIdentifierType,
 
         // Support .mlpackage
         let inputs = cbc.inputs.map { input -> (any PlannedNode) in
-                                        if input.fileType.isWrapper {
-                                            return delegate.createDirectoryTreeNode(input.absolutePath)
-                                        }
-                                        return delegate.createNode(input.absolutePath)
+            if input.fileType.isWrapper {
+                return delegate.createDirectoryTreeNode(input.absolutePath)
+            }
+            return delegate.createNode(input.absolutePath)
         }
 
         let ruleInfo = ["CoreMLModelCodegen", input.absolutePath.str]
@@ -296,7 +295,8 @@ public final class CoreMLCompilerSpec : GenericCompilerSpec, SpecIdentifierType,
                 guard
                     let target = cbc.producer.configuredTarget?.target as? SWBCore.BuildPhaseTarget,
                     let outputPath = headerOutputPath,
-                    target.headersBuildPhase != nil else { continue }
+                    target.headersBuildPhase != nil
+                else { continue }
 
                 await cbc.producer.copySpec.constructCopyTasks(CommandBuildContext(producer: cbc.producer, scope: cbc.scope, inputs: [outputFile], output: outputPath, preparesForIndexing: true), delegate, additionalTaskOrderingOptions: .compilationRequirement)
             }
diff --git a/Sources/SWBApplePlatform/DittoTool.swift b/Sources/SWBApplePlatform/DittoTool.swift
index 0a765c9a..a05fa1e7 100644
--- a/Sources/SWBApplePlatform/DittoTool.swift
+++ b/Sources/SWBApplePlatform/DittoTool.swift
@@ -12,7 +12,7 @@
 
 import SWBCore
 
-final class DittoToolSpec : CommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
+final class DittoToolSpec: CommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
     static let identifier = "com.apple.tools.ditto"
 
     required convenience init(_ parser: SpecParser, _ basedOnSpec: Spec?) {
diff --git a/Sources/SWBApplePlatform/EXUtil.swift b/Sources/SWBApplePlatform/EXUtil.swift
index 86fb6679..4203c83e 100644
--- a/Sources/SWBApplePlatform/EXUtil.swift
+++ b/Sources/SWBApplePlatform/EXUtil.swift
@@ -27,14 +27,13 @@ final class ExtensionPointExtractorSpec: GenericCommandLineToolSpec, SpecIdentif
         let isAppProductType = productType?.conformsTo(identifier: "com.apple.product-type.application") ?? false
         let extensionPointExtractorEnabled = scope.evaluate(BuiltinMacros.EX_ENABLE_EXTENSION_POINT_GENERATION)
 
-        let result = (
-            isBuild
-            && isNormalVariant
-            && extensionPointExtractorEnabled
-            && !indexEnableBuildArena
-            && isAppProductType
-            && isApplePlatform
-        )
+        let result =
+            (isBuild
+                && isNormalVariant
+                && extensionPointExtractorEnabled
+                && !indexEnableBuildArena
+                && isAppProductType
+                && isApplePlatform)
         return result
     }
 
@@ -55,16 +54,18 @@ final class ExtensionPointExtractorSpec: GenericCommandLineToolSpec, SpecIdentif
 
         let commandLine = await commandLineFromTemplate(cbc, delegate, optionContext: discoveredCommandLineToolSpecInfo(cbc.producer, cbc.scope, delegate)).map(\.asString)
 
-        delegate.createTask(type: self,
-                            ruleInfo: defaultRuleInfo(cbc, delegate),
-                            commandLine: commandLine,
-                            environment: environmentFromSpec(cbc, delegate),
-                            workingDirectory: cbc.producer.defaultWorkingDirectory,
-                            inputs: inputs,
-                            outputs: outputs,
-                            action: nil,
-                            execDescription: resolveExecutionDescription(cbc, delegate),
-                            enableSandboxing: enableSandboxing)
+        delegate.createTask(
+            type: self,
+            ruleInfo: defaultRuleInfo(cbc, delegate),
+            commandLine: commandLine,
+            environment: environmentFromSpec(cbc, delegate),
+            workingDirectory: cbc.producer.defaultWorkingDirectory,
+            inputs: inputs,
+            outputs: outputs,
+            action: nil,
+            execDescription: resolveExecutionDescription(cbc, delegate),
+            enableSandboxing: enableSandboxing
+        )
     }
 }
 
@@ -79,12 +80,13 @@ final class AppExtensionPlistGeneratorSpec: GenericCommandLineToolSpec, SpecIden
         let isAppExtensionProductType = productType?.conformsTo(identifier: "com.apple.product-type.extensionkit-extension") ?? false
         let extensionPointAttributesGenerationEnabled = !scope.evaluate(BuiltinMacros.EX_DISABLE_APPEXTENSION_ATTRIBUTES_GENERATION)
 
-        let result = ( isBuild
-                       && isNormalVariant
-                       && extensionPointAttributesGenerationEnabled
-                       && !indexEnableBuildArena
-                       && (isAppExtensionProductType)
-                       && isApplePlatform )
+        let result =
+            (isBuild
+                && isNormalVariant
+                && extensionPointAttributesGenerationEnabled
+                && !indexEnableBuildArena
+                && (isAppExtensionProductType)
+                && isApplePlatform)
 
         return result
     }
@@ -106,19 +108,19 @@ final class AppExtensionPlistGeneratorSpec: GenericCommandLineToolSpec, SpecIden
         let outputPath = cbc.output
         outputs.append(delegate.createNode(outputPath))
 
-
         let commandLine = await commandLineFromTemplate(cbc, delegate, optionContext: discoveredCommandLineToolSpecInfo(cbc.producer, cbc.scope, delegate)).map(\.asString)
 
-        delegate.createTask(type: self,
-                            ruleInfo: defaultRuleInfo(cbc, delegate),
-                            commandLine: commandLine,
-                            environment: environmentFromSpec(cbc, delegate),
-                            workingDirectory: cbc.producer.defaultWorkingDirectory,
-                            inputs: inputs,
-                            outputs: outputs,
-                            action: nil,
-                            execDescription: resolveExecutionDescription(cbc, delegate),
-                            enableSandboxing: enableSandboxing
+        delegate.createTask(
+            type: self,
+            ruleInfo: defaultRuleInfo(cbc, delegate),
+            commandLine: commandLine,
+            environment: environmentFromSpec(cbc, delegate),
+            workingDirectory: cbc.producer.defaultWorkingDirectory,
+            inputs: inputs,
+            outputs: outputs,
+            action: nil,
+            execDescription: resolveExecutionDescription(cbc, delegate),
+            enableSandboxing: enableSandboxing
         )
     }
 }
diff --git a/Sources/SWBApplePlatform/ExtensionPointExtractorTaskProducer.swift b/Sources/SWBApplePlatform/ExtensionPointExtractorTaskProducer.swift
index e842bdb9..ff0d9782 100644
--- a/Sources/SWBApplePlatform/ExtensionPointExtractorTaskProducer.swift
+++ b/Sources/SWBApplePlatform/ExtensionPointExtractorTaskProducer.swift
@@ -33,8 +33,9 @@ final class ExtensionPointExtractorTaskProducer: PhasedTaskProducer, TaskProduce
         return fileTypes.flatMap { fileType in
             buildFiles.compactMap { buildFile in
                 guard let resolvedBuildFileInfo = try? self.context.resolveBuildFileReference(buildFile),
-                      !buildFilesProcessingContext.isExcluded(resolvedBuildFileInfo.absolutePath, filters: buildFile.platformFilters),
-                      resolvedBuildFileInfo.fileType.conformsTo(fileType) else {
+                    !buildFilesProcessingContext.isExcluded(resolvedBuildFileInfo.absolutePath, filters: buildFile.platformFilters),
+                    resolvedBuildFileInfo.fileType.conformsTo(fileType)
+                else {
                     return nil
                 }
 
@@ -78,7 +79,7 @@ final class ExtensionPointExtractorTaskProducer: PhasedTaskProducer, TaskProduce
             let cbc = CommandBuildContext(producer: self.context, scope: scope, inputs: inputs, resourcesDir: buildFilesProcessingContext.resourcesDir)
             await self.appendGeneratedTasks(&deferredTasks) { delegate in
                 let domain = self.context.settings.platform?.name ?? ""
-                guard let spec = self.context.specRegistry.getSpec("com.apple.compilers.extract-appextensionpoints", domain:domain) as? ExtensionPointExtractorSpec else {
+                guard let spec = self.context.specRegistry.getSpec("com.apple.compilers.extract-appextensionpoints", domain: domain) as? ExtensionPointExtractorSpec else {
                     return
                 }
                 await spec.constructTasks(cbc, delegate)
@@ -90,7 +91,6 @@ final class ExtensionPointExtractorTaskProducer: PhasedTaskProducer, TaskProduce
     }
 }
 
-
 final class AppExtensionInfoPlistGeneratorTaskProducer: PhasedTaskProducer, TaskProducer {
 
     override var defaultTaskOrderingOptions: TaskOrderingOptions {
@@ -109,8 +109,9 @@ final class AppExtensionInfoPlistGeneratorTaskProducer: PhasedTaskProducer, Task
         return fileTypes.flatMap { fileType in
             buildFiles.compactMap { buildFile in
                 guard let resolvedBuildFileInfo = try? self.context.resolveBuildFileReference(buildFile),
-                      !buildFilesProcessingContext.isExcluded(resolvedBuildFileInfo.absolutePath, filters: buildFile.platformFilters),
-                      resolvedBuildFileInfo.fileType.conformsTo(fileType) else {
+                    !buildFilesProcessingContext.isExcluded(resolvedBuildFileInfo.absolutePath, filters: buildFile.platformFilters),
+                    resolvedBuildFileInfo.fileType.conformsTo(fileType)
+                else {
                     return nil
                 }
 
@@ -157,7 +158,7 @@ final class AppExtensionInfoPlistGeneratorTaskProducer: PhasedTaskProducer, Task
 
             await self.appendGeneratedTasks(&deferredTasks) { delegate in
                 let domain = self.context.settings.platform?.name ?? ""
-                guard let spec = self.context.specRegistry.getSpec("com.apple.compilers.appextension-plist-generator",domain: domain) as? AppExtensionPlistGeneratorSpec else {
+                guard let spec = self.context.specRegistry.getSpec("com.apple.compilers.appextension-plist-generator", domain: domain) as? AppExtensionPlistGeneratorSpec else {
                     return
                 }
                 await spec.constructTasks(cbc, delegate)
diff --git a/Sources/SWBApplePlatform/ImageScaleFactorsInputFileGroupingStrategy.swift b/Sources/SWBApplePlatform/ImageScaleFactorsInputFileGroupingStrategy.swift
index a9382539..01d0782e 100644
--- a/Sources/SWBApplePlatform/ImageScaleFactorsInputFileGroupingStrategy.swift
+++ b/Sources/SWBApplePlatform/ImageScaleFactorsInputFileGroupingStrategy.swift
@@ -16,7 +16,7 @@ import SWBUtil
 // FIXME: Presently we have no good way during grouping to detect whether we're matching a single file against tiffutil or multiple files against tiffutil.  In principle we could handle that in FilesBasedBuildPhaseTaskProducer once all grouping is completed.  But at present this is handled in a hackier manner in TiffUtilToolSpec.constructTasks() - see the FIXME comment therein for more about this.
 //
 /// A grouping strategy that groups image files containing scale factors of the form "@<n>x" at the end of their base names.
-@_spi(Testing) public final class ImageScaleFactorsInputFileGroupingStrategy : InputFileGroupingStrategy {
+@_spi(Testing) public final class ImageScaleFactorsInputFileGroupingStrategy: InputFileGroupingStrategy {
 
     /// Name of the tool to which the grouping strategy belongs (used as a part of the returned group identifier).
     let toolName: String
diff --git a/Sources/SWBApplePlatform/InstrumentsPackageBuilderSpec.swift b/Sources/SWBApplePlatform/InstrumentsPackageBuilderSpec.swift
index cc0d38c9..65e3af23 100644
--- a/Sources/SWBApplePlatform/InstrumentsPackageBuilderSpec.swift
+++ b/Sources/SWBApplePlatform/InstrumentsPackageBuilderSpec.swift
@@ -22,9 +22,11 @@ public final class InstrumentsPackageBuilderSpec: GenericCompilerSpec, SpecIdent
         // Copy the cbc with an additional virtual node as an output for postprocessing mutating tasks to use to find this task.
         var orderingOutputs: [any PlannedNode] = []
 
-        orderingOutputs.append(contentsOf: evaluatedOutputs(cbc, delegate)?.map({ output in
-            delegate.createVirtualNode("BuildInstrumentsPackage \(output.path.str)")
-        }) ?? [])
+        orderingOutputs.append(
+            contentsOf: evaluatedOutputs(cbc, delegate)?.map({ output in
+                delegate.createVirtualNode("BuildInstrumentsPackage \(output.path.str)")
+            }) ?? []
+        )
 
         let dependencyData: DependencyDataStyle?
         let infoFilePath = cbc.scope.evaluate(BuiltinMacros.INSTRUMENTS_PACKAGE_BUILDER_DEPENDENCY_INFO_FILE)
diff --git a/Sources/SWBApplePlatform/IntentsCompiler.swift b/Sources/SWBApplePlatform/IntentsCompiler.swift
index ccffd2ff..9fbf1ce8 100644
--- a/Sources/SWBApplePlatform/IntentsCompiler.swift
+++ b/Sources/SWBApplePlatform/IntentsCompiler.swift
@@ -92,7 +92,7 @@ fileprivate enum IntentsIndexingInfo: Serializable, SourceFileIndexingInfo, Enco
     }
 }
 
-public final class IntentsCompilerSpec : GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
+public final class IntentsCompilerSpec: GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.compilers.intents"
 
     public override var supportsInstallAPI: Bool {
@@ -130,7 +130,8 @@ public final class IntentsCompilerSpec : GenericCompilerSpec, SpecIdentifierType
         guard
             let target = cbc.producer.configuredTarget?.target as? SWBCore.BuildPhaseTarget,
             target.sourcesBuildPhase != nil,
-            let intentsCodegenVisibility = input.intentsCodegenVisibility else { return }
+            let intentsCodegenVisibility = input.intentsCodegenVisibility
+        else { return }
 
         if case .noCodegen = intentsCodegenVisibility {
             return
@@ -244,7 +245,8 @@ public final class IntentsCompilerSpec : GenericCompilerSpec, SpecIdentifierType
                 guard
                     let target = cbc.producer.configuredTarget?.target as? SWBCore.BuildPhaseTarget,
                     let outputPath = headerOutputPath,
-                    target.headersBuildPhase != nil else { continue }
+                    target.headersBuildPhase != nil
+                else { continue }
 
                 await cbc.producer.copySpec.constructCopyTasks(CommandBuildContext(producer: cbc.producer, scope: cbc.scope, inputs: [outputFile], output: outputPath, preparesForIndexing: true), delegate, additionalTaskOrderingOptions: .compilationRequirement)
             }
diff --git a/Sources/SWBApplePlatform/InterfaceBuilderCompiler.swift b/Sources/SWBApplePlatform/InterfaceBuilderCompiler.swift
index b8a181bf..c5433f50 100644
--- a/Sources/SWBApplePlatform/InterfaceBuilderCompiler.swift
+++ b/Sources/SWBApplePlatform/InterfaceBuilderCompiler.swift
@@ -15,7 +15,7 @@ public import SWBCore
 public import SWBMacro
 import Synchronization
 
-public class IbtoolCompilerSpec : GenericCompilerSpec, IbtoolCompilerSupport, @unchecked Sendable {
+public class IbtoolCompilerSpec: GenericCompilerSpec, IbtoolCompilerSupport, @unchecked Sendable {
     /// The info object collects information across the build phase so that an ibtool task doesn't try to produce a ~device output which is already being explicitly produced from another input.
     private final class BuildPhaseInfo: BuildPhaseInfoForToolSpec, Sendable {
         let allInputFilenames = SWBMutex<Set<String>>([])
@@ -26,7 +26,7 @@ public class IbtoolCompilerSpec : GenericCompilerSpec, IbtoolCompilerSupport, @u
             guard ftb.fileType.identifier == "file.xib" else {
                 return
             }
-            allInputFilenames.withLock{ $0.insert(ftb.absolutePath.basenameWithoutSuffix) }
+            allInputFilenames.withLock { $0.insert(ftb.absolutePath.basenameWithoutSuffix) }
         }
 
         func filterOutputFiles(_ outputs: [any PlannedNode], inputs: [Path]) -> [any PlannedNode] {
@@ -171,7 +171,8 @@ public final class IbtoolCompilerSpecStoryboard: IbtoolCompilerSpec, SpecIdentif
                 sandboxDirectory: cbc.scope.evaluate(BuiltinMacros.TEMP_SANDBOX_DIR),
                 extraSandboxSubdirectories: [],
                 developerDirectory: cbc.scope.evaluate(BuiltinMacros.DEVELOPER_DIR),
-                casOptions: casOptions)
+                casOptions: casOptions
+            )
         } else {
             return nil
         }
diff --git a/Sources/SWBApplePlatform/InterfaceBuilderCompilerOutputParser.swift b/Sources/SWBApplePlatform/InterfaceBuilderCompilerOutputParser.swift
index 89c34d05..6dbbc592 100644
--- a/Sources/SWBApplePlatform/InterfaceBuilderCompilerOutputParser.swift
+++ b/Sources/SWBApplePlatform/InterfaceBuilderCompilerOutputParser.swift
@@ -13,7 +13,7 @@
 public import SWBUtil
 public import SWBCore
 
-public final class InterfaceBuilderCompilerOutputParser : GenericOutputParser {
+public final class InterfaceBuilderCompilerOutputParser: GenericOutputParser {
 
     /// Regex to extract location information from a diagnostic prefix (capture group 0 is the name, 1 is the line number or the object identifier).
     static let locRegex = RegEx(patternLiteral: "^([^:]+):(?:([^:]+):)? .*$")
diff --git a/Sources/SWBApplePlatform/MetalCompiler.swift b/Sources/SWBApplePlatform/MetalCompiler.swift
index 6b5f1631..d4671ffb 100644
--- a/Sources/SWBApplePlatform/MetalCompiler.swift
+++ b/Sources/SWBApplePlatform/MetalCompiler.swift
@@ -40,13 +40,15 @@ struct MetalSourceFileIndexingInfo: SourceFileIndexingInfo {
 
     /// The indexing info is packaged and sent to the client in the property list format defined here.
     public var propertyListItem: PropertyListItem {
-        return .plDict([
-            "outputFilePath": .plString(outputFile.str),
-            "LanguageDialect": .plString("metal"),
-            "metalASTCommandArguments": .plArray(commandLine.map { .plString($0.asString) }),
-            "metalASTBuiltProductsDir": .plString(builtProductsDir.str),
-            "toolchains": .plArray(toolchains.map {.plString($0)})
-            ] as [String: PropertyListItem])
+        return .plDict(
+            [
+                "outputFilePath": .plString(outputFile.str),
+                "LanguageDialect": .plString("metal"),
+                "metalASTCommandArguments": .plArray(commandLine.map { .plString($0.asString) }),
+                "metalASTBuiltProductsDir": .plString(builtProductsDir.str),
+                "toolchains": .plArray(toolchains.map { .plString($0) }),
+            ] as [String: PropertyListItem]
+        )
     }
 }
 
@@ -64,11 +66,13 @@ fileprivate struct MetalIndexingPayload: Serializable, Encodable {
     let workingDir: Path
     let toolchains: [String]
 
-    init(sourceFileIndex: Int,
-         outputFileIndex: Int,
-         builtProductsDir: Path,
-         workingDir: Path,
-         toolchains: [String]) {
+    init(
+        sourceFileIndex: Int,
+        outputFileIndex: Int,
+        builtProductsDir: Path,
+        workingDir: Path,
+        toolchains: [String]
+    ) {
         self.sourceFileIndex = sourceFileIndex
         self.outputFileIndex = outputFileIndex
         self.builtProductsDir = builtProductsDir
@@ -126,7 +130,7 @@ fileprivate struct MetalTaskPayload: TaskPayload, Encodable {
     }
 }
 
-public final class MetalCompilerSpec : GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
+public final class MetalCompilerSpec: GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.compilers.metal"
 
     public override func constructTasks(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate) async {
@@ -156,7 +160,7 @@ public final class MetalCompilerSpec : GenericCompilerSpec, SpecIdentifierType,
                 outputFileIndex: outputFileIndex,
                 builtProductsDir: cbc.scope.evaluate(BuiltinMacros.BUILT_PRODUCTS_DIR),
                 workingDir: cbc.scope.evaluate(BuiltinMacros.PROJECT_DIR),
-                toolchains: cbc.producer.toolchains.map{ $0.identifier }
+                toolchains: cbc.producer.toolchains.map { $0.identifier }
             )
         }()
 
@@ -165,7 +169,8 @@ public final class MetalCompilerSpec : GenericCompilerSpec, SpecIdentifierType,
         // Create the task payload.
         let payload = MetalTaskPayload(
             serializedDiagnosticsPath: diagFilePath,
-            indexingPayload: indexingPayload)
+            indexingPayload: indexingPayload
+        )
 
         await super.constructTasks(cbc, delegate, specialArgs: [], payload: payload, commandLine: commandLine, additionalTaskOrderingOptions: [.compilationForIndexableSourceFile], toolLookup: nil)
     }
@@ -206,6 +211,6 @@ public final class MetalCompilerSpec : GenericCompilerSpec, SpecIdentifierType,
     override public var payloadType: (any TaskPayload.Type)? { return MetalTaskPayload.self }
 }
 
-public final class MetalLinkerSpec : GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
+public final class MetalLinkerSpec: GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.compilers.metal-linker"
 }
diff --git a/Sources/SWBApplePlatform/MiGCompiler.swift b/Sources/SWBApplePlatform/MiGCompiler.swift
index 7d36416d..4ecd963d 100644
--- a/Sources/SWBApplePlatform/MiGCompiler.swift
+++ b/Sources/SWBApplePlatform/MiGCompiler.swift
@@ -20,7 +20,7 @@ public struct DiscoveredMiGToolSpecInfo: DiscoveredCommandLineToolSpecInfo {
     public var toolVersion: Version?
 }
 
-public final class MigCompilerSpec : CompilerSpec, SpecIdentifierType, @unchecked Sendable {
+public final class MigCompilerSpec: CompilerSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.compilers.mig"
 
     required override init(_ parser: SpecParser, _ basedOnSpec: Spec?, isGeneric: Bool) {
diff --git a/Sources/SWBApplePlatform/OpenCLCompiler.swift b/Sources/SWBApplePlatform/OpenCLCompiler.swift
index 00e3913b..6163f651 100644
--- a/Sources/SWBApplePlatform/OpenCLCompiler.swift
+++ b/Sources/SWBApplePlatform/OpenCLCompiler.swift
@@ -14,7 +14,7 @@ import SWBUtil
 import SWBMacro
 import SWBCore
 
-final class OpenCLCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatibleCompilerCommandLineBuilder, @unchecked Sendable {
+final class OpenCLCompilerSpec: CompilerSpec, SpecIdentifierType, GCCCompatibleCompilerCommandLineBuilder, @unchecked Sendable {
     static let identifier = "com.apple.compilers.opencl"
 
     private let openCLOutputs: [MacroStringExpression]?
@@ -51,7 +51,7 @@ final class OpenCLCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
         let openclc = scope.evaluate(BuiltinMacros.OPENCLC)
         let compilerVersionFlag = "-cl-std=" + scope.evaluate(BuiltinMacros.OPENCL_COMPILER_VERSION)
 
-        let preprocessorDefinitionsFlags = scope.evaluate(BuiltinMacros.OPENCL_PREPROCESSOR_DEFINITIONS).map{ "-D" + $0 }
+        let preprocessorDefinitionsFlags = scope.evaluate(BuiltinMacros.OPENCL_PREPROCESSOR_DEFINITIONS).map { "-D" + $0 }
         let headerSearchPaths = GCCCompatibleCompilerSpecSupport.headerSearchPathArguments(cbc.producer, scope, usesModules: scope.evaluate(BuiltinMacros.CLANG_ENABLE_MODULES))
         let headerSearchPathFlags = headerSearchPaths.searchPathArguments(for: self, scope: scope)
         let frameworkSearchPaths = GCCCompatibleCompilerSpecSupport.frameworkSearchPathArguments(cbc.producer, scope)
@@ -71,7 +71,7 @@ final class OpenCLCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
 
             var commandLine = [await resolveExecutablePath(cbc, Path(openclc), delegate: delegate).str]
             commandLine += ["-x", "cl", compilerVersionFlag]
-            optimizationLevelFlag.map{ commandLine.append($0) }
+            optimizationLevelFlag.map { commandLine.append($0) }
             commandLine += preprocessorDefinitionsFlags
             commandLine += headerSearchPathFlags
             commandLine += frameworkSearchPathFlags
@@ -114,7 +114,6 @@ final class OpenCLCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
             }
             commandLine.append(scope.evaluate(BuiltinMacros.OPENCL_AUTO_VECTORIZE_ENABLE) ? "-cl-auto-vectorize-enable" : "-cl-auto-vectorize-disable")
 
-
             let bundleIdentifier = scope.evaluate(BuiltinMacros.PRODUCT_BUNDLE_IDENTIFIER)
             if !bundleIdentifier.isEmpty {
                 commandLine += ["-gcl-bc-bundle-identifier", bundleIdentifier]
diff --git a/Sources/SWBApplePlatform/Plugin.swift b/Sources/SWBApplePlatform/Plugin.swift
index 5606fb08..1ab6b5eb 100644
--- a/Sources/SWBApplePlatform/Plugin.swift
+++ b/Sources/SWBApplePlatform/Plugin.swift
@@ -46,9 +46,11 @@ struct TaskProducersExtension: TaskProducerExtension {
     }
 
     var unorderedPostSetupTaskProducers: [any TaskProducerFactory] {
-        [StubBinaryTaskProducerFactory(),
-         AppExtensionInfoPlistGeneratorTaskProducerFactory(),
-         ExtensionPointExtractorTaskProducerFactory()]
+        [
+            StubBinaryTaskProducerFactory(),
+            AppExtensionInfoPlistGeneratorTaskProducerFactory(),
+            ExtensionPointExtractorTaskProducerFactory(),
+        ]
     }
 
     var unorderedPostBuildPhasesTaskProducers: [any TaskProducerFactory] {
@@ -99,7 +101,7 @@ struct StubBinaryTaskProducerFactory: TaskProducerFactory, GlobalTaskProducerFac
     }
 }
 
-struct AppIntentsMetadataTaskProducerFactory : TaskProducerFactory {
+struct AppIntentsMetadataTaskProducerFactory: TaskProducerFactory {
     var name: String {
         "AppIntentsMetadataTaskProducer"
     }
@@ -154,7 +156,7 @@ struct ApplePlatformSpecsExtension: SpecificationsExtension {
         findResourceBundle(nameWhenInstalledInToolchain: "SwiftBuild_SWBApplePlatform", resourceSearchPaths: resourceSearchPaths, defaultBundle: Bundle.module)
     }
 
-    func specificationDomains() -> [String : [String]] {
+    func specificationDomains() -> [String: [String]] {
         var mappings = [
             "macosx": ["darwin"],
             "driverkit": ["darwin"],
@@ -246,29 +248,29 @@ struct ApplePlatformInfoExtension: PlatformInfoExtension {
 }
 
 struct AppleSettingsBuilderExtension: SettingsBuilderExtension {
-    func addSDKSettings(_ sdk: SDK, _ variant: SDKVariant?, _ sparseSDKs: [SDK]) throws -> [String : String] {
+    func addSDKSettings(_ sdk: SDK, _ variant: SDKVariant?, _ sparseSDKs: [SDK]) throws -> [String: String] {
         guard variant?.llvmTargetTripleVendor == "apple" else {
             return [:]
         }
 
         return [
-            "PER_ARCH_MODULE_FILE_DIR": "$(PER_ARCH_OBJECT_FILE_DIR)",
+            "PER_ARCH_MODULE_FILE_DIR": "$(PER_ARCH_OBJECT_FILE_DIR)"
         ]
     }
 
-    func addBuiltinDefaults(fromEnvironment environment: [String : String], parameters: BuildParameters) throws -> [String : String] {
+    func addBuiltinDefaults(fromEnvironment environment: [String: String], parameters: BuildParameters) throws -> [String: String] {
         let appIntentsProtocols = "AppIntent EntityQuery AppEntity TransientEntity AppEnum AppShortcutProviding AppShortcutsProvider AnyResolverProviding AppIntentsPackage DynamicOptionsProvider _IntentValueRepresentable _AssistantIntentsProvider _GenerativeFunctionExtractable IntentValueQuery Resolver"
         let extensionKitProtocols = "AppExtension ExtensionPointDefining"
         let constValueProtocols = [appIntentsProtocols, extensionKitProtocols].joined(separator: " ")
-        return ["SWIFT_EMIT_CONST_VALUE_PROTOCOLS" : constValueProtocols]
+        return ["SWIFT_EMIT_CONST_VALUE_PROTOCOLS": constValueProtocols]
     }
-    func addOverrides(fromEnvironment: [String : String], parameters: BuildParameters) throws -> [String : String] { [:] }
-    func addProductTypeDefaults(productType: ProductTypeSpec) -> [String : String] { [:] }
-    func addSDKOverridingSettings(_ sdk: SDK, _ variant: SDKVariant?, _ sparseSDKs: [SDK], specLookupContext: any SWBCore.SpecLookupContext, environment: [String: String]) throws -> [String : String] { [:] }
-    func addPlatformSDKSettings(_ platform: SWBCore.Platform?, _ sdk: SDK, _ sdkVariant: SDKVariant?) -> [String : String] { [:] }
+    func addOverrides(fromEnvironment: [String: String], parameters: BuildParameters) throws -> [String: String] { [:] }
+    func addProductTypeDefaults(productType: ProductTypeSpec) -> [String: String] { [:] }
+    func addSDKOverridingSettings(_ sdk: SDK, _ variant: SDKVariant?, _ sparseSDKs: [SDK], specLookupContext: any SWBCore.SpecLookupContext, environment: [String: String]) throws -> [String: String] { [:] }
+    func addPlatformSDKSettings(_ platform: SWBCore.Platform?, _ sdk: SDK, _ sdkVariant: SDKVariant?) -> [String: String] { [:] }
     func xcconfigOverrideData(fromParameters: BuildParameters) -> ByteString { ByteString() }
     func getTargetTestingSwiftPluginFlags(_ scope: MacroEvaluationScope, toolchainRegistry: ToolchainRegistry, sdkRegistry: SDKRegistry, activeRunDestination: RunDestinationInfo?, project: SWBCore.Project?) -> [String] { [] }
     func shouldSkipPopulatingValidArchs(platform: SWBCore.Platform, sdk: SDK?) -> Bool { false }
     func shouldDisableXOJITPreviews(platformName: String, sdk: SDK?) -> Bool { false }
-    func overridingBuildSettings(_: MacroEvaluationScope, platform: SWBCore.Platform?, productType: ProductTypeSpec) -> [String : String] { [:] }
+    func overridingBuildSettings(_: MacroEvaluationScope, platform: SWBCore.Platform?, productType: ProductTypeSpec) -> [String: String] { [:] }
 }
diff --git a/Sources/SWBApplePlatform/RealityAssetsCompilerSpec.swift b/Sources/SWBApplePlatform/RealityAssetsCompilerSpec.swift
index e41cd491..d7039ffa 100644
--- a/Sources/SWBApplePlatform/RealityAssetsCompilerSpec.swift
+++ b/Sources/SWBApplePlatform/RealityAssetsCompilerSpec.swift
@@ -87,7 +87,7 @@ package final class RealityAssetsCompilerSpec: GenericCompilerSpec, SpecIdentifi
         let baseCommandLine = await commandLineFromTemplate(cbc, delegate, optionContext: discoveredCommandLineToolSpecInfo(cbc.producer, cbc.scope, delegate)).map(\.asString)
 
         // commandline from template is not usable...create our own for create-schema
-        var commandLine: [String] = [baseCommandLine[0]] // get executable from template
+        var commandLine: [String] = [baseCommandLine[0]]  // get executable from template
         commandLine.append("create-schema")
         commandLine.append("--output-schema")
         commandLine.append(outputFile)
@@ -100,16 +100,18 @@ package final class RealityAssetsCompilerSpec: GenericCompilerSpec, SpecIdentifi
         let inputs = [targetWithDependenciesPath] + moduleSwiftFilesPaths + dependencySwiftFilesPaths
 
         let ruleInfo = ["RealityAssetsSchemaGen", outputFile]
-        delegate.createTask(type: self,
-                            ruleInfo: ruleInfo,
-                            commandLine: commandLine,
-                            environment: environmentBindings(cbc, delegate),
-                            workingDirectory: cbc.producer.defaultWorkingDirectory,
-                            inputs: inputs,
-                            outputs: [outputPath],
-                            execDescription: "Generate Reality Asset USD schema",
-                            preparesForIndexing: true,
-                            enableSandboxing: true)
+        delegate.createTask(
+            type: self,
+            ruleInfo: ruleInfo,
+            commandLine: commandLine,
+            environment: environmentBindings(cbc, delegate),
+            workingDirectory: cbc.producer.defaultWorkingDirectory,
+            inputs: inputs,
+            outputs: [outputPath],
+            execDescription: "Generate Reality Asset USD schema",
+            preparesForIndexing: true,
+            enableSandboxing: true
+        )
     }
 
     private func constructRealityAssetCompilerTasks(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate) async {
@@ -193,26 +195,27 @@ package final class RealityAssetsCompilerSpec: GenericCompilerSpec, SpecIdentifi
             cachingEnabled = false
         }
 
-
         let ruleInfo = ["RealityAssetsCompile", cbc.output.str]
-        delegate.createTask(type: self,
-                            dependencyData: nil,
-                            payload: nil,
-                            ruleInfo: ruleInfo,
-                            additionalSignatureData: "",
-                            commandLine: commandLine,
-                            additionalOutput: [],
-                            environment: environmentBindings(cbc, delegate),
-                            workingDirectory: cbc.producer.defaultWorkingDirectory,
-                            inputs: inputs,
-                            outputs: outputs,
-                            mustPrecede: [],
-                            action: action,
-                            execDescription: "Compile Reality Asset \(rkAssetsPath.basename)",
-                            preparesForIndexing: true,
-                            enableSandboxing: !cachingEnabled,
-                            llbuildControlDisabled: false,
-                            additionalTaskOrderingOptions: [])
+        delegate.createTask(
+            type: self,
+            dependencyData: nil,
+            payload: nil,
+            ruleInfo: ruleInfo,
+            additionalSignatureData: "",
+            commandLine: commandLine,
+            additionalOutput: [],
+            environment: environmentBindings(cbc, delegate),
+            workingDirectory: cbc.producer.defaultWorkingDirectory,
+            inputs: inputs,
+            outputs: outputs,
+            mustPrecede: [],
+            action: action,
+            execDescription: "Compile Reality Asset \(rkAssetsPath.basename)",
+            preparesForIndexing: true,
+            enableSandboxing: !cachingEnabled,
+            llbuildControlDisabled: false,
+            additionalTaskOrderingOptions: []
+        )
     }
 
     public func constructTasks(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate, moduleWithDependencies: ModuleWithDependencies) async {
diff --git a/Sources/SWBApplePlatform/RealityAssetsTaskProducer.swift b/Sources/SWBApplePlatform/RealityAssetsTaskProducer.swift
index 230f330f..6b653bf7 100644
--- a/Sources/SWBApplePlatform/RealityAssetsTaskProducer.swift
+++ b/Sources/SWBApplePlatform/RealityAssetsTaskProducer.swift
@@ -50,8 +50,9 @@ extension BuildPhaseTarget {
         let buildFilesProcessingContext = BuildFilesProcessingContext(scope)
         return buildFiles.compactMap { buildFile in
             guard let resolvedBuildFileInfo = try? context.resolveBuildFileReference(buildFile),
-                  !buildFilesProcessingContext.isExcluded(resolvedBuildFileInfo.absolutePath, filters: buildFile.platformFilters),
-                  resolvedBuildFileInfo.fileType.conformsTo(fileType) else {
+                !buildFilesProcessingContext.isExcluded(resolvedBuildFileInfo.absolutePath, filters: buildFile.platformFilters),
+                resolvedBuildFileInfo.fileType.conformsTo(fileType)
+            else {
                 return nil
             }
 
@@ -127,8 +128,9 @@ final class RealityAssetsTaskProducer: PhasedTaskProducer, TaskProducer {
 
             let regularConfiguredTargetSettings = context.globalProductPlan.getTargetSettings(regularConfiguredTarget)
             guard let project = regularConfiguredTargetSettings.project,
-               project.isPackage,
-               resourcePackageProject == project else {
+                project.isPackage,
+                resourcePackageProject == project
+            else {
                 return false
             }
 
@@ -185,7 +187,8 @@ final class RealityAssetsTaskProducer: PhasedTaskProducer, TaskProducer {
         // regularStandardTarget will be non-nil if this target is a resource build with .rkassets,
         // and we found the "regular" sources target with this configuredTarget as a dependency
         if let regularConfiguredTarget = findRegularPackageTarget(for: configuredTarget),
-           let regularStandardTarget = regularConfiguredTarget.target as? StandardTarget {
+            let regularStandardTarget = regularConfiguredTarget.target as? StandardTarget
+        {
 
             // regularStandardTarget has sources build phase with .swift files that need to be
             // preprocessed into a .usda schema that will be used to compile the .rkassets
@@ -212,8 +215,7 @@ final class RealityAssetsTaskProducer: PhasedTaskProducer, TaskProducer {
                 if !context.fs.exists(derivedDataPath) {
                     do {
                         try context.fs.createDirectory(derivedDataPath, recursive: true)
-                    }
-                    catch let error as NSError {
+                    } catch let error as NSError {
                         context.error("Could not create directory for '\(moduleWithDependenciesFile)', \(error.localizedDescription)")
                         return []
                     }
@@ -222,8 +224,7 @@ final class RealityAssetsTaskProducer: PhasedTaskProducer, TaskProducer {
 
                 do {
                     try moduleWithDependencies.write(moduleWithDependenciesPath, fsProxy: context.fs)
-                }
-                catch let error as NSError {
+                } catch let error as NSError {
                     if error.domain == "org.swift.swift-build" {
                         context.error(error.localizedDescription)
                     } else {
diff --git a/Sources/SWBApplePlatform/ReferenceObjectCompiler.swift b/Sources/SWBApplePlatform/ReferenceObjectCompiler.swift
index 164d9ba7..4a1f3eae 100644
--- a/Sources/SWBApplePlatform/ReferenceObjectCompiler.swift
+++ b/Sources/SWBApplePlatform/ReferenceObjectCompiler.swift
@@ -19,7 +19,7 @@ public struct DiscoveredReferenceObjectToolSpecInfo: DiscoveredCommandLineToolSp
     public var toolVersion: Version?
 }
 
-public final class ReferenceObjectCompilerSpec : GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
+public final class ReferenceObjectCompilerSpec: GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.compilers.referenceobject"
 
     public override var enableSandboxing: Bool {
diff --git a/Sources/SWBApplePlatform/ResMergerLinkerSpec.swift b/Sources/SWBApplePlatform/ResMergerLinkerSpec.swift
index 931bc66c..3dbc7762 100644
--- a/Sources/SWBApplePlatform/ResMergerLinkerSpec.swift
+++ b/Sources/SWBApplePlatform/ResMergerLinkerSpec.swift
@@ -14,7 +14,7 @@ import SWBUtil
 public import SWBCore
 import SWBMacro
 
-public final class ResMergerLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchecked Sendable {
+public final class ResMergerLinkerSpec: GenericLinkerSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.pbx.linkers.resmerger"
 
     public override func constructTasks(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate) async {
@@ -35,8 +35,7 @@ public final class ResMergerLinkerSpec : GenericLinkerSpec, SpecIdentifierType,
             let resmergerSourcesFork = cbc.scope.evaluate(BuiltinMacros.RESMERGER_SOURCES_FORK)
             if resmergerSourcesFork == "data" {
                 commandLine += ["-srcIs", "DF"]
-            }
-            else if resmergerSourcesFork == "resource" {
+            } else if resmergerSourcesFork == "resource" {
                 commandLine += ["-srcIs", "RSRC"]
             }
 
@@ -51,7 +50,7 @@ public final class ResMergerLinkerSpec : GenericLinkerSpec, SpecIdentifierType,
                 default: return nil
                 }
             }
-            delegate.createTask(type: self, ruleInfo: ["ResMergerCollector", tmpOutputPath.str], commandLine: commandLine, environment: environment, workingDirectory: cbc.producer.defaultWorkingDirectory, inputs: cbc.inputs.map({ $0.absolutePath }), outputs: [tmpOutputPath], action: nil, execDescription:  execDescription, enableSandboxing: enableSandboxing)
+            delegate.createTask(type: self, ruleInfo: ["ResMergerCollector", tmpOutputPath.str], commandLine: commandLine, environment: environment, workingDirectory: cbc.producer.defaultWorkingDirectory, inputs: cbc.inputs.map({ $0.absolutePath }), outputs: [tmpOutputPath], action: nil, execDescription: execDescription, enableSandboxing: enableSandboxing)
         }
 
         // Create the task for the product merge.
@@ -76,8 +75,7 @@ public final class ResMergerLinkerSpec : GenericLinkerSpec, SpecIdentifierType,
             let resmergerSourcesFork = cbc.scope.evaluate(BuiltinMacros.RESMERGER_SOURCES_FORK)
             if resmergerSourcesFork == "data" {
                 commandLine += ["-srcIs", "DF"]
-            }
-            else if resmergerSourcesFork == "resource" {
+            } else if resmergerSourcesFork == "resource" {
                 commandLine += ["-srcIs", "RSRC"]
             }
 
diff --git a/Sources/SWBApplePlatform/SceneKitToolSpec.swift b/Sources/SWBApplePlatform/SceneKitToolSpec.swift
index d80561be..879c321b 100644
--- a/Sources/SWBApplePlatform/SceneKitToolSpec.swift
+++ b/Sources/SWBApplePlatform/SceneKitToolSpec.swift
@@ -13,7 +13,7 @@
 public import SWBCore
 import SWBMacro
 
-public final class SceneKitToolSpec : GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
+public final class SceneKitToolSpec: GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.compilers.scntool"
 
     /// Override construction to handle the custom RESOURCE_FLAG value.
diff --git a/Sources/SWBApplePlatform/StoryboardLinker.swift b/Sources/SWBApplePlatform/StoryboardLinker.swift
index d8ec7a84..5de4433d 100644
--- a/Sources/SWBApplePlatform/StoryboardLinker.swift
+++ b/Sources/SWBApplePlatform/StoryboardLinker.swift
@@ -14,7 +14,7 @@ public import SWBUtil
 public import SWBCore
 public import SWBMacro
 
-public final class IBStoryboardLinkerCompilerSpec : GenericCompilerSpec, SpecIdentifierType, IbtoolCompilerSupport, @unchecked Sendable {
+public final class IBStoryboardLinkerCompilerSpec: GenericCompilerSpec, SpecIdentifierType, IbtoolCompilerSupport, @unchecked Sendable {
     public static let identifier = "com.apple.xcode.tools.ibtool.storyboard.linker"
 
     /// Override to compute the special arguments.
@@ -41,10 +41,9 @@ public final class IBStoryboardLinkerCompilerSpec : GenericCompilerSpec, SpecIde
             outputs = [
                 "Interface.plist",
                 "Interface-glance.plist",
-                "Interface-notification.plist"
+                "Interface-notification.plist",
             ].map { (resourcesDir.join($0), false) }
-        }
-        else {
+        } else {
             // Otherwise compute default values based on the inputs.
             for input in cbc.inputs.map({ $0.absolutePath }) {
                 let subpath = input.relativeSubpath(from: tmpResourcesDir) ?? input.basename
diff --git a/Sources/SWBApplePlatform/StringCatalogCompilerOutputParser.swift b/Sources/SWBApplePlatform/StringCatalogCompilerOutputParser.swift
index 74605ed4..c7b599a4 100644
--- a/Sources/SWBApplePlatform/StringCatalogCompilerOutputParser.swift
+++ b/Sources/SWBApplePlatform/StringCatalogCompilerOutputParser.swift
@@ -13,7 +13,7 @@
 public import SWBUtil
 public import SWBCore
 
-public final class StringCatalogCompilerOutputParser : GenericOutputParser {
+public final class StringCatalogCompilerOutputParser: GenericOutputParser {
     // In String Catalogs, the only unique identifier we really have for an "object" is the string key itself, and that could be a really long piece of text.
     // Thus, xcstringstool outputs its diagnostics like this:
     // /Users/mattseaman/Developer/RocketShip/RocketShip/Localizable.xcstrings: error: Referencing undefined substitution 'arg3' (en: Next meeting at %lld %lld)
diff --git a/Sources/SWBApplePlatform/StubBinaryTaskProducer.swift b/Sources/SWBApplePlatform/StubBinaryTaskProducer.swift
index c20a6644..c41b3044 100644
--- a/Sources/SWBApplePlatform/StubBinaryTaskProducer.swift
+++ b/Sources/SWBApplePlatform/StubBinaryTaskProducer.swift
@@ -81,10 +81,10 @@ extension TaskProducerContext {
         let stubBinaries = [
             StubBinaryTaskProducer.watchKitStubBinary(scope, productType: productType),
             StubBinaryTaskProducer.messagesAppStubBinary(scope),
-            StubBinaryTaskProducer.messagesAppExtensionStubBinary(scope)
+            StubBinaryTaskProducer.messagesAppExtensionStubBinary(scope),
         ]
 
-        return stubBinaries.filter{ !$0.sourcePath.isEmpty }.only
+        return stubBinaries.filter { !$0.sourcePath.isEmpty }.only
     }
 }
 
@@ -94,8 +94,10 @@ final class StubBinaryTaskProducer: PhasedTaskProducer, TaskProducer {
 
         let (bundleSidecarPath, archiveSidecarPath): (Path?, Path?) = {
             if productType?.identifier == "com.apple.product-type.application.watchapp2" {
-                return (scope.evaluate(BuiltinMacros.TARGET_BUILD_DIR).join(scope.evaluate(BuiltinMacros.FULL_PRODUCT_NAME)).join("_WatchKitStub/WK"),
-                        Path(scope.evaluate(BuiltinMacros.WATCHKIT_2_SUPPORT_FOLDER_PATH)))
+                return (
+                    scope.evaluate(BuiltinMacros.TARGET_BUILD_DIR).join(scope.evaluate(BuiltinMacros.FULL_PRODUCT_NAME)).join("_WatchKitStub/WK"),
+                    Path(scope.evaluate(BuiltinMacros.WATCHKIT_2_SUPPORT_FOLDER_PATH))
+                )
             }
             return (nil, nil)
         }()
@@ -154,16 +156,18 @@ final class GlobalStubBinaryTaskProducer: StandardTaskProducer, TaskProducer {
             let thinArchs: Bool
         }
 
-        let stubBinaries: Set<StubBinaryWithArchs> = Set(targetContexts.compactMap { targetContext in
-            let scope = targetContext.settings.globalScope
+        let stubBinaries: Set<StubBinaryWithArchs> = Set(
+            targetContexts.compactMap { targetContext in
+                let scope = targetContext.settings.globalScope
 
-            // The stub is copied only when the "build" component is present.
-            guard scope.evaluate(BuiltinMacros.BUILD_COMPONENTS).contains("build") else { return nil }
+                // The stub is copied only when the "build" component is present.
+                guard scope.evaluate(BuiltinMacros.BUILD_COMPONENTS).contains("build") else { return nil }
 
-            guard var tmp = targetContext.stubBinary else { return nil }
-            tmp.bundleSidecarPath = nil
-            return StubBinaryWithArchs(stubBinary: tmp, archs: Set(scope.evaluate(BuiltinMacros.ARCHS)), thinArchs: scope.evaluate(BuiltinMacros.THIN_PRODUCT_STUB_BINARY))
-        })
+                guard var tmp = targetContext.stubBinary else { return nil }
+                tmp.bundleSidecarPath = nil
+                return StubBinaryWithArchs(stubBinary: tmp, archs: Set(scope.evaluate(BuiltinMacros.ARCHS)), thinArchs: scope.evaluate(BuiltinMacros.THIN_PRODUCT_STUB_BINARY))
+            }
+        )
 
         var tasks = [any PlannedTask]()
         await appendGeneratedTasks(&tasks) { delegate in
diff --git a/Sources/SWBApplePlatform/XCStringsCompiler.swift b/Sources/SWBApplePlatform/XCStringsCompiler.swift
index fd7b0d3d..25e47cca 100644
--- a/Sources/SWBApplePlatform/XCStringsCompiler.swift
+++ b/Sources/SWBApplePlatform/XCStringsCompiler.swift
@@ -120,7 +120,7 @@ public final class XCStringsCompilerSpec: GenericCompilerSpec, SpecIdentifierTyp
             self.effectivePlatformName = effectivePlatformName
         }
 
-        func serialize<T>(to serializer: T) where T : SWBUtil.Serializer {
+        func serialize<T>(to serializer: T) where T: SWBUtil.Serializer {
             serializer.serializeAggregate(1) {
                 serializer.serialize(effectivePlatformName)
             }
@@ -296,7 +296,8 @@ public final class XCStringsCompilerSpec: GenericCompilerSpec, SpecIdentifierTyp
         var infos = [TaskGenerateLocalizationInfoOutput(compilableXCStringsPaths: task.inputPaths)]
 
         if let payload = task.payload as? SymbolGenPayload,
-           let xcstringsPath = task.inputPaths.only {
+            let xcstringsPath = task.inputPaths.only
+        {
             let generatedSourceFiles = task.outputPaths.filter { $0.fileExtension == "swift" }
             var info = TaskGenerateLocalizationInfoOutput()
             info.effectivePlatformName = payload.effectivePlatformName
diff --git a/Sources/SWBApplePlatform/XCStringsInputFileGroupingStrategy.swift b/Sources/SWBApplePlatform/XCStringsInputFileGroupingStrategy.swift
index 8532692d..b37f2706 100644
--- a/Sources/SWBApplePlatform/XCStringsInputFileGroupingStrategy.swift
+++ b/Sources/SWBApplePlatform/XCStringsInputFileGroupingStrategy.swift
@@ -30,7 +30,7 @@ import SWBUtil
         return "tool:\(toolName) name:\(groupable.absolutePath.basenameWithoutSuffix)"
     }
 
-    public func groupAdditionalFiles<S>(to target: FileToBuildGroup, from source: S, context: any InputFileGroupingStrategyContext) -> [FileToBuildGroup] where S : Sequence, S.Element == FileToBuildGroup {
+    public func groupAdditionalFiles<S>(to target: FileToBuildGroup, from source: S, context: any InputFileGroupingStrategyContext) -> [FileToBuildGroup] where S: Sequence, S.Element == FileToBuildGroup {
         // Additionally include .strings and .stringsdict files with the same basename.
 
         guard let xcstringsBasenameWithoutSuffix = Set(target.files.map({ $0.absolutePath.basenameWithoutSuffix })).only else {
diff --git a/Sources/SWBBuildService/BuildDependencyInfo.swift b/Sources/SWBBuildService/BuildDependencyInfo.swift
index 07d3509e..9091adba 100644
--- a/Sources/SWBBuildService/BuildDependencyInfo.swift
+++ b/Sources/SWBBuildService/BuildDependencyInfo.swift
@@ -19,7 +19,6 @@ import SWBMacro
 
 // MARK: Creating a BuildDependencyInfo from a BuildRequest
 
-
 extension BuildDependencyInfo {
 
     package init(workspaceContext: WorkspaceContext, buildRequest: BuildRequest, buildRequestContext: BuildRequestContext, operation: BuildDependencyInfoOperation) async throws {
@@ -59,8 +58,7 @@ extension BuildDependencyInfo {
             // I'm not sure how we'd actually encounter this, unless somehow target specialization went awry or we encounter some unforeseen scenario.
             if seenTargets.contains(target.target) {
                 errors.append("Found multiple identical targets named '\(target.target.targetName)' in project '\(target.target.projectName ?? "nil")' for platform '\(target.target.platformName ?? "nil")")
-            }
-            else {
+            } else {
                 seenTargets.insert(target.target)
             }
         }
@@ -113,8 +111,7 @@ extension BuildDependencyInfo {
                 let resolvedBuildFile: (reference: Reference, absolutePath: Path, fileType: FileTypeSpec)
                 do {
                     resolvedBuildFile = try buildFileResolver.resolveBuildFileReference(buildFile)
-                }
-                catch {
+                } catch {
                     // FIXME: Figure out how to report an issue in as an error in the data structures.
                     continue
                 }
@@ -132,14 +129,11 @@ extension BuildDependencyInfo {
                 if resolvedBuildFile.fileType.conformsTo(identifier: "wrapper.framework") {
                     // TODO: static frameworks?
                     await inputs.addInput(TargetDependencyInfo.Input(inputType: .framework, name: .name(filename), linkType: .searchPath, libraryType: .dynamic))
-                }
-                else if resolvedBuildFile.fileType.conformsTo(identifier: "compiled.mach-o.dylib") {
+                } else if resolvedBuildFile.fileType.conformsTo(identifier: "compiled.mach-o.dylib") {
                     await inputs.addInput(TargetDependencyInfo.Input(inputType: .library, name: .name(filename), linkType: .searchPath, libraryType: .dynamic))
-                }
-                else if resolvedBuildFile.fileType.conformsTo(identifier: "sourcecode.text-based-dylib-definition") {
+                } else if resolvedBuildFile.fileType.conformsTo(identifier: "sourcecode.text-based-dylib-definition") {
                     await inputs.addInput(TargetDependencyInfo.Input(inputType: .library, name: .name(filename), linkType: .searchPath, libraryType: .dynamic))
-                }
-                else if resolvedBuildFile.fileType.conformsTo(identifier: "archive.ar") {
+                } else if resolvedBuildFile.fileType.conformsTo(identifier: "archive.ar") {
                     await inputs.addInput(TargetDependencyInfo.Input(inputType: .library, name: .name(filename), linkType: .searchPath, libraryType: .static))
                 }
                 // FIXME: Handle wrapper.xcframework
@@ -192,7 +186,7 @@ extension BuildDependencyInfo {
 
 /// Special `CoreClientDelegate`-conforming struct because our use of `GlobalProductPlan` here should never be running external tools.
 fileprivate struct UnsupportedCoreClientDelegate: CoreClientDelegate {
-    func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+    func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
         throw StubError.error("Running external tools is not supported when computing build dependency target info.")
     }
 }
@@ -215,7 +209,7 @@ fileprivate final class BuildDependencyInfoGlobalProductPlanDelegate: GlobalProd
 
     let cancelled = false
 
-    func updateProgress(statusMessage: String, showInLog: Bool) { }
+    func updateProgress(statusMessage: String, showInLog: Bool) {}
 
     // CoreClientTargetDiagnosticProducingDelegate conformance
 
@@ -237,11 +231,11 @@ fileprivate final class BuildDependencyInfoGlobalProductPlanDelegate: GlobalProd
         .init(rawValue: -1)
     }
 
-    func endActivity(id: ActivityID, signature: ByteString, status: BuildOperationTaskEnded.Status) { }
+    func endActivity(id: ActivityID, signature: ByteString, status: BuildOperationTaskEnded.Status) {}
 
-    func emit(data: [UInt8], for activity: SWBCore.ActivityID, signature: SWBUtil.ByteString) { }
+    func emit(data: [UInt8], for activity: SWBCore.ActivityID, signature: SWBUtil.ByteString) {}
 
-    func emit(diagnostic: SWBUtil.Diagnostic, for activity: SWBCore.ActivityID, signature: SWBUtil.ByteString) { }
+    func emit(diagnostic: SWBUtil.Diagnostic, for activity: SWBCore.ActivityID, signature: SWBUtil.ByteString) {}
 
     let hadErrors = false
 
diff --git a/Sources/SWBBuildService/BuildDescriptionMessages.swift b/Sources/SWBBuildService/BuildDescriptionMessages.swift
index 6f89b553..174b4f03 100644
--- a/Sources/SWBBuildService/BuildDescriptionMessages.swift
+++ b/Sources/SWBBuildService/BuildDescriptionMessages.swift
@@ -57,7 +57,9 @@ fileprivate extension Request {
                 buildRequestContext: buildRequestContext,
                 workspaceContext: workspaceContext,
                 retain: false
-            ), clientDelegate: clientDelegate, constructionDelegate: operation
+            ),
+            clientDelegate: clientDelegate,
+            constructionDelegate: operation
         )?.buildDescription
 
         guard let buildDescription else {
@@ -167,11 +169,14 @@ struct BuildDescriptionSelectConfiguredTargetsForIndexMsg: MessageHandler {
 
         let uniqueTargets = OrderedSet(message.targets.map(\.rawValue))
 
-        let targets: Dictionary<String, ConfiguredTarget?> = Dictionary(buildDescription.allConfiguredTargets.lazy.filter { uniqueTargets.contains($0.target.guid) }.map {
-            ($0.target.guid, $0)
-        }, uniquingKeysWith: {
-            buildRequestContext.selectConfiguredTargetForIndex($0, $1, hasEnabledIndexBuildArena: buildRequest.enableIndexBuildArena, runDestination: message.request.parameters.activeRunDestination)
-        })
+        let targets: Dictionary<String, ConfiguredTarget?> = Dictionary(
+            buildDescription.allConfiguredTargets.lazy.filter { uniqueTargets.contains($0.target.guid) }.map {
+                ($0.target.guid, $0)
+            },
+            uniquingKeysWith: {
+                buildRequestContext.selectConfiguredTargetForIndex($0, $1, hasEnabledIndexBuildArena: buildRequest.enableIndexBuildArena, runDestination: message.request.parameters.activeRunDestination)
+            }
+        )
 
         let configuredTargets = try uniqueTargets.map { target in
             guard let configuredTarget = targets[target] else {
diff --git a/Sources/SWBBuildService/BuildOperationMessages.swift b/Sources/SWBBuildService/BuildOperationMessages.swift
index acc6c5da..dd0908be 100644
--- a/Sources/SWBBuildService/BuildOperationMessages.swift
+++ b/Sources/SWBBuildService/BuildOperationMessages.swift
@@ -87,7 +87,7 @@ final class ActiveBuild: ActiveBuildOperation {
 
         func beginActivity(ruleInfo: String, executionDescription: String, signature: ByteString, target: ConfiguredTarget?, parentActivity: ActivityID?) -> ActivityID {
             let activity = ActivityID(rawValue: activeBuild.activeTasks.takeID())
-            assert(target == nil) // not supported yet
+            assert(target == nil)  // not supported yet
             activeBuild.request.send(BuildOperationTaskStarted(id: activity.rawValue, targetID: nil, parentID: parentActivity?.rawValue, info: .init(taskName: executionDescription, signature: .activitySignature(signature), ruleInfo: ruleInfo, executionDescription: executionDescription, commandLineDisplayString: nil, interestingPath: nil, serializedDiagnosticsPaths: [])))
             return activity
         }
@@ -484,7 +484,8 @@ final class ActiveBuild: ActiveBuildOperation {
             assert(state == .created)
             state = .started
 
-            if case .cleanBuildFolder(_) = buildRequest.buildCommand {} else {
+            if case .cleanBuildFolder(_) = buildRequest.buildCommand {
+            } else {
                 // Once we have reached this point, we are done reporting preparation progress.
                 let statusMessage = workspaceContext.userPreferences.activityTextShorteningLevel == .full ? "Starting" : "Starting build"
                 preparationProgressDelegate!.updateProgress(statusMessage: statusMessage, showInLog: false)
@@ -540,7 +541,6 @@ final class ActiveBuild: ActiveBuildOperation {
     }
 }
 
-
 // FIXME: This needs to be factored out as a reusable ObjectIDMapping soon (it's not actually set since it doesn't implement the actual Set protocol).
 private final class ObjectIDMapping<T> {
     private struct State {
@@ -549,7 +549,7 @@ private final class ObjectIDMapping<T> {
         var objsToIDs: [Ref<T>: Int] = [:]
 
         mutating func takeID() -> Int {
-            defer{ nextID += 1 }
+            defer { nextID += 1 }
             return nextID
         }
     }
@@ -600,16 +600,21 @@ final class ActiveBuildDiagnosticsHandler: TargetDiagnosticProducingDelegate {
 
     func diagnosticsEngine(for target: ConfiguredTarget?) -> DiagnosticProducingDelegateProtocolPrivate<DiagnosticsEngine> {
         return targetDiagnosticsEngines.withLock { targetDiagnosticsEngines in
-            .init(targetDiagnosticsEngines.getOrInsert(target, {
-                let engine = DiagnosticsEngine()
-                if target == nil {
-                    let request = self.request
-                    engine.addHandler { diag in
-                        sendDiagnosticMessage(request, diag, .global)
+            .init(
+                targetDiagnosticsEngines.getOrInsert(
+                    target,
+                    {
+                        let engine = DiagnosticsEngine()
+                        if target == nil {
+                            let request = self.request
+                            engine.addHandler { diag in
+                                sendDiagnosticMessage(request, diag, .global)
+                            }
+                        }
+                        return engine
                     }
-                }
-                return engine
-            }))
+                )
+            )
         }
     }
 
@@ -918,8 +923,8 @@ private final class TaskOutputParserHandler: TaskOutputParserDelegate {
 
 /// A task output collector which simply discards any data it receives.
 private final class DiscardingTaskOutputHandler: TaskOutputDelegate {
-    var counters: [BuildOperationMetrics.Counter : Int] = [:]
-    var taskCounters: [BuildOperationMetrics.TaskCounter : Int] = [:]
+    var counters: [BuildOperationMetrics.Counter: Int] = [:]
+    var taskCounters: [BuildOperationMetrics.TaskCounter: Int] = [:]
 
     private let _diagnosticsEngine = DiagnosticsEngine()
     var result: TaskResult? { nil }
@@ -1040,7 +1045,7 @@ final class OperationDelegate: BuildOperationDelegate {
         return outputCollector
     }
 
-    func reportPathMap(_ operation: BuildOperation, copiedPathMap: [String : String], generatedFilesPathMap: [String : String]) {
+    func reportPathMap(_ operation: BuildOperation, copiedPathMap: [String: String], generatedFilesPathMap: [String: String]) {
         request.send(BuildOperationReportPathMap(copiedPathMap: copiedPathMap, generatedFilesPathMap: generatedFilesPathMap))
     }
 
@@ -1163,11 +1168,12 @@ final class OperationDelegate: BuildOperationDelegate {
 
         // If we haven't started, show a custom message (to prevent a "Building 0" message).
         if stats.numCommandsStarted == 0 {
-            if  messageShortening != .full || workspaceContext.userPreferences.enableDebugActivityLogs {
+            if messageShortening != .full || workspaceContext.userPreferences.enableDebugActivityLogs {
                 request.send(BuildOperationProgressUpdated(targetName: targetName, statusMessage: "Scanning build tasks", percentComplete: percentComplete, showInLog: false))
             }
         } else {
-            let statusMessage = messageShortening > .legacy
+            let statusMessage =
+                messageShortening > .legacy
                 ? activityMessageFractionString(stats.numCommandsStarted, over: stats.numPossibleMaxExecutedCommands)
                 : "Building \(stats.numCommandsStarted) of \(stats.numPossibleMaxExecutedCommands) tasks"
             request.send(BuildOperationProgressUpdated(targetName: targetName, statusMessage: statusMessage, percentComplete: percentComplete, showInLog: false))
@@ -1331,9 +1337,9 @@ final class OperationDelegate: BuildOperationDelegate {
             )
         })
 
-        self.aggregatedCounters.merge(delegate.counters) { (a, b) in a+b }
+        self.aggregatedCounters.merge(delegate.counters) { (a, b) in a + b }
         if !delegate.taskCounters.isEmpty {
-            self.aggregatedTaskCounters[task.ruleInfo[0], default: [:]].merge(delegate.taskCounters) { (a, b) in a+b }
+            self.aggregatedTaskCounters[task.ruleInfo[0], default: [:]].merge(delegate.taskCounters) { (a, b) in a + b }
         }
 
         request.send(BuildOperationTaskEnded(id: taskID, signature: .taskIdentifier(ByteString(encodingAsUTF8: taskIdentifier.rawValue)), status: status, signalled: status == .cancelled, metrics: metrics))
diff --git a/Sources/SWBBuildService/BuildService.swift b/Sources/SWBBuildService/BuildService.swift
index e1219955..f5d06178 100644
--- a/Sources/SWBBuildService/BuildService.swift
+++ b/Sources/SWBBuildService/BuildService.swift
@@ -58,11 +58,11 @@ open class BuildService: Service, @unchecked Sendable {
     /// The cache of core objects.
     ///
     /// We make this a heavy cache in debug mode, so that it can be explicitly cleared (via `clearAllCaches`), which helps considerably with memory leak debugging.
-#if DEBUG
-    private let sharedCoreCache = HeavyCache<CoreCacheKey, (Core?, [Diagnostic])>()
-#else
-    private let sharedCoreCache = Cache<CoreCacheKey, (Core?, [Diagnostic])>()
-#endif
+    #if DEBUG
+        private let sharedCoreCache = HeavyCache<CoreCacheKey, (Core?, [Diagnostic])>()
+    #else
+        private let sharedCoreCache = Cache<CoreCacheKey, (Core?, [Diagnostic])>()
+    #endif
 
     /// Async lock to guard access to `sharedCoreCache`, since its `getOrInsert` method can't be given an async closure.
     private var sharedCoreCacheLock = ActorLock()
@@ -111,8 +111,7 @@ open class BuildService: Service, @unchecked Sendable {
                         }
                     }
                 }
-            }
-            catch {
+            } catch {
                 // Couldn't get the contents of the frameworks directory - not sure whether this should be an error or if there are development workflows we want to support where it might be missing.
             }
         }
@@ -129,11 +128,9 @@ open class BuildService: Service, @unchecked Sendable {
                 if latestModDate.map({ latestModDate in modDate > latestModDate }) ?? true {
                     latestModDate = modDate
                 }
-            }
-            catch let error as NSError {
+            } catch let error as NSError {
                 throw StubError.error("Couldn't get timestamp of SWBBuildService.bundle contents: \(error.localizedDescription)")
-            }
-            catch {
+            } catch {
                 throw StubError.error("Couldn't get timestamp of SWBBuildService.bundle contents: \(error)")
             }
         }
diff --git a/Sources/SWBBuildService/BuildServiceEntryPoint.swift b/Sources/SWBBuildService/BuildServiceEntryPoint.swift
index 6c348dfa..9b38c4dc 100644
--- a/Sources/SWBBuildService/BuildServiceEntryPoint.swift
+++ b/Sources/SWBBuildService/BuildServiceEntryPoint.swift
@@ -22,19 +22,19 @@ import SWBTaskConstruction
 import SWBTaskExecution
 
 #if canImport(System)
-import System
+    import System
 #else
-import SystemPackage
+    import SystemPackage
 #endif
 
 #if USE_STATIC_PLUGIN_INITIALIZATION
-private import SWBAndroidPlatform
-private import SWBApplePlatform
-private import SWBGenericUnixPlatform
-private import SWBQNXPlatform
-private import SWBUniversalPlatform
-private import SWBWebAssemblyPlatform
-private import SWBWindowsPlatform
+    private import SWBAndroidPlatform
+    private import SWBApplePlatform
+    private import SWBGenericUnixPlatform
+    private import SWBQNXPlatform
+    private import SWBUniversalPlatform
+    private import SWBWebAssemblyPlatform
+    private import SWBWindowsPlatform
 #endif
 
 private struct Options {
@@ -56,10 +56,12 @@ private struct Options {
         while let arg = generator.next() {
             switch arg {
             case "--help":
-                print((OutputByteStream()
+                print(
+                    (OutputByteStream()
                         <<< "Swift Build Build Service\n"
                         <<< "\n"
-                        <<< "  Read the source for help.").bytes.asString)
+                        <<< "  Read the source for help.").bytes.asString
+                )
                 exit = true
 
             default:
@@ -76,13 +78,20 @@ extension BuildService {
         do {
             try await Service.main { inputFD, outputFD in
                 // Launch the Swift Build service.
-                try await BuildService.run(inputFD: inputFD, outputFD: outputFD, connectionMode: .outOfProcess, pluginsDirectory: Bundle.main.builtInPlugInsURL, arguments: arguments, pluginLoadingFinished: {
-                    // Already using DYLD_IMAGE_SUFFIX, clear it to avoid propagating ASan to children.
-                    // This must happen after plugin loading.
-                    if let suffix = getEnvironmentVariable("DYLD_IMAGE_SUFFIX"), suffix == "_asan" {
-                        try POSIX.unsetenv("DYLD_IMAGE_SUFFIX")
+                try await BuildService.run(
+                    inputFD: inputFD,
+                    outputFD: outputFD,
+                    connectionMode: .outOfProcess,
+                    pluginsDirectory: Bundle.main.builtInPlugInsURL,
+                    arguments: arguments,
+                    pluginLoadingFinished: {
+                        // Already using DYLD_IMAGE_SUFFIX, clear it to avoid propagating ASan to children.
+                        // This must happen after plugin loading.
+                        if let suffix = getEnvironmentVariable("DYLD_IMAGE_SUFFIX"), suffix == "_asan" {
+                            try POSIX.unsetenv("DYLD_IMAGE_SUFFIX")
+                        }
                     }
-                })
+                )
             }
             exit(EXIT_SUCCESS)
         } catch {
@@ -132,17 +141,17 @@ extension BuildService {
             // This MUST be a compile-time check because the module dependencies on the plugins are conditional.
             // Minimize the amount of code that is conditionally compiled to avoid breaking the build during refactoring.
             #if USE_STATIC_PLUGIN_INITIALIZATION
-            staticPluginInitializers = [
-                SWBAndroidPlatform.initializePlugin,
-                SWBApplePlatform.initializePlugin,
-                SWBGenericUnixPlatform.initializePlugin,
-                SWBQNXPlatform.initializePlugin,
-                SWBUniversalPlatform.initializePlugin,
-                SWBWebAssemblyPlatform.initializePlugin,
-                SWBWindowsPlatform.initializePlugin,
-            ]
+                staticPluginInitializers = [
+                    SWBAndroidPlatform.initializePlugin,
+                    SWBApplePlatform.initializePlugin,
+                    SWBGenericUnixPlatform.initializePlugin,
+                    SWBQNXPlatform.initializePlugin,
+                    SWBUniversalPlatform.initializePlugin,
+                    SWBWebAssemblyPlatform.initializePlugin,
+                    SWBWindowsPlatform.initializePlugin,
+                ]
             #else
-            staticPluginInitializers = []
+                staticPluginInitializers = []
             #endif
 
             if useStaticPluginInitialization {
diff --git a/Sources/SWBBuildService/ClientExchangeDelegate.swift b/Sources/SWBBuildService/ClientExchangeDelegate.swift
index b391870e..82d231f4 100644
--- a/Sources/SWBBuildService/ClientExchangeDelegate.swift
+++ b/Sources/SWBBuildService/ClientExchangeDelegate.swift
@@ -33,7 +33,7 @@ final class ClientExchangeDelegate: ClientDelegate {
         self.session = session
     }
 
-    func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+    func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
         // Create a synchronous client exchange which the session uses to handle the response from the client, to make the communication synchronous from the point of view of our caller.
         let exchange = SynchronousClientExchange<ExternalToolExecutionResponse>(session)
 
diff --git a/Sources/SWBBuildService/DependencyGraphMessages.swift b/Sources/SWBBuildService/DependencyGraphMessages.swift
index 5973b33d..af67b24a 100644
--- a/Sources/SWBBuildService/DependencyGraphMessages.swift
+++ b/Sources/SWBBuildService/DependencyGraphMessages.swift
@@ -58,17 +58,22 @@ private func constructTargetBuildGraph(for targetGUIDs: [TargetGUID], in workspa
     case .buildRequest:
         scope = .buildRequest
     }
-    let buildGraph = await TargetBuildGraph(workspaceContext: workspaceContext,
-                                      buildRequest: BuildRequest(parameters: parameters,
-                                                                 buildTargets: targets.map { BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }, dependencyScope: scope,
-                                                                 continueBuildingAfterErrors: false,
-                                                                 hideShellScriptEnvironment: true,
-                                                                 useParallelTargets: false,
-                                                                 useImplicitDependencies: includeImplicitDependencies,
-                                                                 useDryRun: false),
-                                      buildRequestContext: buildRequestContext,
-                                      delegate: delegate,
-                                      purpose: .dependencyGraph)
+    let buildGraph = await TargetBuildGraph(
+        workspaceContext: workspaceContext,
+        buildRequest: BuildRequest(
+            parameters: parameters,
+            buildTargets: targets.map { BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) },
+            dependencyScope: scope,
+            continueBuildingAfterErrors: false,
+            hideShellScriptEnvironment: true,
+            useParallelTargets: false,
+            useImplicitDependencies: includeImplicitDependencies,
+            useDryRun: false
+        ),
+        buildRequestContext: buildRequestContext,
+        delegate: delegate,
+        purpose: .dependencyGraph
+    )
     if delegate.hasErrors {
         throw StubError.error("unable to get target build graph:\n" + delegate.diagnostics.map { $0.formatLocalizedDescription(.debug) }.joined(separator: "\n"))
     }
diff --git a/Sources/SWBBuildService/DocumentationInfo.swift b/Sources/SWBBuildService/DocumentationInfo.swift
index 7f5f2ad6..d318e3eb 100644
--- a/Sources/SWBBuildService/DocumentationInfo.swift
+++ b/Sources/SWBBuildService/DocumentationInfo.swift
@@ -74,9 +74,11 @@ extension BuildDescription {
     func generateDocumentationInfo(workspaceContext: WorkspaceContext, buildRequestContext: BuildRequestContext, input: TaskGenerateDocumentationInfoInput) -> [DocumentationInfoOutput] {
         var output: [DocumentationInfoOutput] = []
         taskStore.forEachTask { task in
-            output.append(contentsOf: task.generateDocumentationInfo(input: input).map { info in
-                DocumentationInfoOutput(outputPath: info.outputPath, targetIdentifier: info.targetIdentifier)
-            })
+            output.append(
+                contentsOf: task.generateDocumentationInfo(input: input).map { info in
+                    DocumentationInfoOutput(outputPath: info.outputPath, targetIdentifier: info.targetIdentifier)
+                }
+            )
         }
         return output
     }
diff --git a/Sources/SWBBuildService/LocalizationInfo.swift b/Sources/SWBBuildService/LocalizationInfo.swift
index 1d63532c..6a595cec 100644
--- a/Sources/SWBBuildService/LocalizationInfo.swift
+++ b/Sources/SWBBuildService/LocalizationInfo.swift
@@ -18,7 +18,7 @@ import SWBBuildSystem
 
 /// Errors that might be thrown while generating localization info from a build description.
 enum LocalizationInfoErrors: Error {
-    case noBuildDescriptionID // The client didn't set buildDescriptionID
+    case noBuildDescriptionID  // The client didn't set buildDescriptionID
     case noBuildDescription
 }
 
@@ -92,17 +92,18 @@ extension BuildDescription {
             guard let targetGUID = task.forTarget?.target.guid else {
                 // This task is not associated with a target at all.
                 // Ignore for now.
-                return // equivalent to `continue` since we're in a closure-based loop.
+                return  // equivalent to `continue` since we're in a closure-based loop.
             }
 
             let taskLocalizationOutputs = task.generateLocalizationInfo(input: input)
 
             guard !taskLocalizationOutputs.isEmpty else {
-                return // continue
+                return  // continue
             }
 
             let taskXCStringsPaths = Set(taskLocalizationOutputs.flatMap(\.compilableXCStringsPaths))
-            let taskStringsdataPaths: [LocalizationBuildPortion: Set<Path>] = taskLocalizationOutputs
+            let taskStringsdataPaths: [LocalizationBuildPortion: Set<Path>] =
+                taskLocalizationOutputs
                 .map(\.producedStringsdataPaths)
                 .reduce([:], { aggregate, partial in aggregate.merging(partial, uniquingKeysWith: +) })
                 .mapValues { Set($0) }
@@ -119,7 +120,8 @@ extension BuildDescription {
                 outputsByTarget[targetGUID]?.effectivePlatformName = effectivePlatformName
             }
 
-            let taskGeneratedSymbolFiles = taskLocalizationOutputs
+            let taskGeneratedSymbolFiles =
+                taskLocalizationOutputs
                 .map(\.generatedSymbolFilesByXCStringsPath)
                 .reduce([:], { aggregate, partial in aggregate.merging(partial, uniquingKeysWith: +) })
                 .mapValues { Set($0) }
diff --git a/Sources/SWBBuildService/Messages.swift b/Sources/SWBBuildService/Messages.swift
index ea3baaeb..54650c4d 100644
--- a/Sources/SWBBuildService/Messages.swift
+++ b/Sources/SWBBuildService/Messages.swift
@@ -45,7 +45,7 @@ private struct GetSpecsDumpMsg: MessageHandler {
         let conformingTo: String?
         if let idx = message.commandLine.firstIndex(of: "--conforms-to"), idx + 1 < message.commandLine.count {
             conformingTo = message.commandLine[idx + 1]
-        }  else {
+        } else {
             conformingTo = nil
         }
         return StringResponse(try request.session(for: message).core.getSpecsDump(conformingTo: conformingTo))
@@ -289,13 +289,15 @@ private struct SetSessionUserPreferencesMsg: MessageHandler {
             throw MsgParserError.missingWorkspaceContext
         }
 
-        workspaceContext.updateUserPreferences(UserPreferences(
-            enableDebugActivityLogs: message.enableDebugActivityLogs,
-            enableBuildDebugging: message.enableBuildDebugging,
-            enableBuildSystemCaching: message.enableBuildSystemCaching,
-            activityTextShorteningLevel: message.activityTextShorteningLevel,
-            usePerConfigurationBuildLocations: message.usePerConfigurationBuildLocations,
-            allowsExternalToolExecution: message.allowsExternalToolExecution ?? UserPreferences.allowsExternalToolExecutionDefaultValue)
+        workspaceContext.updateUserPreferences(
+            UserPreferences(
+                enableDebugActivityLogs: message.enableDebugActivityLogs,
+                enableBuildDebugging: message.enableBuildDebugging,
+                enableBuildSystemCaching: message.enableBuildSystemCaching,
+                activityTextShorteningLevel: message.activityTextShorteningLevel,
+                usePerConfigurationBuildLocations: message.usePerConfigurationBuildLocations,
+                allowsExternalToolExecution: message.allowsExternalToolExecution ?? UserPreferences.allowsExternalToolExecutionDefaultValue
+            )
         )
 
         return VoidResponse()
@@ -328,7 +330,7 @@ private struct TransferSessionPIFMsg: MessageHandler {
             throw StubError.error("incremental PIF transfer did not produce the right contents. Diff: \(diff)")
 
         case .incomplete(let missingObjects):
-            return TransferSessionPIFResponse(missingObjects: missingObjects.map{ TransferSessionPIFResponse.MissingObject(type: $0.type, signature: $0.signature) })
+            return TransferSessionPIFResponse(missingObjects: missingObjects.map { TransferSessionPIFResponse.MissingObject(type: $0.type, signature: $0.signature) })
         }
     }
 
@@ -463,11 +465,16 @@ private struct WorkspaceInfoMsg: MessageHandler {
             throw MsgParserError.missingWorkspaceContext
         }
 
-        return WorkspaceInfoResponse(sessionHandle: session.UID, workspaceInfo: .init(targetInfos: workspaceContext.workspace.projects.flatMap { project in
-            return project.targets.map { target in
-                return .init(guid: target.guid, targetName: target.name, projectName: project.name, dynamicTargetVariantGuid: target.dynamicTargetVariantGuid)
-            }
-        }))
+        return WorkspaceInfoResponse(
+            sessionHandle: session.UID,
+            workspaceInfo: .init(
+                targetInfos: workspaceContext.workspace.projects.flatMap { project in
+                    return project.targets.map { target in
+                        return .init(guid: target.guid, targetName: target.name, projectName: project.name, dynamicTargetVariantGuid: target.dynamicTargetVariantGuid)
+                    }
+                }
+            )
+        )
     }
 }
 
@@ -516,9 +523,9 @@ private struct BuildCancelRequestMsg: MessageHandler {
 
 package class InfoOperation {
     private var isCancelled: LockedValue<Bool> = .init(false)
-    package var cancelled: Bool { return isCancelled.withLock{$0} }
+    package var cancelled: Bool { return isCancelled.withLock { $0 } }
     package func cancel() {
-        isCancelled.withLock{$0 = true}
+        isCancelled.withLock { $0 = true }
         tasks.withLock {
             for task in $0 {
                 task.cancel()
@@ -554,18 +561,18 @@ final class IndexingOperation: InfoOperation, BuildDescriptionConstructionDelega
         .init(_diagnosticsEngine)
     }
 
-    var diagnostics: [ConfiguredTarget? : [Diagnostic]] {
+    var diagnostics: [ConfiguredTarget?: [Diagnostic]] {
         [nil: _diagnosticsEngine.diagnostics]
     }
 
-    package func updateProgress(statusMessage: String, showInLog: Bool) { }
+    package func updateProgress(statusMessage: String, showInLog: Bool) {}
 
     package func beginActivity(ruleInfo: String, executionDescription: String, signature: ByteString, target: ConfiguredTarget?, parentActivity: ActivityID?) -> ActivityID { .init(rawValue: -1) }
-    package func endActivity(id: ActivityID, signature: ByteString, status: BuildOperationTaskEnded.Status) { }
-    package func emit(data: [UInt8], for activity: ActivityID, signature: ByteString) { }
-    package func emit(diagnostic: Diagnostic, for activity: ActivityID, signature: ByteString) { }
+    package func endActivity(id: ActivityID, signature: ByteString, status: BuildOperationTaskEnded.Status) {}
+    package func emit(data: [UInt8], for activity: ActivityID, signature: ByteString) {}
+    package func emit(diagnostic: Diagnostic, for activity: ActivityID, signature: ByteString) {}
 
-    package func buildDescriptionCreated(_ buildDescriptionID: BuildDescriptionID) { }
+    package func buildDescriptionCreated(_ buildDescriptionID: BuildDescriptionID) {}
 
     // We don't care about the individual diagnostics here, only if there was at least one error.
     package private(set) var hadErrors = false
@@ -601,11 +608,11 @@ private struct GetIndexingFileSettingsMsg: MessageHandler {
 
     func handle(request: Request, message: IndexingFileSettingsRequest) async throws -> VoidResponse {
         try await handleIndexingInfoRequest(serializationQueue: Self.serializationQueue, request: request, message: message) { message, workspaceContext, buildRequest, buildRequestContext, buildDescription, target, elapsedTimer in
-#if DEBUG
-            // We record the source files we see and report if a particular source file
-            // is encountered more than once.
-            var seenPaths = Set<Path>()
-#endif
+            #if DEBUG
+                // We record the source files we see and report if a particular source file
+                // is encountered more than once.
+                var seenPaths = Set<Path>()
+            #endif
 
             // Collect and return the indexing info.  The indexing info is sent as a property list defined by the SourceFileIndexingInfo object, so there is presently no need for client-side changes to handle this info (and thus little change of revlock issues between the client and the service).  In the future we hope to provide strong typing for this data.
 
@@ -616,19 +623,24 @@ private struct GetIndexingFileSettingsMsg: MessageHandler {
                         let path = info.path
                         let indexingInfo = info.indexingInfo
 
-#if DEBUG
-                        if !seenPaths.insert(path).inserted {
-                            log("Duplicate source file for indexing \(path)")
-                        }
-#endif
+                        #if DEBUG
+                            if !seenPaths.insert(path).inserted {
+                                log("Duplicate source file for indexing \(path)")
+                            }
+                        #endif
 
                         guard case .plDict(let indexingInfoDict) = indexingInfo.propertyListItem else {
                             throw StubError.error("Internal error: expected plDict from \(indexingInfo)")
                         }
 
-                        return try .plDict(indexingInfoDict.merging(["sourceFilePath": .plString(path.str)], uniquingKeysWith: { _, _ in
-                            throw StubError.error("Internal error: unexpected sourceFilePath key in \(indexingInfo)")
-                        }))
+                        return try .plDict(
+                            indexingInfoDict.merging(
+                                ["sourceFilePath": .plString(path.str)],
+                                uniquingKeysWith: { _, _ in
+                                    throw StubError.error("Internal error: unexpected sourceFilePath key in \(indexingInfo)")
+                                }
+                            )
+                        )
                     }
                 }
 
@@ -645,7 +657,7 @@ private struct GetIndexingFileSettingsMsg: MessageHandler {
                             "seconds": .plDouble(duration.seconds),
                             "nanoseconds": .plDouble(Double(duration.nanoseconds)),
                         ]),
-                        "data": .plArray(resultArray)
+                        "data": .plArray(resultArray),
                     ])
 
                     try workspaceContext.fs.write(payloadsDirectory.join("\(dateString).json"), contents: obj.asJSONFragment())
@@ -672,10 +684,12 @@ private struct GetIndexingHeaderInfoMsg: MessageHandler {
             }
 
             let productName = buildRequestContext.getCachedSettings(target.parameters, target: target.target).globalScope.evaluate(BuiltinMacros.PRODUCT_NAME)
-            let copiedHeaders = Dictionary(uniqueKeysWithValues: allTargetOutputPaths.intersection(buildDescription.copiedPathMap.keys).compactMap { path -> (String, String)? in
-                guard let copiedPath = buildDescription.copiedPathMap[path], ProjectHeaderInfo.headerFileExtensions.contains(Path(copiedPath).fileExtension) else { return nil }
-                return (path, copiedPath)
-            })
+            let copiedHeaders = Dictionary(
+                uniqueKeysWithValues: allTargetOutputPaths.intersection(buildDescription.copiedPathMap.keys).compactMap { path -> (String, String)? in
+                    guard let copiedPath = buildDescription.copiedPathMap[path], ProjectHeaderInfo.headerFileExtensions.contains(Path(copiedPath).fileExtension) else { return nil }
+                    return (path, copiedPath)
+                }
+            )
 
             return IndexingHeaderInfoResponse(targetID: message.targetID, productName: productName, copiedPathMap: copiedHeaders)
         }
@@ -813,20 +827,20 @@ private final class DocumentationOperation: InfoOperation, DocumentationInfoDele
         .init(_diagnosticsEngine)
     }
 
-    var diagnostics: [ConfiguredTarget? : [Diagnostic]] {
+    var diagnostics: [ConfiguredTarget?: [Diagnostic]] {
         [nil: _diagnosticsEngine.diagnostics]
     }
 
     let clientDelegate: any ClientDelegate
 
-    package func updateProgress(statusMessage: String, showInLog: Bool) { }
+    package func updateProgress(statusMessage: String, showInLog: Bool) {}
 
     package func beginActivity(ruleInfo: String, executionDescription: String, signature: ByteString, target: ConfiguredTarget?, parentActivity: ActivityID?) -> ActivityID { .init(rawValue: -1) }
-    package func endActivity(id: ActivityID, signature: ByteString, status: BuildOperationTaskEnded.Status) { }
-    package func emit(data: [UInt8], for activity: ActivityID, signature: ByteString) { }
-    package func emit(diagnostic: Diagnostic, for activity: ActivityID, signature: ByteString) { }
+    package func endActivity(id: ActivityID, signature: ByteString, status: BuildOperationTaskEnded.Status) {}
+    package func emit(data: [UInt8], for activity: ActivityID, signature: ByteString) {}
+    package func emit(diagnostic: Diagnostic, for activity: ActivityID, signature: ByteString) {}
 
-    package func buildDescriptionCreated(_ buildDescriptionID: BuildDescriptionID) { }
+    package func buildDescriptionCreated(_ buildDescriptionID: BuildDescriptionID) {}
 
     package init(clientDelegate: any ClientDelegate, workspace: SWBCore.Workspace) {
         self.clientDelegate = clientDelegate
@@ -850,7 +864,7 @@ private final class LocalizationOperation: InfoOperation, LocalizationInfoDelega
         .init(_diagnosticsEngine)
     }
 
-    var diagnostics: [ConfiguredTarget? : [Diagnostic]] {
+    var diagnostics: [ConfiguredTarget?: [Diagnostic]] {
         [nil: _diagnosticsEngine.diagnostics]
     }
 
@@ -858,14 +872,14 @@ private final class LocalizationOperation: InfoOperation, LocalizationInfoDelega
 
     // We don't care about most of these messages.
 
-    package func updateProgress(statusMessage: String, showInLog: Bool) { }
+    package func updateProgress(statusMessage: String, showInLog: Bool) {}
 
     package func beginActivity(ruleInfo: String, executionDescription: String, signature: ByteString, target: ConfiguredTarget?, parentActivity: ActivityID?) -> ActivityID { .init(rawValue: -1) }
-    package func endActivity(id: ActivityID, signature: ByteString, status: BuildOperationTaskEnded.Status) { }
-    package func emit(data: [UInt8], for activity: ActivityID, signature: ByteString) { }
-    package func emit(diagnostic: Diagnostic, for activity: ActivityID, signature: ByteString) { }
+    package func endActivity(id: ActivityID, signature: ByteString, status: BuildOperationTaskEnded.Status) {}
+    package func emit(data: [UInt8], for activity: ActivityID, signature: ByteString) {}
+    package func emit(diagnostic: Diagnostic, for activity: ActivityID, signature: ByteString) {}
 
-    package func buildDescriptionCreated(_ buildDescriptionID: BuildDescriptionID) { }
+    package func buildDescriptionCreated(_ buildDescriptionID: BuildDescriptionID) {}
 
     package init(clientDelegate: any ClientDelegate, workspace: SWBCore.Workspace) {
         self.clientDelegate = clientDelegate
@@ -902,15 +916,17 @@ private struct GetLocalizationInfoMsg: MessageHandler {
                 let input = TaskGenerateLocalizationInfoInput(targetIdentifiers: message.targetIdentifiers)
                 let output = try await session.buildDescriptionManager.generateLocalizationInfo(workspaceContext: workspaceContext, buildRequest: buildRequest, buildRequestContext: buildRequestContext, delegate: operation, input: input)
 
-                let response = LocalizationInfoResponse(targetInfos: output.map({ infoOutput in
-                    var stringsdataPaths = [LocalizationInfoBuildPortion: Set<Path>]()
-                    for (buildPortion, paths) in infoOutput.producedStringsdataPaths {
-                        stringsdataPaths[LocalizationInfoBuildPortion(effectivePlatformName: buildPortion.effectivePlatformName, variant: buildPortion.variant, architecture: buildPortion.architecture)] = paths
-                    }
-                    var payload = LocalizationInfoMessagePayload(targetIdentifier: infoOutput.targetIdentifier, compilableXCStringsPaths: infoOutput.compilableXCStringsPaths, producedStringsdataPaths: stringsdataPaths, effectivePlatformName: infoOutput.effectivePlatformName)
-                    payload.generatedSymbolFilesByXCStringsPath = infoOutput.generatedSymbolFilesByXCStringsPath
-                    return payload
-                }))
+                let response = LocalizationInfoResponse(
+                    targetInfos: output.map({ infoOutput in
+                        var stringsdataPaths = [LocalizationInfoBuildPortion: Set<Path>]()
+                        for (buildPortion, paths) in infoOutput.producedStringsdataPaths {
+                            stringsdataPaths[LocalizationInfoBuildPortion(effectivePlatformName: buildPortion.effectivePlatformName, variant: buildPortion.variant, architecture: buildPortion.architecture)] = paths
+                        }
+                        var payload = LocalizationInfoMessagePayload(targetIdentifier: infoOutput.targetIdentifier, compilableXCStringsPaths: infoOutput.compilableXCStringsPaths, producedStringsdataPaths: stringsdataPaths, effectivePlatformName: infoOutput.effectivePlatformName)
+                        payload.generatedSymbolFilesByXCStringsPath = infoOutput.generatedSymbolFilesByXCStringsPath
+                        return payload
+                    })
+                )
                 return response
             } catch {
                 return ErrorResponse("could not generate localization info: \(error)")
@@ -949,7 +965,7 @@ private struct BuildDescriptionTargetInfoMsg: MessageHandler {
                 let targets = buildDescription.allConfiguredTargets.reduce(into: Set<SWBCore.Target>()) { set, configuredTarget in
                     set.insert(configuredTarget.target)
                 }
-                return StringListResponse(targets.map{$0.guid})
+                return StringListResponse(targets.map { $0.guid })
             case .failed(let msg):
                 return msg
             }
@@ -966,7 +982,7 @@ private final class PreviewingOperation: InfoOperation, PreviewInfoDelegate {
         .init(_diagnosticsEngine)
     }
 
-    var diagnostics: [ConfiguredTarget? : [Diagnostic]] {
+    var diagnostics: [ConfiguredTarget?: [Diagnostic]] {
         [nil: _diagnosticsEngine.diagnostics]
     }
 
@@ -976,14 +992,14 @@ private final class PreviewingOperation: InfoOperation, PreviewInfoDelegate {
 
     package var hadErrors: Bool { !errorDiagnostics.isEmpty }
 
-    package func updateProgress(statusMessage: String, showInLog: Bool) { }
+    package func updateProgress(statusMessage: String, showInLog: Bool) {}
 
     package func beginActivity(ruleInfo: String, executionDescription: String, signature: ByteString, target: ConfiguredTarget?, parentActivity: ActivityID?) -> ActivityID { .init(rawValue: -1) }
-    package func endActivity(id: ActivityID, signature: ByteString, status: BuildOperationTaskEnded.Status) { }
-    package func emit(data: [UInt8], for activity: ActivityID, signature: ByteString) { }
-    package func emit(diagnostic: Diagnostic, for activity: ActivityID, signature: ByteString) { }
+    package func endActivity(id: ActivityID, signature: ByteString, status: BuildOperationTaskEnded.Status) {}
+    package func emit(data: [UInt8], for activity: ActivityID, signature: ByteString) {}
+    package func emit(diagnostic: Diagnostic, for activity: ActivityID, signature: ByteString) {}
 
-    package func buildDescriptionCreated(_ buildDescriptionID: BuildDescriptionID) { }
+    package func buildDescriptionCreated(_ buildDescriptionID: BuildDescriptionID) {}
 
     package init(clientDelegate: any ClientDelegate, workspace: SWBCore.Workspace) {
         self.clientDelegate = clientDelegate
@@ -1057,7 +1073,7 @@ extension MessageHandler {
                     targetIDs: message.targetIDs,
                     input: message.generatePreviewInfoInput
                 )
-                responses.append(contentsOf: output.map{ $0.asMessagePayload() })
+                responses.append(contentsOf: output.map { $0.asMessagePayload() })
 
                 return PreviewInfoResponse(
                     targetIDs: message.targetIDs,
@@ -1065,7 +1081,7 @@ extension MessageHandler {
                 )
             } catch {
                 if operation.hadErrors {
-                    let errorStrings = operation.errorDiagnostics.map{$0.formatLocalizedDescription(.debug)}
+                    let errorStrings = operation.errorDiagnostics.map { $0.formatLocalizedDescription(.debug) }
                     return ErrorResponse("could not generate preview info: \(error)\ndiagnostics:\n\(errorStrings.joined(separator: "\n"))")
                 } else {
                     return ErrorResponse("could not generate preview info: \(error)")
@@ -1221,7 +1237,6 @@ private struct DeveloperPathHandler: MessageHandler {
     }
 }
 
-
 final package class BuildDependencyInfoOperation: InfoOperation, TargetDependencyResolverDelegate {
     private let _diagnosticsEngine = DiagnosticsEngine()
 
@@ -1229,11 +1244,11 @@ final package class BuildDependencyInfoOperation: InfoOperation, TargetDependenc
         .init(_diagnosticsEngine)
     }
 
-    var diagnostics: [ConfiguredTarget? : [Diagnostic]] {
+    var diagnostics: [ConfiguredTarget?: [Diagnostic]] {
         [nil: _diagnosticsEngine.diagnostics]
     }
 
-    package func updateProgress(statusMessage: String, showInLog: Bool) { }
+    package func updateProgress(statusMessage: String, showInLog: Bool) {}
 
     // We don't care about the individual diagnostics here, only if there was at least one error.
     package private(set) var hadErrors = false
@@ -1268,8 +1283,7 @@ private struct DumpBuildDependencyInfoMsg: MessageHandler {
             let buildDependencyInfo: BuildDependencyInfo
             do {
                 buildDependencyInfo = try await BuildDependencyInfo(workspaceContext: workspaceContext, buildRequest: buildRequest, buildRequestContext: buildRequestContext, operation: operation)
-            }
-            catch {
+            } catch {
                 return ErrorResponse(error.localizedDescription)
             }
 
@@ -1285,15 +1299,13 @@ private struct DumpBuildDependencyInfoMsg: MessageHandler {
                 let encoder = JSONEncoder()
                 encoder.outputFormatting = [.prettyPrinted, .sortedKeys, .withoutEscapingSlashes]
                 jsonData = try encoder.encode(buildDependencyInfo)
-            }
-            catch {
+            } catch {
                 return ErrorResponse("Unable to serialize build dependency info: \(error.localizedDescription)")
             }
             do {
                 try localFS.createDirectory(outputPath.dirname, recursive: true)
                 try localFS.write(outputPath, contents: ByteString(jsonData))
-            }
-            catch {
+            } catch {
                 return ErrorResponse("Unable to write build dependency info: \(error.localizedDescription)")
             }
 
@@ -1304,10 +1316,8 @@ private struct DumpBuildDependencyInfoMsg: MessageHandler {
     }
 }
 
-
 // MARK: Evaluating macros
 
-
 /// Returns a `Settings` object for a `MacroEvaluationRequestContext` (creating it if necessary) for a `MacroEvaluationRequestLevel` and `BuildParameters`.
 private func getSettings(for session: Session, workspaceContext: WorkspaceContext, level: MacroEvaluationRequestLevel, buildParameters: BuildParameters, purpose: SettingsPurpose) throws -> Settings {
     let buildRequestContext = BuildRequestContext(workspaceContext: workspaceContext)
@@ -1367,11 +1377,12 @@ private struct MacroEvaluationMsg: MessageHandler {
                 }
                 return result
             }()
-            lookup = lookupOverrides.count > 0 ? { macro in
-                return lookupOverrides[macro]
-            } : nil
-        }
-        else {
+            lookup =
+                lookupOverrides.count > 0
+                ? { macro in
+                    return lookupOverrides[macro]
+                } : nil
+        } else {
             lookup = nil
         }
 
@@ -1395,8 +1406,7 @@ private struct MacroEvaluationMsg: MessageHandler {
                 } else if let macroDefn = macroDefn as? PathListMacroDeclaration {
                     let result: [String] = scope.evaluate(macroDefn, lookup: lookup)
                     return MacroEvaluationResponse(result: .stringList(result))
-                }
-                else {
+                } else {
                     // This is not a macro string list definition, so evaluate it as a string and return it as a single-element array.
                     let result: String = scope.evaluateAsString(macroDefn, lookup: lookup)
                     return MacroEvaluationResponse(result: .stringList([result]))
@@ -1473,7 +1483,6 @@ private struct BuildSettingsEditorInfoMsg: MessageHandler {
     }
 }
 
-
 // MARK: Testing & Debugging Commands
 
 private struct ExecuteCommandLineToolMsg: MessageHandler {
@@ -1495,11 +1504,17 @@ private struct ExecuteCommandLineToolMsg: MessageHandler {
                     request.service.send(message.replyChannel, BoolResponse(false))
                     return
                 }
-                let result = await executeInternalTool(core: core, commandLine: message.commandLine, workingDirectory: message.workingDirectory, stdoutHandler: {
-                    request.service.send(message.replyChannel, StringResponse($0))
-                }, stderrHandler: {
-                    request.service.send(message.replyChannel, ErrorResponse($0))
-                })
+                let result = await executeInternalTool(
+                    core: core,
+                    commandLine: message.commandLine,
+                    workingDirectory: message.workingDirectory,
+                    stdoutHandler: {
+                        request.service.send(message.replyChannel, StringResponse($0))
+                    },
+                    stderrHandler: {
+                        request.service.send(message.replyChannel, ErrorResponse($0))
+                    }
+                )
                 request.service.send(message.replyChannel, BoolResponse(result))
             }
         }
@@ -1668,12 +1683,14 @@ extension Session {
 
     fileprivate func withInfoOperation(operation: InfoOperation, qos: SWBQoS, requestForReply: Request, lock: ActorLock, _ work: @escaping @Sendable () async -> any Message) {
         registerInfoOperation(operation)
-        operation.addTask(_Concurrency.Task<Void, Never>(priority: .init(buildRequestQoS: qos)) {
-            await lock.withLock {
-                let message = await work()
-                unregisterInfoOperation(operation)
-                requestForReply.reply(message)
+        operation.addTask(
+            _Concurrency.Task<Void, Never>(priority: .init(buildRequestQoS: qos)) {
+                await lock.withLock {
+                    let message = await work()
+                    unregisterInfoOperation(operation)
+                    requestForReply.reply(message)
+                }
             }
-        })
+        )
     }
 }
diff --git a/Sources/SWBBuildService/PlanningOperation.swift b/Sources/SWBBuildService/PlanningOperation.swift
index 3f2d7dfa..37b16d4e 100644
--- a/Sources/SWBBuildService/PlanningOperation.swift
+++ b/Sources/SWBBuildService/PlanningOperation.swift
@@ -48,8 +48,7 @@ package final class PlanningOperation: Sendable {
     /// Concurrent queue used to dispatch work to the background.
     private let workQueue: SWBQueue
 
-    init(request: Request, session: Session, workspaceContext: WorkspaceContext, buildRequest: BuildRequest, buildRequestContext: BuildRequestContext, delegate: any PlanningOperationDelegate)
-    {
+    init(request: Request, session: Session, workspaceContext: WorkspaceContext, buildRequest: BuildRequest, buildRequestContext: BuildRequestContext, delegate: any PlanningOperationDelegate) {
         self.request = request
         self.uuid = UUID()
         self.session = session
@@ -94,32 +93,34 @@ package final class PlanningOperation: Sendable {
         // We now need to request all the provisioning inputs, which we do in parallel.
         let provisioningInputs: [ConfiguredTarget: ProvisioningTaskInputs]
         do {
-            provisioningInputs = try await Dictionary(uniqueKeysWithValues: withThrowingTaskGroup(of: (ConfiguredTarget, ProvisioningTaskInputs).self) { [delegate] group in
-                return try await delegate.withActivity(ruleInfo: "GatherProvisioningInputs", executionDescription: "Gather provisioning inputs", signature: "gather_provisioning_inputs", target: nil, parentActivity: nil) { [delegate] activity in
-                    for (index, target) in graph.allTargets.enumerated() {
-                        group.addTask {
-                            try _Concurrency.Task.checkCancellation()
-
-                            // Dispatch the request for inputs.
-                            let inputs = await self.getProvisioningTaskInputs(for: target)
-
-                            if self.workspaceContext.userPreferences.enableDebugActivityLogs {
-                                delegate.emit(data: Array("Received inputs for target \(target): \(inputs)\n".utf8), for: activity, signature: "gather_provisioning_inputs")
+            provisioningInputs = try await Dictionary(
+                uniqueKeysWithValues: withThrowingTaskGroup(of: (ConfiguredTarget, ProvisioningTaskInputs).self) { [delegate] group in
+                    return try await delegate.withActivity(ruleInfo: "GatherProvisioningInputs", executionDescription: "Gather provisioning inputs", signature: "gather_provisioning_inputs", target: nil, parentActivity: nil) { [delegate] activity in
+                        for (index, target) in graph.allTargets.enumerated() {
+                            group.addTask {
+                                try _Concurrency.Task.checkCancellation()
+
+                                // Dispatch the request for inputs.
+                                let inputs = await self.getProvisioningTaskInputs(for: target)
+
+                                if self.workspaceContext.userPreferences.enableDebugActivityLogs {
+                                    delegate.emit(data: Array("Received inputs for target \(target): \(inputs)\n".utf8), for: activity, signature: "gather_provisioning_inputs")
+                                }
+
+                                // Register the result.
+                                let numInputs = index + 1
+                                let provisioningStatus = messageShortening >= .allDynamicText ? "Provisioning \(activityMessageFractionString(numInputs, over: graph.allTargets.count))" : "Getting \(numInputs) of \(graph.allTargets.count) provisioning task inputs"
+                                delegate.updateProgress(statusMessage: provisioningStatus, showInLog: false)
+
+                                return (target, inputs)
                             }
-
-                            // Register the result.
-                            let numInputs = index + 1
-                            let provisioningStatus = messageShortening >= .allDynamicText ? "Provisioning \(activityMessageFractionString(numInputs, over: graph.allTargets.count))" : "Getting \(numInputs) of \(graph.allTargets.count) provisioning task inputs"
-                            delegate.updateProgress(statusMessage: provisioningStatus, showInLog: false)
-
-                            return (target, inputs)
                         }
+                        return try await group.collect()
                     }
-                    return try await group.collect()
                 }
-            })
+            )
         } catch {
-            return nil // CancellationError
+            return nil  // CancellationError
         }
 
         if messageShortening != .full || self.workspaceContext.userPreferences.enableDebugActivityLogs {
@@ -152,14 +153,13 @@ package final class PlanningOperation: Sendable {
     /// Create the provisioning task inputs for a configured target.
     private func getProvisioningTaskInputs(for configuredTarget: ConfiguredTarget) async -> ProvisioningTaskInputs {
         // We only collect provisioning task inputs for standard targets.
-        if let target = configuredTarget.target as? SWBCore.StandardTarget
-        {
+        if let target = configuredTarget.target as? SWBCore.StandardTarget {
             // Create the settings and collect data we need to ship back to the client.
             let settings = buildRequestContext.getCachedSettings(configuredTarget.parameters, target: target)
 
             // Exit early if code signing is disabled, or if we don't have a valid SDK.
             guard let project = settings.project, let sdk = settings.sdk,
-                  settings.globalScope.evaluate(BuiltinMacros.CODE_SIGNING_ALLOWED)
+                settings.globalScope.evaluate(BuiltinMacros.CODE_SIGNING_ALLOWED)
             else {
                 return ProvisioningTaskInputs()
             }
@@ -211,16 +211,21 @@ package final class PlanningOperation: Sendable {
                 // Based on the conversation from rdar://problem/40909675, the team prefix should have a trailing period (`.`), but **only** if teamID actually has a value.
                 let parsedTeamIdentifierPrefix = settings.userNamespace.parseLiteralString(teamID.flatMap { $0 + "." } ?? "")
 
-                return rawEntitlements.byEvaluatingMacros(withScope: settings.globalScope, andDictionaryKeys: true, preserveReferencesToSettings: preserveReferencesToSettings, lookup: { macro in
-                    switch macro {
-                    case BuiltinMacros.CFBundleIdentifier:
-                        return parsedBundleIdentifier
-                    case BuiltinMacros.TeamIdentifierPrefix:
-                        return parsedTeamIdentifierPrefix
-                    default:
-                        return nil
+                return rawEntitlements.byEvaluatingMacros(
+                    withScope: settings.globalScope,
+                    andDictionaryKeys: true,
+                    preserveReferencesToSettings: preserveReferencesToSettings,
+                    lookup: { macro in
+                        switch macro {
+                        case BuiltinMacros.CFBundleIdentifier:
+                            return parsedBundleIdentifier
+                        case BuiltinMacros.TeamIdentifierPrefix:
+                            return parsedTeamIdentifierPrefix
+                        default:
+                            return nil
+                        }
                     }
-                })
+                )
             }
 
             // We need to read the entitlements from CODE_SIGN_ENTITLEMENTS_CONTENTS and evaluate build settings in it, to send it to Xcode to generate the provisioning inputs.
@@ -228,14 +233,12 @@ package final class PlanningOperation: Sendable {
             if !entitlementsContentsString.isEmpty {
                 if let rawEntitlementsFromBuildSetting = try? PropertyList.fromString(entitlementsContentsString) {
                     entitlementsFromBuildSetting = processRawEntitlements(rawEntitlementsFromBuildSetting)
-                }
-                else {
+                } else {
                     delegate.emit(.default, .init(behavior: .error, location: .buildSetting(name: "CODE_SIGN_ENTITLEMENTS_CONTENTS"), data: .init("The value of CODE_SIGN_ENTITLEMENTS_CONTENTS could not be parsed as entitlements")))
 
                     entitlementsFromBuildSetting = nil
                 }
-            }
-            else {
+            } else {
                 entitlementsFromBuildSetting = nil
             }
 
@@ -244,13 +247,11 @@ package final class PlanningOperation: Sendable {
             if let entitlementsFilePath = entitlementsFilePath {
                 if let rawEntitlementsFromFile = try? PropertyList.fromPath(entitlementsFilePath, fs: workspaceContext.fs) {
                     entitlementsFromFile = processRawEntitlements(rawEntitlementsFromFile)
-                }
-                else {
+                } else {
                     // FIXME: We should report an issue if we couldn't read the file.  Though presently I think the provisioning inputs generation machinery will do that, it might be clearer to just deal with it ourselves.  However, if `CODE_SIGN_ALLOW_ENTITLEMENTS_MODIFICATION` is being used, the file path might point to a generated file which hasn't yet been created, and we won't be able to read it anyways.
                     entitlementsFromFile = nil
                 }
-            }
-            else {
+            } else {
                 entitlementsFromFile = nil
             }
 
@@ -269,14 +270,11 @@ package final class PlanningOperation: Sendable {
                     }
 
                     return .plDict(entitlementsFromFileDictionary.addingContents(of: entitlementsFromBuildSettingDictionary))
-                }
-                else if let entitlementsFromFile = entitlementsFromFile {
+                } else if let entitlementsFromFile = entitlementsFromFile {
                     return entitlementsFromFile
-                }
-                else if let entitlementsFromBuildSetting = entitlementsFromBuildSetting {
+                } else if let entitlementsFromBuildSetting = entitlementsFromBuildSetting {
                     return entitlementsFromBuildSetting
-                }
-                else {
+                } else {
                     // Otherwise, we don't have any entitlements, and can just set it to nil.
                     return nil
                 }
@@ -294,16 +292,19 @@ package final class PlanningOperation: Sendable {
             // Create the outstanding request entry.
             return await withCheckedContinuation { continuation in
                 workQueue.async {
-                    self.provisioningTaskInputRequests[configuredTargetHandle] = ProvisioningTaskInputRequest(configuredTarget: configuredTarget, settingsHandle: settingsHandle, bundleIdentifier: bundleIdentifier, completion: { inputs in
-                        continuation.resume(returning: inputs)
-                    })
+                    self.provisioningTaskInputRequests[configuredTargetHandle] = ProvisioningTaskInputRequest(
+                        configuredTarget: configuredTarget,
+                        settingsHandle: settingsHandle,
+                        bundleIdentifier: bundleIdentifier,
+                        completion: { inputs in
+                            continuation.resume(returning: inputs)
+                        }
+                    )
 
                     self.request.send(message)
                 }
             }
-        }
-        else
-        {
+        } else {
             // Other target classes get an empty provisioning object.
             return ProvisioningTaskInputs()
         }
@@ -322,8 +323,7 @@ package final class PlanningOperation: Sendable {
             let settings: Settings
             do {
                 settings = try self.session.settings(for: subrequest.settingsHandle)
-            }
-            catch let e as SessionError {
+            } catch let e as SessionError {
                 let error: String
                 switch e {
                 case .noSettings(let str):
@@ -332,8 +332,7 @@ package final class PlanningOperation: Sendable {
                     error = "No settings in session for handle '\(subrequest.settingsHandle)': Handle is for a different workspace"
                 }
                 fatalError(error)
-            }
-            catch {
+            } catch {
                 fatalError("no settings in session for handle '\(subrequest.settingsHandle)': Unknown error")
             }
             // Now evaluate settings in the entitlements plists we got back from the client.  This includes some settings we evaluated before sending the request because the provisioning inputs generation may add content referring to those settings beyond what we passed to it.
@@ -361,8 +360,7 @@ package final class PlanningOperation: Sendable {
             // Clean up.
             do {
                 try self.session.unregisterSettings(for: subrequest.settingsHandle)
-            }
-            catch let e as SessionError {
+            } catch let e as SessionError {
                 let error: String
                 switch e {
                 case .noSettings(let str):
@@ -371,8 +369,7 @@ package final class PlanningOperation: Sendable {
                     error = "No settings to unregister in session for handle '\(subrequest.settingsHandle)': Handle is for a different workspace"
                 }
                 fatalError(error)
-            }
-            catch {
+            } catch {
                 fatalError("no settings to unregister in session for handle '\(subrequest.settingsHandle)': Unknown error")
             }
         }
@@ -397,11 +394,8 @@ extension PlanningOperation: TargetDependencyResolverDelegate {
     }
 }
 
-
-extension ProvisioningTaskInputsSourceData
-{
-    init(configurationName: String, sourceData: ProvisioningSourceData, provisioningProfileSupport: ProvisioningProfileSupport, provisioningProfileSpecifier: String, provisioningProfileUUID: String, bundleIdentifier: String, productTypeEntitlements: PropertyListItem, productTypeIdentifier: String, projectEntitlementsFile: String?, projectEntitlements: PropertyListItem?, signingCertificateIdentifier: String, signingRequiresTeam: Bool, teamID: String?, sdkRoot: String, sdkVariant: String?, supportsEntitlements: Bool, wantsBaseEntitlementInjection: Bool, entitlementsDestination: String, localSigningStyle: String, enableCloudSigning: Bool)
-    {
+extension ProvisioningTaskInputsSourceData {
+    init(configurationName: String, sourceData: ProvisioningSourceData, provisioningProfileSupport: ProvisioningProfileSupport, provisioningProfileSpecifier: String, provisioningProfileUUID: String, bundleIdentifier: String, productTypeEntitlements: PropertyListItem, productTypeIdentifier: String, projectEntitlementsFile: String?, projectEntitlements: PropertyListItem?, signingCertificateIdentifier: String, signingRequiresTeam: Bool, teamID: String?, sdkRoot: String, sdkVariant: String?, supportsEntitlements: Bool, wantsBaseEntitlementInjection: Bool, entitlementsDestination: String, localSigningStyle: String, enableCloudSigning: Bool) {
         self.init(configurationName: configurationName, provisioningProfileSupport: provisioningProfileSupport, provisioningProfileSpecifier: provisioningProfileSpecifier, provisioningProfileUUID: provisioningProfileUUID, provisioningStyle: sourceData.provisioningStyle, teamID: teamID, bundleIdentifier: bundleIdentifier, productTypeEntitlements: productTypeEntitlements, productTypeIdentifier: productTypeIdentifier, projectEntitlementsFile: projectEntitlementsFile, projectEntitlements: projectEntitlements, signingCertificateIdentifier: signingCertificateIdentifier, signingRequiresTeam: signingRequiresTeam, sdkRoot: sdkRoot, sdkVariant: sdkVariant, supportsEntitlements: supportsEntitlements, wantsBaseEntitlementInjection: wantsBaseEntitlementInjection, entitlementsDestination: entitlementsDestination, localSigningStyle: localSigningStyle, enableCloudSigning: enableCloudSigning)
     }
 }
diff --git a/Sources/SWBBuildService/PreviewInfo.swift b/Sources/SWBBuildService/PreviewInfo.swift
index 5b9dbf99..7570a94f 100644
--- a/Sources/SWBBuildService/PreviewInfo.swift
+++ b/Sources/SWBBuildService/PreviewInfo.swift
@@ -149,9 +149,9 @@ extension BuildDescriptionManager {
             guard let potentialTargets = targetsByGuid[targetID] else { continue }
             for configuredTarget in potentialTargets {
                 if case .thunkInfo = input,
-                   let packageProductTarget = configuredTarget.target as? PackageProductTarget,
-                   let dynamicTargetVariantGuid = packageProductTarget.dynamicTargetVariantGuid,
-                   let dynamicTargetVariants = targetsByGuid[dynamicTargetVariantGuid]
+                    let packageProductTarget = configuredTarget.target as? PackageProductTarget,
+                    let dynamicTargetVariantGuid = packageProductTarget.dynamicTargetVariantGuid,
+                    let dynamicTargetVariants = targetsByGuid[dynamicTargetVariantGuid]
                 {
                     targets.append(contentsOf: dynamicTargetVariants)
                 } else {
@@ -242,7 +242,7 @@ extension BuildDescription {
                         case 1:
                             let info = infos[0]
                             linkInfo = info
-                            assert(requestingTargetDependencyInfo || compileInfo?.output == info.input) // make sure the tasks match up.
+                            assert(requestingTargetDependencyInfo || compileInfo?.output == info.input)  // make sure the tasks match up.
                         case 0:
                             // No link task because the target type is a static library (which doesn't support previews), or previews dylib is enabled
                             continue
diff --git a/Sources/SWBBuildService/Session.swift b/Sources/SWBBuildService/Session.swift
index 56f06a01..b0c8e1df 100644
--- a/Sources/SWBBuildService/Session.swift
+++ b/Sources/SWBBuildService/Session.swift
@@ -205,10 +205,8 @@ public final class Session {
         return startPIFTransfer(workspaceSignature: workspaceSignature)
     }
 
-
     // MARK: Support for saving macro evaluation scopes to look up by a handle (UUID).
 
-
     /// The active Settings objects being vended for use by the client.
     /// - remark: This is presently only used in `PlanningOperation` to be able to evaluate some settings after receiving provisioning inputs from the client, without having to reconstruct the `ConfiguredTarget` in that asyncronous operation.
     var registeredSettings = Registry<String, Settings>()
@@ -235,10 +233,8 @@ public final class Session {
         return settings
     }
 
-
     // MARK: Planning operation support
 
-
     /// The active planning operations, if any.
     ///
     /// The client is responsible for closing these.
@@ -267,7 +263,6 @@ public final class Session {
         planningOperation.request.send(PlanningOperationDidFinish(sessionHandle: UID, planningOperationHandle: planningOperation.uuid.description))
     }
 
-
     // MARK: Client exchange objects
 
     // FIXME: This should just map on the UUID type, not a string.
@@ -291,7 +286,6 @@ public final class Session {
         activeClientExchanges.removeValue(forKey: exchange.uuid.description)
     }
 
-
     // MARK: Information operation support
 
     /// The active information operations
@@ -317,7 +311,7 @@ public final class Session {
     /// Cancel ongoing information operations
     func cancelInfoOperations() {
         activeInfoOperations.forEach {
-                $0.1.cancel()
+            $0.1.cancel()
         }
     }
 
@@ -329,7 +323,6 @@ public final class Session {
         }
     }
 
-
     // MARK: Build operation support
 
     /// The active build operations
@@ -337,12 +330,12 @@ public final class Session {
 
     /// Returns the normal build operations, excluding the ones that are for the index.
     private var activeNormalBuilds: [any ActiveBuildOperation] {
-        return activeBuilds.values.filter{ !$0.buildRequest.enableIndexBuildArena && !$0.onlyCreatesBuildDescription }
+        return activeBuilds.values.filter { !$0.buildRequest.enableIndexBuildArena && !$0.onlyCreatesBuildDescription }
     }
 
     /// Returns index build operations.
     private var activeIndexBuilds: [any ActiveBuildOperation] {
-        return activeBuilds.values.filter{ $0.buildRequest.enableIndexBuildArena && !$0.onlyCreatesBuildDescription }
+        return activeBuilds.values.filter { $0.buildRequest.enableIndexBuildArena && !$0.onlyCreatesBuildDescription }
     }
 
     /// Registers a build operation with the session
@@ -351,7 +344,8 @@ public final class Session {
         // But we do allow build description creation operations to run concurrently with normal builds. These are important for index queries to function properly even during a build.
         // We also allow 'prepare-for-index' build operations to run concurrently with a normal build but only one at a time. These are important for functionality in the Xcode editor to work properly, that the user directly interacts with.
         if !build.onlyCreatesBuildDescription {
-            let (buildType, existingBuilds) = build.buildRequest.enableIndexBuildArena
+            let (buildType, existingBuilds) =
+                build.buildRequest.enableIndexBuildArena
                 ? ("index", activeIndexBuilds)
                 : ("normal", activeNormalBuilds)
 
@@ -380,14 +374,12 @@ public final class Session {
     }
 }
 
-
 /// A client exchange is used to send a request to the client and handle its response.  The service creates and discards these, and is responsible for adding and removing them from the session.
 protocol ClientExchange {
     /// The stable UUID of the receiver.
     var uuid: UUID { get }
 }
 
-
 // Session Extensions
 
 extension Request {
diff --git a/Sources/SWBBuildService/Tools.swift b/Sources/SWBBuildService/Tools.swift
index 0d6bfe3b..3843ac36 100644
--- a/Sources/SWBBuildService/Tools.swift
+++ b/Sources/SWBBuildService/Tools.swift
@@ -155,9 +155,9 @@ private class MsgPackDumpTool {
         // Consume all the objects in the file.
         enum DecoderItem {
             /// A dictionary with N elements remaining.
-        case dict(count: Int, atKey: Bool)
+            case dict(count: Int, atKey: Bool)
             /// An array with N elements remaining.
-        case array(count: Int)
+            case array(count: Int)
         }
         var stack = [DecoderItem]()
         var indent: String {
@@ -193,7 +193,7 @@ private class MsgPackDumpTool {
             }
 
             if decoder.consumedCount == data.count {
-                continue // at EOF, go back through and finish the indenting
+                continue  // at EOF, go back through and finish the indenting
             }
 
             // Read the next item from the decoder.
@@ -229,7 +229,6 @@ private class MsgPackDumpTool {
     }
 }
 
-
 /// Utilities for working with headermaps.
 private class HeadermapTool {
     /// The parsed command line options.
@@ -476,8 +475,6 @@ private class ClangScanTool {
     }
 }
 
-
-
 private class SerializedDiagnosticsTool {
     /// The parsed command line options.
     struct Options {
diff --git a/Sources/SWBBuildSystem/BuildManager.swift b/Sources/SWBBuildSystem/BuildManager.swift
index 215fd5eb..ff9dab63 100644
--- a/Sources/SWBBuildSystem/BuildManager.swift
+++ b/Sources/SWBBuildSystem/BuildManager.swift
@@ -31,13 +31,19 @@ package actor BuildManager {
 
     /// Public initializer (so external clients can create new BuildManagers).
     package init() {
-        self.cachedBuildSystems = HeavyCache<Path, SystemCacheEntry>(maximumSize: UserDefaults.buildDescriptionInMemoryCacheSize, evictionPolicy: .default(totalCostLimit: UserDefaults.buildDescriptionInMemoryCostLimit, willEvictCallback: { entry in
-            // Capture the path to a local variable so that the buildDescription instance isn't retained by OSLog's autoclosure message parameter.
-            let buildDatabasePath = entry.buildDescription?.buildDatabasePath
-            #if canImport(os)
-            OSLog.log("Evicted cached build system for '\(buildDatabasePath?.str ?? "<unknown>")'")
-            #endif
-        }))
+        self.cachedBuildSystems = HeavyCache<Path, SystemCacheEntry>(
+            maximumSize: UserDefaults.buildDescriptionInMemoryCacheSize,
+            evictionPolicy: .default(
+                totalCostLimit: UserDefaults.buildDescriptionInMemoryCostLimit,
+                willEvictCallback: { entry in
+                    // Capture the path to a local variable so that the buildDescription instance isn't retained by OSLog's autoclosure message parameter.
+                    let buildDatabasePath = entry.buildDescription?.buildDatabasePath
+                    #if canImport(os)
+                        OSLog.log("Evicted cached build system for '\(buildDatabasePath?.str ?? "<unknown>")'")
+                    #endif
+                }
+            )
+        )
     }
 
     /// Enqueue a build operation.
@@ -57,7 +63,7 @@ package actor BuildManager {
             buildOnlyThesePaths = nil
         }
 
-        let buildOutputMap: [String:String]?
+        let buildOutputMap: [String: String]?
         if let buildOnlyThesePaths {
             buildOutputMap = {
                 var outputMap: [String: String] = [:]
diff --git a/Sources/SWBBuildSystem/BuildOperation.swift b/Sources/SWBBuildSystem/BuildOperation.swift
index 8129e0aa..0239583c 100644
--- a/Sources/SWBBuildSystem/BuildOperation.swift
+++ b/Sources/SWBBuildSystem/BuildOperation.swift
@@ -244,7 +244,7 @@ package final class BuildOperation: BuildSystemOperation {
     private var wasAbortRequested = false
 
     /// Optional map of a subset of files to build and their desired output paths
-    private let buildOutputMap: [String:String]?
+    private let buildOutputMap: [String: String]?
 
     /// Optional list of a subset of nodes to build
     private let nodesToBuild: [BuildDescription.BuildNodeToPrepareForIndex]?
@@ -265,7 +265,7 @@ package final class BuildOperation: BuildSystemOperation {
 
     package let cachedBuildSystems: any BuildSystemCache
 
-    package init(_ request: BuildRequest, _ requestContext: BuildRequestContext, _ buildDescription: BuildDescription, environment: [String: String]? = nil, _ delegate: any BuildOperationDelegate, _ clientDelegate: any ClientDelegate, _ cachedBuildSystems: any BuildSystemCache, persistent: Bool = false, serial: Bool = false, buildOutputMap: [String:String]? = nil, nodesToBuild: [BuildDescription.BuildNodeToPrepareForIndex]? = nil, workspace: SWBCore.Workspace, core: Core, userPreferences: UserPreferences) {
+    package init(_ request: BuildRequest, _ requestContext: BuildRequestContext, _ buildDescription: BuildDescription, environment: [String: String]? = nil, _ delegate: any BuildOperationDelegate, _ clientDelegate: any ClientDelegate, _ cachedBuildSystems: any BuildSystemCache, persistent: Bool = false, serial: Bool = false, buildOutputMap: [String: String]? = nil, nodesToBuild: [BuildDescription.BuildNodeToPrepareForIndex]? = nil, workspace: SWBCore.Workspace, core: Core, userPreferences: UserPreferences) {
         self.uuid = UUID()
         self.request = request
         self.requestContext = requestContext
@@ -290,7 +290,7 @@ package final class BuildOperation: BuildSystemOperation {
         buildOutputDelegate = delegate.buildStarted(self)
 
         // Report the copied path map.
-        delegate.reportPathMap(self, copiedPathMap: buildDescription.copiedPathMap, generatedFilesPathMap: buildOutputMap ?? [String:String]())
+        delegate.reportPathMap(self, copiedPathMap: buildDescription.copiedPathMap, generatedFilesPathMap: buildOutputMap ?? [String: String]())
 
         // Report the diagnostics from task construction.
         //
@@ -335,9 +335,16 @@ package final class BuildOperation: BuildSystemOperation {
                 switch overrides {
                 case let .table(overrides):
                     if !overrides.isEmpty {
-                        buildOutputDelegate.emit(Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("Applying \(infix) build settings"), childDiagnostics: overrides.sorted(by: \.0).map { (key, value) in
-                            Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("\(key)=\(value)"))
-                        }))
+                        buildOutputDelegate.emit(
+                            Diagnostic(
+                                behavior: .note,
+                                location: .unknown,
+                                data: DiagnosticData("Applying \(infix) build settings"),
+                                childDiagnostics: overrides.sorted(by: \.0).map { (key, value) in
+                                    Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("\(key)=\(value)"))
+                                }
+                            )
+                        )
                     }
                 case let .file(path):
                     buildOutputDelegate.emit(Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("Applying \(infix) build settings from path: \(path.str)")))
@@ -354,7 +361,7 @@ package final class BuildOperation: BuildSystemOperation {
 
         // If the build has been cancelled before it really began, we can bail out early
         do {
-            let isCancelled = await queue.sync{ self.wasCancellationRequested }
+            let isCancelled = await queue.sync { self.wasCancellationRequested }
             if !UserDefaults.skipEarlyBuildOperationCancellation && isCancelled {
                 let effectiveStatus = BuildOperationEnded.Status.cancelled
                 delegate.buildComplete(self, status: effectiveStatus, delegate: buildOutputDelegate, metrics: nil)
@@ -408,7 +415,7 @@ package final class BuildOperation: BuildSystemOperation {
             debuggingDataPath = nil
         }
 
-        var buildEnvironment: [String:String] = [:]
+        var buildEnvironment: [String: String] = [:]
 
         if let actualEnvironment = environment {
             buildEnvironment.addContents(of: actualEnvironment)
@@ -542,7 +549,7 @@ package final class BuildOperation: BuildSystemOperation {
                     // Build selected nodes, the build fails if one operation failed.
                     var currResult = true
                     for nodeToPrepare in buildOnlyTheseNodes {
-                        let isCancelled = await queue.sync{ self.wasCancellationRequested }
+                        let isCancelled = await queue.sync { self.wasCancellationRequested }
                         if isCancelled {
                             currResult = false
                             break
@@ -704,14 +711,14 @@ package final class BuildOperation: BuildSystemOperation {
         }
 
         #if canImport(Darwin)
-        do {
-            if let xcbuildDataArchive = getEnvironmentVariable("XCBUILDDATA_ARCHIVE")?.nilIfEmpty.map(Path.init) {
-                let archive = XCBuildDataArchive(filePath: xcbuildDataArchive)
-                try archive.appendBuildDataDirectory(from: buildDescription.dir, uuid: uuid)
+            do {
+                if let xcbuildDataArchive = getEnvironmentVariable("XCBUILDDATA_ARCHIVE")?.nilIfEmpty.map(Path.init) {
+                    let archive = XCBuildDataArchive(filePath: xcbuildDataArchive)
+                    try archive.appendBuildDataDirectory(from: buildDescription.dir, uuid: uuid)
+                }
+            } catch {
+                self.buildOutputDelegate.error("unable to process build ended event via the BuildOperationExtensionPoint: \(error)")
             }
-        } catch {
-            self.buildOutputDelegate.error("unable to process build ended event via the BuildOperationExtensionPoint: \(error)")
-        }
         #endif
 
         if let swiftBuildTraceFilePath = getEnvironmentVariable("SWIFTBUILD_TRACE_FILE")?.nilIfEmpty.map(Path.init) ?? getEnvironmentVariable("XCBUILDDATA_ARCHIVE")?.nilIfEmpty.map(Path.init)?.dirname.join(".SWIFTBUILD_TRACE") {
@@ -722,7 +729,7 @@ package final class BuildOperation: BuildSystemOperation {
                 let path: String
             }
             do {
-                let traceEntry  = SwiftDataTraceEntry(
+                let traceEntry = SwiftDataTraceEntry(
                     buildDescriptionSignature: buildDescription.signature.asString,
                     isTargetParallelizationEnabled: request.useParallelTargets,
                     name: workspace.name,
@@ -743,7 +750,7 @@ package final class BuildOperation: BuildSystemOperation {
         let effectiveStatus: BuildOperationEnded.Status?
         switch (isCancelled, isAborted) {
         case (true, false), (true, true):
-            effectiveStatus = .cancelled // cancelled always wins over aborted
+            effectiveStatus = .cancelled  // cancelled always wins over aborted
         case (false, true):
             effectiveStatus = .failed
         case (false, false):
@@ -755,7 +762,7 @@ package final class BuildOperation: BuildSystemOperation {
     }
 
     func prepareForBuilding() async -> ([String], [String])? {
-        let warnings = [String]()       // Not presently used
+        let warnings = [String]()  // Not presently used
         var errors = [String]()
 
         // Create the module session file if necessary.
@@ -765,11 +772,9 @@ package final class BuildOperation: BuildSystemOperation {
             do {
                 try fs.createDirectory(moduleSessionFilePath.dirname, recursive: true)
                 try fs.write(moduleSessionFilePath, contents: fileContents)
-            }
-            catch let err as SWBUtil.POSIXError {
+            } catch let err as SWBUtil.POSIXError {
                 errors.append("unable to write module session file at '\(moduleSessionFilePath.str)': \(err.description)")
-            }
-            catch {
+            } catch {
                 errors.append("unable to write module session file at '\(moduleSessionFilePath.str)': unknown error")
             }
         }
@@ -814,7 +819,7 @@ package final class BuildOperation: BuildSystemOperation {
         ]
         if let pluginPath = info.options.pluginPath {
             commandLine.append(contentsOf: [
-                "-fcas-plugin-path", pluginPath.str
+                "-fcas-plugin-path", pluginPath.str,
             ])
         }
         let result: Processes.ExecutionResult = try await clientDelegate.executeExternalTool(commandLine: commandLine)
@@ -959,7 +964,7 @@ extension BuildOperation: Hashable {
         hasher.combine(ObjectIdentifier(self))
     }
 
-    package static func ==(lhs: BuildOperation, rhs: BuildOperation) -> Bool {
+    package static func == (lhs: BuildOperation, rhs: BuildOperation) -> Bool {
         return lhs === rhs
     }
 }
@@ -969,9 +974,9 @@ extension BuildOperation: Hashable {
 // these delegates.
 final class CustomTaskSerializerDelegate: ConfiguredTargetSerializerDelegate {
     var currentBuildParametersIndex: Int = 0
-    var buildParametersIndexes = [BuildParameters : Int]()
+    var buildParametersIndexes = [BuildParameters: Int]()
     var currentConfiguredTargetIndex: Int = 0
-    var configuredTargetIndexes = [ConfiguredTarget : Int]()
+    var configuredTargetIndexes = [ConfiguredTarget: Int]()
 }
 
 final class CustomTaskDeserializerDelegate: ConfiguredTargetDeserializerDelegate {
@@ -1062,7 +1067,7 @@ private struct OperatorSystemAdaptorDynamicContext: DynamicTaskExecutionDelegate
         if singleUse {
             if adaptor.operation.request.recordBuildBacktraces, let reason = reason {
                 // Since this is a single use task, record a backtrace frame describing why it was requested
-                adaptor.recordBuildBacktraceFrame(identifier: .task(.taskIdentifier(ByteString(encodingAsUTF8: identifier.rawValue))), previousFrameIdentifier: .task(.taskIdentifier(ByteString(encodingAsUTF8: task.identifier.rawValue))), category: .dynamicTaskRequest, kind: reason.backtraceFrameKind, description: reason.description )
+                adaptor.recordBuildBacktraceFrame(identifier: .task(.taskIdentifier(ByteString(encodingAsUTF8: identifier.rawValue))), previousFrameIdentifier: .task(.taskIdentifier(ByteString(encodingAsUTF8: task.identifier.rawValue))), category: .dynamicTaskRequest, kind: reason.backtraceFrameKind, description: reason.description)
             }
             commandInterface.commandsNeedsSingleUseInput(key: buildKey, inputID: taskID)
         } else {
@@ -1220,9 +1225,9 @@ private class InProcessCommand: SWBLLBuild.ExternalCommand, SWBLLBuild.ExternalD
             task,
             dynamicExecutionDelegate: adaptorInterfaceDelegate,
             executionDelegate:
-            adaptor.operation,
+                adaptor.operation,
             clientDelegate:
-            adaptor.operation.clientDelegate,
+                adaptor.operation.clientDelegate,
             outputDelegate: outputDelegate
         )
 
@@ -1283,9 +1288,7 @@ private class BuildValueValidatingInProcessCommand: InProcessCommand, ProducesCu
     }
 }
 
-
-
-private final class InProcessTool:  SWBLLBuild.Tool {
+private final class InProcessTool: SWBLLBuild.Tool {
     let actionType: TaskAction.Type
     let description: BuildDescription
     let adaptor: OperationSystemAdaptor
@@ -1325,12 +1328,14 @@ private final class InProcessTool:  SWBLLBuild.Tool {
         )
 
         guard let dynamicTask = try? DynamicTask(from: deserializer),
-            let spec = DynamicTaskSpecRegistry.spec(for: dynamicTask.toolIdentifier) else {
+            let spec = DynamicTaskSpecRegistry.spec(for: dynamicTask.toolIdentifier)
+        else {
             return nil
         }
 
         guard let executableTask = try? spec.buildExecutableTask(dynamicTask: dynamicTask, context: adaptor.dynamicOperationContext),
-              let taskAction = try? spec.buildTaskAction(dynamicTaskKey: dynamicTask.taskKey, context: adaptor.dynamicOperationContext) else {
+            let taskAction = try? spec.buildTaskAction(dynamicTaskKey: dynamicTask.taskKey, context: adaptor.dynamicOperationContext)
+        else {
             return nil
         }
 
@@ -1539,7 +1544,7 @@ internal final class OperationSystemAdaptor: SWBLLBuild.BuildSystemDelegate, Act
     func cleanupCompilationCache() {
         let settings = operation.requestContext.getCachedSettings(operation.request.parameters)
         if settings.globalScope.evaluate(BuiltinMacros.COMPILATION_CACHE_KEEP_CAS_DIRECTORY) {
-            return // Keep the cache directory.
+            return  // Keep the cache directory.
         }
 
         let cachePath = Path(settings.globalScope.evaluate(BuiltinMacros.COMPILATION_CACHE_CAS_PATH))
@@ -1566,7 +1571,7 @@ internal final class OperationSystemAdaptor: SWBLLBuild.BuildSystemDelegate, Act
     func cleanupGlobalModuleCache() {
         let settings = operation.requestContext.getCachedSettings(operation.request.parameters)
         if settings.globalScope.evaluate(BuiltinMacros.KEEP_GLOBAL_MODULE_CACHE_DIRECTORY) {
-            return // Keep the cache directory.
+            return  // Keep the cache directory.
         }
 
         let cachePath = settings.globalScope.evaluate(BuiltinMacros.MODULE_CACHE_DIR)
@@ -1698,7 +1703,7 @@ internal final class OperationSystemAdaptor: SWBLLBuild.BuildSystemDelegate, Act
         // Get the task for this command.
         //
         // FIXME: Find a better way to maintain command associations.
-         if let registeredTask = description.taskStore.task(for: identifier) {
+        if let registeredTask = description.taskStore.task(for: identifier) {
             return registeredTask
         } else if let dynamicTask = dynamicTask(for: identifier) {
             return dynamicTask
@@ -2032,9 +2037,10 @@ internal final class OperationSystemAdaptor: SWBLLBuild.BuildSystemDelegate, Act
         } else {
             let inputsString = inputDescriptions.joined(separator: ", ")
             let allInputsAreFiles = inputs.map { ($0.kind == .customTask, $0.key) }.filter { $0 == false && $1.hasPrefix("<") }.isEmpty
-            let adviceString = inputDescriptions.count > 1
-            ? "Did you forget to declare these \(allInputsAreFiles ? "file" : "node")s as outputs of any script phases or custom build rules which produce them?"
-            : "Did you forget to declare this \(allInputsAreFiles ? "file" : "node") as an output of a script phase or custom build rule which produces it?"
+            let adviceString =
+                inputDescriptions.count > 1
+                ? "Did you forget to declare these \(allInputsAreFiles ? "file" : "node")s as outputs of any script phases or custom build rules which produce them?"
+                : "Did you forget to declare this \(allInputsAreFiles ? "file" : "node") as an output of a script phase or custom build rule which produces it?"
             message = "Build input\(allInputsAreFiles ? " file" : "")\(inputDescriptions.count > 1 ? "s" : "") cannot be found: \(inputsString). \(adviceString)"
         }
         // This error happens before the command has started, so we do this here in order to have a command output delegate.
@@ -2091,7 +2097,8 @@ internal final class OperationSystemAdaptor: SWBLLBuild.BuildSystemDelegate, Act
 
         let cmdInfos: [CommandInfo] = commands.compactMap { command in
             guard let task = lookupTask(TaskIdentifier(command: command)),
-                  let target = task.forTarget else { return nil }
+                let target = task.forTarget
+            else { return nil }
             return CommandInfo(command: command, task: task, target: target)
         }
 
@@ -2101,9 +2108,11 @@ internal final class OperationSystemAdaptor: SWBLLBuild.BuildSystemDelegate, Act
         }
 
         // Make sure we're stable between runs and then pick the "best" target
-        guard let selectedTarget = cmdInfos.map(\.target).sorted().one(by: {
-            self.operation.requestContext.selectConfiguredTargetForIndex($0, $1, hasEnabledIndexBuildArena: true, runDestination: buildRequest.parameters.activeRunDestination)
-        }) else {
+        guard
+            let selectedTarget = cmdInfos.map(\.target).sorted().one(by: {
+                self.operation.requestContext.selectConfiguredTargetForIndex($0, $1, hasEnabledIndexBuildArena: true, runDestination: buildRequest.parameters.activeRunDestination)
+            })
+        else {
             // This shouldn't actually be possible - `one` returns `nil` only
             // the initial array is empty, which it isn't.
             return nil
@@ -2114,10 +2123,12 @@ internal final class OperationSystemAdaptor: SWBLLBuild.BuildSystemDelegate, Act
         }).richFormattedRuleInfo(workspace: workspace)
 
         self.buildOutputDelegate.emit(
-            Diagnostic(behavior: .warning,
-                       location: .unknown,
-                       data: DiagnosticData("Multiple commands produce '\(output.key)', picked with target '\(selectedTarget.guid)'"),
-                       childDiagnostics: childDiagnostics)
+            Diagnostic(
+                behavior: .warning,
+                location: .unknown,
+                data: DiagnosticData("Multiple commands produce '\(output.key)', picked with target '\(selectedTarget.guid)'"),
+                childDiagnostics: childDiagnostics
+            )
         )
 
         return cmdInfos.first(where: { $0.target === selectedTarget })?.command
@@ -2203,12 +2214,12 @@ internal final class OperationSystemAdaptor: SWBLLBuild.BuildSystemDelegate, Act
         case let buildKey as BuildKey.CustomTask:
             return .task(BuildOperationTaskSignature.taskIdentifier(ByteString(encodingAsUTF8: buildKey.name)))
         case is BuildKey.DirectoryContents,
-             is BuildKey.FilteredDirectoryContents,
-             is BuildKey.DirectoryTreeSignature,
-             is BuildKey.DirectoryTreeStructureSignature,
-             is BuildKey.Node,
-             is BuildKey.Target,
-             is BuildKey.Stat:
+            is BuildKey.FilteredDirectoryContents,
+            is BuildKey.DirectoryTreeSignature,
+            is BuildKey.DirectoryTreeStructureSignature,
+            is BuildKey.Node,
+            is BuildKey.Target,
+            is BuildKey.Stat:
             return .genericBuildKey(buildKey.description)
         default:
             return nil
@@ -2455,7 +2466,7 @@ extension OperationSystemAdaptor: SubtaskProgressReporter {
     }
 }
 
-private func ==<K, V>(lhs: [K: V]?, rhs: [K: V]?) -> Bool {
+private func == <K, V>(lhs: [K: V]?, rhs: [K: V]?) -> Bool {
     switch (lhs, rhs) {
     case (let lhs?, let rhs?):
         return lhs == rhs
diff --git a/Sources/SWBBuildSystem/BuildOperationExtension.swift b/Sources/SWBBuildSystem/BuildOperationExtension.swift
index 9bca060d..02ba82bc 100644
--- a/Sources/SWBBuildSystem/BuildOperationExtension.swift
+++ b/Sources/SWBBuildSystem/BuildOperationExtension.swift
@@ -25,13 +25,16 @@ package struct BuildOperationExtensionPoint: ExtensionPoint {
 
     package static func additionalEnvironmentVariables(pluginManager: any PluginManager, fromEnvironment: @autoclosure () -> [String: String], parameters: @autoclosure () -> BuildParameters) throws -> [String: String] {
         let (fromEnvironment, parameters) = (fromEnvironment(), parameters())
-        return try pluginManager.extensions(of: Self.self).reduce([:], { environment, ext in
-            try environment.addingContents(of: ext.additionalEnvironmentVariables(fromEnvironment: fromEnvironment, parameters: parameters))
-        })
+        return try pluginManager.extensions(of: Self.self).reduce(
+            [:],
+            { environment, ext in
+                try environment.addingContents(of: ext.additionalEnvironmentVariables(fromEnvironment: fromEnvironment, parameters: parameters))
+            }
+        )
     }
 }
 
 package protocol BuildOperationExtension: Sendable {
     /// Provides a dictionary of additional environment variables
-    func additionalEnvironmentVariables(fromEnvironment: [String:String], parameters: BuildParameters) throws -> [String:String]
+    func additionalEnvironmentVariables(fromEnvironment: [String: String], parameters: BuildParameters) throws -> [String: String]
 }
diff --git a/Sources/SWBBuildSystem/CleanOperation.swift b/Sources/SWBBuildSystem/CleanOperation.swift
index 3c5c7054..ab212346 100644
--- a/Sources/SWBBuildSystem/CleanOperation.swift
+++ b/Sources/SWBBuildSystem/CleanOperation.swift
@@ -160,7 +160,7 @@ package final class CleanOperation: BuildSystemOperation, TargetDependencyResolv
     }
 
     private final class CleanExecutableTask: ExecutableTask {
-        init(commandLine: [String], workingDirectory: Path, environment: [String:String], configuredTarget: ConfiguredTarget, type: any TaskTypeDescription) {
+        init(commandLine: [String], workingDirectory: Path, environment: [String: String], configuredTarget: ConfiguredTarget, type: any TaskTypeDescription) {
             self.commandLine = commandLine.map { .literal(ByteString(encodingAsUTF8: $0)) }
             self.workingDirectory = workingDirectory
             self.environment = EnvironmentBindings(environment)
@@ -242,7 +242,7 @@ package final class CleanOperation: BuildSystemOperation, TargetDependencyResolv
         if let reason = error.localizedFailureReason {
             description += " (\(reason))"
         }
-        return NSError(domain: "org.swift.swift-build", code: 0, userInfo: [ NSLocalizedDescriptionKey: "\(message): \(description)" ])
+        return NSError(domain: "org.swift.swift-build", code: 0, userInfo: [NSLocalizedDescriptionKey: "\(message): \(description)"])
     }
 
     private func cleanBuildFolders(buildFolders: Set<Path>, buildOutputDelegate: any BuildOutputDelegate) {
@@ -283,9 +283,16 @@ package final class CleanOperation: BuildSystemOperation, TargetDependencyResolv
                 } else {
                     message += "."
                 }
-                buildOutputDelegate.emit(Diagnostic(behavior: .error, location: .unknown, data: DiagnosticData(message), childDiagnostics: [
-                    Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("To mark this directory as deletable by the build system, run `\(UNIXShellCommandCodec(encodingStrategy: .singleQuotes, encodingBehavior: .fullCommandLine).encode(fs.commandLineArgumentsToApplyCreatedByBuildSystemAttribute(to: buildFolderPath)))` when it is created."))
-                ]))
+                buildOutputDelegate.emit(
+                    Diagnostic(
+                        behavior: .error,
+                        location: .unknown,
+                        data: DiagnosticData(message),
+                        childDiagnostics: [
+                            Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("To mark this directory as deletable by the build system, run `\(UNIXShellCommandCodec(encodingStrategy: .singleQuotes, encodingBehavior: .fullCommandLine).encode(fs.commandLineArgumentsToApplyCreatedByBuildSystemAttribute(to: buildFolderPath)))` when it is created."))
+                        ]
+                    )
+                )
             }
         }
     }
diff --git a/Sources/SWBBuildSystem/DependencyCycleFormatter.swift b/Sources/SWBBuildSystem/DependencyCycleFormatter.swift
index 88e83e99..33e17a31 100644
--- a/Sources/SWBBuildSystem/DependencyCycleFormatter.swift
+++ b/Sources/SWBBuildSystem/DependencyCycleFormatter.swift
@@ -25,7 +25,7 @@ private enum TaskType: Equatable {
     case other
 }
 
-private func ==(lhs: TaskType, rhs: TaskType) -> Bool {
+private func == (lhs: TaskType, rhs: TaskType) -> Bool {
     switch (lhs, rhs) {
     case (.beginTargetTask(_), .beginTargetTask(_)): return true
     case (.endTargetTask(_), .endTargetTask(_)): return true
@@ -157,8 +157,7 @@ struct DependencyCycleFormatter {
         let rulesInCycle: [BuildKey]
         do {
             rulesInCycle = try rulesInsideCycle()
-        }
-        catch {
+        } catch {
             return error.localizedDescription
         }
 
@@ -186,8 +185,7 @@ struct DependencyCycleFormatter {
             } else {
                 (cycleOutput, involvesManualTargetOrder) = try formattedMultiTargetCycleOutput(rulesInCycle)
             }
-        }
-        catch {
+        } catch {
             return error.localizedDescription
         }
 
@@ -335,94 +333,93 @@ struct DependencyCycleFormatter {
         var previousConfiguredTarget: ConfiguredTarget? = nil
         var previousTargetDependencies = [ResolvedTargetDependency]()
         var savedTasks = [(rule: BuildKey, task: any ExecutableTask)]()
-        let cycleMessagePayloads: [DependencyCycleMessagePayload] = (try cycleRules.compactMap({ rule in
-            // The custom rule explaining the reason for the target dependency, if we create one for this rule.
-            var messagePayloads: [DependencyCycleMessagePayload]? = nil
-
-            // Get the task for the rule, if any.
-            let task: (any ExecutableTask)? = try {
-                if let task = executableTask(for: rule) {
-                    return task
-                } else if let customRule = rule as? BuildKey.CustomTask, let task = try executableTaskForCustomRule(customRule) {
-                    return task
-                } else {
-                    return nil
-                }
-            }()
-
-            if let task {
-                if let configuredTarget = task.forTarget {
-                    // We're only going to report anything if we've crossed a target boundary.
-                    // In the future we can adjust this if we find multi-target cycles where tasks within a target are relevant, either materially or to provide useful context to humans.
-                    if configuredTarget != previousConfiguredTarget {
-                        // We only create a message if we have saved tasks.
-                        if !savedTasks.isEmpty, let previousConfiguredTarget {
-                            // If both this and the saved task are gate tasks, then we almost certainly have a target dependency, either explicit, implicit, or due to ordering.
-                            // It would be weird if there is a task without a target between the previous task and this task, which is why we use .first here.  If we find a scenario where that happens, we can revise this.  (We use .first rather than .only so we don't drop something on the floor that we are capable of reporting.)
-                            if task.isGate, let previousTask = savedTasks.first?.task, previousTask.isGate {
-                                // Resolve the dependency between the previous target and this one.
-                                let resolvedTargetDependency = previousTargetDependencies.filter({ $0.target == configuredTarget }).only
-
-                                // We only note that manual target order is in use if we see that we've crossed a target boundary but we couldn't find an expressed target dependency.  Otherwise it (in theory) doesn't matter whether manual target order is in use, because the target dependencies in the cycle should be the same even if it weren't.
-                                if resolvedTargetDependency == nil, !buildDescription.targetsBuildInParallel {
-                                    involvesManualTargetOrder = true
-                                }
+        let cycleMessagePayloads: [DependencyCycleMessagePayload] =
+            (try cycleRules.compactMap({ rule in
+                // The custom rule explaining the reason for the target dependency, if we create one for this rule.
+                var messagePayloads: [DependencyCycleMessagePayload]? = nil
+
+                // Get the task for the rule, if any.
+                let task: (any ExecutableTask)? = try {
+                    if let task = executableTask(for: rule) {
+                        return task
+                    } else if let customRule = rule as? BuildKey.CustomTask, let task = try executableTaskForCustomRule(customRule) {
+                        return task
+                    } else {
+                        return nil
+                    }
+                }()
+
+                if let task {
+                    if let configuredTarget = task.forTarget {
+                        // We're only going to report anything if we've crossed a target boundary.
+                        // In the future we can adjust this if we find multi-target cycles where tasks within a target are relevant, either materially or to provide useful context to humans.
+                        if configuredTarget != previousConfiguredTarget {
+                            // We only create a message if we have saved tasks.
+                            if !savedTasks.isEmpty, let previousConfiguredTarget {
+                                // If both this and the saved task are gate tasks, then we almost certainly have a target dependency, either explicit, implicit, or due to ordering.
+                                // It would be weird if there is a task without a target between the previous task and this task, which is why we use .first here.  If we find a scenario where that happens, we can revise this.  (We use .first rather than .only so we don't drop something on the floor that we are capable of reporting.)
+                                if task.isGate, let previousTask = savedTasks.first?.task, previousTask.isGate {
+                                    // Resolve the dependency between the previous target and this one.
+                                    let resolvedTargetDependency = previousTargetDependencies.filter({ $0.target == configuredTarget }).only
+
+                                    // We only note that manual target order is in use if we see that we've crossed a target boundary but we couldn't find an expressed target dependency.  Otherwise it (in theory) doesn't matter whether manual target order is in use, because the target dependencies in the cycle should be the same even if it weren't.
+                                    if resolvedTargetDependency == nil, !buildDescription.targetsBuildInParallel {
+                                        involvesManualTargetOrder = true
+                                    }
 
-                                // Create a new custom task with the message describing the dependency between these targets.
-                                // Note that we would only not have a previous target here if we're still in the first target of the cycle.  But we should find the dependency again later on.
-                                // FIXME: This doesn't handle the case where the workspace has multiple targets with the same name (in different projects).
-                                let targetName = configuredTarget.target.name
-                                let previousTargetName = previousConfiguredTarget.target.name
-                                let message: String
-                                switch resolvedTargetDependency?.reason {
-                                case .explicit?:
-                                    message = "Target '\(previousTargetName)' has an explicit dependency on Target '\(targetName)'"
-                                case let .implicitBuildPhaseLinkage(filename, _, buildPhase)?:
-                                    message = "Target '\(previousTargetName)' has an implicit dependency on Target '\(targetName)' because '\(previousTargetName)' references the file '\(filename)' in the build phase '\(buildPhase)'"
-                                case let .implicitBuildSetting(settingName, options)?:
-                                    message = "Target '\(previousTargetName)' has an implicit dependency on Target '\(targetName)' because '\(previousTargetName)' defines the option '\(options.joined(separator: " "))' in the build setting '\(settingName)'"
-                                case let .impliedByTransitiveDependencyViaRemovedTargets(intermediateTargetName: intermediateTargetName):
-                                    message = "Target '\(previousTargetName)' has a dependency on Target '\(targetName)' via its transitive dependency through '\(intermediateTargetName)'"
-                                case nil:
-                                    if !buildDescription.targetsBuildInParallel {
-                                        message = "Target '\(previousTargetName)' is ordered after Target '\(targetName)' in a “Target Dependencies” build phase" + (buildRequest.schemeCommand != nil ? " or in the scheme" : "")
-                                    } else {
-                                        message = "Target '\(previousTargetName)' depends on Target '\(targetName)', but the reason for the dependency could not be determined"
+                                    // Create a new custom task with the message describing the dependency between these targets.
+                                    // Note that we would only not have a previous target here if we're still in the first target of the cycle.  But we should find the dependency again later on.
+                                    // FIXME: This doesn't handle the case where the workspace has multiple targets with the same name (in different projects).
+                                    let targetName = configuredTarget.target.name
+                                    let previousTargetName = previousConfiguredTarget.target.name
+                                    let message: String
+                                    switch resolvedTargetDependency?.reason {
+                                    case .explicit?:
+                                        message = "Target '\(previousTargetName)' has an explicit dependency on Target '\(targetName)'"
+                                    case let .implicitBuildPhaseLinkage(filename, _, buildPhase)?:
+                                        message = "Target '\(previousTargetName)' has an implicit dependency on Target '\(targetName)' because '\(previousTargetName)' references the file '\(filename)' in the build phase '\(buildPhase)'"
+                                    case let .implicitBuildSetting(settingName, options)?:
+                                        message = "Target '\(previousTargetName)' has an implicit dependency on Target '\(targetName)' because '\(previousTargetName)' defines the option '\(options.joined(separator: " "))' in the build setting '\(settingName)'"
+                                    case let .impliedByTransitiveDependencyViaRemovedTargets(intermediateTargetName: intermediateTargetName):
+                                        message = "Target '\(previousTargetName)' has a dependency on Target '\(targetName)' via its transitive dependency through '\(intermediateTargetName)'"
+                                    case nil:
+                                        if !buildDescription.targetsBuildInParallel {
+                                            message = "Target '\(previousTargetName)' is ordered after Target '\(targetName)' in a “Target Dependencies” build phase" + (buildRequest.schemeCommand != nil ? " or in the scheme" : "")
+                                        } else {
+                                            message = "Target '\(previousTargetName)' depends on Target '\(targetName)', but the reason for the dependency could not be determined"
+                                        }
                                     }
+
+                                    messagePayloads = [DependencyCycleMessagePayload(configuredTarget, .message(message))]
                                 }
 
-                                messagePayloads = [DependencyCycleMessagePayload(configuredTarget, .message(message))]
+                                // If the two tasks are not gate tasks, then we're crossing a target boundary for a different reason and we need to create a message from the tasks and the intervening node.
+                                else {
+                                    messagePayloads = savedTasks.enumerated().map({ index, saved in DependencyCycleMessagePayload(index == 0 ? previousConfiguredTarget : nil, .rule(saved.rule)) }) + [DependencyCycleMessagePayload(configuredTarget, .rule(rule))]
+                                }
                             }
 
-                            // If the two tasks are not gate tasks, then we're crossing a target boundary for a different reason and we need to create a message from the tasks and the intervening node.
-                            else {
-                                messagePayloads = savedTasks.enumerated().map({ index, saved in DependencyCycleMessagePayload( index == 0 ? previousConfiguredTarget : nil, .rule(saved.rule)) }) +
-                                    [DependencyCycleMessagePayload(configuredTarget, .rule(rule))]
-                            }
+                            // Record the current target as the new previous target.  Also zero out previousTargetDependencies since we're in a new target.
+                            previousConfiguredTarget = configuredTarget
+                            previousTargetDependencies = []
                         }
 
-                        // Record the current target as the new previous target.  Also zero out previousTargetDependencies since we're in a new target.
-                        previousConfiguredTarget = configuredTarget
-                        previousTargetDependencies = []
+                        // Save this task rule and task.
+                        savedTasks = [(rule, task)]
+                    } else {
+                        // If this task doesn't have a target, then add this task rule and task to the saved list so we have tasks going back to the last task with a target.
+                        savedTasks.append((rule, task))
                     }
 
-                    // Save this task rule and task.
-                    savedTasks = [(rule, task)]
-                }
-                else {
-                    // If this task doesn't have a target, then add this task rule and task to the saved list so we have tasks going back to the last task with a target.
-                    savedTasks.append((rule, task))
-                }
-
-                // If this task has target dependencies, then record them as the previous target's dependencies.
-                // Note that only (some?) gate tasks populate this property; see the comment in ExecutableTask.targetDependencies.
-                if !task.targetDependencies.isEmpty {
-                    previousTargetDependencies = task.targetDependencies
+                    // If this task has target dependencies, then record them as the previous target's dependencies.
+                    // Note that only (some?) gate tasks populate this property; see the comment in ExecutableTask.targetDependencies.
+                    if !task.targetDependencies.isEmpty {
+                        previousTargetDependencies = task.targetDependencies
+                    }
                 }
-            }
 
-            return messagePayloads
-        }) as [[DependencyCycleMessagePayload]]).reduce([], +)
+                return messagePayloads
+            }) as [[DependencyCycleMessagePayload]]).reduce([], +)
 
         // Create the formatted output for the cycle.
         let messages: [(target: ConfiguredTarget?, message: String)] = try cycleMessagePayloads.compactMap { payload in
@@ -462,14 +459,16 @@ struct DependencyCycleFormatter {
         // For target dependencies, remove the task that led to it.
         var effectiveRules = cycleRules
         for rule in cycleRules.enumerated().dropLast(4) {
-            let nodePairs = [("entry", "end"),
-                             ("begin-compiling", "modules-ready"),
-                             ("begin-linking", "linker-inputs-ready")]
+            let nodePairs = [
+                ("entry", "end"),
+                ("begin-compiling", "modules-ready"),
+                ("begin-linking", "linker-inputs-ready"),
+            ]
 
             for (begin, end) in nodePairs {
                 // Check if the successor build keys match a target dependency:
                 // target entry node => target entry gate task => target end node => target end gate task
-                if let cmd = self.executableTask(for: cycleRules[rule.offset + 2]), cmd.taskType == .beginTargetTask(targetName: ""), cycleRules[rule.offset + 1].key.hasSuffix("-\(begin)>")  {
+                if let cmd = self.executableTask(for: cycleRules[rule.offset + 2]), cmd.taskType == .beginTargetTask(targetName: ""), cycleRules[rule.offset + 1].key.hasSuffix("-\(begin)>") {
                     if let cmd = self.executableTask(for: cycleRules[rule.offset + 4]), cmd.taskType == .endTargetTask(targetName: ""), cycleRules[rule.offset + 3].key.hasSuffix("-\(end)>") {
                         // If they do, replace the current task, because only the target's name is relevant but not the concrete task.
                         if let targetName = self.executableTask(for: rule.element)?.forTarget?.target.name {
@@ -594,15 +593,15 @@ struct DependencyCycleFormatter {
             } else {
                 rawDescription = String(bytes: rule.keyData, encoding: .utf8) ?? rule.key
             }
-            default:
-                rawDescription = rule.key
+        default:
+            rawDescription = rule.key
         }
         return "\(rule.kind): \(rawDescription)"
     }
 
     /// Look up and return an `ExecutableTask` from the `BuildDescription` if `buildKey` is a command.
     private func executableTask(for buildKey: BuildKey) -> (any ExecutableTask)? {
-        return  buildKey.kind == .command ? buildDescription.taskStore.task(for: TaskIdentifier(rawValue: buildKey.key)) : nil
+        return buildKey.kind == .command ? buildDescription.taskStore.task(for: TaskIdentifier(rawValue: buildKey.key)) : nil
     }
 
     /// Grab target names from the rules involved in the cycle.
diff --git a/Sources/SWBBuildSystem/SandboxViolations.swift b/Sources/SWBBuildSystem/SandboxViolations.swift
index be69d624..b92e3b19 100644
--- a/Sources/SWBBuildSystem/SandboxViolations.swift
+++ b/Sources/SWBBuildSystem/SandboxViolations.swift
@@ -15,7 +15,7 @@ import SWBUtil
 package import SWBCore
 
 #if os(macOS)
-import OSLog
+    import OSLog
 #endif
 
 extension ExecutableTask {
@@ -31,45 +31,46 @@ extension ExecutableTask {
     package func extractSandboxViolationMessages_ASYNC_UNSAFE(startTime: Date) -> [String] {
         var res: [String] = []
         #if os(macOS)
-        withUnsafeCurrentTask { task in
-            if task != nil {
-                preconditionFailure("This function should not be invoked from the Swift Concurrency thread pool as it may lead to deadlock via thread starvation.")
+            withUnsafeCurrentTask { task in
+                if task != nil {
+                    preconditionFailure("This function should not be invoked from the Swift Concurrency thread pool as it may lead to deadlock via thread starvation.")
+                }
             }
-        }
 
-        if let store = try? OSLogStore.local() {
-            let query = String("((processID == 0 AND senderImagePath CONTAINS[c] \"/Sandbox\") OR (process == \"sandboxd\" AND subsystem == \"com.apple.sandbox.reporting\")) AND (eventMessage CONTAINS[c] %@)")
-            let endTime = Date()
-            let duration = -DateInterval(start: startTime, end: endTime).duration
+            if let store = try? OSLogStore.local() {
+                let query = String("((processID == 0 AND senderImagePath CONTAINS[c] \"/Sandbox\") OR (process == \"sandboxd\" AND subsystem == \"com.apple.sandbox.reporting\")) AND (eventMessage CONTAINS[c] %@)")
+                let endTime = Date()
+                let duration = -DateInterval(start: startTime, end: endTime).duration
 
-            let position = store.position(timeIntervalSinceEnd: duration)
+                let position = store.position(timeIntervalSinceEnd: duration)
 
-            let sentinel = identifier.sandboxProfileSentinel
+                let sentinel = identifier.sandboxProfileSentinel
 
-            if let entries = try? store.getEntries(with: [], at: position, matching: NSPredicate(format: query, sentinel)) {
-                for entry in entries {
-                    if entry is (any OSLogEntryWithPayload) {
-                        let fullViolation = entry.composedMessage
-                        if let strippedViolation = fullViolation.components(separatedBy: "\n").first {
-                            // strip the guid from the emitted diagnostic
-                            res.append(strippedViolation)
-                        } else {
-                            // this should never happen
-                            res.append("Failed to parse sandbox violation: \(fullViolation)")
+                if let entries = try? store.getEntries(with: [], at: position, matching: NSPredicate(format: query, sentinel)) {
+                    for entry in entries {
+                        if entry is (any OSLogEntryWithPayload) {
+                            let fullViolation = entry.composedMessage
+                            if let strippedViolation = fullViolation.components(separatedBy: "\n").first {
+                                // strip the guid from the emitted diagnostic
+                                res.append(strippedViolation)
+                            } else {
+                                // this should never happen
+                                res.append("Failed to parse sandbox violation: \(fullViolation)")
+                            }
                         }
-                    }
 
-                    if let entryWithPayload = entry as? (any OSLogEntryWithPayload),
-                        entryWithPayload.components.count == 5,
-                        entryWithPayload.components[3].argumentCategory == .string,
-                        let violationMessage = entryWithPayload.components[3].argumentStringValue {
-                        res.append(violationMessage)
+                        if let entryWithPayload = entry as? (any OSLogEntryWithPayload),
+                            entryWithPayload.components.count == 5,
+                            entryWithPayload.components[3].argumentCategory == .string,
+                            let violationMessage = entryWithPayload.components[3].argumentStringValue
+                        {
+                            res.append(violationMessage)
+                        }
                     }
                 }
             }
-        }
         #else
-        res.append("Cannot obtain list of violations on non-macOS platforms")
+            res.append("Cannot obtain list of violations on non-macOS platforms")
         #endif
         return res
     }
diff --git a/Sources/SWBCAS/CASFSNode.swift b/Sources/SWBCAS/CASFSNode.swift
index 970d68d4..58346af6 100644
--- a/Sources/SWBCAS/CASFSNode.swift
+++ b/Sources/SWBCAS/CASFSNode.swift
@@ -13,9 +13,9 @@
 public import SWBUtil
 import Foundation
 #if canImport(System)
-import System
+    import System
 #else
-import SystemPackage
+    import SystemPackage
 #endif
 
 /// A CAS object representing a filesystem node
@@ -49,7 +49,7 @@ public struct CASFSNode<CAS: CASProtocol>: Sendable {
             self.destination = destination
         }
 
-        func serialize<T>(to serializer: T) where T : SWBUtil.Serializer {
+        func serialize<T>(to serializer: T) where T: SWBUtil.Serializer {
             serializer.beginAggregate(2)
             serializer.serialize(name)
             serializer.serialize(destination)
diff --git a/Sources/SWBCAS/ToolchainCASPlugin.swift b/Sources/SWBCAS/ToolchainCASPlugin.swift
index 8caee630..0ef9ee08 100644
--- a/Sources/SWBCAS/ToolchainCASPlugin.swift
+++ b/Sources/SWBCAS/ToolchainCASPlugin.swift
@@ -112,64 +112,85 @@ public final class ToolchainCAS: @unchecked Sendable, CASProtocol, ActionCachePr
     public func cache(objectID: ToolchainDataID, forKeyID key: ToolchainDataID) async throws {
         let keyDigest = api.llcas_objectid_get_digest(cCas, key.id)
         let cancellationHandler = CancellationHandler(api: api)
-        try await withTaskCancellationHandler(operation: {
-            try await withCheckedThrowingContinuation { continuation in
-                let box = ContextBox<Void, any Error>(continuation: continuation, llcas_string_dispose: api.llcas_string_dispose)
-                var cancellationToken: llcas_cancellable_t? = nil
-                api.llcas_actioncache_put_for_digest_async(cCas, keyDigest, objectID.id, false, Unmanaged.passRetained(box).toOpaque(), { ctx, failed, error in
-                    let context = Unmanaged<ContextBox<Void, any Error>>.fromOpaque(ctx!).takeRetainedValue()
-                    if failed {
-                        var detailedError: String?
-                        if let error = error {
-                            detailedError = String(cString: error)
-                            context.llcas_string_dispose(error)
-                        }
-                        context.continuation.resume(throwing: ToolchainCASPluginError.cacheInsertionFailed(detailedError))
-                    } else {
-                        context.continuation.resume(returning: ())
+        try await withTaskCancellationHandler(
+            operation: {
+                try await withCheckedThrowingContinuation { continuation in
+                    let box = ContextBox<Void, any Error>(continuation: continuation, llcas_string_dispose: api.llcas_string_dispose)
+                    var cancellationToken: llcas_cancellable_t? = nil
+                    api.llcas_actioncache_put_for_digest_async(
+                        cCas,
+                        keyDigest,
+                        objectID.id,
+                        false,
+                        Unmanaged.passRetained(box).toOpaque(),
+                        { ctx, failed, error in
+                            let context = Unmanaged<ContextBox<Void, any Error>>.fromOpaque(ctx!).takeRetainedValue()
+                            if failed {
+                                var detailedError: String?
+                                if let error = error {
+                                    detailedError = String(cString: error)
+                                    context.llcas_string_dispose(error)
+                                }
+                                context.continuation.resume(throwing: ToolchainCASPluginError.cacheInsertionFailed(detailedError))
+                            } else {
+                                context.continuation.resume(returning: ())
+                            }
+                        },
+                        &cancellationToken
+                    )
+                    if let cancellationToken {
+                        cancellationHandler.registerCancellationToken(cancellationToken)
                     }
-                }, &cancellationToken)
-                if let cancellationToken {
-                    cancellationHandler.registerCancellationToken(cancellationToken)
                 }
+            },
+            onCancel: {
+                cancellationHandler.cancel()
             }
-        }, onCancel: {
-            cancellationHandler.cancel()
-        })
+        )
     }
 
     public func lookupCachedObject(for keyID: ToolchainDataID) async throws -> ToolchainDataID? {
         let keyDigest = api.llcas_objectid_get_digest(cCas, keyID.id)
         let cancellationHandler = CancellationHandler(api: api)
-        return try await withTaskCancellationHandler(operation: {
-            return try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<ToolchainDataID?, Error>) in
-                let box = ContextBox<ToolchainDataID?, any Error>(continuation: continuation, llcas_string_dispose: api.llcas_string_dispose)
-                var cancellationToken: llcas_cancellable_t? = nil
-                api.llcas_actioncache_get_for_digest_async(cCas, keyDigest, false, Unmanaged.passRetained(box).toOpaque(), { ctx, lookupResult, objectID, error in
-                    let context = Unmanaged<ContextBox<ToolchainDataID?, any Error>>.fromOpaque(ctx!).takeRetainedValue()
-                    switch lookupResult {
-                    case LLCAS_LOOKUP_RESULT_SUCCESS:
-                        context.continuation.resume(returning: ToolchainDataID(id: objectID))
-                    case LLCAS_LOOKUP_RESULT_NOTFOUND:
-                        context.continuation.resume(returning: nil)
-                    case LLCAS_LOOKUP_RESULT_ERROR:
-                        var detailedError: String?
-                        if let error {
-                            detailedError = String(cString: error)
-                            context.llcas_string_dispose(error)
-                        }
-                        context.continuation.resume(throwing: ToolchainCASPluginError.cacheLookupFailed(detailedError))
-                    default:
-                        context.continuation.resume(throwing: ToolchainCASPluginError.cacheLookupFailed(nil))
+        return try await withTaskCancellationHandler(
+            operation: {
+                return try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<ToolchainDataID?, Error>) in
+                    let box = ContextBox<ToolchainDataID?, any Error>(continuation: continuation, llcas_string_dispose: api.llcas_string_dispose)
+                    var cancellationToken: llcas_cancellable_t? = nil
+                    api.llcas_actioncache_get_for_digest_async(
+                        cCas,
+                        keyDigest,
+                        false,
+                        Unmanaged.passRetained(box).toOpaque(),
+                        { ctx, lookupResult, objectID, error in
+                            let context = Unmanaged<ContextBox<ToolchainDataID?, any Error>>.fromOpaque(ctx!).takeRetainedValue()
+                            switch lookupResult {
+                            case LLCAS_LOOKUP_RESULT_SUCCESS:
+                                context.continuation.resume(returning: ToolchainDataID(id: objectID))
+                            case LLCAS_LOOKUP_RESULT_NOTFOUND:
+                                context.continuation.resume(returning: nil)
+                            case LLCAS_LOOKUP_RESULT_ERROR:
+                                var detailedError: String?
+                                if let error {
+                                    detailedError = String(cString: error)
+                                    context.llcas_string_dispose(error)
+                                }
+                                context.continuation.resume(throwing: ToolchainCASPluginError.cacheLookupFailed(detailedError))
+                            default:
+                                context.continuation.resume(throwing: ToolchainCASPluginError.cacheLookupFailed(nil))
+                            }
+                        },
+                        &cancellationToken
+                    )
+                    if let cancellationToken {
+                        cancellationHandler.registerCancellationToken(cancellationToken)
                     }
-                }, &cancellationToken)
-                if let cancellationToken {
-                    cancellationHandler.registerCancellationToken(cancellationToken)
                 }
+            },
+            onCancel: {
+                cancellationHandler.cancel()
             }
-        }, onCancel: {
-            cancellationHandler.cancel()
-        })
+        )
     }
 
     public func getOnDiskSize() throws -> Int64 {
@@ -195,7 +216,7 @@ public final class ToolchainCAS: @unchecked Sendable, CASProtocol, ActionCachePr
 
     public func setOnDiskSizeLimit(_ limit: Int64) throws {
         var error: UnsafeMutablePointer<CChar>? = nil
-        guard let  llcas_cas_set_ondisk_size_limit = api.llcas_cas_set_ondisk_size_limit else {
+        guard let llcas_cas_set_ondisk_size_limit = api.llcas_cas_set_ondisk_size_limit else {
             throw ToolchainCASPluginError.casSizeOperationUnsupported
         }
         if llcas_cas_set_ondisk_size_limit(cCas, limit, &error) {
diff --git a/Sources/SWBCAS/plugin_api_t.swift b/Sources/SWBCAS/plugin_api_t.swift
index abdba805..8d669bcf 100644
--- a/Sources/SWBCAS/plugin_api_t.swift
+++ b/Sources/SWBCAS/plugin_api_t.swift
@@ -18,45 +18,47 @@ extension plugin_api_t {
         func loadRequired<T>(_ symbol: String) throws -> T {
             guard let sym: T = Library.lookup(handle, symbol) else {
                 throw ToolchainCASPluginError.missingRequiredSymbol(symbol)
-          }
-          return sym
+            }
+            return sym
         }
         func loadOptional<T>(_ symbol: String) -> T? {
             guard let sym: T = Library.lookup(handle, symbol) else {
                 return nil
-          }
-          return sym
+            }
+            return sym
         }
-        self.init(llcas_get_plugin_version: try loadRequired("llcas_get_plugin_version"),
-                  llcas_string_dispose: try loadRequired("llcas_string_dispose"),
-                  llcas_cancellable_cancel: loadOptional("llcas_cancellable_cancel"),
-                  llcas_cancellable_dispose: loadOptional("llcas_cancellable_dispose"),
-                  llcas_cas_options_create: try loadRequired("llcas_cas_options_create"),
-                  llcas_cas_options_dispose: try loadRequired("llcas_cas_options_dispose"),
-                  llcas_cas_options_set_client_version: try loadRequired("llcas_cas_options_set_client_version"),
-                  llcas_cas_options_set_ondisk_path: try loadRequired("llcas_cas_options_set_ondisk_path"),
-                  llcas_cas_options_set_option: try loadRequired("llcas_cas_options_set_option"),
-                  llcas_cas_create: try loadRequired("llcas_cas_create"),
-                  llcas_cas_dispose: try loadRequired("llcas_cas_dispose"),
-                  llcas_cas_get_ondisk_size: loadOptional("llcas_cas_get_ondisk_size"),
-                  llcas_cas_set_ondisk_size_limit: loadOptional("llcas_cas_set_ondisk_size_limit"),
-                  llcas_cas_prune_ondisk_data: loadOptional("llcas_cas_prune_ondisk_data"),
-                  llcas_cas_get_hash_schema_name: try loadRequired("llcas_cas_get_hash_schema_name"),
-                  llcas_digest_parse: try loadRequired("llcas_digest_parse"),
-                  llcas_digest_print: try loadRequired("llcas_digest_print"),
-                  llcas_cas_get_objectid: try loadRequired("llcas_cas_get_objectid"),
-                  llcas_objectid_get_digest: try loadRequired("llcas_objectid_get_digest"),
-                  llcas_cas_contains_object: try loadRequired("llcas_cas_contains_object"),
-                  llcas_cas_load_object: try loadRequired("llcas_cas_load_object"),
-                  llcas_cas_load_object_async: try loadRequired("llcas_cas_load_object_async"),
-                  llcas_cas_store_object: try loadRequired("llcas_cas_store_object"),
-                  llcas_loaded_object_get_data: try loadRequired("llcas_loaded_object_get_data"),
-                  llcas_loaded_object_get_refs: try loadRequired("llcas_loaded_object_get_refs"),
-                  llcas_object_refs_get_count: try loadRequired("llcas_object_refs_get_count"),
-                  llcas_object_refs_get_id: try loadRequired("llcas_object_refs_get_id"),
-                  llcas_actioncache_get_for_digest: try loadRequired("llcas_actioncache_get_for_digest"),
-                  llcas_actioncache_get_for_digest_async: try loadRequired("llcas_actioncache_get_for_digest_async"),
-                  llcas_actioncache_put_for_digest: try loadRequired("llcas_actioncache_put_for_digest"),
-                  llcas_actioncache_put_for_digest_async: try loadRequired("llcas_actioncache_put_for_digest_async"))
+        self.init(
+            llcas_get_plugin_version: try loadRequired("llcas_get_plugin_version"),
+            llcas_string_dispose: try loadRequired("llcas_string_dispose"),
+            llcas_cancellable_cancel: loadOptional("llcas_cancellable_cancel"),
+            llcas_cancellable_dispose: loadOptional("llcas_cancellable_dispose"),
+            llcas_cas_options_create: try loadRequired("llcas_cas_options_create"),
+            llcas_cas_options_dispose: try loadRequired("llcas_cas_options_dispose"),
+            llcas_cas_options_set_client_version: try loadRequired("llcas_cas_options_set_client_version"),
+            llcas_cas_options_set_ondisk_path: try loadRequired("llcas_cas_options_set_ondisk_path"),
+            llcas_cas_options_set_option: try loadRequired("llcas_cas_options_set_option"),
+            llcas_cas_create: try loadRequired("llcas_cas_create"),
+            llcas_cas_dispose: try loadRequired("llcas_cas_dispose"),
+            llcas_cas_get_ondisk_size: loadOptional("llcas_cas_get_ondisk_size"),
+            llcas_cas_set_ondisk_size_limit: loadOptional("llcas_cas_set_ondisk_size_limit"),
+            llcas_cas_prune_ondisk_data: loadOptional("llcas_cas_prune_ondisk_data"),
+            llcas_cas_get_hash_schema_name: try loadRequired("llcas_cas_get_hash_schema_name"),
+            llcas_digest_parse: try loadRequired("llcas_digest_parse"),
+            llcas_digest_print: try loadRequired("llcas_digest_print"),
+            llcas_cas_get_objectid: try loadRequired("llcas_cas_get_objectid"),
+            llcas_objectid_get_digest: try loadRequired("llcas_objectid_get_digest"),
+            llcas_cas_contains_object: try loadRequired("llcas_cas_contains_object"),
+            llcas_cas_load_object: try loadRequired("llcas_cas_load_object"),
+            llcas_cas_load_object_async: try loadRequired("llcas_cas_load_object_async"),
+            llcas_cas_store_object: try loadRequired("llcas_cas_store_object"),
+            llcas_loaded_object_get_data: try loadRequired("llcas_loaded_object_get_data"),
+            llcas_loaded_object_get_refs: try loadRequired("llcas_loaded_object_get_refs"),
+            llcas_object_refs_get_count: try loadRequired("llcas_object_refs_get_count"),
+            llcas_object_refs_get_id: try loadRequired("llcas_object_refs_get_id"),
+            llcas_actioncache_get_for_digest: try loadRequired("llcas_actioncache_get_for_digest"),
+            llcas_actioncache_get_for_digest_async: try loadRequired("llcas_actioncache_get_for_digest_async"),
+            llcas_actioncache_put_for_digest: try loadRequired("llcas_actioncache_put_for_digest"),
+            llcas_actioncache_put_for_digest_async: try loadRequired("llcas_actioncache_put_for_digest_async")
+        )
     }
 }
diff --git a/Sources/SWBCore/Apple/DeviceFamily.swift b/Sources/SWBCore/Apple/DeviceFamily.swift
index 768fe138..e9fedfcd 100644
--- a/Sources/SWBCore/Apple/DeviceFamily.swift
+++ b/Sources/SWBCore/Apple/DeviceFamily.swift
@@ -96,9 +96,10 @@ public struct DeviceFamilies: Hashable, Sendable {
     public init(families: [DeviceFamily]) throws {
         self.list = families
 
-        self.explicitTargetDeviceName = list.count == 1
-        ? list.filter { $0.identifier == nil }.only?.name
-        : nil
+        self.explicitTargetDeviceName =
+            list.count == 1
+            ? list.filter { $0.identifier == nil }.only?.name
+            : nil
 
         let familiesWithNumericIdentifiers = families.compactMap { family -> (Int, DeviceFamily)? in
             guard let identifier = family.identifier else {
@@ -131,7 +132,7 @@ public struct DeviceFamilies: Hashable, Sendable {
 
     /// Convenience property which returns the target device identifiers as strings
     public var targetDeviceIdentifierStrings: Set<String> {
-        return Set<String>(list.compactMap({$0.identifier?.toString()}))
+        return Set<String>(list.compactMap({ $0.identifier?.toString() }))
     }
 }
 
diff --git a/Sources/SWBCore/Apple/InterfaceBuilderShared.swift b/Sources/SWBCore/Apple/InterfaceBuilderShared.swift
index 3d68ac80..be8f4124 100644
--- a/Sources/SWBCore/Apple/InterfaceBuilderShared.swift
+++ b/Sources/SWBCore/Apple/InterfaceBuilderShared.swift
@@ -22,51 +22,58 @@ extension SDKVariant {
 
         // Special case / optimization: by default, don't include iPad assets for Mac Catalyst apps/appexts deploying to 14.0+ if they include Mac assets
         return skipIt
-        || (name == MacCatalystInfo.sdkVariantName
-            && productType?.onlyPreferredAssets == true
-            && ((try? Version(scope.evaluate(BuiltinMacros.IPHONEOS_DEPLOYMENT_TARGET))) ?? Version()) >= Version(14)
-            && targetDeviceName == "ipad"
-            && targetDeviceIdentifierStrings.contains("6"))
+            || (name == MacCatalystInfo.sdkVariantName
+                && productType?.onlyPreferredAssets == true
+                && ((try? Version(scope.evaluate(BuiltinMacros.IPHONEOS_DEPLOYMENT_TARGET))) ?? Version()) >= Version(14)
+                && targetDeviceName == "ipad"
+                && targetDeviceIdentifierStrings.contains("6"))
     }
 
     public func evaluateTargetedDeviceFamilyBuildSetting(_ scope: MacroEvaluationScope, _ productType: ProductTypeSpec?) -> (filteredDeviceIdentifiers: Set<Int>, effectiveDeviceIdentifiers: Set<Int>, effectiveDeviceNames: [String], unexpectedValues: [String]) {
         var unexpectedValues = [String]()
 
         // int values, filtered to ones supported by the current platform
-        let filteredDeviceIdentifiers = Set(scope.targetedDeviceFamily.sorted().compactMap { string -> Int? in
-            guard !string.isEmpty else { return nil }
-            if let int = Int(string), int != 0 {
-                // Platforms with an explicit target device name don't use identifiers at all
-                if deviceFamilies.explicitTargetDeviceName != nil {
-                    return nil
-                }
-
-                // Only add this value to the list if it's actually supported by this platform.
-                // That is, we filter out values not associated with the current platform in order to
-                // allow TARGETED_DEVICE_FAMILY to contain all possible values in cross platform targets.
-                if deviceFamilies.targetDeviceIdentifiers.contains(int) {
-                    if let targetDeviceName = deviceFamilies.targetDeviceName(for: int), !targetDeviceName.isEmpty, shouldSkip(targetDeviceName: targetDeviceName, productType: productType, in: scope, usingDefaultTargetDeviceIdentifiers: false) {
+        let filteredDeviceIdentifiers = Set(
+            scope.targetedDeviceFamily.sorted().compactMap { string -> Int? in
+                guard !string.isEmpty else { return nil }
+                if let int = Int(string), int != 0 {
+                    // Platforms with an explicit target device name don't use identifiers at all
+                    if deviceFamilies.explicitTargetDeviceName != nil {
                         return nil
                     }
 
-                    return int
-                }
+                    // Only add this value to the list if it's actually supported by this platform.
+                    // That is, we filter out values not associated with the current platform in order to
+                    // allow TARGETED_DEVICE_FAMILY to contain all possible values in cross platform targets.
+                    if deviceFamilies.targetDeviceIdentifiers.contains(int) {
+                        if let targetDeviceName = deviceFamilies.targetDeviceName(for: int), !targetDeviceName.isEmpty, shouldSkip(targetDeviceName: targetDeviceName, productType: productType, in: scope, usingDefaultTargetDeviceIdentifiers: false) {
+                            return nil
+                        }
 
-                return nil
-            } else {
-                unexpectedValues.append(string)
-                return nil
+                        return int
+                    }
+
+                    return nil
+                } else {
+                    unexpectedValues.append(string)
+                    return nil
+                }
             }
-        })
+        )
 
         // int values we're actually going to use (if we got no values compatible, we use the default set)
-        let effectiveDeviceIdentifiers = !filteredDeviceIdentifiers.isEmpty ? filteredDeviceIdentifiers : Set(deviceFamilies.targetDeviceIdentifiers.compactMap { int -> Int? in
-            // perform any shouldSkip filtering of values from the default deviceFamilies.targetDeviceIdentifiers set
-            if let targetDeviceName = deviceFamilies.targetDeviceName(for: int), !targetDeviceName.isEmpty, shouldSkip(targetDeviceName: targetDeviceName, productType: productType, in: scope, usingDefaultTargetDeviceIdentifiers: true) {
-                return nil
-            }
-            return int
-        })
+        let effectiveDeviceIdentifiers =
+            !filteredDeviceIdentifiers.isEmpty
+            ? filteredDeviceIdentifiers
+            : Set(
+                deviceFamilies.targetDeviceIdentifiers.compactMap { int -> Int? in
+                    // perform any shouldSkip filtering of values from the default deviceFamilies.targetDeviceIdentifiers set
+                    if let targetDeviceName = deviceFamilies.targetDeviceName(for: int), !targetDeviceName.isEmpty, shouldSkip(targetDeviceName: targetDeviceName, productType: productType, in: scope, usingDefaultTargetDeviceIdentifiers: true) {
+                        return nil
+                    }
+                    return int
+                }
+            )
 
         // string values we're actually going to use (for platforms with an explicit name we use that, otherwise the effective IDs mapped to strings)
         let effectiveDeviceNames = { () -> [String] in
diff --git a/Sources/SWBCore/BuildDependencyInfo.swift b/Sources/SWBCore/BuildDependencyInfo.swift
index f6f915b2..2805b34b 100644
--- a/Sources/SWBCore/BuildDependencyInfo.swift
+++ b/Sources/SWBCore/BuildDependencyInfo.swift
@@ -11,9 +11,9 @@
 //===----------------------------------------------------------------------===//
 
 #if canImport(System)
-import struct System.FilePath
+    import struct System.FilePath
 #else
-import struct SystemPackage.FilePath
+    import struct SystemPackage.FilePath
 #endif
 
 import struct Foundation.Data
@@ -24,7 +24,6 @@ import SWBUtil
 
 // MARK: Data structures
 
-
 /// Hierarchy of data structures containing the dependencies for all targets in a build.
 ///
 /// These structures can be encoded to and decoded from JSON.  The JSON is an API used by clients, and the data structures may become such an API eventually if we decide to share them directly with clients.
@@ -33,7 +32,6 @@ import SWBUtil
 ///
 /// Presently the main way to instantiate these structures is to use `init(workspaceContext:buildRequest:buildRequestContext:operation:)`, which is defined below after the data structures.
 
-
 /// The input and output dependencies for all targets in a build.
 package struct BuildDependencyInfo: Codable {
     package init(targets: [BuildDependencyInfo.TargetDependencyInfo], errors: [String]) {
@@ -199,10 +197,8 @@ package struct BuildDependencyInfo: Codable {
 
 }
 
-
 // MARK: Encoding and decoding
 
-
 extension BuildDependencyInfo.TargetDependencyInfo {
 
     package func encode(to encoder: any Encoder) throws {
@@ -297,14 +293,11 @@ extension BuildDependencyInfo.TargetDependencyInfo.Input.NameType {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         if let path = try container.decodeIfPresent(String.self, forKey: .path) {
             self = .absolutePath(path)
-        }
-        else if let name = try container.decodeIfPresent(String.self, forKey: .name) {
+        } else if let name = try container.decodeIfPresent(String.self, forKey: .name) {
             self = .name(name)
-        }
-        else if let stem = try container.decodeIfPresent(String.self, forKey: .stem) {
+        } else if let stem = try container.decodeIfPresent(String.self, forKey: .stem) {
             self = .stem(stem)
-        }
-        else {
+        } else {
             throw StubError.error("unknown type for input name")
         }
     }
@@ -317,10 +310,8 @@ extension BuildDependencyInfo.TargetDependencyInfo.Input.NameType {
 
 }
 
-
 // MARK: Custom string definitions for better debugging
 
-
 extension BuildDependencyInfo.TargetDependencyInfo.Target: CustomStringConvertible {
     package var description: String {
         return "\(type(of: self))<target=\(targetName):project=\(projectName == nil ? "nil" : projectName!):platform=\(platformName == nil ? "nil" : platformName!)>"
diff --git a/Sources/SWBCore/BuildFileResolution.swift b/Sources/SWBCore/BuildFileResolution.swift
index 8c4ab089..09165354 100644
--- a/Sources/SWBCore/BuildFileResolution.swift
+++ b/Sources/SWBCore/BuildFileResolution.swift
@@ -86,8 +86,7 @@ extension BuildFileResolution {
             if let productRefTarget = productRef.target, let parameters = configuredTarget?.parameters {
                 settingsForRef = settingsForProductReferenceTarget(productRefTarget, parameters: parameters)
                 specLookupContext = SpecLookupCtxt(specRegistry: settingsForRef.platform?.specRegistry ?? workspaceContext.core.specRegistry, platform: settingsForRef.platform)
-            }
-            else {
+            } else {
                 // If the product reference doesn't have a producing target, or we don't have a configured target, then... that's very weird.
                 settingsForRef = settings
                 specLookupContext = self
@@ -100,8 +99,8 @@ extension BuildFileResolution {
         // Resolve the path and file type.
         let absolutePath: Path, fileType: FileTypeSpec?
         switch reference {
-            // Variant groups always resolve the path and file type of the first reference.
-            // FIXME: This is historical, and should be cleaned up by making the input model more explicit. This also isn't exactly what Xcode would do, which is very risky. It is possible that we should extend Xcode to pass this information down with the top-level variant group itself. (This FIXME is from 2017 and was ported from TaskProducer.)
+        // Variant groups always resolve the path and file type of the first reference.
+        // FIXME: This is historical, and should be cleaned up by making the input model more explicit. This also isn't exactly what Xcode would do, which is very risky. It is possible that we should extend Xcode to pass this information down with the top-level variant group itself. (This FIXME is from 2017 and was ported from TaskProducer.)
         case let asVariantGroup as VariantGroup where !asVariantGroup.children.isEmpty:
             absolutePath = settingsForRef.filePathResolver.resolveAbsolutePath(asVariantGroup.children[0])
             fileType = specLookupContext.lookupFileType(reference: asVariantGroup.children[0])
@@ -114,4 +113,3 @@ extension BuildFileResolution {
     }
 
 }
-
diff --git a/Sources/SWBCore/BuildParameters.swift b/Sources/SWBCore/BuildParameters.swift
index 8b8fced8..66caa40b 100644
--- a/Sources/SWBCore/BuildParameters.swift
+++ b/Sources/SWBCore/BuildParameters.swift
@@ -138,7 +138,7 @@ public struct BuildParameters: Hashable, SerializableCodable, Sendable {
         hasher.combine(precomputedHash)
     }
 
-    public static func ==(lhs: BuildParameters, rhs: BuildParameters) -> Bool {
+    public static func == (lhs: BuildParameters, rhs: BuildParameters) -> Bool {
         // Compare all properties except the signature which isn't stable.
         if lhs.action != rhs.action { return false }
         if lhs.configuration != rhs.configuration { return false }
@@ -181,7 +181,7 @@ public struct BuildParameters: Hashable, SerializableCodable, Sendable {
     }
 
     enum CodingKeys: String, CodingKey {
-        case action, configuration, packageConfigurationOverride, activeRunDestination, activeArchitecture, arena,  overrides, commandLineOverrides, commandLineConfigOverridesPath, commandLineConfigOverrides,  environmentConfigOverridesPath, environmentConfigOverrides, toolchainOverride
+        case action, configuration, packageConfigurationOverride, activeRunDestination, activeArchitecture, arena, overrides, commandLineOverrides, commandLineConfigOverridesPath, commandLineConfigOverrides, environmentConfigOverridesPath, environmentConfigOverrides, toolchainOverride
     }
     public func encode(to encoder: any Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
@@ -253,7 +253,8 @@ extension BuildParameters {
             environmentConfigOverridesPath: environmentConfigOverridesPath,
             environmentConfigOverrides: environmentConfigOverrides,
             toolchainOverride: toolchainOverride,
-            arena: arena)
+            arena: arena
+        )
     }
 
     // Returns these `BuildParameters` after filtering out any overrides.
@@ -270,7 +271,8 @@ extension BuildParameters {
             environmentConfigOverridesPath: nil,
             environmentConfigOverrides: [:],
             toolchainOverride: toolchainOverride,
-            arena: arena)
+            arena: arena
+        )
     }
 
     // Returns these `BuildParameters` after modifying `activeRunDestination` and `activeArchitecture`.
@@ -287,7 +289,8 @@ extension BuildParameters {
             environmentConfigOverridesPath: environmentConfigOverridesPath,
             environmentConfigOverrides: environmentConfigOverrides,
             toolchainOverride: toolchainOverride,
-            arena: arena)
+            arena: arena
+        )
     }
 
     /// Removes any of the potentially imposed settings **unless** those have been specified via explicit overrides which have come in via the initial build request.
@@ -315,7 +318,8 @@ extension BuildParameters {
             environmentConfigOverridesPath: environmentConfigOverridesPath,
             environmentConfigOverrides: environmentConfigOverrides,
             toolchainOverride: toolchainOverride,
-            arena: arena)
+            arena: arena
+        )
     }
 }
 
diff --git a/Sources/SWBCore/BuildRequest.swift b/Sources/SWBCore/BuildRequest.swift
index 622ead43..f599de82 100644
--- a/Sources/SWBCore/BuildRequest.swift
+++ b/Sources/SWBCore/BuildRequest.swift
@@ -116,12 +116,15 @@ extension SWBCore.BuildCommand {
         case let .singleFileBuild(buildOnlyTheseFiles):
             self = .singleFileBuild(buildOnlyTheseFiles: buildOnlyTheseFiles.map(Path.init))
         case let .prepareForIndexing(buildOnlyTheseTargets, enableIndexBuildArena):
-            self = try .prepareForIndexing(buildOnlyTheseTargets: buildOnlyTheseTargets?.map {
-                guard let target = workspace.target(for: $0) else {
-                    throw MsgParserError.missingTarget(guid: $0)
-                }
-                return target
-            } ?? nil, enableIndexBuildArena: enableIndexBuildArena)
+            self = try .prepareForIndexing(
+                buildOnlyTheseTargets: buildOnlyTheseTargets?.map {
+                    guard let target = workspace.target(for: $0) else {
+                        throw MsgParserError.missingTarget(guid: $0)
+                    }
+                    return target
+                } ?? nil,
+                enableIndexBuildArena: enableIndexBuildArena
+            )
         case .migrate:
             throw MsgParserError.swiftMigrationNoLongerAvailable
         case let .cleanBuildFolder(style):
@@ -336,7 +339,7 @@ extension BuildRequest {
         case .buildRequest:
             dependencyScope = .buildRequest
         }
-        try self.init(parameters: parameters, buildTargets: payload.configuredTargets.map{ try BuildRequest.BuildTargetInfo(from: $0, defaultParameters: parameters, workspace: workspace) }, dependencyScope: dependencyScope, continueBuildingAfterErrors: payload.continueBuildingAfterErrors, hideShellScriptEnvironment: payload.hideShellScriptEnvironment, useParallelTargets: payload.useParallelTargets, useImplicitDependencies: payload.useImplicitDependencies, useDryRun: payload.useDryRun, enableStaleFileRemoval: nil, showNonLoggedProgress: payload.showNonLoggedProgress, recordBuildBacktraces: payload.recordBuildBacktraces, generatePrecompiledModulesReport: payload.generatePrecompiledModulesReport, buildDescriptionID: payload.buildDescriptionID.map(BuildDescriptionID.init), qos: qos, schedulerLaneWidthOverride: payload.schedulerLaneWidthOverride, buildPlanDiagnosticsDirPath: payload.buildPlanDiagnosticsDirPath, buildCommand: buildCommand, schemeCommand: payload.schemeCommand?.coreRepresentation, containerPath: payload.containerPath, jsonRepresentation: payload.jsonRepresentation)
+        try self.init(parameters: parameters, buildTargets: payload.configuredTargets.map { try BuildRequest.BuildTargetInfo(from: $0, defaultParameters: parameters, workspace: workspace) }, dependencyScope: dependencyScope, continueBuildingAfterErrors: payload.continueBuildingAfterErrors, hideShellScriptEnvironment: payload.hideShellScriptEnvironment, useParallelTargets: payload.useParallelTargets, useImplicitDependencies: payload.useImplicitDependencies, useDryRun: payload.useDryRun, enableStaleFileRemoval: nil, showNonLoggedProgress: payload.showNonLoggedProgress, recordBuildBacktraces: payload.recordBuildBacktraces, generatePrecompiledModulesReport: payload.generatePrecompiledModulesReport, buildDescriptionID: payload.buildDescriptionID.map(BuildDescriptionID.init), qos: qos, schedulerLaneWidthOverride: payload.schedulerLaneWidthOverride, buildPlanDiagnosticsDirPath: payload.buildPlanDiagnosticsDirPath, buildCommand: buildCommand, schemeCommand: payload.schemeCommand?.coreRepresentation, containerPath: payload.containerPath, jsonRepresentation: payload.jsonRepresentation)
     }
 
     /// Whether the build request _explicitly_ contains the specified `target`.
@@ -382,7 +385,7 @@ extension BuildRequest {
 private extension BuildRequest.BuildTargetInfo {
     init(from payload: ConfiguredTargetMessagePayload, defaultParameters: BuildParameters, workspace: SWBCore.Workspace) throws {
         guard let target = workspace.target(for: payload.guid) else { throw MsgParserError.missingTarget(guid: payload.guid) }
-        try self.init(parameters: payload.parameters.map{ try BuildParameters(from: $0) } ?? defaultParameters, target: target)
+        try self.init(parameters: payload.parameters.map { try BuildParameters(from: $0) } ?? defaultParameters, target: target)
     }
 }
 
diff --git a/Sources/SWBCore/BuildRequestContext.swift b/Sources/SWBCore/BuildRequestContext.swift
index d971d45c..68a6e328 100644
--- a/Sources/SWBCore/BuildRequestContext.swift
+++ b/Sources/SWBCore/BuildRequestContext.swift
@@ -94,12 +94,14 @@ public final class BuildRequestContext: Sendable {
             "XCTest",
             "XCTestCore",
             "XCUIAutomation",
-            "XCUnit"
+            "XCUnit",
         ]
 
-        suffixes.append(contentsOf: frameworkNames.flatMap { name in
-            [Path("\(name).framework/\(name)"), Path("/\(name).framework/Versions/A/\(name)")]
-        })
+        suffixes.append(
+            contentsOf: frameworkNames.flatMap { name in
+                [Path("\(name).framework/\(name)"), Path("/\(name).framework/Versions/A/\(name)")]
+            }
+        )
 
         for platformExtension in workspaceContext.core.pluginManager.extensions(of: PlatformInfoExtensionPoint.self) {
             suffixes.append(contentsOf: platformExtension.additionalKnownTestLibraryPathSuffixes())
@@ -110,7 +112,7 @@ public final class BuildRequestContext: Sendable {
 
 extension BuildRequestContext {
     /// Certain file types allow multiple files with the same name, in which case we unique the output file.
-    private static let fileTypesWhichUseUniquing = [ "sourcecode.c.c", "sourcecode.c.objc", "sourcecode.cpp.cpp", "sourcecode.cpp.objcpp", "sourcecode.asm" ]
+    private static let fileTypesWhichUseUniquing = ["sourcecode.c.c", "sourcecode.c.objc", "sourcecode.cpp.cpp", "sourcecode.cpp.objcpp", "sourcecode.asm"]
 
     private func computeOutputParameters(for input: FileToBuild, command: BuildCommand, settings: Settings, lookup: @escaping (MacroDeclaration) -> (MacroExpression?)) -> (Path, String) {
         let outputDir = settings.globalScope.evaluate(BuiltinMacros.PER_ARCH_OBJECT_FILE_DIR, lookup: lookup)
@@ -150,7 +152,7 @@ extension BuildRequestContext {
         let currentPlatformFilter = PlatformFilter(settings.globalScope)
 
         // FIXME: It is a bit unfortunate that we need to compute all this for the `uniquingSuffix` behavior.
-        var sourceCodeFileToBuildableReference = [Path:Reference]()
+        var sourceCodeFileToBuildableReference = [Path: Reference]()
         if let target = target.target as? StandardTarget {
             if let buildableReferences = try! target.sourcesBuildPhase?.buildFiles.compactMap({ (buildFile) -> Reference? in
                 guard currentPlatformFilter.matches(buildFile.platformFilters) else { return nil }
@@ -196,8 +198,9 @@ extension BuildRequestContext {
         }
         func platformAndSDKVariant(for target: ConfiguredTarget) -> PlatformAndSDKVariant {
             if hasEnabledIndexBuildArena,
-               let activeRunDestination = target.parameters.activeRunDestination,
-               let platform = workspaceContext.core.platformRegistry.lookup(name: activeRunDestination.platform) {
+                let activeRunDestination = target.parameters.activeRunDestination,
+                let platform = workspaceContext.core.platformRegistry.lookup(name: activeRunDestination.platform)
+            {
                 // Configured targets include their platform in parameters, we can use it directly and avoid the expense of `getCachedSettings()` calls.
                 // If in future `ConfiguredTarget` carries along an instance of its Settings, we can avoid this check and go back to using `Settings` without the cost of `getCachedSettings`.
                 return PlatformAndSDKVariant(platform: platform, sdkVariant: activeRunDestination.sdkVariant)
diff --git a/Sources/SWBCore/BuildRuleAction.swift b/Sources/SWBCore/BuildRuleAction.swift
index ff61bfe5..1bf27866 100644
--- a/Sources/SWBCore/BuildRuleAction.swift
+++ b/Sources/SWBCore/BuildRuleAction.swift
@@ -13,7 +13,6 @@
 import SWBUtil
 public import SWBMacro
 
-
 /// Encapsulates a type of action for a build rule.  Concrete types of actions involve the ability to invoke a build tool or to run a custom shell script.
 public protocol BuildRuleAction: AnyObject, CustomStringConvertible, Sendable {
     var inputFileGroupingStrategies: [any InputFileGroupingStrategy] { get }
@@ -43,7 +42,6 @@ public protocol BuildRuleAction: AnyObject, CustomStringConvertible, Sendable {
     var name: String { get }
 }
 
-
 /// A build rule action that creates a build task to invoke a build tool.
 public final class BuildRuleTaskAction: BuildRuleAction {
     public let toolSpec: CommandLineToolSpec
@@ -89,7 +87,6 @@ public final class BuildRuleTaskAction: BuildRuleAction {
     }
 }
 
-
 /// A build rule action that creates a build task to run a script.
 public final class BuildRuleScriptAction: BuildRuleAction {
     public struct OutputFileInfo: Sendable {
diff --git a/Sources/SWBCore/BuildRuleCondition.swift b/Sources/SWBCore/BuildRuleCondition.swift
index 14440810..0aeef60a 100644
--- a/Sources/SWBCore/BuildRuleCondition.swift
+++ b/Sources/SWBCore/BuildRuleCondition.swift
@@ -78,15 +78,13 @@ public final class BuildRuleFileTypeCondition: BuildRuleCondition {
     public var description: String {
         if fileTypes.count == 1, let fileType = fileTypes.first {
             return "<\(type(of: self)):\(fileType)>"
-        }
-        else {
+        } else {
             let allFileTypes = fileTypes.map({ $0.identifier }).joined(separator: ":")
             return "<\(type(of: self)):\(allFileTypes)>"
         }
     }
 }
 
-
 /// A condition of a build rule that uses file name pattern as the match criterion.
 public final class BuildRuleFileNameCondition: BuildRuleCondition {
     let namePatterns: [MacroStringExpression]
diff --git a/Sources/SWBCore/BuildRuleSet.swift b/Sources/SWBCore/BuildRuleSet.swift
index 65e2d518..6a5db1fe 100644
--- a/Sources/SWBCore/BuildRuleSet.swift
+++ b/Sources/SWBCore/BuildRuleSet.swift
@@ -99,13 +99,16 @@ public final class DisambiguatingBuildRuleSet: BuildRuleSet {
     }
 
     public func match(_ candidate: FileToBuild, _ scope: MacroEvaluationScope) -> MatchResult {
-        let actions = Dictionary(grouping: rules.compactMap { (condition, action) -> (action: any BuildRuleAction, priority: BuildRuleConditionMatchPriority)? in
-            let priority = condition.match(candidate, scope)
-            guard priority != .none else {
-                return nil
-            }
-            return (action, priority)
-        }, by: { $0.priority }).mapValues { $0.map { $0.0 } }
+        let actions = Dictionary(
+            grouping: rules.compactMap { (condition, action) -> (action: any BuildRuleAction, priority: BuildRuleConditionMatchPriority)? in
+                let priority = condition.match(candidate, scope)
+                guard priority != .none else {
+                    return nil
+                }
+                return (action, priority)
+            },
+            by: { $0.priority }
+        ).mapValues { $0.map { $0.0 } }
 
         let priorityLevels = [BuildRuleConditionMatchPriority.normal, .low]
 
@@ -113,7 +116,8 @@ public final class DisambiguatingBuildRuleSet: BuildRuleSet {
             for priority in priorityLevels {
                 // NOTE: There might be multiple matches for the same action because our input data structure pairs an action multiple times, based on the number of input conditions it accepts. Due to type system limitations w.r.t. Hashable, we can't have an OrderedSet of BuildRuleActions, but we can use a generic Hashable Pair of data to convey identifier and name pairs.
                 if let matches = actions[priority].map({ OrderedSet($0.map({ Pair($0.identifier, $0.name) })) }),
-                    matches.count > 1 {
+                    matches.count > 1
+                {
 
                     let identifiers = matches.map { $0.first }
 
diff --git a/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierFramework.swift b/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierFramework.swift
index 614c3939..7c5585d5 100644
--- a/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierFramework.swift
+++ b/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierFramework.swift
@@ -128,7 +128,7 @@ public struct ModuleVerifierFramework {
         return headers
     }
 
-    private static func modules(ofKind kind:ModuleMapKind, rootPath: Path, fs: any FSProxy, frameworkName: String) throws -> [ModuleVerifierModuleMap] {
+    private static func modules(ofKind kind: ModuleMapKind, rootPath: Path, fs: any FSProxy, frameworkName: String) throws -> [ModuleVerifierModuleMap] {
         var moduleMaps: [ModuleVerifierModuleMap] = []
 
         for path in ModuleVerifierModuleMap.paths(for: kind) {
@@ -210,12 +210,12 @@ extension ModuleVerifierFramework {
         }
         return filteredHeaders.sorted { (lhp, rhp) -> Bool in
             lhp.include(language: language) < rhp.include(language: language)
-        }.map {$0.include(language: language)}.joined(separator: "\n").appending("\n")
+        }.map { $0.include(language: language) }.joined(separator: "\n").appending("\n")
     }
 }
 
 extension String {
-    fileprivate func hasSuffix(_ strings:[String]) -> Bool {
+    fileprivate func hasSuffix(_ strings: [String]) -> Bool {
         for string in strings {
             if self.hasSuffix(string) {
                 return true
diff --git a/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierHeader.swift b/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierHeader.swift
index 9bb47f05..6a604ae2 100644
--- a/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierHeader.swift
+++ b/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierHeader.swift
@@ -19,7 +19,7 @@ enum HeaderKind: String {
 }
 
 @_spi(Testing)
-public struct ModuleVerifierHeader : Hashable {
+public struct ModuleVerifierHeader: Hashable {
     @_spi(Testing) public var file: Path
     @_spi(Testing) public var unresolvedFile: Path
     @_spi(Testing) public var framework: String
@@ -50,7 +50,7 @@ public struct ModuleVerifierHeader : Hashable {
         var subFolder: [String] = []
         while true {
             let component = tail.basename
-            if component.isEmpty || component == "Headers"  || component == "PrivateHeaders" {
+            if component.isEmpty || component == "Headers" || component == "PrivateHeaders" {
                 break
             }
             tail = tail.dirname
@@ -60,7 +60,7 @@ public struct ModuleVerifierHeader : Hashable {
     }
 }
 
-extension ModuleVerifierHeader : Comparable {
+extension ModuleVerifierHeader: Comparable {
     @_spi(Testing)
     public static func < (lhs: ModuleVerifierHeader, rhs: ModuleVerifierHeader) -> Bool {
         lhs.include(language: .c) < rhs.include(language: .c)
diff --git a/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierModuleMap.swift b/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierModuleMap.swift
index a5a0be65..b54f8677 100644
--- a/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierModuleMap.swift
+++ b/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierModuleMap.swift
@@ -19,7 +19,7 @@ import class Foundation.NSRegularExpression
 @_spi(Testing)
 public enum ModuleMapKind: String {
     case publicModule = "public"
-    case privateModule =  "private"
+    case privateModule = "private"
 }
 
 @_spi(Testing)
@@ -53,7 +53,7 @@ public struct ModuleVerifierModuleMap: Hashable {
             let regularExpression = try! NSRegularExpression(pattern: pattern, options: .dotMatchesLineSeparators)
             // The range conversions are all real awkward, <rdar://78800247&78800081&78800042>.
             let wholeString = NSRange(moduleContents.startIndex..., in: moduleContents)
-            return regularExpression.matches(in: moduleContents, range: wholeString).map {match in
+            return regularExpression.matches(in: moduleContents, range: wholeString).map { match in
                 return String(moduleContents[Range(match.range(at: 1), in: moduleContents)!])
             }
         }
@@ -117,7 +117,7 @@ public struct ModuleVerifierModuleMap: Hashable {
         ]
 
         let lines = moduleContents.components(separatedBy: "\n")
-        let moduleNames:[String] = lines.filter { line in
+        let moduleNames: [String] = lines.filter { line in
             let line = line.trimmingCharacters(in: .whitespacesAndNewlines)
             return line.starts(withOneOf: moduleNamesPrefix) && !line.contains(oneOf: notModuleNameFilters)
         }.compactMap { line in
@@ -141,7 +141,7 @@ extension ModuleVerifierModuleMap: Comparable {
 }
 
 extension String {
-    fileprivate func contains(oneOf strings:[String]) -> Bool {
+    fileprivate func contains(oneOf strings: [String]) -> Bool {
         for string in strings {
             if self.contains(string) {
                 return true
@@ -150,7 +150,7 @@ extension String {
         return false
     }
 
-    fileprivate func starts(withOneOf strings:[String]) -> Bool {
+    fileprivate func starts(withOneOf strings: [String]) -> Bool {
         for string in strings {
             if self.hasPrefix(string) {
                 return true
@@ -159,7 +159,7 @@ extension String {
         return false
     }
 
-    fileprivate func remove(strings:[String], options mask: CompareOptions = []) -> String {
+    fileprivate func remove(strings: [String], options mask: CompareOptions = []) -> String {
         var finalString = self
 
         for string in strings {
diff --git a/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierModuleMapFileVerifier.swift b/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierModuleMapFileVerifier.swift
index 6a87a358..812b0229 100644
--- a/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierModuleMapFileVerifier.swift
+++ b/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierModuleMapFileVerifier.swift
@@ -29,10 +29,12 @@ public struct ModuleVerifierModuleMapFileVerifier {
         }
 
         if let publicModuleMap = framework.publicModuleMap {
-            let publicDiagnostics = self.moduleMapCheck(moduleMapKind: .publicModule,
-                                                        path: publicModuleMap.path,
-                                                        hasHeaders: framework.hasPublicHeaders,
-                                                        modulesCount: publicModuleMap.modulesHaveContents ? publicModuleMap.modules.count : 0)
+            let publicDiagnostics = self.moduleMapCheck(
+                moduleMapKind: .publicModule,
+                path: publicModuleMap.path,
+                hasHeaders: framework.hasPublicHeaders,
+                modulesCount: publicModuleMap.modulesHaveContents ? publicModuleMap.modules.count : 0
+            )
 
             if publicDiagnostics.count > 0 {
                 verifyPublic = false
@@ -41,10 +43,12 @@ public struct ModuleVerifierModuleMapFileVerifier {
         }
 
         if let privateModuleMap = framework.privateModuleMap {
-            let privateDiagnostics = self.moduleMapCheck(moduleMapKind: .privateModule,
-                                                         path: privateModuleMap.path,
-                                                         hasHeaders: framework.hasPrivateHeaders,
-                                                         modulesCount: privateModuleMap.modules.count)
+            let privateDiagnostics = self.moduleMapCheck(
+                moduleMapKind: .privateModule,
+                path: privateModuleMap.path,
+                hasHeaders: framework.hasPrivateHeaders,
+                modulesCount: privateModuleMap.modules.count
+            )
 
             if privateDiagnostics.count > 0 {
                 verifyPrivate = false
@@ -55,7 +59,7 @@ public struct ModuleVerifierModuleMapFileVerifier {
         return (verifyPublic, verifyPrivate, diagnostics)
     }
 
-    private static func moduleMapCheck(moduleMapKind:ModuleMapKind, path: Path, hasHeaders: Bool, modulesCount: Int) -> [Diagnostic] {
+    private static func moduleMapCheck(moduleMapKind: ModuleMapKind, path: Path, hasHeaders: Bool, modulesCount: Int) -> [Diagnostic] {
         // Xcode currently does not properly support a framework with only private headers being modularized
         // In order to make it work an empty module map has to be supplied which will throw a bunch of errors unless we bail early
         if moduleMapKind == .publicModule && !hasHeaders && modulesCount == 0 {
diff --git a/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierTarget.swift b/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierTarget.swift
index d8e5bbe0..5c9e73eb 100644
--- a/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierTarget.swift
+++ b/Sources/SWBCore/ClangModuleVerifier/ModuleVerifierTarget.swift
@@ -66,10 +66,12 @@ extension ModuleVerifierTargetSet {
     }
 
     public static func combinations(languages: [ModuleVerifierLanguage], targets: [String], targetVariants: [String], standards: [ModuleVerifierLanguage.Standard]) -> [ModuleVerifierTargetSet] {
-        return ModuleVerifierTargetSet.combinations(languages: languages,
-                                      targets: ModuleVerifierTarget.targets(from: targets),
-                                      targetVariants: ModuleVerifierTarget.targets(from: targetVariants),
-                                      standards: standards)
+        return ModuleVerifierTargetSet.combinations(
+            languages: languages,
+            targets: ModuleVerifierTarget.targets(from: targets),
+            targetVariants: ModuleVerifierTarget.targets(from: targetVariants),
+            standards: standards
+        )
     }
 
     private static func combinations(languages: [ModuleVerifierLanguage], targets: [ModuleVerifierTarget], targetVariants: [ModuleVerifierTarget], standards: [ModuleVerifierLanguage.Standard]) -> [ModuleVerifierTargetSet] {
@@ -109,8 +111,10 @@ extension ModuleVerifierTargetSet {
 
 extension ModuleVerifierTargetSet {
     public static func verifyTargets(targets: [String], targetVariants: [String]) -> [Diagnostic] {
-        return ModuleVerifierTargetSet.verifyTargets(targets: ModuleVerifierTarget.targets(from: targets),
-                                        targetVariants: ModuleVerifierTarget.targets(from: targetVariants))
+        return ModuleVerifierTargetSet.verifyTargets(
+            targets: ModuleVerifierTarget.targets(from: targets),
+            targetVariants: ModuleVerifierTarget.targets(from: targetVariants)
+        )
     }
 
     static func verifyTargets(targets: [ModuleVerifierTarget], targetVariants: [ModuleVerifierTarget]) -> [Diagnostic] {
@@ -149,8 +153,10 @@ extension ModuleVerifierTargetSet {
         return diagnostics
     }
 
-    private static func verifyMatchingTargetForVariant(partitionedTargets: [String: [ModuleVerifierTarget]],
-                                        partitionedTargetVariants: [String: [ModuleVerifierTarget]]) -> [Diagnostic] {
+    private static func verifyMatchingTargetForVariant(
+        partitionedTargets: [String: [ModuleVerifierTarget]],
+        partitionedTargetVariants: [String: [ModuleVerifierTarget]]
+    ) -> [Diagnostic] {
         var diagnostics: [Diagnostic] = []
 
         for (architecture, targetVariants) in partitionedTargetVariants {
diff --git a/Sources/SWBCore/ClangModuleVerifierOutputParser.swift b/Sources/SWBCore/ClangModuleVerifierOutputParser.swift
index 524507fd..06cb457c 100644
--- a/Sources/SWBCore/ClangModuleVerifierOutputParser.swift
+++ b/Sources/SWBCore/ClangModuleVerifierOutputParser.swift
@@ -95,7 +95,8 @@ extension ModuleVerifierFilenameMap {
         let fixits = diag.fixIts.map { updateFixit($0) }
         var location = diag.location
         if case .path(let path, fileLocation: let fileLoc) = location,
-           let mappedFilename = map(filename: path.str) {
+            let mappedFilename = map(filename: path.str)
+        {
             location = .path(Path(mappedFilename), fileLocation: fileLoc)
         }
         return diag.with(location: location, fixIts: fixits, childDiagnostics: childDiagnostics)
diff --git a/Sources/SWBCore/ClangSerializedDiagnostics.swift b/Sources/SWBCore/ClangSerializedDiagnostics.swift
index dd538341..9cbbf5bf 100644
--- a/Sources/SWBCore/ClangSerializedDiagnostics.swift
+++ b/Sources/SWBCore/ClangSerializedDiagnostics.swift
@@ -41,7 +41,7 @@ extension Diagnostic.Behavior {
         case .warning:
             self = .warning
         case .error,
-             .fatal:
+            .fatal:
             self = .error
         }
     }
diff --git a/Sources/SWBCore/CommandLineArgument.swift b/Sources/SWBCore/CommandLineArgument.swift
index 0a4cc458..b946a964 100644
--- a/Sources/SWBCore/CommandLineArgument.swift
+++ b/Sources/SWBCore/CommandLineArgument.swift
@@ -43,7 +43,7 @@ public enum CommandLineArgument: Equatable, Hashable, ExpressibleByStringLiteral
         self = .literal(ByteString(stringLiteral: value))
     }
 
-    public func serialize<T>(to serializer: T) where T : SWBUtil.Serializer {
+    public func serialize<T>(to serializer: T) where T: SWBUtil.Serializer {
         switch self {
         case .literal(let byteString):
             // FIXME: pack in one byte
diff --git a/Sources/SWBCore/ConfiguredTarget.swift b/Sources/SWBCore/ConfiguredTarget.swift
index 5ab5c0c5..f318634a 100644
--- a/Sources/SWBCore/ConfiguredTarget.swift
+++ b/Sources/SWBCore/ConfiguredTarget.swift
@@ -73,7 +73,7 @@ public final class ConfiguredTarget: Hashable, CustomStringConvertible, Serializ
             components.append(("runDestination", runDestString))
         }
 
-        let string = components.map({ "\($0.key): \($0.value)"}).joined(separator: " ")
+        let string = components.map({ "\($0.key): \($0.value)" }).joined(separator: " ")
 
         // Construct the description.
         return "<\(type(of: self)) \(string)>"
@@ -107,7 +107,7 @@ public final class ConfiguredTarget: Hashable, CustomStringConvertible, Serializ
             }
         }
         if specializeGuidForActiveRunDestination {
-            let discriminator = self.parameters.activeRunDestination.map{ "\($0.platform)-\($0.sdkVariant ?? "")" } ?? ""
+            let discriminator = self.parameters.activeRunDestination.map { "\($0.platform)-\($0.sdkVariant ?? "")" } ?? ""
             parameters.append(discriminator)
         }
         return .init(id: ["target", target.name, target.guid, parameters.joined(separator: ":")].joined(separator: "-"))
@@ -127,12 +127,11 @@ public final class ConfiguredTarget: Hashable, CustomStringConvertible, Serializ
         // Make sure each build parameters struct is serialized only once.
         if let index = delegate.buildParametersIndexes[parameters] {
             // We already have an index into the build parameters list, so serialize it.
-            serializer.serialize(1)         // Placeholder indicating the next element is an index
+            serializer.serialize(1)  // Placeholder indicating the next element is an index
             serializer.serialize(index)
-        }
-        else {
+        } else {
             // These parameters have not been serialized before, so serialize them and add them to our delegate's index map.
-            serializer.serialize(0)         // Placeholder indicating the next element is a serialized BuildParameters
+            serializer.serialize(0)  // Placeholder indicating the next element is a serialized BuildParameters
             serializer.serialize(parameters)
             delegate.buildParametersIndexes[parameters] = delegate.currentBuildParametersIndex
             delegate.currentBuildParametersIndex += 1
@@ -171,7 +170,7 @@ public final class ConfiguredTarget: Hashable, CustomStringConvertible, Serializ
         }
     }
 
-    public static func ==(lhs: ConfiguredTarget, rhs: ConfiguredTarget) -> Bool {
+    public static func == (lhs: ConfiguredTarget, rhs: ConfiguredTarget) -> Bool {
         // Fast path common case.
         //
         // FIXME: We key on this a lot -- we need to move this to using reference equality: <rdar://problem/28948909> Change ConfiguredTarget to use reference equality
diff --git a/Sources/SWBCore/Core.swift b/Sources/SWBCore/Core.swift
index b01421d2..cae14793 100644
--- a/Sources/SWBCore/Core.swift
+++ b/Sources/SWBCore/Core.swift
@@ -40,7 +40,7 @@ public final class Core: Sendable {
     /// Get a configured instance of the core.
     ///
     /// - returns: An initialized Core instance on which all discovery and loading will have been completed. If there are errors during that process, they will be logged to `stderr` and no instance will be returned. Otherwise, the initialized object is returned.
-    public static func getInitializedCore(_ delegate: any CoreDelegate, pluginManager: MutablePluginManager, developerPath: DeveloperPath? = nil, resourceSearchPaths: [Path] = [], inferiorProductsPath: Path? = nil, extraPluginRegistration: @PluginExtensionSystemActor (_ pluginManager: MutablePluginManager, _ pluginPaths: [Path]) -> Void = { _, _ in }, additionalContentPaths: [Path] = [], environment: [String:String] = [:], buildServiceModTime: Date, connectionMode: ServiceHostConnectionMode) async -> Core? {
+    public static func getInitializedCore(_ delegate: any CoreDelegate, pluginManager: MutablePluginManager, developerPath: DeveloperPath? = nil, resourceSearchPaths: [Path] = [], inferiorProductsPath: Path? = nil, extraPluginRegistration: @PluginExtensionSystemActor (_ pluginManager: MutablePluginManager, _ pluginPaths: [Path]) -> Void = { _, _ in }, additionalContentPaths: [Path] = [], environment: [String: String] = [:], buildServiceModTime: Date, connectionMode: ServiceHostConnectionMode) async -> Core? {
         // Enable macro expression interning during loading.
         return await MacroNamespace.withExpressionInterningEnabled { () -> Core? in
             let hostOperatingSystem: OperatingSystem
@@ -97,9 +97,16 @@ public final class Core: Sendable {
 
             if UserDefaults.enablePluginManagerLogging {
                 let plugins = core.pluginManager.pluginsByIdentifier
-                delegate.emit(Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("Loaded \(plugins.count) plugins"), childDiagnostics: plugins.sorted(byKey: <).map { (identifier, plugin) in
-                    Diagnostic(behavior: .note, location: .path(plugin.path), data: DiagnosticData("Loaded plugin: \(identifier) from \(plugin.path.str)"))
-                }))
+                delegate.emit(
+                    Diagnostic(
+                        behavior: .note,
+                        location: .unknown,
+                        data: DiagnosticData("Loaded \(plugins.count) plugins"),
+                        childDiagnostics: plugins.sorted(byKey: <).map { (identifier, plugin) in
+                            Diagnostic(behavior: .note, location: .path(plugin.path), data: DiagnosticData("Loaded plugin: \(identifier) from \(plugin.path.str)"))
+                        }
+                    )
+                )
             }
 
             for diagnostic in core.pluginManager.loadingDiagnostics {
@@ -203,7 +210,7 @@ public final class Core: Sendable {
     public let additionalContentPaths: [Path]
 
     /// Additional override environment variables
-    public let environment: [String:String]
+    public let environment: [String: String]
 
     /// The Xcode application version, as a string.
     public let xcodeVersionString: String
@@ -222,7 +229,7 @@ public final class Core: Sendable {
 
     public let connectionMode: ServiceHostConnectionMode
 
-    @_spi(Testing) public init(delegate: any CoreDelegate, hostOperatingSystem: OperatingSystem, pluginManager: any PluginManager, developerPath: DeveloperPath, resourceSearchPaths: [Path], inferiorProductsPath: Path?, additionalContentPaths: [Path], environment: [String:String], buildServiceModTime: Date, connectionMode: ServiceHostConnectionMode) async throws {
+    @_spi(Testing) public init(delegate: any CoreDelegate, hostOperatingSystem: OperatingSystem, pluginManager: any PluginManager, developerPath: DeveloperPath, resourceSearchPaths: [Path], inferiorProductsPath: Path?, additionalContentPaths: [Path], environment: [String: String], buildServiceModTime: Date, connectionMode: ServiceHostConnectionMode) async throws {
         self.delegate = delegate
         self.hostOperatingSystem = hostOperatingSystem
         self.pluginManager = pluginManager
@@ -401,7 +408,8 @@ public final class Core: Sendable {
             }
             let libclangVersion: Version?
             if let versionString = libclang?.getVersionString(),
-               let match = try? #/\(clang-(?<clang>[0-9]+(?:\.[0-9]+){0,})\)/#.firstMatch(in: versionString) {
+                let match = try? #/\(clang-(?<clang>[0-9]+(?:\.[0-9]+){0,})\)/#.firstMatch(in: versionString)
+            {
                 libclangVersion = try? Version(String(match.clang))
             } else {
                 libclangVersion = nil
@@ -461,7 +469,6 @@ public final class Core: Sendable {
         _platformRegistry.initialize(to: await PlatformRegistry(delegate: self.registryDelegate, searchPaths: searchPaths, hostOperatingSystem: hostOperatingSystem, fs: fs))
     }
 
-
     private func initializeToolchainRegistry() async {
         self._toolchainRegistry.initialize(to: await ToolchainRegistry(delegate: self.registryDelegate, searchPaths: self.toolchainPaths, fs: localFS, hostOperatingSystem: hostOperatingSystem))
     }
@@ -549,7 +556,7 @@ public final class Core: Sendable {
     /// Dump information on the registered spec proxies.
     public func getSpecsDump(conformingTo: String?) -> String {
         var result = ""
-        for (domain,domainRegistry) in specRegistry.proxiesByDomain.sorted(byKey: <) {
+        for (domain, domainRegistry) in specRegistry.proxiesByDomain.sorted(byKey: <) {
             let domainName = domain.isEmpty ? "(default)" : domain
             result += "-- Domain: \(domainName) --\n"
 
@@ -589,7 +596,8 @@ public final class Core: Sendable {
         }
 
         let specs: [SpecDump] = specRegistry.domains.flatMap { domain -> [SpecDump] in
-            let allSpecs = specRegistry.findSpecs(BuildSettingsSpec.self, domain: domain, includeInherited: false)
+            let allSpecs =
+                specRegistry.findSpecs(BuildSettingsSpec.self, domain: domain, includeInherited: false)
                 + specRegistry.findSpecs(BuildSettingsExtensionSpec.self, domain: domain, includeInherited: false)
                 + specRegistry.findSpecs(BuildSystemSpec.self, domain: domain, includeInherited: false)
                 + specRegistry.findSpecs(CommandLineToolSpec.self, domain: domain, includeInherited: false)
@@ -599,7 +607,8 @@ public final class Core: Sendable {
                     path: spec.proxyPath.str,
                     options: spec.flattenedBuildOptions.values.sorted(by: \.name).map { option in
                         .init(name: option.name, displayName: option.localizedName != option.name ? option.localizedName : nil, categoryName: option.localizedCategoryName, description: option.localizedDescription)
-                })
+                    }
+                )
             }
         }
 
@@ -610,7 +619,7 @@ public final class Core: Sendable {
     /// Dump information on the registered toolchains.
     public func getToolchainsDump() async -> String {
         var result = ""
-        for (_,toolchain) in toolchainRegistry.toolchainsByIdentifier.sorted(byKey: <) {
+        for (_, toolchain) in toolchainRegistry.toolchainsByIdentifier.sorted(byKey: <) {
             result += "\(toolchain)\n"
         }
         return result
@@ -659,13 +668,15 @@ extension Core: PlatformInfoLookup {
         // If we found a match, look up the SDK -- we'll deterministically get the latest version of that SDK,
         // and it should have only one variant whose platform ID matches our platform.
         if let platformName = platformNames.only, let platform = platformRegistry.lookup(name: platformName) {
-            let potentialSDKNames = [platform.sdkCanonicalName].compactMap { $0 } + sdkRegistry.supportedSDKCanonicalNameSuffixes().compactMap {
-                if let sdkBaseName = platform.sdkCanonicalName {
-                    return "\(sdkBaseName).\($0)"
-                } else {
-                    return nil
+            let potentialSDKNames =
+                [platform.sdkCanonicalName].compactMap { $0 }
+                + sdkRegistry.supportedSDKCanonicalNameSuffixes().compactMap {
+                    if let sdkBaseName = platform.sdkCanonicalName {
+                        return "\(sdkBaseName).\($0)"
+                    } else {
+                        return nil
+                    }
                 }
-            }
             if let sdk = potentialSDKNames.compactMap({ try? sdkRegistry.lookup($0, activeRunDestination: nil) }).first {
                 return sdk.variants.values.filter { sdk.targetBuildVersionPlatform(sdkVariant: $0) == buildPlatform }.only
             }
@@ -714,7 +725,7 @@ extension Core {
 /// The delegate used to convey information to registry subsystems about the core, including a channel for those registries to report diagnostics.  This struct is created by the core itself and refers to the core.  It exists as a struct separate from core to avoid creating an ownership cycle between the core and the registry objects.
 ///
 /// Although primarily used by registries during the loading of the core, this delegate is persisted since registries may need to report additional information after loading.  For example, new toolchains may be downloaded.
-struct CoreRegistryDelegate : PlatformRegistryDelegate, SDKRegistryDelegate, SpecRegistryDelegate, ToolchainRegistryDelegate, SpecRegistryProvider, Sendable {
+struct CoreRegistryDelegate: PlatformRegistryDelegate, SDKRegistryDelegate, SpecRegistryDelegate, ToolchainRegistryDelegate, SpecRegistryProvider, Sendable {
     unowned let core: Core
 
     var diagnosticsEngine: DiagnosticProducingDelegateProtocolPrivate<DiagnosticsEngine> {
diff --git a/Sources/SWBCore/CustomTaskTypeDescription.swift b/Sources/SWBCore/CustomTaskTypeDescription.swift
index ee15c9a8..9210ce81 100644
--- a/Sources/SWBCore/CustomTaskTypeDescription.swift
+++ b/Sources/SWBCore/CustomTaskTypeDescription.swift
@@ -60,6 +60,6 @@ public final class CustomTaskTypeDescription: TaskTypeDescription {
     }
 
     public func generateLocalizationInfo(for task: any ExecutableTask, input: TaskGenerateLocalizationInfoInput) -> [TaskGenerateLocalizationInfoOutput] {
-       []
+        []
     }
 }
diff --git a/Sources/SWBCore/Dependencies.swift b/Sources/SWBCore/Dependencies.swift
index de31a838..0cff938b 100644
--- a/Sources/SWBCore/Dependencies.swift
+++ b/Sources/SWBCore/Dependencies.swift
@@ -97,7 +97,8 @@ public struct ModuleDependenciesContext: Sendable, SerializableCodable {
         Diagnostic(
             behavior: .warning,
             location: .unknown,
-            data: DiagnosticData("The current toolchain does not support \(BuiltinMacros.VALIDATE_MODULE_DEPENDENCIES.name)"))
+            data: DiagnosticData("The current toolchain does not support \(BuiltinMacros.VALIDATE_MODULE_DEPENDENCIES.name)")
+        )
     }
 
     /// Compute missing module dependencies.
@@ -130,31 +131,36 @@ public struct ModuleDependenciesContext: Sendable, SerializableCodable {
             let fixIt = fixItContext?.makeFixIt(newModules: missingDependencies.map { $0.0 })
             let fixIts = fixIt.map { [$0] } ?? []
 
-            let importDiags: [Diagnostic] = missingDependencies
+            let importDiags: [Diagnostic] =
+                missingDependencies
                 .flatMap { dep in
                     dep.1.map {
                         return Diagnostic(
                             behavior: behavior,
                             location: $0,
                             data: DiagnosticData("Missing entry in \(BuiltinMacros.MODULE_DEPENDENCIES.name): \(dep.0.asBuildSettingEntryQuotedIfNeeded)"),
-                            fixIts: fixIts)
+                            fixIts: fixIts
+                        )
                     }
                 }
 
             let message = "Missing entries in \(BuiltinMacros.MODULE_DEPENDENCIES.name): \(missingDependencies.map { $0.0.asBuildSettingEntryQuotedIfNeeded }.sorted().joined(separator: " "))"
 
-            let location: Diagnostic.Location = fixIt.map {
-                Diagnostic.Location.path($0.sourceRange.path, line: $0.sourceRange.endLine, column: $0.sourceRange.endColumn)
-            } ?? Diagnostic.Location.buildSetting(BuiltinMacros.MODULE_DEPENDENCIES)
-
-            missingDiagnostics = [Diagnostic(
-                behavior: behavior,
-                location: location,
-                data: DiagnosticData(message),
-                fixIts: fixIts,
-                childDiagnostics: importDiags)]
-        }
-        else {
+            let location: Diagnostic.Location =
+                fixIt.map {
+                    Diagnostic.Location.path($0.sourceRange.path, line: $0.sourceRange.endLine, column: $0.sourceRange.endColumn)
+                } ?? Diagnostic.Location.buildSetting(BuiltinMacros.MODULE_DEPENDENCIES)
+
+            missingDiagnostics = [
+                Diagnostic(
+                    behavior: behavior,
+                    location: location,
+                    data: DiagnosticData(message),
+                    fixIts: fixIts,
+                    childDiagnostics: importDiags
+                )
+            ]
+        } else {
             missingDiagnostics = []
         }
 
@@ -162,13 +168,15 @@ public struct ModuleDependenciesContext: Sendable, SerializableCodable {
         if !unusedDependencies.isEmpty {
             let message = "Unused entries in \(BuiltinMacros.MODULE_DEPENDENCIES.name): \(unusedDependencies.map { $0.name }.sorted().joined(separator: " "))"
             // TODO location & fixit
-            unusedDiagnostics = [Diagnostic(
-                behavior: validateUnused == .yesError ? .error : .warning,
-                location: .unknown,
-                data: DiagnosticData(message),
-                fixIts: [])]
-        }
-        else {
+            unusedDiagnostics = [
+                Diagnostic(
+                    behavior: validateUnused == .yesError ? .error : .warning,
+                    location: .unknown,
+                    data: DiagnosticData(message),
+                    fixIts: []
+                )
+            ]
+        } else {
             unusedDiagnostics = []
         }
 
@@ -189,20 +197,18 @@ public struct ModuleDependenciesContext: Sendable, SerializableCodable {
             let thisTargetCondition = MacroCondition(parameter: BuiltinMacros.targetNameCondition, valuePattern: target.name)
 
             // TODO: if you have an assignment in a project-xcconfig and another assignment in target-settings, this would find the project-xcconfig assignment, but updating that might have no effect depending on the target-settings assignment
-            if let assignment = (settings.globalScope.table.lookupMacro(BuiltinMacros.MODULE_DEPENDENCIES)?.sequence.first {
-                   $0.location != nil && ($0.conditions?.conditions == [thisTargetCondition] || ($0.conditions?.conditions.isEmpty ?? true))
-               }),
-               let location = assignment.location
+            if let assignment =
+                (settings.globalScope.table.lookupMacro(BuiltinMacros.MODULE_DEPENDENCIES)?.sequence.first {
+                    $0.location != nil && ($0.conditions?.conditions == [thisTargetCondition] || ($0.conditions?.conditions.isEmpty ?? true))
+                }),
+                let location = assignment.location
             {
                 self.init(sourceRange: .init(path: location.path, startLine: location.endLine, startColumn: location.endColumn, endLine: location.endLine, endColumn: location.endColumn), modificationStyle: .appendToExistingAssignment)
-            }
-            else if let xcconfig = settings.constructionComponents.targetXcconfig {
+            } else if let xcconfig = settings.constructionComponents.targetXcconfig {
                 self.init(sourceRange: .init(path: xcconfig.path, startLine: xcconfig.finalLineNumber, startColumn: xcconfig.finalColumnNumber, endLine: xcconfig.finalLineNumber, endColumn: xcconfig.finalColumnNumber), modificationStyle: .insertNewAssignment(targetNameCondition: nil))
-            }
-            else if let xcconfig = settings.constructionComponents.projectXcconfig {
+            } else if let xcconfig = settings.constructionComponents.projectXcconfig {
                 self.init(sourceRange: .init(path: xcconfig.path, startLine: xcconfig.finalLineNumber, startColumn: xcconfig.finalColumnNumber, endLine: xcconfig.finalLineNumber, endColumn: xcconfig.finalColumnNumber), modificationStyle: .insertNewAssignment(targetNameCondition: target.name))
-            }
-            else {
+            } else {
                 return nil
             }
         }
@@ -299,7 +305,8 @@ public struct HeaderDependenciesContext: Sendable, SerializableCodable {
         Diagnostic(
             behavior: .warning,
             location: .unknown,
-            data: DiagnosticData("The current toolchain does not support \(BuiltinMacros.VALIDATE_HEADER_DEPENDENCIES.name)"))
+            data: DiagnosticData("The current toolchain does not support \(BuiltinMacros.VALIDATE_HEADER_DEPENDENCIES.name)")
+        )
     }
 
     /// Compute missing module dependencies.
@@ -314,16 +321,14 @@ public struct HeaderDependenciesContext: Sendable, SerializableCodable {
                 // TODO: What if the basename doesn't uniquely identify the header?
                 HeaderDependency(name: $0.basename, accessLevel: .Private, optional: false)
             }
-        }
-        else {
+        } else {
             missing = []
         }
 
         let unused: [HeaderDependency]
         if validateUnused != .no {
             unused = declared.filter { !$0.optional && !declaredNames.contains($0.name) }
-        }
-        else {
+        } else {
             unused = []
         }
 
@@ -344,17 +349,20 @@ public struct HeaderDependenciesContext: Sendable, SerializableCodable {
 
             let message = "Missing entries in \(BuiltinMacros.HEADER_DEPENDENCIES.name): \(missingDependencies.map { $0.asBuildSettingEntryQuotedIfNeeded }.sorted().joined(separator: " "))"
 
-            let location: Diagnostic.Location = fixIt.map {
-                Diagnostic.Location.path($0.sourceRange.path, line: $0.sourceRange.endLine, column: $0.sourceRange.endColumn)
-            } ?? Diagnostic.Location.buildSetting(BuiltinMacros.HEADER_DEPENDENCIES)
-
-            missingDiagnostics = [Diagnostic(
-                behavior: behavior,
-                location: location,
-                data: DiagnosticData(message),
-                fixIts: fixIts)]
-        }
-        else {
+            let location: Diagnostic.Location =
+                fixIt.map {
+                    Diagnostic.Location.path($0.sourceRange.path, line: $0.sourceRange.endLine, column: $0.sourceRange.endColumn)
+                } ?? Diagnostic.Location.buildSetting(BuiltinMacros.HEADER_DEPENDENCIES)
+
+            missingDiagnostics = [
+                Diagnostic(
+                    behavior: behavior,
+                    location: location,
+                    data: DiagnosticData(message),
+                    fixIts: fixIts
+                )
+            ]
+        } else {
             missingDiagnostics = []
         }
 
@@ -362,13 +370,15 @@ public struct HeaderDependenciesContext: Sendable, SerializableCodable {
         if !unusedDependencies.isEmpty {
             let message = "Unused entries in \(BuiltinMacros.HEADER_DEPENDENCIES.name): \(unusedDependencies.map { $0.name }.sorted().joined(separator: " "))"
             // TODO location & fixit
-            unusedDiagnostics = [Diagnostic(
-                behavior: validateUnused == .yesError ? .error : .warning,
-                location: .unknown,
-                data: DiagnosticData(message),
-                fixIts: [])]
-        }
-        else {
+            unusedDiagnostics = [
+                Diagnostic(
+                    behavior: validateUnused == .yesError ? .error : .warning,
+                    location: .unknown,
+                    data: DiagnosticData(message),
+                    fixIts: []
+                )
+            ]
+        } else {
             unusedDiagnostics = []
         }
 
@@ -388,20 +398,18 @@ public struct HeaderDependenciesContext: Sendable, SerializableCodable {
             guard let target = settings.target else { return nil }
             let thisTargetCondition = MacroCondition(parameter: BuiltinMacros.targetNameCondition, valuePattern: target.name)
 
-            if let assignment = (settings.globalScope.table.lookupMacro(BuiltinMacros.HEADER_DEPENDENCIES)?.sequence.first {
-                   $0.location != nil && ($0.conditions?.conditions == [thisTargetCondition] || ($0.conditions?.conditions.isEmpty ?? true))
-               }),
-               let location = assignment.location
+            if let assignment =
+                (settings.globalScope.table.lookupMacro(BuiltinMacros.HEADER_DEPENDENCIES)?.sequence.first {
+                    $0.location != nil && ($0.conditions?.conditions == [thisTargetCondition] || ($0.conditions?.conditions.isEmpty ?? true))
+                }),
+                let location = assignment.location
             {
                 self.init(sourceRange: .init(path: location.path, startLine: location.endLine, startColumn: location.endColumn, endLine: location.endLine, endColumn: location.endColumn), modificationStyle: .appendToExistingAssignment)
-            }
-            else if let xcconfig = settings.constructionComponents.targetXcconfig {
+            } else if let xcconfig = settings.constructionComponents.targetXcconfig {
                 self.init(sourceRange: .init(path: xcconfig.path, startLine: xcconfig.finalLineNumber, startColumn: xcconfig.finalColumnNumber, endLine: xcconfig.finalLineNumber, endColumn: xcconfig.finalColumnNumber), modificationStyle: .insertNewAssignment(targetNameCondition: nil))
-            }
-            else if let xcconfig = settings.constructionComponents.projectXcconfig {
+            } else if let xcconfig = settings.constructionComponents.projectXcconfig {
                 self.init(sourceRange: .init(path: xcconfig.path, startLine: xcconfig.finalLineNumber, startColumn: xcconfig.finalColumnNumber, endLine: xcconfig.finalLineNumber, endColumn: xcconfig.finalColumnNumber), modificationStyle: .insertNewAssignment(targetNameCondition: target.name))
-            }
-            else {
+            } else {
                 return nil
             }
         }
diff --git a/Sources/SWBCore/DependencyResolution.swift b/Sources/SWBCore/DependencyResolution.swift
index 80343091..1d126d9b 100644
--- a/Sources/SWBCore/DependencyResolution.swift
+++ b/Sources/SWBCore/DependencyResolution.swift
@@ -100,7 +100,6 @@ struct SpecializationParameters: Hashable, CustomStringConvertible {
         return macros
     }
 
-
     enum SpecializationSource: CustomStringConvertible {
         case synthesized
         case workspace
@@ -155,9 +154,9 @@ struct SpecializationParameters: Hashable, CustomStringConvertible {
             sourceString = "imposed by \(source)"
         }
 
-        return "Specialization parameters \(sourceString): platform '\(platform?.identifier ?? "nil")' sdkVariant '\(sdkVariant?.name ?? "nil")' supportedPlatforms: '\(supportedPlatforms?.joined(separator: " ") ?? "nil")' toolchain: '\(toolchain?.joined(separator: " ") ?? "nil")'" +
+        return "Specialization parameters \(sourceString): platform '\(platform?.identifier ?? "nil")' sdkVariant '\(sdkVariant?.name ?? "nil")' supportedPlatforms: '\(supportedPlatforms?.joined(separator: " ") ?? "nil")' toolchain: '\(toolchain?.joined(separator: " ") ?? "nil")'"
             // Hide the suffix if it is not present.
-        (canonicalNameSuffix != nil ? " suffix: \(String(describing: canonicalNameSuffix))" : "")
+            + (canonicalNameSuffix != nil ? " suffix: \(String(describing: canonicalNameSuffix))" : "")
     }
 
     private func effectiveToolchainOverride(originalParameters: BuildParameters, workspaceContext: WorkspaceContext) -> [String]? {
@@ -186,10 +185,7 @@ struct SpecializationParameters: Hashable, CustomStringConvertible {
     /// Check if a configured target can be used when this specialization is required.
     func isCompatible(with configuredTarget: ConfiguredTarget, settings: Settings, workspaceContext: WorkspaceContext) -> Bool {
         let toolchain = effectiveToolchainOverride(originalParameters: configuredTarget.parameters, workspaceContext: workspaceContext)
-        return (platform == nil || platform === settings.platform) &&
-        (sdkVariant == nil || sdkVariant?.name == settings.sdkVariant?.name) &&
-        (toolchain == nil || toolchain == settings.toolchains.map(\.identifier)) &&
-        (canonicalNameSuffix == nil || canonicalNameSuffix?.nilIfEmpty == settings.sdk?.canonicalNameSuffix)
+        return (platform == nil || platform === settings.platform) && (sdkVariant == nil || sdkVariant?.name == settings.sdkVariant?.name) && (toolchain == nil || toolchain == settings.toolchains.map(\.identifier)) && (canonicalNameSuffix == nil || canonicalNameSuffix?.nilIfEmpty == settings.sdk?.canonicalNameSuffix)
     }
 
     /// Return an effective set of specialization parameters based on a specific target-dependency pair.
@@ -251,8 +247,7 @@ struct SpecializationParameters: Hashable, CustomStringConvertible {
         let overridingSdk: SDK?
         if let sdkRoot {
             overridingSdk = try? workspaceContext.core.sdkRegistry.lookup(nameOrPath: sdkRoot.value, basePath: Path("/"), activeRunDestination: parameters.activeRunDestination)
-        }
-        else {
+        } else {
             overridingSdk = nil
         }
         // This seems like an unfortunate way to get from the SDK to its platform.  But SettingsBuilder.computeBoundProperties() creates a scope to evaluate the PLATFORM_NAME defined in the SDK's default properties, so maybe there isn't a clearly better way.
@@ -265,8 +260,7 @@ struct SpecializationParameters: Hashable, CustomStringConvertible {
             if let overridingSdk = overridingSdk {
                 let platformNames = workspaceContext.core.platformRegistry.platforms.map { $0.name }
                 diagnostics.append(Diagnostic(behavior: .warning, location: .unknown, data: DiagnosticData("Could not find a platform name for workspace specialization parameter for overriding SDK '\(overridingSdk.canonicalName)' among loaded platforms '\(platformNames.joined(separator: " "))'s.")))
-            }
-            else if let sdkRoot = sdkRoot {
+            } else if let sdkRoot = sdkRoot {
                 diagnostics.append(Diagnostic(behavior: .warning, location: .unknown, data: DiagnosticData("Could not find an SDK for workspace specialization parameters for overriding SDKROOT '\(sdkRoot.value)' from \(sdkRoot.source).")))
             }
             // Otherwise there was no overriding SDK provided, and there is no active run destination (or somehow there's a destination without a platform).  This is valid, but it's not clear to me what this means for specialization parameters.
@@ -294,8 +288,7 @@ struct SpecializationParameters: Hashable, CustomStringConvertible {
                 let platformNames = workspaceContext.core.platformRegistry.platforms.map { $0.name }
                 diagnostics.append(Diagnostic(behavior: .warning, location: .unknown, data: DiagnosticData("Could not find a platform named '\(platformName)' from loaded platforms '\(platformNames.joined(separator: " "))' for workspace specialization parameters.")))
             }
-        }
-        else {
+        } else {
             platform = nil
         }
         let defaultVariant: SDKVariant?
@@ -368,14 +361,14 @@ extension BuildRequestContext {
         for overrideSource in overrideSources {
             switch overrideSource {
             case .environmentConfigOverrides(dict: let dict),
-                 .commandLineConfigOverrides(dict: let dict),
-                 .commandLineOverrides(dict: let dict),
-                 .buildParametersOverrides(dict: let dict):
+                .commandLineConfigOverrides(dict: let dict),
+                .commandLineOverrides(dict: let dict),
+                .buildParametersOverrides(dict: let dict):
                 if let value = dict[macroName] {
                     return (value, overrideSource)
                 }
             case .environmentConfigOverridesPath,
-                 .commandLineConfigOverridesPath:
+                .commandLineConfigOverridesPath:
                 // These cases were handled before this loop.
                 continue
             }
@@ -500,7 +493,7 @@ extension SpecializationParameters {
             // Keep this dictionary empty so that `LinkageDependencyResolver` fallbacks to using the build parameters of the configured targets, which are the relevant ones.
             self.buildParametersByTarget = [:]
         } else {
-            var buildParametersByTarget = [Target:BuildParameters]()
+            var buildParametersByTarget = [Target: BuildParameters]()
             for targetInfo in buildRequest.buildTargets {
                 buildParametersByTarget[targetInfo.target] = targetInfo.parameters
             }
@@ -517,15 +510,20 @@ extension SpecializationParameters {
             var hostBuildParameters: PlatformBuildParameters? = nil
             for platform in workspaceContext.core.platformRegistry.platforms {
                 // Find the corresponding SDK for this platform
-                let potentialSDKNames = [platform.sdkCanonicalName].compactMap { $0 } + workspaceContext.core.sdkRegistry.supportedSDKCanonicalNameSuffixes().compactMap {
-                    if let sdkBaseName = platform.sdkCanonicalName {
-                        return "\(sdkBaseName).\($0)"
-                    } else {
-                        return nil
+                let potentialSDKNames =
+                    [platform.sdkCanonicalName].compactMap { $0 }
+                    + workspaceContext.core.sdkRegistry.supportedSDKCanonicalNameSuffixes().compactMap {
+                        if let sdkBaseName = platform.sdkCanonicalName {
+                            return "\(sdkBaseName).\($0)"
+                        } else {
+                            return nil
+                        }
                     }
-                }
-                guard let matchingSDK = potentialSDKNames
-                    .compactMap({ try? workspaceContext.core.sdkRegistry.lookup($0, activeRunDestination: nil) }).first else {
+                guard
+                    let matchingSDK =
+                        potentialSDKNames
+                        .compactMap({ try? workspaceContext.core.sdkRegistry.lookup($0, activeRunDestination: nil) }).first
+                else {
                     continue
                 }
 
@@ -537,7 +535,7 @@ extension SpecializationParameters {
                     let specializationParams = SpecializationParameters.default(workspaceContext: workspaceContext, buildRequestContext: buildRequestContext, parameters: buildParams)
                     platformBuildParameters.append(PlatformBuildParameters(buildParams: buildParams, specializationParams: specializationParams))
 
-                    if runDestination.platform == hostOS && runDestination.sdkVariant == matchingSDK.defaultVariant?.name  {
+                    if runDestination.platform == hostOS && runDestination.sdkVariant == matchingSDK.defaultVariant?.name {
                         hostBuildParameters = platformBuildParameters.last
                     }
                 }
@@ -550,11 +548,13 @@ extension SpecializationParameters {
             self.hostParametersForIndex = nil
         }
 
-        self.dynamicallyBuildingTargets = Set(buildRequest.buildTargets.filter {
-            workspaceContext.workspace.project(for: $0.target).isPackage && buildRequestContext.getCachedSettings($0.parameters, target: $0.target).globalScope.evaluate(BuiltinMacros.PACKAGE_BUILD_DYNAMICALLY)
-        }.map {
-            $0.target
-        })
+        self.dynamicallyBuildingTargets = Set(
+            buildRequest.buildTargets.filter {
+                workspaceContext.workspace.project(for: $0.target).isPackage && buildRequestContext.getCachedSettings($0.parameters, target: $0.target).globalScope.evaluate(BuiltinMacros.PACKAGE_BUILD_DYNAMICALLY)
+            }.map {
+                $0.target
+            }
+        )
     }
 
     /// Add the superimposed overrides in `specialization` to be imposed on the target in `configuredTarget` and other instances of that target which match this `configuredTarget`.
@@ -868,8 +868,7 @@ extension SpecializationParameters {
             } else {
                 imposedSdkVariant = imposedPlatform?.defaultSDKVariant
             }
-        }
-        else {
+        } else {
             imposedSdkVariant = nil
         }
 
@@ -897,14 +896,21 @@ extension SpecializationParameters {
                     // having a build description, severely hampering semantic functionality.
                     let behavior: Diagnostic.Behavior = buildRequest.enableIndexBuildArena ? .warning : .error
 
-                    delegate.emit(Diagnostic(behavior: behavior, location: .unknown, data: data, childDiagnostics: {
-                        switch specialization.source {
-                        case .synthesized, .workspace:
-                            []
-                        case let .target(name):
-                            [Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("Consider changing target '\(name)' to build using an \(specializationSDKOptions.joined(separator: " ")) SDK."))]
-                        }
-                    }()))
+                    delegate.emit(
+                        Diagnostic(
+                            behavior: behavior,
+                            location: .unknown,
+                            data: data,
+                            childDiagnostics: {
+                                switch specialization.source {
+                                case .synthesized, .workspace:
+                                    []
+                                case let .target(name):
+                                    [Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("Consider changing target '\(name)' to build using an \(specializationSDKOptions.joined(separator: " ")) SDK."))]
+                                }
+                            }()
+                        )
+                    )
                 }
 
                 // Since we are imposing a platform, we also need to impose internal-ness (from either the client or `SPECIALIZATION_SDK_OPTIONS`).
@@ -947,14 +953,16 @@ extension SpecializationParameters {
             imposedToolchain = nil
         }
 
-        let fromPackage =  workspaceContext.workspace.project(for: forTarget).isPackage
+        let fromPackage = workspaceContext.workspace.project(for: forTarget).isPackage
 
         let imposedSwiftCompileCache: Bool?
         if fromPackage {
-            imposedSwiftCompileCache = settings.globalScope.evaluate(BuiltinMacros.SWIFT_ENABLE_COMPILE_CACHE) || buildRequest.buildTargets.contains { buildTargetInfo in
-                let buildTargetSettings = buildRequestContext.getCachedSettings(buildTargetInfo.parameters, target: buildTargetInfo.target)
-                return buildTargetSettings.globalScope.evaluate(BuiltinMacros.SWIFT_ENABLE_COMPILE_CACHE)
-            }
+            imposedSwiftCompileCache =
+                settings.globalScope.evaluate(BuiltinMacros.SWIFT_ENABLE_COMPILE_CACHE)
+                || buildRequest.buildTargets.contains { buildTargetInfo in
+                    let buildTargetSettings = buildRequestContext.getCachedSettings(buildTargetInfo.parameters, target: buildTargetInfo.target)
+                    return buildTargetSettings.globalScope.evaluate(BuiltinMacros.SWIFT_ENABLE_COMPILE_CACHE)
+                }
         } else {
             imposedSwiftCompileCache = nil
         }
@@ -967,8 +975,7 @@ extension SpecializationParameters {
         // Ideally, this code shouldn't live here, but there are issues tracked in (rdar://80907686) that we need to work through.
         if settings.enableTargetPlatformSpecialization || settings.enableBuildRequestOverrides || fromPackage {
             return lookupConfiguredTarget(forTarget, parameters: filteredSpecialization.imposed(on: parameters, workspaceContext: workspaceContext), superimposedProperties: filteredSpecialization.superimposedProperties)
-        }
-        else {
+        } else {
             let nonimposedParameters = fromPackage ? parameters : parameters.withoutImposedOverrides(buildRequest, core: workspaceContext.core)
             return lookupConfiguredTarget(forTarget, parameters: filteredSpecialization.imposed(on: nonimposedParameters, workspaceContext: workspaceContext), superimposedProperties: filteredSpecialization.superimposedProperties)
         }
@@ -1083,8 +1090,7 @@ extension DependencyResolver {
             for n in 0..<iterations {
                 await fn(n)
             }
-        }
-        else {
+        } else {
             await TaskGroup.concurrentPerform(iterations: iterations, maximumParallelism: maximumParallelism, execute: fn)
         }
     }
@@ -1093,8 +1099,7 @@ extension DependencyResolver {
     func concurrentMap<Element: Sendable, T: Sendable, S: Sendable>(maximumParallelism: Int, _ items: S, _ transform: @Sendable @escaping (Element) async -> [T]) async -> [T] where S: Sequence<Element> {
         if disableConcurrentDependencyResolution {
             return await items.asyncMap(transform).flatMap { $0 }
-        }
-        else {
+        } else {
             return await items.concurrentMap(maximumParallelism: maximumParallelism, transform).flatMap { $0 }
         }
     }
diff --git a/Sources/SWBCore/EnvironmentBindings.swift b/Sources/SWBCore/EnvironmentBindings.swift
index ad20efef..f42388ba 100644
--- a/Sources/SWBCore/EnvironmentBindings.swift
+++ b/Sources/SWBCore/EnvironmentBindings.swift
@@ -53,7 +53,7 @@ public struct EnvironmentBindings: Sendable {
 }
 
 extension EnvironmentBindings: Equatable {
-    public static func ==(lhs: EnvironmentBindings, rhs: EnvironmentBindings) -> Bool {
+    public static func == (lhs: EnvironmentBindings, rhs: EnvironmentBindings) -> Bool {
         return lhs.bindingsDictionary == rhs.bindingsDictionary
     }
 }
diff --git a/Sources/SWBCore/ExecutableTask.swift b/Sources/SWBCore/ExecutableTask.swift
index ad6fbf31..d9ea0ceb 100644
--- a/Sources/SWBCore/ExecutableTask.swift
+++ b/Sources/SWBCore/ExecutableTask.swift
@@ -105,7 +105,7 @@ extension ExecutableTask {
     ///
     /// Clients should expect this is cheap to compute, but not necessarily O(1).
     public var commandLineAsStrings: AnySequence<String> {
-        return AnySequence(commandLine.lazy.map{ $0.asString })
+        return AnySequence(commandLine.lazy.map { $0.asString })
     }
 
     public func generateIndexingInfo(input: TaskGenerateIndexingInfoInput) -> [TaskGenerateIndexingInfoOutput] {
@@ -145,8 +145,7 @@ extension ExecutableTask {
             if let selfName = self.forTarget?.target.name, let otherName = other.forTarget?.target.name {
                 // If both tasks' targets have names, then we order them by those names
                 return selfName < otherName
-            }
-            else {
+            } else {
                 // Otherwise only one has a name, so we order the one without a name last.  So all tasks without a
                 // target will get ordered to the end (usually these are all gate tasks).
                 return self.forTarget?.target.name != nil
diff --git a/Sources/SWBCore/Extensions/SettingsBuilderExtension.swift b/Sources/SWBCore/Extensions/SettingsBuilderExtension.swift
index 6a5ca157..520f307d 100644
--- a/Sources/SWBCore/Extensions/SettingsBuilderExtension.swift
+++ b/Sources/SWBCore/Extensions/SettingsBuilderExtension.swift
@@ -25,16 +25,16 @@ public struct SettingsBuilderExtensionPoint: ExtensionPoint {
 
 public protocol SettingsBuilderExtension: Sendable {
     /// Provides a table of additional build properties overrides
-    func addOverrides(fromEnvironment: [String:String], parameters: BuildParameters) throws -> [String:String]
+    func addOverrides(fromEnvironment: [String: String], parameters: BuildParameters) throws -> [String: String]
 
     /// Provides a table of additional build settings builtin defaults
-    func addBuiltinDefaults(fromEnvironment: [String:String], parameters: BuildParameters) throws -> [String:String]
+    func addBuiltinDefaults(fromEnvironment: [String: String], parameters: BuildParameters) throws -> [String: String]
 
     /// Provides a table of default settings for a product type.
     func addProductTypeDefaults(productType: ProductTypeSpec) -> [String: String]
 
     /// Provides a table of additional SDK settings
-    func addSDKSettings(_ sdk: SDK, _ variant: SDKVariant?, _ sparseSDKs: [SDK]) throws -> [String : String]
+    func addSDKSettings(_ sdk: SDK, _ variant: SDKVariant?, _ sparseSDKs: [SDK]) throws -> [String: String]
 
     /// Provides a table of overriding SDK settings
     func addSDKOverridingSettings(_ sdk: SDK, _ variant: SDKVariant?, _ sparseSDKs: [SDK], specLookupContext: any SpecLookupContext, environment: [String: String]) throws -> [String: String]
diff --git a/Sources/SWBCore/FileSystemSignatureBasedCache.swift b/Sources/SWBCore/FileSystemSignatureBasedCache.swift
index 4ba2551c..6af259a1 100644
--- a/Sources/SWBCore/FileSystemSignatureBasedCache.swift
+++ b/Sources/SWBCore/FileSystemSignatureBasedCache.swift
@@ -30,11 +30,14 @@ final class FileSystemSignatureBasedCache<Value: Sendable>: Sendable {
 
     /// Gets the object with the given path and signature, creating it if necessary.
     public func get(at path: Path, filesSignature: FilesSignature) throws -> Value {
-        return try cache.getOrInsert(Key(path: path, filesSignature: filesSignature), body: { () -> Result<Value, any Error> in
-            return Result<Value, any Error> {
-                try block(path)
+        return try cache.getOrInsert(
+            Key(path: path, filesSignature: filesSignature),
+            body: { () -> Result<Value, any Error> in
+                return Result<Value, any Error> {
+                    try block(path)
+                }
             }
-        }).get()
+        ).get()
     }
 }
 
diff --git a/Sources/SWBCore/FileToBuild.swift b/Sources/SWBCore/FileToBuild.swift
index 00e8222a..88bcafad 100644
--- a/Sources/SWBCore/FileToBuild.swift
+++ b/Sources/SWBCore/FileToBuild.swift
@@ -15,7 +15,7 @@ public import SWBProtocol
 public import SWBMacro
 
 /// Represents a file to be passed as input to some part of the build machinery.  May be a source file originally sent down with the PIF, or might be a temporary file.  Once a build rule action has been determined, it is assigned to the FileToBuild so it doesn’t have to be looked up again.  Note that the term “file” here is used in the loosest sense — the path can refer to any file system entity.
-public struct FileToBuild : Hashable, Sendable {
+public struct FileToBuild: Hashable, Sendable {
     /// Absolute path of the referenced file.
     public let absolutePath: Path
 
@@ -100,7 +100,7 @@ public struct FileToBuild : Hashable, Sendable {
         hasher.combine(headerVisibility)
     }
 
-    public static func ==(lhs: FileToBuild, rhs: FileToBuild) -> Bool {
+    public static func == (lhs: FileToBuild, rhs: FileToBuild) -> Bool {
         // QUESTION: Does the header visibility really make two files of the same type and the same path different? <rdar://problem/29980516> [Swift Build] Should FileToBuild.== be considering the headerVisibility property?
         return lhs.absolutePath == rhs.absolutePath && lhs.fileType === rhs.fileType && lhs.headerVisibility == rhs.headerVisibility
     }
@@ -112,7 +112,7 @@ public struct FileToBuild : Hashable, Sendable {
 }
 
 /// Represents a group of one or more files to be processed by a single build task.  Once added to a group, a file cannot be removed from it.
-public final class FileToBuildGroup : Hashable, Equatable, CustomStringConvertible {
+public final class FileToBuildGroup: Hashable, Equatable, CustomStringConvertible {
     /// The identifier for this group.
     public let identifier: String?
 
@@ -132,12 +132,11 @@ public final class FileToBuildGroup : Hashable, Equatable, CustomStringConvertib
         hasher.combine(files)
     }
 
-    public static func ==(lhs: FileToBuildGroup, rhs: FileToBuildGroup) -> Bool {
+    public static func == (lhs: FileToBuildGroup, rhs: FileToBuildGroup) -> Bool {
         return lhs.files == rhs.files
     }
 
-    public var description: String
-    {
+    public var description: String {
         // Since only the files are relevant for equality, that's all we emit here.
         let filesDescription = files.map({ $0.descriptionForGroup }).joined(separator: ", ")
         return "<\(type(of: self)):[\(filesDescription)]>"
@@ -148,8 +147,8 @@ public protocol RegionVariable {
     var regionVariantName: String? { get }
 }
 
-extension Path: RegionVariable { }
-extension FileToBuild: RegionVariable { }
+extension Path: RegionVariable {}
+extension FileToBuild: RegionVariable {}
 
 extension FileToBuildGroup: RegionVariable {
     /// Returns the region variant name for a group of files.
diff --git a/Sources/SWBCore/LibSwiftDriver/LibSwiftDriver.swift b/Sources/SWBCore/LibSwiftDriver/LibSwiftDriver.swift
index c3ef9d63..fede4384 100644
--- a/Sources/SWBCore/LibSwiftDriver/LibSwiftDriver.swift
+++ b/Sources/SWBCore/LibSwiftDriver/LibSwiftDriver.swift
@@ -18,7 +18,7 @@ import TSCBasic
 
 public import SWBUtil
 
-public protocol SwiftGlobalExplicitDependencyGraph : AnyObject {
+public protocol SwiftGlobalExplicitDependencyGraph: AnyObject {
     /// Register a collection of driver jobs in the graph, de-duplicating them in the process
     /// - Parameters:
     ///   - jobs: A collection of explicit-dependency build jobs from a given Swift Driver invocation
@@ -54,8 +54,11 @@ private struct GlobalExplicitDependencyTracker {
     /// The collection of *all* explicit module dependency build jobs found so far
     fileprivate private(set) var plannedExplicitDependencyJobs: [LibSwiftDriver.PlannedBuild.PlannedSwiftDriverJob] = []
 
-    mutating func addExplicitDependencyBuildJobs(_ jobs: [SwiftDriverJob], workingDirectory: Path,
-                                                 producerMap: inout [Path: LibSwiftDriver.JobKey]) throws -> Set<LibSwiftDriver.JobKey> {
+    mutating func addExplicitDependencyBuildJobs(
+        _ jobs: [SwiftDriverJob],
+        workingDirectory: Path,
+        producerMap: inout [Path: LibSwiftDriver.JobKey]
+    ) throws -> Set<LibSwiftDriver.JobKey> {
         // Filter out "new" unique jobs and populate the `producerMap`
         var jobKeys: Set<LibSwiftDriver.JobKey> = []
         var jobsWithIndices: [(SwiftDriverJob, LibSwiftDriver.JobIndex)] = []
@@ -137,7 +140,7 @@ public final class SwiftModuleDependencyGraph: SwiftGlobalExplicitDependencyGrap
     public init() {}
 
     public func waitForCompletion() async {
-        await registryQueue.sync { }
+        await registryQueue.sync {}
     }
 
     /// Plans a build and stores it for a given unique identifier.
@@ -301,8 +304,11 @@ public final class SwiftModuleDependencyGraph: SwiftGlobalExplicitDependencyGrap
         }
     }
 
-    public func addExplicitDependencyBuildJobs(_ jobs: [SwiftDriverJob], workingDirectory: Path,
-                                               producerMap: inout [Path: LibSwiftDriver.JobKey]) throws -> Set<LibSwiftDriver.JobKey> {
+    public func addExplicitDependencyBuildJobs(
+        _ jobs: [SwiftDriverJob],
+        workingDirectory: Path,
+        producerMap: inout [Path: LibSwiftDriver.JobKey]
+    ) throws -> Set<LibSwiftDriver.JobKey> {
         try registryQueue.blocking_sync {
             try globalExplicitDependencyTracker.addExplicitDependencyBuildJobs(jobs, workingDirectory: workingDirectory, producerMap: &producerMap)
         }
@@ -353,17 +359,21 @@ public final class SwiftModuleDependencyGraph: SwiftGlobalExplicitDependencyGrap
             summaryCSV.writeRow([moduleID, "\(jobs.count)"])
             summaryMessage += "\(moduleID): \(jobs.count == 1 ? "1 variant" : "\(jobs.count) variants")\n"
 
-            let mergeResult = nWayMerge(jobs.map { $0.commandLine.filter {
-                if ["pcm", "dia", "d"].contains(Path($0).fileExtension) {
-                    // Filter differences in module paths, they are a function of the other args
-                    return false
-                } else if $0.hasPrefix("llvmcas://") {
-                    // Filter differences in CAS URLs, they are a function of the other args
-                    return false
-                } else {
-                    return true
+            let mergeResult = nWayMerge(
+                jobs.map {
+                    $0.commandLine.filter {
+                        if ["pcm", "dia", "d"].contains(Path($0).fileExtension) {
+                            // Filter differences in module paths, they are a function of the other args
+                            return false
+                        } else if $0.hasPrefix("llvmcas://") {
+                            // Filter differences in CAS URLs, they are a function of the other args
+                            return false
+                        } else {
+                            return true
+                        }
+                    }.map { $0.asString }
                 }
-            }.map { $0.asString } }).filter {
+            ).filter {
                 if $0.elementOf.count == jobs.count {
                     // Don't report args common to all variants
                     return false
@@ -417,10 +427,12 @@ class Executor: DriverExecutor {
         self.workingDirectory = workingDirectory
     }
 
-    func execute(job: Job, forceResponseFiles: Bool, recordedInputModificationDates: [TypedVirtualPath : TimePoint]) throws -> ProcessResult {
-        let useResponseFiles : ResponseFileHandling = forceResponseFiles ? .forced : .heuristic
-        let arguments: [String] = try resolver.resolveArgumentList(for: job,
-                                                                   useResponseFiles: useResponseFiles)
+    func execute(job: Job, forceResponseFiles: Bool, recordedInputModificationDates: [TypedVirtualPath: TimePoint]) throws -> ProcessResult {
+        let useResponseFiles: ResponseFileHandling = forceResponseFiles ? .forced : .heuristic
+        let arguments: [String] = try resolver.resolveArgumentList(
+            for: job,
+            useResponseFiles: useResponseFiles
+        )
 
         try job.verifyInputsNotModified(since: recordedInputModificationDates, fileSystem: fileSystem)
 
@@ -439,14 +451,14 @@ class Executor: DriverExecutor {
         }
     }
 
-    func execute(workload: DriverExecutorWorkload, delegate: any JobExecutionDelegate, numParallelJobs: Int, forceResponseFiles: Bool, recordedInputModificationDates: [TypedVirtualPath : TimePoint]) throws {
+    func execute(workload: DriverExecutorWorkload, delegate: any JobExecutionDelegate, numParallelJobs: Int, forceResponseFiles: Bool, recordedInputModificationDates: [TypedVirtualPath: TimePoint]) throws {
         guard self.plannedBuild == nil else {
             throw StubError.error("Unexpected extra workload from Swift driver.")
         }
         self.plannedBuild = try LibSwiftDriver.PlannedBuild(workload: workload, argsResolver: self.resolver, explicitModulesResolver: self.explicitModulesResolver, jobExecutionDelegate: delegate, globalExplicitDependencyJobGraph: explicitDependencyGraph, workingDirectory: workingDirectory, eagerCompilationEnabled: eagerCompilationEnabled)
     }
 
-    func checkNonZeroExit(args: String..., environment: [String : String]) throws -> String {
+    func checkNonZeroExit(args: String..., environment: [String: String]) throws -> String {
         try Process.checkNonZeroExit(arguments: args, environmentBlock: .init(environment))
     }
 
@@ -469,19 +481,19 @@ class Executor: DriverExecutor {
 public final class LibSwiftDriver {
     public typealias JobIndex = Int
     /// Type to fetch dependencies of planned jobs
-    public enum JobKey : Comparable, Hashable, Serializable {
+    public enum JobKey: Comparable, Hashable, Serializable {
         case explicitDependencyJob(_ index: JobIndex)
         case targetJob(_ index: JobIndex)
 
-        public func serialize<T>(to serializer: T) where T : Serializer {
+        public func serialize<T>(to serializer: T) where T: Serializer {
             serializer.beginAggregate(2)
             switch self {
-                case .explicitDependencyJob(let index):
-                    serializer.serialize(0)
-                    serializer.serialize(index)
-                case .targetJob(let index):
-                    serializer.serialize(1)
-                    serializer.serialize(index)
+            case .explicitDependencyJob(let index):
+                serializer.serialize(0)
+                serializer.serialize(index)
+            case .targetJob(let index):
+                serializer.serialize(1)
+                serializer.serialize(index)
             }
             serializer.endAggregate()
         }
@@ -490,14 +502,14 @@ public final class LibSwiftDriver {
             try deserializer.beginAggregate(2)
             let code: Int = try deserializer.deserialize()
             switch code {
-                case 0:
-                    let index: JobIndex = try deserializer.deserialize()
-                    self = .explicitDependencyJob(index)
-                case 1:
-                    let index: JobIndex = try deserializer.deserialize()
-                    self = .targetJob(index)
-                default:
-                    throw DeserializerError.incorrectType("Unexpected type code for LibSwiftDriver.JobKey: \(code)")
+            case 0:
+                let index: JobIndex = try deserializer.deserialize()
+                self = .explicitDependencyJob(index)
+            case 1:
+                let index: JobIndex = try deserializer.deserialize()
+                self = .targetJob(index)
+            default:
+                throw DeserializerError.incorrectType("Unexpected type code for LibSwiftDriver.JobKey: \(code)")
             }
         }
     }
@@ -614,7 +626,7 @@ public final class LibSwiftDriver {
             let fallbackDiagnostics: [SWBUtil.Diagnostic]
             if driver.diagnosticEngine.hasErrors {
                 #if canImport(os)
-                OSLog.log("Driver threw error \(error) but emitted errors to build log.")
+                    OSLog.log("Driver threw error \(error) but emitted errors to build log.")
                 #endif
                 fallbackDiagnostics = []
             } else {
@@ -641,9 +653,11 @@ public final class LibSwiftDriver {
                 return nil
             }
             do {
-                guard let job = jobs.filter({ job in
-                    job.primarySwiftSourceFiles.contains(where: { $0.typedFile.file.absolutePath?.pathString == inputPath.str })
-                }).only else {
+                guard
+                    let job = jobs.filter({ job in
+                        job.primarySwiftSourceFiles.contains(where: { $0.typedFile.file.absolutePath?.pathString == inputPath.str })
+                    }).only
+                else {
                     return nil
                 }
                 return try shim.resolver.resolveArgumentList(for: job, useResponseFiles: .heuristic)
@@ -655,7 +669,7 @@ public final class LibSwiftDriver {
 
             if diagnosticsEngine.hasErrors {
                 #if canImport(os)
-                OSLog.log("Driver threw error \(error) but emitted errors to build log.")
+                    OSLog.log("Driver threw error \(error) but emitted errors to build log.")
                 #endif
             } else {
                 outputDelegate.error("Driver threw \(error) without emitting errors.")
@@ -684,7 +698,7 @@ public final class LibSwiftDriver {
 
             if diagnosticsEngine.hasErrors {
                 #if canImport(os)
-                OSLog.log("Driver threw error \(error) but emitted errors to build log.")
+                    OSLog.log("Driver threw error \(error) but emitted errors to build log.")
                 #endif
             } else {
                 outputDelegate.error("Driver threw \(error) without emitting errors.")
@@ -718,9 +732,11 @@ extension SwiftModuleDependencyGraph {
         guard let oracle = oracleRegistry[key] else {
             throw StubError.error("can't find created dependency scanning oracle from compiler location \(compilerLocation)")
         }
-        let cas = try oracle.getOrCreateCAS(pluginPath: try toAbsolutePath(casOptions.pluginPath?.str),
-                                            onDiskPath: try toAbsolutePath(casOptions.casPath.str),
-                                            pluginOptions: pluginOpts)
+        let cas = try oracle.getOrCreateCAS(
+            pluginPath: try toAbsolutePath(casOptions.pluginPath?.str),
+            onDiskPath: try toAbsolutePath(casOptions.casPath.str),
+            pluginOptions: pluginOpts
+        )
         return SwiftCASDatabases(cas)
     }
 }
diff --git a/Sources/SWBCore/LibSwiftDriver/PlannedBuild.swift b/Sources/SWBCore/LibSwiftDriver/PlannedBuild.swift
index a5bc4e9c..fcb83f89 100644
--- a/Sources/SWBCore/LibSwiftDriver/PlannedBuild.swift
+++ b/Sources/SWBCore/LibSwiftDriver/PlannedBuild.swift
@@ -11,9 +11,9 @@
 //===----------------------------------------------------------------------===//
 
 #if os(Windows)
-private import Foundation
+    private import Foundation
 #else
-public import Foundation
+    public import Foundation
 #endif
 
 import SwiftDriver
@@ -38,7 +38,7 @@ public struct SwiftDriverJob: Serializable, CustomDebugStringConvertible {
     public enum Kind: Serializable {
         case target, explicitModule(uniqueID: Int)
 
-        public func serialize<T>(to serializer: T) where T : Serializer {
+        public func serialize<T>(to serializer: T) where T: Serializer {
             serializer.serializeAggregate(2) {
                 switch self {
                 case .target:
@@ -120,7 +120,7 @@ public struct SwiftDriverJob: Serializable, CustomDebugStringConvertible {
         }.sorted()
     }
 
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serializeAggregate(10) {
             serializer.serialize(kind)
             serializer.serialize(ruleInfoType)
@@ -154,7 +154,6 @@ public struct SwiftDriverJob: Serializable, CustomDebugStringConvertible {
     }
 }
 
-
 extension LibSwiftDriver {
 
     public final class PlannedBuild {
@@ -198,7 +197,7 @@ extension LibSwiftDriver {
                 self.signature = md5.signature
             }
 
-            public func serialize<T>(to serializer: T) where T : Serializer {
+            public func serialize<T>(to serializer: T) where T: Serializer {
                 serializer.serializeAggregate(5) {
                     serializer.serialize(key)
                     serializer.serialize(driverJob)
@@ -229,10 +228,10 @@ extension LibSwiftDriver {
                 let keyStrConverter: (_ key: JobKey) -> String = { key in
                     let keyStr: String
                     switch key {
-                        case .explicitDependencyJob(let index):
-                            keyStr = ("explicit(\(index))")
-                        case .targetJob(let index):
-                            keyStr = ("target(\(index))")
+                    case .explicitDependencyJob(let index):
+                        keyStr = ("explicit(\(index))")
+                    case .targetJob(let index):
+                        keyStr = ("target(\(index))")
 
                     }
                     return keyStr
@@ -306,7 +305,7 @@ extension LibSwiftDriver {
             }
         }
 
-        private static func evaluateWorkload(_ workload: SwiftDriver.DriverExecutorWorkload, argsResolver: ArgsResolver, explicitModulesResolver: ArgsResolver, globalExplicitDependencyJobGraph: (any SwiftGlobalExplicitDependencyGraph)?, workingDirectory: Path, eagerCompilationEnabled: Bool) throws -> (plannedTargetJobs: [PlannedSwiftDriverJob], originalTargetJobs: [SwiftDriver.Job], incrementalCompilationState: IncrementalCompilationState?, producerMap: [Path: JobKey], explicitModuleBuildJobKeys: Set<JobKey>, compilationRequirementsIndices: Range<JobIndex>, compilationIndices:  Range<JobIndex>, afterCompilationIndices: Range<JobIndex>, verificationIndices: Range<JobIndex>) {
+        private static func evaluateWorkload(_ workload: SwiftDriver.DriverExecutorWorkload, argsResolver: ArgsResolver, explicitModulesResolver: ArgsResolver, globalExplicitDependencyJobGraph: (any SwiftGlobalExplicitDependencyGraph)?, workingDirectory: Path, eagerCompilationEnabled: Bool) throws -> (plannedTargetJobs: [PlannedSwiftDriverJob], originalTargetJobs: [SwiftDriver.Job], incrementalCompilationState: IncrementalCompilationState?, producerMap: [Path: JobKey], explicitModuleBuildJobKeys: Set<JobKey>, compilationRequirementsIndices: Range<JobIndex>, compilationIndices: Range<JobIndex>, afterCompilationIndices: Range<JobIndex>, verificationIndices: Range<JobIndex>) {
             var wrappedJobs: [SwiftDriverJob] = []
             var originalTargetJobs: [SwiftDriver.Job] = []
             let incrementalCompilationState: IncrementalCompilationState?
@@ -334,30 +333,39 @@ extension LibSwiftDriver {
                     /* 2 */ \.categorizer.isGeneratePch,
                     /* 3 */ \.categorizer.isCompile,
                     /* 4 */ \.categorizer.isVerification,
-                    /* 5 */ { _ in true }
+                    /* 5 */ { _ in true },
                 ])
 
+            explicitModuleBuildJobKeys = try addExplicitDependencyBuildJobs(
+                groupedJobs[0],
+                to: explicitDependencyJobGraph,
+                workingDirectory: workingDirectory,
+                producing: &producerMap
+            )
 
-            explicitModuleBuildJobKeys = try addExplicitDependencyBuildJobs(groupedJobs[0],
-                                                                            to: explicitDependencyJobGraph,
-                                                                            workingDirectory: workingDirectory,
-                                                                            producing: &producerMap)
-
-            compilationRequirementsIndices = try addTargetJobs(groupedJobs[2] + groupedJobs[1] + (eagerCompilationEnabled ? [] : groupedJobs[3]),
-                                                               to: &wrappedJobs,
-                                                               producing: &producerMap)
+            compilationRequirementsIndices = try addTargetJobs(
+                groupedJobs[2] + groupedJobs[1] + (eagerCompilationEnabled ? [] : groupedJobs[3]),
+                to: &wrappedJobs,
+                producing: &producerMap
+            )
 
-            compilationIndices = try addTargetJobs(eagerCompilationEnabled ? groupedJobs[3] : [],
-                                                   to: &wrappedJobs,
-                                                   producing: &producerMap)
+            compilationIndices = try addTargetJobs(
+                eagerCompilationEnabled ? groupedJobs[3] : [],
+                to: &wrappedJobs,
+                producing: &producerMap
+            )
 
-            verificationIndices = try addTargetJobs(groupedJobs[4],
-                                                    to: &wrappedJobs,
-                                                    producing: &producerMap)
+            verificationIndices = try addTargetJobs(
+                groupedJobs[4],
+                to: &wrappedJobs,
+                producing: &producerMap
+            )
 
-            afterCompilationIndices = try addTargetJobs(groupedJobs[5],
-                                                        to: &wrappedJobs,
-                                                        producing: &producerMap)
+            afterCompilationIndices = try addTargetJobs(
+                groupedJobs[5],
+                to: &wrappedJobs,
+                producing: &producerMap
+            )
 
             originalTargetJobs = jobsToWrap.filter {
                 !SwiftDriverJobCategorizer($0).isExplicitDependencyBuild
@@ -390,12 +398,17 @@ extension LibSwiftDriver {
         }
 
         @discardableResult
-        private static func addExplicitDependencyBuildJobs(_ explicitDependencyDriverJobs: [SwiftDriverJob],
-                                                           to explicitDependencyJobGraph: any SwiftGlobalExplicitDependencyGraph,
-                                                           workingDirectory: Path, producing producerMap: inout [Path: JobKey]) throws -> Set<JobKey> {
-            return try explicitDependencyJobGraph.addExplicitDependencyBuildJobs(explicitDependencyDriverJobs,
-                                                                                 workingDirectory: workingDirectory,
-                                                                                 producerMap: &producerMap)
+        private static func addExplicitDependencyBuildJobs(
+            _ explicitDependencyDriverJobs: [SwiftDriverJob],
+            to explicitDependencyJobGraph: any SwiftGlobalExplicitDependencyGraph,
+            workingDirectory: Path,
+            producing producerMap: inout [Path: JobKey]
+        ) throws -> Set<JobKey> {
+            return try explicitDependencyJobGraph.addExplicitDependencyBuildJobs(
+                explicitDependencyDriverJobs,
+                workingDirectory: workingDirectory,
+                producerMap: &producerMap
+            )
         }
 
         @discardableResult
@@ -407,22 +420,26 @@ extension LibSwiftDriver {
                 jobs.append(job)
             }
 
-            return initialCount ..< jobs.count
+            return initialCount..<jobs.count
         }
 
-        internal static func addProducts(of job: SwiftDriverJob, index: JobKey, knownJobs: [SwiftDriverJob], to producerMap: inout [Path: JobKey]
+        internal static func addProducts(
+            of job: SwiftDriverJob,
+            index: JobKey,
+            knownJobs: [SwiftDriverJob],
+            to producerMap: inout [Path: JobKey]
         ) throws {
             for output in job.outputs {
                 if let otherJobKey = producerMap.updateValue(index, forKey: output) {
                     // Due to rdar://88393903 emit-module and compile jobs will specify to produce the Objective-C header file of the Swift target. Since we're not tracking outputs yet in llbuild for dynamic tasks it won't matter but we should throw the error again once llbuild starts tracking outputs. (rdar://70881411)
 
                     _ = otherJobKey
-//                    switch otherJobKey {
-//                        case .targetJob(let otherJobIndex):
-//                            throw PlannedBuild.Errors.multipleProducers(output: output, jobs: [job, knownJobs[otherJobIndex]])
-//                        case .explicitDependencyJob(let otherJobIndex):
-//                            throw PlannedBuild.Errors.multipleProducers(output: output, jobs: [job, knownJobs[otherJobIndex]])
-//                    }
+                    //                    switch otherJobKey {
+                    //                        case .targetJob(let otherJobIndex):
+                    //                            throw PlannedBuild.Errors.multipleProducers(output: output, jobs: [job, knownJobs[otherJobIndex]])
+                    //                        case .explicitDependencyJob(let otherJobIndex):
+                    //                            throw PlannedBuild.Errors.multipleProducers(output: output, jobs: [job, knownJobs[otherJobIndex]])
+                    //                    }
                 }
                 producerMap[output] = index
             }
@@ -430,12 +447,12 @@ extension LibSwiftDriver {
 
         private func driverJob(for plannedDriverJob: PlannedSwiftDriverJob) throws -> SwiftDriver.Job {
             switch plannedDriverJob.key {
-                case .targetJob(let index):
-                    guard let job = driverTargetJobs[safe: index] else {
-                        throw StubError.error("Data inconsistency between planned driver jobs and actual jobs. Job \(plannedDriverJob.driverJob) is unknown.")
-                    }
-                    return job
-                case .explicitDependencyJob(_):
+            case .targetJob(let index):
+                guard let job = driverTargetJobs[safe: index] else {
+                    throw StubError.error("Data inconsistency between planned driver jobs and actual jobs. Job \(plannedDriverJob.driverJob) is unknown.")
+                }
+                return job
+            case .explicitDependencyJob(_):
                 throw StubError.error("Querying SwiftDriver.job unsupported for an Explicit Dependency Build job.")
             }
         }
@@ -497,13 +514,13 @@ extension LibSwiftDriver {
         public func dependencies(for job: PlannedSwiftDriverJob) -> [PlannedSwiftDriverJob] {
             return job.dependencies.compactMap { dependencyKey in
                 switch dependencyKey {
-                    case .targetJob(_):
-                        return plannedTargetJob(for: dependencyKey)
-                    case .explicitDependencyJob(_):
-                        guard let explicitDependencyJobGraph = globalExplicitDependencyJobGraph else {
-                            fatalError("Explicit Module build job detected without a globalExplicitDependencyJobGraph.")
-                        }
-                        return explicitDependencyJobGraph.plannedExplicitDependencyBuildJob(for: dependencyKey)
+                case .targetJob(_):
+                    return plannedTargetJob(for: dependencyKey)
+                case .explicitDependencyJob(_):
+                    guard let explicitDependencyJobGraph = globalExplicitDependencyJobGraph else {
+                        fatalError("Explicit Module build job detected without a globalExplicitDependencyJobGraph.")
+                    }
+                    return explicitDependencyJobGraph.plannedExplicitDependencyBuildJob(for: dependencyKey)
                 }
             }
         }
@@ -550,7 +567,7 @@ extension LibSwiftDriver {
             try await dispatchQueue.sync {
                 let driverJob = try self.driverJob(for: job)
                 guard let reproJob = self.jobExecutionDelegate?.getReproducerJob(job: driverJob, output: try VirtualPath(path: dir.str)) else {
-                  return nil
+                    return nil
                 }
                 return try self.argsResolver.resolveArgumentList(for: reproJob, useResponseFiles: .heuristic)
             }
@@ -601,11 +618,11 @@ private extension TSCBasic.ProcessResult.ExitStatus {
         case let .exit(code):
             self = .terminated(code: code)
         case let .uncaughtSignal(signal):
-#if os(Windows)
-            self = .abnormal(exception: UInt32(signal))
-#else
-            self = .signalled(signal: signal)
-#endif
+            #if os(Windows)
+                self = .abnormal(exception: UInt32(signal))
+            #else
+                self = .signalled(signal: signal)
+            #endif
         }
     }
 }
@@ -663,19 +680,16 @@ public extension SwiftDriverJobCategorizer {
     }
 
     var isEmitModule: Bool {
-        containsInputs { ext, _ in ext == "swift" } &&
-        containsOutputs { ext, basename in ext == "swiftmodule" && !basename.contains("~partial") }
+        containsInputs { ext, _ in ext == "swift" } && containsOutputs { ext, basename in ext == "swiftmodule" && !basename.contains("~partial") }
     }
 
     var isCompile: Bool {
         // Compile jobs may not contain .o file if build for IS_ZIPPERED
-        containsInputs { ext, _ in ext == "swift" } &&
-        containsOutputs { ext, _ in ext == "d" || ext == "o" }
+        containsInputs { ext, _ in ext == "swift" } && containsOutputs { ext, _ in ext == "d" || ext == "o" }
     }
 
     var isGeneratePch: Bool {
-        containsInputs { ext, _ in ext == "h" } &&
-        containsOutputs { ext, _ in ext == "pch" }
+        containsInputs { ext, _ in ext == "h" } && containsOutputs { ext, _ in ext == "pch" }
     }
 
     // FIXME: Track the SwiftDriver.Job.Kind of SWBCore.SwiftDriverJobs that are not for explicit modules, and use that to classify verification tasks.
@@ -702,8 +716,7 @@ public extension SwiftDriverJob {
 private extension Array {
     func grouped(by conditionsInOrder: [(Element) -> Bool]) throws -> [[Element]] {
         var result: [[Element]] = .init(repeating: [], count: conditionsInOrder.count)
-    arrayLoop:
-        for element in self {
+        arrayLoop: for element in self {
             for (index, condition) in conditionsInOrder.enumerated() {
                 if condition(element) {
                     result[index].append(element)
diff --git a/Sources/SWBCore/LibclangVendored/Libclang.swift b/Sources/SWBCore/LibclangVendored/Libclang.swift
index 06125dd9..b69934df 100644
--- a/Sources/SWBCore/LibclangVendored/Libclang.swift
+++ b/Sources/SWBCore/LibclangVendored/Libclang.swift
@@ -17,7 +17,7 @@ import SWBLibc
 /// A wrapper for a libclang library.
 public final class Libclang {
     public enum Error: Swift.Error {
-    case unableToGetDriverActions(String)
+        case unableToGetDriverActions(String)
     }
 
     fileprivate let lib: libclang_t
@@ -66,11 +66,14 @@ public final class Libclang {
         // let envp = CStringArray(environment.map{ "\($0.0)=\($0.1)" })
         var error: String? = nil
         let success = libclang_driver_get_actions(
-            lib, CInt(args.cArray.count - 1), args.cArray, nil,
+            lib,
+            CInt(args.cArray.count - 1),
+            args.cArray,
+            nil,
             workingDirectory,
             /*callback: */ { (argc, argv) in
                 let argc = Int(argc)
-                result.append((0 ..< argc).map{ String(cString: argv![$0]!) })
+                result.append((0..<argc).map { String(cString: argv![$0]!) })
             },
             /*error_callback:*/ { (string: UnsafePointer<CChar>?) -> Void in
                 let errString = String(cString: string!)
@@ -79,7 +82,8 @@ public final class Libclang {
                 } else {
                     error = errString
                 }
-            })
+            }
+        )
         guard success else {
             assert(error != nil)
             throw Error.unableToGetDriverActions(error!)
@@ -211,12 +215,20 @@ public final class DependencyScanner {
         var result: FileDependencies?
         // The count is `- 1` here, because CStringArray appends a trailing nullptr.
         let success = libclang_scanner_scan_dependencies(
-            scanner, CInt(args.cArray.count - 1), args.cArray, workingDirectory,
-            /*lookup_output:*/ { (cmoduleName: UnsafePointer<CChar>?, ccontextHash: UnsafePointer<CChar>?,
-                                  ckind: clang_output_kind_t, coutput: UnsafeMutablePointer<CChar>?,
-                                  maxLen: size_t) -> size_t in
+            scanner,
+            CInt(args.cArray.count - 1),
+            args.cArray,
+            workingDirectory,
+            /*lookup_output:*/ {
+                (
+                    cmoduleName: UnsafePointer<CChar>?,
+                    ccontextHash: UnsafePointer<CChar>?,
+                    ckind: clang_output_kind_t,
+                    coutput: UnsafeMutablePointer<CChar>?,
+                    maxLen: size_t
+                ) -> size_t in
                 guard let kind = ModuleOutputKind(ckind) else {
-                    return 0 // Unknown output
+                    return 0  // Unknown output
                 }
                 let moduleName = String(cString: cmoduleName!)
                 let contextHash: String = String(cString: ccontextHash!)
@@ -229,7 +241,7 @@ public final class DependencyScanner {
                     }
                 } else {
                     assert(kind != .moduleFile, "moduleFile is a required output")
-                    return 0 // Empty
+                    return 0  // Empty
                 }
             },
             /*modules_callback:*/ { (modules: clang_module_dependency_set_t, topologicallySorted: Bool) -> Void in
@@ -243,14 +255,16 @@ public final class DependencyScanner {
             /*callback:*/ { (fileDeps: clang_file_dependencies_t) -> Void in
                 var commands: [Command] = []
                 for i in 0..<fileDeps.num_commands {
-                    commands.append(Command(
-                        context_hash: String(cString: fileDeps.commands[i].context_hash),
-                        file_deps: Array<String>.fromCStringArray(fileDeps.commands[i].file_deps),
-                        module_deps: Array<String>.fromCStringArray(fileDeps.commands[i].module_deps),
-                        cache_key: fileDeps.commands[i].cache_key.map{String(cString:$0)},
-                        executable: fileDeps.commands[i].executable.map({String(cString:$0)}),
-                        build_arguments: Array<String>.fromCStringArray(fileDeps.commands[i].build_arguments)
-                    ))
+                    commands.append(
+                        Command(
+                            context_hash: String(cString: fileDeps.commands[i].context_hash),
+                            file_deps: Array<String>.fromCStringArray(fileDeps.commands[i].file_deps),
+                            module_deps: Array<String>.fromCStringArray(fileDeps.commands[i].module_deps),
+                            cache_key: fileDeps.commands[i].cache_key.map { String(cString: $0) },
+                            executable: fileDeps.commands[i].executable.map({ String(cString: $0) }),
+                            build_arguments: Array<String>.fromCStringArray(fileDeps.commands[i].build_arguments)
+                        )
+                    )
                 }
                 result = FileDependencies(includeTreeID: fileDeps.include_tree_id.map { String(cString: $0) }, commands: commands)
             },
@@ -265,7 +279,8 @@ public final class DependencyScanner {
             },
             /*error_callback:*/ { (string: UnsafePointer<CChar>?) -> Void in
                 error = String(cString: string!)
-            })
+            }
+        )
         guard success, let fileDeps = result else {
             if let diagnostics = diagnostics {
                 throw Error.dependencyScanDiagnostics(diagnostics)
@@ -280,12 +295,15 @@ public final class DependencyScanner {
 
     public func diagnoseInvalidNegativeStatCacheEntries() -> [String] {
         var entries: [String] = []
-        libclang_scanner_diagnose_invalid_negative_stat_cache_entries(scanner, { cString in
-            guard let cString else {
-                return
+        libclang_scanner_diagnose_invalid_negative_stat_cache_entries(
+            scanner,
+            { cString in
+                guard let cString else {
+                    return
+                }
+                entries.append(String(cString: cString))
             }
-            entries.append(String(cString: cString))
-        })
+        )
         return entries
     }
 
@@ -317,9 +335,11 @@ fileprivate struct ClangDiagnosticSet {
     public init(_ libclang: Libclang, filePath: String) throws {
         var error: UnsafePointer<Int8>!
         defer { error?.deallocate() }
-        guard let diagnosticSet = filePath.withCString({ path in
-            return libclang_read_diagnostics(libclang.lib, path, &error)
-        }) else {
+        guard
+            let diagnosticSet = filePath.withCString({ path in
+                return libclang_read_diagnostics(libclang.lib, path, &error)
+            })
+        else {
             throw Error.error(String(cString: error))
         }
 
@@ -494,9 +514,14 @@ public final class ClangCASDatabases {
         }
         self.libclang = libclang
         var error: Error? = nil
-        guard let dbs = libclang_casdatabases_create(options.options, { cerror in
-            error = .creationFailed(String(cString: cerror!))
-        }) else {
+        guard
+            let dbs = libclang_casdatabases_create(
+                options.options,
+                { cerror in
+                    error = .creationFailed(String(cString: cerror!))
+                }
+            )
+        else {
             throw error!
         }
         self.dbs = dbs
@@ -508,9 +533,12 @@ public final class ClangCASDatabases {
 
     public func getOndiskSize() throws -> Int64? {
         var error: ClangCASDatabases.Error? = nil
-        let ret = libclang_casdatabases_get_ondisk_size(dbs, { c_error in
-            error = .operationFailed(String(cString: c_error!))
-        })
+        let ret = libclang_casdatabases_get_ondisk_size(
+            dbs,
+            { c_error in
+                error = .operationFailed(String(cString: c_error!))
+            }
+        )
         if let error {
             throw error
         }
@@ -522,9 +550,13 @@ public final class ClangCASDatabases {
 
     public func setOndiskSizeLimit(_ limit: Int64?) throws {
         var error: ClangCASDatabases.Error? = nil
-        libclang_casdatabases_set_ondisk_size_limit(dbs, limit ?? 0, { c_error in
-            error = .operationFailed(String(cString: c_error!))
-        })
+        libclang_casdatabases_set_ondisk_size_limit(
+            dbs,
+            limit ?? 0,
+            { c_error in
+                error = .operationFailed(String(cString: c_error!))
+            }
+        )
         if let error {
             throw error
         }
@@ -532,9 +564,12 @@ public final class ClangCASDatabases {
 
     public func pruneOndiskData() throws {
         var error: ClangCASDatabases.Error? = nil
-        libclang_casdatabases_prune_ondisk_data(dbs, { c_error in
-            error = .operationFailed(String(cString: c_error!))
-        })
+        libclang_casdatabases_prune_ondisk_data(
+            dbs,
+            { c_error in
+                error = .operationFailed(String(cString: c_error!))
+            }
+        )
         if let error {
             throw error
         }
@@ -550,9 +585,14 @@ public final class ClangCASDatabases {
     /// Query the CAS for the associated outputs of a cache key.
     public func getCachedCompilation(cacheKey: String, globally: Bool) throws -> ClangCASCachedCompilation? {
         var error: ClangCASDatabases.Error? = nil
-        let c_cachedComp = libclang_cas_get_cached_compilation(dbs, cacheKey, globally, { c_error in
-            error = .operationFailed(String(cString: c_error!))
-        })
+        let c_cachedComp = libclang_cas_get_cached_compilation(
+            dbs,
+            cacheKey,
+            globally,
+            { c_error in
+                error = .operationFailed(String(cString: c_error!))
+            }
+        )
         if let error {
             throw error
         }
@@ -569,7 +609,7 @@ public final class ClangCASDatabases {
     public func getCachedCompilation(cacheKey: String) async throws -> ClangCASCachedCompilation? {
         let libclang = self.libclang
         return try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<ClangCASCachedCompilation?, Swift.Error>) in
-            libclang_cas_get_cached_compilation_async(dbs, cacheKey, /*globally*/true) { c_cachedComp, c_error in
+            libclang_cas_get_cached_compilation_async(dbs, cacheKey, /*globally*/ true) { c_cachedComp, c_error in
                 if let c_error {
                     continuation.resume(throwing: Error.operationFailed(String(cString: c_error)))
                     return
diff --git a/Sources/SWBCore/LinkageDependencyResolver.swift b/Sources/SWBCore/LinkageDependencyResolver.swift
index da34444e..658510b1 100644
--- a/Sources/SWBCore/LinkageDependencyResolver.swift
+++ b/Sources/SWBCore/LinkageDependencyResolver.swift
@@ -247,7 +247,7 @@ actor LinkageDependencyResolver {
         }
 
         // If we're resolving implicit dependencies, build up the names of products of these targets, so we don't try to resolve implicit dependencies for any of them.
-        let productNamesOfExplicitDependencies = Set<String>(immediateDependencies.compactMap{ ($0.target as? StandardTarget)?.productReference.name })
+        let productNamesOfExplicitDependencies = Set<String>(immediateDependencies.compactMap { ($0.target as? StandardTarget)?.productReference.name })
 
         // Get information about the configured target which we need to determine its implicit dependencies.
         let buildFileFilter = LinkageDependencyBuildFileFilteringContext(scope: configuredTargetSettings.globalScope)
@@ -297,7 +297,6 @@ actor LinkageDependencyResolver {
                         continue
                     }
 
-
                     // Look for a target which generates a product with the stem of this name.
                     //
                     // The purpose of this logic (at present) is to be able to resolve implicit dependencies when linking against the binary inside of an arbitrary bundle.  For example, this can be used for the Xcode workspace itself to deal with linking against the binary inside a .ideplugin.
@@ -371,9 +370,11 @@ actor LinkageDependencyResolver {
             }
         }
 
-        let moduleNamesOfExplicitDependencies = Set<String>(immediateDependencies.compactMap{
-            buildRequestContext.getCachedSettings($0.parameters, target: $0.target).globalScope.evaluate(BuiltinMacros.PRODUCT_MODULE_NAME)
-        })
+        let moduleNamesOfExplicitDependencies = Set<String>(
+            immediateDependencies.compactMap {
+                buildRequestContext.getCachedSettings($0.parameters, target: $0.target).globalScope.evaluate(BuiltinMacros.PRODUCT_MODULE_NAME)
+            }
+        )
 
         for moduleDependencyName in (configuredTargetSettings.moduleDependencies.map { $0.name }) {
             if !moduleNamesOfExplicitDependencies.contains(moduleDependencyName), let implicitDependency = await implicitDependency(forModuleName: moduleDependencyName, from: configuredTarget, imposedParameters: imposedParameters, source: .moduleDependency(name: moduleDependencyName, buildSetting: BuiltinMacros.MODULE_DEPENDENCIES)) {
@@ -575,19 +576,27 @@ actor LinkageDependencyResolver {
             let location: Diagnostic.Location
             switch source {
             case let .frameworkLinkerFlag(_, _, buildSetting),
-                 let .libraryLinkerFlag(_, _, buildSetting):
+                let .libraryLinkerFlag(_, _, buildSetting):
                 location = .buildSetting(buildSetting)
             case let .productReference(_, buildFile, buildPhase),
-                 let .productNameStem(_, buildFile, buildPhase):
+                let .productNameStem(_, buildFile, buildPhase):
                 location = .buildFile(buildFileGUID: buildFile.guid, buildPhaseGUID: buildPhase.guid, targetGUID: configuredTarget.target.guid)
             case let .moduleDependency(_, buildSetting):
                 location = .buildSettings([buildSetting])
             }
 
-            delegate.emit(.overrideTarget(configuredTarget), SWBUtil.Diagnostic(behavior: .warning, location: location, data: DiagnosticData("Multiple targets match implicit dependency for \(source.valueForDisplay). Consider adding an explicit dependency on the intended target to resolve this ambiguity.", component: .targetIntegrity), childDiagnostics: candidateConfiguredTargets.map({ dependency -> Diagnostic in
-                let project = workspaceContext.workspace.project(for: dependency.target)
-                return Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("Target '\(dependency.target.name)' (in project '\(project.name)')"))
-            })))
+            delegate.emit(
+                .overrideTarget(configuredTarget),
+                SWBUtil.Diagnostic(
+                    behavior: .warning,
+                    location: location,
+                    data: DiagnosticData("Multiple targets match implicit dependency for \(source.valueForDisplay). Consider adding an explicit dependency on the intended target to resolve this ambiguity.", component: .targetIntegrity),
+                    childDiagnostics: candidateConfiguredTargets.map({ dependency -> Diagnostic in
+                        let project = workspaceContext.workspace.project(for: dependency.target)
+                        return Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("Target '\(dependency.target.name)' (in project '\(project.name)')"))
+                    })
+                )
+            )
         }
     }
 
diff --git a/Sources/SWBCore/MacCatalystInfo.swift b/Sources/SWBCore/MacCatalystInfo.swift
index 15f829bc..54a1d07c 100644
--- a/Sources/SWBCore/MacCatalystInfo.swift
+++ b/Sources/SWBCore/MacCatalystInfo.swift
@@ -24,5 +24,5 @@ public struct MacCatalystInfo {
     /// Name of the SDK variant used for the `SDK_VARIANT` build setting.
     public static let sdkVariantName = "iosmac"
 
-    private init() { }
+    private init() {}
 }
diff --git a/Sources/SWBCore/MacroConfigFileLoader.swift b/Sources/SWBCore/MacroConfigFileLoader.swift
index 705f9940..5520f41e 100644
--- a/Sources/SWBCore/MacroConfigFileLoader.swift
+++ b/Sources/SWBCore/MacroConfigFileLoader.swift
@@ -82,7 +82,7 @@ final class MacroConfigFileLoader: Sendable {
         }
 
         var normalizedPath: Path { return normalizedPathCache.getValue(self) }
-        private var normalizedPathCache = LazyCache{ (ancestorInclude: AncestorInclude) -> Path in
+        private var normalizedPathCache = LazyCache { (ancestorInclude: AncestorInclude) -> Path in
             return ancestorInclude.path.normalize()
         }
 
@@ -214,7 +214,7 @@ final class MacroConfigFileLoader: Sendable {
                         }
                     }
 
-                    let cyclePathStr = (ancestorIncludes.paths[startingCycleIndex...] + [pathToInclude]).map{ $0.descriptionWithBasename }.joined(separator: " -> ")
+                    let cyclePathStr = (ancestorIncludes.paths[startingCycleIndex...] + [pathToInclude]).map { $0.descriptionWithBasename }.joined(separator: " -> ")
 
                     // To maintain compatibility, we need to warn here. rdar://45532351 to consider putting this behind an option to expose it's level of diagnostic.
                     handleDiagnostic(MacroConfigFileDiagnostic(kind: .cyclicIncludeFileDirective, level: .warning, message: "Skipping the inclusion of '\(pathToInclude.normalizedPath.basename)' from '\(parser.path.normalize().basename)' as it would create a cycle.\nCycle Path: \(cyclePathStr)\nCycle Details:\n\(cycleDetailsStr)", lineNumber: parser.lineNumber), parser: parser)
@@ -255,7 +255,7 @@ final class MacroConfigFileLoader: Sendable {
                 // If we have any conditions, we also construct a condition set.
                 var conditionSet: MacroConditionSet?
                 if !conditions.isEmpty {
-                    conditionSet = MacroConditionSet(conditions: conditions.map{ MacroCondition(parameter: table.namespace.declareConditionParameter($0.0), valuePattern: $0.1) })
+                    conditionSet = MacroConditionSet(conditions: conditions.map { MacroCondition(parameter: table.namespace.declareConditionParameter($0.0), valuePattern: $0.1) })
                 }
 
                 // Parse the value in a manner consistent with the macro definition.
@@ -283,7 +283,7 @@ final class MacroConfigFileLoader: Sendable {
         let diagnostics = ConfigDiagnostics()
         let nestedConfigs = NestedConfigurations()
         let ancestorIncludes = AncestorIncludes()
-        path.map{ nestedConfigs.paths.append($0) }
+        path.map { nestedConfigs.paths.append($0) }
 
         if let path {
             ancestorIncludes.paths.append(AncestorInclude(path: path, fs: fs))
diff --git a/Sources/SWBCore/MacroEvaluationExtensions.swift b/Sources/SWBCore/MacroEvaluationExtensions.swift
index db4c6c09..e484498b 100644
--- a/Sources/SWBCore/MacroEvaluationExtensions.swift
+++ b/Sources/SWBCore/MacroEvaluationExtensions.swift
@@ -14,8 +14,7 @@ public import SWBUtil
 public import SWBMacro
 import Foundation
 
-public extension PropertyListItem
-{
+public extension PropertyListItem {
     // TODO: In principle we could push 'preserveReferencesToSettings' down to the core evaluation methods, but that's a lot more work and not immediately needed.  I only added it here because evaluating macros in a whole property list structure is nontrivial.
     //
     /// Method which returns a new property list with macros evaluated in all string values.  By default, macros in dictionary keys are *not* evaluated, but they optionally can be.
@@ -24,11 +23,9 @@ public extension PropertyListItem
     /// - parameter preserveReferencesToSettings: If not nil, then any macros in this set will not be evaluated but will be preserved for later potential evaluation.  Macros in this set take precedence over the later `lookup` parameter.
     /// - parameter lookup: A block used to override evaluation of macros in the scope.
     /// - returns: The receiver with settings evaluated as directed.
-    func byEvaluatingMacros(withScope scope: MacroEvaluationScope, andDictionaryKeys: Bool = false, preserveReferencesToSettings: Set<MacroDeclaration>? = nil, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> PropertyListItem
-    {
+    func byEvaluatingMacros(withScope scope: MacroEvaluationScope, andDictionaryKeys: Bool = false, preserveReferencesToSettings: Set<MacroDeclaration>? = nil, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> PropertyListItem {
         // Helper function to evaluate macros in a string,
-        func stringByEvaluatingMacros(_ string: String, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> String
-        {
+        func stringByEvaluatingMacros(_ string: String, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> String {
             // If preserveSettingsReferences is not nil, then we create a lookup block to preserve settings references during evaluation.  We define this block here rather than in the outermost call so we can track whether we actually preserved any references and skip the .replacingOccurrences(of:) call below if we don't need to do it.
             var anyReferencesWerePreserved = false
             let preservingLookup: ((MacroDeclaration) -> MacroExpression?)?
@@ -41,8 +38,7 @@ public extension PropertyListItem
                     }
                     return lookup?(macro) ?? nil
                 }
-            }
-            else {
+            } else {
                 preservingLookup = lookup
             }
             let parsedString = scope.table.namespace.parseString(string)
@@ -68,8 +64,7 @@ public extension PropertyListItem
         case .plDict(let value):
             // Expand macros in values of a dictionary, and if requested, in keys.
             var result = [String: PropertyListItem]()
-            for (key, item) in value
-            {
+            for (key, item) in value {
                 let newKey = andDictionaryKeys ? stringByEvaluatingMacros(key, lookup: lookup) : key
                 let newValue = item.byEvaluatingMacros(withScope: scope, andDictionaryKeys: andDictionaryKeys, preserveReferencesToSettings: preserveReferencesToSettings, lookup: lookup)
                 result[newKey] = newValue
@@ -122,9 +117,12 @@ extension MacroEvaluationScope {
     /// Get the value of `$(TARGET_BUILD_DIR)` unmodified by `$(TARGET_BUILD_SUBPATH)`.
     /// This is used to retrieve the "original" target build directory for test targets using a host bundle.
     public var unmodifiedTargetBuildDir: Path {
-        return evaluate(BuiltinMacros.TARGET_BUILD_DIR, lookup: {
-            return ($0 == BuiltinMacros.TARGET_BUILD_SUBPATH) ? self.table.namespace.parseLiteralString("") : nil
-        })
+        return evaluate(
+            BuiltinMacros.TARGET_BUILD_DIR,
+            lookup: {
+                return ($0 == BuiltinMacros.TARGET_BUILD_SUBPATH) ? self.table.namespace.parseLiteralString("") : nil
+            }
+        )
     }
 
     public func subscopeBindingArchAndTriple(arch: String) -> MacroEvaluationScope {
diff --git a/Sources/SWBCore/OnDemandResources.swift b/Sources/SWBCore/OnDemandResources.swift
index a3eef722..cfb008fc 100644
--- a/Sources/SWBCore/OnDemandResources.swift
+++ b/Sources/SWBCore/OnDemandResources.swift
@@ -28,7 +28,7 @@ public struct ODRAssetPackInfo: Sendable {
         var infoPlistContent: [String: any PropertyListItemConvertible] = [
             "CFBundleIdentifier": identifier,
             "Tags": tags.sorted(),
-            ]
+        ]
 
         if let priority {
             infoPlistContent["Priority"] = priority
@@ -58,12 +58,10 @@ public struct ODRAssetPackInfo: Sendable {
         let productOnDemandResourcesDirectory: Path
         if !assetPackFolderPath.isEmpty {
             productOnDemandResourcesDirectory = targetBuildDir.join(assetPackFolderPath)
-        }
-        else if scope.evaluate(BuiltinMacros.EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE) && !unlocalizedResourcesFolderPath.isEmpty {
+        } else if scope.evaluate(BuiltinMacros.EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE) && !unlocalizedResourcesFolderPath.isEmpty {
             let productResourcesDir = targetBuildDir.join(unlocalizedResourcesFolderPath)
             productOnDemandResourcesDirectory = productResourcesDir.join(onDemandResourcesSubdirectoryName)
-        }
-        else {
+        } else {
             productOnDemandResourcesDirectory = targetBuildDir.join(onDemandResourcesSubdirectoryName)
         }
 
@@ -97,21 +95,25 @@ public struct AssetPackOutputSpecificationsPlist: PropertyListItemConvertible {
     public var entries: Set<Entry>
 
     public init(assetPacks: [ODRAssetPackInfo]) {
-        entries = Set(assetPacks.map {
-            Entry(identifier: $0.identifier, tags: $0.tags, path: $0.path)
-        })
+        entries = Set(
+            assetPacks.map {
+                Entry(identifier: $0.identifier, tags: $0.tags, path: $0.path)
+            }
+        )
     }
 
     public var propertyListItem: PropertyListItem {
-        return .init(entries
-            .sorted { $0.identifier < $1.identifier }
-            .map {
-                [
-                    "bundle-id": .plString($0.identifier),
-                    "tags": PropertyListItem($0.tags.sorted()),
-                    "bundle-path": .plString($0.path.str),
-                ]
-            })
+        return .init(
+            entries
+                .sorted { $0.identifier < $1.identifier }
+                .map {
+                    [
+                        "bundle-id": .plString($0.identifier),
+                        "tags": PropertyListItem($0.tags.sorted()),
+                        "bundle-path": .plString($0.path.str),
+                    ]
+                }
+        )
     }
 }
 
@@ -166,7 +168,7 @@ public struct AssetPackManifestPlist: Hashable, PropertyListItemConvertible {
                     return PropertyListItem([
                         "strategy": "modtime",
                         "hash": hash,
-                        ])
+                    ])
                 }
             }
         }
@@ -194,7 +196,7 @@ public struct AssetPackManifestPlist: Hashable, PropertyListItemConvertible {
                 "primaryContentHash": primaryContentHash,
                 "uncompressedSize": uncompressedSize,
                 "URL": url,
-                ]
+            ]
 
             if let p = downloadPriority {
                 result["downloadPriority"] = p
@@ -212,7 +214,7 @@ public struct AssetPackManifestPlist: Hashable, PropertyListItemConvertible {
 
     public var propertyListItem: PropertyListItem {
         return PropertyListItem([
-            "resources": resources.sorted { $0.assetPackBundleIdentifier < $1.assetPackBundleIdentifier },
-            ])
+            "resources": resources.sorted { $0.assetPackBundleIdentifier < $1.assetPackBundleIdentifier }
+        ])
     }
 }
diff --git a/Sources/SWBCore/OptimizationRemarks.swift b/Sources/SWBCore/OptimizationRemarks.swift
index a07b53db..114ba287 100644
--- a/Sources/SWBCore/OptimizationRemarks.swift
+++ b/Sources/SWBCore/OptimizationRemarks.swift
@@ -13,298 +13,298 @@
 public import SWBUtil
 
 #if canImport(LLVM_C) && !SKIP_LLVM_REMARKS
-public import Foundation
-private import LLVM_C
-
-/// The type of a remark.
-public enum OptimizationRemarkType {
-    case unknown, passed, missed, analysis, analysisFPCommute, analysisAliasing, failure
-
-    fileprivate init(_ type: LLVMRemarkType) {
-        switch type {
-        case LLVMRemarkTypePassed:
-            self = .passed
-        case LLVMRemarkTypeMissed:
-            self = .missed
-        case LLVMRemarkTypeAnalysis:
-            self = .analysis
-        case LLVMRemarkTypeAnalysisFPCommute:
-            self = .analysisFPCommute
-        case LLVMRemarkTypeAnalysisAliasing:
-            self = .analysisAliasing
-        case LLVMRemarkTypeFailure:
-            self = .failure
-        default:
-            self = .unknown
-        }
-    }
-}
-
-/**
- A remark entry used to give more insight into the compiler.
- */
-public struct OptimizationRemark {
-    /// The debug location that the remark is referring to.
-    public struct DebugLoc {
-        /// The path to the source file. Can be relative or absolute.
-        public let sourceFilePath: String
-        /// The line in the source file.
-        public let sourceLine: UInt
-        /// The column in the source file.
-        public let sourceColumn: UInt
-
-        fileprivate init(_ rawDebugLoc: LLVMRemarkDebugLocRef) {
-            sourceFilePath = String(LLVMRemarkDebugLocGetSourceFilePath(rawDebugLoc))
-            sourceLine = UInt(LLVMRemarkDebugLocGetSourceLine(rawDebugLoc))
-            sourceColumn = UInt(LLVMRemarkDebugLocGetSourceColumn(rawDebugLoc))
+    public import Foundation
+    private import LLVM_C
+
+    /// The type of a remark.
+    public enum OptimizationRemarkType {
+        case unknown, passed, missed, analysis, analysisFPCommute, analysisAliasing, failure
+
+        fileprivate init(_ type: LLVMRemarkType) {
+            switch type {
+            case LLVMRemarkTypePassed:
+                self = .passed
+            case LLVMRemarkTypeMissed:
+                self = .missed
+            case LLVMRemarkTypeAnalysis:
+                self = .analysis
+            case LLVMRemarkTypeAnalysisFPCommute:
+                self = .analysisFPCommute
+            case LLVMRemarkTypeAnalysisAliasing:
+                self = .analysisAliasing
+            case LLVMRemarkTypeFailure:
+                self = .failure
+            default:
+                self = .unknown
+            }
         }
     }
 
     /**
-     An argument is an arbitrary key-value entry that adds more information to the remark.
-
-     Depending on the key, the value can be interpreted as a string, integer, etc.
-
-     The debug location associated with the argument may refer to a separate location in the code.
+     A remark entry used to give more insight into the compiler.
      */
-    public struct Arg {
-        public let key: String
-        public let value: String
-        public let debugLoc: DebugLoc?
+    public struct OptimizationRemark {
+        /// The debug location that the remark is referring to.
+        public struct DebugLoc {
+            /// The path to the source file. Can be relative or absolute.
+            public let sourceFilePath: String
+            /// The line in the source file.
+            public let sourceLine: UInt
+            /// The column in the source file.
+            public let sourceColumn: UInt
+
+            fileprivate init(_ rawDebugLoc: LLVMRemarkDebugLocRef) {
+                sourceFilePath = String(LLVMRemarkDebugLocGetSourceFilePath(rawDebugLoc))
+                sourceLine = UInt(LLVMRemarkDebugLocGetSourceLine(rawDebugLoc))
+                sourceColumn = UInt(LLVMRemarkDebugLocGetSourceColumn(rawDebugLoc))
+            }
+        }
 
-        fileprivate init(_ rawArg: LLVMRemarkArgRef) {
-            key = String(LLVMRemarkArgGetKey(rawArg))
-            value = String(LLVMRemarkArgGetValue(rawArg))
-            if let rawDebugLoc = LLVMRemarkArgGetDebugLoc(rawArg) {
-                debugLoc = OptimizationRemark.DebugLoc(rawDebugLoc)
-            } else {
-                debugLoc = nil
+        /**
+         * An argument is an arbitrary key-value entry that adds more information to the remark.
+         *
+         * Depending on the key, the value can be interpreted as a string, integer, etc.
+         *
+         * The debug location associated with the argument may refer to a separate location in the code.
+         **/
+        public struct Arg {
+            public let key: String
+            public let value: String
+            public let debugLoc: DebugLoc?
+
+            fileprivate init(_ rawArg: LLVMRemarkArgRef) {
+                key = String(LLVMRemarkArgGetKey(rawArg))
+                value = String(LLVMRemarkArgGetValue(rawArg))
+                if let rawDebugLoc = LLVMRemarkArgGetDebugLoc(rawArg) {
+                    debugLoc = OptimizationRemark.DebugLoc(rawDebugLoc)
+                } else {
+                    debugLoc = nil
+                }
             }
         }
-    }
 
-    /// The type of the remark.
-    public let type: OptimizationRemarkType
+        /// The type of the remark.
+        public let type: OptimizationRemarkType
 
-    /// The name of the pass that emitted the remark.
-    public let passName: String
+        /// The name of the pass that emitted the remark.
+        public let passName: String
 
-    /// The per-pass unique identifier of the remark. For example, a missing definition found by the inliner will have a remark name: "NoDefinition".
-    public let remarkName: String
+        /// The per-pass unique identifier of the remark. For example, a missing definition found by the inliner will have a remark name: "NoDefinition".
+        public let remarkName: String
 
-    /// The name of the function where the remark occurred. For C++, the mangled name is used. For Swift, the demangled name is used.
-    public let functionName: String
+        /// The name of the function where the remark occurred. For C++, the mangled name is used. For Swift, the demangled name is used.
+        public let functionName: String
 
-    /// An optional debug source location that the remark is referring to.
-    public let debugLoc: DebugLoc?
+        /// An optional debug source location that the remark is referring to.
+        public let debugLoc: DebugLoc?
 
-    /// The hotness of the code referenced by the remark, determined by compiler heuristics like PGO.
-    public let hotness: UInt
+        /// The hotness of the code referenced by the remark, determined by compiler heuristics like PGO.
+        public let hotness: UInt
 
-    /// A list of key-value entries adding more information to the remark.
-    public let args: [Arg]
+        /// A list of key-value entries adding more information to the remark.
+        public let args: [Arg]
 
-    fileprivate init(_ rawEntry: LLVMRemarkEntryRef) {
-        type = OptimizationRemarkType(LLVMRemarkEntryGetType(rawEntry))
-        passName = String(LLVMRemarkEntryGetPassName(rawEntry))
-        remarkName = String(LLVMRemarkEntryGetRemarkName(rawEntry))
-        functionName = String(LLVMRemarkEntryGetFunctionName(rawEntry))
-        if let rawDebugLoc = LLVMRemarkEntryGetDebugLoc(rawEntry) {
-            debugLoc = DebugLoc(rawDebugLoc)
-        } else {
-            debugLoc = nil
-        }
-        hotness = UInt(LLVMRemarkEntryGetHotness(rawEntry))
-        var mutableArgs: [Arg] = []
-        let numArgs = LLVMRemarkEntryGetNumArgs(rawEntry)
-        if numArgs != 0 {
-            mutableArgs.reserveCapacity(Int(numArgs))
-            var nextRawArg = LLVMRemarkEntryGetFirstArg(rawEntry)!
-            mutableArgs.append(Arg(nextRawArg))
-            while let rawArg = LLVMRemarkEntryGetNextArg(nextRawArg, rawEntry) {
-                mutableArgs.append(Arg(rawArg))
-                nextRawArg = rawArg
+        fileprivate init(_ rawEntry: LLVMRemarkEntryRef) {
+            type = OptimizationRemarkType(LLVMRemarkEntryGetType(rawEntry))
+            passName = String(LLVMRemarkEntryGetPassName(rawEntry))
+            remarkName = String(LLVMRemarkEntryGetRemarkName(rawEntry))
+            functionName = String(LLVMRemarkEntryGetFunctionName(rawEntry))
+            if let rawDebugLoc = LLVMRemarkEntryGetDebugLoc(rawEntry) {
+                debugLoc = DebugLoc(rawDebugLoc)
+            } else {
+                debugLoc = nil
+            }
+            hotness = UInt(LLVMRemarkEntryGetHotness(rawEntry))
+            var mutableArgs: [Arg] = []
+            let numArgs = LLVMRemarkEntryGetNumArgs(rawEntry)
+            if numArgs != 0 {
+                mutableArgs.reserveCapacity(Int(numArgs))
+                var nextRawArg = LLVMRemarkEntryGetFirstArg(rawEntry)!
+                mutableArgs.append(Arg(nextRawArg))
+                while let rawArg = LLVMRemarkEntryGetNextArg(nextRawArg, rawEntry) {
+                    mutableArgs.append(Arg(rawArg))
+                    nextRawArg = rawArg
+                }
+                args = mutableArgs
+            } else {
+                args = []
             }
-            args = mutableArgs
-        } else {
-            args = []
         }
     }
-}
-
-extension OptimizationRemarkType: CustomStringConvertible {
-    public var description: String {
-        switch self {
-        case .unknown:
-            return "Unknown"
-        case .passed:
-            return "Passed"
-        case .missed:
-            return "Missed"
-        case .analysis:
-            return "Analysis"
-        case .analysisFPCommute:
-            return "Analysis (FP commute)"
-        case .analysisAliasing:
-            return "Analysis (aliasing)"
-        case .failure:
-            return "Failure"
+
+    extension OptimizationRemarkType: CustomStringConvertible {
+        public var description: String {
+            switch self {
+            case .unknown:
+                return "Unknown"
+            case .passed:
+                return "Passed"
+            case .missed:
+                return "Missed"
+            case .analysis:
+                return "Analysis"
+            case .analysisFPCommute:
+                return "Analysis (FP commute)"
+            case .analysisAliasing:
+                return "Analysis (aliasing)"
+            case .failure:
+                return "Failure"
+            }
         }
     }
-}
 
-extension OptimizationRemark.DebugLoc: CustomStringConvertible {
-    public var description: String {
-        return "\(sourceFilePath):\(sourceLine):\(sourceColumn)"
+    extension OptimizationRemark.DebugLoc: CustomStringConvertible {
+        public var description: String {
+            return "\(sourceFilePath):\(sourceLine):\(sourceColumn)"
+        }
     }
-}
 
-extension OptimizationRemark.Arg: CustomStringConvertible {
-    public var description: String {
-        var desc = "\(key) : \(value)"
-        if let loc = debugLoc {
-            desc += " at \(loc)"
+    extension OptimizationRemark.Arg: CustomStringConvertible {
+        public var description: String {
+            var desc = "\(key) : \(value)"
+            if let loc = debugLoc {
+                desc += " at \(loc)"
+            }
+            return desc
         }
-        return desc
     }
-}
 
-extension OptimizationRemark: CustomStringConvertible {
-    public var description: String {
-        var desc = "\(type) remark: \(passName):\(remarkName) in \(functionName)"
-        if let loc = debugLoc {
-            desc += " at \(loc)"
-        }
-        if hotness > 0 {
-            desc += " with hotness \(hotness)"
-        }
-        if !args.isEmpty {
-            desc += "\nArgs:\n"
-            for arg in args {
-                desc += "- \(arg)\n"
+    extension OptimizationRemark: CustomStringConvertible {
+        public var description: String {
+            var desc = "\(type) remark: \(passName):\(remarkName) in \(functionName)"
+            if let loc = debugLoc {
+                desc += " at \(loc)"
+            }
+            if hotness > 0 {
+                desc += " with hotness \(hotness)"
             }
+            if !args.isEmpty {
+                desc += "\nArgs:\n"
+                for arg in args {
+                    desc += "- \(arg)\n"
+                }
+            }
+            return desc
         }
-        return desc
-    }
 
-    public var message: String {
-        return args.reduce(String(), { result, arg in result + arg.value })
+        public var message: String {
+            return args.reduce(String(), { result, arg in result + arg.value })
+        }
     }
-}
 
-extension String {
-    fileprivate init(_ rawString: LLVMRemarkStringRef) {
-        self = String(decoding: Data(bytesNoCopy: UnsafeMutableRawPointer(mutating: LLVMRemarkStringGetData(rawString)), count: Int(LLVMRemarkStringGetLen(rawString)), deallocator: Data.Deallocator.none), as: UTF8.self)
+    extension String {
+        fileprivate init(_ rawString: LLVMRemarkStringRef) {
+            self = String(decoding: Data(bytesNoCopy: UnsafeMutableRawPointer(mutating: LLVMRemarkStringGetData(rawString)), count: Int(LLVMRemarkStringGetLen(rawString)), deallocator: Data.Deallocator.none), as: UTF8.self)
+        }
     }
-}
 
-public enum OptimizationRemarkParserFormat {
-    case bitstream, yaml
-}
+    public enum OptimizationRemarkParserFormat {
+        case bitstream, yaml
+    }
 
-public enum OptimizationRemarkParsingError: LocalizedError {
-    case parsing(_ message: String)
+    public enum OptimizationRemarkParsingError: LocalizedError {
+        case parsing(_ message: String)
 
-    public var errorDescription: String? {
-        switch self {
-        case .parsing(let message):
-            return message
-        }
-    }
-}
-
-fileprivate class OptimizationRemarkParser {
-    private var rawParser: LLVMRemarkParserRef
-
-    init(data: UnsafeRawBufferPointer, format: OptimizationRemarkParserFormat = .bitstream) throws {
-        let rawParser: LLVMRemarkParserRef
-        switch format {
-        case .bitstream:
-            rawParser = LLVMRemarkParserCreateBitstream(data.baseAddress, UInt64(data.count))
-        case .yaml:
-            rawParser = LLVMRemarkParserCreateYAML(data.baseAddress, UInt64(data.count))
+        public var errorDescription: String? {
+            switch self {
+            case .parsing(let message):
+                return message
+            }
         }
-        self.rawParser = rawParser
     }
 
-    deinit {
-        LLVMRemarkParserDispose(rawParser)
-    }
+    fileprivate class OptimizationRemarkParser {
+        private var rawParser: LLVMRemarkParserRef
 
-    private func getError() -> String? {
-        if LLVMRemarkParserHasError(rawParser) == 0 {
-            return nil
+        init(data: UnsafeRawBufferPointer, format: OptimizationRemarkParserFormat = .bitstream) throws {
+            let rawParser: LLVMRemarkParserRef
+            switch format {
+            case .bitstream:
+                rawParser = LLVMRemarkParserCreateBitstream(data.baseAddress, UInt64(data.count))
+            case .yaml:
+                rawParser = LLVMRemarkParserCreateYAML(data.baseAddress, UInt64(data.count))
+            }
+            self.rawParser = rawParser
         }
-        if let rawMessage = LLVMRemarkParserGetErrorMessage(rawParser) {
-            return String(cString: rawMessage)
+
+        deinit {
+            LLVMRemarkParserDispose(rawParser)
         }
-        return "no error message"
-    }
 
-    public func readRemark() throws -> OptimizationRemark? {
-        guard let entry = LLVMRemarkParserGetNext(rawParser) else {
-            // If it's an error, throw it.
-            if let error = getError() {
-                throw OptimizationRemarkParsingError.parsing(error)
+        private func getError() -> String? {
+            if LLVMRemarkParserHasError(rawParser) == 0 {
+                return nil
             }
-            // If there is no error and no remark, it's the end of the file.
-            return nil
+            if let rawMessage = LLVMRemarkParserGetErrorMessage(rawParser) {
+                return String(cString: rawMessage)
+            }
+            return "no error message"
         }
 
-        defer { LLVMRemarkEntryDispose(entry) }
+        public func readRemark() throws -> OptimizationRemark? {
+            guard let entry = LLVMRemarkParserGetNext(rawParser) else {
+                // If it's an error, throw it.
+                if let error = getError() {
+                    throw OptimizationRemarkParsingError.parsing(error)
+                }
+                // If there is no error and no remark, it's the end of the file.
+                return nil
+            }
 
-        // We have a remark entry.
-        return OptimizationRemark(entry)
-    }
+            defer { LLVMRemarkEntryDispose(entry) }
 
-    public func forEach(_ body: (OptimizationRemark) -> Void) throws {
-        while let remark = try readRemark() {
-            body(remark)
+            // We have a remark entry.
+            return OptimizationRemark(entry)
         }
-    }
 
-    public func readRemarks() throws -> [OptimizationRemark] {
-        var result: [OptimizationRemark] = []
-        try forEach { remark in
-            result.append(remark)
+        public func forEach(_ body: (OptimizationRemark) -> Void) throws {
+            while let remark = try readRemark() {
+                body(remark)
+            }
+        }
+
+        public func readRemarks() throws -> [OptimizationRemark] {
+            var result: [OptimizationRemark] = []
+            try forEach { remark in
+                result.append(remark)
+            }
+            return result
         }
-        return result
-    }
-}
-
-extension Diagnostic {
-    public init?(_ remark: OptimizationRemark, workingDirectory: Path) {
-        guard let debugLoc = remark.debugLoc else { return nil } // skip if no debug location
-        let path = Path(debugLoc.sourceFilePath)
-        // Paths can be both absolute and relative to the working directory.
-        let absolutePath = path.makeAbsolute(relativeTo: workingDirectory) ?? path
-        self.init(behavior: .remark, location: .path(absolutePath, line: Int(debugLoc.sourceLine), column: Int(debugLoc.sourceColumn)), data: DiagnosticData(remark.message))
     }
 
-    public static func remarks(forObjectPath objectFilePath: Path, fs: any FSProxy, workingDirectory: Path) throws -> [Diagnostic] {
-        let object = try MachO(data: fs.read(objectFilePath))
-        var result: [Diagnostic] = []
-        for slice in try object.slices() {
-            guard let bitstream = try slice.remarks() else { continue; } // skip if no remarks section
-
-            try bitstream.withUnsafeBytes { (ptr: UnsafeRawBufferPointer) in
-                let parser = try OptimizationRemarkParser(data: ptr, format: .bitstream)
-                try parser.forEach { remark in
-                    guard let diagnostic = Diagnostic(remark, workingDirectory: workingDirectory) else { return }
-                    result.append(diagnostic)
+    extension Diagnostic {
+        public init?(_ remark: OptimizationRemark, workingDirectory: Path) {
+            guard let debugLoc = remark.debugLoc else { return nil }  // skip if no debug location
+            let path = Path(debugLoc.sourceFilePath)
+            // Paths can be both absolute and relative to the working directory.
+            let absolutePath = path.makeAbsolute(relativeTo: workingDirectory) ?? path
+            self.init(behavior: .remark, location: .path(absolutePath, line: Int(debugLoc.sourceLine), column: Int(debugLoc.sourceColumn)), data: DiagnosticData(remark.message))
+        }
+
+        public static func remarks(forObjectPath objectFilePath: Path, fs: any FSProxy, workingDirectory: Path) throws -> [Diagnostic] {
+            let object = try MachO(data: fs.read(objectFilePath))
+            var result: [Diagnostic] = []
+            for slice in try object.slices() {
+                guard let bitstream = try slice.remarks() else { continue;  }  // skip if no remarks section
+
+                try bitstream.withUnsafeBytes { (ptr: UnsafeRawBufferPointer) in
+                    let parser = try OptimizationRemarkParser(data: ptr, format: .bitstream)
+                    try parser.forEach { remark in
+                        guard let diagnostic = Diagnostic(remark, workingDirectory: workingDirectory) else { return }
+                        result.append(diagnostic)
+                    }
                 }
             }
+            return result
         }
-        return result
     }
-}
 
 #else
 
-extension Diagnostic {
-    public static func remarks(forObjectPath objectFilePath: Path, fs: any FSProxy, workingDirectory: Path) throws -> [Diagnostic] {
-        throw StubError.error("Swift Build was not compiled with support for LLVM optimization remarks")
+    extension Diagnostic {
+        public static func remarks(forObjectPath objectFilePath: Path, fs: any FSProxy, workingDirectory: Path) throws -> [Diagnostic] {
+            throw StubError.error("Swift Build was not compiled with support for LLVM optimization remarks")
+        }
     }
-}
 
 #endif
diff --git a/Sources/SWBCore/PlannedTask.swift b/Sources/SWBCore/PlannedTask.swift
index 6ef5a5ac..1ff23d75 100644
--- a/Sources/SWBCore/PlannedTask.swift
+++ b/Sources/SWBCore/PlannedTask.swift
@@ -168,7 +168,7 @@ public final class ConstructedTask: PlannedTask, Sendable {
         self.additionalSignatureData = builder.additionalSignatureData
         self.inputs = builder.inputs
         self.outputs = builder.outputs
-        self.mustPrecede = builder.mustPrecede.map{ UnownedPlannedTask($0) }
+        self.mustPrecede = builder.mustPrecede.map { UnownedPlannedTask($0) }
         self.execTask = execTask
         self.alwaysExecuteTask = builder.alwaysExecuteTask
         self.priority = builder.priority
@@ -189,7 +189,7 @@ public final class ConstructedTask: PlannedTask, Sendable {
 
     // MARK: Forwarding methods
 
-    public var type: any TaskTypeDescription { return execTask.type}
+    public var type: any TaskTypeDescription { return execTask.type }
     public var forTarget: ConfiguredTarget? { return execTask.forTarget }
     public var ruleInfo: [String] { return execTask.ruleInfo }
     public var commandLine: [ByteString] { return execTask.commandLine.map(\.asByteString) }
@@ -198,7 +198,6 @@ public final class ConstructedTask: PlannedTask, Sendable {
     public var llbuildControlDisabled: Bool { return execTask.llbuildControlDisabled }
 }
 
-
 public final class GateTask: PlannedTask, Sendable {
     /// A static task type description for gate tasks.
     private final class GateTaskTypeDescription: TaskTypeDescription {
@@ -282,7 +281,7 @@ public final class GateTask: PlannedTask, Sendable {
         self.additionalSignatureData = builder.additionalSignatureData
         self.inputs = builder.inputs
         self.outputs = builder.outputs
-        self.mustPrecede = builder.mustPrecede.map{ UnownedPlannedTask($0) }
+        self.mustPrecede = builder.mustPrecede.map { UnownedPlannedTask($0) }
         // FIXME: It seems unfortunate that GateTask has to take an ExecutableTask, but I think that the BuildDescription expects that every PlannedTask will have an ExecutableTask.
         self.execTask = execTask
     }
diff --git a/Sources/SWBCore/PlannedTaskAction.swift b/Sources/SWBCore/PlannedTaskAction.swift
index d762996f..b2bb6d86 100644
--- a/Sources/SWBCore/PlannedTaskAction.swift
+++ b/Sources/SWBCore/PlannedTaskAction.swift
@@ -14,12 +14,10 @@ import Foundation
 public import SWBUtil
 public import SWBMacro
 
-
 /// A task action encapsulates concrete work to be done for a task during a build.
 ///
 /// Task actions are primarily used to capture state and execution logic for in-process tasks.
-public protocol PlannedTaskAction
-{
+public protocol PlannedTaskAction {
 }
 
 public struct AuxiliaryFileTaskActionContext {
@@ -103,8 +101,7 @@ public struct InfoPlistProcessorTaskActionContext: PlatformBuildContext, Seriali
         serializer.endAggregate()
     }
 
-    public init(from deserializer: any Deserializer) throws
-    {
+    public init(from deserializer: any Deserializer) throws {
         // Get the platform registry to use to look up the platform from the deserializer's delegate.
         guard let delegate = deserializer.delegate as? (any InfoPlistProcessorTaskActionContextDeserializerDelegate) else { throw DeserializerError.invalidDelegate("delegate must be a BuildDescriptionDeserializerDelegate") }
 
@@ -118,8 +115,7 @@ public struct InfoPlistProcessorTaskActionContext: PlatformBuildContext, Seriali
                 throw DeserializerError.deserializationFailed("Platform lookup failed for identifier: \(platformIdentifier)")
             }
             platform = p
-        }
-        else {
+        } else {
             platform = nil
         }
 
@@ -144,7 +140,7 @@ public struct InfoPlistProcessorTaskActionContext: PlatformBuildContext, Seriali
             sdk = loadedSDK
         } else {
             sdk = nil
-            _ = deserializer.deserializeNil() // skip past SDK variant name
+            _ = deserializer.deserializeNil()  // skip past SDK variant name
             sdkVariant = nil
         }
 
@@ -251,11 +247,11 @@ public struct FileCopyTaskActionContext {
 
         return (
             compileAndLink: partialTargetValues.map { partialTargetValue in
-                    (
-                        compile: stubPartialCompilerCommandLine + ["-target", "\(partialTargetValue)-\(targetTripleOSVersion)\(llvmTargetTripleSuffix)", "-o", tempDir.join("\(partialTargetValue).o").str],
-                        link: stubPartialLinkerCommandLine + ["-target", "\(partialTargetValue)-\(targetTripleOSVersion)\(llvmTargetTripleSuffix)", "-o", tempDir.join("\(partialTargetValue)").str, tempDir.join("\(partialTargetValue).o").str]
-                    )
-                },
+                (
+                    compile: stubPartialCompilerCommandLine + ["-target", "\(partialTargetValue)-\(targetTripleOSVersion)\(llvmTargetTripleSuffix)", "-o", tempDir.join("\(partialTargetValue).o").str],
+                    link: stubPartialLinkerCommandLine + ["-target", "\(partialTargetValue)-\(targetTripleOSVersion)\(llvmTargetTripleSuffix)", "-o", tempDir.join("\(partialTargetValue)").str, tempDir.join("\(partialTargetValue).o").str]
+                )
+            },
             lipo: stubPartialLipoCommandLine + ["-output", frameworkPath.join(isDeepBundle ? "Versions/A" : nil).join(frameworkPath.basenameWithoutSuffix).str] + partialTargetValues.map { partialTargetValue in tempDir.join("\(partialTargetValue)").str }
         )
     }
@@ -264,14 +260,21 @@ public struct FileCopyTaskActionContext {
 extension FileCopyTaskActionContext {
     public init(_ cbc: CommandBuildContext) {
         let compilerPath = cbc.producer.clangSpec.resolveExecutablePath(cbc, forLanguageOfFileType: cbc.producer.lookupFileType(languageDialect: .c))
-        let linkerPath = cbc.producer.ldLinkerSpec.resolveExecutablePath(cbc.producer, cbc.producer.ldLinkerSpec.computeLinkerPath(cbc, usedCXX: false, lookup: { macro in
-            switch macro {
-            case BuiltinMacros.LINKER_DRIVER:
-                return cbc.scope.namespace.parseString("clang")
-            default:
-                return nil
-            }
-        }))
+        let linkerPath = cbc.producer.ldLinkerSpec.resolveExecutablePath(
+            cbc.producer,
+            cbc.producer.ldLinkerSpec.computeLinkerPath(
+                cbc,
+                usedCXX: false,
+                lookup: { macro in
+                    switch macro {
+                    case BuiltinMacros.LINKER_DRIVER:
+                        return cbc.scope.namespace.parseString("clang")
+                    default:
+                        return nil
+                    }
+                }
+            )
+        )
         let lipoPath = cbc.producer.lipoSpec.resolveExecutablePath(cbc.producer, Path(cbc.producer.lipoSpec.computeExecutablePath(cbc)))
 
         // If we couldn't find clang, skip the special stub binary handling. We may be using an Open Source toolchain which only has Swift. Also skip it for installLoc builds.
@@ -283,12 +286,15 @@ extension FileCopyTaskActionContext {
         let scope = cbc.scope
 
         let partialTargetValues = scope.evaluate(BuiltinMacros.ARCHS).map { arch in
-            return scope.evaluate(scope.namespace.parseString("$(CURRENT_ARCH)-$(LLVM_TARGET_TRIPLE_VENDOR)"), lookup: {
-                if $0 == BuiltinMacros.CURRENT_ARCH {
-                    return scope.namespace.parseLiteralString(arch)
+            return scope.evaluate(
+                scope.namespace.parseString("$(CURRENT_ARCH)-$(LLVM_TARGET_TRIPLE_VENDOR)"),
+                lookup: {
+                    if $0 == BuiltinMacros.CURRENT_ARCH {
+                        return scope.namespace.parseLiteralString(arch)
+                    }
+                    return nil
                 }
-                return nil
-            })
+            )
         }
         let llvmTargetTripleOSVersion = scope.evaluate(BuiltinMacros.LLVM_TARGET_TRIPLE_OS_VERSION)
         let llvmTargetTripleSuffix = scope.evaluate(BuiltinMacros.LLVM_TARGET_TRIPLE_SUFFIX)
@@ -307,13 +313,13 @@ extension FileCopyTaskActionContext {
             llvmTargetTripleSuffix: llvmTargetTripleSuffix,
             platformName: platformName,
             swiftPlatformTargetPrefix: swiftPlatformTargetPrefix,
-            isMacCatalyst: isMacCatalyst)
+            isMacCatalyst: isMacCatalyst
+        )
     }
 }
 
 /// Protocol for objects that can create task actions for in-process tasks.
-public protocol TaskActionCreationDelegate
-{
+public protocol TaskActionCreationDelegate {
     func createAuxiliaryFileTaskAction(_ context: AuxiliaryFileTaskActionContext) -> any PlannedTaskAction
     func createBuildDependencyInfoTaskAction() -> any PlannedTaskAction
     func createBuildDirectoryTaskAction() -> any PlannedTaskAction
diff --git a/Sources/SWBCore/PlatformRegistry.swift b/Sources/SWBCore/PlatformRegistry.swift
index 16910753..29f16342 100644
--- a/Sources/SWBCore/PlatformRegistry.swift
+++ b/Sources/SWBCore/PlatformRegistry.swift
@@ -169,7 +169,7 @@ public final class Platform: Sendable {
         }
 
         var result = [String](values)
-        result.sort(by:) { (lhs,rhs) in
+        result.sort(by:) { (lhs, rhs) in
             // Compare as versions.
             let lhsNums = lhs.split(separator: ".").compactMap { Int($0) }
             let rhsNums = rhs.split(separator: ".").compactMap { Int($0) }
@@ -369,14 +369,16 @@ public final class PlatformRegistry {
 
     /// The default deployment targets for all installed platforms.
     var defaultDeploymentTargets: [String: Version] {
-        Dictionary(uniqueKeysWithValues: Dictionary(grouping: platforms, by: { $0.defaultSDKVariant?.deploymentTargetSettingName })
-            .sorted(by: \.key)
-            .compactMap { (key, value) in
-                guard let key, let value = Set(value.compactMap { $0.defaultSDKVariant?.defaultDeploymentTarget }).only else {
-                    return nil
+        Dictionary(
+            uniqueKeysWithValues: Dictionary(grouping: platforms, by: { $0.defaultSDKVariant?.deploymentTargetSettingName })
+                .sorted(by: \.key)
+                .compactMap { (key, value) in
+                    guard let key, let value = Set(value.compactMap { $0.defaultSDKVariant?.defaultDeploymentTarget }).only else {
+                        return nil
+                    }
+                    return (key, value)
                 }
-                return (key, value)
-            })
+        )
     }
 
     @_spi(Testing) public init(delegate: any PlatformRegistryDelegate, searchPaths: [Path], hostOperatingSystem: OperatingSystem, fs: any FSProxy) async {
@@ -594,7 +596,7 @@ public final class PlatformRegistry {
         }
 
         var executableSearchPaths: [Path] = [
-            path.join("usr").join("bin"),
+            path.join("usr").join("bin")
         ]
 
         var sdkSearchPaths: [Path] = [
@@ -611,7 +613,7 @@ public final class PlatformRegistry {
         executableSearchPaths.append(contentsOf: [
             path.join("usr").join("local").join("bin"),
             path.join("Developer").join("usr").join("bin"),
-            path.join("Developer").join("usr").join("local").join("bin")
+            path.join("Developer").join("usr").join("local").join("bin"),
         ])
 
         // FIXME: Need to parse other fields. It would also be nice to diagnose unused keys like we do for Spec data (and we might want to just use the spec parser here).
@@ -663,7 +665,6 @@ public final class PlatformRegistry {
         return false
     }
 
-
     /// Load the extended platform info.
     @_spi(Testing) public func loadExtendedInfo(_ namespace: MacroNamespace) {
         precondition(!hasLoadedExtendedInfo)
@@ -682,12 +683,19 @@ public final class PlatformRegistry {
                 }
             } else if !deploymentTargets.isEmpty {
                 platform._deploymentTargetMacro.initialize(to: nil)
-                delegate.emit(Diagnostic(behavior: .error, location: .unknown, data: DiagnosticData("Multiple deployment targets for platform '\(platform.name)'"), childDiagnostics: baseSDKs.sorted(by: \.canonicalName).compactMap { baseSDK in
-                    guard let deploymentTargetSettingName = baseSDK.defaultVariant?.deploymentTargetSettingName else {
-                        return nil
-                    }
-                    return Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("\(deploymentTargetSettingName), defined by SDK '\(baseSDK.canonicalName)'"))
-                }))
+                delegate.emit(
+                    Diagnostic(
+                        behavior: .error,
+                        location: .unknown,
+                        data: DiagnosticData("Multiple deployment targets for platform '\(platform.name)'"),
+                        childDiagnostics: baseSDKs.sorted(by: \.canonicalName).compactMap { baseSDK in
+                            guard let deploymentTargetSettingName = baseSDK.defaultVariant?.deploymentTargetSettingName else {
+                                return nil
+                            }
+                            return Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("\(deploymentTargetSettingName), defined by SDK '\(baseSDK.canonicalName)'"))
+                        }
+                    )
+                )
             } else {
                 platform._deploymentTargetMacro.initialize(to: nil)
             }
@@ -733,12 +741,14 @@ extension Platform {
     /// Determines the default architecture to use for the index arena build, preferring `preferredArch` if valid on this platform or the first "Standard" architecture otherwise.
     @_spi(Testing) public func determineDefaultArchForIndexArena(preferredArch: String?, using core: Core) -> String? {
         if let preferredArch,
-           core.specRegistry.getSpec(preferredArch, domain: name) is ArchitectureSpec {
+            core.specRegistry.getSpec(preferredArch, domain: name) is ArchitectureSpec
+        {
             return preferredArch
         }
 
         if let standardArch = core.specRegistry.getSpec("Standard", domain: name) as? ArchitectureSpec,
-           let realArchs = standardArch.realArchs?.stringRep {
+            let realArchs = standardArch.realArchs?.stringRep
+        {
             return realArchs.split(" ").0
         }
 
diff --git a/Sources/SWBCore/ProjectModel/BuildConfiguration.swift b/Sources/SWBCore/ProjectModel/BuildConfiguration.swift
index a7f85a78..d920e5b6 100644
--- a/Sources/SWBCore/ProjectModel/BuildConfiguration.swift
+++ b/Sources/SWBCore/ProjectModel/BuildConfiguration.swift
@@ -14,8 +14,7 @@ import SWBProtocol
 import SWBUtil
 public import SWBMacro
 
-public final class BuildConfiguration: ProjectModelItem, Encodable, Sendable
-{
+public final class BuildConfiguration: ProjectModelItem, Encodable, Sendable {
     public let name: String
 
     /// The (cached) parsed build settings table.
@@ -40,7 +39,7 @@ public final class BuildConfiguration: ProjectModelItem, Encodable, Sendable
 
     public let impartedBuildProperties: ImpartedBuildProperties
 
-    private enum CodingKeys : String, CodingKey {
+    private enum CodingKeys: String, CodingKey {
         case name
         case namespace
         case baseConfigurationFileReferenceGUID
@@ -57,7 +56,7 @@ public final class BuildConfiguration: ProjectModelItem, Encodable, Sendable
             case .string(let value):
                 settings[setting.key] = .plString(value)
             case .stringList(let value):
-                settings[setting.key] = .plArray(value.map{ .plString($0) })
+                settings[setting.key] = .plArray(value.map { .plString($0) })
             }
         }
         return settings
@@ -113,7 +112,7 @@ public final class BuildConfiguration: ProjectModelItem, Encodable, Sendable
             // We also construct a condition set if we have conditions.
             var conditionSet: MacroConditionSet?
             if let conditions {
-                conditionSet = MacroConditionSet(conditions: conditions.map{ MacroCondition(parameter: namespace.declareConditionParameter($0.0), valuePattern: $0.1) })
+                conditionSet = MacroConditionSet(conditions: conditions.map { MacroCondition(parameter: namespace.declareConditionParameter($0.0), valuePattern: $0.1) })
             }
 
             // Parse the value in a manner consistent with the macro definition.
@@ -122,7 +121,7 @@ public final class BuildConfiguration: ProjectModelItem, Encodable, Sendable
             case .plString(let stringValue):
                 expr = namespace.parseForMacro(macro, value: stringValue)
             case .plArray(let contents):
-                let asStringList = contents.map{ item -> String in
+                let asStringList = contents.map { item -> String in
                     guard case let .plString(string) = item else { fatalError("unexpected build configuration data") }
                     return string
                 }
diff --git a/Sources/SWBCore/ProjectModel/BuildFile.swift b/Sources/SWBCore/ProjectModel/BuildFile.swift
index 68d3db75..49330e0d 100644
--- a/Sources/SWBCore/ProjectModel/BuildFile.swift
+++ b/Sources/SWBCore/ProjectModel/BuildFile.swift
@@ -15,8 +15,7 @@ public import SWBUtil
 public import SWBMacro
 
 /// Reference subclasses which can be represented by a build file must adopt the BuildFileRepresentable protocol.
-public protocol BuildFileRepresentable: AnyObject
-{
+public protocol BuildFileRepresentable: AnyObject {
 }
 
 public typealias HeaderVisibility = SWBProtocol.BuildFile.HeaderVisibility
@@ -91,20 +90,19 @@ public final class BuildFile: ProjectModelItem {
     /// Whether to skip the "no rule to process file..." warning for this file.
     public let shouldWarnIfNoRuleToProcess: Bool
 
-    init(_ model: SWBProtocol.BuildFile, _ pifLoader: PIFLoader)
-    {
+    init(_ model: SWBProtocol.BuildFile, _ pifLoader: PIFLoader) {
         guid = model.guid
         codeSignOnCopy = model.codeSignOnCopy
         removeHeadersOnCopy = model.removeHeadersOnCopy
         shouldLinkWeakly = model.shouldLinkWeakly
         headerVisibility = model.headerVisibility
-        additionalArgs = model.additionalArgs.map{ pifLoader.userNamespace.parseStringList($0) }
+        additionalArgs = model.additionalArgs.map { pifLoader.userNamespace.parseStringList($0) }
         decompress = model.decompress
         migCodegenFiles = model.migCodegenFiles
         assetTags = model.assetTags
         intentsCodegenVisibility = model.intentsCodegenVisibility
         resourceRule = model.resourceRule
-        platformFilters = Set(model.platformFilters.map{ SWBCore.PlatformFilter($0, pifLoader) })
+        platformFilters = Set(model.platformFilters.map { SWBCore.PlatformFilter($0, pifLoader) })
         shouldWarnIfNoRuleToProcess = model.shouldWarnIfNoRuleToProcess
 
         switch model.buildableItemGUID {
@@ -133,12 +131,14 @@ public final class BuildFile: ProjectModelItem {
         case .plString(let stringValue)?:
             self.additionalArgs = pifLoader.userNamespace.parseStringList(stringValue)
         case .plArray(let arrayValue)?:
-            self.additionalArgs = try pifLoader.userNamespace.parseStringList(arrayValue.map { (plItem) -> String in
-                guard case .plString(let string) = plItem else {
-                    throw PIFParsingError.incorrectTypeInArray(keyName: PIFKey_BuildFile_additionalCompilerOptions, objectType: Self.self, expectedType: "String")
-                }
-                return string
-            }.joined(separator: " "))
+            self.additionalArgs = try pifLoader.userNamespace.parseStringList(
+                arrayValue.map { (plItem) -> String in
+                    guard case .plString(let string) = plItem else {
+                        throw PIFParsingError.incorrectTypeInArray(keyName: PIFKey_BuildFile_additionalCompilerOptions, objectType: Self.self, expectedType: "String")
+                    }
+                    return string
+                }.joined(separator: " ")
+            )
         case .none:
             self.additionalArgs = nil
             break
@@ -162,13 +162,20 @@ public final class BuildFile: ProjectModelItem {
         if let value: ResourceRule = try Self.parseOptionalValueForKeyAsStringEnum(PIFKey_BuildFile_resourceRule, pifDict: pifDict) {
             resourceRule = value
         } else {
-            resourceRule = .process // default to `.process` for backwards compatibility
+            resourceRule = .process  // default to `.process` for backwards compatibility
         }
 
         // Parse the platformFilters data.
-        platformFilters = try Set(Self.parseOptionalValueForKeyAsArrayOfProjectModelItems(PIFKey_platformFilters, pifDict: pifDict, pifLoader: pifLoader, construct: {
-            try PlatformFilter(fromDictionary: $0, withPIFLoader: pifLoader)
-        }) ?? [])
+        platformFilters = try Set(
+            Self.parseOptionalValueForKeyAsArrayOfProjectModelItems(
+                PIFKey_platformFilters,
+                pifDict: pifDict,
+                pifLoader: pifLoader,
+                construct: {
+                    try PlatformFilter(fromDictionary: $0, withPIFLoader: pifLoader)
+                }
+            ) ?? []
+        )
 
         if let targetReferenceGUID = try Self.parseOptionalValueForKeyAsString(PIFKey_BuildFile_targetReference, pifDict: pifDict) {
             buildableItem = .targetProduct(guid: targetReferenceGUID)
@@ -198,8 +205,7 @@ public final class BuildFile: ProjectModelItem {
         self.resourceRule = .process
     }
 
-    public var description: String
-    {
+    public var description: String {
         // It would be convenient to emit something to identify the reference here.
         return "\(type(of: self))<\(guid)>"
     }
diff --git a/Sources/SWBCore/ProjectModel/BuildPhase.swift b/Sources/SWBCore/ProjectModel/BuildPhase.swift
index c533ffd6..447919fe 100644
--- a/Sources/SWBCore/ProjectModel/BuildPhase.swift
+++ b/Sources/SWBCore/ProjectModel/BuildPhase.swift
@@ -16,9 +16,7 @@ public import SWBMacro
 
 // MARK: Build phase abstract class
 
-
-public class BuildPhase: ProjectModelItem, @unchecked Sendable
-{
+public class BuildPhase: ProjectModelItem, @unchecked Sendable {
     /// The name of the build phase, typically for reporting issues.
     public var name: String { fatalError("abstract \(type(of: self)) build phase asked for its name") }
 
@@ -78,29 +76,24 @@ public class BuildPhase: ProjectModelItem, @unchecked Sendable
         }
     }
 
-    public var description: String
-    {
+    public var description: String {
         return "\(type(of: self))<>"
     }
 }
 
-
 // MARK: Build phase with build files abstract class
 
-
-public class BuildPhaseWithBuildFiles: BuildPhase, @unchecked Sendable
-{
+public class BuildPhaseWithBuildFiles: BuildPhase, @unchecked Sendable {
     public let buildFiles: [BuildFile]
 
-    init(_ model: SWBProtocol.BuildPhaseWithBuildFiles, _ pifLoader: PIFLoader)
-    {
-        buildFiles = model.buildFiles.map{ BuildFile($0, pifLoader) }
+    init(_ model: SWBProtocol.BuildPhaseWithBuildFiles, _ pifLoader: PIFLoader) {
+        buildFiles = model.buildFiles.map { BuildFile($0, pifLoader) }
         super.init(model, pifLoader)
     }
 
     override init(fromDictionary pifDict: ProjectModelItemPIF, withPIFLoader pifLoader: PIFLoader) throws {
         // Build files are required.
-        self.buildFiles = try Self.parseValueForKeyAsArrayOfProjectModelItems(PIFKey_BuildPhase_buildFiles, pifDict: pifDict, pifLoader: pifLoader, construct: { try BuildFile(fromDictionary: $0, withPIFLoader: pifLoader) } )
+        self.buildFiles = try Self.parseValueForKeyAsArrayOfProjectModelItems(PIFKey_BuildPhase_buildFiles, pifDict: pifDict, pifLoader: pifLoader, construct: { try BuildFile(fromDictionary: $0, withPIFLoader: pifLoader) })
 
         try super.init(fromDictionary: pifDict, withPIFLoader: pifLoader)
     }
@@ -117,8 +110,7 @@ public class BuildPhaseWithBuildFiles: BuildPhase, @unchecked Sendable
         return buildFiles.filter({ platformFilter.matches($0.platformFilters) })
     }
 
-    override public var description: String
-    {
+    override public var description: String {
         return "\(type(of: self))<\(buildFiles.count) files>"
     }
 
@@ -130,48 +122,33 @@ public class BuildPhaseWithBuildFiles: BuildPhase, @unchecked Sendable
     }
 }
 
-
 // MARK: Sources build phase class
 
-
-public final class SourcesBuildPhase: BuildPhaseWithBuildFiles, @unchecked Sendable
-{
+public final class SourcesBuildPhase: BuildPhaseWithBuildFiles, @unchecked Sendable {
     public override var name: String { return "Compile Sources" }
 }
 
-
 // MARK: Frameworks build phase class
 
-
-public final class FrameworksBuildPhase: BuildPhaseWithBuildFiles, @unchecked Sendable
-{
+public final class FrameworksBuildPhase: BuildPhaseWithBuildFiles, @unchecked Sendable {
     public override var name: String { return "Link Binary" }
 }
 
-
 // MARK: Headers build phase class
 
-
-public final class HeadersBuildPhase: BuildPhaseWithBuildFiles, @unchecked Sendable
-{
+public final class HeadersBuildPhase: BuildPhaseWithBuildFiles, @unchecked Sendable {
     public override var name: String { return "Copy Headers" }
 }
 
-
 // MARK: Resources build phase class
 
-
-public final class ResourcesBuildPhase: BuildPhaseWithBuildFiles, @unchecked Sendable
-{
+public final class ResourcesBuildPhase: BuildPhaseWithBuildFiles, @unchecked Sendable {
     public override var name: String { return "Copy Bundle Resources" }
 }
 
-
 // MARK: Copy files build phase class
 
-
-public final class CopyFilesBuildPhase: BuildPhaseWithBuildFiles, @unchecked Sendable
-{
+public final class CopyFilesBuildPhase: BuildPhaseWithBuildFiles, @unchecked Sendable {
     public override var name: String { return "Copy Files" }
 
     /// The destination subfolder to copy to.  This will commonly be a location relative to `$(TARGET_BUILD_DIR)/$(WRAPPER_NAME)`, but can also be a special indicator such as `<absolute>` or `<builtProductsDir>`.
@@ -181,8 +158,7 @@ public final class CopyFilesBuildPhase: BuildPhaseWithBuildFiles, @unchecked Sen
     /// If `true` then the contents of this phase will only be copied when `$(DEPLOYMENT_POSTPROCESSING)` is enabled.
     public let runOnlyForDeploymentPostprocessing: Bool
 
-    init(_ model: SWBProtocol.CopyFilesBuildPhase, _ pifLoader: PIFLoader)
-    {
+    init(_ model: SWBProtocol.CopyFilesBuildPhase, _ pifLoader: PIFLoader) {
         var destinationSubfolder = model.destinationSubfolder
         var destinationSubpath = model.destinationSubpath
 
@@ -224,12 +200,9 @@ public final class CopyFilesBuildPhase: BuildPhaseWithBuildFiles, @unchecked Sen
     }
 }
 
-
 // MARK: Shell script build phase class
 
-
-public final class ShellScriptBuildPhase: BuildPhase, @unchecked Sendable
-{
+public final class ShellScriptBuildPhase: BuildPhase, @unchecked Sendable {
     public override var name: String { return _name.isEmpty ? "Run Script" : _name }
 
     /// The name of the shell script phase.
@@ -279,17 +252,16 @@ public final class ShellScriptBuildPhase: BuildPhase, @unchecked Sendable
     /// Whether the script phase should also run for `installhdrs` and `installapi` builds, regardless of what `INSTALLHDRS_SCRIPT_PHASE` is set to.
     public let alwaysRunForInstallHdrs: Bool
 
-    init(_ model: SWBProtocol.ShellScriptBuildPhase, _ pifLoader: PIFLoader)
-    {
+    init(_ model: SWBProtocol.ShellScriptBuildPhase, _ pifLoader: PIFLoader) {
         _name = model.name
         // FIXME: This should be a string list, but this matches PBXBuild. Also, this shouldn't ever be a Path.
         shellPath = pifLoader.userNamespace.parseString(model.shellPath.str)
         scriptContents = model.scriptContents
         originalObjectID = model.originalObjectID
-        inputFilePaths = model.inputFilePaths.map{ pifLoader.userNamespace.parseString($0) }
-        inputFileListPaths = model.inputFileListPaths.map{ pifLoader.userNamespace.parseString($0) }
-        outputFilePaths = model.outputFilePaths.map{ pifLoader.userNamespace.parseString($0) }
-        outputFileListPaths = model.outputFileListPaths.map{ pifLoader.userNamespace.parseString($0) }
+        inputFilePaths = model.inputFilePaths.map { pifLoader.userNamespace.parseString($0) }
+        inputFileListPaths = model.inputFileListPaths.map { pifLoader.userNamespace.parseString($0) }
+        outputFilePaths = model.outputFilePaths.map { pifLoader.userNamespace.parseString($0) }
+        outputFileListPaths = model.outputFileListPaths.map { pifLoader.userNamespace.parseString($0) }
         emitEnvironment = model.emitEnvironment
         sandboxingOverride = model.sandboxingOverride
         runOnlyForDeploymentPostprocessing = model.runOnlyForDeploymentPostprocessing
@@ -374,29 +346,20 @@ public final class ShellScriptBuildPhase: BuildPhase, @unchecked Sendable
     }
 }
 
-
 // MARK: Rez build phase class
 
-
-public final class RezBuildPhase: BuildPhaseWithBuildFiles, @unchecked Sendable
-{
+public final class RezBuildPhase: BuildPhaseWithBuildFiles, @unchecked Sendable {
     public override var name: String { return "Build Carbon Resources" }
 }
 
-
 // MARK: AppleScript build phase class
 
-
-public final class AppleScriptBuildPhase: BuildPhaseWithBuildFiles, @unchecked Sendable
-{
+public final class AppleScriptBuildPhase: BuildPhaseWithBuildFiles, @unchecked Sendable {
     public override var name: String { return "Compile AppleScript Files" }
 }
 
-
 // MARK: Java archive build phase class
 
-
-public final class JavaArchiveBuildPhase: BuildPhaseWithBuildFiles, @unchecked Sendable
-{
+public final class JavaArchiveBuildPhase: BuildPhaseWithBuildFiles, @unchecked Sendable {
     public override var name: String { return "Build Java Resources" }
 }
diff --git a/Sources/SWBCore/ProjectModel/BuildRule.swift b/Sources/SWBCore/ProjectModel/BuildRule.swift
index ce87fe12..677733b4 100644
--- a/Sources/SWBCore/ProjectModel/BuildRule.swift
+++ b/Sources/SWBCore/ProjectModel/BuildRule.swift
@@ -43,7 +43,6 @@ public final class BuildRule: ProjectModelItem {
             self.inputSpecifier = .fileType(identifier: identifier)
         }
 
-
         switch model.actionSpecifier {
         case .compiler(let identifier):
             self.actionSpecifier = .compiler(identifier: identifier)
@@ -53,9 +52,12 @@ public final class BuildRule: ProjectModelItem {
                 inputs: inputInfo.map { pifLoader.userNamespace.parseString($0) },
                 inputFileLists: inputFileLists.map { pifLoader.userNamespace.parseString($0) },
                 outputs: outputInfo.map {
-                    BuildRuleOutputInfo(path: pifLoader.userNamespace.parseString($0.path), additionalCompilerFlags: $0.additionalCompilerFlags.map {
-                        pifLoader.userNamespace.parseStringList($0)
-                    } ?? pifLoader.userNamespace.parseLiteralStringList([]))
+                    BuildRuleOutputInfo(
+                        path: pifLoader.userNamespace.parseString($0.path),
+                        additionalCompilerFlags: $0.additionalCompilerFlags.map {
+                            pifLoader.userNamespace.parseStringList($0)
+                        } ?? pifLoader.userNamespace.parseLiteralStringList([])
+                    )
                 },
                 outputFileLists: outputFileLists.map { pifLoader.userNamespace.parseString($0) },
                 dependencyInfo: DependencyInfoFormat.fromPIF(dependencyInfo, pifLoader: pifLoader),
@@ -99,7 +101,6 @@ public final class BuildRule: ProjectModelItem {
 
             let outputFileListPaths = (try Self.parseOptionalValueForKeyAsArrayOfStrings(PIFKey_BuildRule_outputFileListPaths, pifDict: pifDict) ?? []).map { return pifLoader.userNamespace.parseString($0) }
 
-
             // The output file compiler flags are optional.
             let outputFilesCompilerFlags: [MacroStringListExpression]?
             if let data = pifDict[PIFKey_BuildRule_outputFilesCompilerFlags] {
@@ -111,12 +112,14 @@ public final class BuildRule: ProjectModelItem {
                     guard case let .plArray(value) = flagData else {
                         throw PIFParsingError.incorrectType(keyName: PIFKey_BuildRule_outputFilesCompilerFlags, objectType: Self.self, expectedType: "Array", destinationType: nil)
                     }
-                    return try pifLoader.userNamespace.parseStringList(value.map { item -> String in
-                        guard case let .plString(value) = item else {
-                            throw PIFParsingError.incorrectType(keyName: PIFKey_BuildRule_outputFilesCompilerFlags, objectType: Self.self, expectedType: "String", destinationType: nil)
+                    return try pifLoader.userNamespace.parseStringList(
+                        value.map { item -> String in
+                            guard case let .plString(value) = item else {
+                                throw PIFParsingError.incorrectType(keyName: PIFKey_BuildRule_outputFilesCompilerFlags, objectType: Self.self, expectedType: "String", destinationType: nil)
+                            }
+                            return value
                         }
-                        return value
-                    })
+                    )
                 }
             } else {
                 outputFilesCompilerFlags = nil
@@ -181,8 +184,7 @@ public final class BuildRule: ProjectModelItem {
         }
     }
 
-    public var description: String
-    {
+    public var description: String {
         return "\(type(of: self))<\(fileTypeIdentifier)->\(compilerSpecificationIdentifier)>"
     }
 }
@@ -219,17 +221,18 @@ public enum BuildRuleActionSpecifier: Sendable {
     /// - outputFileLists: The list of xcfilelists that contains a list of additional output file paths
     /// - dependencyInfo: The dependency info.
     /// - runOncePerArchitecture: Run once per architecture/variant.
-    case shellScript(contents: String,
-                     inputs: [MacroStringExpression],
-                     inputFileLists: [MacroStringExpression],
-                     outputs: [BuildRuleOutputInfo],
-                     outputFileLists: [MacroStringExpression],
-                     dependencyInfo: DependencyInfoFormat?,
-                     runOncePerArchitecture: Bool)
+    case shellScript(
+        contents: String,
+        inputs: [MacroStringExpression],
+        inputFileLists: [MacroStringExpression],
+        outputs: [BuildRuleOutputInfo],
+        outputFileLists: [MacroStringExpression],
+        dependencyInfo: DependencyInfoFormat?,
+        runOncePerArchitecture: Bool
+    )
 }
 
 // MARK: Build rule constant strings
 
-
-let BuildRule_FileTypeIsPatternIdentifier       = "pattern.proxy"
-let BuildRule_CompilerIsShellScriptIdentifier   = "com.apple.compilers.proxy.script"
+let BuildRule_FileTypeIsPatternIdentifier = "pattern.proxy"
+let BuildRule_CompilerIsShellScriptIdentifier = "com.apple.compilers.proxy.script"
diff --git a/Sources/SWBCore/ProjectModel/DependencyInfoFormat.swift b/Sources/SWBCore/ProjectModel/DependencyInfoFormat.swift
index d7331fbc..3cbd871f 100644
--- a/Sources/SWBCore/ProjectModel/DependencyInfoFormat.swift
+++ b/Sources/SWBCore/ProjectModel/DependencyInfoFormat.swift
@@ -24,7 +24,6 @@ public enum DependencyInfoFormat: Sendable {
     case makefiles([MacroStringExpression])
 }
 
-
 extension DependencyInfoFormat {
     public static func fromPIF(_ dependencyInfo: SWBProtocol.DependencyInfo?, pifLoader: PIFLoader) -> DependencyInfoFormat? {
         guard let dependencyInfo else {
@@ -37,7 +36,7 @@ extension DependencyInfoFormat {
         case .makefile(let path):
             return .makefile(pifLoader.userNamespace.parseString(path))
         case .makefiles(let paths):
-            return .makefiles(paths.map{ pifLoader.userNamespace.parseString($0) })
+            return .makefiles(paths.map { pifLoader.userNamespace.parseString($0) })
         }
     }
 }
diff --git a/Sources/SWBCore/ProjectModel/FilePathResolver.swift b/Sources/SWBCore/ProjectModel/FilePathResolver.swift
index d78b65d0..5950a13c 100644
--- a/Sources/SWBCore/ProjectModel/FilePathResolver.swift
+++ b/Sources/SWBCore/ProjectModel/FilePathResolver.swift
@@ -15,8 +15,7 @@ public import SWBMacro
 import SWBProtocol
 
 /// A FilePathResolver is used to resolve the absolute paths for Reference objects.
-public final class FilePathResolver: Sendable
-{
+public final class FilePathResolver: Sendable {
     /// The MacroEvaluationScope used to expand source trees.
     private let scope: MacroEvaluationScope
 
@@ -29,8 +28,7 @@ public final class FilePathResolver: Sendable
     /// Private table use to cache paths already evaluated for build settings in the MacroEvaluationScope.
     private let buildSettingCache = Cache<MacroDeclaration, Path>()
 
-    public init(scope: MacroEvaluationScope, projectDir: Path? = nil)
-    {
+    public init(scope: MacroEvaluationScope, projectDir: Path? = nil) {
         self.scope = scope
         self.projectDir = projectDir ?? scope.evaluate(BuiltinMacros.PROJECT_DIR)
 
@@ -42,11 +40,9 @@ public final class FilePathResolver: Sendable
     }
 
     /// Resolve and return the absolute path for a Reference.
-    public func resolveAbsolutePath(_ reference: Reference) -> Path
-    {
+    public func resolveAbsolutePath(_ reference: Reference) -> Path {
         // If this is a FileGroup, look it up in the cache.
-        if let fileGroup = reference as? FileGroup
-        {
+        if let fileGroup = reference as? FileGroup {
             return fileGroupCache.getOrInsert(fileGroup) {
                 return computeAbsolutePath(fileGroup)
             }
@@ -56,8 +52,7 @@ public final class FilePathResolver: Sendable
     }
 
     /// Computes the absolute path for a Reference and returns it.  This method does no memoizing of the result, so resolveAbsolutePath() is the preferred client method.
-    private func computeAbsolutePath(_ reference: Reference) -> Path
-    {
+    private func computeAbsolutePath(_ reference: Reference) -> Path {
         // Evaluate the path for the reference.
         switch reference
         {
@@ -91,8 +86,7 @@ public final class FilePathResolver: Sendable
     }
 
     /// Resolve and return the absolute path for a Reference's source tree.  This method will always return an absolute path even if sourceTree is .Absolute, so that it can be prepended to a path even if that path should be absolute but is not.  So the caller should use the result appropriately based on what it will be prepended to.
-    func resolveSourceTree(_ sourceTree: SourceTree, forReference reference: Reference) -> Path
-    {
+    func resolveSourceTree(_ sourceTree: SourceTree, forReference reference: Reference) -> Path {
         // Resolve the source tree.
         // Note: If the Reference's path is relative, then we want to always append it to something, so we always compute a value for the source tree here, defaulting to $(PROJECT_DIR) if no other value can be determined
         switch sourceTree
@@ -124,8 +118,7 @@ public final class FilePathResolver: Sendable
                 var pathForSetting = Path(pathString)
 
                 // If the path for the setting is not absolute, then we append it to the value of $(PROJECT_DIR).
-                if !pathForSetting.isAbsolute
-                {
+                if !pathForSetting.isAbsolute {
                     pathForSetting = projectDir.join(pathForSetting)
                 }
 
@@ -136,8 +129,7 @@ public final class FilePathResolver: Sendable
     }
 
     /// Resolve and return the path for a Reference's path property, evaluating any build settings in it if necessary.
-    func resolvePath(_ refPath: MacroStringExpression, forReference reference: Reference) -> Path
-    {
+    func resolvePath(_ refPath: MacroStringExpression, forReference reference: Reference) -> Path {
         return Path(scope.evaluate(refPath))
     }
 
diff --git a/Sources/SWBCore/ProjectModel/FileTextEncoding.swift b/Sources/SWBCore/ProjectModel/FileTextEncoding.swift
index ee43d556..f9adbbce 100644
--- a/Sources/SWBCore/ProjectModel/FileTextEncoding.swift
+++ b/Sources/SWBCore/ProjectModel/FileTextEncoding.swift
@@ -20,17 +20,17 @@ public import class Foundation.NSNumber
 public import class Foundation.NSString
 
 #if canImport(Darwin)
-import class CoreFoundation.CFString
-import var CoreFoundation.kCFStringEncodingInvalidId
-import func CoreFoundation.CFStringConvertEncodingToNSStringEncoding
-import func CoreFoundation.CFStringConvertEncodingToIANACharSetName
-import func CoreFoundation.CFStringConvertIANACharSetNameToEncoding
-import func CoreFoundation.CFStringConvertNSStringEncodingToEncoding
+    import class CoreFoundation.CFString
+    import var CoreFoundation.kCFStringEncodingInvalidId
+    import func CoreFoundation.CFStringConvertEncodingToNSStringEncoding
+    import func CoreFoundation.CFStringConvertEncodingToIANACharSetName
+    import func CoreFoundation.CFStringConvertIANACharSetNameToEncoding
+    import func CoreFoundation.CFStringConvertNSStringEncodingToEncoding
 #endif
 
 #if canImport(Darwin)
-import struct CoreFoundation.ObjCBool
-public import struct Foundation.StringEncodingDetectionOptionsKey
+    import struct CoreFoundation.ObjCBool
+    public import struct Foundation.StringEncodingDetectionOptionsKey
 #endif
 
 // The naming convention in Foundation is rather unfortunate.
@@ -39,11 +39,11 @@ public import struct Foundation.StringEncodingDetectionOptionsKey
 public extension FileTextEncoding {
     init?(stringEncoding: String.Encoding) {
         #if canImport(Darwin)
-        let cfencoding = CFStringConvertNSStringEncodingToEncoding(stringEncoding.rawValue)
-        if cfencoding != kCFStringEncodingInvalidId, let name = CFStringConvertEncodingToIANACharSetName(cfencoding).map(String.init) {
-            self.init(name)
-            return
-        }
+            let cfencoding = CFStringConvertNSStringEncodingToEncoding(stringEncoding.rawValue)
+            if cfencoding != kCFStringEncodingInvalidId, let name = CFStringConvertEncodingToIANACharSetName(cfencoding).map(String.init) {
+                self.init(name)
+                return
+            }
         #endif
         return nil
     }
@@ -51,10 +51,10 @@ public extension FileTextEncoding {
     /// Convert the given encoding to an `NSStringEncoding`.
     var stringEncoding: String.Encoding? {
         #if canImport(Darwin)
-        let cfencoding = CFStringConvertIANACharSetNameToEncoding(rawValue.asCFString)
-        if cfencoding != kCFStringEncodingInvalidId {
-            return String.Encoding(rawValue: CFStringConvertEncodingToNSStringEncoding(cfencoding))
-        }
+            let cfencoding = CFStringConvertIANACharSetNameToEncoding(rawValue.asCFString)
+            if cfencoding != kCFStringEncodingInvalidId {
+                return String.Encoding(rawValue: CFStringConvertEncodingToNSStringEncoding(cfencoding))
+            }
         #endif
         return nil
     }
@@ -75,13 +75,13 @@ public extension FileTextEncoding {
         }
 
         #if canImport(Darwin)
-        var convertedString: NSString?
-        var usedLossyConversion: ObjCBool = true
-        let stringEncoding = String.Encoding(rawValue: NSString.stringEncoding(for: Data(bytes), encodingOptions: [.allowLossyKey: NSNumber(value: false)], convertedString: &convertedString, usedLossyConversion: &usedLossyConversion))
-        if let convertedString = convertedString as String?, let discoveredEncoding = FileTextEncoding(stringEncoding: stringEncoding), !usedLossyConversion.boolValue {
-            // Always detect ASCII as UTF-8, because we want to prefer Unicode encodings
-            return (convertedString, stringEncoding == .ascii ? FileTextEncoding.utf8 : discoveredEncoding)
-        }
+            var convertedString: NSString?
+            var usedLossyConversion: ObjCBool = true
+            let stringEncoding = String.Encoding(rawValue: NSString.stringEncoding(for: Data(bytes), encodingOptions: [.allowLossyKey: NSNumber(value: false)], convertedString: &convertedString, usedLossyConversion: &usedLossyConversion))
+            if let convertedString = convertedString as String?, let discoveredEncoding = FileTextEncoding(stringEncoding: stringEncoding), !usedLossyConversion.boolValue {
+                // Always detect ASCII as UTF-8, because we want to prefer Unicode encodings
+                return (convertedString, stringEncoding == .ascii ? FileTextEncoding.utf8 : discoveredEncoding)
+            }
         #endif
 
         return nil
@@ -89,7 +89,7 @@ public extension FileTextEncoding {
 }
 
 fileprivate extension String {
-    init?<C: RandomAccessCollection>(_ bytes: C, encoding: FileTextEncoding) where C.Index : SignedInteger, C.Element == UInt8 {
+    init?<C: RandomAccessCollection>(_ bytes: C, encoding: FileTextEncoding) where C.Index: SignedInteger, C.Element == UInt8 {
         switch encoding {
         case .utf8:
             self.init(decodingBytes: bytes, as: Unicode.UTF8.self)
diff --git a/Sources/SWBCore/ProjectModel/PIFLoader.swift b/Sources/SWBCore/ProjectModel/PIFLoader.swift
index dc167904..9f190408 100644
--- a/Sources/SWBCore/ProjectModel/PIFLoader.swift
+++ b/Sources/SWBCore/ProjectModel/PIFLoader.swift
@@ -117,7 +117,6 @@ struct PIFObjectReference: Hashable {
     return vers
 }
 
-
 /// A top-level object which can be represented independently in the PIF format.
 ///
 /// These objects represent the granularity at which the PIF can be incrementally loaded or replaced.
@@ -271,7 +270,7 @@ public final class PIFLoader {
     }
 
     // Return the ProjectModelItem for the requested GUID.  If one cannot be returned, that's an internal error.
-    func lookupReference(for guid: String ) -> Reference? {
+    func lookupReference(for guid: String) -> Reference? {
         return knownReferences[guid]
     }
 
@@ -295,7 +294,6 @@ public final class PIFLoader {
     }
 }
 
-
 /// An incremental PIF loader.
 ///
 /// This is a PIF loader implementation which keeps track of available objects and dynamically negotiates the minimal set of objects which need to be transferred to load the complete PIF.
@@ -306,18 +304,30 @@ public final class PIFLoader {
 //
 // FIXME: This API doesn't feel right, it seems bogus that both the incremental loader and the regular loader are both maintaining maps of objects keyed by the same thing. The separation currently is between the incremental loader, which maintains a set of objects across multiple load requests and can communicate back to the client (via `LoadingSession`) about what new objects are required, and the bare `PIFLoader` which is only responsible for loading a single, complete graph.
 public final class IncrementalPIFLoader {
-    @_spi(Testing) public static let loadsRequested = Statistic("IncrementalPIFLoader.loadsRequested",
-        "The total number of top-level objects requested.")
-    static let objectsRequested = Statistic("IncrementalPIFLoader.objectsRequested",
-        "The number of PIF objects which were requested.")
-    @_spi(Testing) public static let objectsLoaded = Statistic("IncrementalPIFLoader.objectsLoaded",
-        "The number of PIF objects which were loaded, in any form.")
-    static let objectsCachedInMemory = Statistic("IncrementalPIFLoader.objectsCachedInMemory",
-        "The number of PIF objects which hit the in-memory cache.")
-    static let objectsCachedOnDisk = Statistic("IncrementalPIFLoader.objectsCachedOnDisk",
-        "The number of PIF objects which hit the on-disk cache.")
-    @_spi(Testing) public static let objectsTransferred = Statistic("IncrementalPIFLoader.objectsTransferred",
-        "The number of PIF objects which were transferred.")
+    @_spi(Testing) public static let loadsRequested = Statistic(
+        "IncrementalPIFLoader.loadsRequested",
+        "The total number of top-level objects requested."
+    )
+    static let objectsRequested = Statistic(
+        "IncrementalPIFLoader.objectsRequested",
+        "The number of PIF objects which were requested."
+    )
+    @_spi(Testing) public static let objectsLoaded = Statistic(
+        "IncrementalPIFLoader.objectsLoaded",
+        "The number of PIF objects which were loaded, in any form."
+    )
+    static let objectsCachedInMemory = Statistic(
+        "IncrementalPIFLoader.objectsCachedInMemory",
+        "The number of PIF objects which hit the in-memory cache."
+    )
+    static let objectsCachedOnDisk = Statistic(
+        "IncrementalPIFLoader.objectsCachedOnDisk",
+        "The number of PIF objects which hit the on-disk cache."
+    )
+    @_spi(Testing) public static let objectsTransferred = Statistic(
+        "IncrementalPIFLoader.objectsTransferred",
+        "The number of PIF objects which were transferred."
+    )
 
     /// A session for incrementally loading an individual object.
     ///
@@ -357,7 +367,7 @@ public final class IncrementalPIFLoader {
 
         /// The complete set of missing objects for the unloaded data.
         public var missingObjects: AnySequence<(signature: String, type: PIFObjectType)> {
-            return AnySequence(_missingObjects.map{ (signature: $0.signature, type: $0.type) })
+            return AnySequence(_missingObjects.map { (signature: $0.signature, type: $0.type) })
         }
         var _missingObjects: Set<PIFObjectReference> = []
 
@@ -382,7 +392,7 @@ public final class IncrementalPIFLoader {
 
             // Create the loader for this instance and load the object.
             let loader = PIFLoader(provider: ObjectProviderAdaptor(session: self), userNamespace: incrementalLoader.userNamespace)
-            let result = try MacroNamespace.withExpressionInterningEnabled{ try loader.loadReference(signature: workspaceSignature, type: Workspace.self) }
+            let result = try MacroNamespace.withExpressionInterningEnabled { try loader.loadReference(signature: workspaceSignature, type: Workspace.self) }
 
             // Merge back in all the loaded objects.
             for (key, value) in loader.loadedObjects {
diff --git a/Sources/SWBCore/ProjectModel/PlatformFilter.swift b/Sources/SWBCore/ProjectModel/PlatformFilter.swift
index 16d089ce..408683e1 100644
--- a/Sources/SWBCore/ProjectModel/PlatformFilter.swift
+++ b/Sources/SWBCore/ProjectModel/PlatformFilter.swift
@@ -51,13 +51,13 @@ public final class PlatformFilter: ProjectModelItem, Hashable, Codable {
         hasher.combine(environment)
     }
 
-    public static func ==(lhs: PlatformFilter, rhs: PlatformFilter) -> Bool {
+    public static func == (lhs: PlatformFilter, rhs: PlatformFilter) -> Bool {
         return lhs.platform == rhs.platform && lhs.environment == rhs.environment
     }
 }
 
 extension PlatformFilter: Comparable {
-    public static func <(lhs: PlatformFilter, rhs: PlatformFilter) -> Bool {
+    public static func < (lhs: PlatformFilter, rhs: PlatformFilter) -> Bool {
         return lhs.comparisonString < rhs.comparisonString
     }
 
@@ -68,16 +68,18 @@ extension PlatformFilter: Comparable {
 
 extension PlatformFilter {
     static func fromBuildConditionParameterString(_ string: String) -> Set<PlatformFilter> {
-        return Set(string.components(separatedBy: ";").compactMap {
-            let parameters = $0.components(separatedBy: "-")
-            switch parameters.count {
-            case 1:
-                return PlatformFilter(platform: parameters[0])
-            case 2:
-                return PlatformFilter(platform: parameters[0], environment: parameters[1])
-            default:
-                return nil
+        return Set(
+            string.components(separatedBy: ";").compactMap {
+                let parameters = $0.components(separatedBy: "-")
+                switch parameters.count {
+                case 1:
+                    return PlatformFilter(platform: parameters[0])
+                case 2:
+                    return PlatformFilter(platform: parameters[0], environment: parameters[1])
+                default:
+                    return nil
+                }
             }
-        })
+        )
     }
 }
diff --git a/Sources/SWBCore/ProjectModel/Project.swift b/Sources/SWBCore/ProjectModel/Project.swift
index 67c4b47f..27e0bda7 100644
--- a/Sources/SWBCore/ProjectModel/Project.swift
+++ b/Sources/SWBCore/ProjectModel/Project.swift
@@ -13,14 +13,13 @@
 import SWBProtocol
 public import SWBUtil
 
-public final class Project: ProjectModelItem, PIFObject, Hashable, Encodable
-{
+public final class Project: ProjectModelItem, PIFObject, Hashable, Encodable {
     static func referencedObjects(for data: EncodedPIFValue) throws -> [PIFObjectReference] {
         // Any errors here will be diagnosed in the loader.
         switch data {
         case .json(let data):
             guard case let .plArray(projects)? = data["targets"] else { return [] }
-            return projects.compactMap{
+            return projects.compactMap {
                 guard case let .plString(signature) = $0 else { return nil }
                 return PIFObjectReference(signature: signature, type: .target)
             }
@@ -31,7 +30,7 @@ public final class Project: ProjectModelItem, PIFObject, Hashable, Encodable
             // FIXME: This sucks, we are doing the protocol decode twice: <rdar://problem/31097863> Don't require duplicate binary PIF decode in incremental PIF transfer
             let deserializer = MsgPackDeserializer(data)
             let model: SWBProtocol.Project = try deserializer.deserialize()
-            return model.targetSignatures.map{ PIFObjectReference(signature: $0, type: .target) }
+            return model.targetSignatures.map { PIFObjectReference(signature: $0, type: .target) }
         }
     }
 
@@ -72,7 +71,7 @@ public final class Project: ProjectModelItem, PIFObject, Hashable, Encodable
     public let appPreferencesBuildSettings: [String: PropertyListItem]
     public let isPackage: Bool
 
-    private enum CodingKeys : String, CodingKey {
+    private enum CodingKeys: String, CodingKey {
         case name
         case signature
         case guid
@@ -95,9 +94,9 @@ public final class Project: ProjectModelItem, PIFObject, Hashable, Encodable
         self.isPackage = model.isPackage
         self.xcodeprojPath = model.xcodeprojPath
         self.sourceRoot = model.sourceRoot
-        self.targets = try model.targetSignatures.map{ try pifLoader.loadReference(signature: $0, type: Target.self) }
+        self.targets = try model.targetSignatures.map { try pifLoader.loadReference(signature: $0, type: Target.self) }
         self.groupTree = try Reference.create(model.groupTree, pifLoader, isRoot: true) as! FileGroup
-        self.buildConfigurations = model.buildConfigurations.map{ BuildConfiguration($0, pifLoader) }
+        self.buildConfigurations = model.buildConfigurations.map { BuildConfiguration($0, pifLoader) }
         self.defaultConfigurationName = model.defaultConfigurationName
         self.developmentRegion = model.developmentRegion
         self.classPrefix = model.classPrefix
@@ -155,8 +154,7 @@ public final class Project: ProjectModelItem, PIFObject, Hashable, Encodable
         try validateTargets()
     }
 
-    public var description: String
-    {
+    public var description: String {
         return "\(type(of: self))<\(guid):\(xcodeprojPath.str):\(targets.count) targets>"
     }
 
@@ -202,7 +200,7 @@ public final class Project: ProjectModelItem, PIFObject, Hashable, Encodable
         hasher.combine(ObjectIdentifier(self))
     }
 
-    public static func ==(lhs: Project, rhs: Project) -> Bool {
+    public static func == (lhs: Project, rhs: Project) -> Bool {
         return ObjectIdentifier(lhs) == ObjectIdentifier(rhs)
     }
 
diff --git a/Sources/SWBCore/ProjectModel/ProjectModelItem.swift b/Sources/SWBCore/ProjectModel/ProjectModelItem.swift
index 11bcf70e..2d73a46b 100644
--- a/Sources/SWBCore/ProjectModel/ProjectModelItem.swift
+++ b/Sources/SWBCore/ProjectModel/ProjectModelItem.swift
@@ -14,16 +14,12 @@ public import Foundation
 import SWBProtocol
 public import SWBUtil
 
-
 // MARK: Type definitions
 
-
 public typealias ProjectModelItemPIF = [String: PropertyListItem]
 
-
 // MARK: ProjectModelItem protocol
 
-
 public protocol ProjectModelItem: AnyObject, CustomStringConvertible, Sendable {
 }
 
@@ -69,11 +65,9 @@ extension PIFParsingError: LocalizedError {
     }
 }
 
-extension ProjectModelItem
-{
+extension ProjectModelItem {
     // Static methods for parsing a property list to load a PIF.
 
-
     /// Parses the value for an optional key in a PIF dictionary as a String.
     /// - returns: A string value if the key is present, `nil` if it is absent.
     @_spi(Testing) public static func parseOptionalValueForKeyAsString(_ key: String, pifDict: ProjectModelItemPIF) throws -> String? {
@@ -157,12 +151,13 @@ extension ProjectModelItem
     // FIXME
     // @available(*, deprecated, message: "This is a shim method, and should be removed. It's used for the binary PIF representation used only by Swift Build's unit tests; we should transition everything to the JSON based API we currently use in production, and to a unified API at that (rather than one based on actual Swift types, one based on raw property lists, and different APIs for the public API and for the tests).")
     static func parseOptionalValueForKeyAsByteString(_ key: String, pifDict: ProjectModelItemPIF) throws -> ByteString? {
-        return try (parseOptionalValueForKeyAsArrayOfPropertyListItems(key, pifDict: pifDict)?.map { (plItem) -> UInt8 in
-            guard case .plInt(let value) = plItem, let byte = UInt8(exactly: value) else {
-                throw PIFParsingError.incorrectTypeInArray(keyName: key, objectType: self, expectedType: "UInt8")
-            }
-            return byte
-        }).map { ByteString($0) }
+        return try
+            (parseOptionalValueForKeyAsArrayOfPropertyListItems(key, pifDict: pifDict)?.map { (plItem) -> UInt8 in
+                guard case .plInt(let value) = plItem, let byte = UInt8(exactly: value) else {
+                    throw PIFParsingError.incorrectTypeInArray(keyName: key, objectType: self, expectedType: "UInt8")
+                }
+                return byte
+            }).map { ByteString($0) }
     }
 
     /// Parses the value for an optional key in a PIF dictionary as an Array of Strings.
@@ -203,7 +198,7 @@ extension ProjectModelItem
     }
 
     /// Parses the value for a required key in a PIF dictionary as an object of the appropriate concrete subclass of ProjectModelItem, and recursively parses any arrays or dictionaries appropriately.
-    @_spi(Testing) public static func parseValueForKeyAsProjectModelItem<T>( _ key: String, pifDict: ProjectModelItemPIF, pifLoader: PIFLoader, construct: (ProjectModelItemPIF) throws -> T) throws -> T {
+    @_spi(Testing) public static func parseValueForKeyAsProjectModelItem<T>(_ key: String, pifDict: ProjectModelItemPIF, pifLoader: PIFLoader, construct: (ProjectModelItemPIF) throws -> T) throws -> T {
         return try require(key) { try parseOptionalValueForKeyAsProjectModelItem(key, pifDict: pifDict, pifLoader: pifLoader, construct: construct) }
     }
 
@@ -231,17 +226,13 @@ extension ProjectModelItem
     }
 }
 
-
 // MARK: Wrapper for an unowned ProjectModelItem
 
-
 /// Wrapper for `ProjectModelItem`-conforming objects so they can be placed in arrays and dictionaries without creating string reference loops.
-struct UnownedProjectModelItem: Hashable
-{
+struct UnownedProjectModelItem: Hashable {
     unowned let value: any ProjectModelItem
 
-    init(_ value: any ProjectModelItem)
-    {
+    init(_ value: any ProjectModelItem) {
         self.value = value
     }
 
@@ -252,12 +243,10 @@ struct UnownedProjectModelItem: Hashable
 }
 
 /// Two `UnownedProjectModelItem`s are equal if their wrapped items are the same object.
-func ==(lhs: UnownedProjectModelItem, rhs: UnownedProjectModelItem) -> Bool
-{
+func == (lhs: UnownedProjectModelItem, rhs: UnownedProjectModelItem) -> Bool {
     return ObjectIdentifier(lhs.value) == ObjectIdentifier(rhs.value)
 }
 
-
 // MARK: PIF value constant definitions
 
 public protocol PIFStringEnum {
diff --git a/Sources/SWBCore/ProjectModel/Reference.swift b/Sources/SWBCore/ProjectModel/Reference.swift
index 7971142d..a6810daf 100644
--- a/Sources/SWBCore/ProjectModel/Reference.swift
+++ b/Sources/SWBCore/ProjectModel/Reference.swift
@@ -18,9 +18,7 @@ public typealias SourceTree = SWBProtocol.SourceTree
 
 // MARK: Reference abstract class
 
-
-public class Reference: ProjectModelItem, Hashable, Equatable, @unchecked Sendable
-{
+public class Reference: ProjectModelItem, Hashable, Equatable, @unchecked Sendable {
     /// The global ID within the PIF for this reference.
     public let guid: String
 
@@ -30,7 +28,7 @@ public class Reference: ProjectModelItem, Hashable, Equatable, @unchecked Sendab
         case let model as SWBProtocol.VariantGroup: return try VariantGroup(model, pifLoader, isRoot: isRoot)
         case let model as SWBProtocol.FileGroup: return try FileGroup(model, pifLoader, isRoot: isRoot)
         case let model as SWBProtocol.ProductReference: return try ProductReference(model, pifLoader)
-            // NOTE: This comes last because it is both a concrete and base type.
+        // NOTE: This comes last because it is both a concrete and base type.
         case let model as SWBProtocol.FileReference: return try FileReference(model, pifLoader, isRoot: isRoot)
         default:
             fatalError("unexpected model: \(model)")
@@ -39,7 +37,7 @@ public class Reference: ProjectModelItem, Hashable, Equatable, @unchecked Sendab
 
     init(_ model: SWBProtocol.Reference, _ pifLoader: PIFLoader) throws {
         #if canImport(Darwin)
-        assert(type(of: model) !== SWBProtocol.Reference.self, "unexpected concrete type")
+            assert(type(of: model) !== SWBProtocol.Reference.self, "unexpected concrete type")
         #endif
         self.guid = model.guid
 
@@ -55,8 +53,7 @@ public class Reference: ProjectModelItem, Hashable, Equatable, @unchecked Sendab
         try pifLoader.registerReference(self, for: guid)
     }
 
-    init(guid: String)
-    {
+    init(guid: String) {
         self.guid = guid
     }
 
@@ -64,23 +61,19 @@ public class Reference: ProjectModelItem, Hashable, Equatable, @unchecked Sendab
         hasher.combine(ObjectIdentifier(self))
     }
 
-    public static func ==(lhs: Reference, rhs: Reference) -> Bool
-    {
+    public static func == (lhs: Reference, rhs: Reference) -> Bool {
         return lhs === rhs
     }
 
-    public var description: String
-    {
+    public var description: String {
         return "\(type(of: self))<\(guid):ABSTRACT>"
     }
 }
 
 // MARK: GroupTreeReference abstract class
 
-
 /// A GroupTreeReference is a reference which exists as part of a project's group tree.  ProductReference objects are not part of the group tree.
-public class GroupTreeReference: Reference, @unchecked Sendable
-{
+public class GroupTreeReference: Reference, @unchecked Sendable {
     /// The parent of this reference in the group tree.  The root group's parent pointer will always be nil, but all other references should have backpointers once the PIF is fully loaded.
     ///
     /// The parent relationships are currently only used by the FilePath resolver.
@@ -105,7 +98,7 @@ public class GroupTreeReference: Reference, @unchecked Sendable
 
     init(_ model: SWBProtocol.GroupTreeReference, _ pifLoader: PIFLoader, isRoot: Bool) throws {
         #if canImport(Darwin)
-        assert(type(of: model) !== SWBProtocol.GroupTreeReference.self, "unexpected concrete reference")
+            assert(type(of: model) !== SWBProtocol.GroupTreeReference.self, "unexpected concrete reference")
         #endif
         self.sourceTree = model.sourceTree
         self.path = pifLoader.userNamespace.parseString(model.path)
@@ -174,13 +167,10 @@ public class GroupTreeReference: Reference, @unchecked Sendable
     }
 }
 
-
 // MARK: FileReference class
 
-
 /// A FileReference is the most common kind of Reference, representing a single concrete file on disk.
-public final class FileReference: GroupTreeReference, BuildFileRepresentable, @unchecked Sendable
-{
+public final class FileReference: GroupTreeReference, BuildFileRepresentable, @unchecked Sendable {
     public let fileTypeIdentifier: String
     public let regionVariantName: String?
     /// The file text encoding for the reference.  Will only be non-nil if the file type in Xcode indicated that it is a text type file.
@@ -209,19 +199,15 @@ public final class FileReference: GroupTreeReference, BuildFileRepresentable, @u
         try super.init(fromDictionary: pifDict, withPIFLoader: pifLoader, isRoot: isRoot)
     }
 
-    override public var description: String
-    {
+    override public var description: String {
         return "\(type(of: self))<\(guid):\(fileTypeIdentifier):\(sourceTree.debugDescription):\(path.stringRep)>"
     }
 }
 
-
 // MARK: VersionGroup class
 
-
 /// A VersionGroup is a file reference which contains multiple versions of itself as children.  It is possible (but unlikely, and possibly no longer actively promoted) that individual children may be represented by build files.
-public final class VersionGroup: GroupTreeReference, BuildFileRepresentable, @unchecked Sendable
-{
+public final class VersionGroup: GroupTreeReference, BuildFileRepresentable, @unchecked Sendable {
     /// The children of this version group, if any.
     public let children: [GroupTreeReference]
 
@@ -244,13 +230,10 @@ public final class VersionGroup: GroupTreeReference, BuildFileRepresentable, @un
     }
 }
 
-
 // MARK: FileGroup class
 
-
 /// A FileGroup is an abstract grouper of references and groups.  It is commonly used either for conceptual grouping for the benefit of users working with a project (and in this case has no meaningful impact on the build), or to represent a directory on disk which its children are relative to.  In the future it might be able to contribute other meaningful content to the build by, for example, describing build settings which apply to all of its children.
-public final class FileGroup: GroupTreeReference, @unchecked Sendable
-{
+public final class FileGroup: GroupTreeReference, @unchecked Sendable {
     public let name: String
     public let children: [GroupTreeReference]
 
@@ -274,19 +257,15 @@ public final class FileGroup: GroupTreeReference, @unchecked Sendable
         for child in children { child._parent.initialize(to: .init(value: self)) }
     }
 
-    override public var description: String
-    {
+    override public var description: String {
         return "\(type(of: self))<\(guid):\(name):\(sourceTree.debugDescription):\(path.stringRep)>"
     }
 }
 
-
 // MARK: VariantGroup class
 
-
 /// A VariantGroup represents multiple files which conceptually are different 'variants' (e.g., localized variants) of a single file.  This includes more complex groupings, such as a .xib file and its associated localized .strings files.
-public final class VariantGroup: GroupTreeReference, BuildFileRepresentable, @unchecked Sendable
-{
+public final class VariantGroup: GroupTreeReference, BuildFileRepresentable, @unchecked Sendable {
     /// The name of this variant group - primarily for debugging purposes.
     public let name: String
     /// The children of this variant group, if any.
@@ -313,19 +292,15 @@ public final class VariantGroup: GroupTreeReference, BuildFileRepresentable, @un
         for child in children { child._parent.initialize(to: .init(value: self)) }
     }
 
-    override public var description: String
-    {
+    override public var description: String {
         return "\(type(of: self))<\(guid):\(name)>"
     }
 }
 
-
 // MARK: ProductReference class
 
-
 /// A ProductReference represents the product of a StandardTarget object.  It acts as a placeholder so that product can be represented in other targets, but it contains no meaningful information itself; rather, it vends information about itself by querying its target for that information.  A ProductReference object is not part of a product's group tree and has no parent property; rather, it is owned by and has an unowned backpointer to its target.
-public final class ProductReference: Reference, BuildFileRepresentable
-{
+public final class ProductReference: Reference, BuildFileRepresentable {
     /// The name of this reference - primarily for debugging purposes.
     public let name: String
 
diff --git a/Sources/SWBCore/ProjectModel/Target.swift b/Sources/SWBCore/ProjectModel/Target.swift
index 1a79679a..5656f90f 100644
--- a/Sources/SWBCore/ProjectModel/Target.swift
+++ b/Sources/SWBCore/ProjectModel/Target.swift
@@ -58,7 +58,7 @@ public final class CustomTask: ProjectModelItem, Sendable {
             guard let keyAndValuePLs = environmentItemPL.arrayValue else {
                 throw PIFParsingError.incorrectTypeInArray(keyName: PIFKey_CustomTask_environment, objectType: Self.self, expectedType: "Array")
             }
-            guard keyAndValuePLs.count == 2 else  {
+            guard keyAndValuePLs.count == 2 else {
                 throw StubError.error("Expected a key/value pair when deserializing environment")
             }
             guard let key = keyAndValuePLs[0].stringValue, let value = keyAndValuePLs[1].stringValue else {
@@ -77,11 +77,9 @@ public final class CustomTask: ProjectModelItem, Sendable {
     }
 }
 
-
 // MARK: Target Dependency Info
 
-public final class TargetDependency: ProjectModelItem, Encodable, Sendable
-{
+public final class TargetDependency: ProjectModelItem, Encodable, Sendable {
     /// The GUID that maps back to the target GUID.
     public let guid: String
 
@@ -106,31 +104,36 @@ public final class TargetDependency: ProjectModelItem, Encodable, Sendable
     init(_ model: SWBProtocol.TargetDependency, _ pifLoader: PIFLoader) {
         self.guid = model.guid
         self.name = model.name
-        self.platformFilters = Set(model.platformFilters.map{ SWBCore.PlatformFilter($0, pifLoader) })
+        self.platformFilters = Set(model.platformFilters.map { SWBCore.PlatformFilter($0, pifLoader) })
     }
 
     init(fromDictionary pifDict: ProjectModelItemPIF, withPIFLoader pifLoader: PIFLoader) throws {
         // FIXME: Falling back to an empty string GUID does not seem correct, but this can happen for dependencies on targets from missing project references. Should we instead allow `guid` to be nil to represent this case?
         self.guid = try Self.parseOptionalValueForKeyAsString(PIFKey_guid, pifDict: pifDict) ?? ""
         self.name = try Self.parseOptionalValueForKeyAsString(PIFKey_name, pifDict: pifDict)
-        self.platformFilters = Set(try Self.parseOptionalValueForKeyAsArrayOfProjectModelItems(PIFKey_platformFilters, pifDict: pifDict, pifLoader: pifLoader, construct: {
-            try PlatformFilter(fromDictionary: $0, withPIFLoader: pifLoader)
-        }) ?? [])
+        self.platformFilters = Set(
+            try Self.parseOptionalValueForKeyAsArrayOfProjectModelItems(
+                PIFKey_platformFilters,
+                pifDict: pifDict,
+                pifLoader: pifLoader,
+                construct: {
+                    try PlatformFilter(fromDictionary: $0, withPIFLoader: pifLoader)
+                }
+            ) ?? []
+        )
     }
 }
 
-
 // MARK: Target abstract class
 
 /// The Target abstract class defines properties common to all types of targets.
-public class Target: ProjectModelItem, PIFObject, Hashable, Encodable, @unchecked Sendable
-{
+public class Target: ProjectModelItem, PIFObject, Hashable, Encodable, @unchecked Sendable {
     static func referencedObjects(for data: EncodedPIFValue) -> [PIFObjectReference] {
         return []
     }
 
     /// Parses a ProjectModelItemPIF dictionary as an object of the appropriate subclass of Target.
-    static func construct(from data: EncodedPIFValue, signature: PIFObject.Signature, loader: PIFLoader ) throws -> Self {
+    static func construct(from data: EncodedPIFValue, signature: PIFObject.Signature, loader: PIFLoader) throws -> Self {
         switch data {
         case .json(let data):
             return try construct(from: data, signature: signature, loader: loader)
@@ -169,7 +172,7 @@ public class Target: ProjectModelItem, PIFObject, Hashable, Encodable, @unchecke
     public let guid: String
 
     public let name: String
-    public var type: TargetType { preconditionFailure( "\(Swift.type(of: self)) should never be asked directly for its type" ) }
+    public var type: TargetType { preconditionFailure("\(Swift.type(of: self)) should never be asked directly for its type") }
     public let buildConfigurations: [BuildConfiguration]
 
     public let hasImpartedBuildProperties: Bool
@@ -201,9 +204,9 @@ public class Target: ProjectModelItem, PIFObject, Hashable, Encodable, @unchecke
         self.signature = signature
         self.guid = model.guid
         self.name = model.name
-        self.buildConfigurations = model.buildConfigurations.map{ BuildConfiguration($0, pifLoader) }
+        self.buildConfigurations = model.buildConfigurations.map { BuildConfiguration($0, pifLoader) }
         self.customTasks = model.customTasks.map { CustomTask($0, pifLoader) }
-        self.dependencies = model.dependencies.map{ TargetDependency($0, pifLoader) }
+        self.dependencies = model.dependencies.map { TargetDependency($0, pifLoader) }
         self.dynamicTargetVariantGuid = model.dynamicTargetVariantGuid
         self.approvedByUser = model.approvedByUser
         self.hasImpartedBuildProperties = buildConfigurations.filter { !$0.impartedBuildProperties.isEmpty }.isEmpty
@@ -233,9 +236,14 @@ public class Target: ProjectModelItem, PIFObject, Hashable, Encodable, @unchecke
         // The list of dependencies is required.
         //
         // The target dependencies are resolved lazily (see `TargetDependencyResolver`) since they may cross target (and even project) boundaries.
-        dependencies = try Self.parseValueForKeyAsArrayOfProjectModelItems(PIFKey_Target_dependencies, pifDict: pifDict, pifLoader: pifLoader, construct: {
-            return try TargetDependency(fromDictionary: $0, withPIFLoader: pifLoader)
-        })
+        dependencies = try Self.parseValueForKeyAsArrayOfProjectModelItems(
+            PIFKey_Target_dependencies,
+            pifDict: pifDict,
+            pifLoader: pifLoader,
+            construct: {
+                return try TargetDependency(fromDictionary: $0, withPIFLoader: pifLoader)
+            }
+        )
 
         dynamicTargetVariantGuid = try Self.parseOptionalValueForKeyAsString(PIFKey_Target_dynamicTargetVariantGuid, pifDict: pifDict)
         approvedByUser = try Self.parseValueForKeyAsBool(PIFKey_Target_approvedByUser, pifDict: pifDict, defaultValue: true)
@@ -245,8 +253,7 @@ public class Target: ProjectModelItem, PIFObject, Hashable, Encodable, @unchecke
     }
 
     /// Parses a ProjectModelItemPIF dictionary as an object of the appropriate subclass of Target.
-    static func construct(from data: ProjectModelItemPIF, signature: PIFObject.Signature, loader: PIFLoader ) throws -> Self
-    {
+    static func construct(from data: ProjectModelItemPIF, signature: PIFObject.Signature, loader: PIFLoader) throws -> Self {
         // Workaround inability to express protocol completely.
         func autocast<T>(_ some: Target) -> T {
             return some as! T
@@ -272,8 +279,7 @@ public class Target: ProjectModelItem, PIFObject, Hashable, Encodable, @unchecke
         }
     }
 
-    public var description: String
-    {
+    public var description: String {
         return "\(Swift.type(of: self))<\(guid):\(name)>"
     }
 
@@ -312,17 +318,15 @@ public class Target: ProjectModelItem, PIFObject, Hashable, Encodable, @unchecke
         hasher.combine(ObjectIdentifier(self))
     }
 
-    public static func ==(lhs: Target, rhs: Target) -> Bool {
+    public static func == (lhs: Target, rhs: Target) -> Bool {
         return lhs === rhs
     }
 }
 
 // MARK: BuildPhaseTarget class
 
-
 /// A BuildPhaseTarget is a kind of target which can contain build phases.
-public class BuildPhaseTarget: Target, @unchecked Sendable
-{
+public class BuildPhaseTarget: Target, @unchecked Sendable {
     /// List of build phases in the target.
     public let buildPhases: [BuildPhase]
 
@@ -336,7 +340,7 @@ public class BuildPhaseTarget: Target, @unchecked Sendable
     public let resourcesBuildPhase: ResourcesBuildPhase?
 
     init(_ model: SWBProtocol.BuildPhaseTarget, _ pifLoader: PIFLoader, signature: String) {
-        buildPhases = model.buildPhases.map{ BuildPhase.create($0, pifLoader) }
+        buildPhases = model.buildPhases.map { BuildPhase.create($0, pifLoader) }
         // Populate the convenience build phase properties.
         var warnings: [String] = []
         var sourcesBuildPhase: SourcesBuildPhase? = nil
@@ -345,28 +349,28 @@ public class BuildPhaseTarget: Target, @unchecked Sendable
         var resourcesBuildPhase: ResourcesBuildPhase? = nil
         for buildPhase in self.buildPhases {
             switch buildPhase {
-                case let sourcesPhase as SourcesBuildPhase:
-                    if sourcesBuildPhase != nil {
-                        warnings.append("target has multiple \(buildPhase.name) build phases, which may cause it to build incorrectly - all but one should be deleted")
-                    }
-                    sourcesBuildPhase = sourcesPhase
-                case let frameworksPhase as FrameworksBuildPhase:
-                    if frameworksBuildPhase != nil {
-                        warnings.append("target has multiple \(buildPhase.name) build phases, which may cause it to build incorrectly - all but one should be deleted")
-                    }
-                    frameworksBuildPhase = frameworksPhase
-                case let headersPhase as HeadersBuildPhase:
-                    if headersBuildPhase != nil {
-                        warnings.append("target has multiple \(buildPhase.name) build phases, which may cause it to build incorrectly - all but one should be deleted")
-                    }
-                    headersBuildPhase = headersPhase
-                case let resourcesPhase as ResourcesBuildPhase:
-                    if resourcesBuildPhase != nil {
-                        warnings.append("target has multiple \(buildPhase.name) build phases, which may cause it to build incorrectly - all but one should be deleted")
-                    }
-                    resourcesBuildPhase = resourcesPhase
-                default:
-                    break
+            case let sourcesPhase as SourcesBuildPhase:
+                if sourcesBuildPhase != nil {
+                    warnings.append("target has multiple \(buildPhase.name) build phases, which may cause it to build incorrectly - all but one should be deleted")
+                }
+                sourcesBuildPhase = sourcesPhase
+            case let frameworksPhase as FrameworksBuildPhase:
+                if frameworksBuildPhase != nil {
+                    warnings.append("target has multiple \(buildPhase.name) build phases, which may cause it to build incorrectly - all but one should be deleted")
+                }
+                frameworksBuildPhase = frameworksPhase
+            case let headersPhase as HeadersBuildPhase:
+                if headersBuildPhase != nil {
+                    warnings.append("target has multiple \(buildPhase.name) build phases, which may cause it to build incorrectly - all but one should be deleted")
+                }
+                headersBuildPhase = headersPhase
+            case let resourcesPhase as ResourcesBuildPhase:
+                if resourcesBuildPhase != nil {
+                    warnings.append("target has multiple \(buildPhase.name) build phases, which may cause it to build incorrectly - all but one should be deleted")
+                }
+                resourcesBuildPhase = resourcesPhase
+            default:
+                break
             }
         }
         self.sourcesBuildPhase = sourcesBuildPhase
@@ -376,8 +380,7 @@ public class BuildPhaseTarget: Target, @unchecked Sendable
         super.init(model, pifLoader, signature: signature, errors: [], warnings: warnings)
     }
 
-    @_spi(Testing) public override init(fromDictionary pifDict: ProjectModelItemPIF, signature: String, withPIFLoader pifLoader: PIFLoader, errors: [String] = [], warnings: [String] = []) throws
-    {
+    @_spi(Testing) public override init(fromDictionary pifDict: ProjectModelItemPIF, signature: String, withPIFLoader pifLoader: PIFLoader, errors: [String] = [], warnings: [String] = []) throws {
         // The list of build phases is required.
         buildPhases = try Self.parseValueForKeyAsArrayOfPropertyListItems(PIFKey_Target_buildPhases, pifDict: pifDict).map { plItem in
             guard case .plDict(let dictValue) = plItem else {
@@ -400,32 +403,31 @@ public class BuildPhaseTarget: Target, @unchecked Sendable
         var frameworksBuildPhase: FrameworksBuildPhase? = nil
         var headersBuildPhase: HeadersBuildPhase? = nil
         var resourcesBuildPhase: ResourcesBuildPhase? = nil
-        for buildPhase in self.buildPhases
-        {
+        for buildPhase in self.buildPhases {
             switch buildPhase
             {
-                case let sourcesPhase as SourcesBuildPhase:
-                    if sourcesBuildPhase != nil {
-                        newWarnings.append("target has multiple \(buildPhase.name) build phases, which may cause it to build incorrectly - all but one should be deleted")
-                    }
-                    sourcesBuildPhase = sourcesPhase
-                case let frameworksPhase as FrameworksBuildPhase:
-                    if frameworksBuildPhase != nil {
-                        newWarnings.append("target has multiple \(buildPhase.name) build phases, which may cause it to build incorrectly - all but one should be deleted")
-                    }
-                    frameworksBuildPhase = frameworksPhase
-                case let headersPhase as HeadersBuildPhase:
-                    if headersBuildPhase != nil {
-                        newWarnings.append("target has multiple \(buildPhase.name) build phases, which may cause it to build incorrectly - all but one should be deleted")
-                    }
-                    headersBuildPhase = headersPhase
-                case let resourcesPhase as ResourcesBuildPhase:
-                    if resourcesBuildPhase != nil {
-                        newWarnings.append("target has multiple \(buildPhase.name) build phases, which may cause it to build incorrectly - all but one should be deleted")
-                    }
-                    resourcesBuildPhase = resourcesPhase
-                default:
-                    break
+            case let sourcesPhase as SourcesBuildPhase:
+                if sourcesBuildPhase != nil {
+                    newWarnings.append("target has multiple \(buildPhase.name) build phases, which may cause it to build incorrectly - all but one should be deleted")
+                }
+                sourcesBuildPhase = sourcesPhase
+            case let frameworksPhase as FrameworksBuildPhase:
+                if frameworksBuildPhase != nil {
+                    newWarnings.append("target has multiple \(buildPhase.name) build phases, which may cause it to build incorrectly - all but one should be deleted")
+                }
+                frameworksBuildPhase = frameworksPhase
+            case let headersPhase as HeadersBuildPhase:
+                if headersBuildPhase != nil {
+                    newWarnings.append("target has multiple \(buildPhase.name) build phases, which may cause it to build incorrectly - all but one should be deleted")
+                }
+                headersBuildPhase = headersPhase
+            case let resourcesPhase as ResourcesBuildPhase:
+                if resourcesBuildPhase != nil {
+                    newWarnings.append("target has multiple \(buildPhase.name) build phases, which may cause it to build incorrectly - all but one should be deleted")
+                }
+                resourcesBuildPhase = resourcesPhase
+            default:
+                break
             }
         }
         self.sourcesBuildPhase = sourcesBuildPhase
@@ -437,16 +439,13 @@ public class BuildPhaseTarget: Target, @unchecked Sendable
     }
 }
 
-
 // MARK: StandardTarget class
 
-
 /// Source data needed to compute provisioning task inputs for a target+configuration pair.
 public typealias ProvisioningSourceData = SWBProtocol.ProvisioningSourceData
 
 /// A StandardTarget is the most common type of target: A target which has build phases describing its input files, and which generates a product.
-public final class StandardTarget: BuildPhaseTarget, @unchecked Sendable
-{
+public final class StandardTarget: BuildPhaseTarget, @unchecked Sendable {
     public enum SourceCodeLanguage: CustomStringConvertible, Sendable {
         case undefined
         case swift
@@ -511,7 +510,7 @@ public final class StandardTarget: BuildPhaseTarget, @unchecked Sendable
     }
 
     init(_ model: SWBProtocol.StandardTarget, _ pifLoader: PIFLoader, signature: String) throws {
-        buildRules = model.buildRules.map{ BuildRule($0, pifLoader) }
+        buildRules = model.buildRules.map { BuildRule($0, pifLoader) }
         productTypeIdentifier = model.productTypeIdentifier
         productReference = try ProductReference(model.productReference, pifLoader)
         isPackageTarget = model.isPackageTarget
@@ -528,8 +527,7 @@ public final class StandardTarget: BuildPhaseTarget, @unchecked Sendable
         _provisioningSourceData.initialize(to: provisioningSourceData)
     }
 
-    @_spi(Testing) public override init(fromDictionary pifDict: ProjectModelItemPIF, signature: String, withPIFLoader pifLoader: PIFLoader, errors: [String] = [], warnings: [String] = []) throws
-    {
+    @_spi(Testing) public override init(fromDictionary pifDict: ProjectModelItemPIF, signature: String, withPIFLoader pifLoader: PIFLoader, errors: [String] = [], warnings: [String] = []) throws {
         // The product type identifier is required.
         productTypeIdentifier = try Self.parseValueForKeyAsString(PIFKey_Target_productTypeIdentifier, pifDict: pifDict)
 
@@ -580,8 +578,7 @@ public final class StandardTarget: BuildPhaseTarget, @unchecked Sendable
             foundConfigurationNames.insert(sourceData.configurationName)
         }
         // If any configurations didn't have provisioning source data objects, then create default ones for those configurations.
-        for configurationName in configurationNames
-        {
+        for configurationName in configurationNames {
             let sourceData = ProvisioningSourceData(configurationName: configurationName, provisioningStyle: .automatic, bundleIdentifierFromInfoPlist: "")
             provisioningSourceData.append(sourceData)
         }
@@ -605,28 +602,21 @@ public final class StandardTarget: BuildPhaseTarget, @unchecked Sendable
     }
 }
 
-
 // MARK: AggregateTarget class
 
-
 /// An AggregateTarget is a special kind of target primarily intended to group together other targets it depends on, and which does not have a defined product.  However, it may also have build phases, which will be run after all of its dependencies have finished building.
-public final class AggregateTarget: BuildPhaseTarget, @unchecked Sendable
-{
+public final class AggregateTarget: BuildPhaseTarget, @unchecked Sendable {
     public override var type: TargetType { return TargetType.aggregate }
 }
 
-
-
 // MARK: PackageProductTarget class
 
-
 /// A PackageProductTarget is a custom target used by the Swift package manager to encapsulate the semantics of products.
 ///
 /// This target is currently only expected to have target dependencies and an optional frameworks build phase, which should reference other (static library) targets package product targets.
 ///
 /// The behavior of this target is "as if" the dependencies of the package pass through to downstream things which link the target.
-public final class PackageProductTarget: Target, @unchecked Sendable
-{
+public final class PackageProductTarget: Target, @unchecked Sendable {
     public override var type: TargetType { return TargetType.packageProduct }
 
     /// The frameworks build phase which encodes the link dependencies.
@@ -636,7 +626,7 @@ public final class PackageProductTarget: Target, @unchecked Sendable
     public let productReference: ProductReference
 
     init(_ model: SWBProtocol.PackageProductTarget, _ pifLoader: PIFLoader, signature: String) {
-        self.frameworksBuildPhase = model.frameworksBuildPhase.map{ BuildPhase.create($0, pifLoader) as! FrameworksBuildPhase }
+        self.frameworksBuildPhase = model.frameworksBuildPhase.map { BuildPhase.create($0, pifLoader) as! FrameworksBuildPhase }
         self.productReference = ProductReference(guid: "\(model.guid):ProductReference", name: model.name)
         super.init(model, pifLoader, signature: signature)
         self.productReference.target = self
@@ -651,13 +641,10 @@ public final class PackageProductTarget: Target, @unchecked Sendable
     }
 }
 
-
 // MARK: ExternalTarget class
 
-
 /// An ExternalTarget represents the use of an external build system (most commonly, but not limited to, make).  It is very different from other kinds of targets in that it has no build phases, and does have a defined product.
-public final class ExternalTarget: Target, @unchecked Sendable
-{
+public final class ExternalTarget: Target, @unchecked Sendable {
     public override var type: TargetType { return TargetType.external }
     public let toolPath: MacroStringExpression
     public let arguments: MacroStringListExpression
@@ -672,8 +659,7 @@ public final class ExternalTarget: Target, @unchecked Sendable
         super.init(model, pifLoader, signature: signature)
     }
 
-    @_spi(Testing) public override init(fromDictionary pifDict: ProjectModelItemPIF, signature: String, withPIFLoader pifLoader: PIFLoader, errors: [String] = [], warnings: [String] = []) throws
-    {
+    @_spi(Testing) public override init(fromDictionary pifDict: ProjectModelItemPIF, signature: String, withPIFLoader pifLoader: PIFLoader, errors: [String] = [], warnings: [String] = []) throws {
         // The tool path is required.
         toolPath = try pifLoader.userNamespace.parseString(Self.parseValueForKeyAsString(PIFKey_ExternalTarget_toolPath, pifDict: pifDict))
 
diff --git a/Sources/SWBCore/ProjectModel/Workspace.swift b/Sources/SWBCore/ProjectModel/Workspace.swift
index f2c68c93..24d6bc7a 100644
--- a/Sources/SWBCore/ProjectModel/Workspace.swift
+++ b/Sources/SWBCore/ProjectModel/Workspace.swift
@@ -55,14 +55,13 @@ extension WorkspaceErrors: CustomStringConvertible {
     }
 }
 
-public final class Workspace: ProjectModelItem, PIFObject, ReferenceLookupContext, Encodable
-{
+public final class Workspace: ProjectModelItem, PIFObject, ReferenceLookupContext, Encodable {
     static func referencedObjects(for data: EncodedPIFValue) throws -> [PIFObjectReference] {
         switch data {
         case .json(let data):
             // The only direct references are to projects.
             guard case let .plArray(projects)? = data["projects"] else { return [] }
-            return projects.compactMap{
+            return projects.compactMap {
                 guard case let .plString(signature) = $0 else { return nil }
                 return PIFObjectReference(signature: signature, type: .project)
             }
@@ -73,7 +72,7 @@ public final class Workspace: ProjectModelItem, PIFObject, ReferenceLookupContex
             // FIXME: This sucks, we are doing the protocol decode twice: <rdar://problem/31097863> Don't require duplicate binary PIF decode in incremental PIF transfer
             let deserializer = MsgPackDeserializer(data)
             let model: SWBProtocol.Workspace = try deserializer.deserialize()
-            return model.projectSignatures.map{ PIFObjectReference(signature: $0, type: .project) }
+            return model.projectSignatures.map { PIFObjectReference(signature: $0, type: .project) }
         }
     }
 
@@ -147,7 +146,7 @@ public final class Workspace: ProjectModelItem, PIFObject, ReferenceLookupContex
         self.guid = model.guid
         self.name = model.name
         self.path = model.path
-        self.projects = try model.projectSignatures.map{ try pifLoader.loadReference(signature: $0, type: Project.self) }
+        self.projects = try model.projectSignatures.map { try pifLoader.loadReference(signature: $0, type: Project.self) }
 
         // The PIFLoader creates the user namespace which is used during loading, but the workspace ultimately owns it.
         self.userNamespace = pifLoader.userNamespace
@@ -180,8 +179,7 @@ public final class Workspace: ProjectModelItem, PIFObject, ReferenceLookupContex
     }
 
     /// Create the workspace from a PIF property list.
-    @_spi(Testing) public init(fromDictionary pifDict: ProjectModelItemPIF, signature: String, withPIFLoader pifLoader: PIFLoader) throws
-    {
+    @_spi(Testing) public init(fromDictionary pifDict: ProjectModelItemPIF, signature: String, withPIFLoader pifLoader: PIFLoader) throws {
         self.signature = signature
 
         // The PIFLoader creates the user namespace which is used during loading, but the workspace ultimately owns it.
@@ -227,7 +225,7 @@ public final class Workspace: ProjectModelItem, PIFObject, ReferenceLookupContex
     ///
     /// The targets will appear in the order they are within each nested project.
     public var allTargets: AnySequence<Target> {
-        return AnySequence(projects.lazy.flatMap{ $0.targets })
+        return AnySequence(projects.lazy.flatMap { $0.targets })
     }
 
     /// Find project with the given project GUID.
@@ -255,8 +253,10 @@ public final class Workspace: ProjectModelItem, PIFObject, ReferenceLookupContex
     ///
     /// - Precondition: workspace.contains(target)
     public func project(for target: Target) -> Project {
-        guard let project = projectsByTarget[target]
-                ?? (self.target(for: target.guid).map({ projectsByTarget[$0] }) ?? nil) else {
+        guard
+            let project = projectsByTarget[target]
+                ?? (self.target(for: target.guid).map({ projectsByTarget[$0] }) ?? nil)
+        else {
             preconditionFailure("workspace '\(name)' does not contain target '\(target.name)'")
         }
         return project
@@ -326,7 +326,7 @@ public final class Workspace: ProjectModelItem, PIFObject, ReferenceLookupContex
     /// Resolve the reference for the given GUID.
     //
     // FIXME: This is fairly unfortunate, from a performance perspective, we could have pre-bound these things at load time; except that we reuse loaded objects during incremental PIF loading, so we need to guarantee that they are self-contained and don't contain external references. For now, we manage this by deferring the lookup until runtime. See:
-    public func lookupReference(for guid: String ) -> Reference? {
+    public func lookupReference(for guid: String) -> Reference? {
         return referencesByGUID[guid]
     }
 
@@ -349,16 +349,12 @@ public final class Workspace: ProjectModelItem, PIFObject, ReferenceLookupContex
     }
 }
 
-
-extension Workspace: CustomStringConvertible
-{
-    public var description: String
-    {
+extension Workspace: CustomStringConvertible {
+    public var description: String {
         return "\(type(of: self))<\(guid):\(name):\(path.str):\(projects.count) projects>"
     }
 }
 
-
 public struct WorkspaceDiff: CustomStringConvertible, Sendable {
     public var leftProjects: [Project] = []
     public var rightProjects: [Project] = []
@@ -370,25 +366,20 @@ public struct WorkspaceDiff: CustomStringConvertible, Sendable {
     public var rightReferences: [Reference] = []
 
     public var hasChanges: Bool {
-        return !leftProjects.isEmpty ||
-            !rightProjects.isEmpty ||
-            !leftTargets.isEmpty ||
-            !rightTargets.isEmpty ||
-            !leftReferences.isEmpty ||
-            !rightReferences.isEmpty
+        return !leftProjects.isEmpty || !rightProjects.isEmpty || !leftTargets.isEmpty || !rightTargets.isEmpty || !leftReferences.isEmpty || !rightReferences.isEmpty
     }
 
     public var description: String {
         return """
-        \(type(of: self))<
-            leftProjects: \(leftProjects),
-            rightProjects: \(rightProjects),
-            leftTargets: \(leftTargets),
-            rightTargets: \(rightTargets),
-            leftReferences: \(leftReferences),
-            rightReferences: \(rightReferences)
-        >
-        """
+            \(type(of: self))<
+                leftProjects: \(leftProjects),
+                rightProjects: \(rightProjects),
+                leftTargets: \(leftTargets),
+                rightTargets: \(rightTargets),
+                leftReferences: \(leftReferences),
+                rightReferences: \(rightReferences)
+            >
+            """
     }
 }
 
diff --git a/Sources/SWBCore/ProjectModel/WorkspaceHeaderIndex.swift b/Sources/SWBCore/ProjectModel/WorkspaceHeaderIndex.swift
index ab4dd792..ff13bb7f 100644
--- a/Sources/SWBCore/ProjectModel/WorkspaceHeaderIndex.swift
+++ b/Sources/SWBCore/ProjectModel/WorkspaceHeaderIndex.swift
@@ -24,9 +24,11 @@ public final class WorkspaceHeaderIndex: Sendable {
 
     /// Construct the header index for a workspace.
     @_spi(Testing) public init(core: Core, workspace: Workspace) async {
-        self.projectHeaderInfo = await Dictionary(uniqueKeysWithValues: workspace.projects.concurrentMap(maximumParallelism: 10) { project in
-            await (project, ProjectHeaderInfo(core, project, workspace))
-        })
+        self.projectHeaderInfo = await Dictionary(
+            uniqueKeysWithValues: workspace.projects.concurrentMap(maximumParallelism: 10) { project in
+                await (project, ProjectHeaderInfo(core, project, workspace))
+            }
+        )
     }
 }
 
@@ -90,7 +92,6 @@ public struct ProjectHeaderInfo: Sendable {
             }
         }
 
-
         // Construct the set of known header files.
         let knownHeaders = {
             var knownHeaders = OrderedSet<FileReference>()
@@ -100,12 +101,17 @@ public struct ProjectHeaderInfo: Sendable {
         self.knownHeaders = knownHeaders
 
         // Collect the per target information.
-        self.targetHeaderInfo = await Dictionary(uniqueKeysWithValues: project.targets.concurrentMap(maximumParallelism: 100, { target -> (BuildPhaseTarget, TargetHeaderInfo)? in
-            if case let target as BuildPhaseTarget = target, let headerInfo = TargetHeaderInfo(target, knownHeaders, workspace) {
-                return (target, headerInfo)
-            }
-            return nil
-        }).compactMap { $0 })
+        self.targetHeaderInfo = await Dictionary(
+            uniqueKeysWithValues: project.targets.concurrentMap(
+                maximumParallelism: 100,
+                { target -> (BuildPhaseTarget, TargetHeaderInfo)? in
+                    if case let target as BuildPhaseTarget = target, let headerInfo = TargetHeaderInfo(target, knownHeaders, workspace) {
+                        return (target, headerInfo)
+                    }
+                    return nil
+                }
+            ).compactMap { $0 }
+        )
     }
 }
 
@@ -137,8 +143,9 @@ public struct TargetHeaderInfo: Sendable {
         for buildFile in headersPhase.buildFiles {
             // Ignore non-file references.
             guard case let .reference(guid) = buildFile.buildableItem,
-                  let reference = workspace.lookupReference(for: guid),
-                  let fileRef = reference as? FileReference else { continue }
+                let reference = workspace.lookupReference(for: guid),
+                let fileRef = reference as? FileReference
+            else { continue }
 
             // If we don't have any entry for the target, ignore it.
             //
@@ -160,11 +167,11 @@ public struct TargetHeaderInfo: Sendable {
     }
 
     public struct HeaderDestDirs {
-        public let publicPath : Path
-        public let privatePath : Path
-        public let basePath : Path
+        public let publicPath: Path
+        public let privatePath: Path
+        public let basePath: Path
 
-        public init(publicPath: Path, privatePath: Path, basePath: Path ) {
+        public init(publicPath: Path, privatePath: Path, basePath: Path) {
             self.publicPath = publicPath
             self.privatePath = privatePath
             self.basePath = basePath
@@ -180,9 +187,11 @@ public struct TargetHeaderInfo: Sendable {
         let publicHeadersPath = scope.evaluate(BuiltinMacros.PUBLIC_HEADERS_FOLDER_PATH)
         let privateHeadersPath = scope.evaluate(BuiltinMacros.PRIVATE_HEADERS_FOLDER_PATH)
 
-        return HeaderDestDirs(publicPath: wrapperPath.join(publicHeadersPath.basename),
-                              privatePath: wrapperPath.join(privateHeadersPath.basename),
-                              basePath: wrapperPath)
+        return HeaderDestDirs(
+            publicPath: wrapperPath.join(publicHeadersPath.basename),
+            privatePath: wrapperPath.join(privateHeadersPath.basename),
+            basePath: wrapperPath
+        )
     }
 
     /// Utility method that generates the destination dir path for a given visibility. Returns `nil` if the path does not exist for that visibility.
diff --git a/Sources/SWBCore/Provisioning.swift b/Sources/SWBCore/Provisioning.swift
index aba0c0c9..f89864f6 100644
--- a/Sources/SWBCore/Provisioning.swift
+++ b/Sources/SWBCore/Provisioning.swift
@@ -38,7 +38,6 @@ public func computeBundleIdentifier(from scope: MacroEvaluationScope, bundleIden
     return scope.evaluate(bundleIdentifierFromInfoPlist, lookup: nil)
 }
 
-
 /// Compute the identifier of the signing certificate to use.
 ///
 /// - Parameters:
@@ -47,12 +46,11 @@ public func computeBundleIdentifier(from scope: MacroEvaluationScope, bundleIden
 /// - Returns: The signing certificate identifier to use.
 public func computeSigningCertificateIdentifier(from scope: MacroEvaluationScope, platform: Platform?) -> String {
     if platform?.isSimulator == true {
-        return "-" // always Ad-hoc sign for simulator even if CODE_SIGN_IDENTITY has been overridden
+        return "-"  // always Ad-hoc sign for simulator even if CODE_SIGN_IDENTITY has been overridden
     }
     return scope.evaluate(BuiltinMacros.CODE_SIGN_IDENTITY)
 }
 
-
 /// Determine the path for entitlements to use for code signing.
 ///
 /// - Parameters:
diff --git a/Sources/SWBCore/ProvisioningTaskInputs.swift b/Sources/SWBCore/ProvisioningTaskInputs.swift
index 827ff7ce..42cbaf42 100644
--- a/Sources/SWBCore/ProvisioningTaskInputs.swift
+++ b/Sources/SWBCore/ProvisioningTaskInputs.swift
@@ -15,8 +15,7 @@ public import SWBUtil
 // FIXME: Should we add some general mechanism for representing NSErrors in Swift Build?  If so, we should also add a general transport structure to send it over the message pipe.
 //
 /// An error from computation of provisioning task inputs.
-public struct ProvisioningTaskInputError: Codable, Hashable, Sendable
-{
+public struct ProvisioningTaskInputError: Codable, Hashable, Sendable {
     public let description: String
     public let recoverySuggestion: String?
 }
@@ -29,8 +28,7 @@ public struct ProvisioningTaskInputError: Codable, Hashable, Sendable
 /// 2. Ad-hoc signed.
 /// 3. Signed with a profile.
 /// 4. Signed without a profile.
-public struct ProvisioningTaskInputs: Codable, Hashable, Sendable
-{
+public struct ProvisioningTaskInputs: Codable, Hashable, Sendable {
     /// The SHA1 hash of the signing certificate, suitable for passing to the `codesign` tool.
     ///
     /// If this is nil, then `identityName`, `profileName`, `profileUUID` and `designatedRequirements` will all also be nil.
@@ -72,8 +70,7 @@ public struct ProvisioningTaskInputs: Codable, Hashable, Sendable
     /// Any warnings here should be presented to the user, but signing may still proceed.
     public let warnings: [String]
 
-    public init(identityHash: String? = nil, identitySerialNumber: String? = nil, identityName: String? = nil, profileName: String? = nil, profileUUID: String? = nil, profilePath: Path? = nil, designatedRequirements: String? = nil, signedEntitlements: PropertyListItem = .plDict([:]), simulatedEntitlements: PropertyListItem = .plDict([:]), appIdentifierPrefix: String? = nil, teamIdentifierPrefix: String? = nil, isEnterpriseTeam: Bool? = false, useSigningTool: Bool? = false, signingToolKeyPath: String? = nil, signingToolKeyID: String? = nil, signingToolKeyIssuerID: String? = nil, keychainPath: String? = nil, errors: [[String: String]] = [], warnings: [String] = [])
-    {
+    public init(identityHash: String? = nil, identitySerialNumber: String? = nil, identityName: String? = nil, profileName: String? = nil, profileUUID: String? = nil, profilePath: Path? = nil, designatedRequirements: String? = nil, signedEntitlements: PropertyListItem = .plDict([:]), simulatedEntitlements: PropertyListItem = .plDict([:]), appIdentifierPrefix: String? = nil, teamIdentifierPrefix: String? = nil, isEnterpriseTeam: Bool? = false, useSigningTool: Bool? = false, signingToolKeyPath: String? = nil, signingToolKeyID: String? = nil, signingToolKeyIssuerID: String? = nil, keychainPath: String? = nil, errors: [[String: String]] = [], warnings: [String] = []) {
         self.identityHash = identityHash
         self.identitySerialNumber = identitySerialNumber
         self.identityName = identityName
diff --git a/Sources/SWBCore/SDKRegistry.swift b/Sources/SWBCore/SDKRegistry.swift
index 29f1596f..312f0d42 100644
--- a/Sources/SWBCore/SDKRegistry.swift
+++ b/Sources/SWBCore/SDKRegistry.swift
@@ -51,8 +51,7 @@ public final class SDK: Sendable {
                 baseAndVersion = sdkCanonicalName.withoutSuffix(".\(supportedSuffix)")
                 suffix = supportedSuffix
                 break
-            }
-            else if sdkCanonicalName.hasSuffix(supportedSuffix) {
+            } else if sdkCanonicalName.hasSuffix(supportedSuffix) {
                 baseAndVersion = sdkCanonicalName.withoutSuffix(supportedSuffix)
                 suffix = supportedSuffix
                 break
@@ -148,7 +147,7 @@ public final class SDK: Sendable {
     public let librarySearchPaths: [Path]
 
     /// Provides the platform version mapping when working with macCatalyst and macOS variants.
-    public let versionMap: [String:[Version:Version]]
+    public let versionMap: [String: [Version: Version]]
 
     /// The SDK-specific directory macros.
     let directoryMacros: [StringMacroDeclaration]
@@ -167,7 +166,7 @@ public final class SDK: Sendable {
     /// Note that this is technically "broken" for macOS, as the third version component in practice is more like a minor version, and macOS does not have true patch versions, but we'll respect the value in the SDK as-is for now.
     @_spi(Testing) public let maximumDeploymentTarget: Version?
 
-    init(_ canonicalName: String, canonicalNameComponents: CanonicalNameComponents?, _ aliases: Set<String>, _ cohortPlatforms: [String], _ displayName: String, _ path: Path, _ version: Version?, _ productBuildVersion: String?, _ defaultSettings: [String: PropertyListItem], _ overrideSettings: [String: PropertyListItem], _ variants: [String: SDKVariant], _ defaultDeploymentTarget: Version?, _ defaultVariant: SDKVariant?, _ searchPaths: (header: [Path], framework: [Path], library: [Path]), _ directoryMacros: [StringMacroDeclaration], _ isBaseSDK: Bool, _ fallbackSettingConditionValues: [String], _ toolchains: [String], _ versionMap: [String:[Version:Version]], _ maximumDeploymentTarget: Version?) {
+    init(_ canonicalName: String, canonicalNameComponents: CanonicalNameComponents?, _ aliases: Set<String>, _ cohortPlatforms: [String], _ displayName: String, _ path: Path, _ version: Version?, _ productBuildVersion: String?, _ defaultSettings: [String: PropertyListItem], _ overrideSettings: [String: PropertyListItem], _ variants: [String: SDKVariant], _ defaultDeploymentTarget: Version?, _ defaultVariant: SDKVariant?, _ searchPaths: (header: [Path], framework: [Path], library: [Path]), _ directoryMacros: [StringMacroDeclaration], _ isBaseSDK: Bool, _ fallbackSettingConditionValues: [String], _ toolchains: [String], _ versionMap: [String: [Version: Version]], _ maximumDeploymentTarget: Version?) {
         self.canonicalName = canonicalName
         self.canonicalNameComponents = canonicalNameComponents
         self.aliases = aliases
@@ -338,8 +337,7 @@ public final class SDKVariant: PlatformInfoProvider, Sendable {
         // Additional settings for the SDK variants.  In general these should be moved into the variant settings in SDKSettings.plist when possible.
         if name == MacCatalystInfo.sdkVariantName {
             modifiedSettings["IS_MACCATALYST"] = .plString("YES")
-        }
-        else if name == "macos" {
+        } else if name == "macos" {
             // Also set IS_MACCATALYST explicitly for the 'macos' variant, to make build setting interpolation easier.
             modifiedSettings["IS_MACCATALYST"] = .plString("NO")
         }
@@ -363,17 +361,14 @@ public final class SDKVariant: PlatformInfoProvider, Sendable {
         if let min = minimumDeploymentTarget, let max = maximumDeploymentTarget {
             do {
                 deploymentTargetRange = try VersionRange(start: min, end: max)
-            }
-            catch {
+            } catch {
                 // ignore error for now (same as in Platform.deploymentTargetsCache)
                 deploymentTargetRange = VersionRange()
             }
-        }
-        else {
+        } else {
             deploymentTargetRange = VersionRange()
         }
 
-
         var validDeploymentTargets = [Version]()
         for deploymentTarget in supportedTargetDict["ValidDeploymentTargets"]?.arrayValue ?? [] {
             if let value = try? Version(deploymentTarget.stringValue ?? "") {
@@ -407,16 +402,18 @@ public final class SDKVariant: PlatformInfoProvider, Sendable {
         self.minimumOSForSwiftConcurrency = try (supportedTargetDict["SwiftConcurrencyMinimumDeploymentTarget"]?.stringValue ?? concurrency).map { try Version($0) }
         self.minimumOSForSwiftSpan = try (supportedTargetDict["SwiftSpanMinimumDeploymentTarget"]?.stringValue ?? span).map { try Version($0) }
 
-        self.systemPrefix = supportedTargetDict["SystemPrefix"]?.stringValue ?? {
-            switch name {
-            case MacCatalystInfo.sdkVariantName:
-                return "/System/iOSSupport"
-            case "driverkit":
-                return "/System/DriverKit"
-            default:
-                return ""
-            }
-        }()
+        self.systemPrefix =
+            supportedTargetDict["SystemPrefix"]?.stringValue
+            ?? {
+                switch name {
+                case MacCatalystInfo.sdkVariantName:
+                    return "/System/iOSSupport"
+                case "driverkit":
+                    return "/System/DriverKit"
+                default:
+                    return ""
+                }
+            }()
     }
 
     private static func fallbackDeviceFamiliesData(variantName name: String) throws -> PropertyListItem {
@@ -439,7 +436,7 @@ public final class SDKVariant: PlatformInfoProvider, Sendable {
                     "Identifier": .plInt(6),
                     "Name": .plString("mac"),
                     "DisplayName": .plString("Mac"),
-                ])
+                ]),
             ])
         default:
             // Other platforms don't have device families
@@ -467,7 +464,7 @@ public final class SDKVariant: PlatformInfoProvider, Sendable {
 
     private static func fallbackRecommendedDeploymentTarget(variantName name: String) -> String? {
         switch name {
-            // Late Summer 2019 aligned, except iOS which got one final 12.x update in Winter 2020, making this version set the last minor update series of the Fall 2018 aligned releases.
+        // Late Summer 2019 aligned, except iOS which got one final 12.x update in Winter 2020, making this version set the last minor update series of the Fall 2018 aligned releases.
         case "macos", "macosx":
             return "10.14.6"
         case "iphoneos", "iphonesimulator":
@@ -477,7 +474,7 @@ public final class SDKVariant: PlatformInfoProvider, Sendable {
         case "watchos", "watchsimulator":
             return "5.3"
 
-            // No Summer 2019 aligned versions since these were first introduced on or after Fall 2019, so simply use the minimum versions.
+        // No Summer 2019 aligned versions since these were first introduced on or after Fall 2019, so simply use the minimum versions.
         case "driverkit":
             return "19.0"
         case MacCatalystInfo.sdkVariantName:
@@ -485,7 +482,7 @@ public final class SDKVariant: PlatformInfoProvider, Sendable {
         case "xros", "xrsimulator":
             return "1.0"
 
-            // Fall back to the default deployment target, which is equal to the SDK version.
+        // Fall back to the default deployment target, which is equal to the SDK version.
         default:
             return nil
         }
@@ -631,14 +628,16 @@ public final class SDKRegistry: SDKRegistryLookup, CustomStringConvertible, Send
     private func registerSDKsInDirectory(_ path: Path, _ platform: Platform?) {
         guard let pathResolved = try? localFS.realpath(path) else { return }
         guard let contents = try? localFS.listdir(path) else { return }
-        guard let sdkPaths: [(sdkPath: Path, sdkPathResolved: Path)] = try? (contents.filter { $0.hasSuffix(".sdk") }.sorted(by: <).map { path.join($0) }.map{ ($0, try localFS.realpath($0)) }) else { return }
+        guard let sdkPaths: [(sdkPath: Path, sdkPathResolved: Path)] = try? (contents.filter { $0.hasSuffix(".sdk") }.sorted(by: <).map { path.join($0) }.map { ($0, try localFS.realpath($0)) }) else { return }
 
         // If you have SDKs A and L in the same directory, where L is a symlink to A, we'll ignore A and register L.
-        let sdkNamesTargetedByLinks = Set(sdkPaths.compactMap { (sdkPath, sdkPathResolved) -> String? in
-            guard localFS.isSymlink(sdkPath) else { return nil }
-            guard sdkPathResolved.dirname == pathResolved else { return nil }
-            return sdkPathResolved.basename
-        })
+        let sdkNamesTargetedByLinks = Set(
+            sdkPaths.compactMap { (sdkPath, sdkPathResolved) -> String? in
+                guard localFS.isSymlink(sdkPath) else { return nil }
+                guard sdkPathResolved.dirname == pathResolved else { return nil }
+                return sdkPathResolved.basename
+            }
+        )
 
         for (sdkPath, sdkPathResolved) in sdkPaths {
             guard !sdkNamesTargetedByLinks.contains(sdkPath.basename) else { continue }
@@ -722,7 +721,8 @@ public final class SDKRegistry: SDKRegistryLookup, CustomStringConvertible, Send
             displayName = value
         }
 
-        let isBaseSDK = items["IsBaseSDK"]?.looselyTypedBoolValue
+        let isBaseSDK =
+            items["IsBaseSDK"]?.looselyTypedBoolValue
             ?? items["isBaseSDK"]?.looselyTypedBoolValue
             ?? false
 
@@ -736,8 +736,7 @@ public final class SDKRegistry: SDKRegistryLookup, CustomStringConvertible, Send
                     var keyIsAllowed = true
                     if SDKRegistry.ignoredSparseSdkSettingKeys.contains(key) {
                         keyIsAllowed = false
-                    }
-                    else {
+                    } else {
                         for suffix in SDKRegistry.ignoredSparseSdkSettingKeySuffixes {
                             if key.hasSuffix(suffix) {
                                 keyIsAllowed = false
@@ -770,14 +769,14 @@ public final class SDKRegistry: SDKRegistryLookup, CustomStringConvertible, Send
         var defaultSettings: [String: PropertyListItem] = [:]
         if case .plDict(let settingsItems)? = items["DefaultProperties"] {
             defaultSettings = filteredSettings(settingsItems)
-                .filter { $0.key != "TEST_FRAMEWORK_DEVELOPER_VARIANT_SUBPATH" } // rdar://107954685 (Remove watchOS special case for testing framework paths)
+                .filter { $0.key != "TEST_FRAMEWORK_DEVELOPER_VARIANT_SUBPATH" }  // rdar://107954685 (Remove watchOS special case for testing framework paths)
         }
 
         // Parse the custom properties settings.
         var overrideSettings: [String: PropertyListItem] = [:]
         if case .plDict(let settingsItems)? = items["CustomProperties"] {
             overrideSettings = filteredSettings(settingsItems)
-                .filter { !$0.key.hasPrefix("SWIFT_MODULE_ONLY_") } // Rev-lock: don't set SWIFT_MODULE_ONLY_ in SDKs
+                .filter { !$0.key.hasPrefix("SWIFT_MODULE_ONLY_") }  // Rev-lock: don't set SWIFT_MODULE_ONLY_ in SDKs
         }
 
         // Parse the Variants array and the SupportedTargets dictionary, then create the SDKVariant objects from them.  Note that it is not guaranteed that any variant will have both sets of data, so we don't the presence of either one.
@@ -835,8 +834,7 @@ public final class SDKRegistry: SDKRegistryLookup, CustomStringConvertible, Send
                 let supportedTargetDict: [String: PropertyListItem]
                 if case .plDict(let dict) = plist {
                     supportedTargetDict = dict
-                }
-                else {
+                } else {
                     supportedTargetDict = [:]
                 }
 
@@ -892,7 +890,7 @@ public final class SDKRegistry: SDKRegistryLookup, CustomStringConvertible, Send
                 let searchPath = path.join(str)
                 guard localFS.exists(searchPath), localFS.isDirectory(searchPath) else {
                     // FIXME: <rdar://problem/34170562> Re-enable this when we want to warn about search paths an SDK declares which do not exist.
-//                    delegate.warning(path, "header search path does not exist: \(searchPath.str)")
+                    //                    delegate.warning(path, "header search path does not exist: \(searchPath.str)")
                     continue
                 }
                 headerSearchPaths.append(searchPath)
@@ -905,7 +903,7 @@ public final class SDKRegistry: SDKRegistryLookup, CustomStringConvertible, Send
                 let searchPath = path.join(str)
                 guard localFS.exists(searchPath), localFS.isDirectory(searchPath) else {
                     // FIXME: <rdar://problem/34170562> Re-enable this when we want to warn about search paths an SDK declares which do not exist.
-//                    delegate.warning(path, "framework search path does not exist: \(searchPath.str)")
+                    //                    delegate.warning(path, "framework search path does not exist: \(searchPath.str)")
                     continue
                 }
                 frameworkSearchPaths.append(searchPath)
@@ -918,7 +916,7 @@ public final class SDKRegistry: SDKRegistryLookup, CustomStringConvertible, Send
                 let searchPath = path.join(str)
                 guard localFS.exists(searchPath), localFS.isDirectory(searchPath) else {
                     // FIXME: <rdar://problem/34170562> Re-enable this when we want to warn about search paths an SDK declares which do not exist.
-//                    delegate.warning(path, "library search path does not exist: \(searchPath.str)")
+                    //                    delegate.warning(path, "library search path does not exist: \(searchPath.str)")
                     continue
                 }
                 librarySearchPaths.append(searchPath)
@@ -938,8 +936,7 @@ public final class SDKRegistry: SDKRegistryLookup, CustomStringConvertible, Send
         if case .plString(let versionString)? = items["Version"] {
             do {
                 version = try Version(versionString)
-            }
-            catch {
+            } catch {
                 delegate.error(path, "invalid 'Version' field: \(error)")
                 return nil
             }
@@ -966,15 +963,14 @@ public final class SDKRegistry: SDKRegistryLookup, CustomStringConvertible, Send
             }
         }
 
-        var versionMap: [String:[Version:Version]] = [:]
+        var versionMap: [String: [Version: Version]] = [:]
         if case .plDict(let container)? = items["VersionMap"] {
             for (key, dict) in container {
-                var mappings: [Version:Version] = [:]
+                var mappings: [Version: Version] = [:]
                 for (from, to) in dict.dictValue ?? [:] {
                     do {
                         mappings[try Version(from)] = try Version(to.stringValue ?? "")
-                    }
-                    catch {
+                    } catch {
                         delegate.warning("Unable to create version map for '\(key)' mapping '\(from)' to '\(to)' for SDK '\(displayName)'.")
                     }
                 }
@@ -998,8 +994,7 @@ public final class SDKRegistry: SDKRegistryLookup, CustomStringConvertible, Send
             if let sdkNameComponents = try? parseSDKName(canonicalName) {
                 directoryMacros.append(try delegate.namespace.declareStringMacro("SDK_DIR_" + sdkNameComponents.basename.asLegalCIdentifier))
             }
-        }
-        catch {
+        } catch {
             delegate.error("\(error)")
             return nil
         }
@@ -1030,7 +1025,7 @@ public final class SDKRegistry: SDKRegistryLookup, CustomStringConvertible, Send
         "BUILD_VARIANTS",
         "CURRENT_ARCH",
         "PLATFORM_NAME",
-        "SDKROOT"
+        "SDKROOT",
     ])
 
     private static let ignoredSparseSdkSettingKeySuffixes = Set<String>([
@@ -1114,8 +1109,7 @@ public final class SDKRegistry: SDKRegistryLookup, CustomStringConvertible, Send
                 if candidateComponents.version ?? Version(0) > prevSDK.components.version ?? Version(0) {
                     matchedSDK = (candidateSDK, candidateComponents)
                 }
-            }
-            else {
+            } else {
                 matchedSDK = (candidateSDK, candidateComponents)
             }
         }
@@ -1127,8 +1121,8 @@ public final class SDKRegistry: SDKRegistryLookup, CustomStringConvertible, Send
 
     public func lookup(_ path: Path) -> SDK? {
         #if !os(Windows)
-        // TODO: Turn this validation back on once our path handling is cleaned up a bit more
-        precondition(path.isAbsolute, "\(path.str) is not absolute")
+            // TODO: Turn this validation back on once our path handling is cleaned up a bit more
+            precondition(path.isAbsolute, "\(path.str) is not absolute")
         #endif
 
         // First see if we already have it in the cache.
@@ -1164,8 +1158,8 @@ public final class SDKRegistry: SDKRegistryLookup, CustomStringConvertible, Send
 
     public func lookup(nameOrPath key: String, basePath: Path, activeRunDestination: RunDestinationInfo?) throws -> SDK? {
         #if !os(Windows)
-        // TODO: Turn this validation back on once our path handling is cleaned up a bit more
-        precondition(basePath.isAbsolute, "\(basePath.str) is not absolute")
+            // TODO: Turn this validation back on once our path handling is cleaned up a bit more
+            precondition(basePath.isAbsolute, "\(basePath.str) is not absolute")
         #endif
 
         // Check if this is a request for the boot system SDK.
@@ -1219,7 +1213,8 @@ public final class SDKRegistry: SDKRegistryLookup, CustomStringConvertible, Send
                 // by the cohort platforms of the run destination's SDK's platform. This is necessary to resolve
                 // driverkit when we have a DriverKit run destination but with a platform-specific SDK.
                 if let runDestination = activeRunDestination,
-                   let cohortPlatforms = try? lookup(runDestination.sdk, activeRunDestination: nil)?.cohortPlatforms {
+                    let cohortPlatforms = try? lookup(runDestination.sdk, activeRunDestination: nil)?.cohortPlatforms
+                {
                     for cohortPlatform in cohortPlatforms {
                         if let list = sdksByCohortPlatform[cohortPlatform] {
                             return list
@@ -1257,7 +1252,6 @@ public final class SDKRegistry: SDKRegistryLookup, CustomStringConvertible, Send
 
     // MARK: CustomStringConvertible conformance
 
-
     public var description: String {
         return "<\(Swift.type(of: self)):\(self.type)>"
 
@@ -1271,9 +1265,14 @@ public struct AmbiguousSDKLookupError: Hashable, Error {
 
     var diagnostic: Diagnostic {
         let prefix = forRunDestination ? "unable to resolve run destination SDK:" : "unable to resolve SDK:"
-        return Diagnostic(behavior: .error, location: .unknown, data: DiagnosticData("\(prefix) multiple SDKs match alias '\(canonicalName)'"), childDiagnostics: candidateSDKs.sorted(by: \.canonicalName).map { sdk in
-            Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("Candidate '\(sdk.canonicalName)' at path '\(sdk.path.str)'"))
-        })
+        return Diagnostic(
+            behavior: .error,
+            location: .unknown,
+            data: DiagnosticData("\(prefix) multiple SDKs match alias '\(canonicalName)'"),
+            childDiagnostics: candidateSDKs.sorted(by: \.canonicalName).map { sdk in
+                Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("Candidate '\(sdk.canonicalName)' at path '\(sdk.path.str)'"))
+            }
+        )
     }
 
     public func hash(into hasher: inout Hasher) {
diff --git a/Sources/SWBCore/Settings/BuiltinMacros.swift b/Sources/SWBCore/Settings/BuiltinMacros.swift
index 5570cc92..34a0047b 100644
--- a/Sources/SWBCore/Settings/BuiltinMacros.swift
+++ b/Sources/SWBCore/Settings/BuiltinMacros.swift
@@ -952,7 +952,7 @@ public final class BuiltinMacros {
     public static let PRODUCT_BUNDLE_PACKAGE_TYPE = BuiltinMacros.declareStringMacro("PRODUCT_BUNDLE_PACKAGE_TYPE")
     public static let PRODUCT_DEFINITION_PLIST = BuiltinMacros.declareStringMacro("PRODUCT_DEFINITION_PLIST")
     public static let PRODUCT_MODULE_NAME = BuiltinMacros.declareStringMacro("PRODUCT_MODULE_NAME")
-    public static let PRODUCT_SPECIFIC_LDFLAGS = BuiltinMacros.declareStringListMacro("PRODUCT_SPECIFIC_LDFLAGS") // FIXME: We shouldn't need to declare this, but it is a workaround for an instance of: <rdar://problem/24343554> [Swift Build] Unable to find XCTest module
+    public static let PRODUCT_SPECIFIC_LDFLAGS = BuiltinMacros.declareStringListMacro("PRODUCT_SPECIFIC_LDFLAGS")  // FIXME: We shouldn't need to declare this, but it is a workaround for an instance of: <rdar://problem/24343554> [Swift Build] Unable to find XCTest module
     public static let PRODUCT_TYPE_FRAMEWORK_SEARCH_PATHS = BuiltinMacros.declarePathListMacro("PRODUCT_TYPE_FRAMEWORK_SEARCH_PATHS")
     public static let PRODUCT_TYPE_HEADER_SEARCH_PATHS = BuiltinMacros.declarePathListMacro("PRODUCT_TYPE_HEADER_SEARCH_PATHS")
     public static let PRODUCT_TYPE_LIBRARY_SEARCH_PATHS = BuiltinMacros.declarePathListMacro("PRODUCT_TYPE_LIBRARY_SEARCH_PATHS")
@@ -1073,7 +1073,7 @@ public final class BuiltinMacros {
     public static let SWIFT_SYSTEM_INCLUDE_PATHS = BuiltinMacros.declarePathListMacro("SWIFT_SYSTEM_INCLUDE_PATHS")
     public static let PACKAGE_RESOURCE_BUNDLE_NAME = BuiltinMacros.declareStringMacro("PACKAGE_RESOURCE_BUNDLE_NAME")
     public static let PACKAGE_RESOURCE_TARGET_KIND = BuiltinMacros.declareEnumMacro("PACKAGE_RESOURCE_TARGET_KIND") as EnumMacroDeclaration<PackageResourceTargetKind>
-    public static let USE_SWIFT_RESPONSE_FILE = BuiltinMacros.declareBooleanMacro("USE_SWIFT_RESPONSE_FILE") // remove in rdar://53000820
+    public static let USE_SWIFT_RESPONSE_FILE = BuiltinMacros.declareBooleanMacro("USE_SWIFT_RESPONSE_FILE")  // remove in rdar://53000820
     public static let SWIFT_INSTALL_MODULE = BuiltinMacros.declareBooleanMacro("SWIFT_INSTALL_MODULE")
     public static let SWIFT_INSTALL_MODULE_FOR_DEPLOYMENT = BuiltinMacros.declareBooleanMacro("SWIFT_INSTALL_MODULE_FOR_DEPLOYMENT")
     public static let SWIFT_INSTALL_MODULE_ABI_DESCRIPTOR = BuiltinMacros.declareBooleanMacro("SWIFT_INSTALL_MODULE_ABI_DESCRIPTOR")
@@ -1395,7 +1395,6 @@ public final class BuiltinMacros {
         return try! builtinNamespace.declarePathListMacro(name)
     }
 
-
     private static let namespaceInitializationMutex = SWBMutex(())
 
     /// Public access to the namespace forces initialization.
@@ -2297,7 +2296,7 @@ public final class BuiltinMacros {
         PACKAGE_RESOURCE_TARGET_KIND,
         __ORIGINAL_SDK_DEFINED_LLVM_TARGET_TRIPLE_SYS,
         SWIFT_PLATFORM_TARGET_PREFIX,
-        USE_SWIFT_RESPONSE_FILE, // remove in rdar://53000820
+        USE_SWIFT_RESPONSE_FILE,  // remove in rdar://53000820
         SWIFT_INSTALL_MODULE,
         SWIFT_INSTALL_MODULE_FOR_DEPLOYMENT,
         SWIFT_INSTALL_MODULE_ABI_DESCRIPTOR,
@@ -2482,7 +2481,7 @@ public final class BuiltinMacros {
         BUILD_ACTIVE_RESOURCES_ONLY,
         ENABLE_ONLY_ACTIVE_RESOURCES,
         ENABLE_PLAYGROUND_RESULTS,
-        __SKIP_BUILD
+        __SKIP_BUILD,
     ]
 
     /// Force initialization of entitlements macros.
@@ -2684,7 +2683,7 @@ public extension BuiltinMacros {
         return value.compactMap(fn)
     }
 
-    static func ifSet(_ macro:PathMacroDeclaration, in scope: MacroEvaluationScope, fn: (String) -> [String]) -> [String] {
+    static func ifSet(_ macro: PathMacroDeclaration, in scope: MacroEvaluationScope, fn: (String) -> [String]) -> [String] {
         let value = scope.evaluate(macro).str
         if value.isEmpty { return [] }
         return fn(value)
@@ -2947,7 +2946,8 @@ extension Diagnostic.Location {
 extension BuildVersion.Platform {
     public func deploymentTargetSettingName(infoLookup: (any PlatformInfoLookup)?) -> String {
         guard let infoProvider = infoLookup?.lookupPlatformInfo(platform: self),
-              let dtsn = infoProvider.deploymentTargetSettingName else {
+            let dtsn = infoProvider.deploymentTargetSettingName
+        else {
             fatalError("Mach-O based platforms must provide a deployment target setting name")
         }
         return dtsn
diff --git a/Sources/SWBCore/Settings/RecursiveSearchPathResolver.swift b/Sources/SWBCore/Settings/RecursiveSearchPathResolver.swift
index 69fa4523..64d227a4 100644
--- a/Sources/SWBCore/Settings/RecursiveSearchPathResolver.swift
+++ b/Sources/SWBCore/Settings/RecursiveSearchPathResolver.swift
@@ -39,7 +39,7 @@ public final class RecursiveSearchPathResolver: Sendable {
             self.excludedPatterns = excludedPatterns
             self.includedPatterns = includedPatterns
         }
-        public static func <(lhs: Request, rhs: Request) -> Bool {
+        public static func < (lhs: Request, rhs: Request) -> Bool {
             if lhs.path != rhs.path { return lhs.path.str < rhs.path.str }
             if lhs.sourcePath != rhs.sourcePath { return lhs.sourcePath.str < rhs.sourcePath.str }
             if lhs.excludedPatterns != rhs.excludedPatterns { return lhs.excludedPatterns < rhs.excludedPatterns }
@@ -80,7 +80,7 @@ public final class RecursiveSearchPathResolver: Sendable {
             self.warnings = warnings
         }
 
-        public static func ==(lhs: Result, rhs: Result) -> Bool {
+        public static func == (lhs: Result, rhs: Result) -> Bool {
             return lhs.paths == rhs.paths && lhs.warnings == rhs.warnings
         }
 
@@ -147,7 +147,7 @@ public final class RecursiveSearchPathResolver: Sendable {
 
     /// The canonical list of cached results.
     public var allResults: [CachedResult] {
-        return requestCache.keys.sorted().map{ CachedResult(request: $0, result: requestCache[$0]!) }
+        return requestCache.keys.sorted().map { CachedResult(request: $0, result: requestCache[$0]!) }
     }
 
     /// Expand a recursive search path.
@@ -259,7 +259,7 @@ public final class RecursiveSearchPathResolver: Sendable {
     }
 }
 
-private func <(lhs: [String]?, rhs: [String]?) -> Bool {
+private func < (lhs: [String]?, rhs: [String]?) -> Bool {
     switch (lhs, rhs) {
     case (let lhs?, let rhs?):
         return lhs.lexicographicallyPrecedes(rhs)
diff --git a/Sources/SWBCore/Settings/Settings.swift b/Sources/SWBCore/Settings/Settings.swift
index 32ba3c39..a23be8c1 100644
--- a/Sources/SWBCore/Settings/Settings.swift
+++ b/Sources/SWBCore/Settings/Settings.swift
@@ -106,7 +106,7 @@ fileprivate struct PreOverridesSettings {
     }
 
     fileprivate var universalDefaults: MacroValueAssignmentTable { return universalDefaultsCache.getValue(self) }
-    private let universalDefaultsCache = LazyCache{ (settings: CoreSettings) -> MacroValueAssignmentTable in settings.computeUniversalDefaults() }
+    private let universalDefaultsCache = LazyCache { (settings: CoreSettings) -> MacroValueAssignmentTable in settings.computeUniversalDefaults() }
     private func computeUniversalDefaults() -> MacroValueAssignmentTable {
         var table = MacroValueAssignmentTable(namespace: BuiltinMacros.namespace)
 
@@ -227,35 +227,35 @@ fileprivate struct PreOverridesSettings {
 
     // FIXME: This never actually pushed anything to the table, so I've disabled it for now.
     #if false
-    private var unionedCustomizedCompilerDefaultsCache = Registry<String, MacroValueAssignmentTable>()
-    fileprivate func unionedCustomizedCompilerDefaults(domain: String) -> MacroValueAssignmentTable {
-        // FIXME: This table is barely used (for Xcode proper it is almost empty). We should figure out if there might be a simpler solution to this problem.
-        //
-        // That said, it would likely be used a lot more often if we started to pull compiler specific defaults out of the unioned table, although if we had alternate support for them (for example, recognizing the macro type as compiler specific and error out on access from invalid contents), then we might still be able to push them as a single unioned table.
-        return unionedCustomizedCompilerDefaultsCache.getOrInsert(domain) {
-            // Add the defaults from all the registered tools in the given domain.
+        private var unionedCustomizedCompilerDefaultsCache = Registry<String, MacroValueAssignmentTable>()
+        fileprivate func unionedCustomizedCompilerDefaults(domain: String) -> MacroValueAssignmentTable {
+            // FIXME: This table is barely used (for Xcode proper it is almost empty). We should figure out if there might be a simpler solution to this problem.
             //
-            // FIXME: This is somewhat wasteful, as we end up duplicating values for super specifications. However, that lets us keep the condition set required to enable a particular compiler very simple.
-            let unionedDefaults = unionedToolDefaults(domain: domain).table
-            let customizedDefaults = MacroValueAssignmentTable(namespace: core.specRegistry.internalMacroNamespace)
-            for spec in core.specRegistry.findSpecs(CompilerSpec.self, domain: domain) {
-                // Add all the necessary defaults.
-                for option in core.specRegistry.effectiveFlattenedBuildOptions(spec).values {
-                    if let defaultValue = option.defaultValue {
-                        // Only push the default value if it diverges from the existing default.
-                        //
-                        // FIXME: This optimization could be subsumed by the macro assignment table itself, but for now we do it here as an important special case.
-                        if let existingDefault = unionedDefaults.lookupMacro(option.macro)?.expression, existingDefault == defaultValue {
-                            continue
-                        }
+            // That said, it would likely be used a lot more often if we started to pull compiler specific defaults out of the unioned table, although if we had alternate support for them (for example, recognizing the macro type as compiler specific and error out on access from invalid contents), then we might still be able to push them as a single unioned table.
+            return unionedCustomizedCompilerDefaultsCache.getOrInsert(domain) {
+                // Add the defaults from all the registered tools in the given domain.
+                //
+                // FIXME: This is somewhat wasteful, as we end up duplicating values for super specifications. However, that lets us keep the condition set required to enable a particular compiler very simple.
+                let unionedDefaults = unionedToolDefaults(domain: domain).table
+                let customizedDefaults = MacroValueAssignmentTable(namespace: core.specRegistry.internalMacroNamespace)
+                for spec in core.specRegistry.findSpecs(CompilerSpec.self, domain: domain) {
+                    // Add all the necessary defaults.
+                    for option in core.specRegistry.effectiveFlattenedBuildOptions(spec).values {
+                        if let defaultValue = option.defaultValue {
+                            // Only push the default value if it diverges from the existing default.
+                            //
+                            // FIXME: This optimization could be subsumed by the macro assignment table itself, but for now we do it here as an important special case.
+                            if let existingDefault = unionedDefaults.lookupMacro(option.macro)?.expression, existingDefault == defaultValue {
+                                continue
+                            }
 
-                        // FIXME: Need ability to push conditional assignments.
+                            // FIXME: Need ability to push conditional assignments.
+                        }
                     }
                 }
+                return customizedDefaults
             }
-            return customizedDefaults
         }
-    }
     #endif
 
     /// The cache for system build rules.
@@ -477,8 +477,8 @@ final class WorkspaceSettings: Sendable {
             // Add the compiler specific settings.
             //
             // This is necessary to support tools that have distinct values for the same settings (otherwise the tool defaults above would covert it), and is used in conjunction with a compiler condition asserted by the build phase processing.
-            #if false // This never did anything, see comments at `unionedCustomizedCompilerDefaults`
-            push(coreSettings.unionedCustomizedCompilerDefaults(domain: domain))
+            #if false  // This never did anything, see comments at `unionedCustomizedCompilerDefaults`
+                push(coreSettings.unionedCustomizedCompilerDefaults(domain: domain))
             #endif
 
             return BuiltinSettingsInfo(table: builtinsTable, exportedMacros: exportedMacros, errors: errors)
@@ -589,7 +589,6 @@ final class WorkspaceSettings: Sendable {
     }
 }
 
-
 /// This class represents the computed settings of a project and (optionally) target.
 public final class Settings: PlatformBuildContext, Sendable {
     /// The build parameters which were used to construct these settings.
@@ -756,9 +755,9 @@ public final class Settings: PlatformBuildContext, Sendable {
             supportsMacCatalystMacros.formUnion(sdkVariantInfoExtension.supportsMacCatalystMacroNames)
         }
 
-        return supportsMacCatalystMacros.contains { scope.evaluate(scope.namespace.parseString("$(\($0)")).boolValue } ||
+        return supportsMacCatalystMacros.contains { scope.evaluate(scope.namespace.parseString("$(\($0)")).boolValue }
             // For index build ensure zippered frameworks can be configured separately for both macOS and macCatalyst.
-            (scope.evaluate(BuiltinMacros.IS_ZIPPERED) && scope.evaluate(BuiltinMacros.INDEX_ENABLE_BUILD_ARENA))
+            || (scope.evaluate(BuiltinMacros.IS_ZIPPERED) && scope.evaluate(BuiltinMacros.INDEX_ENABLE_BUILD_ARENA))
     }
 
     public var enableTargetPlatformSpecialization: Bool {
@@ -766,8 +765,7 @@ public final class Settings: PlatformBuildContext, Sendable {
     }
 
     public static func targetPlatformSpecializationEnabled(scope: MacroEvaluationScope) -> Bool {
-        return scope.evaluate(BuiltinMacros.ALLOW_TARGET_PLATFORM_SPECIALIZATION) ||
-            SWBFeatureFlag.allowTargetPlatformSpecialization.value
+        return scope.evaluate(BuiltinMacros.ALLOW_TARGET_PLATFORM_SPECIALIZATION) || SWBFeatureFlag.allowTargetPlatformSpecialization.value
     }
 
     public var enableBuildRequestOverrides: Bool {
@@ -826,7 +824,7 @@ public final class Settings: PlatformBuildContext, Sendable {
 
         // Construct the settings table.
         let builder = SettingsBuilder(workspaceContext, buildRequestContext, parameters, settingsContext, provisioningTaskInputs, impartedBuildProperties, artifactBundleInfo, includeExports: includeExports, sdkRegistry)
-        let (boundProperties, boundDeploymentTarget) = MacroNamespace.withExpressionInterningEnabled{ builder.construct() }
+        let (boundProperties, boundDeploymentTarget) = MacroNamespace.withExpressionInterningEnabled { builder.construct() }
 
         // Extract the constructed data.
         self.targetConfiguration = builder.targetConfiguration
@@ -990,9 +988,11 @@ extension WorkspaceContext {
             }
 
             // Add the search paths from each loaded plugin.
-            paths.append(contentsOf: core.pluginManager.extensions(of: SpecificationsExtensionPoint.self).flatMap { ext in
-                ext.specificationSearchPaths(resourceSearchPaths: core.resourceSearchPaths).compactMap { try? $0.filePath }
-            }.sorted())
+            paths.append(
+                contentsOf: core.pluginManager.extensions(of: SpecificationsExtensionPoint.self).flatMap { ext in
+                    ext.specificationSearchPaths(resourceSearchPaths: core.resourceSearchPaths).compactMap { try? $0.filePath }
+                }.sorted()
+            )
 
             // Add the binary paths for each toolchain.
             for toolchain in toolchains {
@@ -1150,11 +1150,12 @@ private class SettingsBuilder {
             let pathDeclarations: [PathMacroDeclaration: String]
             let pathListDeclarations: [PathListMacroDeclaration: Array<String>]
 
-            init(_ scope: MacroEvaluationScope,
-                 _ stringDeclarations: [StringMacroDeclaration],
-                 _ stringListDeclarations: [StringListMacroDeclaration],
-                 _ pathDeclarations: [PathMacroDeclaration],
-                 _ pathListDeclarations: [PathListMacroDeclaration]
+            init(
+                _ scope: MacroEvaluationScope,
+                _ stringDeclarations: [StringMacroDeclaration],
+                _ stringListDeclarations: [StringListMacroDeclaration],
+                _ pathDeclarations: [PathMacroDeclaration],
+                _ pathListDeclarations: [PathListMacroDeclaration]
             ) {
                 self.stringDeclarations = Dictionary(uniqueKeysWithValues: stringDeclarations.map { ($0, scope.evaluate($0)) })
                 self.stringListDeclarations = Dictionary(uniqueKeysWithValues: stringListDeclarations.map { ($0, scope.evaluate($0)) })
@@ -1255,13 +1256,11 @@ private class SettingsBuilder {
     /// The namespace for user macros.  Its parent is the namespace of the `WorkspaceContext` for the settings.
     let userNamespace: MacroNamespace
 
-
     // Properties derived from the properties the builder was initialized with.
 
     /// The bound build configuration for the target.
     var targetConfiguration: BuildConfiguration? = nil
 
-
     // Bound properties of the builder.  These will sometimes come from the BoundProperties struct and are included here for convenience.  The builder should be careful not to access these methods before they are added.
     // FIXME: We should find some compile-time way to enforce that these properties can't be used before they are added.
 
@@ -1278,7 +1277,6 @@ private class SettingsBuilder {
     var moduleDependencies: [ModuleDependency] = []
     var headerDependencies: [HeaderDependency] = []
 
-
     // Mutable state of the builder as we're building up the settings table.
 
     /// The table we build up of macro assignments.
@@ -1290,8 +1288,8 @@ private class SettingsBuilder {
     var exportedNativeIDs = Set<Int>()
 
     var errors = OrderedSet<String>()
-    var warnings =  OrderedSet<String>()
-    var notes =  OrderedSet<String>()
+    var warnings = OrderedSet<String>()
+    var notes = OrderedSet<String>()
     var diagnostics = OrderedSet<Diagnostic>()
 
     /// Target-specific counterpart of `diagnostics`.
@@ -1368,7 +1366,6 @@ private class SettingsBuilder {
         self.includeExports = includeExports && !forBindingProperties
     }
 
-
     // MARK: Settings construction
 
     /// Construct the settings data.
@@ -1411,7 +1408,7 @@ private class SettingsBuilder {
         // Add the toolchain settings.
         //
         // We push in reverse order to honor the precedence correctly.
-        for (idx,toolchain) in boundProperties.toolchains.enumerated().reversed() {
+        for (idx, toolchain) in boundProperties.toolchains.enumerated().reversed() {
             addToolchainSettings(toolchain, isPrimary: idx == 0)
         }
 
@@ -1419,7 +1416,7 @@ private class SettingsBuilder {
             var table = MacroValueAssignmentTable(namespace: userNamespace)
 
             // The order should match the order of TOOLCHAINS.
-            table.push(BuiltinMacros.EFFECTIVE_TOOLCHAINS_DIRS, literal: boundProperties.toolchains.map{ $0.path.str })
+            table.push(BuiltinMacros.EFFECTIVE_TOOLCHAINS_DIRS, literal: boundProperties.toolchains.map { $0.path.str })
 
             push(table)
         }
@@ -1560,8 +1557,7 @@ private class SettingsBuilder {
         if scope.evaluate(BuiltinMacros.ENABLE_ON_DEMAND_RESOURCES) {
             if let productType = self.productType, !scope.evaluate(BuiltinMacros.SUPPORTS_ON_DEMAND_RESOURCES) {
                 self.errors.append("On-Demand Resources is enabled (ENABLE_ON_DEMAND_RESOURCES = YES), but is not supported for \(productType.name.lowercased()) targets")
-            }
-            else {
+            } else {
                 if scope.evaluate(BuiltinMacros.WRAP_ASSET_PACKS_IN_SEPARATE_DIRECTORIES) {
                     self.errors.append("WRAP_ASSET_PACKS_IN_SEPARATE_DIRECTORIES=YES is not supported")
                 }
@@ -1626,9 +1622,11 @@ private class SettingsBuilder {
             }
         }
 
-        if scope.evaluate(BuiltinMacros.ENABLE_PROJECT_OVERRIDE_SPECS), let projectOverrideSpec = core.specRegistry.findSpecs(ProjectOverridesSpec.self, domain: "").filter({ spec in
-            spec.projectName == (scope.evaluate(BuiltinMacros.RC_ProjectName).nilIfEmpty ?? scope.evaluate(BuiltinMacros.SRCROOT).basename)
-        }).only {
+        if scope.evaluate(BuiltinMacros.ENABLE_PROJECT_OVERRIDE_SPECS),
+            let projectOverrideSpec = core.specRegistry.findSpecs(ProjectOverridesSpec.self, domain: "").filter({ spec in
+                spec.projectName == (scope.evaluate(BuiltinMacros.RC_ProjectName).nilIfEmpty ?? scope.evaluate(BuiltinMacros.SRCROOT).basename)
+            }).only
+        {
             push(projectOverrideSpec.buildSettings)
             self.warnings.append("Applying Swift Build settings override to project for \(projectOverrideSpec.bugReport).")
         }
@@ -1656,14 +1654,12 @@ private class SettingsBuilder {
 
         do {
             self.moduleDependencies = try createScope(sdkToUse: boundProperties.sdk).evaluate(BuiltinMacros.MODULE_DEPENDENCIES).map { try ModuleDependency(entry: $0) }
-        }
-        catch {
+        } catch {
             errors.append("Failed to parse \(BuiltinMacros.MODULE_DEPENDENCIES.name): \(error)")
         }
         do {
             self.headerDependencies = try createScope(sdkToUse: boundProperties.sdk).evaluate(BuiltinMacros.HEADER_DEPENDENCIES).map { try HeaderDependency(entry: $0) }
-        }
-        catch {
+        } catch {
             errors.append("Failed to parse \(BuiltinMacros.HEADER_DEPENDENCIES.name): \(error)")
         }
 
@@ -1675,7 +1671,6 @@ private class SettingsBuilder {
         return (boundProperties, boundDeploymentTarget)
     }
 
-
     // MARK: Computing the bound properties
 
     /// Compute the "bound" properties needed to build a complete settings table.  This is called on a separate instance of `SettingsBuilder` used to bind the properties.
@@ -1695,7 +1690,7 @@ private class SettingsBuilder {
         }
 
         // Add the target settings, if configured.
-        if let target = self.target, let config = effectiveTargetConfig  {
+        if let target = self.target, let config = effectiveTargetConfig {
             addTargetSettings(target, SpecLookupCtxt(specRegistry: core.specRegistry, platform: nil), config, nil)
         }
 
@@ -1735,7 +1730,7 @@ private class SettingsBuilder {
         // - Then, we let the run destination override the SDK if needed.
         // - If the SDK or Platform changed, we do a second pass to add the new SDK/Platform settings. This ensures that we can resolve TOOLCHAINS accurately later.
         var sdkroot: String! = nil
-        for i in 0 ..< 2 {
+        for i in 0..<2 {
             // Perform the initial SDK resolution (this may drive the platform).
             sdkroot = createScope(effectiveTargetConfig, sdkToUse: sdk).evaluate(BuiltinMacros.SDKROOT).str
 
@@ -1750,8 +1745,7 @@ private class SettingsBuilder {
                 let supportsMacCatalyst = Settings.supportsMacCatalyst(scope: scope, core: core)
                 if destinationIsMacCatalyst && supportsMacCatalyst {
                     usesReplaceableAutomaticSDKRoot = true
-                }
-                else {
+                } else {
                     usesReplaceableAutomaticSDKRoot = runDestinationIsSupported
                 }
             } else {
@@ -1821,7 +1815,7 @@ private class SettingsBuilder {
             }
 
             // Add the target settings, if configured.
-            if let target = self.target, let config = effectiveTargetConfig  {
+            if let target = self.target, let config = effectiveTargetConfig {
                 addTargetSettings(target, specLookupContext, config, nil)
             }
 
@@ -1865,8 +1859,7 @@ private class SettingsBuilder {
         if project != nil && foundAmbiguousErrors.isEmpty {
             if sdk == nil {
                 errors.append("unable to find sdk '\(sdkroot!)'")
-            }
-            else if platform == nil {
+            } else if platform == nil {
                 errors.append("unable to find platform for sdk '\(sdkroot!)'")
             }
         }
@@ -1885,14 +1878,12 @@ private class SettingsBuilder {
             // Look up the SDK from the workspace context's SDK registry.  Here we let the registry detect whether the string we're looking up is the name of the SDK, or the path to one.
             if let sdk = try? sdkRegistry.lookup(nameOrPath: sparseSDKLookupStr, basePath: project.sourceRoot, activeRunDestination: parameters.activeRunDestination) {
                 return sdk
-            }
-            else {
+            } else {
                 // If we didn't find an SDK, then we treat the lookup string as a path and look for it inside the project directory.
                 let lookupPath = project.sourceRoot.join(sparseSDKLookupStr)
                 if let sdk = sdkRegistry.lookup(lookupPath) {
                     return sdk
-                }
-                else {
+                } else {
                     self.warnings.append("can't find additional SDK '\(sparseSDKLookupStr)'")
                 }
             }
@@ -1919,7 +1910,8 @@ private class SettingsBuilder {
         // If the build system was initialized as part of a swift toolchain, push that toolchain ahead of the default toolchain, if they are not the same (e.g. when on macOS where an Xcode install exists).
         if case .swiftToolchain(let path, xcodeDeveloperPath: _) = core.developerPath {
             if let developerPathToolchain = core.toolchainRegistry.toolchains.first(where: { $0.path.normalize() == path.normalize() }),
-               developerPathToolchain != coreSettings.defaultToolchain {
+                developerPathToolchain != coreSettings.defaultToolchain
+            {
                 toolchains.append(developerPathToolchain)
             }
         }
@@ -1931,7 +1923,7 @@ private class SettingsBuilder {
 
         // Determine the deployment targets that would be used. For enabling macCatalyst, we need to know the pre-mapped versions so we can inject that as SDK overrides.
         let scope = createScope(effectiveTargetConfig, sdkToUse: sdk)
-        let settings = BoundProperties.BoundSettings(scope, [BuiltinMacros.IPHONEOS_DEPLOYMENT_TARGET, BuiltinMacros.DEVELOPMENT_TEAM], [BuiltinMacros.OTHER_LDFLAGS,BuiltinMacros.PRODUCT_SPECIFIC_LDFLAGS],[BuiltinMacros.SDKROOT], [])
+        let settings = BoundProperties.BoundSettings(scope, [BuiltinMacros.IPHONEOS_DEPLOYMENT_TARGET, BuiltinMacros.DEVELOPMENT_TEAM], [BuiltinMacros.OTHER_LDFLAGS, BuiltinMacros.PRODUCT_SPECIFIC_LDFLAGS], [BuiltinMacros.SDKROOT], [])
 
         return BoundProperties(sdk: sdk, sdkVariant: sdkVariant, platform: platform, toolchains: toolchains, sparseSDKs: sparseSDKs, preOverrides: preOverrides, settings: settings)
     }
@@ -2010,7 +2002,6 @@ private class SettingsBuilder {
         push(table, exportType)
     }
 
-
     // MARK: Methods for pushing groups of properties
 
     /// Adds the base layer of build settings, including the environment and builtin defaults.
@@ -2020,7 +2011,7 @@ private class SettingsBuilder {
         // FIXME: <rdar://69032664> Remove rev-lock hack for new CopyStringsFile build setting
         pushTable(.exported) { $0.push(BuiltinMacros.STRINGS_FILE_INFOPLIST_RENAME, literal: true) }
         exportedMacroNames.formUnion(info.exportedMacros)
-        errors.append(contentsOf:info.errors)
+        errors.append(contentsOf: info.errors)
 
         // Default to preserving the module cache directory.
         pushTable(.exported) {
@@ -2117,8 +2108,7 @@ private class SettingsBuilder {
         table.push(BuiltinMacros.IS_UNOPTIMIZED_BUILD, literal: (scope.evaluate(BuiltinMacros.GCC_OPTIMIZATION_LEVEL) == "0" || scope.evaluate(BuiltinMacros.SWIFT_OPTIMIZATION_LEVEL) == "-Onone"))
 
         // If unset, infer the default SWIFT_LIBRARY_LEVEL from the INSTALL_PATH.
-        if scope.evaluateAsString(BuiltinMacros.SWIFT_LIBRARY_LEVEL).isEmpty &&
-           scope.evaluate(BuiltinMacros.MACH_O_TYPE) == "mh_dylib" {
+        if scope.evaluateAsString(BuiltinMacros.SWIFT_LIBRARY_LEVEL).isEmpty && scope.evaluate(BuiltinMacros.MACH_O_TYPE) == "mh_dylib" {
             let privateInstallPaths = scope.evaluate(BuiltinMacros.__KNOWN_SPI_INSTALL_PATHS).map { Path($0) }
             let publicInstallPaths = [
                 Path("/System/Library/Frameworks"),
@@ -2126,7 +2116,8 @@ private class SettingsBuilder {
                 Path("/usr/lib"),
                 Path("/System/iOSSupport/System/Library/Frameworks"),
                 Path("/System/iOSSupport/System/Library/SubFrameworks"),
-                Path("/System/iOSSupport/usr/lib"),]
+                Path("/System/iOSSupport/usr/lib"),
+            ]
             let installPath = scope.evaluate(BuiltinMacros.INSTALL_PATH)
 
             if table.contains(BuiltinMacros.SKIP_INSTALL) {
@@ -2212,8 +2203,7 @@ private class SettingsBuilder {
             if scope.evaluate(BuiltinMacros.MERGEABLE_LIBRARY) {
                 if scope.evaluate(BuiltinMacros.IS_UNOPTIMIZED_BUILD) {
                     table.push(BuiltinMacros.ADD_MERGEABLE_DEBUG_HOOK, literal: true)
-                }
-                else {
+                } else {
                     table.push(BuiltinMacros.MAKE_MERGEABLE, literal: true)
                 }
             }
@@ -2307,8 +2297,7 @@ private class SettingsBuilder {
                 if target.type == .external {
                     // External targets are special - they only look to see if SKIP_INSTALL is enabled in the target itself, and ignore the value of $(INSTALL_PATH).
                     skipInstall = MacroEvaluationScope(table: config.buildSettings).evaluate(BuiltinMacros.SKIP_INSTALL)
-                }
-                else {
+                } else {
                     skipInstall = scope.evaluate(BuiltinMacros.SKIP_INSTALL) || scope.evaluate(BuiltinMacros.INSTALL_PATH).isEmpty
                 }
                 // If we're skipping the install (or don't have a path to install to), then TARGET_BUILD_DIR is set to an UninstalledProducts location.  Note that the external
@@ -2337,7 +2326,7 @@ private class SettingsBuilder {
             // Handle support for not using per-configuration build directories.
             if !usePerConfigurationBuildLocations {
                 table.push(BuiltinMacros.CONFIGURATION_BUILD_DIR, Static { BuiltinMacros.namespace.parseString("$(BUILD_DIR") })
-                table.push(BuiltinMacros.CONFIGURATION_TEMP_DIR, Static { BuiltinMacros.namespace.parseString("$(PROJECT_TEMP_DIR")})
+                table.push(BuiltinMacros.CONFIGURATION_TEMP_DIR, Static { BuiltinMacros.namespace.parseString("$(PROJECT_TEMP_DIR") })
             }
         }
 
@@ -2362,7 +2351,7 @@ private class SettingsBuilder {
             "-Xfrontend",
             "LiveExecutionResultsLogger",
             "-F",
-            "\(platformFrameworksDir)"
+            "\(platformFrameworksDir)",
         ]
 
         table.push(BuiltinMacros.OTHER_SWIFT_FLAGS, BuiltinMacros.namespace.parseStringList(["$(inherited)"] + otherSwiftFlags))
@@ -2416,7 +2405,8 @@ private class SettingsBuilder {
                 platformTable.push(BuiltinMacros.CORRESPONDING_DEVICE_PLATFORM_NAME, literal: correspondingPlatform.name)
                 platformTable.push(BuiltinMacros.CORRESPONDING_DEVICE_PLATFORM_DIR, literal: correspondingPlatform.path.str)
                 if let correspondingSDKName = correspondingPlatform.sdkCanonicalName,
-                    let correspondingSDK = try? sdkRegistry.lookup(correspondingSDKName, activeRunDestination: parameters.activeRunDestination) {
+                    let correspondingSDK = try? sdkRegistry.lookup(correspondingSDKName, activeRunDestination: parameters.activeRunDestination)
+                {
                     platformTable.push(BuiltinMacros.CORRESPONDING_DEVICE_SDK_NAME, literal: correspondingSDK.canonicalName)
                     platformTable.push(BuiltinMacros.CORRESPONDING_DEVICE_SDK_DIR, literal: correspondingSDK.path.str)
                 }
@@ -2425,17 +2415,20 @@ private class SettingsBuilder {
                 platformTable.push(BuiltinMacros.CORRESPONDING_SIMULATOR_PLATFORM_NAME, literal: correspondingPlatform.name)
                 platformTable.push(BuiltinMacros.CORRESPONDING_SIMULATOR_PLATFORM_DIR, literal: correspondingPlatform.path.str)
                 if let correspondingSDKName = correspondingPlatform.sdkCanonicalName,
-                    let correspondingSDK = try? sdkRegistry.lookup(correspondingSDKName, activeRunDestination: parameters.activeRunDestination) {
+                    let correspondingSDK = try? sdkRegistry.lookup(correspondingSDKName, activeRunDestination: parameters.activeRunDestination)
+                {
                     platformTable.push(BuiltinMacros.CORRESPONDING_SIMULATOR_SDK_NAME, literal: correspondingSDK.canonicalName)
                     platformTable.push(BuiltinMacros.CORRESPONDING_SIMULATOR_SDK_DIR, literal: correspondingSDK.path.str)
                 }
             }
 
             // Add the default for SUPPORTED_PLATFORMS.
-            platformTable.push(BuiltinMacros.SUPPORTED_PLATFORMS, literal: core.platformRegistry.platforms.compactMap {
+            platformTable.push(
+                BuiltinMacros.SUPPORTED_PLATFORMS,
+                literal: core.platformRegistry.platforms.compactMap {
                     return $0.familyName == platform.familyName ? $0.name : nil
-                })
-
+                }
+            )
 
             // Add the platform default settings.
             platformTable.pushContentsOf(platform.defaultSettingsTable)
@@ -2841,8 +2834,7 @@ private class SettingsBuilder {
             let info = buildRequestContext.getCachedMacroConfigFile(path, project: project, context: .baseConfiguration)
             if let sdk = sdk, settingsContext.purpose.bindToSDK {
                 bindConditionParameters(bindTargetCondition(info.table), sdk)
-            }
-            else {
+            } else {
                 // No bound SDK, so push the project's build settings unmodified.
                 push(bindTargetCondition(info.table), .exported)
             }
@@ -2869,8 +2861,7 @@ private class SettingsBuilder {
         // Add the project's config settings.
         if let sdk, settingsContext.purpose.bindToSDK {
             bindConditionParameters(bindTargetCondition(config.buildSettings), sdk)
-        }
-        else {
+        } else {
             // No bound SDK, so push the project's build settings unmodified.
             push(bindTargetCondition(config.buildSettings), .exported)
         }
@@ -2894,8 +2885,7 @@ private class SettingsBuilder {
                     let message = "`\(macro)` is not supported. Remove the build setting and conditionalize `PRODUCT_BUNDLE_IDENTIFIER` instead."
                     if scope.evaluate(BuiltinMacros.__DIAGNOSE_DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER_ERROR) {
                         self.errors.append(message)
-                    }
-                    else {
+                    } else {
                         self.warnings.append(message)
                     }
                 }
@@ -2959,14 +2949,14 @@ private class SettingsBuilder {
         }
 
         #if !RC_PLAYGROUNDS
-        // Xcode version settings.
-        let xcodeMajorStr = (core.xcodeVersion[0] * 100).toString(format: "%04d")
-        let xcodeMinorStr = (core.xcodeVersion[0] * 100 + core.xcodeVersion[1] * 10).toString(format: "%04d")
-        let xcodeActualStr = (core.xcodeVersion[0] * 100 + core.xcodeVersion[1] * 10 + core.xcodeVersion[2]).toString(format: "%04d")
-        table.push(BuiltinMacros.XCODE_VERSION_MAJOR, literal: xcodeMajorStr)
-        table.push(BuiltinMacros.XCODE_VERSION_MINOR, literal: xcodeMinorStr)
-        table.push(BuiltinMacros.XCODE_VERSION_ACTUAL, literal: xcodeActualStr)
-        table.push(BuiltinMacros.XCODE_PRODUCT_BUILD_VERSION, literal: core.xcodeProductBuildVersionString)
+            // Xcode version settings.
+            let xcodeMajorStr = (core.xcodeVersion[0] * 100).toString(format: "%04d")
+            let xcodeMinorStr = (core.xcodeVersion[0] * 100 + core.xcodeVersion[1] * 10).toString(format: "%04d")
+            let xcodeActualStr = (core.xcodeVersion[0] * 100 + core.xcodeVersion[1] * 10 + core.xcodeVersion[2]).toString(format: "%04d")
+            table.push(BuiltinMacros.XCODE_VERSION_MAJOR, literal: xcodeMajorStr)
+            table.push(BuiltinMacros.XCODE_VERSION_MINOR, literal: xcodeMinorStr)
+            table.push(BuiltinMacros.XCODE_VERSION_ACTUAL, literal: xcodeActualStr)
+            table.push(BuiltinMacros.XCODE_PRODUCT_BUILD_VERSION, literal: core.xcodeProductBuildVersionString)
         #endif
 
         // Backward compatibility settings.
@@ -3048,8 +3038,7 @@ private class SettingsBuilder {
             let info = buildRequestContext.getCachedMacroConfigFile(path, project: project, context: .baseConfiguration)
             if let sdk = sdk, settingsContext.purpose.bindToSDK {
                 bindConditionParameters(bindTargetCondition(info.table), sdk)
-            }
-            else {
+            } else {
                 // No bound SDK, so push the target xcconfig's build settings unmodified.
                 push(bindTargetCondition(info.table), .exported)
             }
@@ -3070,8 +3059,7 @@ private class SettingsBuilder {
         // FIXME: Cache this table, but we can only do that once we share the namespace.
         if let sdk, settingsContext.purpose.bindToSDK {
             bindConditionParameters(bindTargetCondition(config.buildSettings), sdk)
-        }
-        else {
+        } else {
             // No bound SDK, so push the target's build settings unmodified.
             push(bindTargetCondition(config.buildSettings), .exported)
         }
@@ -3191,8 +3179,7 @@ private class SettingsBuilder {
         if let toolchain = core.toolchainRegistry.lookup(toolchainIdentifier), !toolchain.overrideSettings.isEmpty {
             do {
                 push(try userNamespace.parseTable(toolchain.overrideSettings, allowUserDefined: true), .exported)
-            }
-            catch {
+            } catch {
                 self.errors.append("unable to create override build settings table from toolchain `\(toolchainIdentifier)`")
             }
         }
@@ -3412,8 +3399,7 @@ private class SettingsBuilder {
                             BuiltinMacros.EXECUTABLE_DEBUG_DYLIB_MAPPED_PLATFORM,
                             table.namespace.parseLiteralString("\(appleLDPreviousPlatform)")
                         )
-                    }
-                    else {
+                    } else {
                         table.push(
                             BuiltinMacros.EXECUTABLE_DEBUG_DYLIB_INSTALL_NAME,
                             table.namespace.parseString("@rpath/$(EXECUTABLE_NAME).debug.dylib")
@@ -3428,9 +3414,9 @@ private class SettingsBuilder {
         }
 
         if isExecutableProduct,
-           scope.evaluate(BuiltinMacros.ENABLE_HARDENED_RUNTIME),
-           // Check for ad-hoc
-           scope.evaluate(BuiltinMacros.CODE_SIGN_IDENTITY) == "-"
+            scope.evaluate(BuiltinMacros.ENABLE_HARDENED_RUNTIME),
+            // Check for ad-hoc
+            scope.evaluate(BuiltinMacros.CODE_SIGN_IDENTITY) == "-"
         {
             // Hardened runtime was enabled with ad-hoc codesigning. This is not compatible
             // with debug dylib mode so we'll ignore it and emit a note.
@@ -3446,7 +3432,7 @@ private class SettingsBuilder {
     }
 
     static func targetSupportedPlatforms(scope: MacroEvaluationScope, core: Core, runDestinationPlatform: Platform, emitWarning: (String) -> Void = { _ in }) -> [Platform] {
-        let targetSupportedPlatforms = scope.evaluate(BuiltinMacros.SUPPORTED_PLATFORMS).compactMap{ core.platformRegistry.lookup(name: $0) }
+        let targetSupportedPlatforms = scope.evaluate(BuiltinMacros.SUPPORTED_PLATFORMS).compactMap { core.platformRegistry.lookup(name: $0) }
 
         // Warn if we couldn't find a supported platform for the given list.
         if targetSupportedPlatforms.isEmpty {
@@ -3467,7 +3453,7 @@ private class SettingsBuilder {
             if Settings.targetPlatformSpecializationEnabled(scope: scope) && sdk != nil {
                 return
             }
-        } catch { /* fallthrough */ }
+        } catch { /* fallthrough */  }
 
         // Destination info: since runDestination.{platform,sdk} were set by the IDE, we expect them to resolve in Swift Build correctly
         guard let runDestination = self.parameters.activeRunDestination else { return }
@@ -3544,8 +3530,7 @@ private class SettingsBuilder {
                 } else {
                     requiredSDKCanonicalName = destinationSDK.canonicalName
                 }
-            }
-            else if destinationPlatform.isSimulator, targetPlatform == nil || (targetPlatform !== destinationPlatform && targetPlatform?.familyName == destinationPlatform.familyName) {
+            } else if destinationPlatform.isSimulator, targetPlatform == nil || (targetPlatform !== destinationPlatform && targetPlatform?.familyName == destinationPlatform.familyName) {
                 // Simulator: If the target specifies an SDK for a platform in the destination platform family, use the equivalent SDK for the destination platform.  For example, if the target specifies iphoneos4.2 as its SDK, use iphonesimulator4.2 if such an SDK exists.
                 let targetSuffix = targetSDK.canonicalNameSuffix?.nilIfEmpty.map { ".\($0)" } ?? ""
                 let candidates: [String] = [
@@ -3558,16 +3543,13 @@ private class SettingsBuilder {
                 let resolvedCandidates = candidates.map { ($0, try? sdkRegistry.lookup($0, activeRunDestination: runDestination)?.canonicalName) }
 
                 requiredSDKCanonicalName = resolvedCandidates.compactMap { $0.1 }.first
-            }
-            else if (destinationPlatformIsMacOS || destinationPlatformIsLinux || destinationPlatform.isSimulator) && targetPlatform === destinationPlatform {
+            } else if (destinationPlatformIsMacOS || destinationPlatformIsLinux || destinationPlatform.isSimulator) && targetPlatform === destinationPlatform {
                 // If the target specifies an SDK for the destination platform, don't override its choice of SDK.
-            }
-            else {
+            } else {
                 // The target specifies an SDK not for the destination platform, but claims to support the destination platform.
                 requiredSDKCanonicalName = getLatestSDKCanonicalName(for: destinationPlatform)
             }
-        }
-        else if destinationPlatformIsDeviceOrSimulator {
+        } else if destinationPlatformIsDeviceOrSimulator {
             // For multiplatform builds, we want to ensure consistency between simulator- vs non-simulator environments, so if this target supports a platform that matches the simulator-ness of the destination platform, then use it.
             let isDeployment = destinationPlatform.isDeploymentPlatform
 
@@ -3618,7 +3600,8 @@ private class SettingsBuilder {
 
     func pushHostTargetPlatformSettingsIfNeeded(for runDestination: RunDestinationInfo, to scope: MacroEvaluationScope) {
         if let hostTargetedPlatform = runDestination.hostTargetedPlatform,
-           scope.evaluate(BuiltinMacros.SUPPORTED_HOST_TARGETED_PLATFORMS).contains(hostTargetedPlatform) {
+            scope.evaluate(BuiltinMacros.SUPPORTED_HOST_TARGETED_PLATFORMS).contains(hostTargetedPlatform)
+        {
             pushTable(.exported) { $0.push(BuiltinMacros.HOST_TARGETED_PLATFORM_NAME, literal: hostTargetedPlatform) }
         }
     }
@@ -3654,9 +3637,11 @@ private class SettingsBuilder {
                 BuiltinMacros.PROVISIONING_PROFILE_SPECIFIER,
             ])
 
-            targetDiagnostics.append(contentsOf: inputs.warnings.map {
-                Diagnostic(behavior: .warning, location: signingDiagnosticsLocation, data: DiagnosticData($0))
-            })
+            targetDiagnostics.append(
+                contentsOf: inputs.warnings.map {
+                    Diagnostic(behavior: .warning, location: signingDiagnosticsLocation, data: DiagnosticData($0))
+                }
+            )
 
             let errors = inputs.errors.map { error -> String in
                 var errorString = error.description
@@ -3670,9 +3655,11 @@ private class SettingsBuilder {
                 return errorString
             }
 
-            targetDiagnostics.append(contentsOf: errors.map {
-                Diagnostic(behavior: UserDefaults.disableSigningProvisioningErrors ? .warning : .error, location: signingDiagnosticsLocation, data: DiagnosticData($0))
-            })
+            targetDiagnostics.append(
+                contentsOf: errors.map {
+                    Diagnostic(behavior: UserDefaults.disableSigningProvisioningErrors ? .warning : .error, location: signingDiagnosticsLocation, data: DiagnosticData($0))
+                }
+            )
 
             if !errors.isEmpty {
                 return
@@ -3713,8 +3700,7 @@ private class SettingsBuilder {
                     identityName = "Ad Hoc"
 
                     warnings.append("\(target.name) isn't code signed but requires entitlements. Falling back to ad hoc signing.")
-                }
-                else if !platformRequiresEntitlements {
+                } else if !platformRequiresEntitlements {
                     // Warn the user when code signing is disabled, is not required, but they are specifying entitlements that cannot be used without code signing.
                     warnings.append("\(target.name) isn't code signed but requires entitlements. It is not possible to add entitlements to a binary without signing it.")
                 }
@@ -3828,8 +3814,9 @@ private class SettingsBuilder {
         table.push(BuiltinMacros.INDEX_DIRECTORY_REMAP_VFS_FILE, Static { BuiltinMacros.namespace.parseString("$(OBJROOT)/index-overlay.yaml") })
 
         if let arena = parameters.arena,
-           let productsPath = arena.indexRegularBuildProductsPath,
-           let intermediatesPath = arena.indexRegularBuildIntermediatesPath {
+            let productsPath = arena.indexRegularBuildProductsPath,
+            let intermediatesPath = arena.indexRegularBuildIntermediatesPath
+        {
             table.push(BuiltinMacros.INDEX_REGULAR_BUILD_PRODUCTS_DIR, BuiltinMacros.namespace.parseString(productsPath.str))
             table.push(BuiltinMacros.INDEX_REGULAR_BUILD_INTERMEDIATES_DIR, BuiltinMacros.namespace.parseString(intermediatesPath.str))
         }
@@ -3886,10 +3873,12 @@ private class SettingsBuilder {
 
         table.push(BuiltinMacros.DERIVED_DATA_DIR, BuiltinMacros.namespace.parseString(derivedDataPath!.str))
         if let arena = parameters.arena {
-            for (macro,path) in [(BuiltinMacros.SYMROOT, arena.buildProductsPath),
-                                 (BuiltinMacros.OBJROOT, arena.buildIntermediatesPath),
-                                 (BuiltinMacros.SHARED_PRECOMPS_DIR, arena.pchPath),
-                                 (BuiltinMacros.INDEX_PRECOMPS_DIR, arena.indexPCHPath)] {
+            for (macro, path) in [
+                (BuiltinMacros.SYMROOT, arena.buildProductsPath),
+                (BuiltinMacros.OBJROOT, arena.buildIntermediatesPath),
+                (BuiltinMacros.SHARED_PRECOMPS_DIR, arena.pchPath),
+                (BuiltinMacros.INDEX_PRECOMPS_DIR, arena.indexPCHPath),
+            ] {
                 if !path.isEmpty {
                     table.push(macro, BuiltinMacros.namespace.parseString(path.str))
                 }
@@ -4054,7 +4043,8 @@ private class SettingsBuilder {
                 // contains only a single architecture, use that. This is the code path for generic run destinations,
                 // where the supportedArchitectures should not be treated as priority-ordered.
                 if activeRunDestination.disableOnlyActiveArch,
-                    let supportedArch = Set(activeRunDestination.supportedArchitectures).intersection(archsSet).only {
+                    let supportedArch = Set(activeRunDestination.supportedArchitectures).intersection(archsSet).only
+                {
                     return supportedArch
                 }
 
@@ -4062,7 +4052,8 @@ private class SettingsBuilder {
                 // which is also in the proposed archs list. This is the code path for concrete run destinations,
                 // where the supportedArchitectures should be treated as priority-ordered.
                 if !activeRunDestination.disableOnlyActiveArch,
-                    let supportedArch = activeRunDestination.supportedArchitectures.first(where: archsSet.contains) {
+                    let supportedArch = activeRunDestination.supportedArchitectures.first(where: archsSet.contains)
+                {
                     return supportedArch
                 }
 
@@ -4071,7 +4062,8 @@ private class SettingsBuilder {
                     // Have a matching compatible architecture, so use that (eg. arm64e when the run destination is
                     // arm64).
                     if let compatibleArchs = compatibilityArchMap[activeRunDestination.targetArchitecture],
-                       let compatibleArch = Set(compatibleArchs).intersection(archsSet).only {
+                        let compatibleArch = Set(compatibleArchs).intersection(archsSet).only
+                    {
                         return compatibleArch
                     }
 
@@ -4118,16 +4110,13 @@ private class SettingsBuilder {
                 if spec.deprecatedError {
                     errors.append(deprecatedArchMessage)
                     return false
-                }
-                else if !supportedArchDeploymentTarget && spec.errorOutsideDeploymentTargetRange {
+                } else if !supportedArchDeploymentTarget && spec.errorOutsideDeploymentTargetRange {
                     errors.append(deprecatedArchDeploymentTargetMessage)
                     return false
-                }
-                else if spec.deprecated {
+                } else if spec.deprecated {
                     warnings.append(deprecatedArchMessage)
                     return true
-                }
-                else if !supportedArchDeploymentTarget {
+                } else if !supportedArchDeploymentTarget {
                     warnings.append(deprecatedArchDeploymentTargetMessage)
                     return true
                 }
@@ -4151,11 +4140,14 @@ private class SettingsBuilder {
         // Detect discouraged overrides of SWIFT_PLATFORM_TARGET_PREFIX and use this as a signal to suppress
         // module only architectures
         let tripleOverridesApplied = scope.evaluate(BuiltinMacros.SWIFT_PLATFORM_TARGET_PREFIX) != scope.evaluate(BuiltinMacros.__ORIGINAL_SDK_DEFINED_LLVM_TARGET_TRIPLE_SYS)
-        let moduleOnlyArchs = (onlyActiveArchApplied || tripleOverridesApplied) ? [] : originalModuleOnlyArchs
-            .filter { validArchs.contains($0) }
-            .filter { !excludedArchs.contains($0) }
-            .filter { !effectiveArchs.contains($0) }
-            .removingDuplicates()
+        let moduleOnlyArchs =
+            (onlyActiveArchApplied || tripleOverridesApplied)
+            ? []
+            : originalModuleOnlyArchs
+                .filter { validArchs.contains($0) }
+                .filter { !excludedArchs.contains($0) }
+                .filter { !effectiveArchs.contains($0) }
+                .removingDuplicates()
 
         table.push(BuiltinMacros.__SWIFT_MODULE_ONLY_ARCHS__, literal: originalModuleOnlyArchs)
         table.push(BuiltinMacros.SWIFT_MODULE_ONLY_ARCHS, literal: moduleOnlyArchs)
@@ -4176,13 +4168,12 @@ private class SettingsBuilder {
             BuiltinMacros.CCHROOT,
             BuiltinMacros.CONFIGURATION_BUILD_DIR, BuiltinMacros.SHARED_PRECOMPS_DIR,
             BuiltinMacros.CONFIGURATION_TEMP_DIR, BuiltinMacros.TARGET_TEMP_DIR, BuiltinMacros.TEMP_DIR,
-            BuiltinMacros.PROJECT_DIR, BuiltinMacros.BUILT_PRODUCTS_DIR
+            BuiltinMacros.PROJECT_DIR, BuiltinMacros.BUILT_PRODUCTS_DIR,
         ]
         for macro in macrosToNormalize {
             table.push(macro, literal: (project?.sourceRoot ?? workspaceContext.workspace.path.dirname).join(scope.evaluate(macro), normalize: true).str)
         }
 
-
         // FIXME: Xcode also normalizes SDKROOT to an absolute path here, although native targets also do this (in a different place).
 
         // Compute the resolved value for GCC_VERSION, if not otherwise set.
@@ -4235,9 +4226,12 @@ private class SettingsBuilder {
 
             let shellCodec: any CommandSequenceEncodable = UNIXShellCommandCodec(encodingStrategy: .backslashes, encodingBehavior: .argumentsOnly)
 
-            table.push(BuiltinMacros.ALL_SETTINGS, literal: macros.map({ macro in
-                "\(macro)=" + shellCodec.encode([scope.evaluate(scope.namespace.parseString("$\(macro)"))])
-            }))
+            table.push(
+                BuiltinMacros.ALL_SETTINGS,
+                literal: macros.map({ macro in
+                    "\(macro)=" + shellCodec.encode([scope.evaluate(scope.namespace.parseString("$\(macro)"))])
+                })
+            )
         }
 
         // If testability is enabled, then that overrides certain other settings, and in a way that the user cannot override: They're either using testability, or they're not.
@@ -4320,7 +4314,7 @@ private class SettingsBuilder {
 
         let toolchainPath = Path(scope.evaluateAsString(BuiltinMacros.TOOLCHAIN_DIR))
         guard let toolchain = core.toolchainRegistry.toolchains.first(where: { $0.path == toolchainPath }),
-              let defaultToolchain = core.toolchainRegistry.defaultToolchain
+            let defaultToolchain = core.toolchainRegistry.defaultToolchain
         else {
             return []
         }
@@ -4363,7 +4357,8 @@ private class SettingsBuilder {
         // Ensure only a single variant is set if we're in an index build - either the first from `BUILD_VARIANTS` or `INDEX_BUILD_VARIANT` if it's set.
         var variants: [String] = scope.evaluate(BuiltinMacros.BUILD_VARIANTS)
         if parameters.action == .indexBuild,
-           let firstVariant = variants.first {
+            let firstVariant = variants.first
+        {
             let indexVariant = scope.evaluate(BuiltinMacros.INDEX_BUILD_VARIANT)
             if indexVariant.isEmpty || !variants.contains(indexVariant) {
                 variants = [firstVariant]
@@ -4428,8 +4423,7 @@ private class SettingsBuilder {
         let allSDKs: [SDK]
         if let baseSDK {
             allSDKs = [baseSDK].appending(contentsOf: sparseSDKs)
-        }
-        else {
+        } else {
             allSDKs = sparseSDKs
         }
         // Collect all the macros and SDKs into a map of [macro: [(macro, sdk)] entries, so we know if there are any collisions.
@@ -4533,8 +4527,7 @@ private class SettingsBuilder {
         }
 
         // If any sanitizer is enabled, and this product type has a runpath to its Frameworks directory defined, then we want to add that path to the runpath search path if it's not already present.
-        if scope.evaluate(BuiltinMacros.ENABLE_ADDRESS_SANITIZER) || scope.evaluate(BuiltinMacros.ENABLE_THREAD_SANITIZER) || scope.evaluate(BuiltinMacros.ENABLE_UNDEFINED_BEHAVIOR_SANITIZER)
-        {
+        if scope.evaluate(BuiltinMacros.ENABLE_ADDRESS_SANITIZER) || scope.evaluate(BuiltinMacros.ENABLE_THREAD_SANITIZER) || scope.evaluate(BuiltinMacros.ENABLE_UNDEFINED_BEHAVIOR_SANITIZER) {
             if let frameworksRunpath = productType?.frameworksRunpathSearchPath(in: scope)?.str {
                 if !scope.evaluate(BuiltinMacros.LD_RUNPATH_SEARCH_PATHS).contains(frameworksRunpath) {
                     tableSet.push(.none, BuiltinMacros.LD_RUNPATH_SEARCH_PATHS, BuiltinMacros.namespace.parseStringList(["$(inherited)", frameworksRunpath]))
@@ -4560,9 +4553,9 @@ private class SettingsBuilder {
                 if scope.evaluateAsString(macro).isEmpty || scope.evaluate(macro) {
                     switch searchPathMacro {
                     case BuiltinMacros.HEADER_SEARCH_PATHS:
-                        tableSet.push(.none, searchPathMacro, Static { BuiltinMacros.namespace.parseStringList(["$(BUILT_PRODUCTS_DIR)/include", "$(inherited)"]) } )
+                        tableSet.push(.none, searchPathMacro, Static { BuiltinMacros.namespace.parseStringList(["$(BUILT_PRODUCTS_DIR)/include", "$(inherited)"]) })
                     default:
-                        tableSet.push(.none, searchPathMacro, Static { BuiltinMacros.namespace.parseStringList(["$(BUILT_PRODUCTS_DIR)", "$(inherited)"]) } )
+                        tableSet.push(.none, searchPathMacro, Static { BuiltinMacros.namespace.parseStringList(["$(BUILT_PRODUCTS_DIR)", "$(inherited)"]) })
                     }
                 }
             }
@@ -4603,7 +4596,7 @@ private class SettingsBuilder {
             /// Helper function to process the SDK remapping for a specific `variant` and `arch`.
             func processRemapping(_ scope: MacroEvaluationScope, _ originalValues: [Path], variant: String? = nil, arch: String? = nil) {
                 // Get the evaluated paths for this search path build setting, and remap them into the SDKs as appropriate.
-                let values = originalValues.flatMap{ (path: Path) -> [Path] in
+                let values = originalValues.flatMap { (path: Path) -> [Path] in
                     var results = [Path]()
 
                     // Remap into the sparse SDKs.  This effectively adds search paths into the sparse SDKs.
@@ -4646,7 +4639,7 @@ private class SettingsBuilder {
                             MacroCondition(parameter: BuiltinMacros.archCondition, valuePattern: arch),
                         ])
                     }
-                    table.push(macro, literal: values.map{ $0.str }, conditions: conditions)
+                    table.push(macro, literal: values.map { $0.str }, conditions: conditions)
                 }
             }
 
@@ -4669,13 +4662,13 @@ private class SettingsBuilder {
                     for arch in archs {
                         let scope = scope.subscopeBindingArchAndTriple(arch: arch)
                         let originalValues = scope.evaluate(macro)
-                        processRemapping(scope, originalValues.map{ Path($0) }, variant: variant, arch: arch)
+                        processRemapping(scope, originalValues.map { Path($0) }, variant: variant, arch: arch)
                     }
                 }
             } else {
                 // If CURRENT_* macros were not found while evaluating the macro, then use the original values already parsed
                 // to process the remapping.
-                processRemapping(scope, originalValues.map{ Path($0) })
+                processRemapping(scope, originalValues.map { Path($0) })
             }
         }
 
@@ -4738,8 +4731,7 @@ private class SettingsBuilder {
             let assignedSDKVariantDeploymentTarget: Version
             if let deploymentTarget = try? Version(assignedSDKVariantDeploymentTargetString) {
                 assignedSDKVariantDeploymentTarget = deploymentTarget
-            }
-            else {
+            } else {
                 self.notes.append("The \(buildTarget) deployment target '\(sdkVariantDeploymentTargetMacro!.name)' is set to '\(assignedSDKVariantDeploymentTargetString)' - setting to default value '\(defaultSDKVariantDeploymentTarget.description)'.")
                 assignedSDKVariantDeploymentTarget = defaultSDKVariantDeploymentTarget
             }
@@ -4777,8 +4769,7 @@ private class SettingsBuilder {
                     getMacOSDeploymentTargetFromIOSDeploymentTarget = true
                 }
                 // If macOS deployment target is already defined, we do not check it against a macCatalyst-specific minimum value.  Building a macCatalyst target with a macOS deployment target earlier than the release in which macCatalyst first shipped (10.15) is allowed for zippered products.
-            }
-            else {
+            } else {
                 getMacOSDeploymentTargetFromIOSDeploymentTarget = true
             }
             if getMacOSDeploymentTargetFromIOSDeploymentTarget {
@@ -4787,8 +4778,7 @@ private class SettingsBuilder {
                 platformDeploymentTarget = macOSDeploymentTarget
                 table.push(BuiltinMacros.MACOSX_DEPLOYMENT_TARGET, literal: macOSDeploymentTarget.description)
             }
-        }
-        else {
+        } else {
             sdkVariantDeploymentTargetMacro = nil
             sdkVariantDeploymentTarget = nil
 
@@ -4805,8 +4795,7 @@ private class SettingsBuilder {
                     if let macOSDeploymentTarget = platformDeploymentTarget {
                         // 13.0 is a backstop in case anything isn't defined here.
                         candidateiOSDeploymentTarget = sdk?.versionMap["macOS_iOSMac"]?[macOSDeploymentTarget] ?? Version(13, 0)
-                    }
-                    else {
+                    } else {
                         candidateiOSDeploymentTarget = Version(13, 0)
                     }
                 }
@@ -4865,7 +4854,7 @@ private class SettingsBuilder {
             for setting in [
                 // We should move the check for ONLY_ACTIVE_ARCH here from getCommonTargetTaskOverrides().
                 //BuiltinMacros.ONLY_ACTIVE_ARCH,
-                BuiltinMacros.VALID_ARCHS,
+                BuiltinMacros.VALID_ARCHS
             ] {
                 let definedAtLevels = allProjectSettingsLevels.compactMap { settings in
                     settings.table?.contains(setting) == true ? settings.level : nil
@@ -4930,7 +4919,7 @@ private class SettingsBuilder {
         // Check settings which should either not be defined at all, or which we warn if defined to a specific value.
         for (setting, values, explanation): (MacroDeclaration, [String]?, String?) in [
             // We no longer ship libstdc++ so we warn about it specifically.  c.f. <rdar://83768231>
-            (BuiltinMacros.CLANG_CXX_LIBRARY, ["libstdc++"], "The 'libstdc++' C++ Standard Library is no longer available, and this setting can be removed."),
+            (BuiltinMacros.CLANG_CXX_LIBRARY, ["libstdc++"], "The 'libstdc++' C++ Standard Library is no longer available, and this setting can be removed.")
         ] {
             if let values, !values.isEmpty {
                 // If values is not empty, then we only emit warnings is we detect that the setting is defined to one of the given values.
@@ -4942,8 +4931,7 @@ private class SettingsBuilder {
                         break
                     }
                 }
-            }
-            else {
+            } else {
                 // If values is empty then we emit a warning if the setting is defined at all.
                 let assignedValue = scope.evaluateAsString(setting)
                 if !assignedValue.isEmpty {
@@ -4984,8 +4972,8 @@ private class SettingsBuilder {
             // .append because this setting is commonly used to work around rdar://73504582
             (BuiltinMacros.PRODUCT_SPECIFIC_LDFLAGS, .append),
 
-            (BuiltinMacros.__108704016_DEVELOPER_TOOLCHAIN_DIR_MISUSE_IS_WARNING, .none), // don't allow this to be overridden at the project level
-            (BuiltinMacros.RESCHEDULE_INDEPENDENT_HEADERS_PHASES, .none), // don't allow this to be overridden at the project level
+            (BuiltinMacros.__108704016_DEVELOPER_TOOLCHAIN_DIR_MISUSE_IS_WARNING, .none),  // don't allow this to be overridden at the project level
+            (BuiltinMacros.RESCHEDULE_INDEPENDENT_HEADERS_PHASES, .none),  // don't allow this to be overridden at the project level
         ] as [(MacroDeclaration, SettingMutability)] {
             let definedAtLevels = allProjectSettingsLevels.compactMap { settings -> String? in
                 guard let assignment = settings.table?.valueAssignments[setting] else {
@@ -5125,8 +5113,9 @@ private class SettingsBuilder {
         let paths: [Path] = buildFiles.compactMap { buildFile in
             // Considering only file references.
             guard case let .reference(guid) = buildFile.buildableItem,
-                  let reference = workspaceContext.workspace.lookupReference(for: guid),
-                  let fileRef = reference as? FileReference else {
+                let reference = workspaceContext.workspace.lookupReference(for: guid),
+                let fileRef = reference as? FileReference
+            else {
                 return nil
             }
 
@@ -5198,9 +5187,11 @@ private class SettingsBuilder {
                 // when they have certain localization file extensions but not others.
 
                 // A pattern prefix here is a pattern up to but not including the file extension suffix.
-                var fileExtensionsToMatchingPatternPrefixes: [String: Set<Substring>] = Dictionary(uniqueKeysWithValues: locFileExtensions.map({ locExtension in
-                    return (locExtension, [])
-                }))
+                var fileExtensionsToMatchingPatternPrefixes: [String: Set<Substring>] = Dictionary(
+                    uniqueKeysWithValues: locFileExtensions.map({ locExtension in
+                        return (locExtension, [])
+                    })
+                )
                 for pattern in patterns {
                     guard let fileExtensionDotIndex = indexOfFileExtensionDot(inPattern: pattern) else {
                         continue
@@ -5298,17 +5289,25 @@ extension BuildConfiguration {
 }
 
 extension StandardTarget {
-    public func linksAnyFramework(names: [String], in scope: MacroEvaluationScope, workspaceContext: WorkspaceContext, specLookupContext: any SpecLookupContext, boundSettings: [StringListMacroDeclaration:[String]], filePathResolver: FilePathResolver) -> Bool {
+    public func linksAnyFramework(names: [String], in scope: MacroEvaluationScope, workspaceContext: WorkspaceContext, specLookupContext: any SpecLookupContext, boundSettings: [StringListMacroDeclaration: [String]], filePathResolver: FilePathResolver) -> Bool {
         // Look for an explicit reference to any of the frameworks in the target's linked frameworks
         let frameworkNames = names.map({ return "\($0).framework" })
         if let frameworkFileType = specLookupContext.lookupFileType(identifier: "wrapper.framework"),
             let buildPhase = frameworksBuildPhase,
-            buildPhase.containsFiles(ofType: frameworkFileType, workspaceContext.workspace, specLookupContext, scope, filePathResolver, { fileRef in
-                if let basename = fileRef.path.asLiteralString.map(Path.init)?.basename {
-                    return frameworkNames.contains(basename)
+            buildPhase.containsFiles(
+                ofType: frameworkFileType,
+                workspaceContext.workspace,
+                specLookupContext,
+                scope,
+                filePathResolver,
+                { fileRef in
+                    if let basename = fileRef.path.asLiteralString.map(Path.init)?.basename {
+                        return frameworkNames.contains(basename)
+                    }
+                    return false
                 }
-                return false
-            }) {
+            )
+        {
             return true
         }
 
diff --git a/Sources/SWBCore/Settings/StackedSearchPaths.swift b/Sources/SWBCore/Settings/StackedSearchPaths.swift
index ebde1977..3c5b5866 100644
--- a/Sources/SWBCore/Settings/StackedSearchPaths.swift
+++ b/Sources/SWBCore/Settings/StackedSearchPaths.swift
@@ -103,7 +103,7 @@ extension StackedSearchPathLookupError: CustomStringConvertible {
     public var description: String {
         switch self {
         case let .unableToFind(subject, operatingSystem, searchPaths):
-            let candidates = searchPaths.flatMap { $0.paths.map { $0.join(subject.fileName(operatingSystem: operatingSystem)).str }}
+            let candidates = searchPaths.flatMap { $0.paths.map { $0.join(subject.fileName(operatingSystem: operatingSystem)).str } }
             return "unable to find \(subject.fileName(operatingSystem: operatingSystem).str) among search paths: \(candidates.joined(separator: ", "))"
         }
     }
diff --git a/Sources/SWBCore/ShellScript.swift b/Sources/SWBCore/ShellScript.swift
index 2c42f82f..66cc8c49 100644
--- a/Sources/SWBCore/ShellScript.swift
+++ b/Sources/SWBCore/ShellScript.swift
@@ -136,7 +136,8 @@ public func computeScriptEnvironment(_ type: ScriptType, scope: MacroEvaluationS
         BuiltinMacros.INSTALL_OWNER, BuiltinMacros.INSTALL_GROUP,
         BuiltinMacros.INSTALL_MODE_FLAG,
         BuiltinMacros.DEVELOPMENT_LANGUAGE,
-        BuiltinMacros.FRAMEWORK_VERSION]
+        BuiltinMacros.FRAMEWORK_VERSION,
+    ]
     for macro in alwaysPresentStringMacros {
         result[macro.name] = scope.evaluate(macro)
     }
@@ -149,7 +150,8 @@ public func computeScriptEnvironment(_ type: ScriptType, scope: MacroEvaluationS
         BuiltinMacros.TEMP_FILE_DIR,
         BuiltinMacros.DERIVED_FILES_DIR,
         BuiltinMacros.TARGET_BUILD_DIR,
-        BuiltinMacros.BUILT_PRODUCTS_DIR]
+        BuiltinMacros.BUILT_PRODUCTS_DIR,
+    ]
     for macro in alwaysPresentPathMacros {
         result[macro.name] = scope.evaluate(macro).str
     }
diff --git a/Sources/SWBCore/SigningSupport.swift b/Sources/SWBCore/SigningSupport.swift
index 68921059..4c97527e 100644
--- a/Sources/SWBCore/SigningSupport.swift
+++ b/Sources/SWBCore/SigningSupport.swift
@@ -21,8 +21,7 @@ public enum EntitlementsVariant: Int, Serializable, Sendable {
 }
 
 /// Provides contextual behavior for code signing based on the type of platform being targeted.
-public protocol PlatformSigningContext: Sendable
-{
+public protocol PlatformSigningContext: Sendable {
     func adHocSigningAllowed(_ scope: MacroEvaluationScope) -> Bool
 
     func useAdHocSigningIfSigningIsRequiredButNotSpecified(_ scope: MacroEvaluationScope) -> Bool
@@ -34,30 +33,25 @@ public protocol PlatformSigningContext: Sendable
     func supportsAppSandboxAndHardenedRuntime() -> Bool
 }
 
-extension PlatformSigningContext
-{
+extension PlatformSigningContext {
     /// Returns `true` is ad hoc signing is allowed for the platform.
     ///
     /// This is only in the signing context because some contexts want to call it from `useAdHocSigningIfSigningIsRequiredButNotSpecified()`.
-    @_spi(Testing) public func adHocSigningAllowed(_ scope: MacroEvaluationScope) -> Bool
-    {
+    @_spi(Testing) public func adHocSigningAllowed(_ scope: MacroEvaluationScope) -> Bool {
         // Yup, amazingly AD_HOC_CODE_SIGNING_ALLOWED is considered to be true if either it is defined to be true *or* if it is empty.  It has to be explicitly false to be false.  I infer this is for compatibility reasons so the platforms or SDKs don't need to be mass-revved.
         return scope.evaluateAsString(BuiltinMacros.AD_HOC_CODE_SIGNING_ALLOWED).isEmpty || scope.evaluate(BuiltinMacros.AD_HOC_CODE_SIGNING_ALLOWED)
     }
 
     /// Returns `true` if ad hoc signing should be used if signing is required but no signing identity is provided.
-    @_spi(Testing) public func useAdHocSigningIfSigningIsRequiredButNotSpecified(_ scope: MacroEvaluationScope) -> Bool
-    {
+    @_spi(Testing) public func useAdHocSigningIfSigningIsRequiredButNotSpecified(_ scope: MacroEvaluationScope) -> Bool {
         return false
     }
 
-    @_spi(Testing) public func shouldPassEntitlementsFileContentToCodeSign() -> Bool
-    {
+    @_spi(Testing) public func shouldPassEntitlementsFileContentToCodeSign() -> Bool {
         return true
     }
 
-    @_spi(Testing) public func requiresEntitlements(_ scope: MacroEvaluationScope, hasProfile: Bool, productFileType: FileTypeSpec) -> Bool
-    {
+    @_spi(Testing) public func requiresEntitlements(_ scope: MacroEvaluationScope, hasProfile: Bool, productFileType: FileTypeSpec) -> Bool {
         return hasProfile || scope.evaluate(BuiltinMacros.ENTITLEMENTS_REQUIRED)
     }
 
@@ -66,45 +60,34 @@ extension PlatformSigningContext
     }
 }
 
-
 /// Provides behavior for code signing for the macOS platform.
-@_spi(Testing) public struct MacSigningContext: PlatformSigningContext
-{
+@_spi(Testing) public struct MacSigningContext: PlatformSigningContext {
     @_spi(Testing) public func supportsAppSandboxAndHardenedRuntime() -> Bool {
         return true
     }
 }
 
-
 /// Provides behavior for code signing for device platforms.
-@_spi(Testing) public struct DeviceSigningContext: PlatformSigningContext
-{
-    @_spi(Testing) public func useAdHocSigningIfSigningIsRequiredButNotSpecified(_ scope: MacroEvaluationScope) -> Bool
-    {
+@_spi(Testing) public struct DeviceSigningContext: PlatformSigningContext {
+    @_spi(Testing) public func useAdHocSigningIfSigningIsRequiredButNotSpecified(_ scope: MacroEvaluationScope) -> Bool {
         return adHocSigningAllowed(scope)
     }
 
-    @_spi(Testing) public func requiresEntitlements(_ scope: MacroEvaluationScope, hasProfile: Bool, productFileType: FileTypeSpec) -> Bool
-    {
+    @_spi(Testing) public func requiresEntitlements(_ scope: MacroEvaluationScope, hasProfile: Bool, productFileType: FileTypeSpec) -> Bool {
         // Entitlements are only required if what we're signing is not a framework.
         return productFileType.isFramework ? false : (hasProfile || scope.evaluate(BuiltinMacros.ENTITLEMENTS_REQUIRED))
     }
 }
 
-
 /// Provides behavior for code signing for simulator platforms.
-@_spi(Testing) public struct SimulatorSigningContext: PlatformSigningContext
-{
-    @_spi(Testing) public func shouldPassEntitlementsFileContentToCodeSign() -> Bool
-    {
+@_spi(Testing) public struct SimulatorSigningContext: PlatformSigningContext {
+    @_spi(Testing) public func shouldPassEntitlementsFileContentToCodeSign() -> Bool {
         // We don't want to codesign with entitlements because we put them in the LD_ENTITLEMENTS_SECTION.
         return false
     }
 
-    @_spi(Testing) public func requiresEntitlements(_ scope: MacroEvaluationScope, hasProfile: Bool, productFileType: FileTypeSpec) -> Bool
-    {
+    @_spi(Testing) public func requiresEntitlements(_ scope: MacroEvaluationScope, hasProfile: Bool, productFileType: FileTypeSpec) -> Bool {
         // We don't need entitlements when building for the simulator.
         return false
     }
 }
-
diff --git a/Sources/SWBCore/SpecImplementations/CommandLineToolSpec.swift b/Sources/SWBCore/SpecImplementations/CommandLineToolSpec.swift
index cee454e4..afb4c153 100644
--- a/Sources/SWBCore/SpecImplementations/CommandLineToolSpec.swift
+++ b/Sources/SWBCore/SpecImplementations/CommandLineToolSpec.swift
@@ -36,7 +36,7 @@ public protocol InputFileGroupable: RegionVariable {
     var regionVariantName: String? { get }
 }
 
-extension FileToBuild: InputFileGroupable { }
+extension FileToBuild: InputFileGroupable {}
 
 public protocol InputFileGroupingStrategyFactory: Sendable {
     func makeStrategy(specIdentifier: String) -> any InputFileGroupingStrategy
@@ -62,7 +62,7 @@ public extension InputFileGroupingStrategy {
 }
 
 /// A grouping strategy that groups all files in a build phase which match a given build rule into the same group.  For example, all files to be processed by the Swift compiler in a build phase will be passed to a single invocation of the compiler.
-@_spi(Testing) public final class AllInputFilesGroupingStrategy : InputFileGroupingStrategy, Encodable {
+@_spi(Testing) public final class AllInputFilesGroupingStrategy: InputFileGroupingStrategy, Encodable {
 
     /// Group identifier that’s returned for every path.
     let groupIdentifier: String
@@ -78,7 +78,7 @@ public extension InputFileGroupingStrategy {
 }
 
 /// A grouping strategy that groups all files in a build phase with the same filename base into a single invocation of the tool, but files with different bases will be passed to different invocations.
-@_spi(Testing) public final class CommonFileBaseInputFileGroupingStrategy : InputFileGroupingStrategy {
+@_spi(Testing) public final class CommonFileBaseInputFileGroupingStrategy: InputFileGroupingStrategy {
 
     /// Name of the tool to which the grouping strategy belongs (used as a part of the returned group identifier).
     let toolName: String
@@ -99,7 +99,6 @@ protocol DependencyInfoEditableTaskPayload: TaskPayload {
 
 // MARK:
 
-
 /// A class that adopts this protocol can be used to collect information for creating tasks for a given command line tool spec, e.g. information from elsewhere in the build phase or target which is not local to the input files of the task being created.
 public protocol BuildPhaseInfoForToolSpec: AnyObject, Sendable {
     // Certainly other parameters can be added here, or ways to collect broader information than just on individual files, but the initial implementation only covers what it was needed for.
@@ -108,7 +107,6 @@ public protocol BuildPhaseInfoForToolSpec: AnyObject, Sendable {
     func addToContext(_ ftb: FileToBuild)
 }
 
-
 /// Discovered info about a command line tool spec.
 public protocol DiscoveredCommandLineToolSpecInfo: BuildOptionGenerationContext, Sendable {
 }
@@ -248,14 +246,14 @@ extension DiscoveredCommandLineToolSpecInfo {
         }
         return try await producer.discoveredCommandLineToolSpecInfo(delegate, toolPath.basename, ["/usr/bin/what", "-q", toolPath.str]) { executionResult in
             let outputString = String(decoding: executionResult.stdout, as: UTF8.self).trimmingCharacters(in: .whitespacesAndNewlines)
-            let lines = Set(outputString.split(separator: "\n").map(String.init)) // version info is printed once per architecture slice, but we never expect them to differ
+            let lines = Set(outputString.split(separator: "\n").map(String.init))  // version info is printed once per architecture slice, but we never expect them to differ
             return try construct(AppleGenericVersionInfo(string: lines.only ?? outputString))
         }
     }
 }
 
-open class CommandLineToolSpec : PropertyDomainSpec, SpecType, TaskTypeDescription, @unchecked Sendable {
-    package enum CommandLineTemplateArg : Sendable {
+open class CommandLineToolSpec: PropertyDomainSpec, SpecType, TaskTypeDescription, @unchecked Sendable {
+    package enum CommandLineTemplateArg: Sendable {
         /// Placeholder for the dynamically computed executable path.
         //
         // FIXME: Note, this is only used by 'Ld.xcspec', there might be a simpler implementation.
@@ -443,9 +441,11 @@ open class CommandLineToolSpec : PropertyDomainSpec, SpecType, TaskTypeDescripti
                 parser.error("invalid 'CommandLine' template placeholder arg: '\(str)'")
                 return .literal(value: parser.delegate.internalMacroNamespace.parseLiteralStringList([str]))
             default:
-                return .literal(value: parser.delegate.internalMacroNamespace.parseStringList(str) { diag in
+                return .literal(
+                    value: parser.delegate.internalMacroNamespace.parseStringList(str) { diag in
                         parser.handleMacroDiagnostic(diag, "macro parsing error in 'CommandLine' template")
-                    })
+                    }
+                )
             }
         }
     }
@@ -468,9 +468,11 @@ open class CommandLineToolSpec : PropertyDomainSpec, SpecType, TaskTypeDescripti
                 parser.error("invalid 'RuleName' template placeholder arg: '\(str)'")
                 return .literal(value: parser.delegate.internalMacroNamespace.parseLiteralStringList([str]))
             default:
-                return .literal(value: parser.delegate.internalMacroNamespace.parseStringList(str) { diag in
+                return .literal(
+                    value: parser.delegate.internalMacroNamespace.parseStringList(str) { diag in
                         parser.handleMacroDiagnostic(diag, "macro parsing error in 'RuleName' template")
-                    })
+                    }
+                )
             }
         }
     }
@@ -479,8 +481,7 @@ open class CommandLineToolSpec : PropertyDomainSpec, SpecType, TaskTypeDescripti
         // Parse the execution description, which is a macro-expandable display description of a single invocation of the tool.
         if let execDescString = parser.parseString("ExecDescription") {
             self.execDescription = parser.delegate.internalMacroNamespace.parseString(execDescString)
-        }
-        else {
+        } else {
             self.execDescription = nil
         }
 
@@ -559,14 +560,19 @@ open class CommandLineToolSpec : PropertyDomainSpec, SpecType, TaskTypeDescripti
         if let envVariables = parser.parseObject("EnvironmentVariables", inherited: false) {
             if case .plDict(let items) = envVariables {
                 var variables: [(String, MacroStringExpression)] = []
-                for (key,valueData) in items.sorted(by: \.0) {
+                for (key, valueData) in items.sorted(by: \.0) {
                     guard case .plString(let value) = valueData else {
                         parser.error("invalid value for '\(key)' key in 'EnvironmentVariables' (expected string)")
                         continue
                     }
-                    variables.append((key, parser.delegate.internalMacroNamespace.parseString(value) { diag in
-                        parser.handleMacroDiagnostic(diag, "macro parsing error in 'EnvironmentVariables' for key '\(key)'")
-                    }))
+                    variables.append(
+                        (
+                            key,
+                            parser.delegate.internalMacroNamespace.parseString(value) { diag in
+                                parser.handleMacroDiagnostic(diag, "macro parsing error in 'EnvironmentVariables' for key '\(key)'")
+                            }
+                        )
+                    )
                 }
                 self.environmentVariables = variables
             } else {
@@ -587,8 +593,7 @@ open class CommandLineToolSpec : PropertyDomainSpec, SpecType, TaskTypeDescripti
 
         if let additionalDirectoriesToCreate = parser.parseStringList("AdditionalDirectoriesToCreate") {
             self.additionalDirectoriesToCreate = additionalDirectoriesToCreate.map({ parser.delegate.internalMacroNamespace.parseString($0) })
-        }
-        else {
+        } else {
             self.additionalDirectoriesToCreate = nil
         }
 
@@ -618,7 +623,7 @@ open class CommandLineToolSpec : PropertyDomainSpec, SpecType, TaskTypeDescripti
             for grouping in groupings {
                 // We should really have something more extensible here, but for now this will do.
                 switch grouping {
-                case "tool":  groupingStrategies.append(AllInputFilesGroupingStrategy(groupIdentifier: parser.proxy.data["Identifier"]!.description))
+                case "tool": groupingStrategies.append(AllInputFilesGroupingStrategy(groupIdentifier: parser.proxy.data["Identifier"]!.description))
                 case "common-file-base": groupingStrategies.append(CommonFileBaseInputFileGroupingStrategy(toolName: parser.proxy.data["Identifier"]!.description))
                 default:
                     if let strategy = parser.delegate.groupingStrategy(name: grouping, specIdentifier: parser.proxy.data["Identifier"]!.description) {
@@ -629,8 +634,7 @@ open class CommandLineToolSpec : PropertyDomainSpec, SpecType, TaskTypeDescripti
                 }
             }
             self.inputFileGroupingStrategies = groupingStrategies
-        }
-        else {
+        } else {
             self.inputFileGroupingStrategies = nil
         }
 
@@ -649,7 +653,7 @@ open class CommandLineToolSpec : PropertyDomainSpec, SpecType, TaskTypeDescripti
         //
         // FIXME: Eliminate any of these fields which are unused.
         parser.parseStringList("AdditionalFilesToClean")
-        parser.parseString("AdditionalInputFiles") // FIXME: This should be a string list.
+        parser.parseString("AdditionalInputFiles")  // FIXME: This should be a string list.
         parser.parseBool("CaresAboutInclusionDependencies")
         parser.parseString("CommandIdentifier")
         parser.parseObject("CommandOutputParser")
@@ -815,7 +819,7 @@ open class CommandLineToolSpec : PropertyDomainSpec, SpecType, TaskTypeDescripti
                     outputs.append(delegate.createNode(onlyPath))
                     return .dependencyInfo(onlyPath)
                 } else {
-                    assert(!only.value.isEmpty) // shouldn't be possible to get an empty array here
+                    assert(!only.value.isEmpty)  // shouldn't be possible to get an empty array here
                     delegate.error("Multiple build options specified dependency info in ld64 format")
                 }
             case .makefile:
@@ -823,7 +827,7 @@ open class CommandLineToolSpec : PropertyDomainSpec, SpecType, TaskTypeDescripti
                     outputs.append(delegate.createNode(onlyPath))
                     return .makefile(onlyPath)
                 } else {
-                    assert(!only.value.isEmpty) // shouldn't be possible to get an empty array here
+                    assert(!only.value.isEmpty)  // shouldn't be possible to get an empty array here
                     outputs.append(contentsOf: only.value.map(delegate.createNode))
                     return .makefiles(only.value)
                 }
@@ -900,13 +904,11 @@ open class CommandLineToolSpec : PropertyDomainSpec, SpecType, TaskTypeDescripti
         if swapOutputsWithInputsForIndexing {
             if let input = cbc.inputs.only, outputs.count == 1 {
                 indexingInputReplacement = input.absolutePath
-            }
-            else {
+            } else {
                 delegate.warning("SwapOutputsWithInputsForIndexing is enabled, but there were \(cbc.inputs.count) inputs and \(outputs.count) outputs (expected 1 and 1)")
                 indexingInputReplacement = nil
             }
-        }
-        else {
+        } else {
             indexingInputReplacement = nil
         }
 
@@ -916,12 +918,14 @@ open class CommandLineToolSpec : PropertyDomainSpec, SpecType, TaskTypeDescripti
 
         // Add the additional outputs defined by the spec.  These are not declared as outputs but should be processed by the tool separately.
         let additionalEvaluatedOutputsResult = await additionalEvaluatedOutputs(cbc, delegate)
-        outputs.append(contentsOf: additionalEvaluatedOutputsResult.outputs.map { output in
-            if let fileTypeIdentifier = output.fileType, let fileType = cbc.producer.lookupFileType(identifier: fileTypeIdentifier) {
-                delegate.declareOutput(FileToBuild(absolutePath: output.path, fileType: fileType))
+        outputs.append(
+            contentsOf: additionalEvaluatedOutputsResult.outputs.map { output in
+                if let fileTypeIdentifier = output.fileType, let fileType = cbc.producer.lookupFileType(identifier: fileTypeIdentifier) {
+                    delegate.declareOutput(FileToBuild(absolutePath: output.path, fileType: fileType))
+                }
+                return delegate.createNode(output.path)
             }
-            return delegate.createNode(output.path)
-        })
+        )
 
         if let infoPlistContent = additionalEvaluatedOutputsResult.generatedInfoPlistContent {
             delegate.declareGeneratedInfoPlistContent(infoPlistContent)
@@ -931,10 +935,12 @@ open class CommandLineToolSpec : PropertyDomainSpec, SpecType, TaskTypeDescripti
         let executionDescription = resolveExecutionDescription(cbc, delegate, lookup: lookup)
 
         // Create the inputs.
-        var inputs: [any PlannedNode] = cbc.inputs.flatMap{ input -> [any PlannedNode] in
+        var inputs: [any PlannedNode] = cbc.inputs.flatMap { input -> [any PlannedNode] in
             if areInputsDirectoryTrees {
-                return [delegate.createDirectoryTreeNode(input.absolutePath),
-                        delegate.createNode(input.absolutePath)] as [any PlannedNode]
+                return [
+                    delegate.createDirectoryTreeNode(input.absolutePath),
+                    delegate.createNode(input.absolutePath),
+                ] as [any PlannedNode]
             } else {
                 return [delegate.createNode(input.absolutePath)] as [any PlannedNode]
             }
@@ -951,11 +957,16 @@ open class CommandLineToolSpec : PropertyDomainSpec, SpecType, TaskTypeDescripti
         await inputs.append(contentsOf: additionalInputDependencies(cbc, delegate, optionContext: discoveredCommandLineToolSpecInfo(cbc.producer, cbc.scope, delegate), lookup: lookup).map(delegate.createNode))
 
         delegate.createTask(
-            type: self, dependencyData: dependencyData, payload: payload,
-            ruleInfo: ruleInfo, commandLine: commandLine,
+            type: self,
+            dependencyData: dependencyData,
+            payload: payload,
+            ruleInfo: ruleInfo,
+            commandLine: commandLine,
             environment: EnvironmentBindings(environment),
             workingDirectory: cbc.producer.defaultWorkingDirectory,
-            inputs: inputs, outputs: outputs, mustPrecede: [],
+            inputs: inputs,
+            outputs: outputs,
+            mustPrecede: [],
             action: createTaskAction(cbc, delegate),
             execDescription: executionDescription,
             preparesForIndexing: cbc.preparesForIndexing,
@@ -1007,18 +1018,20 @@ open class CommandLineToolSpec : PropertyDomainSpec, SpecType, TaskTypeDescripti
         let inputFileType = cbc.inputs.first?.fileType
         let lookup = { self.lookup($0, cbc, delegate) }
         let optionContext = await discoveredCommandLineToolSpecInfo(producer, scope, delegate)
-        result.outputs.append(contentsOf: cbc.producer.effectiveFlattenedOrderedBuildOptions(self, filter: .all).flatMap { buildOption -> [(Path, String?)] in
-            // Check if the effective arguments for this build option were non-empty as a proxy for whether it got filtered out by architecture mismatch, etc.
-            guard let outputDependencies = buildOption.outputDependencies, !buildOption.getArgumentsForCommand(producer, scope: scope, inputFileType: inputFileType, optionContext: optionContext, lookup: lookup).isEmpty else {
-                return []
-            }
-            return outputDependencies.compactMap { outputDependency in
-                guard let path = Path(scope.evaluate(outputDependency.path, lookup: lookup)).nilIfEmpty else {
-                    return nil
+        result.outputs.append(
+            contentsOf: cbc.producer.effectiveFlattenedOrderedBuildOptions(self, filter: .all).flatMap { buildOption -> [(Path, String?)] in
+                // Check if the effective arguments for this build option were non-empty as a proxy for whether it got filtered out by architecture mismatch, etc.
+                guard let outputDependencies = buildOption.outputDependencies, !buildOption.getArgumentsForCommand(producer, scope: scope, inputFileType: inputFileType, optionContext: optionContext, lookup: lookup).isEmpty else {
+                    return []
+                }
+                return outputDependencies.compactMap { outputDependency in
+                    guard let path = Path(scope.evaluate(outputDependency.path, lookup: lookup)).nilIfEmpty else {
+                        return nil
+                    }
+                    return (path.normalize(), outputDependency.fileType.map { scope.evaluate($0, lookup: lookup).nilIfEmpty } ?? nil)
                 }
-                return (path.normalize(), outputDependency.fileType.map { scope.evaluate($0, lookup: lookup).nilIfEmpty } ?? nil)
             }
-        })
+        )
 
         return result
     }
@@ -1065,7 +1078,7 @@ open class CommandLineToolSpec : PropertyDomainSpec, SpecType, TaskTypeDescripti
         switch macro {
         case BuiltinMacros.DerivedFilesDir:
             return Static { BuiltinMacros.namespace.parseString("$(DERIVED_SOURCES_DIR)") }
-        case BuiltinMacros.InputFile,  BuiltinMacros.InputFilePath, BuiltinMacros.InputPath:
+        case BuiltinMacros.InputFile, BuiltinMacros.InputFilePath, BuiltinMacros.InputPath:
             return namespace.parseLiteralString(firstInput(\.absolutePath.str) ?? "")
         case BuiltinMacros.InputFileDir:
             return namespace.parseLiteralString(firstInput(\.absolutePath.dirname.str) ?? "")
@@ -1155,9 +1168,9 @@ open class CommandLineToolSpec : PropertyDomainSpec, SpecType, TaskTypeDescripti
                 return cbc.inputs.map { $0.absolutePath.str }
             case .output:
                 // We always resolve the Output via a recursive macro evaluation. See constructTasks() for more information.
-                return [cbc.scope.evaluate(BuiltinMacros.OutputPath, lookup: { return self.lookup($0, cbc, delegate, lookup) } )]
+                return [cbc.scope.evaluate(BuiltinMacros.OutputPath, lookup: { return self.lookup($0, cbc, delegate, lookup) })]
             case .literal(let expr):
-                return cbc.scope.evaluate(expr, lookup: { return self.lookup($0, cbc, delegate, lookup) } )
+                return cbc.scope.evaluate(expr, lookup: { return self.lookup($0, cbc, delegate, lookup) })
             }
         }
     }
@@ -1245,7 +1258,7 @@ open class CommandLineToolSpec : PropertyDomainSpec, SpecType, TaskTypeDescripti
 
             case .output:
                 // We always resolve the Output via a recursive macro evaluation. See constructTasks() for more information.
-                return [.path(Path(cbc.scope.evaluate(BuiltinMacros.OutputPath, lookup: { return self.lookup($0, cbc, delegate, lookup) } )))]
+                return [.path(Path(cbc.scope.evaluate(BuiltinMacros.OutputPath, lookup: { return self.lookup($0, cbc, delegate, lookup) })))]
 
             case .specialArgs:
                 return specialArgs.map { .literal(ByteString(encodingAsUTF8: $0)) }
@@ -1436,14 +1449,14 @@ extension CommandLineToolSpec.RuleInfoTemplateArg: ExpressibleByStringLiteral {
     }
 }
 
-open class GenericCommandLineToolSpec : CommandLineToolSpec, @unchecked Sendable {
+open class GenericCommandLineToolSpec: CommandLineToolSpec, @unchecked Sendable {
     required public init(_ parser: SpecParser, _ basedOnSpec: Spec?) {
         super.init(parser, basedOnSpec, isGeneric: true)
     }
 }
 
 /// A general-purpose output parser for scraping traditional POSIX-style diagnostics.  Output is passed through to the delegate as it is received, while diagnostic parsing is done line-by-line as each newline is encountered.
-open class GenericOutputParser : TaskOutputParser {
+open class GenericOutputParser: TaskOutputParser {
 
     /// The delegate that's informed about output and diagnostics.
     public let delegate: any TaskOutputParserDelegate
@@ -1606,7 +1619,7 @@ open class GenericOutputParser : TaskOutputParser {
     }
 }
 
-@_spi(Testing) public final class ShellScriptOutputParser : GenericOutputParser {
+@_spi(Testing) public final class ShellScriptOutputParser: GenericOutputParser {
     override func parseLine<S: Collection>(_ lineBytes: S) -> Bool where S.Element == UInt8 {
         if !super.parseLine(lineBytes) {
             // Use the non-failable constructor to recover from potentially invalid UTF-8
@@ -1658,8 +1671,8 @@ public final class SerializedDiagnosticsOutputParser: TaskOutputParser {
 fileprivate extension Diagnostic.FixIt {
 
     // For better performance, these are declared outside the initializer, so they are just created once, but are really just an implementation detail of the initializer.
-    static private let fixitRangeRegex = RegEx(patternLiteral: "^([^:]+):([0-9]+):([0-9]+)-([0-9]+):([0-9]+): +fixit: (.*)$") // filename + range
-    static private let fixitLineColumnRegex = RegEx(patternLiteral: "^([^:]+):([0-9]+):([0-9]+): +fixit: (.*)$") // filename + line + column
+    static private let fixitRangeRegex = RegEx(patternLiteral: "^([^:]+):([0-9]+):([0-9]+)-([0-9]+):([0-9]+): +fixit: (.*)$")  // filename + range
+    static private let fixitLineColumnRegex = RegEx(patternLiteral: "^([^:]+):([0-9]+):([0-9]+): +fixit: (.*)$")  // filename + line + column
 
     init?(_ string: String, ignorePaths: Set<String>, workingDirectory: Path) {
         // reminder: fixit lines should look like this: FILE:LINE:COL-LINE:COL: fixit: REPLACEMENT\n
diff --git a/Sources/SWBCore/SpecImplementations/CompilerSpec.swift b/Sources/SWBCore/SpecImplementations/CompilerSpec.swift
index ca3d1696..3b854da0 100644
--- a/Sources/SWBCore/SpecImplementations/CompilerSpec.swift
+++ b/Sources/SWBCore/SpecImplementations/CompilerSpec.swift
@@ -14,7 +14,7 @@ import Foundation
 public import SWBUtil
 import SWBMacro
 
-open class CompilerSpec : CommandLineToolSpec, @unchecked Sendable {
+open class CompilerSpec: CommandLineToolSpec, @unchecked Sendable {
     class public override var typeName: String {
         return "Compiler"
     }
@@ -28,15 +28,16 @@ open class CompilerSpec : CommandLineToolSpec, @unchecked Sendable {
     @_spi(Testing) public let supportedLanguageVersions: [Version]
 
     public override init(_ parser: SpecParser, _ basedOnSpec: Spec?, isGeneric: Bool) {
-        supportedLanguageVersions = parser.parseStringList("SupportedLanguageVersions")?.compactMap {
-            do {
-                return try Version($0)
-            } catch {
-                // FIXME: This should eventually become an error.
-                parser.warning("Could not parse `SupportedLanguageVersions`: \(error)")
-                return nil
-            }
-        } ?? []
+        supportedLanguageVersions =
+            parser.parseStringList("SupportedLanguageVersions")?.compactMap {
+                do {
+                    return try Version($0)
+                } catch {
+                    // FIXME: This should eventually become an error.
+                    parser.warning("Could not parse `SupportedLanguageVersions`: \(error)")
+                    return nil
+                }
+            } ?? []
 
         // Parse and ignore keys we have no use for.
         //
@@ -123,7 +124,7 @@ extension ProjectFailuresBlockList {
     }
 }
 
-open class GenericCompilerSpec : CompilerSpec, @unchecked Sendable {
+open class GenericCompilerSpec: CompilerSpec, @unchecked Sendable {
     required public init(_ parser: SpecParser, _ basedOnSpec: Spec?) {
         super.init(parser, basedOnSpec, isGeneric: true)
     }
diff --git a/Sources/SWBCore/SpecImplementations/FileTypes.swift b/Sources/SWBCore/SpecImplementations/FileTypes.swift
index e7ca3976..b2ae7b7d 100644
--- a/Sources/SWBCore/SpecImplementations/FileTypes.swift
+++ b/Sources/SWBCore/SpecImplementations/FileTypes.swift
@@ -10,46 +10,46 @@
 //
 //===----------------------------------------------------------------------===//
 
-class ApplicationWrapperFileTypeSpec : FileTypeSpec, SpecClassType, @unchecked Sendable {
+class ApplicationWrapperFileTypeSpec: FileTypeSpec, SpecClassType, @unchecked Sendable {
     static let className = "PBXApplicationWrapperFileType"
 }
 
-class CFBundleWrapperFileTypeSpec : FileTypeSpec, SpecClassType, @unchecked Sendable {
+class CFBundleWrapperFileTypeSpec: FileTypeSpec, SpecClassType, @unchecked Sendable {
     static let className = "PBXCFBundleWrapperFileType"
 }
 
-class FrameworkWrapperFileTypeSpec : FileTypeSpec, SpecClassType, @unchecked Sendable {
+class FrameworkWrapperFileTypeSpec: FileTypeSpec, SpecClassType, @unchecked Sendable {
     static let className = "PBXFrameworkWrapperFileType"
 }
 
-class HTMLFileTypeSpec : FileTypeSpec, SpecClassType, @unchecked Sendable {
+class HTMLFileTypeSpec: FileTypeSpec, SpecClassType, @unchecked Sendable {
     static let className = "PBXHTMLFileType"
 }
 
-class MachOFileTypeSpec : FileTypeSpec, SpecClassType, @unchecked Sendable {
+class MachOFileTypeSpec: FileTypeSpec, SpecClassType, @unchecked Sendable {
     static let className = "PBXMachOFileType"
 }
 
-class PlistFileTypeSpec : FileTypeSpec, SpecClassType, @unchecked Sendable {
+class PlistFileTypeSpec: FileTypeSpec, SpecClassType, @unchecked Sendable {
     static let className = "PBXPlistFileType"
 }
 
-class PlugInKitPluginWrapperFileTypeSpec : FileTypeSpec, SpecClassType, @unchecked Sendable {
+class PlugInKitPluginWrapperFileTypeSpec: FileTypeSpec, SpecClassType, @unchecked Sendable {
     static let className = "PBXPlugInKitPluginWrapperFileType"
 }
 
-class SpotlightImporternWrapperFileTypeSpec : FileTypeSpec, SpecClassType, @unchecked Sendable {
+class SpotlightImporternWrapperFileTypeSpec: FileTypeSpec, SpecClassType, @unchecked Sendable {
     static let className = "PBXSpotlightImporternWrapperFileType"
 }
 
-class StaticFrameworkWrapperFileTypeSpec : FileTypeSpec, SpecClassType, @unchecked Sendable {
+class StaticFrameworkWrapperFileTypeSpec: FileTypeSpec, SpecClassType, @unchecked Sendable {
     static let className = "XCStaticFrameworkWrapperFileType"
 }
 
-class XPCServiceWrapperFileTypeSpec : FileTypeSpec, SpecClassType, @unchecked Sendable {
+class XPCServiceWrapperFileTypeSpec: FileTypeSpec, SpecClassType, @unchecked Sendable {
     static let className = "PBXXPCServiceWrapperFileType"
 }
 
-class XCFrameworkWrapperFileTypeSpec : FileTypeSpec, SpecClassType, @unchecked Sendable {
+class XCFrameworkWrapperFileTypeSpec: FileTypeSpec, SpecClassType, @unchecked Sendable {
     static let className = "PBXXCFrameworkWrapperFileType"
 }
diff --git a/Sources/SWBCore/SpecImplementations/LinkerSpec.swift b/Sources/SWBCore/SpecImplementations/LinkerSpec.swift
index 6149d4c4..fd1b880d 100644
--- a/Sources/SWBCore/SpecImplementations/LinkerSpec.swift
+++ b/Sources/SWBCore/SpecImplementations/LinkerSpec.swift
@@ -15,7 +15,7 @@ public import SWBMacro
 
 public let reexportedBinariesDirectoryName = "ReexportedBinaries"
 
-open class LinkerSpec : CommandLineToolSpec, @unchecked Sendable {
+open class LinkerSpec: CommandLineToolSpec, @unchecked Sendable {
     /// Specifier for an individual library to be linked.
     public struct LibrarySpecifier {
         public enum Kind: CaseIterable, CustomStringConvertible {
@@ -28,11 +28,11 @@ open class LinkerSpec : CommandLineToolSpec, @unchecked Sendable {
 
             public var description: String {
                 switch self {
-                case .static:        return "static library"
-                case .dynamic:       return "dynamic library"
-                case .textBased:     return "text-based stub"
-                case .framework:     return "framework"
-                case .object:        return "object file"
+                case .static: return "static library"
+                case .dynamic: return "dynamic library"
+                case .textBased: return "text-based stub"
+                case .framework: return "framework"
+                case .object: return "object file"
                 case .objectLibrary: return "object library"
                 }
             }
@@ -155,7 +155,7 @@ open class LinkerSpec : CommandLineToolSpec, @unchecked Sendable {
     }
 }
 
-open class GenericLinkerSpec : LinkerSpec, @unchecked Sendable {
+open class GenericLinkerSpec: LinkerSpec, @unchecked Sendable {
     required public init(_ parser: SpecParser, _ basedOnSpec: Spec?) {
         super.init(parser, basedOnSpec, isGeneric: true)
     }
diff --git a/Sources/SWBCore/SpecImplementations/ProductTypes.swift b/Sources/SWBCore/SpecImplementations/ProductTypes.swift
index 3492c1de..688e9be3 100644
--- a/Sources/SWBCore/SpecImplementations/ProductTypes.swift
+++ b/Sources/SWBCore/SpecImplementations/ProductTypes.swift
@@ -13,7 +13,7 @@
 public import SWBUtil
 public import SWBMacro
 
-public class ProductTypeSpec : Spec, SpecType, @unchecked Sendable {
+public class ProductTypeSpec: Spec, SpecType, @unchecked Sendable {
     /// The level to elevate the deprecation message as.
     public enum DeprecationLevel {
         case warning
@@ -141,8 +141,7 @@ public class ProductTypeSpec : Spec, SpecType, @unchecked Sendable {
             if let specIdItem = plist["ValidationToolSpec"] {
                 if case .plString(let specId) = specIdItem {
                     productValidationToolSpecIdentifier = specId
-                }
-                else {
+                } else {
                     parser.error("Value for 'ValidationToolSpec' in the 'Validation' dictionary for product type '\(parser.proxy.identifier)' must be a string but is: \(specIdItem)")
                 }
             }
@@ -151,49 +150,50 @@ public class ProductTypeSpec : Spec, SpecType, @unchecked Sendable {
         }
         self.productValidationToolSpecIdentifier = productValidationToolSpecIdentifier
 
-        self.buildPhaseFileRefAdditions = { () -> [String: [BuildPhaseFileRefAddition]]? in
-            let keyPath = "BuildPhaseFileRefAdditions"
-            guard let item = parser.parseObject(keyPath) else { return nil }
-            guard case .plDict(let dict) = item else { parser.error("Expected dict in \(keyPath)"); return nil }
-            var result = [String: [BuildPhaseFileRefAddition]](minimumCapacity: dict.count)
-
-            for (identifier, valuesPL) in dict {
-                let phaseKeyPath = "\(keyPath)['\(identifier)']"
-                guard case .plArray(let valuesArray) = valuesPL else { parser.error("Expected array in \(phaseKeyPath)"); return nil }
-                var resultValues = [BuildPhaseFileRefAddition]()
-
-                for (index, valuePL) in valuesArray.enumerated() {
-                    let fileKeyPath = "\(phaseKeyPath)['\(identifier)'][\(index)]"
-                    guard case .plDict(let valueDict) = valuePL else {
-                        parser.error("Expected dict in \(fileKeyPath), but got \(valuesPL)")
-                        return nil
-                    }
-
-                    // Path must be present and must be a string
-                    guard case .plString(let path)? = valueDict["Path"] else {
-                        parser.error("Expected string in \(fileKeyPath)['Path']")
-                        return nil
-                    }
-
-                    // RegionVariantName must be a non-empty string if it is present, if it is missing this indicates non-localized content
-                    let regionVariantName: String? = {
-                        guard let regionVariantNamePL = valueDict["RegionVariantName"] else {
+        self.buildPhaseFileRefAdditions =
+            { () -> [String: [BuildPhaseFileRefAddition]]? in
+                let keyPath = "BuildPhaseFileRefAdditions"
+                guard let item = parser.parseObject(keyPath) else { return nil }
+                guard case .plDict(let dict) = item else { parser.error("Expected dict in \(keyPath)"); return nil }
+                var result = [String: [BuildPhaseFileRefAddition]](minimumCapacity: dict.count)
+
+                for (identifier, valuesPL) in dict {
+                    let phaseKeyPath = "\(keyPath)['\(identifier)']"
+                    guard case .plArray(let valuesArray) = valuesPL else { parser.error("Expected array in \(phaseKeyPath)"); return nil }
+                    var resultValues = [BuildPhaseFileRefAddition]()
+
+                    for (index, valuePL) in valuesArray.enumerated() {
+                        let fileKeyPath = "\(phaseKeyPath)['\(identifier)'][\(index)]"
+                        guard case .plDict(let valueDict) = valuePL else {
+                            parser.error("Expected dict in \(fileKeyPath), but got \(valuesPL)")
                             return nil
                         }
-                        guard case .plString(let regionVariantName) = regionVariantNamePL, !regionVariantName.isEmpty else {
-                            parser.warning("Expected non-empty string in \(fileKeyPath)['RegionVariantName']")
+
+                        // Path must be present and must be a string
+                        guard case .plString(let path)? = valueDict["Path"] else {
+                            parser.error("Expected string in \(fileKeyPath)['Path']")
                             return nil
                         }
-                        return regionVariantName
-                    }()
 
-                    resultValues.append(BuildPhaseFileRefAddition(path: BuiltinMacros.namespace.parseString(path), regionVariantName: BuiltinMacros.namespace.parseString(regionVariantName ?? "")))
-                }
+                        // RegionVariantName must be a non-empty string if it is present, if it is missing this indicates non-localized content
+                        let regionVariantName: String? = {
+                            guard let regionVariantNamePL = valueDict["RegionVariantName"] else {
+                                return nil
+                            }
+                            guard case .plString(let regionVariantName) = regionVariantNamePL, !regionVariantName.isEmpty else {
+                                parser.warning("Expected non-empty string in \(fileKeyPath)['RegionVariantName']")
+                                return nil
+                            }
+                            return regionVariantName
+                        }()
+
+                        resultValues.append(BuildPhaseFileRefAddition(path: BuiltinMacros.namespace.parseString(path), regionVariantName: BuiltinMacros.namespace.parseString(regionVariantName ?? "")))
+                    }
 
-                result[identifier] = resultValues
-            }
+                    result[identifier] = resultValues
+                }
 
-            return result
+                return result
             }() ?? [:]
 
         self.infoPlistAdditions = parser.parseObject("InfoPlistAdditions")?.withConcreteBooleans(forKeys: ProductTypeSpec.booleanizedInfoPlistKeys)
@@ -207,8 +207,7 @@ public class ProductTypeSpec : Spec, SpecType, @unchecked Sendable {
                 let parsedLevel = parser.parseString("DeprecationLevel") ?? "warning"
                 if let level = DeprecationLevel(level: parsedLevel) {
                     return DeprecationInfo(reason: reason, level: level)
-                }
-                else {
+                } else {
                     parser.error("invalid 'DeprecationLevel' value of '\(parsedLevel)'")
                 }
             }
@@ -371,11 +370,9 @@ public class ProductTypeSpec : Spec, SpecType, @unchecked Sendable {
     }
 }
 
-
 // MARK: Bundle product types
 
-
-public class BundleProductTypeSpec : ProductTypeSpec, SpecClassType, @unchecked Sendable {
+public class BundleProductTypeSpec: ProductTypeSpec, SpecClassType, @unchecked Sendable {
     public class var className: String {
         return "PBXBundleProductType"
     }
@@ -383,13 +380,12 @@ public class BundleProductTypeSpec : ProductTypeSpec, SpecClassType, @unchecked
     // autoConfigureAsMergeableLibrary() is not overridden here: Even if its MACH_O_TYPE has been changed to 'mh_dylib', automatically building a generic bundle as mergeable is outside what we want to handle automatically.  (We might change our mind in the future.)
 
     // This was originally implemented in an extension in InfoPlistTaskProducer.swift for rdar://78512102, but it has been adopted in other places so has been moved here.  It might be that this logic doesn't even belong on this class.
-	public static func validateBuildComponents(_ buildComponents: [String], scope: MacroEvaluationScope) -> Bool
-	{
-		return buildComponents.contains("build") || (buildComponents.contains("installLoc") && scope.evaluate(BuiltinMacros.INSTALLLOC_LANGUAGE).isEmpty) || buildComponents.contains("exportLoc")
-	}
+    public static func validateBuildComponents(_ buildComponents: [String], scope: MacroEvaluationScope) -> Bool {
+        return buildComponents.contains("build") || (buildComponents.contains("installLoc") && scope.evaluate(BuiltinMacros.INSTALLLOC_LANGUAGE).isEmpty) || buildComponents.contains("exportLoc")
+    }
 }
 
-public final class ApplicationProductTypeSpec : BundleProductTypeSpec, @unchecked Sendable {
+public final class ApplicationProductTypeSpec: BundleProductTypeSpec, @unchecked Sendable {
     class public override var className: String {
         return "PBXApplicationProductType"
     }
@@ -419,7 +415,7 @@ public final class ApplicationExtensionProductTypeSpec: BundleProductTypeSpec, @
     }
 }
 
-public class FrameworkProductTypeSpec : BundleProductTypeSpec, @unchecked Sendable {
+public class FrameworkProductTypeSpec: BundleProductTypeSpec, @unchecked Sendable {
     class public override var className: String {
         return "PBXFrameworkProductType"
     }
@@ -448,39 +444,44 @@ public class FrameworkProductTypeSpec : BundleProductTypeSpec, @unchecked Sendab
                 location: wrapperFolderPath.join(currentVersionFolderPath),
                 toPath: Path(scope.evaluateAsString(BuiltinMacros.FRAMEWORK_VERSION)),
                 effectiveToPath: nil
-            ) )
+            )
+        )
         // Resources -> Versions/Current/Resources
         let unlocalizedResourcesFolderName = Path(scope.evaluateAsString(BuiltinMacros.UNLOCALIZED_RESOURCES_FOLDER_PATH)).basename
         descriptors.insert(
             SymlinkDescriptor(
-            	location: wrapperFolderPath.join(unlocalizedResourcesFolderName),
+                location: wrapperFolderPath.join(unlocalizedResourcesFolderName),
                 toPath: currentVersionFolderPath.join(unlocalizedResourcesFolderName),
                 effectiveToPath: frameworkVersionFolderPath.join(unlocalizedResourcesFolderName)
-            ) )
+            )
+        )
         // Headers -> Versions/Current/Headers
         let headersResourcesFolderName = Path(scope.evaluateAsString(BuiltinMacros.PUBLIC_HEADERS_FOLDER_PATH)).basename
         descriptors.insert(
             SymlinkDescriptor(
-            	location: wrapperFolderPath.join(headersResourcesFolderName),
+                location: wrapperFolderPath.join(headersResourcesFolderName),
                 toPath: currentVersionFolderPath.join(headersResourcesFolderName),
                 effectiveToPath: frameworkVersionFolderPath.join(headersResourcesFolderName)
-            ) )
+            )
+        )
         // PrivateHeaders -> Versions/Current/PrivateHeaders
         let privateHeadersFolderName = Path(scope.evaluateAsString(BuiltinMacros.PRIVATE_HEADERS_FOLDER_PATH)).basename
         descriptors.insert(
             SymlinkDescriptor(
-            	location: wrapperFolderPath.join(privateHeadersFolderName),
+                location: wrapperFolderPath.join(privateHeadersFolderName),
                 toPath: currentVersionFolderPath.join(privateHeadersFolderName),
                 effectiveToPath: frameworkVersionFolderPath.join(privateHeadersFolderName)
-            ) )
+            )
+        )
         // Modules -> Versions/Current/Modules
         let modulesFolderName = Path(scope.evaluateAsString(BuiltinMacros.MODULES_FOLDER_PATH)).basename
         descriptors.insert(
             SymlinkDescriptor(
-            	location: wrapperFolderPath.join(modulesFolderName),
+                location: wrapperFolderPath.join(modulesFolderName),
                 toPath: currentVersionFolderPath.join(modulesFolderName),
                 effectiveToPath: frameworkVersionFolderPath.join(modulesFolderName)
-            ) )
+            )
+        )
         // Frameworks -> Versions/Current/Frameworks
         let frameworksFolderName = Path(scope.evaluateAsString(BuiltinMacros.FRAMEWORKS_FOLDER_PATH)).basename
         descriptors.insert(
@@ -488,15 +489,17 @@ public class FrameworkProductTypeSpec : BundleProductTypeSpec, @unchecked Sendab
                 location: wrapperFolderPath.join(frameworksFolderName),
                 toPath: currentVersionFolderPath.join(frameworksFolderName),
                 effectiveToPath: frameworkVersionFolderPath.join(frameworksFolderName)
-            ) )
+            )
+        )
         // PlugIns -> Versions/Current/PlugIns
         let pluginsFolderName = Path(scope.evaluateAsString(BuiltinMacros.PLUGINS_FOLDER_PATH)).basename
         descriptors.insert(
             SymlinkDescriptor(
-            	location: wrapperFolderPath.join(pluginsFolderName),
+                location: wrapperFolderPath.join(pluginsFolderName),
                 toPath: currentVersionFolderPath.join(pluginsFolderName),
                 effectiveToPath: frameworkVersionFolderPath.join(pluginsFolderName)
-            ) )
+            )
+        )
         // Extensions -> Versions/Current/Extensions
         let extensionsFolderName = Path(scope.evaluateAsString(BuiltinMacros.EXTENSIONS_FOLDER_PATH)).basename
         descriptors.insert(
@@ -504,23 +507,26 @@ public class FrameworkProductTypeSpec : BundleProductTypeSpec, @unchecked Sendab
                 location: wrapperFolderPath.join(extensionsFolderName),
                 toPath: currentVersionFolderPath.join(extensionsFolderName),
                 effectiveToPath: frameworkVersionFolderPath.join(extensionsFolderName)
-            ) )
+            )
+        )
         // <binary-name> -> Versions/Current/<binary-name>
         let executableName = scope.evaluateAsString(BuiltinMacros.EXECUTABLE_NAME)
         descriptors.insert(
             SymlinkDescriptor(
-            	location: wrapperFolderPath.join(executableName),
+                location: wrapperFolderPath.join(executableName),
                 toPath: currentVersionFolderPath.join(executableName),
                 effectiveToPath: frameworkVersionFolderPath.join(executableName)
-            ) )
+            )
+        )
         // XPCServices -> Versions/Current/XPCServices
         let xpcServicesFolderName = Path(scope.evaluateAsString(BuiltinMacros.XPCSERVICES_FOLDER_PATH)).basename
         descriptors.insert(
             SymlinkDescriptor(
-            	location: wrapperFolderPath.join(xpcServicesFolderName),
+                location: wrapperFolderPath.join(xpcServicesFolderName),
                 toPath: currentVersionFolderPath.join(xpcServicesFolderName),
                 effectiveToPath: frameworkVersionFolderPath.join(xpcServicesFolderName)
-            ) )
+            )
+        )
         // ExtraModules -> Versions/Current/ExtraModules
         if scope.evaluate(BuiltinMacros.BUILD_PACKAGE_FOR_DISTRIBUTION) {
             descriptors.insert(
@@ -528,7 +534,8 @@ public class FrameworkProductTypeSpec : BundleProductTypeSpec, @unchecked Sendab
                     location: wrapperFolderPath.join("ExtraModules"),
                     toPath: currentVersionFolderPath.join("ExtraModules"),
                     effectiveToPath: frameworkVersionFolderPath.join("ExtraModules")
-                ) )
+                )
+            )
         }
 
         return descriptors
@@ -539,47 +546,47 @@ public class FrameworkProductTypeSpec : BundleProductTypeSpec, @unchecked Sendab
         return ArtifactInfo(kind: .framework, path: path)
     }
 
-/*
-    /// Build setting expressions to evaluate to determine how to create symbolic links for the product structure.
-    static let productStructureSymlinkBuildSettings = [SymlinkDescriptor]([
-        // Versions/Current -> A
-        SymlinkDescriptor(
-            location: BuiltinMacros.namespace.parseString("$(TARGET_BUILT_DIR)/$(WRAPPER_NAME)/$(VERSIONS_PATH)/$(CURRENT_VERSION)"),
-            toPath: BuiltinMacros.namespace.parseString("$(FRAMEWORK_VERSION)")),
-        // Resources -> Versions/Current/Resources
-        SymlinkDescriptor(
-            location: BuiltinMacros.namespace.parseString("$(TARGET_BUILT_DIR)/$(WRAPPER_NAME)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH:file)"),
-            toPath: BuiltinMacros.namespace.parseString("$(VERSIONS_PATH)/$(CURRENT_VERSION)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH:file)")),
-        // Headers -> Versions/Current/Headers
-        SymlinkDescriptor(
-            location: BuiltinMacros.namespace.parseString("$(TARGET_BUILT_DIR)/$(WRAPPER_NAME)/$(PUBLIC_HEADERS_FOLDER_PATH:file)"),
-            toPath: BuiltinMacros.namespace.parseString("$(VERSIONS_PATH)/$(CURRENT_VERSION)/$(PUBLIC_HEADERS_FOLDER_PATH:file)")),
-        // PrivateHeaders -> Versions/Current/PrivateHeaders
-        SymlinkDescriptor(
-            location: BuiltinMacros.namespace.parseString("$(TARGET_BUILT_DIR)/$(WRAPPER_NAME)/$(PRIVATE_HEADERS_FOLDER_PATH:file)"),
-            toPath: BuiltinMacros.namespace.parseString("$(VERSIONS_PATH)/$(CURRENT_VERSION)/$(PRIVATE_HEADERS_FOLDER_PATH:file)")),
-        // Modules -> Versions/Current/Modules
-        SymlinkDescriptor(
-     location: BuiltinMacros.namespace.parseString("$(TARGET_BUILT_DIR)/$(WRAPPER_NAME)/$(MODULES_FOLDER_PATH:file)"),
-            toPath: BuiltinMacros.namespace.parseString("$(VERSIONS_PATH)/$(CURRENT_VERSION)/$(MODULES_FOLDER_PATH:file)")),
-        // PlugIns -> Versions/Current/PlugIns
-        SymlinkDescriptor(
-            location: BuiltinMacros.namespace.parseString("$(TARGET_BUILT_DIR)/$(WRAPPER_NAME)/$(PLUGINS_FOLDER_PATH:file)"),
-            toPath: BuiltinMacros.namespace.parseString("$(VERSIONS_PATH)/$(CURRENT_VERSION)/$(PLUGINS_FOLDER_PATH:file)")),
-        // Extensions -> Versions/Current/Extensions
-        SymlinkDescriptor(
-            location: BuiltinMacros.namespace.parseString("$(TARGET_BUILT_DIR)/$(WRAPPER_NAME)/$(EXTENSIONS_FOLDER_PATH:file)"),
-            toPath: BuiltinMacros.namespace.parseString("$(VERSIONS_PATH)/$(CURRENT_VERSION)/$(EXTENSIONS_FOLDER_PATH:file)")),
-        // <binary-name> -> Versions/Current/<binary-name>
-        SymlinkDescriptor(
-            location: BuiltinMacros.namespace.parseString("$(TARGET_BUILT_DIR)/$(WRAPPER_NAME)/$(EXECUTABLE_NAME)"),
-            toPath: BuiltinMacros.namespace.parseString("$(VERSIONS_PATH)/$(CURRENT_VERSION)/$(EXECUTABLE_NAME)")),
-        // XPCServices -> Versions/Current/XPCServices
-        SymlinkDescriptor(
-            location: BuiltinMacros.namespace.parseString("$(TARGET_BUILT_DIR)/$(WRAPPER_NAME)/$(XPCSERVICES_FOLDER_PATH:file)"),
-            toPath: BuiltinMacros.namespace.parseString("$(VERSIONS_PATH)/$(CURRENT_VERSION)/$(XPCSERVICES_FOLDER_PATH:file)")),
-    ])
-*/
+    /*
+        /// Build setting expressions to evaluate to determine how to create symbolic links for the product structure.
+        static let productStructureSymlinkBuildSettings = [SymlinkDescriptor]([
+            // Versions/Current -> A
+            SymlinkDescriptor(
+                location: BuiltinMacros.namespace.parseString("$(TARGET_BUILT_DIR)/$(WRAPPER_NAME)/$(VERSIONS_PATH)/$(CURRENT_VERSION)"),
+                toPath: BuiltinMacros.namespace.parseString("$(FRAMEWORK_VERSION)")),
+            // Resources -> Versions/Current/Resources
+            SymlinkDescriptor(
+                location: BuiltinMacros.namespace.parseString("$(TARGET_BUILT_DIR)/$(WRAPPER_NAME)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH:file)"),
+                toPath: BuiltinMacros.namespace.parseString("$(VERSIONS_PATH)/$(CURRENT_VERSION)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH:file)")),
+            // Headers -> Versions/Current/Headers
+            SymlinkDescriptor(
+                location: BuiltinMacros.namespace.parseString("$(TARGET_BUILT_DIR)/$(WRAPPER_NAME)/$(PUBLIC_HEADERS_FOLDER_PATH:file)"),
+                toPath: BuiltinMacros.namespace.parseString("$(VERSIONS_PATH)/$(CURRENT_VERSION)/$(PUBLIC_HEADERS_FOLDER_PATH:file)")),
+            // PrivateHeaders -> Versions/Current/PrivateHeaders
+            SymlinkDescriptor(
+                location: BuiltinMacros.namespace.parseString("$(TARGET_BUILT_DIR)/$(WRAPPER_NAME)/$(PRIVATE_HEADERS_FOLDER_PATH:file)"),
+                toPath: BuiltinMacros.namespace.parseString("$(VERSIONS_PATH)/$(CURRENT_VERSION)/$(PRIVATE_HEADERS_FOLDER_PATH:file)")),
+            // Modules -> Versions/Current/Modules
+            SymlinkDescriptor(
+         location: BuiltinMacros.namespace.parseString("$(TARGET_BUILT_DIR)/$(WRAPPER_NAME)/$(MODULES_FOLDER_PATH:file)"),
+                toPath: BuiltinMacros.namespace.parseString("$(VERSIONS_PATH)/$(CURRENT_VERSION)/$(MODULES_FOLDER_PATH:file)")),
+            // PlugIns -> Versions/Current/PlugIns
+            SymlinkDescriptor(
+                location: BuiltinMacros.namespace.parseString("$(TARGET_BUILT_DIR)/$(WRAPPER_NAME)/$(PLUGINS_FOLDER_PATH:file)"),
+                toPath: BuiltinMacros.namespace.parseString("$(VERSIONS_PATH)/$(CURRENT_VERSION)/$(PLUGINS_FOLDER_PATH:file)")),
+            // Extensions -> Versions/Current/Extensions
+            SymlinkDescriptor(
+                location: BuiltinMacros.namespace.parseString("$(TARGET_BUILT_DIR)/$(WRAPPER_NAME)/$(EXTENSIONS_FOLDER_PATH:file)"),
+                toPath: BuiltinMacros.namespace.parseString("$(VERSIONS_PATH)/$(CURRENT_VERSION)/$(EXTENSIONS_FOLDER_PATH:file)")),
+            // <binary-name> -> Versions/Current/<binary-name>
+            SymlinkDescriptor(
+                location: BuiltinMacros.namespace.parseString("$(TARGET_BUILT_DIR)/$(WRAPPER_NAME)/$(EXECUTABLE_NAME)"),
+                toPath: BuiltinMacros.namespace.parseString("$(VERSIONS_PATH)/$(CURRENT_VERSION)/$(EXECUTABLE_NAME)")),
+            // XPCServices -> Versions/Current/XPCServices
+            SymlinkDescriptor(
+                location: BuiltinMacros.namespace.parseString("$(TARGET_BUILT_DIR)/$(WRAPPER_NAME)/$(XPCSERVICES_FOLDER_PATH:file)"),
+                toPath: BuiltinMacros.namespace.parseString("$(VERSIONS_PATH)/$(CURRENT_VERSION)/$(XPCSERVICES_FOLDER_PATH:file)")),
+        ])
+    */
 
     override func computeAdditionalLinkerArgs(_ producer: any CommandProducer, scope: MacroEvaluationScope, lookup: @escaping ((MacroDeclaration) -> MacroStringExpression?)) -> (args: [String], inputs: [Path]) {
         if scope.evaluate(BuiltinMacros.MACH_O_TYPE) != "staticlib" {
@@ -598,20 +605,20 @@ public class FrameworkProductTypeSpec : BundleProductTypeSpec, @unchecked Sendab
     }
 }
 
-public final class StaticFrameworkProductTypeSpec : FrameworkProductTypeSpec, @unchecked Sendable {
+public final class StaticFrameworkProductTypeSpec: FrameworkProductTypeSpec, @unchecked Sendable {
     class public override var className: String {
         return "XCStaticFrameworkProductType"
     }
 }
 
-public final class KernelExtensionProductTypeSpec : BundleProductTypeSpec, @unchecked Sendable {
+public final class KernelExtensionProductTypeSpec: BundleProductTypeSpec, @unchecked Sendable {
     class public override var className: String {
         return "XCKernelExtensionProductType"
     }
 }
 
 /// The product type for XCTest unit and UI test bundles.
-public final class XCTestBundleProductTypeSpec : BundleProductTypeSpec, @unchecked Sendable {
+public final class XCTestBundleProductTypeSpec: BundleProductTypeSpec, @unchecked Sendable {
     class public override var className: String {
         return "PBXXCTestBundleProductType"
     }
@@ -676,8 +683,7 @@ public final class XCTestBundleProductTypeSpec : BundleProductTypeSpec, @uncheck
         // Add to the macro definition table based on how tests are being run (XCTRunner, TEST_HOST, or neither).
         if type(of: self).usesXCTRunner(scope) {
             addXCTRunnerSettings(to: &table, scope, platform, &warnings, &errors)
-        }
-        else if type(of: self).usesTestHost(scope) {
+        } else if type(of: self).usesTestHost(scope) {
             addTestHostSettings(to: &table, Path(scope.evaluate(BuiltinMacros.TEST_HOST)), scope, platform, &warnings, &errors)
         }
 
@@ -691,7 +697,7 @@ public final class XCTestBundleProductTypeSpec : BundleProductTypeSpec, @uncheck
         // Define TARGET_BUILD_SUBPATH so the target builds to $(TARGET_BUILD_DIR)/$(TARGET_BUILD_SUBPATH) (or slightly different for deployment location builds).
         // <rdar://problem/18902931> Should PBXXCTestBundleProductType override BUILT_PRODUCTS_DIR when it overrides TARGET_BUILD_DIR?
         table.push(BuiltinMacros.TARGET_BUILD_SUBPATH, table.namespace.parseString("/$(XCTRUNNER_PRODUCT_NAME)$(_WRAPPER_CONTENTS_DIR)/PlugIns"))
-        table.push(BuiltinMacros.DWARF_DSYM_FOLDER_PATH, table.namespace.parseString("$(TARGET_BUILD_DIR)"))        // Do we really want dSYMs to go inside of the host app's PlugIns dir?
+        table.push(BuiltinMacros.DWARF_DSYM_FOLDER_PATH, table.namespace.parseString("$(TARGET_BUILD_DIR)"))  // Do we really want dSYMs to go inside of the host app's PlugIns dir?
 
         // Entitlements are always required for a UI test target.
         table.push(BuiltinMacros.ENTITLEMENTS_REQUIRED, literal: true)
@@ -708,12 +714,12 @@ public final class XCTestBundleProductTypeSpec : BundleProductTypeSpec, @uncheck
         let targetBuildDir = scope.evaluate(BuiltinMacros.TARGET_BUILD_DIR)
         let testHost = adjustedTestHost(originalTestHost: testHost, addingSettingsToTable: &table, scope)
 
-// This check is disabled due to <rdar://problem/43032765>.  See UnsupportedBehaviorTaskConstructionTests.testOverridingTargetBuildDirInApplicationUnitTestTarget().
-//        guard targetBuildDir.isAncestor(of: testHost) else {
-//            // TEST_HOST must be inside of TARGET_BUILD_DIR.
-//            errors.append("$(TEST_HOST) is not a descendant of $(TARGET_BUILD_DIR) (\(testHost.str) !<= \(targetBuildDir.str))")
-//            return
-//        }
+        // This check is disabled due to <rdar://problem/43032765>.  See UnsupportedBehaviorTaskConstructionTests.testOverridingTargetBuildDirInApplicationUnitTestTarget().
+        //        guard targetBuildDir.isAncestor(of: testHost) else {
+        //            // TEST_HOST must be inside of TARGET_BUILD_DIR.
+        //            errors.append("$(TEST_HOST) is not a descendant of $(TARGET_BUILD_DIR) (\(testHost.str) !<= \(targetBuildDir.str))")
+        //            return
+        //        }
 
         // testHost is a path to the executable for the app, we need to strip off the executable to get the contents directory:
         //     ./MacApp.app/Contents/MacOS/MacApp OR
@@ -782,11 +788,9 @@ public final class XCTestBundleProductTypeSpec : BundleProductTypeSpec, @uncheck
     }
 }
 
-
 // MARK: Standalone binary Product types
 
-
-public class StandaloneExecutableProductTypeSpec : ProductTypeSpec, SpecClassType, @unchecked Sendable {
+public class StandaloneExecutableProductTypeSpec: ProductTypeSpec, SpecClassType, @unchecked Sendable {
     public class var className: String {
         return "XCStandaloneExecutableProductType"
     }
@@ -806,7 +810,7 @@ public class LibraryProductTypeSpec: StandaloneExecutableProductTypeSpec, @unche
     }
 }
 
-public final class DynamicLibraryProductTypeSpec : LibraryProductTypeSpec, @unchecked Sendable {
+public final class DynamicLibraryProductTypeSpec: LibraryProductTypeSpec, @unchecked Sendable {
     class public override var className: String {
         return "PBXDynamicLibraryProductType"
     }
@@ -833,7 +837,7 @@ public final class DynamicLibraryProductTypeSpec : LibraryProductTypeSpec, @unch
 
 }
 
-public final class StaticLibraryProductTypeSpec : LibraryProductTypeSpec, @unchecked Sendable {
+public final class StaticLibraryProductTypeSpec: LibraryProductTypeSpec, @unchecked Sendable {
     class public override var className: String {
         return "PBXStaticLibraryProductType"
     }
@@ -850,7 +854,7 @@ public final class StaticLibraryProductTypeSpec : LibraryProductTypeSpec, @unche
     }
 }
 
-public final class ToolProductTypeSpec : StandaloneExecutableProductTypeSpec, @unchecked Sendable {
+public final class ToolProductTypeSpec: StandaloneExecutableProductTypeSpec, @unchecked Sendable {
     class public override var className: String {
         return "PBXToolProductType"
     }
@@ -862,8 +866,7 @@ public final class ToolProductTypeSpec : StandaloneExecutableProductTypeSpec, @u
 }
 
 /// Describes a symbolic link to create.
-public struct SymlinkDescriptor: Hashable
-{
+public struct SymlinkDescriptor: Hashable {
     /// Where the symbolic link will be created.  This should evaluate to an absolute path.
     public let location: Path
     /// The path the symbolic link points to.  This may be a relative path.
@@ -876,7 +879,7 @@ public struct SymlinkDescriptor: Hashable
         hasher.combine(toPath)
     }
 
-    public static func ==(lhs: SymlinkDescriptor, rhs: SymlinkDescriptor) -> Bool {
+    public static func == (lhs: SymlinkDescriptor, rhs: SymlinkDescriptor) -> Bool {
         return lhs.location == rhs.location && lhs.toPath == rhs.toPath
     }
 }
diff --git a/Sources/SWBCore/SpecImplementations/PropertyDomainSpec.swift b/Sources/SWBCore/SpecImplementations/PropertyDomainSpec.swift
index e237aecc..7c3b70fa 100644
--- a/Sources/SWBCore/SpecImplementations/PropertyDomainSpec.swift
+++ b/Sources/SWBCore/SpecImplementations/PropertyDomainSpec.swift
@@ -27,7 +27,7 @@ private protocol BuildOptionType: Sendable {
     /// Declare a macro suitable for the given option type.
     func declareMacro(_ namespace: MacroNamespace, _ name: String) throws -> MacroDeclaration
 }
-private final class BoolBuildOptionType : BuildOptionType {
+private final class BoolBuildOptionType: BuildOptionType {
     let typeName = "Boolean"
     let isListType = false
     let supportsValuesDefinitions = true
@@ -36,7 +36,7 @@ private final class BoolBuildOptionType : BuildOptionType {
         return try namespace.declareBooleanMacro(name)
     }
 }
-private final class CodeSignIdentityBuildOptionType : BuildOptionType {
+private final class CodeSignIdentityBuildOptionType: BuildOptionType {
     let typeName = "CodeSignIdentity"
     let isListType = false
     let supportsValuesDefinitions = false
@@ -45,7 +45,7 @@ private final class CodeSignIdentityBuildOptionType : BuildOptionType {
         return try namespace.declareStringMacro(name)
     }
 }
-private final class CodeSignStyleBuildOptionType : BuildOptionType {
+private final class CodeSignStyleBuildOptionType: BuildOptionType {
     let typeName = "CodeSignStyle"
     let isListType = false
     let supportsValuesDefinitions = true
@@ -54,7 +54,7 @@ private final class CodeSignStyleBuildOptionType : BuildOptionType {
         return try namespace.declareStringMacro(name)
     }
 }
-private final class CompilerVersionBuildOptionType : BuildOptionType {
+private final class CompilerVersionBuildOptionType: BuildOptionType {
     let typeName = "CompilerVersion"
     let isListType = false
     let supportsValuesDefinitions = false
@@ -63,7 +63,7 @@ private final class CompilerVersionBuildOptionType : BuildOptionType {
         return try namespace.declareStringMacro(name)
     }
 }
-private final class DevelopmentTeamBuildOptionType : BuildOptionType {
+private final class DevelopmentTeamBuildOptionType: BuildOptionType {
     let typeName = "DevelopmentTeam"
     let isListType = false
     let supportsValuesDefinitions = false
@@ -72,7 +72,7 @@ private final class DevelopmentTeamBuildOptionType : BuildOptionType {
         return try namespace.declareStringMacro(name)
     }
 }
-private final class EnumBuildOptionType : BuildOptionType {
+private final class EnumBuildOptionType: BuildOptionType {
     let typeName = "Enumeration"
     let isListType = false
     let supportsValuesDefinitions = true
@@ -129,7 +129,7 @@ private final class EnumBuildOptionType : BuildOptionType {
         }
     }
 }
-private final class StringBuildOptionType : BuildOptionType {
+private final class StringBuildOptionType: BuildOptionType {
     let typeName = "String"
     let isListType = false
     let supportsValuesDefinitions = false
@@ -138,7 +138,7 @@ private final class StringBuildOptionType : BuildOptionType {
         return try namespace.declareStringMacro(name)
     }
 }
-private final class StringListBuildOptionType : BuildOptionType {
+private final class StringListBuildOptionType: BuildOptionType {
     let typeName = "StringList"
     let isListType = true
     let supportsValuesDefinitions = false
@@ -147,7 +147,7 @@ private final class StringListBuildOptionType : BuildOptionType {
         return try namespace.declareStringListMacro(name)
     }
 }
-private final class OpenCLArchitecturesBuildOptionType : BuildOptionType {
+private final class OpenCLArchitecturesBuildOptionType: BuildOptionType {
     let typeName = "OpenCLArchitectures"
     let isListType = true
     let supportsValuesDefinitions = false
@@ -156,7 +156,7 @@ private final class OpenCLArchitecturesBuildOptionType : BuildOptionType {
         return try namespace.declareStringListMacro(name)
     }
 }
-private final class PathBuildOptionType : BuildOptionType {
+private final class PathBuildOptionType: BuildOptionType {
     let typeName = "Path"
     let isListType = false
     let supportsValuesDefinitions = false
@@ -165,7 +165,7 @@ private final class PathBuildOptionType : BuildOptionType {
         return try namespace.declarePathMacro(name)
     }
 }
-private final class PathListBuildOptionType : BuildOptionType {
+private final class PathListBuildOptionType: BuildOptionType {
     let typeName = "PathList"
     let isListType = true
     let supportsValuesDefinitions = false
@@ -174,7 +174,7 @@ private final class PathListBuildOptionType : BuildOptionType {
         return try namespace.declarePathListMacro(name)
     }
 }
-private final class ProvisioningProfileBuildOptionType : BuildOptionType {
+private final class ProvisioningProfileBuildOptionType: BuildOptionType {
     let typeName = "ProvisioningProfile"
     let isListType = false
     let supportsValuesDefinitions = false
@@ -183,7 +183,7 @@ private final class ProvisioningProfileBuildOptionType : BuildOptionType {
         return try namespace.declareStringMacro(name)
     }
 }
-private final class ProvisioningProfileSpecifierBuildOptionType : BuildOptionType {
+private final class ProvisioningProfileSpecifierBuildOptionType: BuildOptionType {
     let typeName = "ProvisioningProfileSpecifier"
     let isListType = false
     let supportsValuesDefinitions = false
@@ -281,11 +281,11 @@ private let buildOptionTypes: [String: any BuildOptionType] = [
 @_spi(Testing) public final class BuildOption: CustomStringConvertible, Sendable {
     /// Helper type for representing the type of command line argument specifier that was used for a build option.
     private enum CommandLineSpecifier {
-    case arrayArgs(value: [String])
-    case dictArgs(value: [String: PropertyListItem])
-    case stringArgs(value: String)
-    case flag(value: String)
-    case prefixFlag(value: String)
+        case arrayArgs(value: [String])
+        case dictArgs(value: [String: PropertyListItem])
+        case stringArgs(value: String)
+        case flag(value: String)
+        case prefixFlag(value: String)
     }
 
     /// The name (build setting) of the option.
@@ -371,7 +371,7 @@ private let buildOptionTypes: [String: any BuildOptionType] = [
         var valueNameOpt: String? = nil
         var commandLineTemplateOpt: BuildOptionValue.CommandLineTemplateSpecifier? = nil
         var commandLineKey: String? = nil
-        for (key,valueData) in data {
+        for (key, valueData) in data {
             switch key {
             case "Value":
                 guard case .plString(let value) = valueData else {
@@ -507,7 +507,7 @@ private let buildOptionTypes: [String: any BuildOptionType] = [
                     valueDefns[valueName] = BuildOptionValue(commandLineTemplate: nil)
                 case .plDict(let items):
                     // Parse the option from the definition dict.
-                    guard let (valueName,option) = parseBuildOptionValue(parser, name, type, items) else { continue }
+                    guard let (valueName, option) = parseBuildOptionValue(parser, name, type, items) else { continue }
                     if valueDefns[valueName] != nil {
                         error("duplicate value definition '\(valueName)'")
                         continue
@@ -562,7 +562,7 @@ private let buildOptionTypes: [String: any BuildOptionType] = [
                         return nil
                     }
                 }
-                for (key,valueData) in items.sorted(byKey: <) {
+                for (key, valueData) in items.sorted(byKey: <) {
                     // Convert the valueData to the appropriate option.
                     guard let template = getTemplateForData(key, valueData) else { continue }
 
@@ -668,7 +668,7 @@ private let buildOptionTypes: [String: any BuildOptionType] = [
         // For boolean types, validate and normalize the keys.
         if type is BoolBuildOptionType {
             if let valueDefns = valueDefnsOpt {
-                for (key,item) in valueDefns {
+                for (key, item) in valueDefns {
                     if key == "NO" {
                         emptyValueDefn = item
                     } else if key == "YES" {
@@ -870,7 +870,7 @@ private let buildOptionTypes: [String: any BuildOptionType] = [
                 switch key {
                 case "CommandLineArgs":
                     switch valueData {
-                        // FIXME: The string form is very rarely used, although conceptually it makes sense. We should verify it is worth the complexity though.
+                    // FIXME: The string form is very rarely used, although conceptually it makes sense. We should verify it is worth the complexity though.
                     case .plString(let value):
                         commandLineSpecifierOpt = .stringArgs(value: value)
                     case .plArray(let value):
@@ -1109,8 +1109,7 @@ private let buildOptionTypes: [String: any BuildOptionType] = [
                                 return nil
                             }
                             return VersionRange(start: startVersion)
-                        }
-                        else if valueItems.count == 2 {
+                        } else if valueItems.count == 2 {
                             guard case .plString(let startValue) = valueItems[0], let startVersion = try? Version(startValue) else {
                                 error("could not parse first element of value '\(valueItems)' in array for '\(key)'")
                                 return nil
@@ -1122,11 +1121,10 @@ private let buildOptionTypes: [String: any BuildOptionType] = [
                             do {
                                 return try VersionRange(start: startVersion, end: endVersion)
                             } catch let e {
-                                error("unexpected value '\(valueItems)' in array for '\(key)' - \(e)") // e == "version range start must be less than or equal to end, but \(start) greater than \(end)"
+                                error("unexpected value '\(valueItems)' in array for '\(key)' - \(e)")  // e == "version range start must be less than or equal to end, but \(start) greater than \(end)"
                                 return nil
                             }
-                        }
-                        else {
+                        } else {
                             error("unexpected value '\(valueItems)' in array for '\(key)' - array contains more than 2 elements")
                             return nil
                         }
@@ -1170,7 +1168,7 @@ private let buildOptionTypes: [String: any BuildOptionType] = [
         }
 
         // If we have a name and no type was assigned, infer from the known macro type.
-        if let name = nameOpt, type == nil  {
+        if let name = nameOpt, type == nil {
             if let macro = parser.delegate.internalMacroNamespace.lookupMacroDeclaration(name) {
                 if macro is StringMacroDeclaration {
                     // This is the default, no warning about type incompatibility.
@@ -1402,14 +1400,15 @@ private let buildOptionTypes: [String: any BuildOptionType] = [
 
         // Handle list typed options.
         guard !type.isListType else {
-            var values = switch self.macro {
-            case let macro as StringListMacroDeclaration:
-                scope.evaluate(macro, lookup: lookup)
-            case let macro as PathListMacroDeclaration:
-                scope.evaluate(macro, lookup: lookup)
-            default:
-                fatalError("invalid macro type for List option")
-            }
+            var values =
+                switch self.macro {
+                case let macro as StringListMacroDeclaration:
+                    scope.evaluate(macro, lookup: lookup)
+                case let macro as PathListMacroDeclaration:
+                    scope.evaluate(macro, lookup: lookup)
+                default:
+                    fatalError("invalid macro type for List option")
+                }
 
             // Get the value definition to use.
             let valueDefnOpt = values.isEmpty ? emptyValueDefn : otherValueDefn
@@ -1419,8 +1418,7 @@ private let buildOptionTypes: [String: any BuildOptionType] = [
                 return []
             }
 
-            if self.name == "TAPI_HEADER_SEARCH_PATHS" && (scope.evaluate(BuiltinMacros.TAPI_ENABLE_PROJECT_HEADERS) ||
-                scope.evaluate(BuiltinMacros.TAPI_USE_SRCROOT)) {
+            if self.name == "TAPI_HEADER_SEARCH_PATHS" && (scope.evaluate(BuiltinMacros.TAPI_ENABLE_PROJECT_HEADERS) || scope.evaluate(BuiltinMacros.TAPI_USE_SRCROOT)) {
                 return values.map { valuesArePaths ? .path(Path($0)) : .literal(ByteString(encodingAsUTF8: $0)) }
             }
 
@@ -1538,14 +1536,15 @@ private let buildOptionTypes: [String: any BuildOptionType] = [
             }
             // Handle list typed options.
             guard !type.isListType else {
-                let values = switch self.macro {
-                case let macro as StringListMacroDeclaration:
-                    cbc.scope.evaluate(macro, lookup: lookup)
-                case let macro as PathListMacroDeclaration:
-                    cbc.scope.evaluate(macro, lookup: lookup)
-                default:
-                    fatalError("invalid macro type for List option")
-                }
+                let values =
+                    switch self.macro {
+                    case let macro as StringListMacroDeclaration:
+                        cbc.scope.evaluate(macro, lookup: lookup)
+                    case let macro as PathListMacroDeclaration:
+                        cbc.scope.evaluate(macro, lookup: lookup)
+                    default:
+                        fatalError("invalid macro type for List option")
+                    }
                 // FIXME: This is probably not right - we likely need to quote or escape the values here.
                 return values.isEmpty ? nil : (key, values.joined(separator: " "))
             }
@@ -1601,14 +1600,15 @@ private let buildOptionTypes: [String: any BuildOptionType] = [
 
         // Handle list typed options.
         guard !type.isListType else {
-            let values = switch self.macro {
-            case let macro as StringListMacroDeclaration:
-                scope.evaluate(macro, lookup: lookup)
-            case let macro as PathListMacroDeclaration:
-                scope.evaluate(macro, lookup: lookup)
-            default:
-                fatalError("invalid macro type for List option")
-            }
+            let values =
+                switch self.macro {
+                case let macro as StringListMacroDeclaration:
+                    scope.evaluate(macro, lookup: lookup)
+                case let macro as PathListMacroDeclaration:
+                    scope.evaluate(macro, lookup: lookup)
+                default:
+                    fatalError("invalid macro type for List option")
+                }
 
             // Get the value definition to use.
             let valueDefnOpt = values.isEmpty ? emptyValueDefn : otherValueDefn
@@ -1641,7 +1641,6 @@ private let buildOptionTypes: [String: any BuildOptionType] = [
     }
 }
 
-
 /// A `BuildOptionGenerationContext` provides information that a `BuildOption` need to generate command-line options for a tool.
 public protocol BuildOptionGenerationContext {
     /// The path to the tool in question.
@@ -1660,7 +1659,7 @@ extension BuildOptionGenerationContext {
 }
 
 /// This is a shared base class, but cannot itself be a declared spec type.
-open class PropertyDomainSpec : Spec, @unchecked Sendable {
+open class PropertyDomainSpec: Spec, @unchecked Sendable {
     /// The ordered list of build options associated with this spec, not including any buildOptions from its BasedOn spec (see `flattenedBuildOptions` and `flattenedOrderedBuildOptions` instead).
     @_spi(Testing) public let buildOptions: [BuildOption]
 
@@ -1693,7 +1692,7 @@ open class PropertyDomainSpec : Spec, @unchecked Sendable {
         return flattenedOrderedBuildOptionsCache.getValue(self)
     }
     private var flattenedOrderedBuildOptionsCache = LazyCache { (spec: PropertyDomainSpec) -> [BuildOption] in
-    // We start with a list of ordered option names defined by our basedOnSpec.
+        // We start with a list of ordered option names defined by our basedOnSpec.
         var orderedOptionNames = OrderedSet<String>((spec.basedOnSpec != nil) ? (spec.basedOnSpec! as! PropertyDomainSpec).flattenedOrderedBuildOptions.map({ $0.name }) : [])
         // Now we go through our own options, and decide where to add each one.  An invariant is that no option should appear in the list more than once.
         for option in spec.buildOptions {
@@ -1709,8 +1708,7 @@ open class PropertyDomainSpec : Spec, @unchecked Sendable {
             if let index = orderedOptionNames.firstIndex(of: option.name) {
                 orderedOptionNames.remove(at: index)
                 orderedOptionNames.insert(option.name, at: index)
-            }
-            else {
+            } else {
                 orderedOptionNames.append(option.name)
             }
         }
@@ -1754,7 +1752,6 @@ open class PropertyDomainSpec : Spec, @unchecked Sendable {
     }
 }
 
-
 /// Extensions to PropertyDomainSpec for performance testing.
 extension PropertyDomainSpec {
 
diff --git a/Sources/SWBCore/SpecImplementations/SpecParser.swift b/Sources/SWBCore/SpecImplementations/SpecParser.swift
index 535b1019..d1918dde 100644
--- a/Sources/SWBCore/SpecImplementations/SpecParser.swift
+++ b/Sources/SWBCore/SpecImplementations/SpecParser.swift
@@ -50,7 +50,7 @@ public class SpecParser {
     }
 
     /// The set of keys which are parsed by the proxy machinery, and shouldn't count as unused.
-    private static let keysParsedByProxy = Set<String>([ "Class", "Domain", "_Domain", "Identifier", "Type", "BasedOn" ])
+    private static let keysParsedByProxy = Set<String>(["Class", "Domain", "_Domain", "Identifier", "Type", "BasedOn"])
 
     @_spi(Testing) public func complete() {
         for key in proxy.data.keys {
@@ -111,7 +111,7 @@ public class SpecParser {
         return parseItemAsStringList(key, value)
     }
 
-    func parseItemAsStringList(_ key:String, _ value: PropertyListItem) -> [String]? {
+    func parseItemAsStringList(_ key: String, _ value: PropertyListItem) -> [String]? {
         // Extract the value.
         guard case .plArray(let arrayValue) = value else {
             error("unexpected item: \(value) while parsing key \(key) (expected array of strings)")
@@ -174,9 +174,9 @@ public class SpecParser {
         return parseItemAsBuildSettings(key, value, baseSettings: baseSettings)
     }
 
-    func parseItemAsBuildSettings(_ key:String, _ value: PropertyListItem, baseSettings: MacroValueAssignmentTable? = nil) -> MacroValueAssignmentTable? {
+    func parseItemAsBuildSettings(_ key: String, _ value: PropertyListItem, baseSettings: MacroValueAssignmentTable? = nil) -> MacroValueAssignmentTable? {
         // This holds our "last-in-wins" values for our macro assignments.
-        var values: [String:(macro:MacroDeclaration, conditions:MacroConditionSet?, expression:MacroExpression)] = [:]
+        var values: [String: (macro: MacroDeclaration, conditions: MacroConditionSet?, expression: MacroExpression)] = [:]
 
         // A helper function to populate the `values` table correctly based on the macro/conditions set.
         func setBuildSetting(macro: MacroDeclaration, conditions: MacroConditionSet?, expr: MacroExpression) {
@@ -210,9 +210,8 @@ public class SpecParser {
 
             let conditionSet: MacroConditionSet?
             if let conditions {
-                conditionSet = MacroConditionSet(conditions: conditions.map{ MacroCondition(parameter: namespace.declareConditionParameter($0.0), valuePattern: $0.1) })
-            }
-            else {
+                conditionSet = MacroConditionSet(conditions: conditions.map { MacroCondition(parameter: namespace.declareConditionParameter($0.0), valuePattern: $0.1) })
+            } else {
                 conditionSet = nil
             }
 
@@ -226,22 +225,22 @@ public class SpecParser {
                     case (.path, .plString(_)):
                         return try namespace.declarePathMacro(macroName)
                     case (.pathList, .plString(_)),
-                         (.pathList, .plArray(_)):
+                        (.pathList, .plArray(_)):
                         return try namespace.declarePathListMacro(macroName)
-                    case (.boolean, .plString(_)), // builtin boolean macro + OpenStep plist string => boolean
-                         (.boolean, .plBool(_)),
-                         (nil, .plBool(_)):
+                    case (.boolean, .plString(_)),  // builtin boolean macro + OpenStep plist string => boolean
+                        (.boolean, .plBool(_)),
+                        (nil, .plBool(_)):
                         return try namespace.declareBooleanMacro(macroName)
                     case (.string, .plString(_)),
-                         (nil, .plString(_)):
+                        (nil, .plString(_)):
                         // Both StringMacroDeclaration and EnumMacroDeclaration use the string macro type, but are represented by different classes. If the existing declaration is an enum, it was defined in BuiltinMacros, so prefer it.
                         if let existingDeclaration, existingDeclaration is AnyEnumMacroDeclaration {
                             return existingDeclaration
                         }
                         return try namespace.declareStringMacro(macroName)
-                    case (.stringList, .plString(_)), // some string lists are declared as strings in xcspecs
-                         (.stringList, .plArray(_)),
-                         (nil, .plArray(_)):
+                    case (.stringList, .plString(_)),  // some string lists are declared as strings in xcspecs
+                        (.stringList, .plArray(_)),
+                        (nil, .plArray(_)):
                         return try namespace.declareStringListMacro(macroName)
                     case let (macroType, _):
                         // Using .userDefined here in the nil case is not strictly correct since we're not actually attempting to register a user defined macro, but close enough (we just need _some_ value for the error) - if a plist value was a dictionary for example we'd get an error about the 'dictionary' type being inconsistent with the user defined macro type.
@@ -344,11 +343,11 @@ public class SpecParser {
         }
         // If we have an array we traverse its entries.
         if case .plArray(let entries) = value {
-            return try entries.compactMap{ try callBlock($0) }
+            return try entries.compactMap { try callBlock($0) }
         }
         // Otherwise, if we are asked to allow a single unarrayed element, we just invoke the block once.
         else if allowUnarrayedElement {
-            return try [value].compactMap{ try callBlock($0) }
+            return try [value].compactMap { try callBlock($0) }
         }
         // Otherwise, we have an unexpected item.
         else {
diff --git a/Sources/SWBCore/SpecImplementations/SpecRegistry.swift b/Sources/SWBCore/SpecImplementations/SpecRegistry.swift
index b6e0164b..b8f00e3f 100644
--- a/Sources/SWBCore/SpecImplementations/SpecRegistry.swift
+++ b/Sources/SWBCore/SpecImplementations/SpecRegistry.swift
@@ -217,20 +217,25 @@ public final class SpecProxy {
         if let basedOnProxy = self.basedOnProxy {
             basedOnSpec = basedOnProxy.load(registry)
             if basedOnSpec == nil {
-                let loadingErrorDiagnostic = Diagnostic(behavior: .error, location: .path(self.path), data: DiagnosticData("unable to load \(specifierString) due to errors loading base spec"), childDiagnostics: {
-                    if case let .error(diagnostics) = basedOnProxy.loadedSpec {
-                        return diagnostics
-                    } else {
-                        return []
-                    }
-                }())
+                let loadingErrorDiagnostic = Diagnostic(
+                    behavior: .error,
+                    location: .path(self.path),
+                    data: DiagnosticData("unable to load \(specifierString) due to errors loading base spec"),
+                    childDiagnostics: {
+                        if case let .error(diagnostics) = basedOnProxy.loadedSpec {
+                            return diagnostics
+                        } else {
+                            return []
+                        }
+                    }()
+                )
                 loadedSpec = .error(diagnostics: [loadingErrorDiagnostic])
                 registry.emit(loadingErrorDiagnostic)
                 return nil
             }
         }
 
-        final class Delegate : SpecParserDelegate {
+        final class Delegate: SpecParserDelegate {
             let specRegistry: SpecRegistry
             let proxy: SpecProxy
             var internalMacroNamespace: MacroNamespace {
@@ -310,7 +315,7 @@ extension SpecProxy: CustomStringConvertible {
 }
 
 // Private ordering of SpecProxy objects.
-private func <(lhs: SpecProxy, rhs: SpecProxy) -> Bool {
+private func < (lhs: SpecProxy, rhs: SpecProxy) -> Bool {
     // Every (identifier, domain) pair should be unique, so this should define a total ordering.
     return (lhs.identifier < rhs.identifier) || (lhs.identifier == rhs.identifier && lhs.domain < rhs.domain)
 }
@@ -417,9 +422,17 @@ public final class SpecRegistry: Sendable {
             }
         }
 
-        self.inputFileGroupingStrategyFactories = await pluginManager.extensions(of: InputFileGroupingStrategyExtensionPoint.self).reduce([:], { $0.merging($1.groupingStrategies(), uniquingKeysWith: { _, _ in
-            preconditionFailure("attempt to register duplicate input file grouping strategy")
-        }) })
+        self.inputFileGroupingStrategyFactories = await pluginManager.extensions(of: InputFileGroupingStrategyExtensionPoint.self).reduce(
+            [:],
+            {
+                $0.merging(
+                    $1.groupingStrategies(),
+                    uniquingKeysWith: { _, _ in
+                        preconditionFailure("attempt to register duplicate input file grouping strategy")
+                    }
+                )
+            }
+        )
 
         // Register all the specs concurrently.
         await withTaskGroup(of: [SpecProxy].self, returning: Void.self) { group in
@@ -575,13 +588,13 @@ public final class SpecRegistry: Sendable {
 
         guard case .plString(let className) = classItem else {
             error(path, "invalid 'Class' field")
-            return (success:false, nil)
+            return (success: false, nil)
         }
 
         // Look up the spec class.
         guard let classType = specClassesByClassName[className] else {
             error(path, "unknown spec 'Class': '\(className)'")
-            return (success:false, nil)
+            return (success: false, nil)
         }
 
         return (success: true, classType)
@@ -867,7 +880,7 @@ public final class SpecRegistry: Sendable {
     private let proxyCache = Cache<ProxyCacheKey, [SpecProxy]>()
 
     /// Get all specs in the registry of the given spec type `T` in the given `domain`.
-    public func findSpecs<T: Spec>(_ type: T.Type, domain: String = "", includeInherited: Bool = true) -> [T] where T : SpecType {
+    public func findSpecs<T: Spec>(_ type: T.Type, domain: String = "", includeInherited: Bool = true) -> [T] where T: SpecType {
         var result = Array<T>()
         for proxy in findProxiesInSubregistry(T.self, domain: domain, includeInherited: includeInherited) {
             if let spec = proxy.load(self) {
@@ -907,9 +920,10 @@ public final class SpecRegistry: Sendable {
     @discardableResult @_spi(Testing) public func validateSpecDomainInversion(reportError: ((String) -> (Void))? = nil) -> Bool {
         // See the hacks in registerSpec(), and rdar://problem/22361888.
 
-        let reportError = reportError ?? { error in
-            print(error)
-        }
+        let reportError =
+            reportError ?? { error in
+                print(error)
+            }
 
         // Find places where a proxy illegally depends on a spec overridden in a subdomain.
         //
@@ -936,7 +950,7 @@ public final class SpecRegistry: Sendable {
                 guard let basedOn = proxy.basedOn else { continue }
 
                 // If the proxy's basedOn reference has a domain specifier, we require it to resolve to a fixed proxy.
-                let (_,rhs) = basedOn.split(":")
+                let (_, rhs) = basedOn.split(":")
                 if !rhs.isEmpty {
                     continue
                 }
@@ -1041,9 +1055,10 @@ extension SpecRegistry {
         case let productRef as ProductReference:
             // For a product reference, we look up its producing target's PackageTypeSpec, and return the file type the package type defines.
             if let standardTargetRef = productRef.target as? StandardTarget,
-                   let productType = getSpec(standardTargetRef.productTypeIdentifier, domain: domain) as? ProductTypeSpec,
-                   let packageType = getSpec(productType.defaultPackageTypeIdentifier, domain: domain) as? PackageTypeSpec,
-                   let fileTypeIdent = packageType.productReferenceFileTypeIdentifier {
+                let productType = getSpec(standardTargetRef.productTypeIdentifier, domain: domain) as? ProductTypeSpec,
+                let packageType = getSpec(productType.defaultPackageTypeIdentifier, domain: domain) as? PackageTypeSpec,
+                let fileTypeIdent = packageType.productReferenceFileTypeIdentifier
+            {
                 return lookupFileType(identifier: fileTypeIdent, domain: domain)
             }
             return nil
@@ -1089,7 +1104,7 @@ extension SpecLookupContext {
     }
 
     /// Get all specs in the registry of the given spec type `T` in the given `domain`.
-    func findSpecs<T: Spec>(_ type: T.Type, includeInherited: Bool = true) -> [T] where T : SpecType {
+    func findSpecs<T: Spec>(_ type: T.Type, includeInherited: Bool = true) -> [T] where T: SpecType {
         return specRegistry.findSpecs(type, domain: domain, includeInherited: includeInherited)
     }
 
diff --git a/Sources/SWBCore/SpecImplementations/Specs.swift b/Sources/SWBCore/SpecImplementations/Specs.swift
index cb8cf844..d44b04fe 100644
--- a/Sources/SWBCore/SpecImplementations/Specs.swift
+++ b/Sources/SWBCore/SpecImplementations/Specs.swift
@@ -121,7 +121,7 @@ extension Spec: Hashable {
         hasher.combine(ObjectIdentifier(self))
     }
 
-    public static func ==(lhs: Spec, rhs: Spec) -> Bool {
+    public static func == (lhs: Spec, rhs: Spec) -> Bool {
         return lhs === rhs
     }
 }
@@ -132,7 +132,7 @@ extension Spec: CustomStringConvertible {
     }
 }
 
-public final class ArchitectureSpec : Spec, SpecType, @unchecked Sendable {
+public final class ArchitectureSpec: Spec, SpecType, @unchecked Sendable {
     class public override var typeName: String {
         return "Architecture"
     }
@@ -225,8 +225,7 @@ public final class ArchitectureSpec : Spec, SpecType, @unchecked Sendable {
                 guard lower < upper else { throw StubError.error("expected that \(lower) < \(upper)") }
 
                 return Range(uncheckedBounds: (lower, upper))
-            }
-            catch {
+            } catch {
                 parser.error("\(key): \(error)")
                 return nil
             }
@@ -247,7 +246,7 @@ public final class ArchitectureSpec : Spec, SpecType, @unchecked Sendable {
     }
 }
 
-public final class ProjectOverridesSpec : Spec, SpecType, @unchecked Sendable {
+public final class ProjectOverridesSpec: Spec, SpecType, @unchecked Sendable {
     class public override var typeName: String {
         return "ProjectOverrides"
     }
@@ -269,7 +268,7 @@ public final class ProjectOverridesSpec : Spec, SpecType, @unchecked Sendable {
     }
 }
 
-public class FileTypeSpec : Spec, SpecType, @unchecked Sendable {
+public class FileTypeSpec: Spec, SpecType, @unchecked Sendable {
     class public override var typeName: String {
         return "FileType"
     }
@@ -368,7 +367,7 @@ public class FileTypeSpec : Spec, SpecType, @unchecked Sendable {
     }
 }
 
-public final class PackageTypeSpec : Spec, SpecType, @unchecked Sendable {
+public final class PackageTypeSpec: Spec, SpecType, @unchecked Sendable {
     class public override var typeName: String {
         return "PackageType"
     }
@@ -442,7 +441,7 @@ public final class PackageTypeSpec : Spec, SpecType, @unchecked Sendable {
     ]
 }
 
-public final class PlatformSpec : Spec, SpecType, @unchecked Sendable {
+public final class PlatformSpec: Spec, SpecType, @unchecked Sendable {
     class public override var typeName: String {
         return "Platform"
     }
@@ -451,7 +450,7 @@ public final class PlatformSpec : Spec, SpecType, @unchecked Sendable {
     }
 }
 
-public final class BuildSettingsSpec : PropertyDomainSpec, SpecType, @unchecked Sendable {
+public final class BuildSettingsSpec: PropertyDomainSpec, SpecType, @unchecked Sendable {
     class public override var typeName: String {
         return "BuildSettings"
     }
@@ -471,7 +470,7 @@ public final class BuildSettingsExtensionSpec: PropertyDomainSpec, SpecType, @un
     }
 }
 
-public final class BuildSystemSpec : PropertyDomainSpec, SpecType, @unchecked Sendable {
+public final class BuildSystemSpec: PropertyDomainSpec, SpecType, @unchecked Sendable {
     class public override var typeName: String {
         return "BuildSystem"
     }
@@ -480,7 +479,7 @@ public final class BuildSystemSpec : PropertyDomainSpec, SpecType, @unchecked Se
     }
 }
 
-public final class BuildPhaseSpec : Spec, SpecType, @unchecked Sendable {
+public final class BuildPhaseSpec: Spec, SpecType, @unchecked Sendable {
     class public override var typeName: String {
         return "BuildPhase"
     }
diff --git a/Sources/SWBCore/SpecImplementations/Tools/AppShortcutStringsMetadataCompiler.swift b/Sources/SWBCore/SpecImplementations/Tools/AppShortcutStringsMetadataCompiler.swift
index a711c9ff..314ef56f 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/AppShortcutStringsMetadataCompiler.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/AppShortcutStringsMetadataCompiler.swift
@@ -91,16 +91,18 @@ final public class AppShortcutStringsMetadataCompilerSpec: GenericCommandLineToo
         }
 
         let commandLine = await commandLineFromTemplate(cbc, delegate, optionContext: discoveredCommandLineToolSpecInfo(cbc.producer, cbc.scope, delegate), lookup: lookup).map(\.asString)
-        delegate.createTask(type: self,
-                            ruleInfo: defaultRuleInfo(cbc, delegate),
-                            commandLine: commandLine,
-                            environment: environmentFromSpec(cbc, delegate),
-                            workingDirectory: cbc.producer.defaultWorkingDirectory,
-                            inputs: inputs,
-                            outputs: [outputOrderingNode],
-                            action: nil,
-                            execDescription: resolveExecutionDescription(cbc, delegate),
-                            enableSandboxing: enableSandboxing)
+        delegate.createTask(
+            type: self,
+            ruleInfo: defaultRuleInfo(cbc, delegate),
+            commandLine: commandLine,
+            environment: environmentFromSpec(cbc, delegate),
+            workingDirectory: cbc.producer.defaultWorkingDirectory,
+            inputs: inputs,
+            outputs: [outputOrderingNode],
+            action: nil,
+            execDescription: resolveExecutionDescription(cbc, delegate),
+            enableSandboxing: enableSandboxing
+        )
     }
 
     public override func customOutputParserType(for task: any ExecutableTask) -> (any TaskOutputParser.Type)? {
@@ -133,7 +135,8 @@ public final class AppShortcutStringsValidationOutputParser: TaskOutputParser {
         var diagnosticLocation: Diagnostic.Location {
             guard let path else { return .unknown }
             if let languageCode,
-               let key {
+                let key
+            {
                 return .path(Path(path), fileLocation: .object(identifier: "\(languageCode):\(key)"))
             }
             return .path(Path(path), line: line)
diff --git a/Sources/SWBCore/SpecImplementations/Tools/CCompiler.swift b/Sources/SWBCore/SpecImplementations/Tools/CCompiler.swift
index ead99dcf..7b0428a4 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/CCompiler.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/CCompiler.swift
@@ -14,9 +14,8 @@ public import SWBUtil
 public import SWBMacro
 import Foundation
 
-
 /// Abstract C Compiler.  This is not a concrete implementation, but rather it uses various information in the command build context to choose a specific compiler and to call `constructTasks()` on that compiler.  This provides a level of indirection for projects that just want their source files compiled using the default C compiler.  Depending on the context, the default C compiler for any particular combination of platform, architecture, and other factors may be Clang, ICC, GCC, or some other compiler.
-class AbstractCCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatibleCompilerCommandLineBuilder, @unchecked Sendable {
+class AbstractCCompilerSpec: CompilerSpec, SpecIdentifierType, GCCCompatibleCompilerCommandLineBuilder, @unchecked Sendable {
     static let identifier = "com.apple.compilers.gcc"
 
     override func resolveConcreteSpec(_ cbc: CommandBuildContext) -> CommandLineToolSpec {
@@ -42,7 +41,7 @@ public struct ClangPrefixInfo: Serializable, Hashable, Encodable, Sendable {
 
     struct PCHInfo: Serializable, Hashable, Encodable {
         let output: Path
-        let hashCriteria: Path? // Should be non-optional, but blocked on: <rdar://problem/24469921> [Swift Build] Complete handling of PCH precompiling
+        let hashCriteria: Path?  // Should be non-optional, but blocked on: <rdar://problem/24469921> [Swift Build] Complete handling of PCH precompiling
         let commandLine: [ByteString]
 
         private enum CodingKeys: CodingKey {
@@ -105,16 +104,18 @@ public struct ClangIndexingPayload: Serializable, Encodable, Sendable {
     let responseFileAttachmentPaths: [Path: Path]
     let responseFileFormat: ResponseFileFormat
 
-    init(sourceFileIndex: Int,
-         outputFileIndex: Int,
-         sourceLanguageIndex: Int,
-         builtProductsDir: Path,
-         assetSymbolIndexPath: Path,
-         workingDir: Path,
-         prefixInfo: ClangPrefixInfo?,
-         toolchains: [String],
-         responseFileAttachmentPaths: [Path: Path],
-         responseFileFormat: ResponseFileFormat) {
+    init(
+        sourceFileIndex: Int,
+        outputFileIndex: Int,
+        sourceLanguageIndex: Int,
+        builtProductsDir: Path,
+        assetSymbolIndexPath: Path,
+        workingDir: Path,
+        prefixInfo: ClangPrefixInfo?,
+        toolchains: [String],
+        responseFileAttachmentPaths: [Path: Path],
+        responseFileFormat: ResponseFileFormat
+    ) {
         self.sourceFileIndex = sourceFileIndex
         self.outputFileIndex = outputFileIndex
         self.sourceLanguageIndex = sourceLanguageIndex
@@ -210,12 +211,12 @@ public struct ClangSourceFileIndexingInfo: SourceFileIndexingInfo {
     public static func indexingCommandLine(from commandLine: [ByteString], workingDir: Path, prefixInfo: ClangPrefixInfo? = nil, addSupplementary: Bool = true, replaceCompile: Bool = true, responseFileMapping: [Path: Path], responseFileFormat: ResponseFileFormat?) -> [ByteString] {
         var result = [ByteString]()
         var iterator = commandLine.makeIterator()
-        let _ = iterator.next() // Skip compiler path
+        let _ = iterator.next()  // Skip compiler path
 
         while let arg = iterator.next() {
             if skippedArgsWithValues.contains(arg) {
                 // Skip arg and value
-                _ = iterator.next() // Ignore failure...
+                _ = iterator.next()  // Ignore failure...
             } else if skippedArgsWithoutValues.contains(arg) {
                 // Skip
             } else if arg == "-c" && replaceCompile {
@@ -231,7 +232,8 @@ public struct ClangSourceFileIndexingInfo: SourceFileIndexingInfo {
                 }
 
                 if let includePath = includePathBytes.stringValue,
-                   pchInfo.output.str.hasPrefix(includePath) {
+                    pchInfo.output.str.hasPrefix(includePath)
+                {
                     result.append(ByteString(encodingAsUTF8: prefixInfo.input.str))
                 } else {
                     result.append(includePathBytes)
@@ -239,9 +241,10 @@ public struct ClangSourceFileIndexingInfo: SourceFileIndexingInfo {
             } else if arg.bytes.starts(with: ByteString(stringLiteral: "-fbuild-session-file=").bytes) {
                 // Skip
             } else if arg.starts(with: ByteString(unicodeScalarLiteral: "@")),
-                      let attachmentPath = responseFileMapping[Path(arg.asString.dropFirst())],
-                      let responseFileFormat,
-                      let responseFileArgs = try? ResponseFiles.expandResponseFiles(["@\(attachmentPath.str)"], fileSystem: localFS, relativeTo: workingDir, format: responseFileFormat) {
+                let attachmentPath = responseFileMapping[Path(arg.asString.dropFirst())],
+                let responseFileFormat,
+                let responseFileArgs = try? ResponseFiles.expandResponseFiles(["@\(attachmentPath.str)"], fileSystem: localFS, relativeTo: workingDir, format: responseFileFormat)
+            {
                 result.append(contentsOf: responseFileArgs.map { ByteString(encodingAsUTF8: $0) })
             } else {
                 result.append(arg)
@@ -271,7 +274,7 @@ public struct ClangSourceFileIndexingInfo: SourceFileIndexingInfo {
         // FIXME: Convert to bytes.
         dict["LanguageDialect"] = PropertyListItem(sourceLanguage.asString)
         // FIXME: Convert to bytes.
-        dict["clangASTCommandArguments"] = PropertyListItem(commandLine.map{ $0.asString })
+        dict["clangASTCommandArguments"] = PropertyListItem(commandLine.map { $0.asString })
         dict["clangASTBuiltProductsDir"] = PropertyListItem(builtProductsDir.str)
         dict["assetSymbolIndexPath"] = PropertyListItem(assetSymbolIndexPath.str)
 
@@ -286,7 +289,7 @@ public struct ClangSourceFileIndexingInfo: SourceFileIndexingInfo {
                 }
 
                 // FIXME: Convert to bytes.
-                dict["clangPCHCommandArguments"] = PropertyListItem(pch.commandLine.map{ $0.asString })
+                dict["clangPCHCommandArguments"] = PropertyListItem(pch.commandLine.map { $0.asString })
             }
         }
 
@@ -430,7 +433,7 @@ public protocol ClangModuleVerifierPayloadType: TaskPayload {
 struct ClangModuleVerifierPayload: ClangModuleVerifierPayloadType {
     var fileNameMapPath: Path?
 
-    func serialize<T>(to serializer: T) where T : SWBUtil.Serializer {
+    func serialize<T>(to serializer: T) where T: SWBUtil.Serializer {
         serializer.serialize(fileNameMapPath)
     }
 
@@ -555,8 +558,7 @@ public enum FlagPattern: Sendable {
     }
 }
 
-
-public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatibleCompilerCommandLineBuilder, @unchecked Sendable {
+public class ClangCompilerSpec: CompilerSpec, SpecIdentifierType, GCCCompatibleCompilerCommandLineBuilder, @unchecked Sendable {
     /// Clang compiler data cache, used to cache constant flags.
     fileprivate final class DataCache: SpecDataCache {
         fileprivate struct ConstantFlagsKey: Hashable, Sendable {
@@ -589,7 +591,7 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
         /// Cache of constant flags, keyed by the scope and input file type.
         private let constantFlagsCache = Registry<ConstantFlagsKey, ConstantFlags>()
 
-        required init() { }
+        required init() {}
 
         func getStandardFlags(_ spec: ClangCompilerSpec, producer: any CommandProducer, scope: MacroEvaluationScope, optionContext: (any BuildOptionGenerationContext)?, delegate: any TaskGenerationDelegate, inputFileType: FileTypeSpec) -> ConstantFlags {
             // This cache is per-producer, so it is guaranteed to be invariant based on that.
@@ -650,15 +652,22 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
         var commandLine = Array<String>()
 
         // Add the arguments from the specification.
-        commandLine += self.commandLineFromOptions(producer, scope: scope, inputFileType: inputFileType, optionContext: optionContext, buildOptionsFilter: .specOnly, lookup: { declaration in
-            if declaration.name == "CLANG_INDEX_STORE_ENABLE" && optionContext is DiscoveredClangToolSpecInfo {
-                let clangToolInfo = optionContext as! DiscoveredClangToolSpecInfo
-                if !clangToolInfo.isAppleClang {
-                    return BuiltinMacros.namespace.parseString("NO")
+        commandLine += self.commandLineFromOptions(
+            producer,
+            scope: scope,
+            inputFileType: inputFileType,
+            optionContext: optionContext,
+            buildOptionsFilter: .specOnly,
+            lookup: { declaration in
+                if declaration.name == "CLANG_INDEX_STORE_ENABLE" && optionContext is DiscoveredClangToolSpecInfo {
+                    let clangToolInfo = optionContext as! DiscoveredClangToolSpecInfo
+                    if !clangToolInfo.isAppleClang {
+                        return BuiltinMacros.namespace.parseString("NO")
+                    }
                 }
+                return nil
             }
-            return nil
-        }).map(\.asString)
+        ).map(\.asString)
 
         // Add the common header search paths.
         let headerSearchPaths = GCCCompatibleCompilerSpecSupport.headerSearchPathArguments(producer, scope, usesModules: scope.evaluate(BuiltinMacros.CLANG_ENABLE_MODULES))
@@ -715,16 +724,14 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
                     if let nextArg = iterator.next() {
                         regularCommandLine.append(nextArg)
                     }
-                }
-                else if arg == "-isysroot" || arg == "--sysroot" {
+                } else if arg == "-isysroot" || arg == "--sysroot" {
                     // Exclude the options to pass the path to the base SDK from the response file to make reading the build log easier.
                     // Sparse SDK options do not get similar treatment since they are passed as normal search paths.
                     regularCommandLine.append(arg)
                     if let nextArg = iterator.next() {
                         regularCommandLine.append(nextArg)
                     }
-                }
-                else if ClangSourceFileIndexingInfo.skippedArgsWithValues.contains(argAsByteString) || arg == "-include" {
+                } else if ClangSourceFileIndexingInfo.skippedArgsWithValues.contains(argAsByteString) || arg == "-include" {
                     // Relevant to indexing, so exclude arg and value from response file.
                     regularCommandLine.append(arg)
                     if let nextArg = iterator.next() {
@@ -843,8 +850,7 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
     ])
 
     func isOutputAgnosticCommandLineArgument(_ argument: ByteString, prevArgument: ByteString?) -> Bool {
-        if ClangCompilerSpec.outputAgnosticCompilerArguments.contains(argument) ||
-           ClangCompilerSpec.outputAgnosticCompilerArgumentsWithValues.contains(argument) {
+        if ClangCompilerSpec.outputAgnosticCompilerArguments.contains(argument) || ClangCompilerSpec.outputAgnosticCompilerArgumentsWithValues.contains(argument) {
             return true
         }
 
@@ -853,7 +859,7 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
         }
 
         if let prevArgument, ClangCompilerSpec.outputAgnosticCompilerArgumentsWithValues.contains(prevArgument) {
-          return true
+            return true
         }
 
         return false
@@ -919,11 +925,12 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
         }
 
         let cachedBuild = cachingBuildEnabled(cbc, language: language, clangInfo: clangInfo)
-        let explicitModules = cbc.scope.evaluate(BuiltinMacros.CLANG_ENABLE_MODULES)
-        && (cbc.scope.evaluate(BuiltinMacros.CLANG_ENABLE_EXPLICIT_MODULES) || cbc.scope.evaluate(BuiltinMacros._EXPERIMENTAL_CLANG_EXPLICIT_MODULES))
+        let explicitModules =
+            cbc.scope.evaluate(BuiltinMacros.CLANG_ENABLE_MODULES)
+            && (cbc.scope.evaluate(BuiltinMacros.CLANG_ENABLE_EXPLICIT_MODULES) || cbc.scope.evaluate(BuiltinMacros._EXPERIMENTAL_CLANG_EXPLICIT_MODULES))
 
         let explicitModulesLanguages: Set<GCCCompatibleLanguageDialect> = [
-            .c, .objectiveC
+            .c, .objectiveC,
         ]
         let supportedLanguages = cachedBuild ? GCCCompatibleLanguageDialect.allCLanguages : explicitModulesLanguages
 
@@ -948,16 +955,16 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
 
             // Check that we are using a recognized clang.
             switch compiler.basenameWithoutSuffix {
-                case "clang", "clang++":
-                    break
-                default:
-                    // Not recognized as clang; assume the worst.
-                    delegate.remark("Explicit modules is enabled but the compiler was not recognized; disable explicit modules with CLANG_ENABLE_EXPLICIT_MODULES=NO, or use C_COMPILER_LAUNCHER with CLANG_ENABLE_EXPLICIT_MODULES_WITH_COMPILER_LAUNCHER=YES if using a compatible launcher")
-                    break EXPLICIT_MODULES
+            case "clang", "clang++":
+                break
+            default:
+                // Not recognized as clang; assume the worst.
+                delegate.remark("Explicit modules is enabled but the compiler was not recognized; disable explicit modules with CLANG_ENABLE_EXPLICIT_MODULES=NO, or use C_COMPILER_LAUNCHER with CLANG_ENABLE_EXPLICIT_MODULES_WITH_COMPILER_LAUNCHER=YES if using a compatible launcher")
+                break EXPLICIT_MODULES
             }
 
             // Verify we have a clang version with the latest explicit modules bugfixes.
-            if let clangVersion = clangInfo?.clangVersion, clangVersion < Version(1403, 0, 300, 5)  {
+            if let clangVersion = clangInfo?.clangVersion, clangVersion < Version(1403, 0, 300, 5) {
                 delegate.warning("Explicit modules is not supported with Clang version \(clangVersion), continuing with explicit modules disabled.")
                 break EXPLICIT_MODULES
             }
@@ -1138,7 +1145,7 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
         let dataCache = cbc.producer.getSpecDataCache(self, cacheType: DataCache.self)
         let constantFlags = dataCache.getStandardFlags(self, producer: cbc.producer, scope: cbc.scope, optionContext: clangInfo, delegate: delegate, inputFileType: resolvedInputFileType)
         commandLine += constantFlags.flags
-        let responseFileAdditionalOutput = constantFlags.responseFileMapping.keys.sorted().map({"Using response file: \($0.str)"})
+        let responseFileAdditionalOutput = constantFlags.responseFileMapping.keys.sorted().map({ "Using response file: \($0.str)" })
         additionalOutput.append(contentsOf: responseFileAdditionalOutput)
         inputDeps.append(contentsOf: constantFlags.inputs)
 
@@ -1152,15 +1159,22 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
         // In practice, changes which actually are likely to impact the project will usually result in other source changes which will cause the necessary rebuild, but we should ultimately close this loophole: <rdar://problem/31843906> Move to stronger dependencies on headermaps and VFS
         //
         // We currently don't need to worry about any ordering constraint, because all of the headermap production tasks are forced into an early phase.
-#if false
-        // Mark as depending on search paths which should be treated as inputs.
-        inputDeps.append(contentsOf: constantFlags.headerSearchPaths.inputPaths)
-#endif
+        #if false
+            // Mark as depending on search paths which should be treated as inputs.
+            inputDeps.append(contentsOf: constantFlags.headerSearchPaths.inputPaths)
+        #endif
 
         let cbcWithOutput = cbc.outputs.isEmpty ? cbc.appendingOutputs([outputNode.path]) : cbc
-        commandLine += self.commandLineFromOptions(cbc.producer, scope: cbc.scope, inputFileType: resolvedInputFileType, optionContext: clangInfo, buildOptionsFilter: .extendedOnly, lookup: {
-            self.lookup($0, cbcWithOutput, delegate)
-        }).map(\.asString)
+        commandLine += self.commandLineFromOptions(
+            cbc.producer,
+            scope: cbc.scope,
+            inputFileType: resolvedInputFileType,
+            optionContext: clangInfo,
+            buildOptionsFilter: .extendedOnly,
+            lookup: {
+                self.lookup($0, cbcWithOutput, delegate)
+            }
+        ).map(\.asString)
 
         let additionalOutputs = await self.additionalEvaluatedOutputs(cbcWithOutput, delegate)
         for output in additionalOutputs.outputs {
@@ -1192,7 +1206,7 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
         }
 
         // Add -D arguments for any preprocessor definitions in GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS.
-        commandLine += cbc.scope.evaluate(BuiltinMacros.GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS).map{ "-D\($0)" }
+        commandLine += cbc.scope.evaluate(BuiltinMacros.GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS).map { "-D\($0)" }
 
         // Add -D arguments for any preprocessor definitions in the SDK.
         // FIXME: We don’t yet have the SDK API that we’d need, but perhaps we should instead have the Settings object pass such things down through more general-purpose settings.
@@ -1225,8 +1239,8 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
         let dependencyValidationOutputPath: Path?
         let traceFilePath: Path?
         if clangInfo?.hasFeature("print-headers-direct-per-file") ?? false,
-            ((moduleDependenciesContext?.validate ?? .defaultValue) != .no ||
-             (headerDependenciesContext?.validate ?? .defaultValue) != .no) {
+            ((moduleDependenciesContext?.validate ?? .defaultValue) != .no || (headerDependenciesContext?.validate ?? .defaultValue) != .no)
+        {
 
             dependencyValidationOutputPath = Path(outputNode.path.str + ".dependencies")
             let file = Path(outputNode.path.str + ".trace.json")
@@ -1234,7 +1248,7 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
                 "-Xclang", "-header-include-file",
                 "-Xclang", file.str,
                 "-Xclang", "-header-include-filtering=direct-per-file",
-                "-Xclang", "-header-include-format=json"
+                "-Xclang", "-header-include-format=json",
             ]
             traceFilePath = file
 
@@ -1257,7 +1271,7 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
         let LTO = cbc.scope.evaluate(BuiltinMacros.LLVM_LTO)
         // Pass the flags to emit remarks to the compiler invocation when LTO is disabled. When LTO is enabled, the flags are passed to the linker invocation.
         let shouldGenerateRemarks = cbc.scope.evaluate(BuiltinMacros.CLANG_GENERATE_OPTIMIZATION_REMARKS) && (LTO.isEmpty || LTO == "NO")
-        if  shouldGenerateRemarks {
+        if shouldGenerateRemarks {
             let remarkFilePath = Path(outputNode.path.withoutSuffix + ".opt.bitstream")
             commandLine += ["-fsave-optimization-record=bitstream", "-foptimization-record-file=" + remarkFilePath.str]
             let filter = cbc.scope.evaluate(BuiltinMacros.CLANG_GENERATE_OPTIMIZATION_REMARKS_FILTER)
@@ -1281,8 +1295,7 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
                 commandLine += Self.supplementalIndexingArgs(allowCompilerErrors: clangInfo.toolFeatures.has(.allowPcmWithCompilerErrors))
             }
 
-            if clangInfo.toolFeatures.has(.indexUnitOutputPath) &&
-                (commandLine.contains("-index-store-path") || hasEnabledIndexBuildArena) {
+            if clangInfo.toolFeatures.has(.indexUnitOutputPath) && (commandLine.contains("-index-store-path") || hasEnabledIndexBuildArena) {
                 // Remap the index output file path if either the index store is enabled (checked through the argument since it is conditional on more than just SWIFT_INDEX_STORE_ENABLE) or the build arena is enabled.
                 let basePath = cbc.scope.evaluate(BuiltinMacros.OBJROOT)
                 if let newPath = generateIndexOutputPath(from: outputNode.path, basePath: basePath) {
@@ -1319,12 +1332,12 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
                 ),
                 workingDir: cbc.scope.evaluate(BuiltinMacros.PROJECT_DIR),
                 prefixInfo: prefixInfo,
-                toolchains: cbc.producer.toolchains.map{ $0.identifier },
+                toolchains: cbc.producer.toolchains.map { $0.identifier },
                 responseFileAttachmentPaths: constantFlags.responseFileMapping,
                 responseFileFormat: Self.responseFileFormat(hostOS: cbc.producer.hostOperatingSystem)
             )
         } else {
-            indexingPayload  = nil
+            indexingPayload = nil
         }
 
         // If we're generating module map files, then make the compile task depend on them.
@@ -1467,10 +1480,11 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
         }
 
         if cbc.isPreferredArch,
-           self.identifier == "com.apple.compilers.llvm.clang.1_0.compiler",
-           let sourcecodeCFileType = cbc.producer.lookupFileType(identifier: "sourcecode.c"),
-           resolvedInputFileType.conformsTo(sourcecodeCFileType),
-           !hasEnabledIndexBuildArena {
+            self.identifier == "com.apple.compilers.llvm.clang.1_0.compiler",
+            let sourcecodeCFileType = cbc.producer.lookupFileType(identifier: "sourcecode.c"),
+            resolvedInputFileType.conformsTo(sourcecodeCFileType),
+            !hasEnabledIndexBuildArena
+        {
             // If the static analyzer is enabled, also construct tasks for it.
             let skipAnalyzer = cbc.scope.evaluate(BuiltinMacros.SKIP_CLANG_STATIC_ANALYZER)
             if cbc.scope.evaluate(BuiltinMacros.RUN_CLANG_STATIC_ANALYZER) && !skipAnalyzer {
@@ -1682,7 +1696,7 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
         // Add “standard flags”, which are ones that depend only on the variant, architecture, and language (in addition to the identifier, of course).
         let dataCache = cbc.producer.getSpecDataCache(self, cacheType: DataCache.self)
         let constantFlags = dataCache.getStandardFlags(self, producer: cbc.producer, scope: cbc.scope, optionContext: clangInfo, delegate: delegate, inputFileType: inputFileType)
-        let responseFileAdditionalOutput = constantFlags.responseFileMapping.keys.sorted().map({"Using response file: \($0.str)"})
+        let responseFileAdditionalOutput = constantFlags.responseFileMapping.keys.sorted().map({ "Using response file: \($0.str)" })
         commandLine += constantFlags.flags
 
         // Add the source file argument.
@@ -1717,8 +1731,8 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
         }
 
         // Compute the final input and output path lists.
-        var inputPaths = [ headerPath ] + constantFlags.inputs
-        let outputPaths = [ precompPath ]
+        var inputPaths = [headerPath] + constantFlags.inputs
+        let outputPaths = [precompPath]
 
         // If we're generating module map files, then make PCH generation depend on them.
         // We might not need to include this dependency if the module is 'Swift only', but it shouldn't hurt.
@@ -1729,7 +1743,7 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
             }
         }
 
-        let byteStringCommandLine = commandLine.map{ ByteString(encodingAsUTF8: $0) }
+        let byteStringCommandLine = commandLine.map { ByteString(encodingAsUTF8: $0) }
 
         // Handle explicit modules build.
         let scanningOutput = precompPath.appendingFileNameSuffix("scan")
@@ -1802,12 +1816,12 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
 
             let payload = ClangTaskPayload(serializedDiagnosticsPath: Path(diagnosticsFile), indexingPayload: nil)
 
-            delegate.createTask(type: self, dependencyData: dependencyData, payload: payload, ruleInfo: ruleInfo + ["(implicit-copy)"], additionalSignatureData: additionalSignatureData, commandLine: updatedCommandLine.map{ ByteString(encodingAsUTF8: $0) }, additionalOutput: responseFileAdditionalOutput, environment: EnvironmentBindings(), workingDirectory: compilerWorkingDirectory(cbc), inputs: inputPaths + extraInputs, outputs: [ implicitModulesOutputNode.path ], action: delegate.taskActionCreationDelegate.createDeferredExecutionTaskActionIfRequested(userPreferences: cbc.producer.userPreferences), execDescription: resolveExecutionDescription(cbc, delegate), enableSandboxing: enableSandboxing, additionalTaskOrderingOptions: [.compilationForIndexableSourceFile], usesExecutionInputs: false)
+            delegate.createTask(type: self, dependencyData: dependencyData, payload: payload, ruleInfo: ruleInfo + ["(implicit-copy)"], additionalSignatureData: additionalSignatureData, commandLine: updatedCommandLine.map { ByteString(encodingAsUTF8: $0) }, additionalOutput: responseFileAdditionalOutput, environment: EnvironmentBindings(), workingDirectory: compilerWorkingDirectory(cbc), inputs: inputPaths + extraInputs, outputs: [implicitModulesOutputNode.path], action: delegate.taskActionCreationDelegate.createDeferredExecutionTaskActionIfRequested(userPreferences: cbc.producer.userPreferences), execDescription: resolveExecutionDescription(cbc, delegate), enableSandboxing: enableSandboxing, additionalTaskOrderingOptions: [.compilationForIndexableSourceFile], usesExecutionInputs: false)
         }
 
         return ClangPrefixInfo.PCHInfo(
             output: precompPath,
-            hashCriteria: nil, // rdar://problem/24469921
+            hashCriteria: nil,  // rdar://problem/24469921
             commandLine: ClangSourceFileIndexingInfo.indexingCommandLine(from: byteStringCommandLine, workingDir: cbc.scope.evaluate(BuiltinMacros.PROJECT_DIR), addSupplementary: !hasEnabledIndexBuildArena, replaceCompile: false, responseFileMapping: constantFlags.responseFileMapping, responseFileFormat: Self.responseFileFormat(hostOS: cbc.producer.hostOperatingSystem))
         )
     }
@@ -1843,7 +1857,6 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
 
     public override var payloadType: (any TaskPayload.Type)? { return ClangTaskPayload.self }
 
-
     // MARK: Discovering info by invoking the tool
 
     /// Creates and returns a discovered info object for the clang compiler for the given command producer, scope, and language.
@@ -1981,7 +1994,7 @@ extension ClangCompilerSpec {
     }
 }
 
-public final class ClangStaticAnalyzerSpec : ClangCompilerSpec, @unchecked Sendable {
+public final class ClangStaticAnalyzerSpec: ClangCompilerSpec, @unchecked Sendable {
     public class override var identifier: String {
         "com.apple.compilers.llvm.clang.1_0.analyzer"
     }
@@ -2051,7 +2064,7 @@ func createSpecParser(for proxy: SpecProxy, registry: SpecRegistry) -> SpecParse
     return SpecParser(delegate, proxy)
 }
 
-public final class ClangPreprocessorSpec : ClangCompilerSpec, SpecImplementationType, @unchecked Sendable {
+public final class ClangPreprocessorSpec: ClangCompilerSpec, SpecImplementationType, @unchecked Sendable {
     public class override var identifier: String {
         "com.apple.compilers.llvm.clang.1_0.preprocessor"
     }
@@ -2087,7 +2100,7 @@ public final class ClangPreprocessorSpec : ClangCompilerSpec, SpecImplementation
     }
 }
 
-public final class ClangAssemblerSpec : ClangCompilerSpec, SpecImplementationType, @unchecked Sendable {
+public final class ClangAssemblerSpec: ClangCompilerSpec, SpecImplementationType, @unchecked Sendable {
     public class override var identifier: String {
         "com.apple.compilers.llvm.clang.1_0.assembler"
     }
@@ -2170,7 +2183,7 @@ public final class ClangModuleVerifierSpec: ClangCompilerSpec, SpecImplementatio
     }
 }
 
-private func ==(lhs: ClangCompilerSpec.DataCache.ConstantFlagsKey, rhs: ClangCompilerSpec.DataCache.ConstantFlagsKey) -> Bool {
+private func == (lhs: ClangCompilerSpec.DataCache.ConstantFlagsKey, rhs: ClangCompilerSpec.DataCache.ConstantFlagsKey) -> Bool {
     return ObjectIdentifier(lhs.scope) == ObjectIdentifier(rhs.scope) && lhs.inputFileType == rhs.inputFileType
 }
 
diff --git a/Sources/SWBCore/SpecImplementations/Tools/ClangModuleVerifierInputGenerator.swift b/Sources/SWBCore/SpecImplementations/Tools/ClangModuleVerifierInputGenerator.swift
index 99b75e8f..1af449b1 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/ClangModuleVerifierInputGenerator.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/ClangModuleVerifierInputGenerator.swift
@@ -12,7 +12,7 @@
 
 public import SWBUtil
 
-public final class ClangModuleVerifierInputGeneratorSpec : GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
+public final class ClangModuleVerifierInputGeneratorSpec: GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.build-tools.module-verifier-input-generator"
 
     override public func constructTasks(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate) async {
@@ -31,22 +31,26 @@ public final class ClangModuleVerifierInputGeneratorSpec : GenericCommandLineToo
         ]
         let commandLine = await commandLineFromTemplate(cbc, delegate, optionContext: discoveredCommandLineToolSpecInfo(cbc.producer, cbc.scope, delegate), specialArgs: specialArguments).map(\.asString)
 
-        let inputs = cbc.inputs.map{ delegate.createNode($0.absolutePath) } + cbc.commandOrderingInputs
-        let outputs = cbc.outputs.map { delegate.createNode($0) } + cbc.commandOrderingOutputs + [
-            delegate.createNode(mainOutput),
-            delegate.createNode(headerOutput),
-            delegate.createNode(moduleMapOutput),
-        ]
+        let inputs = cbc.inputs.map { delegate.createNode($0.absolutePath) } + cbc.commandOrderingInputs
+        let outputs =
+            cbc.outputs.map { delegate.createNode($0) } + cbc.commandOrderingOutputs + [
+                delegate.createNode(mainOutput),
+                delegate.createNode(headerOutput),
+                delegate.createNode(moduleMapOutput),
+            ]
 
-        delegate.createTask(type: self,
-                            ruleInfo: ruleInfo,
-                            commandLine: commandLine,
-                            environment: environmentFromSpec(cbc, delegate),
-                            workingDirectory: cbc.producer.defaultWorkingDirectory,
-                            inputs: inputs, outputs: outputs,
-                            action: delegate.taskActionCreationDelegate.createClangModuleVerifierInputGeneratorTaskAction(),
-                            execDescription: resolveExecutionDescription(cbc, delegate),
-                            enableSandboxing: enableSandboxing,
-                            alwaysExecuteTask: alwaysExecuteTask)
+        delegate.createTask(
+            type: self,
+            ruleInfo: ruleInfo,
+            commandLine: commandLine,
+            environment: environmentFromSpec(cbc, delegate),
+            workingDirectory: cbc.producer.defaultWorkingDirectory,
+            inputs: inputs,
+            outputs: outputs,
+            action: delegate.taskActionCreationDelegate.createClangModuleVerifierInputGeneratorTaskAction(),
+            execDescription: resolveExecutionDescription(cbc, delegate),
+            enableSandboxing: enableSandboxing,
+            alwaysExecuteTask: alwaysExecuteTask
+        )
     }
 }
diff --git a/Sources/SWBCore/SpecImplementations/Tools/ClangStatCache.swift b/Sources/SWBCore/SpecImplementations/Tools/ClangStatCache.swift
index 76c69149..250e52cf 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/ClangStatCache.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/ClangStatCache.swift
@@ -20,18 +20,20 @@ final public class ClangStatCacheSpec: GenericCommandLineToolSpec, SpecIdentifie
     }
 
     override public func constructTasks(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate) async {
-        await delegate.createTask(type: self,
-                            ruleInfo: defaultRuleInfo(cbc, delegate),
-                            commandLine: commandLineFromTemplate(cbc, delegate, optionContext: discoveredCommandLineToolSpecInfo(cbc.producer, cbc.scope, delegate)).map(\.asString),
-                            environment: environmentFromSpec(cbc, delegate),
-                            workingDirectory: cbc.producer.defaultWorkingDirectory,
-                            // We intentionally specify no inputs because clang-stat-cache always runs uses FSEvents to optimize invalidation so llbuild doesn't need to stat the entire SDK on every build.
-                            inputs: [],
-                            outputs: [delegate.createNode(cbc.output), delegate.createVirtualNode("ClangStatCache \(cbc.output.str)")],
-                            action: nil,
-                            execDescription: resolveExecutionDescription(cbc, delegate),
-                            preparesForIndexing: true,
-                            enableSandboxing: enableSandboxing,
-                            alwaysExecuteTask: true)
+        await delegate.createTask(
+            type: self,
+            ruleInfo: defaultRuleInfo(cbc, delegate),
+            commandLine: commandLineFromTemplate(cbc, delegate, optionContext: discoveredCommandLineToolSpecInfo(cbc.producer, cbc.scope, delegate)).map(\.asString),
+            environment: environmentFromSpec(cbc, delegate),
+            workingDirectory: cbc.producer.defaultWorkingDirectory,
+            // We intentionally specify no inputs because clang-stat-cache always runs uses FSEvents to optimize invalidation so llbuild doesn't need to stat the entire SDK on every build.
+            inputs: [],
+            outputs: [delegate.createNode(cbc.output), delegate.createVirtualNode("ClangStatCache \(cbc.output.str)")],
+            action: nil,
+            execDescription: resolveExecutionDescription(cbc, delegate),
+            preparesForIndexing: true,
+            enableSandboxing: enableSandboxing,
+            alwaysExecuteTask: true
+        )
     }
 }
diff --git a/Sources/SWBCore/SpecImplementations/Tools/CodeSign.swift b/Sources/SWBCore/SpecImplementations/Tools/CodeSign.swift
index 8f0dd409..f66ea032 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/CodeSign.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/CodeSign.swift
@@ -14,7 +14,7 @@ public import SWBUtil
 public import SWBMacro
 import Foundation
 
-public final class CodesignToolSpec : CommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
+public final class CodesignToolSpec: CommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.build-tools.codesign"
 
     public override func computeExecutablePath(_ cbc: CommandBuildContext) -> String {
@@ -46,7 +46,7 @@ public final class CodesignToolSpec : CommandLineToolSpec, SpecIdentifierType, @
         // Don't code sign unless we have a valid expanded identity.
         let expandedCodeSignIdentity = cbc.scope.evaluate(BuiltinMacros.EXPANDED_CODE_SIGN_IDENTITY)
         if expandedCodeSignIdentity.isEmpty {
-            if cbc.scope.evaluate(BuiltinMacros.CODE_SIGNING_ALLOWED)  &&  cbc.scope.evaluate(BuiltinMacros.CODE_SIGNING_REQUIRED) {
+            if cbc.scope.evaluate(BuiltinMacros.CODE_SIGNING_ALLOWED) && cbc.scope.evaluate(BuiltinMacros.CODE_SIGNING_REQUIRED) {
                 let productTypeString = { () -> String in
                     guard let productType = cbc.producer.productType else { return "" }
                     return " for product type '\(productType.name)"
@@ -86,14 +86,13 @@ public final class CodesignToolSpec : CommandLineToolSpec, SpecIdentifierType, @
         var addTimestampNoneFlag = !cbc.scope.evaluate(BuiltinMacros.DEPLOYMENT_POSTPROCESSING)
         var illegalFlags = [String]()
         for flag in cbc.scope.evaluate(BuiltinMacros.OTHER_CODE_SIGN_FLAGS) {
-            if flag.hasPrefix("-d")  ||  flag == "--display"  ||  flag == "-h" {
+            if flag.hasPrefix("-d") || flag == "--display" || flag == "-h" {
                 illegalFlags.append(flag)
-            }
-            else {
+            } else {
                 commandLine.append(flag)
             }
 
-            if flag.hasPrefix("-r")  ||  flag.hasPrefix("--requirements") {
+            if flag.hasPrefix("-r") || flag.hasPrefix("--requirements") {
                 generateDesignatedRequirements = false
             }
 
@@ -202,7 +201,8 @@ public final class CodesignToolSpec : CommandLineToolSpec, SpecIdentifierType, @
         var environment: [String: String] = environmentFromSpec(cbc, delegate).bindingsDictionary
         environment.merge(
             CodesignToolSpec.computeCodeSigningEnvironment(cbc, codesignAllocate: environment[BuiltinMacros.CODESIGN_ALLOCATE.name]),
-            uniquingKeysWith: { (_, second) in second })
+            uniquingKeysWith: { (_, second) in second }
+        )
 
         // Normally, the additional inputs shouldn't be applied on a resign-task for the target as doing so can create a cycle between the Copy Files Phase and Run Script Phase. However, due to the way that app hosted tests work (e.g. misuse the copy phase to inject content into the app bundle), we need to provide a provision to track that in order to properly-resign the app bundle (cf: testIncrementalCodesignForCopyFileChangesWithAppHostedTests).
         // NOTE: This does mean that the users can actually introduce a cycle if they have a script phase that also injects content into the app bundle related to the test bundle that is getting copied in. However, this should be an obscure usage.
@@ -213,7 +213,7 @@ public final class CodesignToolSpec : CommandLineToolSpec, SpecIdentifierType, @
 
         // FIXME: We currently track the product to sign as an input, but this doesn't seem right given that the tool won't actually look at that?
         // NOTE: The use of `createDirectoryTreeNode()` is done as it may very well be the case that the input is a bundle (e.g. .xctest, .framework, .appex, etc...). This is safe to use on files as well.
-        var inputs: [any PlannedNode] = [delegate.createNode(productToSign), delegate.createNode(outputPath)] + extraInputs.map{ delegate.createDirectoryTreeNode($0, excluding: []) } + cbc.commandOrderingInputs
+        var inputs: [any PlannedNode] = [delegate.createNode(productToSign), delegate.createNode(outputPath)] + extraInputs.map { delegate.createDirectoryTreeNode($0, excluding: []) } + cbc.commandOrderingInputs
 
         // Detect whether or not we are signing a bundle, so that we can properly report the inputs and outputs. This is important for our mutable node handling being able to connect the tasks properly.
         var outputs: [any PlannedNode]
@@ -242,8 +242,7 @@ public final class CodesignToolSpec : CommandLineToolSpec, SpecIdentifierType, @
                     // For non-framework bundles we need to include Contents/MacOS when not using shallow bundles.
                     if !shallow {
                         binaryPath = outputPath.join("Contents/MacOS").join(bundleName)
-                    }
-                    else {
+                    } else {
                         binaryPath = outputPath.join(bundleName)
                     }
                 }
@@ -284,16 +283,16 @@ public final class CodesignToolSpec : CommandLineToolSpec, SpecIdentifierType, @
         // First, look for a -i or --identifier codesign parameter.
         if let identifierIdx = commandLine.firstIndex(of: "-i") ?? commandLine.firstIndex(of: "--identifier") {
             // If we found find a -i or --identifier parameter, use it as the identifier.
-            if identifierIdx+1 < commandLine.count {
-                identifier = commandLine[identifierIdx+1]
+            if identifierIdx + 1 < commandLine.count {
+                identifier = commandLine[identifierIdx + 1]
             }
         }
 
         // If there are no periods in the identifier, look for a --prefix codesign parameter and if found, prepend it to the identifier.
         if identifier.contains(".") {
             if let prefixIdx = commandLine.firstIndex(of: "--prefix") {
-                if prefixIdx+1 < commandLine.count {
-                    let prefix = commandLine[prefixIdx+1]
+                if prefixIdx + 1 < commandLine.count {
+                    let prefix = commandLine[prefixIdx + 1]
                     identifier = prefix + identifier
                 }
             }
@@ -317,7 +316,6 @@ public final class CodesignToolSpec : CommandLineToolSpec, SpecIdentifierType, @
         return cbc.scope.evaluate(cbc.scope.namespace.parseString(unevaluatedDesignatedRequirements), lookup: lookup)
     }
 
-
     /// Computes the environment for invoking the code signing tool.
     ///
     /// - Parameters:
diff --git a/Sources/SWBCore/SpecImplementations/Tools/ConcatenateTool.swift b/Sources/SWBCore/SpecImplementations/Tools/ConcatenateTool.swift
index 024d6db6..34e61bb0 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/ConcatenateTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/ConcatenateTool.swift
@@ -13,14 +13,17 @@
 public import SWBUtil
 import SWBMacro
 
-public final class ConcatenateToolSpec : CommandLineToolSpec, SpecImplementationType, @unchecked Sendable {
+public final class ConcatenateToolSpec: CommandLineToolSpec, SpecImplementationType, @unchecked Sendable {
     public static let identifier = "com.apple.build-tools.concatenate"
 
     public static func construct(registry: SpecRegistry, proxy: SpecProxy) -> Spec {
-        return self.init(registry, proxy,
-                         execDescription: registry.internalMacroNamespace.parseString("Concatenating to $(OutputRelativePath)"),
-                         ruleInfoTemplate: ["Concatenate", .output, .inputs],
-                         commandLineTemplate: [.execPath, .output, .inputs])
+        return self.init(
+            registry,
+            proxy,
+            execDescription: registry.internalMacroNamespace.parseString("Concatenating to $(OutputRelativePath)"),
+            ruleInfoTemplate: ["Concatenate", .output, .inputs],
+            commandLineTemplate: [.execPath, .output, .inputs]
+        )
     }
 
     public override func computeExecutablePath(_ cbc: CommandBuildContext) -> String {
diff --git a/Sources/SWBCore/SpecImplementations/Tools/ConstructStubExecutorFileListTool.swift b/Sources/SWBCore/SpecImplementations/Tools/ConstructStubExecutorFileListTool.swift
index 1609be7b..7f0620cd 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/ConstructStubExecutorFileListTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/ConstructStubExecutorFileListTool.swift
@@ -57,7 +57,7 @@ public final class ConstructStubExecutorFileListToolSpec: CommandLineToolSpec, S
             debugDylibPath.str,
             stubExecutorLibraryPath.str,
             stubExecutorLibraryWithSwiftEntryPointPath.str,
-            "--output", cbc.output.str
+            "--output", cbc.output.str,
         ]
 
         delegate.createTask(
diff --git a/Sources/SWBCore/SpecImplementations/Tools/CopyTool.swift b/Sources/SWBCore/SpecImplementations/Tools/CopyTool.swift
index e7053e61..f9228aef 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/CopyTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/CopyTool.swift
@@ -13,7 +13,7 @@
 public import SWBUtil
 import SWBMacro
 
-public final class CopyToolSpec : CompilerSpec, SpecIdentifierType, @unchecked Sendable {
+public final class CopyToolSpec: CompilerSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.compilers.pbxcp"
 
     /// Construct a `Copy` task to copy a source file to a destination with default behaviors.
@@ -25,12 +25,18 @@ public final class CopyToolSpec : CompilerSpec, SpecIdentifierType, @unchecked S
 
     /// Construct a `Copy` task to copy a source file to a destination.
     public func constructCopyTasks(
-        _ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate,
-        ruleName: String? = nil, executionDescription: String? = nil,
-        removeHeaderDirectories: Bool = false, removeStaticExecutables: Bool = false,
-        excludeSubpaths: [String] = [], includeOnlySubpaths: [String] = [],
-        stripUnsignedBinaries: Bool? = nil, stripSubpaths: [String] = [],
-        stripBitcode: Bool = false, skipCopyIfContentsEqual: Bool = false,
+        _ cbc: CommandBuildContext,
+        _ delegate: any TaskGenerationDelegate,
+        ruleName: String? = nil,
+        executionDescription: String? = nil,
+        removeHeaderDirectories: Bool = false,
+        removeStaticExecutables: Bool = false,
+        excludeSubpaths: [String] = [],
+        includeOnlySubpaths: [String] = [],
+        stripUnsignedBinaries: Bool? = nil,
+        stripSubpaths: [String] = [],
+        stripBitcode: Bool = false,
+        skipCopyIfContentsEqual: Bool = false,
         additionalFilesToRemove: [String]? = nil,
         additionalPresumedOutputs: [any PlannedNode] = [],
         ignoreMissingInputs: Bool = false,
@@ -154,15 +160,21 @@ public final class CopyToolSpec : CompilerSpec, SpecIdentifierType, @unchecked S
 
         // Note that the order of rule info here is against the usual conventions.
         let action = delegate.taskActionCreationDelegate.createFileCopyTaskAction(FileCopyTaskActionContext(cbc))
-        let inputs: [any PlannedNode] = cbc.inputs.map{ delegate.createDirectoryTreeNode($0.absolutePath) } + cbc.commandOrderingInputs
+        let inputs: [any PlannedNode] = cbc.inputs.map { delegate.createDirectoryTreeNode($0.absolutePath) } + cbc.commandOrderingInputs
         let outputs: [any PlannedNode] = [delegate.createNode(outputPath)] + additionalPresumedOutputs + cbc.commandOrderingOutputs
         delegate.createTask(
-            type: self, payload: payload, ruleInfo: ruleInfo,
-            commandLine: commandLine, environment: environmentFromSpec(cbc, delegate),
+            type: self,
+            payload: payload,
+            ruleInfo: ruleInfo,
+            commandLine: commandLine,
+            environment: environmentFromSpec(cbc, delegate),
             workingDirectory: cbc.producer.defaultWorkingDirectory,
-            inputs: inputs, outputs: outputs, action: action,
+            inputs: inputs,
+            outputs: outputs,
+            action: action,
             execDescription: executionDescription ?? resolveExecutionDescription(cbc, delegate),
-            preparesForIndexing: cbc.preparesForIndexing, enableSandboxing: enableSandboxing,
+            preparesForIndexing: cbc.preparesForIndexing,
+            enableSandboxing: enableSandboxing,
             additionalTaskOrderingOptions: additionalTaskOrderingOptions,
             repairViaOwnershipAnalysis: repairViaOwnershipAnalysis
         )
diff --git a/Sources/SWBCore/SpecImplementations/Tools/CreateAssetPackManifestTool.swift b/Sources/SWBCore/SpecImplementations/Tools/CreateAssetPackManifestTool.swift
index 8964b9df..d6f1a23d 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/CreateAssetPackManifestTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/CreateAssetPackManifestTool.swift
@@ -13,7 +13,7 @@
 import SWBUtil
 public import SWBMacro
 
-public final class CreateAssetPackManifestToolSpec : CommandLineToolSpec, SpecImplementationType, @unchecked Sendable {
+public final class CreateAssetPackManifestToolSpec: CommandLineToolSpec, SpecImplementationType, @unchecked Sendable {
     public static let identifier = "com.apple.build-tools.odr.create-asset-pack-manifest"
 
     public class func construct(registry: SpecRegistry, proxy: SpecProxy) -> Spec {
@@ -41,10 +41,13 @@ public final class CreateAssetPackManifestToolSpec : CommandLineToolSpec, SpecIm
             BuiltinMacros.OutputPath.name: assetPackManifestPath.str,
         ]
 
-        let inputs: [any PlannedNode] = assetPacks.flatMap { assetPack -> [any PlannedNode] in
-            [delegate.createDirectoryTreeNode(assetPack.path),
-             delegate.createNode(assetPack.path.join("Info.plist"))]
-        } + orderingInputs
+        let inputs: [any PlannedNode] =
+            assetPacks.flatMap { assetPack -> [any PlannedNode] in
+                [
+                    delegate.createDirectoryTreeNode(assetPack.path),
+                    delegate.createNode(assetPack.path.join("Info.plist")),
+                ]
+            } + orderingInputs
         let outputPath = assetPackManifestPath
         let outputs = [delegate.createNode(outputPath)]
         let commandLine = assetPacks.map { $0.path.str }.sorted()
diff --git a/Sources/SWBCore/SpecImplementations/Tools/DocumentationCompiler.swift b/Sources/SWBCore/SpecImplementations/Tools/DocumentationCompiler.swift
index 705dee00..cad47e36 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/DocumentationCompiler.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/DocumentationCompiler.swift
@@ -142,7 +142,7 @@ final public class DocumentationCompilerSpec: GenericCompilerSpec, SpecIdentifie
             // When building executable types (like applications and command-line tools), include all levels of headers in the generated symbol graph
             // since executable documentation is meant for the team developing that executable (compared to framework documentation for the consumers
             // of that framework).
-            return [.public, .private, nil] // nil for project visibility
+            return [.public, .private, nil]  // nil for project visibility
         case .framework, .none:
             // For frameworks (and non-documentable types), only include public API in the generated symbol graph.
             return [.public]
@@ -155,9 +155,16 @@ final public class DocumentationCompilerSpec: GenericCompilerSpec, SpecIdentifie
         }
 
         if cbc.inputs.count > 1 {
-            delegate.emit(Diagnostic(behavior: .error, location: .unknown, data: DiagnosticData("Each target may contain only a single documentation catalog."), childDiagnostics: cbc.inputs.map { input in
-                Diagnostic(behavior: .note, location: .path(input.absolutePath), data: DiagnosticData("Documentation catalog named \(input.absolutePath.basename)"))
-            }))
+            delegate.emit(
+                Diagnostic(
+                    behavior: .error,
+                    location: .unknown,
+                    data: DiagnosticData("Each target may contain only a single documentation catalog."),
+                    childDiagnostics: cbc.inputs.map { input in
+                        Diagnostic(behavior: .note, location: .path(input.absolutePath), data: DiagnosticData("Documentation catalog named \(input.absolutePath.basename)"))
+                    }
+                )
+            )
             return
         }
 
@@ -188,7 +195,8 @@ final public class DocumentationCompilerSpec: GenericCompilerSpec, SpecIdentifie
         let environmentBindings = templatePath.map { [("DOCC_HTML_DIR", $0.str)] } ?? []
 
         // The inputs (files that this task depend on) are the '.docs' bundles, specified in the '.xcspec' file, and the symbol graph task
-        let inputs: [any PlannedNode] = cbc.inputs.map({ delegate.createDirectoryTreeNode($0.absolutePath) })
+        let inputs: [any PlannedNode] =
+            cbc.inputs.map({ delegate.createDirectoryTreeNode($0.absolutePath) })
             + mainSymbolGraphFiles.map({ delegate.createNode($0) })
 
         // The outputs (files that other tasks can depend on) are specified in the '.xcspec' file.
@@ -257,12 +265,15 @@ final public class DocumentationCompilerSpec: GenericCompilerSpec, SpecIdentifie
         // Attach a payload with information about what built documentation this task will output.
         let outputDir = cbc.scope.evaluate(BuiltinMacros.DOCC_ARCHIVE_PATH)
         let diagnosticsFilePath = cbc.scope.evaluate(BuiltinMacros.DOCC_DIAGNOSTICS_FILE, lookup: lookup).nilIfEmpty
-        let payload = outputDir.isEmpty ? nil : DocumentationTaskPayload(
-            bundleIdentifier: cbc.scope.evaluate(BuiltinMacros.DOCC_CATALOG_IDENTIFIER),
-            outputPath: Path(outputDir),
-            targetIdentifier: cbc.producer.configuredTarget?.target.guid,
-            documentationDiagnosticsPath: diagnosticsFilePath
-        )
+        let payload =
+            outputDir.isEmpty
+            ? nil
+            : DocumentationTaskPayload(
+                bundleIdentifier: cbc.scope.evaluate(BuiltinMacros.DOCC_CATALOG_IDENTIFIER),
+                outputPath: Path(outputDir),
+                targetIdentifier: cbc.producer.configuredTarget?.target.guid,
+                documentationDiagnosticsPath: diagnosticsFilePath
+            )
         if let diagnosticsFilePath {
             outputs.append(delegate.createNode(diagnosticsFilePath))
         }
@@ -340,27 +351,32 @@ public func discoveredDocumentationCompilerInfo(_ producer: any CommandProducer,
     if !producer.executableSearchPaths.fs.exists(featuresPath) && producer.hostOperatingSystem == .windows {
         return DocumentationCompilerToolSpecInfo(toolPath: toolPath, toolFeatures: .init([.diagnosticsFile]))
     }
-    return try await producer.discoveredCommandLineToolSpecInfo(delegate, "docc", featuresPath, { contents in
-        func getFeatures(at toolPath: Path) throws -> ToolFeatures<DocumentationCompilerToolSpecInfo.FeatureFlag> {
-            do {
-                let fs = PseudoFS()
-                try fs.createDirectory(featuresPath.dirname, recursive: true)
-                try fs.write(featuresPath, contents: ByteString(contents))
-                return try .init(path: featuresPath, fs: fs)
-            } catch {
-                // If this is a custom tool path (via DOCC_EXEC) check the default features.
-                if let defaultToolPath = producer.executableSearchPaths.findExecutable(operatingSystem: producer.hostOperatingSystem, basename: "docc"), defaultToolPath != toolPath {
-                    let defaultFeaturesPath = defaultToolPath.dirname.dirname.join("share").join("docc").join("features.json")
-                    if localFS.exists(defaultFeaturesPath) {
-                        return try .init(path: defaultFeaturesPath, fs: localFS)
+    return try await producer.discoveredCommandLineToolSpecInfo(
+        delegate,
+        "docc",
+        featuresPath,
+        { contents in
+            func getFeatures(at toolPath: Path) throws -> ToolFeatures<DocumentationCompilerToolSpecInfo.FeatureFlag> {
+                do {
+                    let fs = PseudoFS()
+                    try fs.createDirectory(featuresPath.dirname, recursive: true)
+                    try fs.write(featuresPath, contents: ByteString(contents))
+                    return try .init(path: featuresPath, fs: fs)
+                } catch {
+                    // If this is a custom tool path (via DOCC_EXEC) check the default features.
+                    if let defaultToolPath = producer.executableSearchPaths.findExecutable(operatingSystem: producer.hostOperatingSystem, basename: "docc"), defaultToolPath != toolPath {
+                        let defaultFeaturesPath = defaultToolPath.dirname.dirname.join("share").join("docc").join("features.json")
+                        if localFS.exists(defaultFeaturesPath) {
+                            return try .init(path: defaultFeaturesPath, fs: localFS)
+                        }
                     }
+                    // Didn't find any default features.
+                    throw error
                 }
-                // Didn't find any default features.
-                throw error
             }
+            return try DocumentationCompilerToolSpecInfo(toolPath: toolPath, toolFeatures: getFeatures(at: toolPath))
         }
-        return try DocumentationCompilerToolSpecInfo(toolPath: toolPath, toolFeatures: getFeatures(at: toolPath))
-    })
+    )
 }
 
 public struct DocumentationCompilerToolSpecInfo: DiscoveredCommandLineToolSpecInfo {
@@ -393,9 +409,9 @@ extension DocumentationCompilerSpec {
 
         /// The Mach-O types considered by DocC to be frameworks.
         private static let frameworkMachOTypes: Set = [
-            "mh_dylib", // dylibs and dynamic frameworks
-            "staticlib", // static libraries and static frameworks
-            "mh_object", // relocatable objects, used by SwiftPM
+            "mh_dylib",  // dylibs and dynamic frameworks
+            "staticlib",  // static libraries and static frameworks
+            "mh_object",  // relocatable objects, used by SwiftPM
         ]
 
         /// The Mach-O type that DocC considers to be executable.
@@ -709,7 +725,7 @@ private extension Diagnostic {
             location: mainLocation,
             sourceRanges: mainSourceRanges,
             data: DiagnosticData(diagnostic.summary),
-            fixIts: [], // DocC Solutions are created as child diagnostics to customize the fix-it messages
+            fixIts: [],  // DocC Solutions are created as child diagnostics to customize the fix-it messages
             childDiagnostics: childDiagnostics
         )
     }
@@ -744,9 +760,10 @@ private extension Diagnostic.SourceRange {
     init(path: Path, range: DiagnosticFile.Diagnostic.Range) {
         self.init(
             path: path,
-            startLine: range.start.line, startColumn: range.start.column,
-            endLine: range.end.line, endColumn: range.end.column
+            startLine: range.start.line,
+            startColumn: range.start.column,
+            endLine: range.end.line,
+            endColumn: range.end.column
         )
     }
 }
-
diff --git a/Sources/SWBCore/SpecImplementations/Tools/DsymutilTool.swift b/Sources/SWBCore/SpecImplementations/Tools/DsymutilTool.swift
index 3fccd547..799d5b47 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/DsymutilTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/DsymutilTool.swift
@@ -13,7 +13,7 @@
 public import SWBUtil
 public import SWBMacro
 
-public final class DsymutilToolSpec : GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
+public final class DsymutilToolSpec: GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.tools.dsymutil"
 
     public override func constructTasks(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate) async {
diff --git a/Sources/SWBCore/SpecImplementations/Tools/GCCCompatibleCompilerSupport.swift b/Sources/SWBCore/SpecImplementations/Tools/GCCCompatibleCompilerSupport.swift
index 446bed95..3743bb8c 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/GCCCompatibleCompilerSupport.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/GCCCompatibleCompilerSupport.swift
@@ -13,10 +13,8 @@
 package import SWBUtil
 package import SWBMacro
 
-
 /// An abstract representation of a search path entry, with any auxiliary information as appropriate depending on the type.
-package enum SearchPathEntry
-{
+package enum SearchPathEntry {
     /// A "user" header search path, in the manner of the `-iquote` option.  This kind of path is searched for quote-style includes, but is ignored for bracket-style includes.
     case userHeaderSearchPath(path: Path)
 
@@ -40,8 +38,7 @@ package enum SearchPathEntry
 }
 
 /// An abstract representation of a list of search paths.
-package final class SearchPathBuilder
-{
+package final class SearchPathBuilder {
     /// The list of search path entries.
     private var searchPathEntries = [SearchPathEntry]()
 
@@ -97,22 +94,19 @@ package final class SearchPathBuilder
     }
 
     /// Add a user header search path to the list of search paths.
-    func addUserHeaderSearchPath(_ path: Path, isInputPath: Bool = false)
-    {
+    func addUserHeaderSearchPath(_ path: Path, isInputPath: Bool = false) {
         let normalizedPath = path.normalize()
         addSearchPathEntry(.userHeaderSearchPath(path: normalizedPath), normalizedPath, isInputPath)
     }
 
     /// Add an ordinary header search path to the list of search paths.
-    func addHeaderSearchPath(_ path: Path, asSeparateArguments: Bool = false, isInputPath: Bool = false)
-    {
+    func addHeaderSearchPath(_ path: Path, asSeparateArguments: Bool = false, isInputPath: Bool = false) {
         let normalizedPath = path.normalize()
         addSearchPathEntry(.headerSearchPath(path: normalizedPath, asSeparateArguments: asSeparateArguments), normalizedPath, isInputPath)
     }
 
     /// Add a system header search path to the list of search paths.  The path will not be added if an ordinary or system header search path for the path has previously been added.
-    func addSystemHeaderSearchPath(_ path: Path, isInputPath: Bool = false)
-    {
+    func addSystemHeaderSearchPath(_ path: Path, isInputPath: Bool = false) {
         let normalizedPath = path.normalize()
         guard !headerSearchPaths.contains(normalizedPath) && !systemHeaderSearchPaths.contains(normalizedPath) else {
             return
@@ -121,21 +115,18 @@ package final class SearchPathBuilder
     }
 
     /// Add a system header search path to the list of search paths.
-    func addHeaderSearchPathSplitter()
-    {
+    func addHeaderSearchPathSplitter() {
         searchPathEntries.append(.headerSearchPathSplitter)
     }
 
     /// Add an ordinary framework search path to the list of search paths.
-    func addFrameworkSearchPath(_ path: Path, asSeparateArguments: Bool = false, isInputPath: Bool = false)
-    {
+    func addFrameworkSearchPath(_ path: Path, asSeparateArguments: Bool = false, isInputPath: Bool = false) {
         let normalizedPath = path.normalize()
         addSearchPathEntry(.frameworkSearchPath(path: normalizedPath, asSeparateArguments: asSeparateArguments), normalizedPath, isInputPath)
     }
 
     /// Add a system framework search path to the list of search paths.  The path will not be added if an ordinary or system framework search path for the path has previously been added.
-    func addSystemFrameworkSearchPath(_ path: Path, isInputPath: Bool = false)
-    {
+    func addSystemFrameworkSearchPath(_ path: Path, isInputPath: Bool = false) {
         let normalizedPath = path.normalize()
         guard !frameworkSearchPaths.contains(normalizedPath) && !systemFrameworkSearchPaths.contains(normalizedPath) else {
             return
@@ -144,8 +135,7 @@ package final class SearchPathBuilder
     }
 
     /// Adds a list of literal arguments to the command line.
-    func addLiteralArguments(_ args: [String], inputPaths: [Path] = [])
-    {
+    func addLiteralArguments(_ args: [String], inputPaths: [Path] = []) {
         searchPathEntries.append(.literalArguments(args))
         self.inputPaths.append(contentsOf: inputPaths.map({ $0.normalize() }).filter({ !$0.isEmpty }))
     }
@@ -190,36 +180,29 @@ package struct SearchPaths: Sendable {
 }
 
 /// Adopting this protocol indicates that the adopter can generate command line arguments for search path entries.
-package protocol SearchPathCommandLineBuilder
-{
+package protocol SearchPathCommandLineBuilder {
     func searchPathArguments(_ entry: SearchPathEntry, _ scope: MacroEvaluationScope) -> [String]
 
     func searchPathArguments(_ entries: [SearchPathEntry], _ scope: MacroEvaluationScope) -> [String]
 }
 
-extension SearchPathCommandLineBuilder
-{
-    package func searchPathArguments(_ entries: [SearchPathEntry], _ scope: MacroEvaluationScope) -> [String]
-    {
+extension SearchPathCommandLineBuilder {
+    package func searchPathArguments(_ entries: [SearchPathEntry], _ scope: MacroEvaluationScope) -> [String] {
         return entries.flatMap({ return self.searchPathArguments($0, scope) })
     }
 }
 
-
 /// Utility methods for GCC-compatible compiler specifications.
-package struct GCCCompatibleCompilerSpecSupport
-{
+package struct GCCCompatibleCompilerSpecSupport {
     /// Constructs and returns common header search path entries for LLVM-based compiler specs.  Also returns any input paths (to headermap or VFS files) which users of these search paths should depend on.
-    package static func headerSearchPathArguments(_ producer: any CommandProducer, _ scope: MacroEvaluationScope, usesModules: Bool) -> SearchPaths
-    {
+    package static func headerSearchPathArguments(_ producer: any CommandProducer, _ scope: MacroEvaluationScope, usesModules: Bool) -> SearchPaths {
         let searchPathBuilder = SearchPathBuilder()
 
         // Evaluate some settings we need to look at several times.
         let alwaysSearchUserPaths = scope.evaluate(BuiltinMacros.ALWAYS_SEARCH_USER_PATHS)
 
         // Add the arguments for the headermap files, if any.
-        if scope.evaluate(BuiltinMacros.USE_HEADERMAP)
-        {
+        if scope.evaluate(BuiltinMacros.USE_HEADERMAP) {
             // Swift Build does not support "traditional" (single-file) headermaps.  Use of separate headermaps has been the default for new projects for years, and use of the VFS (when clang modules are enabled) requires separate headermaps.
             // If the target is configured to use a traditional headermap, then we the HeadermapTaskProducer emits a warning about that, and we use separate headermaps anyway.
 
@@ -233,8 +216,7 @@ package struct GCCCompatibleCompilerSpecSupport
             searchPathBuilder.addHeaderSearchPath(hmapFileForOwnTargets, isInputPath: true)
 
             // If we are using the VFS, replace the all targets headermap with it.
-            if usesVFS
-            {
+            if usesVFS {
                 // Mark the creation context as needing VFS construction.
                 // If we are using the VFS, we still need an equivalent of the all targets headermap for non-framework headers.
                 let hmapFileForAllNonFrameworkTargetHeaders = scope.evaluate(BuiltinMacros.CPP_HEADERMAP_FILE_FOR_ALL_NON_FRAMEWORK_TARGET_HEADERS)
@@ -244,9 +226,7 @@ package struct GCCCompatibleCompilerSpecSupport
                 let productHeadersVFSFile = scope.evaluate(BuiltinMacros.CPP_HEADERMAP_PRODUCT_HEADERS_VFS_FILE)
                 // FIXME: We should make Path be able to be used here, potentially using a "path string provider" protocol or somesuch.
                 searchPathBuilder.addLiteralArguments(["-ivfsoverlay", productHeadersVFSFile.str], inputPaths: [productHeadersVFSFile])
-            }
-            else
-            {
+            } else {
                 // Not using a VFS, so we just add the headermap for all headers that are a member of any target.
                 let hmapFileForAllTargetHeaders = scope.evaluate(BuiltinMacros.CPP_HEADERMAP_FILE_FOR_ALL_TARGET_HEADERS)
                 searchPathBuilder.addHeaderSearchPath(hmapFileForAllTargetHeaders, isInputPath: true)
@@ -258,46 +238,37 @@ package struct GCCCompatibleCompilerSpecSupport
         }
 
         // If we should use header symlinks, we add the path to that directory to the search path.  We do this early, so that it comes near the beginning of the bracket search paths and overrides them all.
-        if scope.evaluate(BuiltinMacros.USE_HEADER_SYMLINKS)
-        {
+        if scope.evaluate(BuiltinMacros.USE_HEADER_SYMLINKS) {
             let headerSymlinksDir = scope.evaluate(BuiltinMacros.CPP_HEADER_SYMLINKS_DIR)
             searchPathBuilder.addUserHeaderSearchPath(headerSymlinksDir)
         }
 
         // Add search paths for USER_HEADER_SEARCH_PATHS before other header search paths.
         let userHeaderSearchPaths = producer.expandedSearchPaths(for: BuiltinMacros.USER_HEADER_SEARCH_PATHS, scope: scope)
-        if alwaysSearchUserPaths
-        {
+        if alwaysSearchUserPaths {
             // If we should always search user paths, then we pass the USER_HEADER_SEARCH_PATHS using an ordinary header search option.
-            for searchPath in userHeaderSearchPaths
-            {
+            for searchPath in userHeaderSearchPaths {
                 searchPathBuilder.addHeaderSearchPath(Path(searchPath))
             }
-        }
-        else
-        {
+        } else {
             // If we should *not* always search user paths, then we pass the USER_HEADER_SEARCH_PATHS using a user header search option.
-            for searchPath in userHeaderSearchPaths
-            {
+            for searchPath in userHeaderSearchPaths {
                 searchPathBuilder.addUserHeaderSearchPath(Path(searchPath))
             }
         }
 
         // Add ordinary header search paths for HEADER_SEARCH_PATHS.
-        for searchPath in producer.expandedSearchPaths(for: BuiltinMacros.HEADER_SEARCH_PATHS, scope: scope)
-        {
+        for searchPath in producer.expandedSearchPaths(for: BuiltinMacros.HEADER_SEARCH_PATHS, scope: scope) {
             searchPathBuilder.addHeaderSearchPath(Path(searchPath))
         }
 
         // Add system header search paths for SYSTEM_HEADER_SEARCH_PATHS.  The builder will filter out any which have already been added as ordinary header search paths.
-        for searchPath in producer.expandedSearchPaths(for: BuiltinMacros.SYSTEM_HEADER_SEARCH_PATHS, scope: scope)
-        {
+        for searchPath in producer.expandedSearchPaths(for: BuiltinMacros.SYSTEM_HEADER_SEARCH_PATHS, scope: scope) {
             searchPathBuilder.addSystemHeaderSearchPath(Path(searchPath))
         }
 
         // Add ordinary header search paths for PRODUCT_TYPE_HEADER_SEARCH_PATHS.
-        for searchPath in producer.expandedSearchPaths(for: BuiltinMacros.PRODUCT_TYPE_HEADER_SEARCH_PATHS, scope: scope)
-        {
+        for searchPath in producer.expandedSearchPaths(for: BuiltinMacros.PRODUCT_TYPE_HEADER_SEARCH_PATHS, scope: scope) {
             searchPathBuilder.addHeaderSearchPath(Path(searchPath))
         }
 
@@ -321,7 +292,8 @@ package struct GCCCompatibleCompilerSpecSupport
         // If there are Iig generated files in this target, add them to the search path.
         if let target = producer.configuredTarget?.target as? BuildPhaseTarget {
             if let iigType = producer.lookupFileType(identifier: "sourcecode.iig"),
-               target.sourcesBuildPhase?.containsFiles(ofType: iigType, producer, producer, scope, producer.filePathResolver) ?? false {
+                target.sourcesBuildPhase?.containsFiles(ofType: iigType, producer, producer, scope, producer.filePathResolver) ?? false
+            {
                 searchPathBuilder.addHeaderSearchPath(Path(scope.evaluate(BuiltinMacros.IIG_HEADERS_DIR)))
             }
         }
@@ -330,8 +302,7 @@ package struct GCCCompatibleCompilerSpecSupport
     }
 
     /// Constructs and returns common framework search path arguments for LLVM-based compiler specs.
-    package static func frameworkSearchPathArguments(_ producer: any CommandProducer, _ scope: MacroEvaluationScope, asSeparateArguments: Bool = false) -> SearchPaths
-    {
+    package static func frameworkSearchPathArguments(_ producer: any CommandProducer, _ scope: MacroEvaluationScope, asSeparateArguments: Bool = false) -> SearchPaths {
         let searchPathBuilder = SearchPathBuilder()
 
         guard producer.isApplePlatform else {
@@ -339,42 +310,35 @@ package struct GCCCompatibleCompilerSpecSupport
         }
 
         // Add ordinary framework search paths for FRAMEWORK_SEARCH_PATHS.
-        for searchPath in producer.expandedSearchPaths(for: BuiltinMacros.FRAMEWORK_SEARCH_PATHS, scope: scope)
-        {
+        for searchPath in producer.expandedSearchPaths(for: BuiltinMacros.FRAMEWORK_SEARCH_PATHS, scope: scope) {
             searchPathBuilder.addFrameworkSearchPath(Path(searchPath), asSeparateArguments: asSeparateArguments)
         }
 
         // Add system framework search paths for PRODUCT_TYPE_HEADER_SEARCH_PATHS.
-        for searchPath in producer.expandedSearchPaths(for: BuiltinMacros.PRODUCT_TYPE_FRAMEWORK_SEARCH_PATHS, scope: scope)
-        {
+        for searchPath in producer.expandedSearchPaths(for: BuiltinMacros.PRODUCT_TYPE_FRAMEWORK_SEARCH_PATHS, scope: scope) {
             searchPathBuilder.addSystemFrameworkSearchPath(Path(searchPath))
         }
 
         // Add system framework search paths for SYSTEM_FRAMEWORK_SEARCH_PATHS.  The builder will filter out any which have already been added as ordinary framework search paths.
-        for searchPath in producer.expandedSearchPaths(for: BuiltinMacros.SYSTEM_FRAMEWORK_SEARCH_PATHS, scope: scope)
-        {
+        for searchPath in producer.expandedSearchPaths(for: BuiltinMacros.SYSTEM_FRAMEWORK_SEARCH_PATHS, scope: scope) {
             searchPathBuilder.addSystemFrameworkSearchPath(Path(searchPath))
         }
 
         return searchPathBuilder.searchPaths
     }
 
-    private static func sparseSDKSearchPathArguments(_ sparseSDKs: [SDK], _ existingHeaderSearchPaths: Set<Path>, _ existingFrameworkSearchPaths: Set<Path>, asSeparateArguments: Bool = false, skipHeaderSearchPaths: Bool = false) -> SearchPaths
-    {
+    private static func sparseSDKSearchPathArguments(_ sparseSDKs: [SDK], _ existingHeaderSearchPaths: Set<Path>, _ existingFrameworkSearchPaths: Set<Path>, asSeparateArguments: Bool = false, skipHeaderSearchPaths: Bool = false) -> SearchPaths {
         // Create a search path build with the search paths which are already in the arguments as -I and -F options, so we don't add SDK search paths to the same paths.
         let searchPathBuilder = SearchPathBuilder(headerSearchPaths: existingHeaderSearchPaths, frameworkSearchPaths: existingFrameworkSearchPaths)
 
-        for sdk in sparseSDKs
-        {
+        for sdk in sparseSDKs {
             if !skipHeaderSearchPaths {
                 // Figure out which, if any, additional header search path options to add.  We start with the header search paths defined by the sparse SDK, if any.
                 let headerSearchPaths = sdk.headerSearchPaths
 
                 // Add additional header paths as system header search paths.  The builder will filter out any which have already been added as ordinary header search paths.
-                if !headerSearchPaths.isEmpty
-                {
-                    for path in headerSearchPaths
-                    {
+                if !headerSearchPaths.isEmpty {
+                    for path in headerSearchPaths {
                         searchPathBuilder.addSystemHeaderSearchPath(path)
                     }
                 }
@@ -384,10 +348,8 @@ package struct GCCCompatibleCompilerSpecSupport
             let frameworkSearchPaths = sdk.frameworkSearchPaths
 
             // Add additional framework paths as system framework search paths.  The builder will filter out any which have already been added as ordinary framework search paths.
-            if !frameworkSearchPaths.isEmpty
-            {
-                for path in frameworkSearchPaths
-                {
+            if !frameworkSearchPaths.isEmpty {
+                for path in frameworkSearchPaths {
                     searchPathBuilder.addSystemFrameworkSearchPath(path)
                 }
             }
@@ -410,39 +372,34 @@ package struct GCCCompatibleCompilerSpecSupport
     }
 }
 
-
 /// Adopting this protocol indicates that the adopter can generate LLVM-based compiler command line arguments for search path entries.
-package protocol GCCCompatibleCompilerCommandLineBuilder: SearchPathCommandLineBuilder
-{
+package protocol GCCCompatibleCompilerCommandLineBuilder: SearchPathCommandLineBuilder {
 }
 
-
-extension GCCCompatibleCompilerCommandLineBuilder
-{
-    package func searchPathArguments(_ entry: SearchPathEntry, _ scope: MacroEvaluationScope) -> [String]
-    {
+extension GCCCompatibleCompilerCommandLineBuilder {
+    package func searchPathArguments(_ entry: SearchPathEntry, _ scope: MacroEvaluationScope) -> [String] {
         var args = [String]()
         switch entry
         {
-          case .userHeaderSearchPath(let path):
+        case .userHeaderSearchPath(let path):
             args.append(contentsOf: ["-iquote", path.str])
 
-          case .headerSearchPath(let path, let separateArgs):
+        case .headerSearchPath(let path, let separateArgs):
             args.append(contentsOf: separateArgs ? ["-I", path.str] : ["-I" + path.str])
 
-          case .systemHeaderSearchPath(let path):
+        case .systemHeaderSearchPath(let path):
             args.append(contentsOf: ["-isystem", path.str])
 
-          case .headerSearchPathSplitter:
-            args.append("-I-")              // <rdar://problem/24312805> states that clang has never supported this option.
+        case .headerSearchPathSplitter:
+            args.append("-I-")  // <rdar://problem/24312805> states that clang has never supported this option.
 
-          case .frameworkSearchPath(let path, let separateArgs):
+        case .frameworkSearchPath(let path, let separateArgs):
             args.append(contentsOf: separateArgs ? ["-F", path.str] : ["-F" + path.str])
 
-          case .systemFrameworkSearchPath(let path):
+        case .systemFrameworkSearchPath(let path):
             args.append(contentsOf: ["-iframework", path.str])
 
-          case .literalArguments(let literalArgs):
+        case .literalArguments(let literalArgs):
             args.append(contentsOf: literalArgs)
         }
         return args
diff --git a/Sources/SWBCore/SpecImplementations/Tools/InfoPlistTool.swift b/Sources/SWBCore/SpecImplementations/Tools/InfoPlistTool.swift
index d0683f6f..67c7c512 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/InfoPlistTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/InfoPlistTool.swift
@@ -14,7 +14,7 @@ public import SWBUtil
 import SWBMacro
 import Foundation
 
-public final class InfoPlistToolSpec : GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
+public final class InfoPlistToolSpec: GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.tools.info-plist-utility"
 
     public override func constructTasks(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate) async {
@@ -35,8 +35,7 @@ public final class InfoPlistToolSpec : GenericCommandLineToolSpec, SpecIdentifie
             let contents: SWBUtil.ByteString
             do {
                 contents = try ByteString(additions.asBytes(.binary))
-            }
-            catch {
+            } catch {
                 delegate.error("failed to serialize product type infoPlistAdditions: \(error)")
                 return nil
             }
@@ -130,7 +129,7 @@ public final class InfoPlistToolSpec : GenericCommandLineToolSpec, SpecIdentifie
          that tracks the usage of these potential items.
          */
         var privacyFiles: [Path] = []
-        var privacyFilesMap: [String:[Path]] = [:]
+        var privacyFilesMap: [String: [Path]] = [:]
         for path in files {
             let basename = path.basename
             privacyFilesMap[basename, default: []].append(path)
@@ -144,13 +143,11 @@ public final class InfoPlistToolSpec : GenericCommandLineToolSpec, SpecIdentifie
 
                 if let pathToUse = paths.filter({ $0.str.hasPrefix(targetPath.str) }).first {
                     privacyFiles.append(pathToUse)
-                }
-                else {
+                } else {
                     // Unclear which one to use so pass them all.
                     privacyFiles.append(contentsOf: paths)
                 }
-            }
-            else {
+            } else {
                 privacyFiles.append(contentsOf: paths)
             }
         }
diff --git a/Sources/SWBCore/SpecImplementations/Tools/LaunchServicesRegisterTool.swift b/Sources/SWBCore/SpecImplementations/Tools/LaunchServicesRegisterTool.swift
index 216ea105..80fd2822 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/LaunchServicesRegisterTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/LaunchServicesRegisterTool.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-final class LaunchServicesRegisterToolSpec : GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
+final class LaunchServicesRegisterToolSpec: GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
     static let identifier = "com.apple.build-tasks.ls-register-url"
 
     override func createTaskAction(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate) -> (any PlannedTaskAction)? {
diff --git a/Sources/SWBCore/SpecImplementations/Tools/LinkerTools.swift b/Sources/SWBCore/SpecImplementations/Tools/LinkerTools.swift
index 414ec486..7b0e216b 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/LinkerTools.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/LinkerTools.swift
@@ -150,7 +150,7 @@ public struct DiscoveredLdLinkerToolSpecInfo: DiscoveredCommandLineToolSpecInfo
 }
 
 /// Parses stderr output as generated by ld(1).
-@_spi(Testing) public final class LdLinkerOutputParser : GenericOutputParser {
+@_spi(Testing) public final class LdLinkerOutputParser: GenericOutputParser {
 
     /// Regular expression that matches a line indicating the start of a list of undefined symbols.  The section ends with a "symbol(s) not found" error message.
     static let undefSymbolsSectionStartRegEx = RegEx(patternLiteral: "^[ ]*Undefined symbols.*:$")
@@ -202,7 +202,8 @@ public struct DiscoveredLdLinkerToolSpecInfo: DiscoveredCommandLineToolSpecInfo
             let processedLines: [ByteString] = linesToParse.map { lineBytes in
                 let lineString = String(decoding: lineBytes, as: Unicode.UTF8.self)
                 if lineString.contains(": error:")
-                    || lineString.contains(": warning:") {
+                    || lineString.contains(": warning:")
+                {
 
                     let issueString = "\(projectPath.str): \(targetName): \(lineString)"
                     return ByteString(encodingAsUTF8: issueString)
@@ -215,8 +216,7 @@ public struct DiscoveredLdLinkerToolSpecInfo: DiscoveredCommandLineToolSpecInfo
                 delegate.emitOutput($0)
                 delegate.emitOutput("\n")
             }
-        }
-        else {
+        } else {
             // Forward the bytes
             linesToParse.forEach {
                 delegate.emitOutput(ByteString($0))
@@ -245,11 +245,12 @@ public struct DiscoveredLdLinkerToolSpecInfo: DiscoveredCommandLineToolSpecInfo
             if let match = LdLinkerOutputParser.undefSymbolNameRegEx.firstMatch(in: lineString) {
                 // We've found a symbol, so we add it to the list.
                 undefinedSymbols.append(match[0])
-            }
-            else if let match = LdLinkerOutputParser.problemMessageRegEx.firstMatch(in: lineString), match[3].hasPrefix("symbol(s) not found") {
+            } else if let match = LdLinkerOutputParser.problemMessageRegEx.firstMatch(in: lineString), match[3].hasPrefix("symbol(s) not found") {
                 // It's time to emit all the symbols.  We emit each as a separate message.
-                let projectLocation = Workspace.projectLocation(for: self.task.forTarget?.target,
-                                                                workspace: self.workspaceContext.workspace)
+                let projectLocation = Workspace.projectLocation(
+                    for: self.task.forTarget?.target,
+                    workspace: self.workspaceContext.workspace
+                )
 
                 for symbol in undefinedSymbols.prefix(undefinedSymbolCountLimit) {
                     delegate.diagnosticsEngine.emit(Diagnostic(behavior: .error, location: projectLocation, data: DiagnosticData("Undefined symbol: \(symbol)"), appendToOutputStream: false))
@@ -259,23 +260,22 @@ public struct DiscoveredLdLinkerToolSpecInfo: DiscoveredCommandLineToolSpecInfo
                 }
                 collectingUndefinedSymbols = false
                 undefinedSymbols = []
-            }
-            else {
+            } else {
                 // Ignore references for now.
             }
-        }
-        else if LdLinkerOutputParser.undefSymbolsSectionStartRegEx.firstMatch(in: lineString) != nil {
+        } else if LdLinkerOutputParser.undefSymbolsSectionStartRegEx.firstMatch(in: lineString) != nil {
             // We've found the start of a list of undefined symbols; we'll collect them and emit them at the end of the list.
             collectingUndefinedSymbols = true
-        }
-        else if let match = LdLinkerOutputParser.problemMessageRegEx.firstMatch(in: lineString) {
+        } else if let match = LdLinkerOutputParser.problemMessageRegEx.firstMatch(in: lineString) {
             // We've found an error outside of the undefined-symbols list.  We emit it in accordance with its type.
             // match[0] is severity prefix (if any), match[1] is severity name (if any), match[2] is the message
             let severity = match[2].isEmpty ? "error" : match[2]
             let behavior = Diagnostic.Behavior(name: severity) ?? .note
             let message = match[3].prefix(1).localizedCapitalized + match[3].dropFirst()
-            let projectLocation = Workspace.projectLocation(for: self.task.forTarget?.target,
-                                                            workspace: self.workspaceContext.workspace)
+            let projectLocation = Workspace.projectLocation(
+                for: self.task.forTarget?.target,
+                workspace: self.workspaceContext.workspace
+            )
             let diagnostic = Diagnostic(behavior: behavior, location: projectLocation, data: DiagnosticData(message), appendToOutputStream: false)
             delegate.diagnosticsEngine.emit(diagnostic)
         }
@@ -293,7 +293,7 @@ public struct DiscoveredLdLinkerToolSpecInfo: DiscoveredCommandLineToolSpecInfo
     }
 }
 
-public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchecked Sendable {
+public final class LdLinkerSpec: GenericLinkerSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.pbx.linkers.ld"
 
     override public var toolBasenameAliases: [String] {
@@ -345,7 +345,7 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
         let suppressDriverStdlibPaths: Bool
     }
 
-    static public func computeRPaths(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate, inputRunpathSearchPaths: [String], isUsingSwift: Bool ) async -> RuntimeSearchPaths {
+    static public func computeRPaths(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate, inputRunpathSearchPaths: [String], isUsingSwift: Bool) async -> RuntimeSearchPaths {
         // Product types can provide their own set of rpath values, we need to ensure that our rpath flags for Swift in the OS appear before those. Also, due to the fact that we are staging this rollout, we need to specifically override any Swift libraries that may be in the bundle _when_ the Swift ABI version matches on the system with that in which the tool was built with.
 
         var runpathSearchPaths = inputRunpathSearchPaths
@@ -358,17 +358,13 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
         let supportsSwiftSpanNatively = cbc.producer.platform?.supportsSwiftSpanNatively(cbc.scope, forceNextMajorVersion: false, considerTargetDeviceOSVersion: false) ?? true
         let shouldEmitRPathForSwiftConcurrency = UserDefaults.allowRuntimeSearchPathAdditionForSwiftConcurrency && !supportsSwiftConcurrencyNatively
         let shouldEmitRPathForSwiftSpan = !cbc.scope.evaluate(BuiltinMacros.DISABLE_SWIFT_SPAN_COMPATIBILITY_RPATH) && !supportsSwiftSpanNatively
-        if (
-            cbc.producer.platform?.supportsSwiftInTheOS(cbc.scope, forceNextMajorVersion: true, considerTargetDeviceOSVersion: false) != true ||
-            cbc.producer.toolchains.usesSwiftOpenSourceToolchain ||
-            shouldEmitRPathForSwiftConcurrency ||
-            shouldEmitRPathForSwiftSpan
-        )
+        if (cbc.producer.platform?.supportsSwiftInTheOS(cbc.scope, forceNextMajorVersion: true, considerTargetDeviceOSVersion: false) != true || cbc.producer.toolchains.usesSwiftOpenSourceToolchain || shouldEmitRPathForSwiftConcurrency || shouldEmitRPathForSwiftSpan)
             && isUsingSwift
-            && cbc.producer.platform?.minimumOSForSwiftInTheOS != nil {
+            && cbc.producer.platform?.minimumOSForSwiftInTheOS != nil
+        {
             // NOTE: For swift.org toolchains, this is fine as `DYLD_LIBRARY_PATH` is used to override these settings.
-            let swiftABIVersion =  await (cbc.producer.swiftCompilerSpec.discoveredCommandLineToolSpecInfo(cbc.producer, cbc.scope, delegate) as? DiscoveredSwiftCompilerToolSpecInfo)?.swiftABIVersion
-            runpathSearchPaths.insert( swiftABIVersion.flatMap { "/usr/lib/swift-\($0)" } ?? "/usr/lib/swift", at: 0)
+            let swiftABIVersion = await (cbc.producer.swiftCompilerSpec.discoveredCommandLineToolSpecInfo(cbc.producer, cbc.scope, delegate) as? DiscoveredSwiftCompilerToolSpecInfo)?.swiftABIVersion
+            runpathSearchPaths.insert(swiftABIVersion.flatMap { "/usr/lib/swift-\($0)" } ?? "/usr/lib/swift", at: 0)
             // Ensure the linker driver does not insert a duplicate rpath (if linking using swiftc)
             suppressDriverStdlibPaths = true
         }
@@ -431,16 +427,19 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
         let previewDylib = cbc.scope.evaluate(BuiltinMacros.EXECUTABLE_DEBUG_DYLIB_PATH)
         let isPreviewDylib = !previewDylib.isEmpty
 
-        let machOTypeString = isPreviewDylib
+        let machOTypeString =
+            isPreviewDylib
             ? "mh_dylib"
             : cbc.scope.evaluate(BuiltinMacros.MACH_O_TYPE)
         let machOType = cbc.scope.namespace.parseLiteralString(machOTypeString)
 
-        let entitlements = isPreviewDylib
+        let entitlements =
+            isPreviewDylib
             ? cbc.scope.namespace.parseLiteralString("")
             : cbc.scope.namespace.parseLiteralString(cbc.scope.evaluate(BuiltinMacros.LD_ENTITLEMENTS_SECTION))
 
-        let entitlementsDer = isPreviewDylib
+        let entitlementsDer =
+            isPreviewDylib
             ? cbc.scope.namespace.parseLiteralString("")
             : cbc.scope.namespace.parseLiteralString(cbc.scope.evaluate(BuiltinMacros.LD_ENTITLEMENTS_SECTION_DER))
 
@@ -492,12 +491,14 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
 
         // Add the additional outputs defined by the spec.  These are not declared as outputs but should be processed by the tool separately.
         let additionalEvaluatedOutputsResult = await additionalEvaluatedOutputs(cbc, delegate)
-        outputs.append(contentsOf: additionalEvaluatedOutputsResult.outputs.map { output in
-            if let fileTypeIdentifier = output.fileType, let fileType = cbc.producer.lookupFileType(identifier: fileTypeIdentifier) {
-                delegate.declareOutput(FileToBuild(absolutePath: output.path, fileType: fileType))
+        outputs.append(
+            contentsOf: additionalEvaluatedOutputsResult.outputs.map { output in
+                if let fileTypeIdentifier = output.fileType, let fileType = cbc.producer.lookupFileType(identifier: fileTypeIdentifier) {
+                    delegate.declareOutput(FileToBuild(absolutePath: output.path, fileType: fileType))
+                }
+                return delegate.createNode(output.path)
             }
-            return delegate.createNode(output.path)
-        })
+        )
 
         if let infoPlistContent = additionalEvaluatedOutputsResult.generatedInfoPlistContent {
             delegate.declareGeneratedInfoPlistContent(infoPlistContent)
@@ -541,7 +542,7 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
             // this target could be using the exposed Swift APIs in the C++ section of the generated
             // header.
             if let target = cbc.producer.configuredTarget {
-                let depScopes = cbc.producer.targetSwiftDependencyScopes(for: target, arch: cbc.scope.evaluate(BuiltinMacros.CURRENT_ARCH), variant:  cbc.scope.evaluate(BuiltinMacros.CURRENT_VARIANT))
+                let depScopes = cbc.producer.targetSwiftDependencyScopes(for: target, arch: cbc.scope.evaluate(BuiltinMacros.CURRENT_ARCH), variant: cbc.scope.evaluate(BuiltinMacros.CURRENT_VARIANT))
                 for scope in depScopes {
                     if scope.evaluate(BuiltinMacros.SWIFT_OBJC_INTEROP_MODE) == "objcxx" {
                         let optionContext = await cbc.producer.swiftCompilerSpec.discoveredCommandLineToolSpecInfo(cbc.producer, scope, delegate)
@@ -572,7 +573,7 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
             // FIXME: These rpaths should be evaluated in `computeRPaths`.
             if cbc.scope.evaluate(BuiltinMacros.MERGE_LINKED_LIBRARIES), !cbc.scope.evaluate(BuiltinMacros.DONT_EMBED_REEXPORTED_MERGEABLE_LIBRARIES) {
                 if libraries.first(where: { $0.mode == .reexport_merge }) != nil {
-                    runpathSearchPaths.insert( "@loader_path/\(reexportedBinariesDirectoryName)", at: 0)
+                    runpathSearchPaths.insert("@loader_path/\(reexportedBinariesDirectoryName)", at: 0)
                 }
             }
         }
@@ -627,8 +628,7 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
                 let ldFlagsToEvaluate: [String]
                 if dyldEnvDiagnosticBehavior == .warning {
                     ldFlagsToEvaluate = filterLinkerFlagsWhenUnderPreviewsDylib(originalLdFlags)
-                }
-                else {
+                } else {
                     ldFlagsToEvaluate = originalLdFlags
                 }
 
@@ -691,7 +691,7 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
             }
         }
         if !usesLDClassic, supportsSDKImportsFeature, !sdkImportsInfoFile.isEmpty, cbc.scope.evaluate(BuiltinMacros.ENABLE_SDK_IMPORTS), cbc.producer.isApplePlatform {
-            commandLine.insert(contentsOf: ["-Xlinker", "-sdk_imports", "-Xlinker", sdkImportsInfoFile.str, "-Xlinker", "-sdk_imports_each_object"], at: commandLine.count - 2) // This preserves the assumption that the last argument is the linker output which a few tests make.
+            commandLine.insert(contentsOf: ["-Xlinker", "-sdk_imports", "-Xlinker", sdkImportsInfoFile.str, "-Xlinker", "-sdk_imports_each_object"], at: commandLine.count - 2)  // This preserves the assumption that the last argument is the linker output which a few tests make.
             outputs.append(delegate.createNode(sdkImportsInfoFile))
 
             await cbc.producer.processSDKImportsSpec.createTasks(CommandBuildContext(producer: cbc.producer, scope: cbc.scope, inputs: []), delegate, ldSDKImportsPath: sdkImportsInfoFile)
@@ -745,7 +745,7 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
         }
 
         // Compute the inputs and outputs.
-        var inputs: [any PlannedNode] = inputPaths.map{ delegate.createNode($0) }
+        var inputs: [any PlannedNode] = inputPaths.map { delegate.createNode($0) }
 
         await inputs.append(contentsOf: additionalInputDependencies(cbc, delegate, optionContext: discoveredCommandLineToolSpecInfo(cbc.producer, cbc.scope, delegate), lookup: lookup).map(delegate.createNode))
 
@@ -773,8 +773,9 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
                     cbc.scope.evaluate(BuiltinMacros.TARGET_BUILD_DIR).join(cbc.scope.evaluate(BuiltinMacros.EXECUTABLE_PATH)),
                     cbc.scope.evaluate(BuiltinMacros.TARGET_BUILD_DIR).join(cbc.scope.evaluate(BuiltinMacros.WRAPPER_NAME)).join(cbc.scope.evaluate(BuiltinMacros.EXECUTABLE_NAME)),
                     Path(cbc.scope.evaluate(BuiltinMacros.TAPI_OUTPUT_PATH)),
-                    Path(cbc.scope.evaluate(BuiltinMacros.EAGER_LINKING_INTERMEDIATE_TBD_PATH))
-                ], removableBasenames: [
+                    Path(cbc.scope.evaluate(BuiltinMacros.EAGER_LINKING_INTERMEDIATE_TBD_PATH)),
+                ],
+                removableBasenames: [
                     cbc.scope.evaluate(BuiltinMacros.EXECUTABLE_NAME),
                     Path(cbc.scope.evaluate(BuiltinMacros.EXECUTABLE_NAME)).basenameWithoutSuffix + ".tbd",
                 ],
@@ -971,7 +972,7 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
         }
 
         // Compute the inputs and outputs.
-        let inputs = inputPaths.map{ delegate.createNode($0) } + cbc.commandOrderingInputs
+        let inputs = inputPaths.map { delegate.createNode($0) } + cbc.commandOrderingInputs
         let outputs: [any PlannedNode] = [delegate.createNode(cbc.output)] + cbc.commandOrderingOutputs
 
         // Silently fix up the dependency info in order to avoid generating incorrect dependencies in certain cases:
@@ -986,7 +987,7 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
                     cbc.output,
                     cbc.scope.evaluate(BuiltinMacros.TARGET_BUILD_DIR).join(cbc.scope.evaluate(BuiltinMacros.EXECUTABLE_DEBUG_DYLIB_PATH)),
                     Path(cbc.scope.evaluate(BuiltinMacros.TAPI_OUTPUT_PATH)),
-                    Path(cbc.scope.evaluate(BuiltinMacros.EAGER_LINKING_INTERMEDIATE_TBD_PATH))
+                    Path(cbc.scope.evaluate(BuiltinMacros.EAGER_LINKING_INTERMEDIATE_TBD_PATH)),
                 ],
                 removableBasenames: [
                     cbc.scope.evaluate(BuiltinMacros.EXECUTABLE_NAME),
@@ -1051,7 +1052,7 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
             outputPath: cbc.output,
             dependencyInfoEditPayload: DependencyInfoEditPayload(
                 removablePaths: [
-                    cbc.output,
+                    cbc.output
                 ],
                 removableBasenames: [],
                 developerPath: cbc.scope.evaluate(BuiltinMacros.DEVELOPER_DIR)
@@ -1107,7 +1108,7 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
         for arg in ["-export_dynamic", "-sdk_imports_each_object", "-dead_strip"] {
             while let index = commandLine.firstIndex(of: arg) {
                 guard index > 0, commandLine[index - 1] == argPrefix else { break }
-                commandLine.removeSubrange(index - 1 ... index)
+                commandLine.removeSubrange(index - 1...index)
             }
         }
 
@@ -1136,11 +1137,11 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
                     index + 2 < commandLine.count,
                     commandLine[index - 1] == argPrefix,
                     commandLine[index + 1] == argPrefix
-                    else {
-                        break
+                else {
+                    break
                 }
 
-                commandLine.removeSubrange(index - 1 ... index + 2)
+                commandLine.removeSubrange(index - 1...index + 2)
             }
         }
 
@@ -1149,14 +1150,14 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
             commandLine.append(contentsOf: [
                 "-dynamiclib",
                 payload.outputPath.str,
-                ])
+            ])
 
         case .bundleLoader:
             commandLine.append(contentsOf: [
                 "-bundle",
                 "-bundle_loader",
                 payload.outputPath.str,
-                ])
+            ])
         case .staticLib:
             break
         }
@@ -1165,7 +1166,7 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
         commandLine.append(contentsOf: [
             "-o",
             outputPath.str,
-            ])
+        ])
 
         let output = TaskGeneratePreviewInfoOutput(
             architecture: previewPayload.architecture,
@@ -1194,7 +1195,7 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
         ] {
             while let index = commandLine.firstIndex(of: arg) {
                 guard index > 0, commandLine[index - 1] == argPrefix else { break }
-                commandLine.removeSubrange(index - 1 ... index)
+                commandLine.removeSubrange(index - 1...index)
             }
         }
 
@@ -1207,11 +1208,11 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
                     index + 2 < commandLine.count,
                     commandLine[index - 1] == argPrefix,
                     commandLine[index + 1] == argPrefix
-                    else {
-                        break
+                else {
+                    break
                 }
 
-                commandLine.removeSubrange(index - 1 ... index + 2)
+                commandLine.removeSubrange(index - 1...index + 2)
             }
         }
 
@@ -1319,8 +1320,7 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
                 let returnPath: Path
                 if let pathArg = absPathArgs.last, Path(pathArg).basename == frameworkName {
                     returnPath = Path(pathArg)
-                }
-                else {
+                } else {
                     returnPath = specifier.path
                 }
                 return (absPathArgs, [returnPath])
@@ -1381,11 +1381,9 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
                         let components = arg.split(separator: ",")
                         if components.count == 1 {
                             return (nil, nil)
-                        }
-                        else if components.count == 2 {
+                        } else if components.count == 2 {
                             return (String(components[1]), nil)
-                        }
-                        else {
+                        } else {
                             // Not sure what it means if we end up with more components than the option supports, so we just ignore that.
                             return (String(components[1]), String(components[2]))
                         }
@@ -1397,8 +1395,7 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
                     if StaticVars.frameworkArgs.contains(option) {
                         if let argument {
                             await addFramework(macro, option, argument)
-                        }
-                        else {
+                        } else {
                             // See if the next option is also a -Wl,
                             guard let next = argsIterator.next() else {
                                 await addError("\(macro.name) in target '\(settings.target?.name ?? "<unknown>")': Expected a framework name quoted with -Wl, after \(option)")
@@ -1409,8 +1406,7 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
                                     let components = next.split(separator: ",")
                                     if components.count == 1 {
                                         return nil
-                                    }
-                                    else {
+                                    } else {
                                         return String(components[1])
                                     }
                                 }()
@@ -1419,14 +1415,12 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
                                     continue
                                 }
                                 await addFramework(macro, option, argument)
-                            }
-                            else {
+                            } else {
                                 await addError("\(macro.name) in target '\(settings.target?.name ?? "<unknown>")': Expected a framework name quoted with -Wl, after \(option) but found '\(next)'")
                                 break
                             }
                         }
-                    }
-                    else if let prefix = (StaticVars.libPrefixArgs.first { option.hasPrefix($0) }) {
+                    } else if let prefix = (StaticVars.libPrefixArgs.first { option.hasPrefix($0) }) {
                         let stem = String(option.dropFirst(prefix.count))
                         await addLibrary(macro, prefix, stem)
                     }
@@ -1449,14 +1443,12 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
                             await addError("\(macro.name) in target '\(settings.target?.name ?? "<unknown>")': Expected a framework name quoted with -Xlinker after \(arg)")
                             break
                         }
-                        argument  = next
-                    }
-                    else {
+                        argument = next
+                    } else {
                         argument = next
                     }
                     await addFramework(macro, arg, argument)
-                }
-                else if let prefix = (StaticVars.libPrefixArgs.first { arg.hasPrefix($0) }) {
+                } else if let prefix = (StaticVars.libPrefixArgs.first { arg.hasPrefix($0) }) {
                     let stem = String(arg.dropFirst(prefix.count))
                     await addLibrary(macro, prefix, stem)
                 }
@@ -1519,7 +1511,7 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
         if alternateLinker != "" && alternateLinker != "ld" && alternateLinker != "link" {
             linkerPath = Path(producer.hostOperatingSystem.imageFormat.executableName(basename: "ld.\(alternateLinker)"))
         } else if alternateLinker != "" {
-            linkerPath =  Path(alternateLinker)
+            linkerPath = Path(alternateLinker)
         }
         // If the linker does not support multiple architectures update the path to include a subfolder based on the prefix map
         // to find the architecture specific executable.
@@ -1572,10 +1564,10 @@ fileprivate extension LinkerSpec.LibrarySpecifier {
         case (.dynamic, .weak):
             return ["-weak-l" + name]
         case (.static, .weak),
-             (.textBased, .weak):
+            (.textBased, .weak):
             return ["-weak-l" + name]
         case (.static, _),
-             (.textBased, _):
+            (.textBased, _):
             // Other modes are not supported for these kinds.
             return ["-l" + name]
         case (.framework, .normal):
@@ -1610,10 +1602,10 @@ fileprivate extension LinkerSpec.LibrarySpecifier {
         case (.dynamic, .weak):
             return ["-weak_library", path.str]
         case (.static, .weak),
-             (.textBased, .weak):
+            (.textBased, .weak):
             return ["-weak_library", path.str]
         case (.static, _),
-             (.textBased, _):
+            (.textBased, _):
             // Other modes are not supported for these kinds.
             return [path.str]
         // FIXME: When linking with absolute paths, we pass the path to library inside the framework using the appropriate -***_library option (or no option for normal mode). This is probably a mis-feature, I doubt it is a good idea to bypass the linker's notion of frameworkness, but this has been the behavior for a long time and it's not clear that the linker provides us with a better alternative.
@@ -1641,7 +1633,7 @@ public struct DiscoveredLibtoolLinkerToolSpecInfo: DiscoveredCommandLineToolSpec
     public let toolVersion: Version?
 }
 
-public final class LibtoolLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchecked Sendable {
+public final class LibtoolLinkerSpec: GenericLinkerSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.pbx.linkers.libtool"
 
     override public var payloadType: (any TaskPayload.Type)? { return LibtoolLinkerTaskPayload.self }
@@ -1665,23 +1657,28 @@ public final class LibtoolLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @u
             return DiscoveredLibtoolLinkerToolSpecInfo(toolPath: toolPath, toolVersion: nil)
         }
 
-        return try await producer.discoveredCommandLineToolSpecInfo(delegate, nil, [toolPath.str, producer.isApplePlatform ? "-V" : "--version"], { executionResult in
-            let outputString = String(decoding: executionResult.stdout, as: UTF8.self).trimmingCharacters(in: .whitespacesAndNewlines)
-            let regexes: [Regex<(Substring, libtool: Substring)>]
-            if producer.isApplePlatform {
-                regexes = [#/^Apple Inc\. version cctools(?:_[A-Za-z0-9_]+)?-(?<libtool>[0-9\.]+)$/#]
-            } else {
-                regexes = [
-                    #/^libtool \(GNU libtool\) (?<libtool>[0-9\.]+).*/#,
-                    #/^LLD (?<libtool>[0-9\.]+).*/#,
-                ]
-            }
-            guard let match = try regexes.compactMap({ try $0.firstMatch(in: outputString) }).first else {
-                throw StubError.error("Could not parse libtool version from: \(outputString)")
-            }
+        return try await producer.discoveredCommandLineToolSpecInfo(
+            delegate,
+            nil,
+            [toolPath.str, producer.isApplePlatform ? "-V" : "--version"],
+            { executionResult in
+                let outputString = String(decoding: executionResult.stdout, as: UTF8.self).trimmingCharacters(in: .whitespacesAndNewlines)
+                let regexes: [Regex<(Substring, libtool: Substring)>]
+                if producer.isApplePlatform {
+                    regexes = [#/^Apple Inc\. version cctools(?:_[A-Za-z0-9_]+)?-(?<libtool>[0-9\.]+)$/#]
+                } else {
+                    regexes = [
+                        #/^libtool \(GNU libtool\) (?<libtool>[0-9\.]+).*/#,
+                        #/^LLD (?<libtool>[0-9\.]+).*/#,
+                    ]
+                }
+                guard let match = try regexes.compactMap({ try $0.firstMatch(in: outputString) }).first else {
+                    throw StubError.error("Could not parse libtool version from: \(outputString)")
+                }
 
-            return try DiscoveredLibtoolLinkerToolSpecInfo(toolPath: toolPath, toolVersion: Version(String(match.output.libtool)))
-        })
+                return try DiscoveredLibtoolLinkerToolSpecInfo(toolPath: toolPath, toolVersion: Version(String(match.output.libtool)))
+            }
+        )
     }
 
     override public func discoveredCommandLineToolSpecInfo(_ producer: any CommandProducer, _ scope: MacroEvaluationScope, _ delegate: any CoreClientTargetDiagnosticProducingDelegate) async -> (any DiscoveredCommandLineToolSpecInfo)? {
@@ -1716,43 +1713,44 @@ public final class LibtoolLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @u
         }
 
         // Add arguments for the contents of the Link Binaries build phase.
-        specialArgs.append(contentsOf: libraries.flatMap { specifier -> [String] in
-            let basename = specifier.path.basename
+        specialArgs.append(
+            contentsOf: libraries.flatMap { specifier -> [String] in
+                let basename = specifier.path.basename
+
+                switch specifier.kind {
+                case .static:
+                    // A static library can build against another static library.
+
+                    // If directed to link it weakly, we emit a warning, since libtool can't perform weak linking (since it's not really linking).  Then we pass it normally.
+                    // We silently ignore other non-normal modes, since they are only set programmatically and there's nothing the user can do about them.
+                    if specifier.mode == .weak {
+                        delegate.warning("Product \(cbc.output.basename) cannot weak-link \(specifier.kind) \(basename)")
+                    }
 
-            switch specifier.kind {
-            case .static:
-                // A static library can build against another static library.
+                    if specifier.useSearchPaths, basename.hasPrefix("lib"), basename.hasSuffix(".a") {
+                        // Locate using search paths: Add a -l option and *don't* add the path to the library as an input to the task.
+                        return ["-l" + basename.withoutPrefix("lib").withoutSuffix(".a")]
+                    } else {
+                        // Locate using an absolute path: Add the path as an option and as an input to the task.
+                        inputPaths.append(specifier.path)
+                        return [specifier.path.str]
+                    }
 
-                // If directed to link it weakly, we emit a warning, since libtool can't perform weak linking (since it's not really linking).  Then we pass it normally.
-                // We silently ignore other non-normal modes, since they are only set programmatically and there's nothing the user can do about them.
-                if specifier.mode == .weak {
-                    delegate.warning("Product \(cbc.output.basename) cannot weak-link \(specifier.kind) \(basename)")
-                }
+                case .object:
+                    // Object files are added to linker inputs in the sources task producer and so end up in the link-file-list.
+                    return []
 
-                if specifier.useSearchPaths, basename.hasPrefix("lib"), basename.hasSuffix(".a") {
-                    // Locate using search paths: Add a -l option and *don't* add the path to the library as an input to the task.
-                    return ["-l" + basename.withoutPrefix("lib").withoutSuffix(".a")]
-                }
-                else {
-                    // Locate using an absolute path: Add the path as an option and as an input to the task.
+                case .objectLibrary:
                     inputPaths.append(specifier.path)
-                    return [specifier.path.str]
-                }
-
-            case .object:
-                // Object files are added to linker inputs in the sources task producer and so end up in the link-file-list.
-                return []
-
-            case .objectLibrary:
-                inputPaths.append(specifier.path)
-                return ["@\(specifier.path.join("args.resp").str)"]
+                    return ["@\(specifier.path.join("args.resp").str)"]
 
-            case .dynamic, .textBased, .framework:
-                // A static library can't build against a dynamic library, or against a .tbd file, so we don't add any arguments here.  But the inclusion of such a file in the Link Binaries build phase might be used to find implicit dependencies.
-                // We don't have a concrete example of this, and we used to emit an error here, but we removed it in <rdar://problem/34314195>.
-                return []
+                case .dynamic, .textBased, .framework:
+                    // A static library can't build against a dynamic library, or against a .tbd file, so we don't add any arguments here.  But the inclusion of such a file in the Link Binaries build phase might be used to find implicit dependencies.
+                    // We don't have a concrete example of this, and we used to emit an error here, but we removed it in <rdar://problem/34314195>.
+                    return []
+                }
             }
-        })
+        )
 
         var outputs: [any PlannedNode] = [delegate.createNode(cbc.output)] + cbc.commandOrderingOutputs
 
@@ -1771,13 +1769,13 @@ public final class LibtoolLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @u
         let commandLine = await commandLineFromTemplate(cbc, delegate, optionContext: optionContext, specialArgs: specialArgs).map(\.asString)
 
         // Compute the inputs and outputs.
-        var inputs = inputPaths.map{ delegate.createNode($0) }
+        var inputs = inputPaths.map { delegate.createNode($0) }
         // Add inputs for the (un)exports files, if we generated options for them.
-        if let idx = commandLine.firstIndex(of: "-exported_symbols_list"), idx+1 < commandLine.count {
-            inputs.append(delegate.createNode(Path(commandLine[idx+1]).normalize()))
+        if let idx = commandLine.firstIndex(of: "-exported_symbols_list"), idx + 1 < commandLine.count {
+            inputs.append(delegate.createNode(Path(commandLine[idx + 1]).normalize()))
         }
-        if let idx = commandLine.firstIndex(of: "-unexported_symbols_list"), idx+1 < commandLine.count {
-            inputs.append(delegate.createNode(Path(commandLine[idx+1]).normalize()))
+        if let idx = commandLine.firstIndex(of: "-unexported_symbols_list"), idx + 1 < commandLine.count {
+            inputs.append(delegate.createNode(Path(commandLine[idx + 1]).normalize()))
         }
 
         var payload: LibtoolLinkerTaskPayload? = nil
@@ -1857,69 +1855,84 @@ public func discoveredLinkerToolsInfo(_ producer: any CommandProducer, _ delegat
     do {
         do {
             let commandLine = [toolPath.str, "-version_details"]
-            return try await producer.discoveredCommandLineToolSpecInfo(delegate, nil, commandLine, { executionResult in
-                let gnuLD = [
-                    #/GNU ld version (?<version>[\d.]+)-.*/#,
-                    #/GNU ld \(GNU Binutils.*\) (?<version>[\d.]+)/#,
-                ]
-                if let match = try gnuLD.compactMap({ try $0.firstMatch(in: String(decoding: executionResult.stdout, as: UTF8.self)) }).first {
-                    return DiscoveredLdLinkerToolSpecInfo(linker: .gnuld, toolPath: toolPath, toolVersion: try Version(String(match.output.version)), architectures: Set())
-                }
+            return try await producer.discoveredCommandLineToolSpecInfo(
+                delegate,
+                nil,
+                commandLine,
+                { executionResult in
+                    let gnuLD = [
+                        #/GNU ld version (?<version>[\d.]+)-.*/#,
+                        #/GNU ld \(GNU Binutils.*\) (?<version>[\d.]+)/#,
+                    ]
+                    if let match = try gnuLD.compactMap({ try $0.firstMatch(in: String(decoding: executionResult.stdout, as: UTF8.self)) }).first {
+                        return DiscoveredLdLinkerToolSpecInfo(linker: .gnuld, toolPath: toolPath, toolVersion: try Version(String(match.output.version)), architectures: Set())
+                    }
 
-                let goLD = [
-                    #/GNU gold version (?<version>[\d.]+)-.*/#,
-                    #/GNU gold \(GNU Binutils.*\) (?<version>[\d.]+)/#, // Ubuntu "GNU gold (GNU Binutils for Ubuntu 2.38) 1.16", Debian "GNU gold (GNU Binutils for Debian 2.40) 1.16"
-                    #/GNU gold \(version .*\) (?<version>[\d.]+)/#,     // Fedora "GNU gold (version 2.40-14.fc39) 1.16", RHEL "GNU gold (version 2.35.2-54.el9) 1.16", Amazon "GNU gold (version 2.29.1-31.amzn2.0.1) 1.14"
-                ]
+                    let goLD = [
+                        #/GNU gold version (?<version>[\d.]+)-.*/#,
+                        #/GNU gold \(GNU Binutils.*\) (?<version>[\d.]+)/#,  // Ubuntu "GNU gold (GNU Binutils for Ubuntu 2.38) 1.16", Debian "GNU gold (GNU Binutils for Debian 2.40) 1.16"
+                        #/GNU gold \(version .*\) (?<version>[\d.]+)/#,  // Fedora "GNU gold (version 2.40-14.fc39) 1.16", RHEL "GNU gold (version 2.35.2-54.el9) 1.16", Amazon "GNU gold (version 2.29.1-31.amzn2.0.1) 1.14"
+                    ]
 
-                if let match = try goLD.compactMap({ try $0.firstMatch(in: String(decoding: executionResult.stdout, as: UTF8.self)) }).first {
-                    return DiscoveredLdLinkerToolSpecInfo(linker: .gold, toolPath: toolPath, toolVersion: try Version(String(match.output.version)), architectures: Set())
-                }
+                    if let match = try goLD.compactMap({ try $0.firstMatch(in: String(decoding: executionResult.stdout, as: UTF8.self)) }).first {
+                        return DiscoveredLdLinkerToolSpecInfo(linker: .gold, toolPath: toolPath, toolVersion: try Version(String(match.output.version)), architectures: Set())
+                    }
 
-                // link.exe has no option to simply dump the version, running, the program will no arguments or an invalid one will dump a header that contains the version.
-                let linkExe = [
-                    #/Microsoft \(R\) Incremental Linker Version (?<version>[\d.]+)/#
-                ]
-                if let match = try linkExe.compactMap({ try $0.firstMatch(in: String(decoding: executionResult.stdout, as: UTF8.self)) }).first {
-                    return DiscoveredLdLinkerToolSpecInfo(linker: .linkExe, toolPath: toolPath, toolVersion: try Version(String(match.output.version)), architectures: Set())
-                }
+                    // link.exe has no option to simply dump the version, running, the program will no arguments or an invalid one will dump a header that contains the version.
+                    let linkExe = [
+                        #/Microsoft \(R\) Incremental Linker Version (?<version>[\d.]+)/#
+                    ]
+                    if let match = try linkExe.compactMap({ try $0.firstMatch(in: String(decoding: executionResult.stdout, as: UTF8.self)) }).first {
+                        return DiscoveredLdLinkerToolSpecInfo(linker: .linkExe, toolPath: toolPath, toolVersion: try Version(String(match.output.version)), architectures: Set())
+                    }
 
-                struct LDVersionDetails: Decodable {
-                    let version: Version
-                    let architectures: Set<String>
-                }
+                    struct LDVersionDetails: Decodable {
+                        let version: Version
+                        let architectures: Set<String>
+                    }
 
-                let details: LDVersionDetails
-                do {
-                    details = try JSONDecoder().decode(LDVersionDetails.self, from: executionResult.stdout)
-                } catch {
-                    throw CommandLineOutputJSONParsingError(commandLine: commandLine, data: executionResult.stdout)
-                }
+                    let details: LDVersionDetails
+                    do {
+                        details = try JSONDecoder().decode(LDVersionDetails.self, from: executionResult.stdout)
+                    } catch {
+                        throw CommandLineOutputJSONParsingError(commandLine: commandLine, data: executionResult.stdout)
+                    }
 
-                return DiscoveredLdLinkerToolSpecInfo(linker: .ld64, toolPath: toolPath, toolVersion: details.version, architectures: details.architectures)
-            })
+                    return DiscoveredLdLinkerToolSpecInfo(linker: .ld64, toolPath: toolPath, toolVersion: details.version, architectures: details.architectures)
+                }
+            )
         } catch let e as CommandLineOutputJSONParsingError {
             let vCommandLine = [toolPath.str, "-v"]
-            return try await producer.discoveredCommandLineToolSpecInfo(delegate, nil, vCommandLine, { executionResult in
-                let lld = [
-                    #/LLD (?<version>[\d.]+).*/#,
-                ]
-                if let match = try lld.compactMap({ try $0.firstMatch(in: String(decoding: executionResult.stdout, as: UTF8.self)) }).first {
-                    return DiscoveredLdLinkerToolSpecInfo(linker: .lld, toolPath: toolPath, toolVersion: try Version(String(match.output.version)), architectures: Set())
-                }
-
-                let versionCommandLine = [toolPath.str, "--version"]
-                return try await producer.discoveredCommandLineToolSpecInfo(delegate, nil, versionCommandLine, { executionResult in
+            return try await producer.discoveredCommandLineToolSpecInfo(
+                delegate,
+                nil,
+                vCommandLine,
+                { executionResult in
                     let lld = [
-                        #/LLD (?<version>[\d.]+).*/#,
+                        #/LLD (?<version>[\d.]+).*/#
                     ]
                     if let match = try lld.compactMap({ try $0.firstMatch(in: String(decoding: executionResult.stdout, as: UTF8.self)) }).first {
                         return DiscoveredLdLinkerToolSpecInfo(linker: .lld, toolPath: toolPath, toolVersion: try Version(String(match.output.version)), architectures: Set())
                     }
 
-                    throw e
-                })
-            })
+                    let versionCommandLine = [toolPath.str, "--version"]
+                    return try await producer.discoveredCommandLineToolSpecInfo(
+                        delegate,
+                        nil,
+                        versionCommandLine,
+                        { executionResult in
+                            let lld = [
+                                #/LLD (?<version>[\d.]+).*/#
+                            ]
+                            if let match = try lld.compactMap({ try $0.firstMatch(in: String(decoding: executionResult.stdout, as: UTF8.self)) }).first {
+                                return DiscoveredLdLinkerToolSpecInfo(linker: .lld, toolPath: toolPath, toolVersion: try Version(String(match.output.version)), architectures: Set())
+                            }
+
+                            throw e
+                        }
+                    )
+                }
+            )
         }
     } catch {
         delegate.error(error)
@@ -1949,14 +1962,17 @@ fileprivate func enumerateLinkerCommandLine(arguments: [String], handleWl: Bool
             continue
         }
 
-        handle(arg, { (offset: Int) -> String? in
-            // The driver accepts both `-Xlinker -flag value` _and_ `-Xlinker -flag -Xlinker value`.
-            // So if the first argument used -Xlinker, we may or may not have more.
-            if let value = it.next(count: offset, transform: { it, arg in isXlinker && arg == "-Xlinker" ? it.next() : arg }).last ?? nil {
-                return value
+        handle(
+            arg,
+            { (offset: Int) -> String? in
+                // The driver accepts both `-Xlinker -flag value` _and_ `-Xlinker -flag -Xlinker value`.
+                // So if the first argument used -Xlinker, we may or may not have more.
+                if let value = it.next(count: offset, transform: { it, arg in isXlinker && arg == "-Xlinker" ? it.next() : arg }).last ?? nil {
+                    return value
+                }
+                return nil
             }
-            return nil
-        })
+        )
     }
 }
 
@@ -1980,8 +1996,7 @@ fileprivate func filterLinkerFlagsWhenUnderPreviewsDylib(_ flags: [String]) -> [
                 }
             }
             continue
-        }
-        else if flag == "-client_name" {
+        } else if flag == "-client_name" {
             // Filter out `-client_Name` when using the previews dylib, since this isn't
             // allowed on dylibs. Transition from `OTHER_LD_FLAGS` to the dedicated
             // `LD_CLIENT_NAME` (by defining both at once) in order to remain compatible with
@@ -1995,16 +2010,13 @@ fileprivate func filterLinkerFlagsWhenUnderPreviewsDylib(_ flags: [String]) -> [
                         break
                     }
                 }
-            }
-            else {
+            } else {
                 _ = it.next()
             }
             continue
-        }
-        else if flag == "-Wl,-no_exported_symbols" {
+        } else if flag == "-Wl,-no_exported_symbols" {
             continue
-        }
-        else if flag == "-no_exported_symbols" && newFlags.last == "-Xlinker" {
+        } else if flag == "-no_exported_symbols" && newFlags.last == "-Xlinker" {
             // Filter out `-no_exported_symbols` when using the previews dylib, since this
             // strips important symbols that are needed for the stub executor trampoline..
             // Transition from `OTHER_LD_FLAGS` to the dedicated `LD_EXPORT_SYMBOLS` (by
diff --git a/Sources/SWBCore/SpecImplementations/Tools/Lipo.swift b/Sources/SWBCore/SpecImplementations/Tools/Lipo.swift
index d5d76c02..b1f6acd7 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/Lipo.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/Lipo.swift
@@ -48,12 +48,12 @@ public final class LipoToolSpec: GenericCommandLineToolSpec, SpecIdentifierType,
 
         var commandLine = [String]()
         if cbc.scope.evaluate(BuiltinMacros.CREATE_UNIVERSAL_STATIC_LIBRARY_USING_LIBTOOL) && cbc.scope.evaluate(BuiltinMacros.MACH_O_TYPE) == "staticlib" {
-                    commandLine.append(cbc.producer.libtoolLinkerSpec.libtoolToolPath(cbc).str)
-                    commandLine.append("-static")
-                    for input in cbc.inputs {
-                        commandLine.append(input.absolutePath.str)
-                    }
-                    commandLine += ["-o", outputPath.str]
+            commandLine.append(cbc.producer.libtoolLinkerSpec.libtoolToolPath(cbc).str)
+            commandLine.append("-static")
+            for input in cbc.inputs {
+                commandLine.append(input.absolutePath.str)
+            }
+            commandLine += ["-o", outputPath.str]
 
         } else {
             commandLine.append(lipoToolPath(cbc).str)
diff --git a/Sources/SWBCore/SpecImplementations/Tools/MkdirTool.swift b/Sources/SWBCore/SpecImplementations/Tools/MkdirTool.swift
index 78feb6d3..a38b62f0 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/MkdirTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/MkdirTool.swift
@@ -12,7 +12,7 @@
 
 import SWBUtil
 
-public final class MkdirToolSpec : CommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
+public final class MkdirToolSpec: CommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.tools.mkdir"
 
     override public func constructTasks(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate) async {
@@ -20,11 +20,14 @@ public final class MkdirToolSpec : CommandLineToolSpec, SpecIdentifierType, @unc
         // We must create a virtual output usable for mutable node ordering.
         let outputs: [any PlannedNode] = [delegate.createNode(output), delegate.createVirtualNode("MkDir \(output.str)")]
         delegate.createTask(
-            type: self, ruleInfo: ["MkDir", output.str],
+            type: self,
+            ruleInfo: ["MkDir", output.str],
             commandLine: ["/bin/mkdir", "-p", output.str],
             environment: EnvironmentBindings(),
             workingDirectory: cbc.producer.defaultWorkingDirectory,
-            inputs: [], outputs: outputs, action: nil,
+            inputs: [],
+            outputs: outputs,
+            action: nil,
             execDescription: resolveExecutionDescription(cbc, delegate),
             preparesForIndexing: cbc.preparesForIndexing,
             enableSandboxing: enableSandboxing,
diff --git a/Sources/SWBCore/SpecImplementations/Tools/ModulesVerifierTool.swift b/Sources/SWBCore/SpecImplementations/Tools/ModulesVerifierTool.swift
index a584628e..d59ce3ee 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/ModulesVerifierTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/ModulesVerifierTool.swift
@@ -12,7 +12,7 @@
 
 public import SWBUtil
 
-public final class ModulesVerifierToolSpec : GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
+public final class ModulesVerifierToolSpec: GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.build-tools.modules-verifier"
 
     override public func constructTasks(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate) async {
@@ -29,17 +29,21 @@ public final class ModulesVerifierToolSpec : GenericCommandLineToolSpec, SpecIde
 
         let commandLine = await commandLineFromTemplate(cbc, delegate, optionContext: discoveredCommandLineToolSpecInfo(cbc.producer, cbc.scope, delegate), specialArgs: specialArguments).map(\.asString)
 
-        let inputs = cbc.inputs.map{ delegate.createNode($0.absolutePath) } + cbc.commandOrderingInputs
+        let inputs = cbc.inputs.map { delegate.createNode($0.absolutePath) } + cbc.commandOrderingInputs
         let outputs = cbc.outputs.map { delegate.createNode($0) } + cbc.commandOrderingOutputs
 
-        delegate.createTask(type: self,
-                            ruleInfo: ruleInfo,
-                            commandLine: commandLine,
-                            environment: environmentFromSpec(cbc, delegate),
-                            workingDirectory: cbc.producer.defaultWorkingDirectory,
-                            inputs: inputs, outputs: outputs, action: nil,
-                            execDescription: resolveExecutionDescription(cbc, delegate),
-                            enableSandboxing: enableSandboxing,
-                            alwaysExecuteTask: alwaysExecuteTask)
+        delegate.createTask(
+            type: self,
+            ruleInfo: ruleInfo,
+            commandLine: commandLine,
+            environment: environmentFromSpec(cbc, delegate),
+            workingDirectory: cbc.producer.defaultWorkingDirectory,
+            inputs: inputs,
+            outputs: outputs,
+            action: nil,
+            execDescription: resolveExecutionDescription(cbc, delegate),
+            enableSandboxing: enableSandboxing,
+            alwaysExecuteTask: alwaysExecuteTask
+        )
     }
 }
diff --git a/Sources/SWBCore/SpecImplementations/Tools/ObjectLibraryAssembler.swift b/Sources/SWBCore/SpecImplementations/Tools/ObjectLibraryAssembler.swift
index d228388d..b13e40de 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/ObjectLibraryAssembler.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/ObjectLibraryAssembler.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-public final class ObjectLibraryAssemblerSpec : GenericLinkerSpec, SpecIdentifierType, @unchecked Sendable {
+public final class ObjectLibraryAssemblerSpec: GenericLinkerSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier: String = "org.swift.linkers.object-library-assembler"
 
     public override func createTaskAction(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate) -> (any PlannedTaskAction)? {
diff --git a/Sources/SWBCore/SpecImplementations/Tools/PLUtilTool.swift b/Sources/SWBCore/SpecImplementations/Tools/PLUtilTool.swift
index c8bad67e..17569397 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/PLUtilTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/PLUtilTool.swift
@@ -10,6 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-final class PLUtilToolSpec : CommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
+final class PLUtilToolSpec: CommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
     static let identifier = "com.apple.tools.plutil"
 }
diff --git a/Sources/SWBCore/SpecImplementations/Tools/PrelinkedObjectLink.swift b/Sources/SWBCore/SpecImplementations/Tools/PrelinkedObjectLink.swift
index d2e17180..89f4ab08 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/PrelinkedObjectLink.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/PrelinkedObjectLink.swift
@@ -36,9 +36,10 @@ public final class PrelinkedObjectLinkSpec: CommandLineToolSpec, SpecImplementat
         commandLine += ["-r", "-arch", arch]
 
         if let buildPlatform = cbc.producer.sdk?.targetBuildVersionPlatform(sdkVariant: cbc.producer.sdkVariant),
-           let deploymentTargetMacro = cbc.producer.platform?.deploymentTargetMacro,
-           let minDeploymentTarget = cbc.scope.evaluate(deploymentTargetMacro).nilIfEmpty,
-           let sdkVersion = cbc.producer.sdk?.version {
+            let deploymentTargetMacro = cbc.producer.platform?.deploymentTargetMacro,
+            let minDeploymentTarget = cbc.scope.evaluate(deploymentTargetMacro).nilIfEmpty,
+            let sdkVersion = cbc.producer.sdk?.version
+        {
             commandLine += ["-platform_version", "\(buildPlatform.rawValue)", minDeploymentTarget, sdkVersion.canonicalDeploymentTargetForm.description]
         }
 
diff --git a/Sources/SWBCore/SpecImplementations/Tools/ProductPackaging.swift b/Sources/SWBCore/SpecImplementations/Tools/ProductPackaging.swift
index 2fec4dd2..2f3eca5c 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/ProductPackaging.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/ProductPackaging.swift
@@ -14,7 +14,7 @@ public import SWBUtil
 import SWBMacro
 import Foundation
 
-public final class ProductPackagingToolSpec : GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
+public final class ProductPackagingToolSpec: GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.tools.product-pkg-utility"
 
     public override func constructTasks(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate) async {
@@ -175,7 +175,7 @@ public final class ProductPackagingToolSpec : GenericCommandLineToolSpec, SpecId
             delegate.access(path: path)
         }
 
-        delegate.createTask(type: self, ruleInfo: ["ProcessProductPackaging", codeSignEntitlementsInput?.absolutePath.str ?? "", outputPath.str], commandLine: commandLine, additionalOutput: additionalOutput, environment: environmentFromSpec(cbc, delegate), workingDirectory: cbc.producer.defaultWorkingDirectory, inputs: inputs.map(\.absolutePath), outputs: [ outputPath ], action: action, execDescription: resolveExecutionDescription(cbc, delegate), enableSandboxing: enableSandboxing)
+        delegate.createTask(type: self, ruleInfo: ["ProcessProductPackaging", codeSignEntitlementsInput?.absolutePath.str ?? "", outputPath.str], commandLine: commandLine, additionalOutput: additionalOutput, environment: environmentFromSpec(cbc, delegate), workingDirectory: cbc.producer.defaultWorkingDirectory, inputs: inputs.map(\.absolutePath), outputs: [outputPath], action: action, execDescription: resolveExecutionDescription(cbc, delegate), enableSandboxing: enableSandboxing)
     }
 
     /// Construct a task to create the provisioning file (commonly named `embedded.mobileprovision`).
@@ -202,10 +202,10 @@ public final class ProductPackagingToolSpec : GenericCommandLineToolSpec, SpecId
         let commandLine = await commandLineFromTemplate(cbc, delegate, optionContext: discoveredCommandLineToolSpecInfo(cbc.producer, cbc.scope, delegate), lookup: lookup).map(\.asString)
 
         let action = delegate.taskActionCreationDelegate.createProcessProductProvisioningProfileTaskAction()
-        delegate.createTask(type: self, ruleInfo: ["ProcessProductPackaging", inputPath.str, outputPath.str], commandLine: commandLine, environment: environmentFromSpec(cbc, delegate), workingDirectory: cbc.producer.defaultWorkingDirectory, inputs: cbc.inputs.map({ $0.absolutePath }), outputs: [ outputPath ], action: action, execDescription: resolveExecutionDescription(cbc, delegate), enableSandboxing: enableSandboxing)
+        delegate.createTask(type: self, ruleInfo: ["ProcessProductPackaging", inputPath.str, outputPath.str], commandLine: commandLine, environment: environmentFromSpec(cbc, delegate), workingDirectory: cbc.producer.defaultWorkingDirectory, inputs: cbc.inputs.map({ $0.absolutePath }), outputs: [outputPath], action: action, execDescription: resolveExecutionDescription(cbc, delegate), enableSandboxing: enableSandboxing)
 
         // FIXME: Need to add this signature info to the command once commands support signatures.  (I think we probably only need to add the UUID.)
-//        producer.extraSignatureInfo = inputs.profileUUID ?: inputs.profilePath.pathString;
+        //        producer.extraSignatureInfo = inputs.profileUUID ?: inputs.profilePath.pathString;
     }
 }
 
@@ -230,7 +230,7 @@ private extension ProductPackagingToolSpec {
                         message = "The '\(buildSettingName)' build setting is set to '\(buildSettingValue)', but entitlement '\(entitlement)' is set to '\(entitlementValue ? "YES" : "NO")' in your entitlements file."
                         childDiagnostics = [
                             .init(behavior: .note, location: entitlementsLocation, data: .init("To enable '\(buildSettingName)', remove the entitlement from your entitlements file.")),
-                            .init(behavior: .note, location: .buildSettings(names: [buildSettingName]), data: .init("To disable '\(buildSettingName)', remove the entitlement from your entitlements file and disable '\(buildSettingName)' in  build settings."))
+                            .init(behavior: .note, location: .buildSettings(names: [buildSettingName]), data: .init("To disable '\(buildSettingName)', remove the entitlement from your entitlements file and disable '\(buildSettingName)' in  build settings.")),
                         ]
 
                         delegate.warning(message, childDiagnostics: childDiagnostics)
diff --git a/Sources/SWBCore/SpecImplementations/Tools/ShellScriptTool.swift b/Sources/SWBCore/SpecImplementations/Tools/ShellScriptTool.swift
index 095d25df..24d5d621 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/ShellScriptTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/ShellScriptTool.swift
@@ -12,7 +12,7 @@
 
 public import SWBUtil
 
-public final class ShellScriptToolSpec : CommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
+public final class ShellScriptToolSpec: CommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.commands.shell-script"
 
     override public func constructTasks(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate) async {
@@ -21,30 +21,48 @@ public final class ShellScriptToolSpec : CommandLineToolSpec, SpecIdentifierType
     }
 
     public func constructShellScriptTasks(
-        _ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate,
-        ruleInfo: [String], commandLine: [String], environment: EnvironmentBindings,
-        workingDirectory: Path? = nil, inputs: [any PlannedNode], outputs: [any PlannedNode],
-        dependencyData: DependencyDataStyle?, execDescription: String,
-        showEnvironment: Bool, alwaysExecuteTask: Bool, enableSandboxing: Bool,
-        payload: (any TaskPayload)? = nil, action: (any PlannedTaskAction)? = nil,
+        _ cbc: CommandBuildContext,
+        _ delegate: any TaskGenerationDelegate,
+        ruleInfo: [String],
+        commandLine: [String],
+        environment: EnvironmentBindings,
+        workingDirectory: Path? = nil,
+        inputs: [any PlannedNode],
+        outputs: [any PlannedNode],
+        dependencyData: DependencyDataStyle?,
+        execDescription: String,
+        showEnvironment: Bool,
+        alwaysExecuteTask: Bool,
+        enableSandboxing: Bool,
+        payload: (any TaskPayload)? = nil,
+        action: (any PlannedTaskAction)? = nil,
         repairViaOwnershipAnalysis: Bool = false
     ) {
         delegate.createTask(
-            type: self, dependencyData: dependencyData, payload: payload,
-            ruleInfo: ruleInfo, additionalSignatureData: "",
+            type: self,
+            dependencyData: dependencyData,
+            payload: payload,
+            ruleInfo: ruleInfo,
+            additionalSignatureData: "",
             commandLine: commandLine.map { ByteString(encodingAsUTF8: $0) },
-            additionalOutput: [], environment: environment,
+            additionalOutput: [],
+            environment: environment,
             workingDirectory: workingDirectory ?? cbc.producer.defaultWorkingDirectory,
-            inputs: inputs, outputs: outputs, mustPrecede: [],
-            action: action ?? delegate.taskActionCreationDelegate
+            inputs: inputs,
+            outputs: outputs,
+            mustPrecede: [],
+            action: action
+                ?? delegate.taskActionCreationDelegate
                 .createDeferredExecutionTaskActionIfRequested(
                     userPreferences: delegate.userPreferences
                 ),
             execDescription: execDescription,
             preparesForIndexing: cbc.preparesForIndexing,
             enableSandboxing: enableSandboxing,
-            llbuildControlDisabled: true, additionalTaskOrderingOptions: [],
-            alwaysExecuteTask: alwaysExecuteTask, showEnvironment: showEnvironment,
+            llbuildControlDisabled: true,
+            additionalTaskOrderingOptions: [],
+            alwaysExecuteTask: alwaysExecuteTask,
+            showEnvironment: showEnvironment,
             repairViaOwnershipAnalysis: repairViaOwnershipAnalysis
         )
     }
diff --git a/Sources/SWBCore/SpecImplementations/Tools/StripTool.swift b/Sources/SWBCore/SpecImplementations/Tools/StripTool.swift
index 0f4a556d..ed97774e 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/StripTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/StripTool.swift
@@ -13,7 +13,7 @@
 import SWBMacro
 import SWBUtil
 
-public final class StripToolSpec : GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
+public final class StripToolSpec: GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.build-tools.strip"
 
     /// Custom override to inject an appropriate output path.
diff --git a/Sources/SWBCore/SpecImplementations/Tools/SwiftABICheckerTool.swift b/Sources/SWBCore/SpecImplementations/Tools/SwiftABICheckerTool.swift
index 8ed1aebe..3605cce1 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/SwiftABICheckerTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/SwiftABICheckerTool.swift
@@ -13,7 +13,7 @@
 public import SWBUtil
 public import SWBMacro
 
-public final class SwiftABICheckerToolSpec : GenericCommandLineToolSpec, SpecIdentifierType, SwiftDiscoveredCommandLineToolSpecInfo, @unchecked Sendable {
+public final class SwiftABICheckerToolSpec: GenericCommandLineToolSpec, SpecIdentifierType, SwiftDiscoveredCommandLineToolSpecInfo, @unchecked Sendable {
     public static let identifier = "com.apple.build-tools.swift-abi-checker"
 
     override public func discoveredCommandLineToolSpecInfo(_ producer: any CommandProducer, _ scope: MacroEvaluationScope, _ delegate: any CoreClientTargetDiagnosticProducingDelegate) async -> (any DiscoveredCommandLineToolSpecInfo)? {
@@ -105,18 +105,20 @@ public final class SwiftABICheckerToolSpec : GenericCommandLineToolSpec, SpecIde
         for searchPath in SwiftCompilerSpec.collectInputSearchPaths(cbc, toolInfo: toolSpecInfo) {
             commandLine += ["-I", searchPath]
         }
-        delegate.createTask(type: self,
-                            payload: ABICheckerPayload(
-                                serializedDiagnosticsPath: serializedDiagsPath,
-                                downgradeErrors: downgradeErrors
-                            ),
-                            ruleInfo: defaultRuleInfo(cbc, delegate),
-                            commandLine: commandLine,
-                            environment: environmentFromSpec(cbc, delegate),
-                            workingDirectory: cbc.producer.defaultWorkingDirectory,
-                            inputs: allInputs,
-                            outputs: [delegate.createNode(cbc.output)],
-                            enableSandboxing: enableSandboxing)
+        delegate.createTask(
+            type: self,
+            payload: ABICheckerPayload(
+                serializedDiagnosticsPath: serializedDiagsPath,
+                downgradeErrors: downgradeErrors
+            ),
+            ruleInfo: defaultRuleInfo(cbc, delegate),
+            commandLine: commandLine,
+            environment: environmentFromSpec(cbc, delegate),
+            workingDirectory: cbc.producer.defaultWorkingDirectory,
+            inputs: allInputs,
+            outputs: [delegate.createNode(cbc.output)],
+            enableSandboxing: enableSandboxing
+        )
     }
 }
 
diff --git a/Sources/SWBCore/SpecImplementations/Tools/SwiftABIGenerationTool.swift b/Sources/SWBCore/SpecImplementations/Tools/SwiftABIGenerationTool.swift
index b8e47fd7..c12c4fba 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/SwiftABIGenerationTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/SwiftABIGenerationTool.swift
@@ -13,7 +13,7 @@
 public import SWBUtil
 public import SWBMacro
 
-public final class SwiftABIGenerationToolSpec : GenericCommandLineToolSpec, SpecIdentifierType, SwiftDiscoveredCommandLineToolSpecInfo, @unchecked Sendable {
+public final class SwiftABIGenerationToolSpec: GenericCommandLineToolSpec, SpecIdentifierType, SwiftDiscoveredCommandLineToolSpecInfo, @unchecked Sendable {
     public static let identifier = "com.apple.build-tools.swift-abi-generation"
 
     override public func discoveredCommandLineToolSpecInfo(_ producer: any CommandProducer, _ scope: MacroEvaluationScope, _ delegate: any CoreClientTargetDiagnosticProducingDelegate) async -> (any DiscoveredCommandLineToolSpecInfo)? {
@@ -53,13 +53,15 @@ public final class SwiftABIGenerationToolSpec : GenericCommandLineToolSpec, Spec
         for searchPath in SwiftCompilerSpec.collectInputSearchPaths(cbc, toolInfo: toolSpecInfo) {
             commandLine += ["-I", searchPath]
         }
-        delegate.createTask(type: self,
-                            ruleInfo: defaultRuleInfo(cbc, delegate),
-                            commandLine: commandLine,
-                            environment: environmentFromSpec(cbc, delegate),
-                            workingDirectory: cbc.producer.defaultWorkingDirectory,
-                            inputs: cbc.inputs.map { delegate.createNode($0.absolutePath) },
-                            outputs: [delegate.createNode(cbc.output)],
-                            enableSandboxing: enableSandboxing)
+        delegate.createTask(
+            type: self,
+            ruleInfo: defaultRuleInfo(cbc, delegate),
+            commandLine: commandLine,
+            environment: environmentFromSpec(cbc, delegate),
+            workingDirectory: cbc.producer.defaultWorkingDirectory,
+            inputs: cbc.inputs.map { delegate.createNode($0.absolutePath) },
+            outputs: [delegate.createNode(cbc.output)],
+            enableSandboxing: enableSandboxing
+        )
     }
 }
diff --git a/Sources/SWBCore/SpecImplementations/Tools/SwiftCompiler.swift b/Sources/SWBCore/SpecImplementations/Tools/SwiftCompiler.swift
index d9ed7ad7..9cb6fe61 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/SwiftCompiler.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/SwiftCompiler.swift
@@ -104,7 +104,7 @@ public struct SwiftSourceFileIndexingInfo: SourceFileIndexingInfo {
             result += ["-index-unit-output-path", indexOutputFile]
         }
         return result
-     }
+    }
     public var indexOutputFile: String? { outputFile.str }
     public var language: IndexingInfoLanguage? { .swift }
 
@@ -142,7 +142,7 @@ public struct SwiftSourceFileIndexingInfo: SourceFileIndexingInfo {
         "-emit-module-interface",
         "-emit-objc-header",
         "-lto=llvm-thin",
-        "-lto=llvm-full"
+        "-lto=llvm-full",
     ]
     private static let removeArgs: Set<ByteString> = [
         "-o",
@@ -153,11 +153,12 @@ public struct SwiftSourceFileIndexingInfo: SourceFileIndexingInfo {
         "-emit-module-interface-path",
         "-emit-private-module-interface-path",
         "-emit-package-module-interface-path",
-        "-emit-objc-header-path"
+        "-emit-objc-header-path",
     ]
     private static let removeFrontendArgs: Set<ByteString> = [
         "-experimental-skip-non-inlinable-function-bodies",
-        "-experimental-skip-all-function-bodies"]
+        "-experimental-skip-all-function-bodies",
+    ]
 
     // SourceKit uses the old driver to determine the frontend args. Remove all
     // new driver flags as a workaround for cases were corresponding no-op
@@ -174,7 +175,8 @@ public struct SwiftSourceFileIndexingInfo: SourceFileIndexingInfo {
         "-emit-module-separately-wmo",
         "-no-emit-module-separately-wmo",
         "-use-frontend-parseable-output",
-        "-emit-digester-baseline"]
+        "-emit-digester-baseline",
+    ]
     private static let newDriverArgs: Set<ByteString> = [
         "-emit-module-serialize-diagnostics-path",
         "-emit-module-dependencies-path",
@@ -182,7 +184,8 @@ public struct SwiftSourceFileIndexingInfo: SourceFileIndexingInfo {
         "-compare-to-baseline-path",
         "-serialize-breaking-changes-path",
         "-digester-breakage-allowlist-path",
-        "-digester-mode"]
+        "-digester-mode",
+    ]
 
     private static func indexingCommandLine(commandLine: [ByteString], payload: SwiftIndexingPayload, enableIndexBuildArena: Bool, integratedDriver: Bool) -> [ByteString] {
         precondition(!commandLine.isEmpty)
@@ -222,7 +225,8 @@ public struct SwiftSourceFileIndexingInfo: SourceFileIndexingInfo {
 
                 // <rdar://problem/23297285> Swift tests are not being discovered, XCTest framework from the project fails to import correctly
                 if !enableIndexBuildArena, UserDefaults.enableFixFor23297285,
-                   arg == "-I" || arg == "-F" {
+                    arg == "-I" || arg == "-F"
+                {
                     result.append(contentsOf: ["-Xcc", arg, "-Xcc", nextArg])
                 }
             }
@@ -263,7 +267,7 @@ public struct SwiftSourceFileIndexingInfo: SourceFileIndexingInfo {
         // FIXME: Convert to bytes.
         dict["LanguageDialect"] = PropertyListItem("swift")
         // FIXME: Convert to bytes.
-        dict["swiftASTCommandArguments"] = PropertyListItem(commandLine.map{ $0.asString })
+        dict["swiftASTCommandArguments"] = PropertyListItem(commandLine.map { $0.asString })
         dict["swiftASTBuiltProductsDir"] = PropertyListItem(builtProductsDir.str)
         dict["assetSymbolIndexPath"] = PropertyListItem(assetSymbolIndexPath.str)
         dict["toolchains"] = PropertyListItem(toolchains)
@@ -338,7 +342,7 @@ public struct SwiftLocalizationPayload: Serializable, Sendable {
         self.architecture = architecture
     }
 
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serializeAggregate(3) {
             serializer.serialize(effectivePlatformName)
             serializer.serialize(buildVariant)
@@ -420,7 +424,7 @@ public struct SwiftDriverPayload: Serializable, TaskPayload, Encodable {
         self.verifyScannerDependencies = try deserializer.deserialize()
     }
 
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serializeAggregate(19) {
             serializer.serialize(self.uniqueID)
             serializer.serialize(self.compilerLocation)
@@ -528,8 +532,8 @@ public final class SwiftCommandOutputParser: TaskOutputParser {
     enum MessageKind: String {
         case began
         case finished
-        case abnormal = "abnormal-exit" // Windows exceptions
-        case signalled // POSIX signals
+        case abnormal = "abnormal-exit"  // Windows exceptions
+        case signalled  // POSIX signals
         case skipped
     }
 
@@ -651,7 +655,7 @@ public final class SwiftCommandOutputParser: TaskOutputParser {
         // The encoding is an ASCII one:
         // <length>\n
         // <contents>\n
-        var slice = buffer[buffer.startIndex ..< buffer.endIndex]
+        var slice = buffer[buffer.startIndex..<buffer.endIndex]
         while !slice.isEmpty {
             // Get the end of the length.
             guard let lengthTerminator = slice.firstIndex(of: UInt8(ascii: "\n")) else {
@@ -659,14 +663,15 @@ public final class SwiftCommandOutputParser: TaskOutputParser {
             }
 
             // We expect the slice to be a single integer length followed by a newline.
-            guard let lengthString = String(bytes: slice[slice.startIndex ..< lengthTerminator], encoding: .utf8),
-                  let length = Int(lengthString) else {
+            guard let lengthString = String(bytes: slice[slice.startIndex..<lengthTerminator], encoding: .utf8),
+                let length = Int(lengthString)
+            else {
                 // Non-parseable chunks are *assumed* to be output, currently.
                 //
                 // This actually happens in practice in at least one case when the swiftc subprocess crashes.
                 let eol = slice.index(after: lengthTerminator)
-                delegate.emitOutput(ByteString(slice[slice.startIndex ..< eol]))
-                slice = slice[eol ..< slice.endIndex]
+                delegate.emitOutput(ByteString(slice[slice.startIndex..<eol]))
+                slice = slice[eol..<slice.endIndex]
                 continue
             }
 
@@ -678,10 +683,10 @@ public final class SwiftCommandOutputParser: TaskOutputParser {
             }
 
             // We found a message.
-            handleMessage(Array(slice[dataStart ..< dataEnd]))
+            handleMessage(Array(slice[dataStart..<dataEnd]))
 
             // Update the slice.
-            slice = slice[dataEnd ..< slice.endIndex]
+            slice = slice[dataEnd..<slice.endIndex]
         }
 
         // Update the buffer.
@@ -720,23 +725,23 @@ public final class SwiftCommandOutputParser: TaskOutputParser {
             let title: String
             switch name {
             case .compile:
-                title = onlyInput.map{ "Compile \($0.basename)" } ?? "Compile \(inputCount) Swift source files"
+                title = onlyInput.map { "Compile \($0.basename)" } ?? "Compile \(inputCount) Swift source files"
             case .backend:
-                title = onlyInput.map{ "Code Generation \($0.basename)" } ?? "Code Generation for Swift source files"
+                title = onlyInput.map { "Code Generation \($0.basename)" } ?? "Code Generation for Swift source files"
             case .mergeModule:
-                title = onlyInput.map{ "Merge \($0.basename)" } ?? "Merge swiftmodule"
+                title = onlyInput.map { "Merge \($0.basename)" } ?? "Merge swiftmodule"
             case .emitModule:
                 title = "Emit Swift module"
             case .compileModuleFromInterface:
                 title = "Compile Swift module interface"
             case .verifyEmittedModuleInterface, .legacyVerifyEmittedModuleInterface:
-                title = onlyInput.map{ "Verify \($0.basename)" } ?? "Verify swiftinterface"
+                title = onlyInput.map { "Verify \($0.basename)" } ?? "Verify swiftinterface"
             case .link:
                 title = "Link"
             case .generatePCH:
-                title = onlyInput.map{ "Precompile Bridging Header \($0.basename)" } ?? "Precompile bridging header"
+                title = onlyInput.map { "Precompile Bridging Header \($0.basename)" } ?? "Precompile bridging header"
             case .generatePCM:
-                title = onlyInput.map{ "Compile Clang module \($0.basename)" } ?? "Compile Clang module"
+                title = onlyInput.map { "Compile Clang module \($0.basename)" } ?? "Compile Clang module"
             case .generateDSYM:
                 title = "Generate dSYM"
             }
@@ -750,7 +755,7 @@ public final class SwiftCommandOutputParser: TaskOutputParser {
 
     /// Compute the rule info signature to use for this subtask.
     private func computeSubtaskSignatureName(_ name: String) -> String {
-       if let name = SubtaskName(rawValue: name) {
+        if let name = SubtaskName(rawValue: name) {
             switch name {
             case .compile:
                 return "CompileSwift"
@@ -788,7 +793,8 @@ public final class SwiftCommandOutputParser: TaskOutputParser {
         var result = [Path]()
         for item in outputContents {
             guard case let .plDict(contents) = item,
-                  case let .plString(itemType)? = contents["type"] else {
+                case let .plString(itemType)? = contents["type"]
+            else {
                 delegate.diagnosticsEngine.emit(data: DiagnosticData("invalid item in Swift parseable output message (\(item))"), behavior: .error)
                 return nil
             }
@@ -827,9 +833,7 @@ public final class SwiftCommandOutputParser: TaskOutputParser {
         if case let .plArray(inputContents)? = contents["inputs"] {
             var hadInput = false
             for case let .plString(value) in inputContents {
-                if value.hasSuffix(".swift") ||
-                   value.hasSuffix(".swiftinterface") ||
-                   value.hasSuffix(".modulemap") {
+                if value.hasSuffix(".swift") || value.hasSuffix(".swiftinterface") || value.hasSuffix(".modulemap") {
                     inputCount += 1
                     if !hadInput {
                         hadInput = true
@@ -851,7 +855,7 @@ public final class SwiftCommandOutputParser: TaskOutputParser {
                 return error("missing pid")
             }
             if subtasks[pid] != nil {
-                    return error("invalid pid \(pid) (already in use)")
+                return error("invalid pid \(pid) (already in use)")
             }
 
             // Compute the title.
@@ -880,7 +884,8 @@ public final class SwiftCommandOutputParser: TaskOutputParser {
                 additionalOutput: [],
                 interestingPath: onlyInput,
                 workingDirectory: workingDirectory,
-                serializedDiagnosticsPaths: serializedDiagnosticsPaths)
+                serializedDiagnosticsPaths: serializedDiagnosticsPaths
+            )
             subtasks[pid] = Subtask(pid: pid, serializedDiagnosticsPaths: serializedDiagnosticsPaths, delegate: subtaskDelegate)
 
             if subtaskName == .compile, !usingSwiftIntegratedDriver {
@@ -998,7 +1003,7 @@ public final class SwiftCommandOutputParser: TaskOutputParser {
 
 public struct SwiftBlocklists: Sendable {
 
-    public struct ExplicitModulesInfo : ProjectFailuresBlockList, Codable, Sendable {
+    public struct ExplicitModulesInfo: ProjectFailuresBlockList, Codable, Sendable {
         let KnownFailures: [String]
 
         enum CodingKeys: String, CodingKey {
@@ -1008,14 +1013,14 @@ public struct SwiftBlocklists: Sendable {
 
     var explicitModules: ExplicitModulesInfo? = nil
 
-    public struct InstallAPILazyTypecheckInfo : Codable, Sendable {
+    public struct InstallAPILazyTypecheckInfo: Codable, Sendable {
         /// A blocklist of module names that do not support the `SWIFT_INSTALLAPI_LAZY_TYPECHECK` build setting.
         let Modules: [String]
     }
 
     var installAPILazyTypecheck: InstallAPILazyTypecheckInfo? = nil
 
-    public struct CachingBlockList : ProjectFailuresBlockList, Codable, Sendable {
+    public struct CachingBlockList: ProjectFailuresBlockList, Codable, Sendable {
         let KnownFailures: [String]
 
         /// A blocklist of module names that do not support the `SWIFT_ENABLE_COMPILE_CACHE` build setting.
@@ -1024,7 +1029,7 @@ public struct SwiftBlocklists: Sendable {
 
     var caching: CachingBlockList? = nil
 
-    public struct LanguageFeatureEnablementInfo : Codable, Sendable {
+    public struct LanguageFeatureEnablementInfo: Codable, Sendable {
         public struct Feature: Codable, Sendable {
             public enum DiagnosticLevel: String, Codable, Sendable {
                 case ignore
@@ -1136,7 +1141,7 @@ public struct SwiftMacroImplementationDescriptor: Hashable, Comparable, Sendable
     }
 }
 
-public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDiscoveredCommandLineToolSpecInfo, @unchecked Sendable {
+public final class SwiftCompilerSpec: CompilerSpec, SpecIdentifierType, SwiftDiscoveredCommandLineToolSpecInfo, @unchecked Sendable {
     @_spi(Testing) public static let parallelismLevel = ProcessInfo.processInfo.activeProcessorCount
 
     public static let identifier = "com.apple.xcode.tools.swift.compiler"
@@ -1148,8 +1153,11 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
         return true
     }
 
-    fileprivate func getABIBaselinePath(_ scope: MacroEvaluationScope, _ delegate: any TaskGenerationDelegate,
-                                        _ mode: SwiftCompilationMode) -> Path? {
+    fileprivate func getABIBaselinePath(
+        _ scope: MacroEvaluationScope,
+        _ delegate: any TaskGenerationDelegate,
+        _ mode: SwiftCompilationMode
+    ) -> Path? {
         switch mode {
         case .api, .prepareForIndex:
             return nil
@@ -1398,14 +1406,13 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
         cbc.scope.evaluate(BuiltinMacros.COMPILER_WORKING_DIRECTORY).nilIfEmpty.map { Path($0) } ?? cbc.producer.defaultWorkingDirectory
     }
 
-    private func getExplicitModuleBlocklist(_ producer: any CommandProducer, _ scope: MacroEvaluationScope, _ delegate: any TaskGenerationDelegate) async ->  SwiftBlocklists.ExplicitModulesInfo? {
+    private func getExplicitModuleBlocklist(_ producer: any CommandProducer, _ scope: MacroEvaluationScope, _ delegate: any TaskGenerationDelegate) async -> SwiftBlocklists.ExplicitModulesInfo? {
         let specInfo = await (discoveredCommandLineToolSpecInfo(producer, scope, delegate) as? DiscoveredSwiftCompilerToolSpecInfo)
         return specInfo?.blocklists.explicitModules
     }
 
     func swiftExplicitModuleBuildEnabled(_ producer: any CommandProducer, _ scope: MacroEvaluationScope, _ delegate: any TaskGenerationDelegate) async -> Bool {
-        let buildSettingEnabled = scope.evaluate(BuiltinMacros.SWIFT_ENABLE_EXPLICIT_MODULES) == .enabled ||
-                                  scope.evaluate(BuiltinMacros._EXPERIMENTAL_SWIFT_EXPLICIT_MODULES) == .enabled
+        let buildSettingEnabled = scope.evaluate(BuiltinMacros.SWIFT_ENABLE_EXPLICIT_MODULES) == .enabled || scope.evaluate(BuiltinMacros._EXPERIMENTAL_SWIFT_EXPLICIT_MODULES) == .enabled
 
         // If this project is on the blocklist, override the blocklist default enable for it
         if let explicitModuleBlocklist = await getExplicitModuleBlocklist(producer, scope, delegate), explicitModuleBlocklist.isProjectListed(scope) {
@@ -1778,7 +1785,8 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                 if cbc.scope.evaluate(BuiltinMacros.SWIFT_ENABLE_INCREMENTAL_COMPILATION) {
                     args.append("-incremental")
                     if LibSwiftDriver.supportsDriverFlag(spelled: "-incremental-dependency-scan"),
-                       cbc.scope.evaluate(BuiltinMacros.SWIFT_ENABLE_INCREMENTAL_SCAN) {
+                        cbc.scope.evaluate(BuiltinMacros.SWIFT_ENABLE_INCREMENTAL_SCAN)
+                    {
                         args.append("-incremental-dependency-scan")
                     }
                 }
@@ -1800,8 +1808,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
             }
 
             var indexObjectFileDir: Path? = nil
-            if toolSpecInfo.toolFeatures.has(.indexUnitOutputPathWithoutWarning) ||
-                (toolSpecInfo.toolFeatures.has(.indexUnitOutputPath) && (args.contains("-index-store-path") || cbc.scope.evaluate(BuiltinMacros.INDEX_ENABLE_BUILD_ARENA))) {
+            if toolSpecInfo.toolFeatures.has(.indexUnitOutputPathWithoutWarning) || (toolSpecInfo.toolFeatures.has(.indexUnitOutputPath) && (args.contains("-index-store-path") || cbc.scope.evaluate(BuiltinMacros.INDEX_ENABLE_BUILD_ARENA))) {
                 // Unlike CCompiler, the index unit path remapping is actually added to the output file map. So even though both *arguments* are ignored when determining tasks to re-run, the file itself is hashed and that will cause rebuilds. Thus, always add the output path if Swift is new enough to not generate a warning if it isn't used.
                 let basePath = cbc.scope.evaluate(BuiltinMacros.OBJROOT)
                 if let newPath = generateIndexOutputPath(from: objectFileDir, basePath: basePath) {
@@ -1840,12 +1847,14 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                     args.append(contentsOf: ["-module-cache-path", explicitDependencyOutputPath.str])
                     let moduleCacheDir = cbc.scope.evaluate(BuiltinMacros.MODULE_CACHE_DIR)
                     if LibSwiftDriver.supportsDriverFlag(spelled: "-clang-scanner-module-cache-path"),
-                       !moduleCacheDir.isEmpty {
+                        !moduleCacheDir.isEmpty
+                    {
                         // Specify the Clang scanner cache separately as a shared cache among different projects
                         args.append(contentsOf: ["-clang-scanner-module-cache-path", moduleCacheDir.str])
                     }
                     if LibSwiftDriver.supportsDriverFlag(spelled: "-sdk-module-cache-path"),
-                       !moduleCacheDir.isEmpty {
+                        !moduleCacheDir.isEmpty
+                    {
                         args.append(contentsOf: ["-sdk-module-cache-path", moduleCacheDir.str])
                     }
                 }
@@ -1870,7 +1879,8 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                     }
                     // If the integrated cache queries is enabled, the remote service is handled by build system and no need to pass to compiler
                     if !casOpts.enableIntegratedCacheQueries && casOpts.hasRemoteCache,
-                       let remoteService = casOpts.remoteServicePath {
+                        let remoteService = casOpts.remoteServicePath
+                    {
                         args += ["-cas-plugin-option", "remote-service-path=" + remoteService.str]
                     }
                 }
@@ -1930,12 +1940,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
             let sourceInfoPath = Path(moduleFilePath.withoutSuffix + ".swiftsourceinfo")
             moduleOutputPaths.append(sourceInfoPath)
             let usingLegacyDriver = cbc.scope.evaluate(BuiltinMacros.OTHER_SWIFT_FLAGS).contains("-disallow-use-new-driver")
-            let abiDescriptorPath: Path? = !usingLegacyDriver &&
-                cbc.producer.isApplePlatform &&
-                toolSpecInfo.toolFeatures.has(.emitABIDescriptor) &&
-                compilationMode.canEmitABIDescriptor &&
-                cbc.scope.evaluate(BuiltinMacros.SWIFT_INSTALL_MODULE_ABI_DESCRIPTOR) ?
-                  Path(moduleFilePath.withoutSuffix + ".abi.json") : nil
+            let abiDescriptorPath: Path? = !usingLegacyDriver && cbc.producer.isApplePlatform && toolSpecInfo.toolFeatures.has(.emitABIDescriptor) && compilationMode.canEmitABIDescriptor && cbc.scope.evaluate(BuiltinMacros.SWIFT_INSTALL_MODULE_ABI_DESCRIPTOR) ? Path(moduleFilePath.withoutSuffix + ".abi.json") : nil
             if let abiDescriptorPath {
                 moduleOutputPaths.append(abiDescriptorPath)
             }
@@ -1961,8 +1966,9 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                     let packageName = cbc.scope.evaluate(BuiltinMacros.SWIFT_PACKAGE_NAME)
                     let emitPackageInterfacePath = "-emit-package-module-interface-path"
                     if !packageName.isEmpty,
-                       toolSpecInfo.toolFeatures.has(.emitPackageModuleInterfacePath),
-                       LibSwiftDriver.supportsDriverFlag(spelled: emitPackageInterfacePath) {
+                        toolSpecInfo.toolFeatures.has(.emitPackageModuleInterfacePath),
+                        LibSwiftDriver.supportsDriverFlag(spelled: emitPackageInterfacePath)
+                    {
                         let path = Path(moduleFilePath.withoutSuffix + ".package.swiftinterface")
                         packageModuleInterfaceFilePath = path
                         args += [emitPackageInterfacePath, path.str]
@@ -1971,8 +1977,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                         packageModuleInterfaceFilePath = nil
                     }
                 }
-            }
-            else {
+            } else {
                 moduleInterfaceFilePath = nil
                 privateModuleInterfaceFilePath = nil
                 packageModuleInterfaceFilePath = nil
@@ -1985,19 +1990,22 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
 
             let buildSessionFile = cbc.scope.evaluate(BuiltinMacros.CLANG_MODULES_BUILD_SESSION_FILE)
             if !buildSessionFile.isEmpty,
-               integratedDriverEnabled(scope: cbc.scope),
-               LibSwiftDriver.supportsDriverFlag(spelled: "-validate-clang-modules-once") && LibSwiftDriver.supportsDriverFlag(spelled: "-clang-build-session-file"),
-               cbc.scope.evaluate(BuiltinMacros.SWIFT_VALIDATE_CLANG_MODULES_ONCE_PER_BUILD_SESSION) {
+                integratedDriverEnabled(scope: cbc.scope),
+                LibSwiftDriver.supportsDriverFlag(spelled: "-validate-clang-modules-once") && LibSwiftDriver.supportsDriverFlag(spelled: "-clang-build-session-file"),
+                cbc.scope.evaluate(BuiltinMacros.SWIFT_VALIDATE_CLANG_MODULES_ONCE_PER_BUILD_SESSION)
+            {
                 args += ["-validate-clang-modules-once", "-clang-build-session-file", buildSessionFile]
             }
 
             if toolSpecInfo.toolFeatures.has(.libraryLevel),
-               let libraryLevel = cbc.scope.evaluateAsString(BuiltinMacros.SWIFT_LIBRARY_LEVEL).nilIfEmpty {
+                let libraryLevel = cbc.scope.evaluateAsString(BuiltinMacros.SWIFT_LIBRARY_LEVEL).nilIfEmpty
+            {
                 args += ["-library-level", libraryLevel]
             }
 
             if toolSpecInfo.toolFeatures.has(.packageName),
-               let packageName = cbc.scope.evaluate(BuiltinMacros.SWIFT_PACKAGE_NAME).nilIfEmpty {
+                let packageName = cbc.scope.evaluate(BuiltinMacros.SWIFT_PACKAGE_NAME).nilIfEmpty
+            {
                 args += ["-package-name", packageName]
             }
 
@@ -2016,8 +2024,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                     // FIXME: Separate -I and its argument.
                     args += ["-Xcc", "-I" + overridesHeadermapPath.str]
                 }
-            }
-            else {
+            } else {
                 objcHeaderFilePath = nil
             }
 
@@ -2037,10 +2044,18 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                     delegate.error(error)
                     return
                 }
-                cbc.producer.writeFileSpec.constructFileTasks(CommandBuildContext(producer: cbc.producer, scope: cbc.scope, inputs: [], output: protocolListPath),
-                                                              delegate, contents: protocolListContents, permissions: nil, preparesForIndexing: true, additionalTaskOrderingOptions: [.immediate, .ignorePhaseOrdering])
-                args += ["-Xfrontend", "-const-gather-protocols-file",
-                         "-Xfrontend", protocolListPath.str]
+                cbc.producer.writeFileSpec.constructFileTasks(
+                    CommandBuildContext(producer: cbc.producer, scope: cbc.scope, inputs: [], output: protocolListPath),
+                    delegate,
+                    contents: protocolListContents,
+                    permissions: nil,
+                    preparesForIndexing: true,
+                    additionalTaskOrderingOptions: [.immediate, .ignorePhaseOrdering]
+                )
+                args += [
+                    "-Xfrontend", "-const-gather-protocols-file",
+                    "-Xfrontend", protocolListPath.str,
+                ]
                 extraInputPaths.append(protocolListPath)
             }
 
@@ -2097,14 +2112,16 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
             let objcBridgingHeaderPath = Path(cbc.scope.evaluate(BuiltinMacros.SWIFT_OBJC_BRIDGING_HEADER))
             if !objcBridgingHeaderPath.isEmpty {
                 let objcBridgingHeaderNode = delegate.createNode(objcBridgingHeaderPath)
-                let flag = cbc.scope.evaluate(BuiltinMacros.SWIFT_BRIDGING_HEADER_IS_INTERNAL)
+                let flag =
+                    cbc.scope.evaluate(BuiltinMacros.SWIFT_BRIDGING_HEADER_IS_INTERNAL)
                     ? "-internal-import-bridging-header"
                     : "-import-objc-header"
                 args += [flag, objcBridgingHeaderNode.path.normalize().str]
                 extraInputPaths.append(objcBridgingHeaderPath)
                 let precompsPath = cbc.scope.evaluate(BuiltinMacros.SHARED_PRECOMPS_DIR)
                 if !precompsPath.isEmpty,
-                   !explicitModuleBuildEnabled {
+                    !explicitModuleBuildEnabled
+                {
                     args += ["-pch-output-dir", precompsPath.str]
                 }
             }
@@ -2141,7 +2158,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                     "-Xfrontend", "-enable-implicit-dynamic",
                     "-Xfrontend", "-enable-private-imports",
                     "-Xfrontend", "-enable-dynamic-replacement-chaining",
-                    "-Xfrontend", "-disable-previous-implementation-calls-in-dynamic-replacements"
+                    "-Xfrontend", "-disable-previous-implementation-calls-in-dynamic-replacements",
                 ])
             }
 
@@ -2188,8 +2205,14 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                     inputs.append(input.absolutePath)
 
                     // Compute and add the output object file path.
-                    outputs.append(SwiftCompilerSpec.objectFileDirOutput(input: input, moduleBaseNameSuffix: compilationMode.moduleBaseNameSuffix,
-                                                                         objectFileDir: objectFileDir, fileExtension: ".\(outputObjectExtension)"))
+                    outputs.append(
+                        SwiftCompilerSpec.objectFileDirOutput(
+                            input: input,
+                            moduleBaseNameSuffix: compilationMode.moduleBaseNameSuffix,
+                            objectFileDir: objectFileDir,
+                            fileExtension: ".\(outputObjectExtension)"
+                        )
+                    )
                 }
                 return (inputs, outputs)
             }()
@@ -2208,8 +2231,12 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                     // Otherwise, there will be a const metadata file per-input (per-object-file-output)
                     for input in cbc.inputs {
                         // Compute and add the output supplementary const metadata file path.
-                        let supplementaryConstMetadataOutputPath = SwiftCompilerSpec.objectFileDirOutput(input: input, moduleBaseNameSuffix: compilationMode.moduleBaseNameSuffix,
-                                                                                                         objectFileDir: objectFileDir, fileExtension: ".swiftconstvalues")
+                        let supplementaryConstMetadataOutputPath = SwiftCompilerSpec.objectFileDirOutput(
+                            input: input,
+                            moduleBaseNameSuffix: compilationMode.moduleBaseNameSuffix,
+                            objectFileDir: objectFileDir,
+                            fileExtension: ".swiftconstvalues"
+                        )
                         extraOutputPaths.append(supplementaryConstMetadataOutputPath)
                         delegate.declareGeneratedSwiftConstMetadataFile(supplementaryConstMetadataOutputPath, architecture: arch)
                     }
@@ -2250,14 +2277,15 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
             let additionalSignatureData = "SWIFTC: \(toolSpecInfo.swiftTag)"
             let environmentBindings = EnvironmentBindings(environment)
 
-            let indexingInputReplacements = Dictionary(uniqueKeysWithValues: cbc.inputs.compactMap { ftb -> (Path, Path)? in
-                if let repl = ftb.indexingInputReplacement {
-                    return (ftb.absolutePath, repl)
-                }
-                else {
-                    return nil
+            let indexingInputReplacements = Dictionary(
+                uniqueKeysWithValues: cbc.inputs.compactMap { ftb -> (Path, Path)? in
+                    if let repl = ftb.indexingInputReplacement {
+                        return (ftb.absolutePath, repl)
+                    } else {
+                        return nil
+                    }
                 }
-            })
+            )
 
             let dependencyInfoPath: Path? = await {
                 guard await shouldEmitMakeStyleDependencies(cbc.producer, cbc.scope, delegate: delegate) else {
@@ -2303,9 +2331,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
             // 1. The platform must require it
             // 2. We must be compiling with debug info
             // 3. We must be emitting a module separately
-            if cbc.scope.evaluate(BuiltinMacros.PLATFORM_REQUIRES_SWIFT_MODULEWRAP) &&
-                cbc.scope.evaluate(BuiltinMacros.GCC_GENERATE_DEBUGGING_SYMBOLS) &&
-                emittingModuleSeparately {
+            if cbc.scope.evaluate(BuiltinMacros.PLATFORM_REQUIRES_SWIFT_MODULEWRAP) && cbc.scope.evaluate(BuiltinMacros.GCC_GENERATE_DEBUGGING_SYMBOLS) && emittingModuleSeparately {
                 let moduleWrapOutput = Path(moduleFilePath.withoutSuffix + ".o")
                 moduleOutputPaths.append(moduleWrapOutput)
             }
@@ -2331,7 +2357,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                 rule + [
                     variant,
                     arch + compilationMode.moduleBaseNameSuffix,
-                    self.identifier
+                    self.identifier,
                 ]
             }
 
@@ -2346,7 +2372,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                         cbc.scope.evaluate(BuiltinMacros.ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOL_INDEX_PATH)
                     ),
                     objectFileDir: indexObjectFileDir ?? objectFileDir,
-                    toolchains: cbc.producer.toolchains.map{ $0.identifier }
+                    toolchains: cbc.producer.toolchains.map { $0.identifier }
                 ),
                 previewPayload: previewPayload,
                 localizationPayload: localizationPayload,
@@ -2470,13 +2496,13 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                     // `fileSuffix` would only return .swiftinterface in this case.
                     let privateModuleInterfaceSuffix = ".private.swiftinterface"
                     if input.matchesFilenamePattern("*" + privateModuleInterfaceSuffix) {
-                      inputFileSuffix = privateModuleInterfaceSuffix
+                        inputFileSuffix = privateModuleInterfaceSuffix
                     }
 
                     // Check for .package.swiftinterface suffix of package module interfaces.
                     let packageModuleInterfaceSuffix = ".package.swiftinterface"
                     if input.matchesFilenamePattern("*" + packageModuleInterfaceSuffix) {
-                      inputFileSuffix = packageModuleInterfaceSuffix
+                        inputFileSuffix = packageModuleInterfaceSuffix
                     }
 
                     // Check for the longer suffix of abi descriptor.
@@ -2552,13 +2578,13 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
             let compilerLocation: LibSwiftDriver.CompilerLocation
 
             #if os(macOS) || !canImport(Darwin)
-            compilerLocation = .path(swiftc)
+                compilerLocation = .path(swiftc)
             #else
-            guard let libSwiftScanPath = cbc.producer.toolchains.map({ $0.path.join("usr/lib/swift/host/lib_InternalSwiftScan.dylib") }).first(where: { localFS.exists($0) }) else {
-                delegate.error("Could not find lib_InternalSwiftScan.dylib in toolchain")
-                return nil
-            }
-            compilerLocation = .library(libSwiftScanPath: libSwiftScanPath)
+                guard let libSwiftScanPath = cbc.producer.toolchains.map({ $0.path.join("usr/lib/swift/host/lib_InternalSwiftScan.dylib") }).first(where: { localFS.exists($0) }) else {
+                    delegate.error("Could not find lib_InternalSwiftScan.dylib in toolchain")
+                    return nil
+                }
+                compilerLocation = .library(libSwiftScanPath: libSwiftScanPath)
             #endif
             let explicitModuleBuildEnabled = await swiftExplicitModuleBuildEnabled(cbc.producer, cbc.scope, delegate)
             let verifyScannerDependencies = explicitModuleBuildEnabled && cbc.scope.evaluate(BuiltinMacros.SWIFT_DEPENDENCY_REGISTRATION_MODE) == .verifySwiftDependencyScanner
@@ -2676,7 +2702,8 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
             await constructSwiftCompilationTasks(
                 compilationMode: .generateModule(triplePlatform: triplePlatform, tripleSuffix: tripleSuffix, moduleOnly: moduleOnly),
                 inputMode: inputMode,
-                lookup: chainLookup)
+                lookup: chainLookup
+            )
         }
 
         let hasEnabledIndexBuildArena = cbc.scope.evaluate(BuiltinMacros.INDEX_ENABLE_BUILD_ARENA)
@@ -2708,7 +2735,8 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                 case BuiltinMacros.DEPLOYMENT_TARGET_SETTING_NAME:
                     if cbc.producer.sdkVariant?.isMacCatalyst == true {
                         return cbc.scope.namespace.parseString(
-                            BuildVersion.Platform.macCatalyst.deploymentTargetSettingName(infoLookup: cbc.producer))
+                            BuildVersion.Platform.macCatalyst.deploymentTargetSettingName(infoLookup: cbc.producer)
+                        )
                     }
                     return nil
                 default:
@@ -2727,7 +2755,8 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                 await constructSwiftCompilationTasks(
                     compilationMode: .generateModule(triplePlatform: triplePlatform, tripleSuffix: tripleSuffix, moduleOnly: true),
                     inputMode: inputMode,
-                    lookup: chainLookup)
+                    lookup: chainLookup
+                )
             }
 
             // Don't pass the module-only flag to the zippered variant if we passed it to the main variant above, because we don't want to create generated Objective-C headers from that task. It's unnecessary because zippering can't be distinguished at the API level, and would result in duplicate tasks creating the header file anyways.
@@ -2747,8 +2776,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                 return
             }
             compilationMode = .api
-        }
-        else {
+        } else {
             compilationMode = .compile
         }
         await constructSwiftCompilationTasks(compilationMode: compilationMode, inputMode: inputMode)
@@ -2850,7 +2878,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
 
         // Check if there should be an additional main symbol graph file for the zippered variant in this sub scope.
         if cbc.producer.platform?.familyName == "macOS", cbc.scope.evaluate(BuiltinMacros.IS_ZIPPERED),
-           let (_, triplePlatform, tripleSuffix) = zipperedSwiftModuleInfo(cbc.producer, arch: cbc.scope.evaluate(BuiltinMacros.CURRENT_ARCH))
+            let (_, triplePlatform, tripleSuffix) = zipperedSwiftModuleInfo(cbc.producer, arch: cbc.scope.evaluate(BuiltinMacros.CURRENT_ARCH))
         {
             paths.append(getMainSymbolGraphFile(cbc.scope, .generateModule(triplePlatform: triplePlatform, tripleSuffix: tripleSuffix, moduleOnly: false)))
         }
@@ -2940,9 +2968,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
     public static func shouldUseWholeModuleOptimization(for scope: MacroEvaluationScope) -> (result: Bool, isExplicitlyEnabled: Bool) {
         let isForAPI = scope.evaluate(BuiltinMacros.INSTALLAPI_MODE_ENABLED)
         let isExplicitlyEnabled =
-            scope.evaluate(BuiltinMacros.SWIFT_WHOLE_MODULE_OPTIMIZATION) ||
-            (scope.evaluate(BuiltinMacros.SWIFT_COMPILATION_MODE) == "wholemodule") ||
-            (scope.evaluate(BuiltinMacros.SWIFT_OPTIMIZATION_LEVEL) == "-Owholemodule")
+            scope.evaluate(BuiltinMacros.SWIFT_WHOLE_MODULE_OPTIMIZATION) || (scope.evaluate(BuiltinMacros.SWIFT_COMPILATION_MODE) == "wholemodule") || (scope.evaluate(BuiltinMacros.SWIFT_OPTIMIZATION_LEVEL) == "-Owholemodule")
         let isEnabled = isExplicitlyEnabled || isForAPI
         return (isEnabled, isExplicitlyEnabled)
     }
@@ -2979,7 +3005,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
         // Compute the executable path.
         let swiftc = swiftToolSpec.toolPath
 
-        var args:  [[String]] = []
+        var args: [[String]] = []
         var inputPaths: [Path] = []
         if !forTAPI {
             // TAPI can't use all of the additional linker options, and its spec has all of the build setting/option arguments that it can use.
@@ -3001,17 +3027,27 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
         if swiftLibraryPath.isEmpty {
             // Look next to the compiler and in the toolchains for one.
             if shouldStaticLinkStdlib {
-                swiftLibraryPath = findSearchPathForLibrary(executablePath: swiftc, possibleNames: [
-                        "swift_static/\(platformName)/lib\(swiftStdlibName).a",
-                        "swift_static/lib\(swiftStdlibName).a",
-                        "lib\(swiftStdlibName).a",
-                    ], toolchains: producer.toolchains) ?? Path("")
+                swiftLibraryPath =
+                    findSearchPathForLibrary(
+                        executablePath: swiftc,
+                        possibleNames: [
+                            "swift_static/\(platformName)/lib\(swiftStdlibName).a",
+                            "swift_static/lib\(swiftStdlibName).a",
+                            "lib\(swiftStdlibName).a",
+                        ],
+                        toolchains: producer.toolchains
+                    ) ?? Path("")
             } else {
-                swiftLibraryPath = findSearchPathForLibrary(executablePath: swiftc, possibleNames: [
-                        "swift/\(platformName)/lib\(swiftStdlibName).\(dynamicLibraryExtension)",
-                        "swift/lib\(swiftStdlibName).\(dynamicLibraryExtension)",
-                        "lib\(swiftStdlibName).\(dynamicLibraryExtension)",
-                    ], toolchains: producer.toolchains) ?? Path("")
+                swiftLibraryPath =
+                    findSearchPathForLibrary(
+                        executablePath: swiftc,
+                        possibleNames: [
+                            "swift/\(platformName)/lib\(swiftStdlibName).\(dynamicLibraryExtension)",
+                            "swift/lib\(swiftStdlibName).\(dynamicLibraryExtension)",
+                            "lib\(swiftStdlibName).\(dynamicLibraryExtension)",
+                        ],
+                        toolchains: producer.toolchains
+                    ) ?? Path("")
             }
         }
 
@@ -3103,8 +3139,13 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
     }
 
     private static func objectFileDirOutput(input: FileToBuild, moduleBaseNameSuffix: String, objectFileDir: Path, fileExtension: String) -> Path {
-        return objectFileDirOutput(inputPath: input.absolutePath, moduleBaseNameSuffix: moduleBaseNameSuffix,
-                                   uniquingSuffix: input.uniquingSuffix, objectFileDir: objectFileDir, fileExtension: fileExtension)
+        return objectFileDirOutput(
+            inputPath: input.absolutePath,
+            moduleBaseNameSuffix: moduleBaseNameSuffix,
+            uniquingSuffix: input.uniquingSuffix,
+            objectFileDir: objectFileDir,
+            fileExtension: fileExtension
+        )
     }
 
     /// Generate the Swift output file map.
@@ -3137,7 +3178,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
             return (objectFilePath, fileMapEntry)
         }
 
-           // Add entries to the map indicating where to find the files the compiler generates.
+        // Add entries to the map indicating where to find the files the compiler generates.
         if !isUsingWholeModuleOptimization {
             // If we're not using WMO at all, then we produce an entry in the output file map for each file.
             for input in cbc.inputs {
@@ -3201,8 +3242,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                 // Add the global entry to the map.
                 mapDict[""] = fileMapEntry
             }
-        }
-        else {
+        } else {
             // If we are using WMO, then we still generate entries for each file, but several files move to the global map since the source files aren't processed individually.
             for input in cbc.inputs {
                 mapDict[input.absolutePath.str] = createCommonFileEntry(input: input).fileMapEntry
@@ -3225,7 +3265,6 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                     let emitModuleDependenciesFilePath = objectFileDir.join(primarySwiftBaseName + "-emit-module.d")
                     fileMapEntry.emitModuleDependencies = emitModuleDependenciesFilePath.str
 
-
                     // The dependencies file, used to discover implicit dependencies.  This file will be in Makefile format.
                     let dependenciesFilePath = objectFileDir.join(primarySwiftBaseName + ".d")
                     fileMapEntry.dependencies = dependenciesFilePath.str
@@ -3280,8 +3319,13 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
             let inputReplacementPath = payload.indexingPayload.inputReplacements[inputPath] ?? inputPath
             guard input.requestedSourceFiles.contains(inputReplacementPath) else { return nil }
             // FIXME: <rdar://problem/41060621> Getting the right uniquingSuffix requires having a FileToBuild, which we don't have here.  I'm not sure whether ExecutableTask has enough information to be able to get the correct path to the output file when there are multiple input files with the same base name.
-            let outputFile = SwiftCompilerSpec.objectFileDirOutput(inputPath: inputPath, moduleBaseNameSuffix: "", uniquingSuffix: "",
-                                                                   objectFileDir: payload.indexingPayload.objectFileDir, fileExtension: ".o")
+            let outputFile = SwiftCompilerSpec.objectFileDirOutput(
+                inputPath: inputPath,
+                moduleBaseNameSuffix: "",
+                uniquingSuffix: "",
+                objectFileDir: payload.indexingPayload.objectFileDir,
+                fileExtension: ".o"
+            )
             let indexingInfo: any SourceFileIndexingInfo
             if input.outputPathOnly {
                 indexingInfo = OutputPathIndexingInfo(outputFile: outputFile, language: .swift)
@@ -3405,7 +3449,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                 "-explicit-module-build",
 
                 // Strip until builder SDKs include a swift-driver with this flag. Do not remove without also removing -clang-build-session-file.
-                "-validate-clang-modules-once"
+                "-validate-clang-modules-once",
             ] {
                 while let index = commandLine.firstIndex(of: arg) {
                     commandLine.remove(at: index)
@@ -3418,7 +3462,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
             let argPrefix = "-Xfrontend"
             while let index = commandLine.firstIndex(of: arg) {
                 guard index > 0, commandLine[index - 1] == argPrefix else { break }
-                commandLine.removeSubrange(index - 1 ... index)
+                commandLine.removeSubrange(index - 1...index)
             }
         }
 
@@ -3430,7 +3474,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                 "-enable-implicit-dynamic",
                 "-enable-dynamic-replacement-chaining",
                 "-enable-private-imports",
-                "-disable-previous-implementation-calls-in-dynamic-replacements"
+                "-disable-previous-implementation-calls-in-dynamic-replacements",
             ] {
                 removeWithPrefix(arg)
             }
@@ -3440,7 +3484,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
         func removeWithParameter(_ arg: String) {
             while let index = commandLine.firstIndex(of: arg) {
                 guard index + 1 < commandLine.count else { break }
-                commandLine.removeSubrange(index ... index + 1)
+                commandLine.removeSubrange(index...index + 1)
             }
         }
         for arg in [
@@ -3494,12 +3538,12 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
             let argPrefix = "-Xfrontend"
             while let index = commandLine.firstIndex(of: arg) {
                 guard index > 0, commandLine[index - 1] == argPrefix else { break }
-                commandLine.removeSubrange(index - 1 ... index + 2)
+                commandLine.removeSubrange(index - 1...index + 2)
             }
         }
         for arg in [
             // Stripped because they emit sidecar data that Previews does not need.
-            "-const-gather-protocols-file",
+            "-const-gather-protocols-file"
         ] {
             removeWithPrefixAndParameter(arg)
         }
@@ -3534,8 +3578,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
             } else {
                 newVFSOverlayPath = nil
             }
-        }
-        else {
+        } else {
             selectedInputPath = inputPath
             newVFSOverlayPath = nil
             commandLine.append(contentsOf: [inputPath.str])
@@ -3558,7 +3601,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
             commandLine.append(contentsOf: [
                 "-Xfrontend",
                 "-disable-modules-validate-system-headers",
-                ])
+            ])
         }
 
         // For XOJIT previews, we want the frontend (`swift-frontend`) invocation rather than the driver (`swiftc`) invocation, so ask libSwiftDriver for it and replace the command line with the result for propagation back to the request.
@@ -3610,9 +3653,9 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
             // The driver may have emitted an error even if it returned us a command line. In this case, don't return the command line since it likely won't work.
             if commandLine.isEmpty || outputDelegate.engine.hasErrors {
                 #if canImport(os)
-                for diagnostic in outputDelegate.engine.diagnostics.filter({ $0.behavior == .error }) {
-                    OSLog.log("Swift driver preview info error: \(diagnostic.data.description)")
-                }
+                    for diagnostic in outputDelegate.engine.diagnostics.filter({ $0.behavior == .error }) {
+                        OSLog.log("Swift driver preview info error: \(diagnostic.data.description)")
+                    }
                 #endif
                 return []
             }
@@ -3643,19 +3686,21 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
             return []
         }
 
-        return [TaskGenerateLocalizationInfoOutput(producedStringsdataPaths: [
-            LocalizationBuildPortion(effectivePlatformName: localizationPayload.effectivePlatformName, variant: localizationPayload.buildVariant, architecture: localizationPayload.architecture): stringsdataPaths
-        ])]
+        return [
+            TaskGenerateLocalizationInfoOutput(producedStringsdataPaths: [
+                LocalizationBuildPortion(effectivePlatformName: localizationPayload.effectivePlatformName, variant: localizationPayload.buildVariant, architecture: localizationPayload.architecture): stringsdataPaths
+            ])
+        ]
     }
 
     /// Define the custom output parser.
     public override func customOutputParserType(for task: any ExecutableTask) -> (any TaskOutputParser.Type)? {
         switch task.ruleInfo.first {
         case "CompileSwiftSources",
-             "GenerateSwiftModule":
-                return SwiftCommandOutputParser.self
+            "GenerateSwiftModule":
+            return SwiftCommandOutputParser.self
         default:
-                return nil
+            return nil
         }
     }
 
@@ -3687,75 +3732,79 @@ extension SwiftCompilerSpec {
 ///
 /// This is global and public because it is used by `SWBTaskExecution` and `CoreBasedTests`, which is the basis of many of our tests (so caching this info across tests is desirable), and which is used in some performance tests.  If we discover that the info for a compiler at a given path can change during an instance of Swift Build (e.g., if a downloadable toolchain can replace an existing compiler) then this may need to be revisited.
 public func discoveredSwiftCompilerInfo(_ producer: any CommandProducer, _ delegate: any CoreClientTargetDiagnosticProducingDelegate, at toolPath: Path, blocklistsPathOverride: Path?) async throws -> DiscoveredSwiftCompilerToolSpecInfo {
-    try await producer.discoveredCommandLineToolSpecInfo(delegate, nil, [toolPath.str, "--version"], { executionResult in
-        let outputString = String(decoding: executionResult.stdout, as: UTF8.self)
-
-        // Values we will parse.  If we end up not parsing any values, then we return an empty info struct.
-        var swiftVersion: Version? = nil
-        var swiftTag: String? = nil
-        var swiftABIVersion: String? = nil
-
-        let versionRegex = #/Swift version (?<swiftVersion>[\d.]+).*\((?<swiftTag>.*)\)/#
-        let abiVersionRegex = #/ABI version: (?<abiVersion>[\d.]+)/#
-
-        // Iterate over each line and add any discovered info to the info object.
-        for line in outputString.components(separatedBy: "\n") {
-            if swiftVersion == nil {
-                if let groups = try versionRegex.firstMatch(in: line) {
-                    swiftVersion = try? Version(String(groups.output.swiftVersion))
-                    swiftTag = String(groups.output.swiftTag)
+    try await producer.discoveredCommandLineToolSpecInfo(
+        delegate,
+        nil,
+        [toolPath.str, "--version"],
+        { executionResult in
+            let outputString = String(decoding: executionResult.stdout, as: UTF8.self)
+
+            // Values we will parse.  If we end up not parsing any values, then we return an empty info struct.
+            var swiftVersion: Version? = nil
+            var swiftTag: String? = nil
+            var swiftABIVersion: String? = nil
+
+            let versionRegex = #/Swift version (?<swiftVersion>[\d.]+).*\((?<swiftTag>.*)\)/#
+            let abiVersionRegex = #/ABI version: (?<abiVersion>[\d.]+)/#
+
+            // Iterate over each line and add any discovered info to the info object.
+            for line in outputString.components(separatedBy: "\n") {
+                if swiftVersion == nil {
+                    if let groups = try versionRegex.firstMatch(in: line) {
+                        swiftVersion = try? Version(String(groups.output.swiftVersion))
+                        swiftTag = String(groups.output.swiftTag)
+                    }
                 }
-            }
-            if swiftABIVersion == nil {
-                if let groups = try abiVersionRegex.firstMatch(in: line) {
-                    swiftABIVersion = groups.output.abiVersion.trimmingCharacters(in: .whitespaces)
+                if swiftABIVersion == nil {
+                    if let groups = try abiVersionRegex.firstMatch(in: line) {
+                        swiftABIVersion = groups.output.abiVersion.trimmingCharacters(in: .whitespaces)
+                    }
                 }
             }
-        }
 
-        guard let swiftVersion, let swiftTag else {
-            throw StubError.error("Could not parse Swift versions from: \(outputString)")
-        }
+            guard let swiftVersion, let swiftTag else {
+                throw StubError.error("Could not parse Swift versions from: \(outputString)")
+            }
 
-        func getFeatures(at toolPath: Path) -> ToolFeatures<DiscoveredSwiftCompilerToolSpecInfo.FeatureFlag> {
-            let featuresPath = toolPath.dirname.dirname.join("share").join("swift").join("features.json")
-            do {
-                let features: ToolFeatures<DiscoveredSwiftCompilerToolSpecInfo.FeatureFlag> = try .init(path: featuresPath, fs: localFS)
-                if features.has(.experimentalAllowModuleWithCompilerErrors) {
-                    // FIXME: Need to add this flag into Swift's features.json
-                    return .init(features.flags.union([.vfsDirectoryRemap]))
+            func getFeatures(at toolPath: Path) -> ToolFeatures<DiscoveredSwiftCompilerToolSpecInfo.FeatureFlag> {
+                let featuresPath = toolPath.dirname.dirname.join("share").join("swift").join("features.json")
+                do {
+                    let features: ToolFeatures<DiscoveredSwiftCompilerToolSpecInfo.FeatureFlag> = try .init(path: featuresPath, fs: localFS)
+                    if features.has(.experimentalAllowModuleWithCompilerErrors) {
+                        // FIXME: Need to add this flag into Swift's features.json
+                        return .init(features.flags.union([.vfsDirectoryRemap]))
+                    }
+                    return features
+                } catch {
+                    // FIXME: Consider about reporting this as error, lest users silently get surprising behavior if we fail to read the features file for any reason.
+                    return ToolFeatures.none
                 }
-                return features
-            } catch {
-                // FIXME: Consider about reporting this as error, lest users silently get surprising behavior if we fail to read the features file for any reason.
-                return ToolFeatures.none
             }
-        }
 
-        let blocklistPaths = CompilerSpec.findToolchainBlocklists(producer, directoryOverride: blocklistsPathOverride)
+            let blocklistPaths = CompilerSpec.findToolchainBlocklists(producer, directoryOverride: blocklistsPathOverride)
 
-        func getBlocklist<T: Codable>(type: T.Type, toolchainFilename: String, delegate: any TargetDiagnosticProducingDelegate) -> T? {
-            return CompilerSpec.getBlocklist(
-                type: type,
-                toolchainFilename: toolchainFilename,
-                blocklistPaths: blocklistPaths,
-                fs: localFS,
-                delegate: delegate
-            )
-        }
+            func getBlocklist<T: Codable>(type: T.Type, toolchainFilename: String, delegate: any TargetDiagnosticProducingDelegate) -> T? {
+                return CompilerSpec.getBlocklist(
+                    type: type,
+                    toolchainFilename: toolchainFilename,
+                    blocklistPaths: blocklistPaths,
+                    fs: localFS,
+                    delegate: delegate
+                )
+            }
 
-        var blocklists = SwiftBlocklists()
-        blocklists.explicitModules = getBlocklist(type: SwiftBlocklists.ExplicitModulesInfo.self, toolchainFilename: "swift-explicit-modules.json", delegate: delegate)
-        blocklists.installAPILazyTypecheck = getBlocklist(type: SwiftBlocklists.InstallAPILazyTypecheckInfo.self, toolchainFilename: "swift-lazy-installapi.json", delegate: delegate)
-        blocklists.caching = getBlocklist(type: SwiftBlocklists.CachingBlockList.self, toolchainFilename: "swift-caching.json", delegate: delegate)
-        blocklists.languageFeatureEnablement = getBlocklist(type: SwiftBlocklists.LanguageFeatureEnablementInfo.self, toolchainFilename: "swift-language-feature-enablement.json", delegate: delegate)
-        return DiscoveredSwiftCompilerToolSpecInfo(toolPath: toolPath, swiftVersion: swiftVersion, swiftTag: swiftTag, swiftABIVersion: swiftABIVersion, blocklists: blocklists, toolFeatures: getFeatures(at: toolPath))
-    })
+            var blocklists = SwiftBlocklists()
+            blocklists.explicitModules = getBlocklist(type: SwiftBlocklists.ExplicitModulesInfo.self, toolchainFilename: "swift-explicit-modules.json", delegate: delegate)
+            blocklists.installAPILazyTypecheck = getBlocklist(type: SwiftBlocklists.InstallAPILazyTypecheckInfo.self, toolchainFilename: "swift-lazy-installapi.json", delegate: delegate)
+            blocklists.caching = getBlocklist(type: SwiftBlocklists.CachingBlockList.self, toolchainFilename: "swift-caching.json", delegate: delegate)
+            blocklists.languageFeatureEnablement = getBlocklist(type: SwiftBlocklists.LanguageFeatureEnablementInfo.self, toolchainFilename: "swift-language-feature-enablement.json", delegate: delegate)
+            return DiscoveredSwiftCompilerToolSpecInfo(toolPath: toolPath, swiftVersion: swiftVersion, swiftTag: swiftTag, swiftABIVersion: swiftABIVersion, blocklists: blocklists, toolFeatures: getFeatures(at: toolPath))
+        }
+    )
 }
 
 extension SwiftCompilerSpec: GCCCompatibleCompilerCommandLineBuilder {
-    package func searchPathArguments(_ entry: SearchPathEntry, _ scope: MacroEvaluationScope) -> [String]
-    {
+    package func searchPathArguments(_ entry: SearchPathEntry, _ scope: MacroEvaluationScope) -> [String] {
         var args = [String]()
         switch entry
         {
@@ -3769,7 +3818,7 @@ extension SwiftCompilerSpec: GCCCompatibleCompilerCommandLineBuilder {
             args.append(contentsOf: ["-isystem", path.str])
 
         case .headerSearchPathSplitter:
-            args.append(contentsOf: ["-I-"])              // <rdar://problem/24312805> states that clang has never supported this option.
+            args.append(contentsOf: ["-I-"])  // <rdar://problem/24312805> states that clang has never supported this option.
 
         case .frameworkSearchPath(let path, let separateArgs):
             args.append(contentsOf: separateArgs ? ["-F", path.str] : ["-F" + path.str])
@@ -3779,8 +3828,7 @@ extension SwiftCompilerSpec: GCCCompatibleCompilerCommandLineBuilder {
             // We need to use -Fsystem for the public iOSSupport directories (Frameworks, SubFrameworks), so we special-case doing so.  c.f. <rdar://problem/50117414>  We *don't* pass -Fsystem to the equivalent PrivateFrameworks directory, for reasons described in <rdar://problem/50309541>.
             if path.ends(with: "System/iOSSupport/System/Library/Frameworks") || path.ends(with: "System/iOSSupport/System/Library/SubFrameworks") || scope.evaluate(BuiltinMacros.SYSTEM_FRAMEWORK_SEARCH_PATHS_USE_FSYSTEM) {
                 args.append(contentsOf: ["-Fsystem", path.str])
-            }
-            else {
+            } else {
                 args.append(contentsOf: ["-F", path.str])
             }
 
@@ -3823,8 +3871,9 @@ public extension BuildPhaseWithBuildFiles {
         return buildFiles.contains { buildFile -> Bool in
             // We only need to consider file references.
             guard case let .reference(guid) = buildFile.buildableItem,
-                  let reference = referenceLookupContext.lookupReference(for: guid),
-                  let fileRef = reference as? FileReference else { return false }
+                let reference = referenceLookupContext.lookupReference(for: guid),
+                let fileRef = reference as? FileReference
+            else { return false }
 
             let path = filePathResolver.resolveAbsolutePath(fileRef)
             guard !filteringContext.isExcluded(path, filters: buildFile.platformFilters) else { return false }
@@ -3914,10 +3963,13 @@ extension SwiftDiscoveredCommandLineToolSpecInfo {
         let compilerFileName = producer.hostOperatingSystem.imageFormat.executableName(basename: "swiftc")
 
         // Get the path to the compiler.
-        let path = scope.evaluate(BuiltinMacros.SWIFT_TOOLS_DIR).nilIfEmpty.map(Path.init)?.join(compilerFileName)
-            ?? scope.evaluate(BuiltinMacros.SWIFT_EXEC).nilIfEmpty.map({ $0.isAbsolute
-                ? $0
-                : Path(producer.hostOperatingSystem.imageFormat.executableName(basename: $0.str)) })
+        let path =
+            scope.evaluate(BuiltinMacros.SWIFT_TOOLS_DIR).nilIfEmpty.map(Path.init)?.join(compilerFileName)
+            ?? scope.evaluate(BuiltinMacros.SWIFT_EXEC).nilIfEmpty.map({
+                $0.isAbsolute
+                    ? $0
+                    : Path(producer.hostOperatingSystem.imageFormat.executableName(basename: $0.str))
+            })
             ?? Path(compilerFileName)
         let userSpecifiedBlocklists = scope.evaluate(BuiltinMacros.BLOCKLISTS_PATH).nilIfEmpty.map { Path($0) }
         let toolPath = self.resolveExecutablePath(producer, path)
diff --git a/Sources/SWBCore/SpecImplementations/Tools/SwiftHeaderTool.swift b/Sources/SWBCore/SpecImplementations/Tools/SwiftHeaderTool.swift
index df6c840b..f0b67fde 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/SwiftHeaderTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/SwiftHeaderTool.swift
@@ -13,7 +13,7 @@
 public import SWBUtil
 public import SWBMacro
 
-public final class SwiftHeaderToolSpec : CommandLineToolSpec, SpecImplementationType, @unchecked Sendable {
+public final class SwiftHeaderToolSpec: CommandLineToolSpec, SpecImplementationType, @unchecked Sendable {
     public static let identifier = "com.apple.build-tools.swift-header-tool"
 
     public override func resolveExecutionDescription(_ cbc: CommandBuildContext, _ delegate: any DiagnosticProducingDelegate, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> String {
diff --git a/Sources/SWBCore/SpecImplementations/Tools/SwiftStdLibTool.swift b/Sources/SWBCore/SpecImplementations/Tools/SwiftStdLibTool.swift
index 985a6988..f7edf365 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/SwiftStdLibTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/SwiftStdLibTool.swift
@@ -13,7 +13,7 @@
 import SWBUtil
 public import SWBMacro
 
-public final class SwiftStdLibToolSpec : GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
+public final class SwiftStdLibToolSpec: GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.build-tools.swift-stdlib-tool"
 
     override public func constructTasks(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate) async {
@@ -22,7 +22,7 @@ public final class SwiftStdLibToolSpec : GenericCommandLineToolSpec, SpecIdentif
     }
 
     /// Construct a new task to run the Swift standard library tool.
-    public func constructSwiftStdLibraryToolTask(_ cbc:CommandBuildContext, _ delegate: any TaskGenerationDelegate, foldersToScan: MacroStringListExpression?, filterForSwiftOS: Bool, backDeploySwiftConcurrency: Bool, backDeploySwiftSpan: Bool) async {
+    public func constructSwiftStdLibraryToolTask(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate, foldersToScan: MacroStringListExpression?, filterForSwiftOS: Bool, backDeploySwiftConcurrency: Bool, backDeploySwiftSpan: Bool) async {
         precondition(cbc.outputs.isEmpty, "Unexpected output paths \(cbc.outputs.map { "'\($0.str)'" }) passed to \(type(of: self)).")
 
         let input = cbc.input
@@ -32,19 +32,19 @@ public final class SwiftStdLibToolSpec : GenericCommandLineToolSpec, SpecIdentif
 
         // Create a lookup closure for build setting overrides.
         let lookup: ((MacroDeclaration) -> MacroExpression?) =
-        { macro in
-            switch macro
-            {
-            case BuiltinMacros.SWIFT_STDLIB_TOOL_FOLDERS_TO_SCAN:
-                return foldersToScan
-
-            case BuiltinMacros.OutputPath, BuiltinMacros.OutputFile:
-                return wrapperPathMacroExpression
-
-            default:
-                return nil
+            { macro in
+                switch macro
+                {
+                case BuiltinMacros.SWIFT_STDLIB_TOOL_FOLDERS_TO_SCAN:
+                    return foldersToScan
+
+                case BuiltinMacros.OutputPath, BuiltinMacros.OutputFile:
+                    return wrapperPathMacroExpression
+
+                default:
+                    return nil
+                }
             }
-        }
 
         // Compute the rule info.
         let ruleInfo = defaultRuleInfo(cbc, delegate, lookup: lookup)
@@ -92,6 +92,6 @@ public final class SwiftStdLibToolSpec : GenericCommandLineToolSpec, SpecIdentif
 
         let outputs = [delegate.createVirtualNode("CopySwiftStdlib \(wrapperPathString.str)")]
 
-        delegate.createTask(type: self, dependencyData: .dependencyInfo(dependencyInfoFilePath), ruleInfo: ruleInfo, commandLine: commandLine, environment: EnvironmentBindings(environment.map { ($0, $1) }), workingDirectory: cbc.producer.defaultWorkingDirectory, inputs: [ delegate.createNode(input.absolutePath) ], outputs: outputs, mustPrecede: [], action: action, execDescription: resolveExecutionDescription(cbc, delegate, lookup: lookup), enableSandboxing: enableSandboxing)
+        delegate.createTask(type: self, dependencyData: .dependencyInfo(dependencyInfoFilePath), ruleInfo: ruleInfo, commandLine: commandLine, environment: EnvironmentBindings(environment.map { ($0, $1) }), workingDirectory: cbc.producer.defaultWorkingDirectory, inputs: [delegate.createNode(input.absolutePath)], outputs: outputs, mustPrecede: [], action: action, execDescription: resolveExecutionDescription(cbc, delegate, lookup: lookup), enableSandboxing: enableSandboxing)
     }
 }
diff --git a/Sources/SWBCore/SpecImplementations/Tools/SwiftSymbolExtractor.swift b/Sources/SWBCore/SpecImplementations/Tools/SwiftSymbolExtractor.swift
index 8692342e..436dc60d 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/SwiftSymbolExtractor.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/SwiftSymbolExtractor.swift
@@ -91,20 +91,20 @@ final class SwiftSymbolExtractor: GenericCompilerSpec, GCCCompatibleCompilerComm
                 let userHeaderSearchPaths = cbc.scope.evaluate(BuiltinMacros.SYMBOL_GRAPH_EXTRACTOR_SEARCH_PATHS).map {
                     return "-I" + $0
                 }
-                let defaultFrameworkSearchPaths = frameworkSearchPaths.searchPathArguments(for: self, scope:cbc.scope) + sparseSDKSearchPaths.searchPathArguments(for: self, scope: cbc.scope)
+                let defaultFrameworkSearchPaths = frameworkSearchPaths.searchPathArguments(for: self, scope: cbc.scope) + sparseSDKSearchPaths.searchPathArguments(for: self, scope: cbc.scope)
 
                 // swift-symbolgraph-extract doesn't expect the `-iquote`, `-isystem`, or `-iframework` flags so we map those to `-I` and `-Fsystem` instead.
                 let allSearchPaths = (defaultHeaderSearchPaths + userHeaderSearchPaths + defaultFrameworkSearchPaths)
                     .map { (argument: String) -> String in
-                    switch argument {
-                    case "-iquote", "-isystem":
-                        return "-I"
-                    case "-iframework":
-                        return "-Fsystem"
-                    default:
-                        return argument
+                        switch argument {
+                        case "-iquote", "-isystem":
+                            return "-I"
+                        case "-iframework":
+                            return "-Fsystem"
+                        default:
+                            return argument
+                        }
                     }
-                }
 
                 return cbc.scope.namespace.parseLiteralStringList(allSearchPaths)
 
diff --git a/Sources/SWBCore/SpecImplementations/Tools/SymlinkTool.swift b/Sources/SWBCore/SpecImplementations/Tools/SymlinkTool.swift
index 0d889a54..10838f8a 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/SymlinkTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/SymlinkTool.swift
@@ -12,7 +12,7 @@
 
 public import SWBUtil
 
-public final class SymlinkToolSpec : CommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
+public final class SymlinkToolSpec: CommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.tools.symlink"
 
     override public func constructTasks(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate) async {
@@ -42,10 +42,14 @@ public final class SymlinkToolSpec : CommandLineToolSpec, SpecIdentifierType, @u
 
         let commandLine = ["/bin/ln", "-sfh", toPath, outputPath.str]
         delegate.createTask(
-            type: self, ruleInfo: ["SymLink", outputPath.str, toPath],
-            commandLine: commandLine, environment: environmentFromSpec(cbc, delegate),
+            type: self,
+            ruleInfo: ["SymLink", outputPath.str, toPath],
+            commandLine: commandLine,
+            environment: environmentFromSpec(cbc, delegate),
             workingDirectory: cbc.producer.defaultWorkingDirectory,
-            inputs: [], outputs: [ outputPath ], action: nil,
+            inputs: [],
+            outputs: [outputPath],
+            action: nil,
             execDescription: resolveExecutionDescription(cbc, delegate),
             preparesForIndexing: cbc.preparesForIndexing,
             enableSandboxing: enableSandboxing,
diff --git a/Sources/SWBCore/SpecImplementations/Tools/TAPISymbolExtractor.swift b/Sources/SWBCore/SpecImplementations/Tools/TAPISymbolExtractor.swift
index 6ed9acc8..7e3043c1 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/TAPISymbolExtractor.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/TAPISymbolExtractor.swift
@@ -26,7 +26,7 @@ final public class TAPISymbolExtractor: GenericCompilerSpec, GCCCompatibleCompil
     ///   - cbc: The command build context
     ///   - clangCompilerInfo: Optional information about the installed copy of clang. Pass nil if clang is not being used.
     ///
-    static public func shouldConstructSymbolExtractionTask(_ cbc: CommandBuildContext, clangCompilerInfo: (any DiscoveredCommandLineToolSpecInfo)? ) async -> Bool {
+    static public func shouldConstructSymbolExtractionTask(_ cbc: CommandBuildContext, clangCompilerInfo: (any DiscoveredCommandLineToolSpecInfo)?) async -> Bool {
         let (canGenerateCXXTasks, hasPlusPlusHeaders) = await (canGenerateCXXTasks(cbc), hasPlusPlusHeaders(cbc))
         return ((supportsPlusPlus(cbc: cbc, clangCompilerInfo: clangCompilerInfo) && canGenerateCXXTasks) || !hasPlusPlusHeaders) && DocumentationCompilerSpec.shouldConstructSymbolGenerationTask(cbc)
     }
@@ -98,9 +98,9 @@ final public class TAPISymbolExtractor: GenericCompilerSpec, GCCCompatibleCompil
                 }
                 return predicate(foundFileType)
             })
-        || headers.publicHeaders.contains(where: { predicate(cbc.producer.lookupFileType(identifier: $0.fileTypeIdentifier)) })
-        || headers.privateHeaders.contains(where: { predicate(cbc.producer.lookupFileType(identifier: $0.fileTypeIdentifier)) })
-        || headers.projectHeaders.contains(where: { predicate(cbc.producer.lookupFileType(identifier: $0.fileTypeIdentifier)) })
+            || headers.publicHeaders.contains(where: { predicate(cbc.producer.lookupFileType(identifier: $0.fileTypeIdentifier)) })
+            || headers.privateHeaders.contains(where: { predicate(cbc.producer.lookupFileType(identifier: $0.fileTypeIdentifier)) })
+            || headers.projectHeaders.contains(where: { predicate(cbc.producer.lookupFileType(identifier: $0.fileTypeIdentifier)) })
     }
 
     /// A list of headers to consider for documentation
@@ -149,9 +149,9 @@ final public class TAPISymbolExtractor: GenericCompilerSpec, GCCCompatibleCompil
 
         for buildFile in target.headersBuildPhase?.buildFiles ?? [] {
             guard headerVisibilityToProcess.contains(buildFile.headerVisibility),
-                  case let .reference(guid) = buildFile.buildableItem,
-                  let fileRef = cbc.producer.lookupReference(for: guid) as? FileReference,
-                  let path = fileRef.path.asLiteralString
+                case let .reference(guid) = buildFile.buildableItem,
+                let fileRef = cbc.producer.lookupReference(for: guid) as? FileReference,
+                let path = fileRef.path.asLiteralString
             else { continue }
             fileReferencePlatformFilters[fileRef] = buildFile.platformFilters
 
@@ -174,9 +174,9 @@ final public class TAPISymbolExtractor: GenericCompilerSpec, GCCCompatibleCompil
                 // The developer has opted in to build multi-language documentation.
                 return SwiftCompilerSpec.generatedObjectiveCHeaderOutputPath(cbc.scope)
             }
-            guard willProcessAnyHeaders, // Only process the Swift interface header if some other headers are also processed ...
-                    // ... and if the target has Swift code that can end up in the Swift interface header.
-                    target.sourcesBuildPhase?.containsSwiftSources(cbc.producer, cbc.producer, cbc.scope, cbc.producer.filePathResolver) == true
+            guard willProcessAnyHeaders,  // Only process the Swift interface header if some other headers are also processed ...
+                // ... and if the target has Swift code that can end up in the Swift interface header.
+                target.sourcesBuildPhase?.containsSwiftSources(cbc.producer, cbc.producer, cbc.scope, cbc.producer.filePathResolver) == true
             else {
                 return nil
             }
@@ -208,7 +208,7 @@ final public class TAPISymbolExtractor: GenericCompilerSpec, GCCCompatibleCompil
             //
             // If this target is an executable, continue with a heuristic for finding what headers to extract symbol information from for documentation.
             guard case .executable = DocumentationCompilerSpec.DocumentationType(from: cbc),
-                  let cFamilySourceFileType = cbc.producer.lookupFileType(identifier: "sourcecode.c")
+                let cFamilySourceFileType = cbc.producer.lookupFileType(identifier: "sourcecode.c")
             else {
                 // Otherwise, if it's not an executable, don't look for headers to process for documentation.
                 return .init(publicHeaders: [], privateHeaders: [], projectHeaders: [], generatedSwiftHeader: generatedSwiftHeaderPath(willProcessAnyHeaders: false), headerBuildFiles: [])
@@ -226,9 +226,9 @@ final public class TAPISymbolExtractor: GenericCompilerSpec, GCCCompatibleCompil
 
             for file in target.sourcesBuildPhase?.buildFiles ?? [] {
                 guard case let .reference(guid) = file.buildableItem,
-                      let fileRef = cbc.producer.lookupReference(for: guid) as? FileReference,
-                      let fileType = cbc.producer.lookupFileType(identifier: fileRef.fileTypeIdentifier),
-                      fileType.conformsTo(cFamilySourceFileType)
+                    let fileRef = cbc.producer.lookupReference(for: guid) as? FileReference,
+                    let fileType = cbc.producer.lookupFileType(identifier: fileRef.fileTypeIdentifier),
+                    fileType.conformsTo(cFamilySourceFileType)
                 else { continue }
 
                 let path = cbc.producer.filePathResolver.resolveAbsolutePath(fileRef)
@@ -277,12 +277,12 @@ final public class TAPISymbolExtractor: GenericCompilerSpec, GCCCompatibleCompil
 
         var commandLine = [
             clangPath.str,
-            "-extract-api"
+            "-extract-api",
         ]
 
-
         if let compatibilitySymbolsPath = swiftCompilerInfo?.toolPath.dirname.dirname.join("share").join("swift").join("compatibility-symbols"), let ignoresFlagAvailable = clangCompilerInfo?.hasFeature("extract-api-ignores"),
-           localFS.exists(compatibilitySymbolsPath) && ignoresFlagAvailable {
+            localFS.exists(compatibilitySymbolsPath) && ignoresFlagAvailable
+        {
             commandLine.append("--extract-api-ignores=\(compatibilitySymbolsPath.str)")
         }
 
@@ -302,7 +302,7 @@ final public class TAPISymbolExtractor: GenericCompilerSpec, GCCCompatibleCompil
                 let userHeaderSearchPaths = cbc.scope.evaluate(BuiltinMacros.TAPI_EXTRACT_API_SEARCH_PATHS).map {
                     return "-I" + $0
                 }
-                let defaultFrameworkSearchPaths = frameworkSearchPaths.searchPathArguments(for: self, scope:cbc.scope) + sparseSDKSearchPaths.searchPathArguments(for: self, scope: cbc.scope)
+                let defaultFrameworkSearchPaths = frameworkSearchPaths.searchPathArguments(for: self, scope: cbc.scope) + sparseSDKSearchPaths.searchPathArguments(for: self, scope: cbc.scope)
 
                 let moduleMapSearchPaths = dependenciesModuleMaps.map { "-fmodule-map-file=\($0.str)" }
 
@@ -342,7 +342,8 @@ final public class TAPISymbolExtractor: GenericCompilerSpec, GCCCompatibleCompil
         } else {
             commandLine += headerList.compactMap {
                 if let language = $0.language,
-                   GCCCompatibleLanguageDialect(dialectName: language).isPlusPlus {
+                    GCCCompatibleLanguageDialect(dialectName: language).isPlusPlus
+                {
                     return nil
                 }
                 return $0.path.str
@@ -370,8 +371,9 @@ final public class TAPISymbolExtractor: GenericCompilerSpec, GCCCompatibleCompil
             return
         }
 
-        let inputs = cbc.inputs.map({ delegate.createNode($0.absolutePath) }) as [PlannedPathNode]
-                   + cbc.commandOrderingInputs
+        let inputs =
+            cbc.inputs.map({ delegate.createNode($0.absolutePath) }) as [PlannedPathNode]
+            + cbc.commandOrderingInputs
 
         let symbolGraphFile = Self.getMainSymbolGraphFile(cbc.scope)
 
@@ -393,7 +395,7 @@ final public class TAPISymbolExtractor: GenericCompilerSpec, GCCCompatibleCompil
                 let userHeaderSearchPaths = cbc.scope.evaluate(BuiltinMacros.TAPI_EXTRACT_API_SEARCH_PATHS).map {
                     return "-I" + $0
                 }
-                let defaultFrameworkSearchPaths = frameworkSearchPaths.searchPathArguments(for: self, scope:cbc.scope) + sparseSDKSearchPaths.searchPathArguments(for: self, scope: cbc.scope)
+                let defaultFrameworkSearchPaths = frameworkSearchPaths.searchPathArguments(for: self, scope: cbc.scope) + sparseSDKSearchPaths.searchPathArguments(for: self, scope: cbc.scope)
 
                 let moduleMapSearchPaths = dependenciesModuleMaps.map { "-fmodule-map-file=\($0.str)" }
 
diff --git a/Sources/SWBCore/SpecImplementations/Tools/TAPITools.swift b/Sources/SWBCore/SpecImplementations/Tools/TAPITools.swift
index f21a525d..97f02e9e 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/TAPITools.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/TAPITools.swift
@@ -19,7 +19,7 @@ public struct DiscoveredTAPIToolSpecInfo: DiscoveredCommandLineToolSpecInfo {
     public let toolVersion: Version?
 }
 
-public final class TAPIToolSpec : GenericCommandLineToolSpec, GCCCompatibleCompilerCommandLineBuilder, SpecIdentifierType, @unchecked Sendable {
+public final class TAPIToolSpec: GenericCommandLineToolSpec, GCCCompatibleCompilerCommandLineBuilder, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "com.apple.build-tools.tapi.installapi"
 
     public static let dSYMSupportRequiredVersion = try! FuzzyVersion("1500.*.7")
@@ -48,12 +48,12 @@ public final class TAPIToolSpec : GenericCommandLineToolSpec, GCCCompatibleCompi
                 let frameworkSearchPaths = GCCCompatibleCompilerSpecSupport.frameworkSearchPathArguments(cbc.producer, cbc.scope)
                 let sparseSDKSearchPaths = GCCCompatibleCompilerSpecSupport.sparseSDKSearchPathArguments(cbc.producer.sparseSDKs, headerSearchPaths.headerSearchPaths, frameworkSearchPaths.frameworkSearchPaths)
 
-                let defaultHeaderSearchPaths = headerSearchPaths.searchPathArguments(for:self, scope:cbc.scope)
+                let defaultHeaderSearchPaths = headerSearchPaths.searchPathArguments(for: self, scope: cbc.scope)
 
                 let userHeaderSearchPaths = cbc.scope.evaluate(BuiltinMacros.TAPI_HEADER_SEARCH_PATHS, lookup: lookup).map {
                     return "-I" + $0
                 }
-                let defaultFrameworkSearchPaths = frameworkSearchPaths.searchPathArguments(for: self, scope:cbc.scope) + sparseSDKSearchPaths.searchPathArguments(for:self, scope:cbc.scope)
+                let defaultFrameworkSearchPaths = frameworkSearchPaths.searchPathArguments(for: self, scope: cbc.scope) + sparseSDKSearchPaths.searchPathArguments(for: self, scope: cbc.scope)
 
                 return cbc.scope.namespace.parseLiteralStringList(defaultHeaderSearchPaths + userHeaderSearchPaths + defaultFrameworkSearchPaths)
 
@@ -82,7 +82,7 @@ public final class TAPIToolSpec : GenericCommandLineToolSpec, GCCCompatibleCompi
         let lookup: ((MacroDeclaration) -> MacroExpression?) = { macro in
             switch macro {
             case BuiltinMacros.TAPI_INPUTS:
-                return useOnlyFilelist ? nil : scope.namespace.parseLiteralStringList(cbc.inputs.map{ $0.absolutePath.str })
+                return useOnlyFilelist ? nil : scope.namespace.parseLiteralStringList(cbc.inputs.map { $0.absolutePath.str })
 
             case BuiltinMacros.BuiltBinaryPath:
                 return scope.namespace.parseLiteralString(builtBinaryPath?.normalize().str ?? "")
@@ -107,9 +107,10 @@ public final class TAPIToolSpec : GenericCommandLineToolSpec, GCCCompatibleCompi
         var commandLine: [String] = await commandLineFromTemplate(cbc, delegate, optionContext: toolInfo, lookup: lookup).map(\.asString)
 
         // Compute inputs.
-        var inputs = cbc.inputs.map({ delegate.createNode($0.absolutePath) }) as [PlannedPathNode]
-        + (fileListPath.flatMap({ [delegate.createNode($0)] }) ?? []) as [PlannedPathNode]
-        + generatedTBDFiles.map({ delegate.createNode($0) }) as [PlannedPathNode]
+        var inputs =
+            cbc.inputs.map({ delegate.createNode($0.absolutePath) }) as [PlannedPathNode]
+            + (fileListPath.flatMap({ [delegate.createNode($0)] }) ?? []) as [PlannedPathNode]
+            + generatedTBDFiles.map({ delegate.createNode($0) }) as [PlannedPathNode]
             + cbc.commandOrderingInputs
 
         // Compute swift aware arguments for installapi consumption and verification.
@@ -124,8 +125,10 @@ public final class TAPIToolSpec : GenericCommandLineToolSpec, GCCCompatibleCompi
 
             if !scope.evaluate(BuiltinMacros.SWIFT_OBJC_INTERFACE_HEADER_NAME).isEmpty && scope.evaluate(BuiltinMacros.SWIFT_INSTALL_OBJC_HEADER) {
                 let generatedHeaderPath = SwiftCompilerSpec.generatedObjectiveCHeaderOutputPath(scope).str
-                commandLine.append(contentsOf: ["-exclude-public-header",
-                                                generatedHeaderPath])
+                commandLine.append(contentsOf: [
+                    "-exclude-public-header",
+                    generatedHeaderPath,
+                ])
                 inputs.append(delegate.createNode(Path(generatedHeaderPath)))
             }
         }
@@ -138,7 +141,8 @@ public final class TAPIToolSpec : GenericCommandLineToolSpec, GCCCompatibleCompi
         inputs.append(contentsOf: (dsymPath.flatMap({ [delegate.createNode($0)] }) ?? []) as [PlannedPathNode])
 
         if let version = toolInfo?.toolVersion, version >= TAPIToolSpec.dSYMSupportRequiredVersion,
-                dsymPath != nil, scope.evaluate(BuiltinMacros.TAPI_READ_DSYM) {
+            dsymPath != nil, scope.evaluate(BuiltinMacros.TAPI_READ_DSYM)
+        {
             let dsymBundle = scope.evaluate(BuiltinMacros.DWARF_DSYM_FOLDER_PATH)
                 .join(scope.evaluate(BuiltinMacros.DWARF_DSYM_FILE_NAME))
             commandLine.append(contentsOf: ["--dsym=" + dsymBundle.str])
@@ -166,7 +170,7 @@ public final class TAPIToolSpec : GenericCommandLineToolSpec, GCCCompatibleCompi
     }
 }
 
-final class TAPIMergeToolSpec : CommandLineToolSpec, SpecImplementationType, @unchecked Sendable {
+final class TAPIMergeToolSpec: CommandLineToolSpec, SpecImplementationType, @unchecked Sendable {
     static let identifier = "com.apple.build-tools.tapi.merge"
 
     class func construct(registry: SpecRegistry, proxy: SpecProxy) -> Spec {
@@ -181,7 +185,7 @@ final class TAPIMergeToolSpec : CommandLineToolSpec, SpecImplementationType, @un
         // FIXME: We don't have a spec to work with here, we should get one.
         var commandLine = [resolveExecutablePath(cbc.producer, Path(cbc.scope.tapiExecutablePath())).str]
         commandLine += ["archive", "--merge", "--allow-arch-merges"]
-        commandLine += cbc.inputs.map{ $0.absolutePath.str }
+        commandLine += cbc.inputs.map { $0.absolutePath.str }
         commandLine += ["-o", outputPath.str]
 
         let outputs: [any PlannedNode] = [delegate.createNode(outputPath)] + cbc.commandOrderingOutputs
diff --git a/Sources/SWBCore/SpecImplementations/Tools/TiffUtilTool.swift b/Sources/SWBCore/SpecImplementations/Tools/TiffUtilTool.swift
index ed93f968..80aca6f7 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/TiffUtilTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/TiffUtilTool.swift
@@ -13,7 +13,7 @@
 import SWBUtil
 import SWBMacro
 
-final class TiffUtilToolSpec : GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
+final class TiffUtilToolSpec: GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
     static let identifier = "com.apple.compilers.tiffutil"
 
     private class func deferredSpec(_ cbc: CommandBuildContext) -> CommandLineToolSpec? {
diff --git a/Sources/SWBCore/SpecImplementations/Tools/TouchTool.swift b/Sources/SWBCore/SpecImplementations/Tools/TouchTool.swift
index 57ab5f1a..e41dc526 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/TouchTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/TouchTool.swift
@@ -13,7 +13,7 @@
 import SWBUtil
 import SWBMacro
 
-final class TouchToolSpec : CommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
+final class TouchToolSpec: CommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
     static let identifier = "com.apple.tools.touch"
 
     override func constructTasks(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate) async {
diff --git a/Sources/SWBCore/SpecImplementations/Tools/UnifdefTool.swift b/Sources/SWBCore/SpecImplementations/Tools/UnifdefTool.swift
index 99b2517b..3ccc70a8 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/UnifdefTool.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/UnifdefTool.swift
@@ -13,14 +13,15 @@
 public import SWBUtil
 import SWBMacro
 
-public final class UnifdefToolSpec : CommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
+public final class UnifdefToolSpec: CommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
     public static let identifier = "public.build-task.unifdef"
 
     public override func evaluatedOutputs(_ cbc: CommandBuildContext, _ delegate: any DiagnosticProducingDelegate) -> [(path: Path, isDirectory: Bool)]? {
         let outputs = cbc.outputs.map { ($0, false) }
-        return outputs.nilIfEmpty ?? cbc.resourcesDir.map { resourcesDir in
-            cbc.inputs.map { (resourcesDir.join($0.absolutePath.basename), false) }
-        }
+        return outputs.nilIfEmpty
+            ?? cbc.resourcesDir.map { resourcesDir in
+                cbc.inputs.map { (resourcesDir.join($0.absolutePath.basename), false) }
+            }
     }
 
     public override func constructTasks(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate) async {
diff --git a/Sources/SWBCore/SpecImplementations/Tools/WriteFile.swift b/Sources/SWBCore/SpecImplementations/Tools/WriteFile.swift
index eccf5cf1..3eb66967 100644
--- a/Sources/SWBCore/SpecImplementations/Tools/WriteFile.swift
+++ b/Sources/SWBCore/SpecImplementations/Tools/WriteFile.swift
@@ -32,7 +32,7 @@ public final class WriteFileSpec: CommandLineToolSpec, SpecImplementationType, @
         let execDescription = resolveExecutionDescription(cbc, delegate)
         let action = delegate.taskActionCreationDelegate.createAuxiliaryFileTaskAction(AuxiliaryFileTaskActionContext(output: outputNode.path, input: fileContentsPath, permissions: permissions, forceWrite: forceWrite, diagnostics: diagnostics, logContents: logContents))
         let ruleName = ruleName ?? "WriteAuxiliaryFile"
-        delegate.createTask(type: self, ruleInfo: [ruleName, outputNode.path.str], commandLine: ["write-file", outputNode.path.str], environment: EnvironmentBindings(), workingDirectory: cbc.producer.defaultWorkingDirectory, inputs: cbc.commandOrderingInputs, outputs: [ outputNode ], mustPrecede: [], action: action, execDescription: execDescription, preparesForIndexing: preparesForIndexing, enableSandboxing: enableSandboxing, additionalTaskOrderingOptions: additionalTaskOrderingOptions, priority: .unblocksDownstreamTasks)
+        delegate.createTask(type: self, ruleInfo: [ruleName, outputNode.path.str], commandLine: ["write-file", outputNode.path.str], environment: EnvironmentBindings(), workingDirectory: cbc.producer.defaultWorkingDirectory, inputs: cbc.commandOrderingInputs, outputs: [outputNode], mustPrecede: [], action: action, execDescription: execDescription, preparesForIndexing: preparesForIndexing, enableSandboxing: enableSandboxing, additionalTaskOrderingOptions: additionalTaskOrderingOptions, priority: .unblocksDownstreamTasks)
         return fileContentsPath
     }
 }
diff --git a/Sources/SWBCore/TargetDependencyResolver.swift b/Sources/SWBCore/TargetDependencyResolver.swift
index b3e37419..72185ac3 100644
--- a/Sources/SWBCore/TargetDependencyResolver.swift
+++ b/Sources/SWBCore/TargetDependencyResolver.swift
@@ -50,7 +50,7 @@ public struct ResolvedTargetDependency: Hashable, Encodable, Sendable {
 }
 
 extension ResolvedTargetDependency: Serializable {
-    public func serialize<T>(to serializer: T) where T : SWBUtil.Serializer {
+    public func serialize<T>(to serializer: T) where T: SWBUtil.Serializer {
         serializer.serializeAggregate(2) {
             serializer.serialize(target)
             serializer.serialize(reason)
@@ -110,12 +110,12 @@ public struct TargetBuildGraph: TargetGraph, Sendable {
     /// The result closure guarantees that all targets a target depends on appear in the returned array before that target.  Any detected dependency cycles will be broken.
     public init(workspaceContext: WorkspaceContext, buildRequest: BuildRequest, buildRequestContext: BuildRequestContext, delegate: any TargetDependencyResolverDelegate, purpose: Purpose = .build) async {
         let (allTargets, targetDependencies, targetsToLinkedReferencesToProducingTargets, dynamicallyBuildingTargets) =
-        await MacroNamespace.withExpressionInterningEnabled {
-            await buildRequestContext.keepAliveSettingsCache {
-                let resolver = TargetDependencyResolver(workspaceContext: workspaceContext, buildRequest: buildRequest, buildRequestContext: buildRequestContext, delegate: delegate, purpose: purpose)
-                return await resolver.computeGraph()
+            await MacroNamespace.withExpressionInterningEnabled {
+                await buildRequestContext.keepAliveSettingsCache {
+                    let resolver = TargetDependencyResolver(workspaceContext: workspaceContext, buildRequest: buildRequest, buildRequestContext: buildRequestContext, delegate: delegate, purpose: purpose)
+                    return await resolver.computeGraph()
+                }
             }
-        }
         self.init(workspaceContext: workspaceContext, buildRequest: buildRequest, buildRequestContext: buildRequestContext, allTargets: allTargets, targetDependencies: targetDependencies, targetsToLinkedReferencesToProducingTargets: targetsToLinkedReferencesToProducingTargets, dynamicallyBuildingTargets: dynamicallyBuildingTargets)
     }
 
@@ -196,31 +196,41 @@ public struct TargetBuildGraph: TargetGraph, Sendable {
     }
     private var _dependencyGraphDiagnostic: LazyCache<TargetBuildGraph, Diagnostic> = LazyCache { instance in
         // .allTargets is sorted in topological order. Reverse this so that targets appear before their dependencies in the list.
-        return Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("Target dependency graph (\(instance.allTargets.count) target" + (instance.allTargets.count > 1 ? "s" : "") + ")"), childDiagnostics: instance.allTargets.reversed().map { configuredTarget in
-            let project = instance.workspaceContext.workspace.project(for: configuredTarget.target)
-            let resolvedDependencies = instance.resolvedDependencies(of: configuredTarget)
-            let parts = [
-                "Target '\(configuredTarget.target.name)' in project '\(project.name)'",
-                instance.buildRequest.shouldSkipExecution(target: configuredTarget.target) ? " (skipped due to 'Skip Dependencies' scheme option)" : "",
-                resolvedDependencies.isEmpty ? " (no dependencies)" : "",
-            ]
-            return Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData(parts.joined(separator: "")), childDiagnostics: resolvedDependencies.map { dependency in
-                let project = instance.workspaceContext.workspace.project(for: dependency.target.target)
-                let dependencyDescription = "target '\(dependency.target.target.name)' in project '\(project.name)'"
-                let dependencyString: String
-                switch dependency.reason {
-                case .explicit:
-                    dependencyString = "Explicit dependency on \(dependencyDescription)"
-                case .implicitBuildPhaseLinkage(filename: let filename, buildableItem: _, buildPhase: let buildPhase):
-                    dependencyString = "Implicit dependency on \(dependencyDescription) via file '\(filename)' in build phase '\(buildPhase)'"
-                case .implicitBuildSetting(settingName: let settingName, options: let options):
-                    dependencyString = "Implicit dependency on \(dependencyDescription) via options '\(options.joined(separator: " "))' in build setting '\(settingName)'"
-                case .impliedByTransitiveDependencyViaRemovedTargets(let intermediateTargetName):
-                    dependencyString = "Dependency on \(dependencyDescription) via transitive dependency through '\(intermediateTargetName)'"
-                }
-                return Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("➜ " + dependencyString))
-            })
-        })
+        return Diagnostic(
+            behavior: .note,
+            location: .unknown,
+            data: DiagnosticData("Target dependency graph (\(instance.allTargets.count) target" + (instance.allTargets.count > 1 ? "s" : "") + ")"),
+            childDiagnostics: instance.allTargets.reversed().map { configuredTarget in
+                let project = instance.workspaceContext.workspace.project(for: configuredTarget.target)
+                let resolvedDependencies = instance.resolvedDependencies(of: configuredTarget)
+                let parts = [
+                    "Target '\(configuredTarget.target.name)' in project '\(project.name)'",
+                    instance.buildRequest.shouldSkipExecution(target: configuredTarget.target) ? " (skipped due to 'Skip Dependencies' scheme option)" : "",
+                    resolvedDependencies.isEmpty ? " (no dependencies)" : "",
+                ]
+                return Diagnostic(
+                    behavior: .note,
+                    location: .unknown,
+                    data: DiagnosticData(parts.joined(separator: "")),
+                    childDiagnostics: resolvedDependencies.map { dependency in
+                        let project = instance.workspaceContext.workspace.project(for: dependency.target.target)
+                        let dependencyDescription = "target '\(dependency.target.target.name)' in project '\(project.name)'"
+                        let dependencyString: String
+                        switch dependency.reason {
+                        case .explicit:
+                            dependencyString = "Explicit dependency on \(dependencyDescription)"
+                        case .implicitBuildPhaseLinkage(filename: let filename, buildableItem: _, buildPhase: let buildPhase):
+                            dependencyString = "Implicit dependency on \(dependencyDescription) via file '\(filename)' in build phase '\(buildPhase)'"
+                        case .implicitBuildSetting(settingName: let settingName, options: let options):
+                            dependencyString = "Implicit dependency on \(dependencyDescription) via options '\(options.joined(separator: " "))' in build setting '\(settingName)'"
+                        case .impliedByTransitiveDependencyViaRemovedTargets(let intermediateTargetName):
+                            dependencyString = "Dependency on \(dependencyDescription) via transitive dependency through '\(intermediateTargetName)'"
+                        }
+                        return Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("➜ " + dependencyString))
+                    }
+                )
+            }
+        )
     }
 }
 
@@ -400,8 +410,7 @@ fileprivate extension TargetDependencyResolver {
                 for configuredTarget in configuredTargets {
                     if let newConfiguredTarget = configuredTargetsToReplace[configuredTarget] {
                         newConfiguredTargets.insert(newConfiguredTarget)
-                    }
-                    else {
+                    } else {
                         newConfiguredTargets.insert(configuredTarget)
                     }
                 }
@@ -418,8 +427,7 @@ fileprivate extension TargetDependencyResolver {
                     if let newDependencyTarget = configuredTargetsToReplace[dependency.target] {
                         let newDependency = ResolvedTargetDependency(target: newDependencyTarget, reason: dependency.reason)
                         newDependencies.append(newDependency)
-                    }
-                    else {
+                    } else {
                         newDependencies.append(dependency)
                     }
                 }
@@ -718,7 +726,8 @@ fileprivate extension TargetDependencyResolver {
     ///   - dependencyPath: The ordered list of dependencies added along the path to this target, for detecting recursion.
     ///   - imposedParameters: Additional build parameter overrides which should be imposed upon all targets along this path (for specialization purposes).
     private func addDependencies(forConfiguredTarget configuredTarget: ConfiguredTarget, toDependencyClosure dependencyClosure: inout OrderedSet<ConfiguredTarget>, dependencyPath: inout OrderedSet<ConfiguredTarget>, imposedParameters: SpecializationParameters? = nil) async {
-        let statusMessage = workspaceContext.userPreferences.activityTextShorteningLevel >= .allDynamicText
+        let statusMessage =
+            workspaceContext.userPreferences.activityTextShorteningLevel >= .allDynamicText
             ? "Computing dependencies"
             : "Computing dependencies for '\(configuredTarget.target.name)'"
         delegate.updateProgress(statusMessage: statusMessage, showInLog: false)
@@ -779,7 +788,6 @@ fileprivate extension TargetDependencyResolver {
             await addDependencies(forConfiguredTarget: dependency.target, toDependencyClosure: &dependencyClosure, dependencyPath: &dependencyPath, imposedParameters: dependencyImposedParameters)
         }
 
-
         // Visit all of the immediate dependencies.
         for configuredDependency in discoveredInfo.immediateDependencies {
             if Task.isCancelled { break }
diff --git a/Sources/SWBCore/TaskGeneration.swift b/Sources/SWBCore/TaskGeneration.swift
index c944d4fd..8c9440c3 100644
--- a/Sources/SWBCore/TaskGeneration.swift
+++ b/Sources/SWBCore/TaskGeneration.swift
@@ -353,10 +353,13 @@ extension SpecRegistry {
     func effectiveFlattenedBuildOptions(_ spec: PropertyDomainSpec) -> [String: BuildOption] {
         var options = spec.flattenedBuildOptions
         for extensionSpec in findSpecs(BuildSettingsExtensionSpec.self) where spec.conformsTo(identifier: extensionSpec.extendsConformsTo) {
-            options.merge(extensionSpec.flattenedBuildOptions, uniquingKeysWith: { _, new in
-                // Should duplicates be an error?
-                return new
-            })
+            options.merge(
+                extensionSpec.flattenedBuildOptions,
+                uniquingKeysWith: { _, new in
+                    // Should duplicates be an error?
+                    return new
+                }
+            )
         }
         return options
     }
@@ -439,26 +442,32 @@ public struct CommandBuildContext {
     public let validityCriteria: (any TaskValidityCriteria)?
 
     public init(
-        producer: any CommandProducer, scope: MacroEvaluationScope,
-        inputs: [FileToBuild], isPreferredArch: Bool = true,
+        producer: any CommandProducer,
+        scope: MacroEvaluationScope,
+        inputs: [FileToBuild],
+        isPreferredArch: Bool = true,
         currentArchSpec: ArchitectureSpec? = nil,
         output: Path? = nil,
         commandOrderingInputs: [any PlannedNode] = [],
         commandOrderingOutputs: [any PlannedNode] = [],
         buildPhaseInfo: (any BuildPhaseInfoForToolSpec)? = nil,
-        resourcesDir: Path? = nil, tmpResourcesDir: Path? = nil,
+        resourcesDir: Path? = nil,
+        tmpResourcesDir: Path? = nil,
         unlocalizedResourcesDir: Path? = nil,
         preparesForIndexing: Bool = false,
         validityCriteria: (any TaskValidityCriteria)? = nil
     ) {
         self.init(
-            producer: producer, scope: scope, inputs: inputs,
+            producer: producer,
+            scope: scope,
+            inputs: inputs,
             isPreferredArch: isPreferredArch,
             currentArchSpec: currentArchSpec,
             outputs: output.map { [$0] } ?? [],
             commandOrderingInputs: commandOrderingInputs,
             commandOrderingOutputs: commandOrderingOutputs,
-            buildPhaseInfo: buildPhaseInfo, resourcesDir: resourcesDir,
+            buildPhaseInfo: buildPhaseInfo,
+            resourcesDir: resourcesDir,
             tmpResourcesDir: tmpResourcesDir,
             unlocalizedResourcesDir: unlocalizedResourcesDir,
             preparesForIndexing: preparesForIndexing,
@@ -467,14 +476,17 @@ public struct CommandBuildContext {
     }
 
     public init(
-        producer: any CommandProducer, scope: MacroEvaluationScope,
-        inputs: [FileToBuild], isPreferredArch: Bool = true,
+        producer: any CommandProducer,
+        scope: MacroEvaluationScope,
+        inputs: [FileToBuild],
+        isPreferredArch: Bool = true,
         currentArchSpec: ArchitectureSpec? = nil,
         outputs: [Path],
         commandOrderingInputs: [any PlannedNode] = [],
         commandOrderingOutputs: [any PlannedNode] = [],
         buildPhaseInfo: (any BuildPhaseInfoForToolSpec)? = nil,
-        resourcesDir: Path? = nil, tmpResourcesDir: Path? = nil,
+        resourcesDir: Path? = nil,
+        tmpResourcesDir: Path? = nil,
         unlocalizedResourcesDir: Path? = nil,
         preparesForIndexing: Bool = false,
         validityCriteria: (any TaskValidityCriteria)? = nil
@@ -584,22 +596,23 @@ public struct TaskOrderingOptions: OptionSet, CustomDebugStringConvertible, Send
     public static let ignorePhaseOrdering = TaskOrderingOptions(1 << 10)
 
     public var debugDescription: String {
-        return "<TaskOrderingOptions [" + [
-            "compilation": .compilation,
-            "compilationForIndexableSourceFile": .compilationForIndexableSourceFile,
-            "linking": .linking,
-
-            "immediate": TaskOrderingOptions.immediate,
-            "blockedByTargetHeaders": .blockedByTargetHeaders,
-
-            "compilationRequirement": .compilationRequirement,
-            "unsignedProductRequirement": .unsignedProductRequirement,
-            "linkingRequirement": .linkingRequirement,
-            "scanning": .scanning,
-            "ignorePhaseOrdering": .ignorePhaseOrdering,
+        return "<TaskOrderingOptions ["
+            + [
+                "compilation": .compilation,
+                "compilationForIndexableSourceFile": .compilationForIndexableSourceFile,
+                "linking": .linking,
+
+                "immediate": TaskOrderingOptions.immediate,
+                "blockedByTargetHeaders": .blockedByTargetHeaders,
+
+                "compilationRequirement": .compilationRequirement,
+                "unsignedProductRequirement": .unsignedProductRequirement,
+                "linkingRequirement": .linkingRequirement,
+                "scanning": .scanning,
+                "ignorePhaseOrdering": .ignorePhaseOrdering,
             ].compactMap { (description, rawValue) -> String? in
                 return self.contains(rawValue) ? description : nil
-        }.joined(separator: ", ") + "]>"
+            }.joined(separator: ", ") + "]>"
     }
 }
 
@@ -893,12 +906,12 @@ public extension TaskGenerationDelegate {
 
     /// Create a new task taking a command line as a `String` array, and inputs and outputs as `Path` arrays.  The command line will be implicitly marshalled into a `ByteString` array, and the inputs and outputs into `PlannedNode` arrays.
     func createTask(type: any TaskTypeDescription, dependencyData: DependencyDataStyle? = nil, payload: (any TaskPayload)? = nil, ruleInfo: [String], additionalSignatureData: String = "", commandLine: [String], additionalOutput: [String] = [], environment: EnvironmentBindings, workingDirectory: Path, inputs: [Path], outputs: [Path], mustPrecede: [any PlannedTask] = [], action: (any PlannedTaskAction)? = nil, execDescription: String? = nil, preparesForIndexing: Bool = false, enableSandboxing: Bool, llbuildControlDisabled: Bool = false, additionalTaskOrderingOptions: TaskOrderingOptions = [], usesExecutionInputs: Bool = false, isGate: Bool = false, alwaysExecuteTask: Bool = false, showInLog: Bool = true, showCommandLineInLog: Bool = true, priority: TaskPriority = .unspecified, repairViaOwnershipAnalysis: Bool = false, validityCriteria: (any TaskValidityCriteria)? = nil) {
-        return createTask(type: type, dependencyData: dependencyData, payload: payload, ruleInfo: ruleInfo, additionalSignatureData: additionalSignatureData, commandLine: commandLine.map{ ByteString(encodingAsUTF8: $0) }, additionalOutput: additionalOutput, environment: environment, workingDirectory: workingDirectory, inputs: inputs.map(createNode), outputs: outputs.map(createNode), mustPrecede: mustPrecede, action: action, execDescription: execDescription, preparesForIndexing: preparesForIndexing, enableSandboxing: enableSandboxing, llbuildControlDisabled: llbuildControlDisabled, additionalTaskOrderingOptions: additionalTaskOrderingOptions, usesExecutionInputs: usesExecutionInputs, isGate: isGate, alwaysExecuteTask: alwaysExecuteTask, showInLog: showInLog, showCommandLineInLog: showCommandLineInLog, priority: priority, repairViaOwnershipAnalysis: repairViaOwnershipAnalysis, validityCriteria: validityCriteria)
+        return createTask(type: type, dependencyData: dependencyData, payload: payload, ruleInfo: ruleInfo, additionalSignatureData: additionalSignatureData, commandLine: commandLine.map { ByteString(encodingAsUTF8: $0) }, additionalOutput: additionalOutput, environment: environment, workingDirectory: workingDirectory, inputs: inputs.map(createNode), outputs: outputs.map(createNode), mustPrecede: mustPrecede, action: action, execDescription: execDescription, preparesForIndexing: preparesForIndexing, enableSandboxing: enableSandboxing, llbuildControlDisabled: llbuildControlDisabled, additionalTaskOrderingOptions: additionalTaskOrderingOptions, usesExecutionInputs: usesExecutionInputs, isGate: isGate, alwaysExecuteTask: alwaysExecuteTask, showInLog: showInLog, showCommandLineInLog: showCommandLineInLog, priority: priority, repairViaOwnershipAnalysis: repairViaOwnershipAnalysis, validityCriteria: validityCriteria)
     }
 
     /// Create a new task taking a command line as a `String` array.  It will be implicitly marshalled into a `ByteString` array.
     func createTask(type: any TaskTypeDescription, dependencyData: DependencyDataStyle? = nil, payload: (any TaskPayload)? = nil, ruleInfo: [String], additionalSignatureData: String = "", commandLine: [String], additionalOutput: [String] = [], environment: EnvironmentBindings, workingDirectory: Path, inputs: [any PlannedNode], outputs: [any PlannedNode], mustPrecede: [any PlannedTask] = [], action: (any PlannedTaskAction)? = nil, execDescription: String? = nil, preparesForIndexing: Bool = false, enableSandboxing: Bool, llbuildControlDisabled: Bool = false, additionalTaskOrderingOptions: TaskOrderingOptions = [], usesExecutionInputs: Bool = false, isGate: Bool = false, alwaysExecuteTask: Bool = false, showInLog: Bool = true, showCommandLineInLog: Bool = true, showEnvironment: Bool = false, priority: TaskPriority = .unspecified, repairViaOwnershipAnalysis: Bool = false, validityCriteria: (any TaskValidityCriteria)? = nil) {
-        return createTask(type: type, dependencyData: dependencyData, payload: payload, ruleInfo: ruleInfo, additionalSignatureData: additionalSignatureData, commandLine: commandLine.map{ ByteString(encodingAsUTF8: $0) }, additionalOutput: additionalOutput, environment: environment, workingDirectory: workingDirectory, inputs: inputs, outputs: outputs, mustPrecede: mustPrecede, action: action, execDescription: execDescription, preparesForIndexing: preparesForIndexing, enableSandboxing: enableSandboxing, llbuildControlDisabled: llbuildControlDisabled, additionalTaskOrderingOptions: additionalTaskOrderingOptions, usesExecutionInputs: usesExecutionInputs, isGate: isGate, alwaysExecuteTask: alwaysExecuteTask, showInLog: showInLog, showCommandLineInLog: showCommandLineInLog, showEnvironment: showEnvironment, priority: priority, repairViaOwnershipAnalysis: repairViaOwnershipAnalysis, validityCriteria: validityCriteria)
+        return createTask(type: type, dependencyData: dependencyData, payload: payload, ruleInfo: ruleInfo, additionalSignatureData: additionalSignatureData, commandLine: commandLine.map { ByteString(encodingAsUTF8: $0) }, additionalOutput: additionalOutput, environment: environment, workingDirectory: workingDirectory, inputs: inputs, outputs: outputs, mustPrecede: mustPrecede, action: action, execDescription: execDescription, preparesForIndexing: preparesForIndexing, enableSandboxing: enableSandboxing, llbuildControlDisabled: llbuildControlDisabled, additionalTaskOrderingOptions: additionalTaskOrderingOptions, usesExecutionInputs: usesExecutionInputs, isGate: isGate, alwaysExecuteTask: alwaysExecuteTask, showInLog: showInLog, showCommandLineInLog: showCommandLineInLog, showEnvironment: showEnvironment, priority: priority, repairViaOwnershipAnalysis: repairViaOwnershipAnalysis, validityCriteria: validityCriteria)
     }
 
     func createGateTask(inputs: [any PlannedNode], output: any PlannedNode, name: String? = nil, mustPrecede: [any PlannedTask] = [], payload: (any TaskPayload)? = nil, additionalSignatureData: String = "") {
@@ -1078,9 +1091,11 @@ public struct OutputPathIndexingInfo: SourceFileIndexingInfo {
 
     /// The indexing info is packaged and sent to the client in a property list format.
     public var propertyListItem: PropertyListItem {
-        return .plDict([
-            "outputFilePath": .plString(outputFile.str),
-            ] as [String: PropertyListItem])
+        return .plDict(
+            [
+                "outputFilePath": .plString(outputFile.str)
+            ] as [String: PropertyListItem]
+        )
     }
 }
 
@@ -1276,8 +1291,10 @@ public struct TaskGenerateLocalizationInfoOutput {
     /// - Parameters:
     ///   - compilableXCStringsPaths: Paths to input source .xcstrings files.
     ///   - producedStringsdataPaths: Paths to output .stringsdata files.
-    public init(compilableXCStringsPaths: [Path] = [],
-                producedStringsdataPaths: [LocalizationBuildPortion: [Path]] = [:]) {
+    public init(
+        compilableXCStringsPaths: [Path] = [],
+        producedStringsdataPaths: [LocalizationBuildPortion: [Path]] = [:]
+    ) {
         self.compilableXCStringsPaths = compilableXCStringsPaths
         self.producedStringsdataPaths = producedStringsdataPaths
     }
diff --git a/Sources/SWBCore/TaskResult.swift b/Sources/SWBCore/TaskResult.swift
index e52dd640..452c4ce9 100644
--- a/Sources/SWBCore/TaskResult.swift
+++ b/Sources/SWBCore/TaskResult.swift
@@ -80,10 +80,14 @@ public extension Optional where Wrapped == TaskResult {
 }
 
 public struct CommandMetrics: Hashable, Sendable {
-    public let utime: UInt64         /// User time (in μs)
-    public let stime: UInt64         /// Sys time (in μs)
-    public let maxRSS: UInt64        /// Max RSS (in bytes)
-    public let wcDuration: ElapsedTimerInterval? /// Wall time duration (in μs).
+    public let utime: UInt64
+    /// User time (in μs)
+    public let stime: UInt64
+    /// Sys time (in μs)
+    public let maxRSS: UInt64
+    /// Max RSS (in bytes)
+    public let wcDuration: ElapsedTimerInterval?
+    /// Wall time duration (in μs).
 
     public init(utime: UInt64, stime: UInt64, maxRSS: UInt64, wcDuration: ElapsedTimerInterval?) {
         self.utime = utime
diff --git a/Sources/SWBCore/TaskValidityCriteria.swift b/Sources/SWBCore/TaskValidityCriteria.swift
index 280793cc..32736609 100644
--- a/Sources/SWBCore/TaskValidityCriteria.swift
+++ b/Sources/SWBCore/TaskValidityCriteria.swift
@@ -21,7 +21,6 @@ public protocol TaskValidityCriteria: Sendable {
     func isValid(_ task: any PlannedTask, _ context: any TaskValidationContext) -> Bool
 }
 
-
 /// A task validation context exposes information a task needs to determine whether it should be included in the build.
 public protocol TaskValidationContext: AnyObject {
     /// The set of paths which have been declared as inputs to one or more tasks.
diff --git a/Sources/SWBCore/ToolInfo/ClangToolInfo.swift b/Sources/SWBCore/ToolInfo/ClangToolInfo.swift
index 4e4ba77d..336e7862 100644
--- a/Sources/SWBCore/ToolInfo/ClangToolInfo.swift
+++ b/Sources/SWBCore/ToolInfo/ClangToolInfo.swift
@@ -14,9 +14,9 @@ public import SWBMacro
 public import SWBUtil
 import Foundation
 
-public struct ClangBlocklists : Sendable {
+public struct ClangBlocklists: Sendable {
 
-    public struct CachingBlocklistInfo : ProjectFailuresBlockList, Codable, Sendable {
+    public struct CachingBlocklistInfo: ProjectFailuresBlockList, Codable, Sendable {
         /// A blocklist of project names that do not support the `CLANG_ENABLE_COMPILE_CACHE` build setting.
         let KnownFailures: [String]
 
@@ -27,7 +27,7 @@ public struct ClangBlocklists : Sendable {
 
     var caching: CachingBlocklistInfo? = nil
 
-    public struct BuiltinModuleVerifierInfo : ProjectFailuresBlockList, Codable, Sendable {
+    public struct BuiltinModuleVerifierInfo: ProjectFailuresBlockList, Codable, Sendable {
         /// A blocklist of project names that do not support the `MODULE_VERIFIER_KIND=builtin` build setting.
         let KnownFailures: [String]
         enum CodingKeys: String, CodingKey {
@@ -100,7 +100,7 @@ public struct DiscoveredClangToolSpecInfo: DiscoveredCommandLineToolSpecInfo {
 
     public func isCachingBlocked(_ scope: MacroEvaluationScope) -> Bool {
         return blocklists.isBlocked(scope, info: blocklists.caching)
-     }
+    }
 
     public func isBuiltinModuleVerifyBlocked(_ scope: MacroEvaluationScope) -> Bool {
         return blocklists.isBlocked(scope, info: blocklists.builtinModuleVerify)
@@ -140,78 +140,82 @@ public func discoveredClangToolInfo(
     commandLine.append("-c")
     commandLine.append(Path.null.str)
 
-    return try await producer.discoveredCommandLineToolSpecInfo(delegate, nil, commandLine, { executionResult in
-        let outputString = String(decoding: executionResult.stdout, as: UTF8.self).trimmingCharacters(in: .whitespacesAndNewlines)
-
-        var clangVersion: Version? = nil
-        var llvmVersion: Version? = nil
-        var isAppleClang = false
-
-        for line in outputString.components(separatedBy: "\n") {
-            if line.hasPrefix("#define ") {
-                // Parse out the macro name and value.
-                let macroAssignment = line.withoutPrefix("#define ")
-                guard !macroAssignment.isEmpty else { continue }
-
-                let (macroName, macroValue) = macroAssignment.split(" ")
-                guard !macroValue.isEmpty else { continue }
-
-                // If the #define is __clang_version__, then we try to extract the LLVM and clang versions.  The value of this macro will look something like one of the following (including the quote characters):
-                // "8.1.0 (clang-802.1.38)"
-                // "12.0.0 (clang-1200.0.22.5) [ptrauth objc isa mode: sign-and-strip]"
-                if macroName == "__clang_version__" {
-                    if let match: RegEx.MatchResult = clangVersionRe.firstMatch(in: macroValue) {
-                        llvmVersion = match["llvm"].map { try? Version($0) } ?? nil
-                        clangVersion = match["clang"].map { try? Version($0) } ?? nil
-                    } else if let match = try? swiftOSSToolchainClangVersionRe.regex.firstMatch(in: macroValue) {
-                        llvmVersion = try? Version(String(match.llvm))
+    return try await producer.discoveredCommandLineToolSpecInfo(
+        delegate,
+        nil,
+        commandLine,
+        { executionResult in
+            let outputString = String(decoding: executionResult.stdout, as: UTF8.self).trimmingCharacters(in: .whitespacesAndNewlines)
+
+            var clangVersion: Version? = nil
+            var llvmVersion: Version? = nil
+            var isAppleClang = false
+
+            for line in outputString.components(separatedBy: "\n") {
+                if line.hasPrefix("#define ") {
+                    // Parse out the macro name and value.
+                    let macroAssignment = line.withoutPrefix("#define ")
+                    guard !macroAssignment.isEmpty else { continue }
+
+                    let (macroName, macroValue) = macroAssignment.split(" ")
+                    guard !macroValue.isEmpty else { continue }
+
+                    // If the #define is __clang_version__, then we try to extract the LLVM and clang versions.  The value of this macro will look something like one of the following (including the quote characters):
+                    // "8.1.0 (clang-802.1.38)"
+                    // "12.0.0 (clang-1200.0.22.5) [ptrauth objc isa mode: sign-and-strip]"
+                    if macroName == "__clang_version__" {
+                        if let match: RegEx.MatchResult = clangVersionRe.firstMatch(in: macroValue) {
+                            llvmVersion = match["llvm"].map { try? Version($0) } ?? nil
+                            clangVersion = match["clang"].map { try? Version($0) } ?? nil
+                        } else if let match = try? swiftOSSToolchainClangVersionRe.regex.firstMatch(in: macroValue) {
+                            llvmVersion = try? Version(String(match.llvm))
+                        }
                     }
-                }
 
-                if macroName == "__apple_build_version__" {
-                    isAppleClang = true
+                    if macroName == "__apple_build_version__" {
+                        isAppleClang = true
+                    }
                 }
             }
-        }
 
-        func getFeatures(at toolPath: Path) -> ToolFeatures<DiscoveredClangToolSpecInfo.FeatureFlag> {
-            let featuresPath = toolPath.dirname.dirname.join("share").join("clang").join("features.json")
-            do {
-                return try ToolFeatures(path: featuresPath, fs: localFS)
-            } catch {
-                // Clang was missing its own 'features.json' for a while (see rdar://72387110). Use the presence of the Swift 'features.json' for the features that were supported when it was added.
-                // Note that clang's is still missing on Windows: https://github.com/swiftlang/swift-installer-scripts/issues/337
-                let swiftFeaturesPath = toolPath.dirname.dirname.join("share").join("swift").join("features.json")
-                if localFS.exists(swiftFeaturesPath) {
-                    return .init([ .allowPcmWithCompilerErrors, .vfsDirectoryRemap, .indexUnitOutputPath])
+            func getFeatures(at toolPath: Path) -> ToolFeatures<DiscoveredClangToolSpecInfo.FeatureFlag> {
+                let featuresPath = toolPath.dirname.dirname.join("share").join("clang").join("features.json")
+                do {
+                    return try ToolFeatures(path: featuresPath, fs: localFS)
+                } catch {
+                    // Clang was missing its own 'features.json' for a while (see rdar://72387110). Use the presence of the Swift 'features.json' for the features that were supported when it was added.
+                    // Note that clang's is still missing on Windows: https://github.com/swiftlang/swift-installer-scripts/issues/337
+                    let swiftFeaturesPath = toolPath.dirname.dirname.join("share").join("swift").join("features.json")
+                    if localFS.exists(swiftFeaturesPath) {
+                        return .init([.allowPcmWithCompilerErrors, .vfsDirectoryRemap, .indexUnitOutputPath])
+                    }
+                    return .init([])
                 }
-                return .init([])
             }
-        }
 
-        let blocklistPaths = CompilerSpec.findToolchainBlocklists(producer, directoryOverride: blocklistsPathOverride)
+            let blocklistPaths = CompilerSpec.findToolchainBlocklists(producer, directoryOverride: blocklistsPathOverride)
 
-        func getBlocklist<T: Codable>(type: T.Type, toolchainFilename: String, delegate: any TargetDiagnosticProducingDelegate) -> T? {
-            return CompilerSpec.getBlocklist(
-                type: type,
-                toolchainFilename: toolchainFilename,
-                blocklistPaths: blocklistPaths,
-                fs: localFS,
-                delegate: delegate
+            func getBlocklist<T: Codable>(type: T.Type, toolchainFilename: String, delegate: any TargetDiagnosticProducingDelegate) -> T? {
+                return CompilerSpec.getBlocklist(
+                    type: type,
+                    toolchainFilename: toolchainFilename,
+                    blocklistPaths: blocklistPaths,
+                    fs: localFS,
+                    delegate: delegate
+                )
+            }
+            var blocklists = ClangBlocklists()
+            blocklists.caching = getBlocklist(type: ClangBlocklists.CachingBlocklistInfo.self, toolchainFilename: "clang-caching.json", delegate: delegate)
+            blocklists.builtinModuleVerify = getBlocklist(type: ClangBlocklists.BuiltinModuleVerifierInfo.self, toolchainFilename: "clang-builtin-module-verify.json", delegate: delegate)
+
+            return DiscoveredClangToolSpecInfo(
+                toolPath: toolPath,
+                clangVersion: clangVersion,
+                llvmVersion: llvmVersion,
+                isAppleClang: isAppleClang,
+                blocklists: blocklists,
+                toolFeatures: getFeatures(at: toolPath)
             )
         }
-        var blocklists = ClangBlocklists()
-        blocklists.caching = getBlocklist(type: ClangBlocklists.CachingBlocklistInfo.self, toolchainFilename: "clang-caching.json", delegate: delegate)
-        blocklists.builtinModuleVerify = getBlocklist(type: ClangBlocklists.BuiltinModuleVerifierInfo.self, toolchainFilename: "clang-builtin-module-verify.json", delegate: delegate)
-
-
-        return DiscoveredClangToolSpecInfo(
-            toolPath: toolPath,
-            clangVersion: clangVersion,
-            llvmVersion: llvmVersion,
-            isAppleClang: isAppleClang,
-            blocklists: blocklists,
-            toolFeatures: getFeatures(at: toolPath)
-        )
-    })
+    )
 }
diff --git a/Sources/SWBCore/ToolchainRegistry.swift b/Sources/SWBCore/ToolchainRegistry.swift
index 1279156e..8984b3ed 100644
--- a/Sources/SWBCore/ToolchainRegistry.swift
+++ b/Sources/SWBCore/ToolchainRegistry.swift
@@ -27,8 +27,7 @@ private extension ToolchainRegistryDelegate {
     func issue(strict: Bool, _ path: Path, _ message: String) {
         if strict {
             error(path, message)
-        }
-        else {
+        } else {
             warning(path, message)
         }
     }
@@ -79,7 +78,7 @@ public final class Toolchain: Hashable, Sendable {
         self.identifier = identifier
         self.version = version
 
-        assert(!aliases.contains{ $0.lowercased() != $0 })
+        assert(!aliases.contains { $0.lowercased() != $0 })
         self.aliases = aliases
 
         self.path = path
@@ -165,14 +164,12 @@ public final class Toolchain: Hashable, Sendable {
                 throw StubError.error("if the 'Name' key is present, it must be a string")
             }
             displayName = infoDisplayNameString
-        }
-        else if let infoDisplayName = items["DisplayName"] {
+        } else if let infoDisplayName = items["DisplayName"] {
             guard case .plString(let infoDisplayNameString) = infoDisplayName else {
                 throw StubError.error("if the 'DisplayName' key is present, it must be a string")
             }
             displayName = infoDisplayNameString
-        }
-        else {
+        } else {
             displayName = Toolchain.deriveDisplayName(identifier: identifier)
         }
 
@@ -185,12 +182,10 @@ public final class Toolchain: Hashable, Sendable {
 
             do {
                 version = try Version(infoVersionString)
-            }
-            catch {
+            } catch {
                 throw StubError.error("'Version' parse error: \(error)")
             }
-        }
-        else {
+        } else {
             // No version specified in the plist, so we derive the version from the identifier.
             version = Toolchain.deriveVersion(identifier: identifier)
         }
@@ -210,8 +205,7 @@ public final class Toolchain: Hashable, Sendable {
                 guard !aliasStr.isEmpty else { continue }
                 aliases.insert(aliasStr.lowercased())
             }
-        }
-        else {
+        } else {
             // No aliases specified in the plist, so we derive them from the identifier.
             aliases = Toolchain.deriveAliases(path: path, identifier: identifier)
         }
@@ -285,7 +279,7 @@ public final class Toolchain: Hashable, Sendable {
         defaultSettingsWhenPrimary["TOOLCHAIN_VERSION"] = .plString(version.description)
 
         var executableSearchPaths = [
-            path.join("usr").join("bin"),
+            path.join("usr").join("bin")
         ]
 
         for platformExtension in pluginManager.extensions(of: PlatformInfoExtensionPoint.self) {
@@ -294,18 +288,21 @@ public final class Toolchain: Hashable, Sendable {
 
         executableSearchPaths.append(contentsOf: [
             path.join("usr").join("local").join("bin"),
-            path.join("usr").join("libexec")
+            path.join("usr").join("libexec"),
         ])
 
         // Testing library platform names
         let testingLibrarySearchDir = path.join("usr").join("lib").join("swift")
-        let testingLibraryPlatformNames: Set<String> = if let platformRegistry, fs.exists(testingLibrarySearchDir) {
-            Set(try fs.listdir(testingLibrarySearchDir).filter {
-                platformRegistry.lookup(name: $0) != nil && fs.exists(testingLibrarySearchDir.join($0).join("testing"))
-            })
-        } else {
-            []
-        }
+        let testingLibraryPlatformNames: Set<String> =
+            if let platformRegistry, fs.exists(testingLibrarySearchDir) {
+                Set(
+                    try fs.listdir(testingLibrarySearchDir).filter {
+                        platformRegistry.lookup(name: $0) != nil && fs.exists(testingLibrarySearchDir.join($0).join("testing"))
+                    }
+                )
+            } else {
+                []
+            }
 
         // Construct the toolchain
         self.init(identifier: identifier, displayName: displayName, version: version, aliases: aliases, path: path, frameworkPaths: frameworkSearchPaths, libraryPaths: librarySearchPaths, defaultSettings: defaultSettings, overrideSettings: overrideSettings, defaultSettingsWhenPrimary: defaultSettingsWhenPrimary, executableSearchPaths: executableSearchPaths, testingLibraryPlatformNames: testingLibraryPlatformNames, fs: fs)
@@ -315,18 +312,16 @@ public final class Toolchain: Hashable, Sendable {
         hasher.combine(ObjectIdentifier(self))
     }
 
-    public static func ==(lhs: Toolchain, rhs: Toolchain) -> Bool {
+    public static func == (lhs: Toolchain, rhs: Toolchain) -> Bool {
         return lhs === rhs
     }
 
     @_spi(Testing) public static func deriveDisplayName(identifier: String) -> String {
         if identifier == ToolchainRegistry.defaultToolchainIdentifier {
             return "Xcode Default"
-        }
-        else if identifier.hasPrefix(ToolchainRegistry.appleToolchainIdentifierPrefix) {
+        } else if identifier.hasPrefix(ToolchainRegistry.appleToolchainIdentifierPrefix) {
             return identifier.withoutPrefix(ToolchainRegistry.appleToolchainIdentifierPrefix)
-        }
-        else {
+        } else {
             return identifier
         }
     }
@@ -382,7 +377,7 @@ public final class Toolchain: Hashable, Sendable {
         let groups: [[String]] = Static.deriveVersionPattern.matchGroups(in: identifier)
 
         // <rdar://problem/31359366> error: ambiguous use of 'prefix'
-        let numbers: [UInt] = Array(groups.prefix(3)).map{ $0.first! }.map{ UInt($0) ?? 0 }
+        let numbers: [UInt] = Array(groups.prefix(3)).map { $0.first! }.map { UInt($0) ?? 0 }
 
         return Version(numbers)
     }
@@ -466,8 +461,7 @@ public final class ToolchainRegistry: @unchecked Sendable {
 
             do {
                 try await registerToolchainsInDirectory(path, strict: strict, aliases: searchPath.aliases, operatingSystem: hostOperatingSystem, delegate: delegate)
-            }
-            catch let err {
+            } catch let err {
                 delegate.issue(strict: strict, path, "failed to load toolchains in \(path.str): \(err)")
             }
         }
diff --git a/Sources/SWBCore/WorkspaceContext.swift b/Sources/SWBCore/WorkspaceContext.swift
index 5f0e4f6b..b464e57f 100644
--- a/Sources/SWBCore/WorkspaceContext.swift
+++ b/Sources/SWBCore/WorkspaceContext.swift
@@ -111,9 +111,9 @@ public struct UserPreferences: Sendable {
 
     public static var allowsExternalToolExecutionDefaultValue: Bool {
         #if RC_PLAYGROUNDS
-        return true
+            return true
         #else
-        return false
+            return false
         #endif
     }
 
@@ -317,7 +317,7 @@ public final class WorkspaceContext: Sendable {
         return sdkRegistryCache.getValue(self)
     }
     private let sdkRegistryCache = LazyCache { (workspaceContext: WorkspaceContext) -> WorkspaceContextSDKRegistry in
-        let overridingSDKsDir: Path? = workspaceContext.userInfo?.processEnvironment["XCODE_OVERRIDING_SDKS_DIRECTORY"].flatMap{Path($0)}
+        let overridingSDKsDir: Path? = workspaceContext.userInfo?.processEnvironment["XCODE_OVERRIDING_SDKS_DIRECTORY"].flatMap { Path($0) }
 
         return WorkspaceContextSDKRegistry(coreSDKRegistry: workspaceContext.core.sdkRegistry, delegate: workspaceContext.core.registryDelegate, userNamespace: workspaceContext.workspace.userNamespace, overridingSDKsDir: overridingSDKsDir)
     }
@@ -361,8 +361,7 @@ public final class WorkspaceContext: Sendable {
         if let p = parameters.arena?.derivedDataPath {
             // If the arena defines a derived data path, then use it.
             cacheFolderPath = p
-        }
-        else {
+        } else {
             // Otherwise use the path to the default clang user cache directory.  This will mainly used when running xcodebuild without -scheme.
             // First see if CCHROOT is defined in the environment.  If it is, and if it does *not* start with "/Library/Caches/com.apple.Xcode", then we use it.
             if let CCHROOT = self.userInfo?.processEnvironment["CCHROOT"], !CCHROOT.isEmpty {
@@ -386,10 +385,10 @@ public final class WorkspaceContext: Sendable {
 extension FSProxy {
     private static var CreatedByBuildSystemAttribute: String {
         #if os(Linux) || os(Android)
-        // On Linux, "the name [of an extended attribute] must be a null-terminated string prefixed by a namespace identifier and a dot character" and only the "user" namespace is available for unrestricted access.
-        "user.org.swift.swift-build.CreatedByBuildSystem"
+            // On Linux, "the name [of an extended attribute] must be a null-terminated string prefixed by a namespace identifier and a dot character" and only the "user" namespace is available for unrestricted access.
+            "user.org.swift.swift-build.CreatedByBuildSystem"
         #else
-        "com.apple.xcode.CreatedByBuildSystem"
+            "com.apple.xcode.CreatedByBuildSystem"
         #endif
     }
 
@@ -450,4 +449,4 @@ extension MachOInfo: FileSystemInitializable {
     }
 }
 
-extension XCFramework: FileSystemInitializable { }
+extension XCFramework: FileSystemInitializable {}
diff --git a/Sources/SWBCore/XCFramework.swift b/Sources/SWBCore/XCFramework.swift
index 1326f5fe..02cd57c0 100644
--- a/Sources/SWBCore/XCFramework.swift
+++ b/Sources/SWBCore/XCFramework.swift
@@ -293,7 +293,7 @@ public struct XCFramework: Hashable, Sendable {
             self.libraryIdentifier = libraryIdentifier
             self.supportedPlatform = supportedPlatform
             self.supportedArchitectures = supportedArchitectures
-            self.platformVariant = platformVariant?.nilIfEmpty // remove the property if it is empty
+            self.platformVariant = platformVariant?.nilIfEmpty  // remove the property if it is empty
             self.libraryPath = libraryPath
             self.binaryPath = binaryPath
             self.headersPath = headersPath
@@ -482,7 +482,7 @@ extension XCFramework.Library: Hashable {
     }
 
     /// Returns `true` iff the `libraryIdentifiers` are equal. The rest of the library components are not used for equality.
-    static public func ==(lhs: XCFramework.Library, rhs: XCFramework.Library) -> Bool {
+    static public func == (lhs: XCFramework.Library, rhs: XCFramework.Library) -> Bool {
         return lhs.libraryIdentifier == rhs.libraryIdentifier
     }
 }
@@ -544,8 +544,7 @@ extension XCFramework.Library: Hashable {
 
             if platformVariant == "macabi" {
                 try container.encode("maccatalyst", forKey: .platformVariant)
-            }
-            else {
+            } else {
                 try container.encodeIfPresent(platformVariant, forKey: .platformVariant)
             }
 
@@ -622,8 +621,7 @@ extension XCFramework {
         let libraries: [XCFramework.Library]
         do {
             version = try Version(other.version)
-        }
-        catch {
+        } catch {
             throw XCFrameworkValidationError.unsupportedVersion(version: other.version)
         }
 
@@ -672,8 +670,7 @@ extension XCFramework {
         let subfolder: Path
         if scope.evaluate(BuiltinMacros.DEPLOYMENT_LOCATION) {
             subfolder = scope.evaluate(BuiltinMacros.BUILT_PRODUCTS_DIR)
-        }
-        else {
+        } else {
             subfolder = scope.unmodifiedTargetBuildDir
         }
 
@@ -693,13 +690,11 @@ extension XCFramework {
         case internalDistribution
 
         var libraryPath: Path? {
-            if case let .library(path, _, _) = self { return path }
-            else { return nil }
+            if case let .library(path, _, _) = self { return path } else { return nil }
         }
 
         var headersPath: Path? {
-            if case let .library(_, path, _) = self { return path }
-            else { return nil }
+            if case let .library(_, path, _) = self { return path } else { return nil }
         }
 
         var debugSymbolPaths: [Path] {
@@ -753,7 +748,6 @@ extension XCFramework {
             }
         }
 
-
         // If the '-archive' flag is used, then all -framework/-library usages will be prefixed with their corresponding path into the archive. Also, the '-headers' and '-debug-symbols' will be added pointing into the archive. This function does not handle any of the error handling, but lets the rest of the system deal with duplicate or improper usage.
         var newCommandLine: [String] = []
 
@@ -776,8 +770,7 @@ extension XCFramework {
                     newCommandLine.append(archiveRoot.join(root).join(name).str)
 
                     rewriteDebugSymbolCommandLine(archiveRoot, name, fs, &newCommandLine)
-                }
-                else {
+                } else {
                     newCommandLine.append(entry)
                 }
 
@@ -796,8 +789,7 @@ extension XCFramework {
                     }
 
                     rewriteDebugSymbolCommandLine(archiveRoot, name, fs, &newCommandLine)
-                }
-                else {
+                } else {
                     newCommandLine.append(entry)
                 }
 
@@ -841,7 +833,7 @@ extension XCFramework {
         precondition(currentWorkingDirectory.isAbsolute, "path '\(currentWorkingDirectory.str)' is not absolute")
 
         // The -archive flag is handled in a very special way; it re-writes the user's entered command line by emitting the corresponding -framework/-library, -headers, -debug-symbols arguments.
-        let commandLine = rewriteCommandLine(commandLine, cwd: currentWorkingDirectory, fs:  fs)
+        let commandLine = rewriteCommandLine(commandLine, cwd: currentWorkingDirectory, fs: fs)
 
         var arguments = [Argument]()
         var argumentIndex = commandLine.startIndex
@@ -869,8 +861,8 @@ extension XCFramework {
             switch parseState {
             case .next:
                 switch arg {
-                case "createXCFramework": parseState = .next        // the main command from Swift Build
-                case "-create-xcframework": parseState = .next      // passed through via xcodebuild's parameter passing splat
+                case "createXCFramework": parseState = .next  // the main command from Swift Build
+                case "-create-xcframework": parseState = .next  // passed through via xcodebuild's parameter passing splat
                 case "-framework": parseState = .framework
                 case "-library": parseState = .library
                 case "-headers": parseState = .libraryHeader
@@ -884,8 +876,7 @@ extension XCFramework {
                     // When running via `xcodebuild`, there are additional arguments passed that we want to safely ignore.
                     if arg.hasPrefix("-DVT") || arg.hasPrefix("-ExtraPlugInFolders") {
                         parseState = .next
-                    }
-                    else {
+                    } else {
                         return .failure(XCFrameworkCreationError(message: "error: invalid argument '\(arg)'."))
                     }
                 }
@@ -932,7 +923,7 @@ extension XCFramework {
                 arguments.append(.output(path: normalize(path: arg, cwd: currentWorkingDirectory)))
                 parseState = .next
 
-            case .end: break   // do nothing
+            case .end: break  // do nothing
             }
 
             // Time to grab the next index.
@@ -941,8 +932,8 @@ extension XCFramework {
 
         let (frameworkCount, libraryCount, outputCount) = arguments.reduce((0, 0, 0)) { (acc, arg) in
             switch arg {
-            case .framework(_,_): return (acc.0 + 1, acc.1, acc.2)
-            case .library(_,_,_): return (acc.0, acc.1 + 1, acc.2)
+            case .framework(_, _): return (acc.0 + 1, acc.1, acc.2)
+            case .library(_, _, _): return (acc.0, acc.1 + 1, acc.2)
             case .output(_): return (acc.0, acc.1, acc.2 + 1)
             case .internalDistribution: return acc
             }
@@ -1030,8 +1021,7 @@ extension XCFramework {
                     mergeableMetadataArchs.insert(slice.arch)
                 }
             }
-        }
-        catch {
+        } catch {
             return .failure(XCFrameworkCreationError(message: "error: unable to determine mergeability of the binary at '\(binaryPath.str)': \(error)"))
         }
         if !mergeableMetadataArchs.isEmpty, Set(supportedArchs) != mergeableMetadataArchs {
@@ -1087,8 +1077,8 @@ extension XCFramework {
         let fs = localFS
 
         // Utility function for constructing the array of `XCFramework.Library` based on the command line arguments. A mapping of the path and the resulting library is returned upon success.
-        func xcframeworkLibraries(from arguments: [Argument]) -> Result<[LibraryPathsKey:XCFramework.Library], XCFrameworkCreationError> {
-            var libraryMap = [LibraryPathsKey:XCFramework.Library]()
+        func xcframeworkLibraries(from arguments: [Argument]) -> Result<[LibraryPathsKey: XCFramework.Library], XCFrameworkCreationError> {
+            var libraryMap = [LibraryPathsKey: XCFramework.Library]()
 
             do {
                 for arg in arguments {
@@ -1124,8 +1114,7 @@ extension XCFramework {
                     default: continue
                     }
                 }
-            }
-            catch {
+            } catch {
                 return .failure(XCFrameworkCreationError(message: error.localizedDescription))
             }
 
@@ -1147,10 +1136,12 @@ extension XCFramework {
 
             let xcframework = try XCFramework(libraries: libraryMap.values.map { $0 })
 
-            guard let outputPath = parsedCommandLineArgs.filter({
-                if case .output(_) = $0 { return true }
-                return false
-            }).first?.outputPath else {
+            guard
+                let outputPath = parsedCommandLineArgs.filter({
+                    if case .output(_) = $0 { return true }
+                    return false
+                }).first?.outputPath
+            else {
                 // this is a fatalError() as `parseCommandLine` should have already handled this error.
                 fatalError("no output path found.")
             }
@@ -1209,8 +1200,7 @@ extension XCFramework {
             }
 
             return (true, "xcframework successfully written out to: \(outputPath.str)\n")
-        }
-        catch {
+        } catch {
             return (false, "\(error.localizedDescription)\n")
         }
     }
@@ -1320,7 +1310,7 @@ extension XCFramework {
             guard fs.exists(copyHeadersFromPath) else {
                 throw XCFrameworkValidationError.missingPathEntry(xcframeworkPath: xcframeworkPath, libraryIdentifier: library.libraryIdentifier, plistKey: XCFrameworkInfoPlist_V1.Library.CodingKeys.headersPath.stringValue, plistValue: library.headersPath?.str ?? "<empty value>")
             }
-            let copyHeadersToPath = copyLibraryToPath.join(Path("include"))     // this is the path that is added by default from the compile process.
+            let copyHeadersToPath = copyLibraryToPath.join(Path("include"))  // this is the path that is added by default from the compile process.
 
             // Ensure the headers path actually exists on disk.
             if !dryRun {
diff --git a/Sources/SWBGenericUnixPlatform/Plugin.swift b/Sources/SWBGenericUnixPlatform/Plugin.swift
index 5e103d24..8491969c 100644
--- a/Sources/SWBGenericUnixPlatform/Plugin.swift
+++ b/Sources/SWBGenericUnixPlatform/Plugin.swift
@@ -27,7 +27,7 @@ final class GenericUnixPlugin: Sendable {
     func swiftExecutablePath(fs: any FSProxy) -> Path? {
         [
             Environment.current["SWIFT_EXEC"].map(Path.init),
-            StackedSearchPath(environment: .current, fs: fs).lookup(Path("swift"))
+            StackedSearchPath(environment: .current, fs: fs).lookup(Path("swift")),
         ].compactMap { $0 }.first(where: fs.exists)
     }
 
@@ -81,15 +81,18 @@ struct GenericUnixPlatformInfoExtension: PlatformInfoExtension {
             guard operatingSystem.createFallbackSystemToolchain || operatingSystem != context.hostOperatingSystem else {
                 return nil
             }
-            return try (.root, [
-                "Type": .plString("Platform"),
-                "Name": .plString(operatingSystem.xcodePlatformName),
-                "Identifier": .plString(operatingSystem.xcodePlatformName),
-                "Description": .plString(operatingSystem.xcodePlatformName),
-                "FamilyName": .plString(operatingSystem.xcodePlatformName.capitalized),
-                "FamilyIdentifier": .plString(operatingSystem.xcodePlatformName),
-                "IsDeploymentPlatform": .plString("YES"),
-            ])
+            return try (
+                .root,
+                [
+                    "Type": .plString("Platform"),
+                    "Name": .plString(operatingSystem.xcodePlatformName),
+                    "Identifier": .plString(operatingSystem.xcodePlatformName),
+                    "Description": .plString(operatingSystem.xcodePlatformName),
+                    "FamilyName": .plString(operatingSystem.xcodePlatformName.capitalized),
+                    "FamilyIdentifier": .plString(operatingSystem.xcodePlatformName),
+                    "IsDeploymentPlatform": .plString("YES"),
+                ]
+            )
         }
     }
 }
@@ -195,11 +198,16 @@ struct GenericUnixSDKRegistryExtension: SDKRegistryExtension {
                     sysroot = swiftSDK.path
                     architectures = try swiftSDK.targetTriples.keys.map { try LLVMTriple($0).arch }.sorted()
                     tripleVersion = try Set(swiftSDK.targetTriples.keys.compactMap { try LLVMTriple($0).systemVersion }).only?.description
-                    customProperties = try Dictionary(uniqueKeysWithValues: swiftSDK.targetTriples.map { targetTriple in
-                        try ("__SYSROOT_\(LLVMTriple(targetTriple.key).arch)", .plString(swiftSDK.path.join(targetTriple.value.sdkRootPath).str))
-                    }).merging([
-                        "SYSROOT": "$(__SYSROOT_$(CURRENT_ARCH))",
-                    ], uniquingKeysWith: { _, new in new })
+                    customProperties = try Dictionary(
+                        uniqueKeysWithValues: swiftSDK.targetTriples.map { targetTriple in
+                            try ("__SYSROOT_\(LLVMTriple(targetTriple.key).arch)", .plString(swiftSDK.path.join(targetTriple.value.sdkRootPath).str))
+                        }
+                    ).merging(
+                        [
+                            "SYSROOT": "$(__SYSROOT_$(CURRENT_ARCH))"
+                        ],
+                        uniquingKeysWith: { _, new in new }
+                    )
                 } catch {
                     // FIXME: Handle errors?
                     return nil
@@ -221,7 +229,7 @@ struct GenericUnixSDKRegistryExtension: SDKRegistryExtension {
                 } else if let tripleVersion {
                     realTripleVersion = tripleVersion
                 } else {
-                    return nil // couldn't compute triple version for FreeBSD
+                    return nil  // couldn't compute triple version for FreeBSD
                 }
                 deploymentTargetSettings = [
                     "DeploymentTargetSettingName": .plString("FREEBSD_DEPLOYMENT_TARGET"),
@@ -233,24 +241,31 @@ struct GenericUnixSDKRegistryExtension: SDKRegistryExtension {
                 deploymentTargetSettings = [:]
             }
 
-            return try (sysroot, platform, [
-                "Type": .plString("SDK"),
-                "Version": .plString(Version(ProcessInfo.processInfo.operatingSystemVersion).zeroTrimmed.description),
-                "CanonicalName": .plString(operatingSystem.xcodePlatformName),
-                "IsBaseSDK": .plBool(true),
-                "DefaultProperties": .plDict([
-                    "PLATFORM_NAME": .plString(operatingSystem.xcodePlatformName),
-                ].merging(defaultProperties, uniquingKeysWith: { _, new in new })),
-                "CustomProperties": .plDict(customProperties),
-                "SupportedTargets": .plDict([
-                    operatingSystem.xcodePlatformName: .plDict([
-                        "Archs": .plArray(architectures.map { .plString($0) }),
-                        "LLVMTargetTripleEnvironment": .plString(tripleEnvironment),
-                        "LLVMTargetTripleSys": .plString(operatingSystem.xcodePlatformName),
-                        "LLVMTargetTripleVendor": .plString("unknown"),
-                    ].merging(deploymentTargetSettings, uniquingKeysWith: { _, new in new }))
-                ]),
-            ])
+            return try (
+                sysroot, platform,
+                [
+                    "Type": .plString("SDK"),
+                    "Version": .plString(Version(ProcessInfo.processInfo.operatingSystemVersion).zeroTrimmed.description),
+                    "CanonicalName": .plString(operatingSystem.xcodePlatformName),
+                    "IsBaseSDK": .plBool(true),
+                    "DefaultProperties": .plDict(
+                        [
+                            "PLATFORM_NAME": .plString(operatingSystem.xcodePlatformName)
+                        ].merging(defaultProperties, uniquingKeysWith: { _, new in new })
+                    ),
+                    "CustomProperties": .plDict(customProperties),
+                    "SupportedTargets": .plDict([
+                        operatingSystem.xcodePlatformName: .plDict(
+                            [
+                                "Archs": .plArray(architectures.map { .plString($0) }),
+                                "LLVMTargetTripleEnvironment": .plString(tripleEnvironment),
+                                "LLVMTargetTripleSys": .plString(operatingSystem.xcodePlatformName),
+                                "LLVMTargetTripleVendor": .plString("unknown"),
+                            ].merging(deploymentTargetSettings, uniquingKeysWith: { _, new in new })
+                        )
+                    ]),
+                ]
+            )
         }.compactMap { $0 }
     }
 }
@@ -295,7 +310,8 @@ struct GenericUnixToolchainRegistryExtension: ToolchainRegistryExtension {
                 defaultSettingsWhenPrimary: [:],
                 executableSearchPaths: realSwiftPath.dirname.relativeSubpath(from: path).map { [path.join($0).join("bin")] } ?? [],
                 testingLibraryPlatformNames: [],
-                fs: fs)
+                fs: fs
+            )
         ]
     }
 }
diff --git a/Sources/SWBLLBuild/LowLevelBuildSystem.swift b/Sources/SWBLLBuild/LowLevelBuildSystem.swift
index 42487c84..8fb65182 100644
--- a/Sources/SWBLLBuild/LowLevelBuildSystem.swift
+++ b/Sources/SWBLLBuild/LowLevelBuildSystem.swift
@@ -17,7 +17,7 @@ public import SWBLibc
 @_exported public import llbuild
 
 #if !LLBUILD_FRAMEWORK
-@_exported public import llbuildSwift
+    @_exported public import llbuildSwift
 #endif
 
 // Filesystem adaptors for SWBLLBuild.FileSystem.
@@ -36,15 +36,15 @@ extension SWBUtil.FileInfo: SWBLLBuild.FileInfo {
         statBuf.st_mode = numericCast(self.permissions)
         statBuf.st_size = numericCast(self.size)
         #if canImport(Darwin)
-        statBuf.st_mtimespec.tv_sec = numericCast(self.modificationTimestamp)
-        statBuf.st_mtimespec.tv_nsec = self.modificationNanoseconds
+            statBuf.st_mtimespec.tv_sec = numericCast(self.modificationTimestamp)
+            statBuf.st_mtimespec.tv_nsec = self.modificationNanoseconds
         #elseif os(Windows)
-        statBuf.st_mtime = self.modificationTimestamp
+            statBuf.st_mtime = self.modificationTimestamp
         #elseif canImport(Glibc) || canImport(Musl) || canImport(Android)
-        statBuf.st_mtim.tv_sec = numericCast(self.modificationTimestamp)
-        statBuf.st_mtim.tv_nsec = self.modificationNanoseconds
+            statBuf.st_mtim.tv_sec = numericCast(self.modificationTimestamp)
+            statBuf.st_mtim.tv_nsec = self.modificationNanoseconds
         #else
-        #error("Not implemented for this platform")
+            #error("Not implemented for this platform")
         #endif
         return statBuf
     }
@@ -132,9 +132,9 @@ public enum BuildValueKind: UInt32 {
 extension llbuild_pid_t {
     public static var invalid: Self {
         #if os(Windows)
-        INVALID_HANDLE_VALUE
+            INVALID_HANDLE_VALUE
         #else
-        -1
+            -1
         #endif
     }
 }
@@ -142,9 +142,9 @@ extension llbuild_pid_t {
 extension llbuild_pid_t {
     public var pid: pid_t {
         #if os(Windows)
-        return Int32(GetProcessId(self))
+            return Int32(GetProcessId(self))
         #else
-        return self
+            return self
         #endif
     }
 }
diff --git a/Sources/SWBLibc/libc.swift b/Sources/SWBLibc/libc.swift
index 6f980ee6..1323d31d 100644
--- a/Sources/SWBLibc/libc.swift
+++ b/Sources/SWBLibc/libc.swift
@@ -11,19 +11,19 @@
 //===----------------------------------------------------------------------===//
 
 #if canImport(Darwin)
-@_exported import Darwin.C
+    @_exported import Darwin.C
 #elseif os(Windows)
-@_exported import ucrt
-@_exported import CRT
-@_exported import WinSDK
+    @_exported import ucrt
+    @_exported import CRT
+    @_exported import WinSDK
 #elseif canImport(Glibc)
-@_exported import Glibc
+    @_exported import Glibc
 #elseif canImport(Musl)
-@_exported import Musl
+    @_exported import Musl
 #elseif canImport(Android)
-@_exported import Android
+    @_exported import Android
 #else
-#error("Missing libc or equivalent")
+    #error("Missing libc or equivalent")
 #endif
 @_exported import SWBCLibc
 
diff --git a/Sources/SWBMacro/MacroCondition.swift b/Sources/SWBMacro/MacroCondition.swift
index 9d1d8bb7..d2715567 100644
--- a/Sources/SWBMacro/MacroCondition.swift
+++ b/Sources/SWBMacro/MacroCondition.swift
@@ -34,7 +34,7 @@ public final class MacroCondition: Serializable, Hashable, CustomStringConvertib
         hasher.combine(valuePattern)
     }
 
-    public static func ==(lhs: MacroCondition, rhs: MacroCondition) -> Bool {
+    public static func == (lhs: MacroCondition, rhs: MacroCondition) -> Bool {
         return lhs.parameter == rhs.parameter && lhs.valuePattern == rhs.valuePattern
     }
 
@@ -100,8 +100,7 @@ public final class MacroCondition: Serializable, Hashable, CustomStringConvertib
         let parmName: String = try deserializer.deserialize()
         if let aParm = delegate.namespace.lookupConditionParameter(parmName) {
             self.parameter = aParm
-        }
-        else {
+        } else {
             self.parameter = delegate.namespace.declareConditionParameter(parmName)
         }
 
diff --git a/Sources/SWBMacro/MacroConditionExpression.swift b/Sources/SWBMacro/MacroConditionExpression.swift
index 38ed351a..0a73ffea 100644
--- a/Sources/SWBMacro/MacroConditionExpression.swift
+++ b/Sources/SWBMacro/MacroConditionExpression.swift
@@ -14,21 +14,17 @@ import SWBUtil
 
 // MARK: MacroConditionExpression classes
 
-
 /// A parsed condition which can be evaluated in the context of a scope to return a boolean or string result.  This is used in build options to define conditions under which the option should contribute arguments to a command line.
-public class MacroConditionExpression: CustomStringConvertible, @unchecked Sendable
-{
+public class MacroConditionExpression: CustomStringConvertible, @unchecked Sendable {
     /// Parse a ``MacroConditionExpression`` object from ``string``.
     ///
     /// - parameter string: The string from which the expression will be parsed.
     /// - parameter macroNamespace: If passed, this will be used to parse any strings which might contain build settings.  If not passed, then the ``BuiltinMacros`` namespace will be used.
     /// - parameter diagnosticsHandler: If any errors are encountered during parsing, an error string will be passed to this block.  Defaults to an empty block.
     /// - returns: The parsed expression, or nil if any errors were encountered.
-    public class func fromString(_ string: String, macroNamespace: MacroNamespace, diagnosticsHandler: @escaping (((String) -> Void)) = {_ in }) -> MacroConditionExpression?
-    {
+    public class func fromString(_ string: String, macroNamespace: MacroNamespace, diagnosticsHandler: @escaping (((String) -> Void)) = { _ in }) -> MacroConditionExpression? {
         // If the string is empty, then so is the expression.
-        if(string.isEmpty)
-        {
+        if (string.isEmpty) {
             return MacroConditionStringConstantExpression(macroNamespace.parseString(string))
         }
 
@@ -42,8 +38,7 @@ public class MacroConditionExpression: CustomStringConvertible, @unchecked Senda
             error = diagnostic
             diagnosticsHandler(diagnostic)
         }
-        if parser.nextToken.type != .eof  &&  error == nil
-        {
+        if parser.nextToken.type != .eof && error == nil {
             // No error was detected but we still have more, unparsed tokens at the end of the string this early termination indicates an error.
             error = "expected operator or end-of-string, but found '\(parser.scanner.stringForToken(parser.nextToken))' at offset \(parser.nextToken.offset)"
             diagnosticsHandler(error!)
@@ -55,53 +50,45 @@ public class MacroConditionExpression: CustomStringConvertible, @unchecked Senda
     }
 
     /// Evaluate the receiver as a string.
-    public func evaluateAsString(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> String
-    {
+    public func evaluateAsString(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> String {
         fatalError("This method is a subclass responsibility.")
     }
 
     /// Evaluate the receiver as a boolean.
-    public func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool
-    {
+    public func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool {
         fatalError("This method is a subclass responsibility.")
     }
 
     /**
-        Parse an expression, which has the following format:
-
-            expression:
-                ternary-conditional-expression
-                ;
-    */
-    private class func parseExpression(_ parser: ParserState, _ diagnosticsHandler: @escaping ((String) -> Void)) -> MacroConditionExpression?
-    {
+     *   Parse an expression, which has the following format:
+     *
+     *       expression:
+     *           ternary-conditional-expression
+     *           ;
+     **/
+    private class func parseExpression(_ parser: ParserState, _ diagnosticsHandler: @escaping ((String) -> Void)) -> MacroConditionExpression? {
         return parseTernaryConditionalExpression(parser, diagnosticsHandler)
     }
 
     /**
-        Parse a ternary conditional expression, which has the following format:
-
-            ternary-conditional-expression:
-                logical-OR-expression
-                | logical-OR-expression '?' expression ':' ternary-conditional-expression
-                ;
-     */
-    private class func parseTernaryConditionalExpression(_ parser: ParserState, _ diagnosticsHandler: @escaping ((String) -> Void)) -> MacroConditionExpression?
-    {
+     *    Parse a ternary conditional expression, which has the following format:
+     *
+     *        ternary-conditional-expression:
+     *            logical-OR-expression
+     *            | logical-OR-expression '?' expression ':' ternary-conditional-expression
+     *            ;
+     **/
+    private class func parseTernaryConditionalExpression(_ parser: ParserState, _ diagnosticsHandler: @escaping ((String) -> Void)) -> MacroConditionExpression? {
         var expr = parseLogicalORExpression(parser, diagnosticsHandler)
-        if parser.nextToken.type == .questionMark
-        {
+        if parser.nextToken.type == .questionMark {
             // logical-OR-expression '?' expression ':' ternary-conditional-expression
             parser.step()
             let thenExpr = (parser.nextToken.type == .colon) ? expr : parseExpression(parser, diagnosticsHandler)
-            if parser.nextToken.type == .colon
-            {
+            if parser.nextToken.type == .colon {
                 parser.step()
                 let elseExpr = parseExpression(parser, diagnosticsHandler)
                 expr = MacroConditionTernaryConditionalExpression(condExpr: expr, thenExpr: thenExpr, elseExpr: elseExpr)
-            }
-            else
-            {
+            } else {
                 diagnosticsHandler("expected ':' but found '\(parser.scanner.stringForToken(parser.nextToken))' at offset \(parser.nextToken.offset)")
             }
         }
@@ -109,23 +96,20 @@ public class MacroConditionExpression: CustomStringConvertible, @unchecked Senda
     }
 
     /**
-        Parse a logical-OR expression, which has the following format:
-
-            logical-OR-expression:
-                logical-AND-expression
-                | logical-OR-expression '||' logical-AND-expression
-                ;
-
-        '``or``' is a synonym for '``||``'.
-     */
-    private class func parseLogicalORExpression(_ parser: ParserState, _ diagnosticsHandler: @escaping ((String) -> Void)) -> MacroConditionExpression?
-    {
+     *   Parse a logical-OR expression, which has the following format:
+     *
+     *        logical-OR-expression:
+     *            logical-AND-expression
+     *            | logical-OR-expression '||' logical-AND-expression
+     *            ;
+     *
+     *    '``or``' is a synonym for '``||``'.
+     **/
+    private class func parseLogicalORExpression(_ parser: ParserState, _ diagnosticsHandler: @escaping ((String) -> Void)) -> MacroConditionExpression? {
         var expr = parseLogicalANDExpression(parser, diagnosticsHandler)
-        if parser.nextToken.type == .or
-        {
+        if parser.nextToken.type == .or {
             // logical-AND-expression '&&' equality-expression
-            repeat
-            {
+            repeat {
                 parser.step()
                 expr = MacroConditionLogicalORExpression(leftExpr: expr, rightExpr: parseLogicalANDExpression(parser, diagnosticsHandler))
             } while parser.nextToken.type == .or
@@ -134,23 +118,20 @@ public class MacroConditionExpression: CustomStringConvertible, @unchecked Senda
     }
 
     /**
-        Parse a logical-AND expression, which has the following format:
-
-            logical-AND-expression:
-                equality-expression
-                | logical-AND-expression '&&' equality-expression
-                ;
-
-        '``and``' is a synonym for '``&&``'.
-     */
-    private class func parseLogicalANDExpression(_ parser: ParserState, _ diagnosticsHandler: @escaping ((String) -> Void)) -> MacroConditionExpression?
-    {
+     *    Parse a logical-AND expression, which has the following format:
+     *
+     *        logical-AND-expression:
+     *            equality-expression
+     *            | logical-AND-expression '&&' equality-expression
+     *            ;
+     *
+     *    '``and``' is a synonym for '``&&``'.
+     **/
+    private class func parseLogicalANDExpression(_ parser: ParserState, _ diagnosticsHandler: @escaping ((String) -> Void)) -> MacroConditionExpression? {
         var expr = parseEqualityExpression(parser, diagnosticsHandler)
-        if parser.nextToken.type == .and
-        {
-        // logical-AND-expression '&&' equality-expression
-            repeat
-            {
+        if parser.nextToken.type == .and {
+            // logical-AND-expression '&&' equality-expression
+            repeat {
                 parser.step()
                 expr = MacroConditionLogicalANDExpression(leftExpr: expr, rightExpr: parseEqualityExpression(parser, diagnosticsHandler))
             } while parser.nextToken.type == .and
@@ -159,27 +140,24 @@ public class MacroConditionExpression: CustomStringConvertible, @unchecked Senda
     }
 
     /**
-        Parse an equality expression, which has the following format:
-
-            equality-expression:
-                relational-expression
-                | equality-expression '==' relational-expression
-                | equality-expression '!=' relational-expression
-                | equality-expression 'contains' relational-expression
-                ;
-
-        '``is``' is a synonym for '``==``', and '``isnot``' is a synonym for '``!=``'.
-     */
-    private class func parseEqualityExpression(_ parser: ParserState, _ diagnosticsHandler: @escaping ((String) -> Void)) -> MacroConditionExpression?
-    {
+     *    Parse an equality expression, which has the following format:
+     *
+     *        equality-expression:
+     *            relational-expression
+     *            | equality-expression '==' relational-expression
+     *            | equality-expression '!=' relational-expression
+     *            | equality-expression 'contains' relational-expression
+     *            ;
+     *
+     *    '``is``' is a synonym for '``==``', and '``isnot``' is a synonym for '``!=``'.
+     **/
+    private class func parseEqualityExpression(_ parser: ParserState, _ diagnosticsHandler: @escaping ((String) -> Void)) -> MacroConditionExpression? {
         var expr = parseRelationalExpression(parser, diagnosticsHandler)
-        if parser.nextToken.type == .equals  ||  parser.nextToken.type == .notEquals  ||  parser.nextToken.type == .contains
-        {
+        if parser.nextToken.type == .equals || parser.nextToken.type == .notEquals || parser.nextToken.type == .contains {
             //   equality-expression '==' relational-expression
             // | equality-expression '!=' relational-expression
             // | equality-expression 'CONTAINS' relational-expression
-            repeat
-            {
+            repeat {
                 let tokenType = parser.nextToken.type
                 parser.step()
                 switch tokenType
@@ -194,26 +172,25 @@ public class MacroConditionExpression: CustomStringConvertible, @unchecked Senda
                     // Kind of an odd default, but it reproduces the original behavior.
                     expr = MacroConditionInequalityExpression(leftExpr: expr, rightExpr: parseRelationalExpression(parser, diagnosticsHandler))
                 }
-            } while parser.nextToken.type == .equals  ||  parser.nextToken.type == .notEquals  ||  parser.nextToken.type == .contains
+            } while parser.nextToken.type == .equals || parser.nextToken.type == .notEquals || parser.nextToken.type == .contains
         }
         return expr
     }
 
     /**
-        Parse a relational expression, which has the following format:
-
-            relational-expression:
-                unary-expression
-                | relational-expression '<' unary-expression
-                | relational-expression '>' unary-expression
-                | relational-expression '<=' unary-expression
-                | relational-expression '>=' unary-expression
-                ;
-
-        At present relational comparisons are not supported, so this method just calls through to ``parseUnaryExpression()``.
-     */
-    private class func parseRelationalExpression(_ parser: ParserState, _ diagnosticsHandler: @escaping ((String) -> Void)) -> MacroConditionExpression?
-    {
+     *    Parse a relational expression, which has the following format:
+     *
+     *        relational-expression:
+     *            unary-expression
+     *            | relational-expression '<' unary-expression
+     *            | relational-expression '>' unary-expression
+     *            | relational-expression '<=' unary-expression
+     *            | relational-expression '>=' unary-expression
+     *            ;
+     *
+     *    At present relational comparisons are not supported, so this method just calls through to ``parseUnaryExpression()``.
+     **/
+    private class func parseRelationalExpression(_ parser: ParserState, _ diagnosticsHandler: @escaping ((String) -> Void)) -> MacroConditionExpression? {
         let expr = parseUnaryExpression(parser, diagnosticsHandler)
 
         // TODO: Relational expressions were not implemented in the native build system support for macro condition expressions, so they're not implemented here yet either.
@@ -222,77 +199,65 @@ public class MacroConditionExpression: CustomStringConvertible, @unchecked Senda
     }
 
     /**
-        Parse a unary expression, which has the following format:
-
-            unary-expression:
-                primary-expression
-                | 'not' primary-expression
-                ;
-     */
-    private class func parseUnaryExpression(_ parser: ParserState, _ diagnosticsHandler: @escaping ((String) -> Void)) -> MacroConditionExpression?
-    {
-        if parser.nextToken.type == .not
-        {
+     *    Parse a unary expression, which has the following format:
+     *
+     *        unary-expression:
+     *            primary-expression
+     *            | 'not' primary-expression
+     *            ;
+     **/
+    private class func parseUnaryExpression(_ parser: ParserState, _ diagnosticsHandler: @escaping ((String) -> Void)) -> MacroConditionExpression? {
+        if parser.nextToken.type == .not {
             // 'not' primary-expression
             parser.step()
             let expr = parsePrimaryExpression(parser, diagnosticsHandler)
             return expr != nil ? MacroConditionLogicalNOTExpression(expr!) : nil
-        }
-        else
-        {
+        } else {
             // primary-expression
             return parsePrimaryExpression(parser, diagnosticsHandler)
         }
     }
 
     /**
-        Parse a primary expression, which has the following format:
-
-            primary-expression:
-                constant
-                | '(' expression ')'
-                ;
-
-        Note that a quirk in the scanner (carried over from the native build system) requires there to be a space between the last token in ``expression`` and the closing paren ``)``, or else the closing paren will be scanned as part of that last token.
-     */
-    private class func parsePrimaryExpression(_ parser: ParserState, _ diagnosticsHandler: @escaping ((String) -> Void)) -> MacroConditionExpression?
-    {
+     *    Parse a primary expression, which has the following format:
+     *
+     *        primary-expression:
+     *            constant
+     *            | '(' expression ')'
+     *            ;
+     *
+     *    Note that a quirk in the scanner (carried over from the native build system) requires there to be a space between the last token in ``expression`` and the closing paren ``)``, or else the closing paren will be scanned as part of that last token.
+     **/
+    private class func parsePrimaryExpression(_ parser: ParserState, _ diagnosticsHandler: @escaping ((String) -> Void)) -> MacroConditionExpression? {
         var expr: MacroConditionExpression? = nil
         switch parser.nextToken.type
         {
         case .leftParen:
             // '(' expression ')'
-            parser.step()       // Skip the '('
+            parser.step()  // Skip the '('
             let e = parseExpression(parser, diagnosticsHandler)
-            if parser.nextToken.type == .rightParen
-            {
+            if parser.nextToken.type == .rightParen {
                 // Found a ')', so the enclosed expression is our expression.
                 expr = e
-                parser.step()       // Skip the ')'
-            }
-            else
-            {
+                parser.step()  // Skip the ')'
+            } else {
                 diagnosticsHandler("expected ')' but found '\(parser.scanner.stringForToken(parser.nextToken))' at offset \(parser.nextToken.offset)")
             }
 
         default:
             // constant             (we treat every token other than '(' and EOF as a string constant)
             let nextToken = parser.nextToken
-            if nextToken.type != .eof
-            {
+            if nextToken.type != .eof {
                 // The token string might contain backslashes, which have already served their purpose in not ending quoted strings etc.  But we need to strip them out now.
                 var unescapedChars = [UInt8]()
                 var i = 0
-                while i < nextToken.length
-                {
-                    var ch = parser.scanner.bytes[nextToken.offset+i]
-                    if ch == 92 /* '\\' */  &&  i < nextToken.length-1
-                    {
+                while i < nextToken.length {
+                    var ch = parser.scanner.bytes[nextToken.offset + i]
+                    if ch == 92 /* '\\' */ && i < nextToken.length - 1 {
                         i += 1
-                        ch = parser.scanner.bytes[nextToken.offset+i]
+                        ch = parser.scanner.bytes[nextToken.offset + i]
                     }
-                    if i < nextToken.length
-                    {
+                    if i < nextToken.length {
                         unescapedChars.append(ch)
                     }
                     i += 1
@@ -303,15 +268,13 @@ public class MacroConditionExpression: CustomStringConvertible, @unchecked Senda
                 let unescapedString = String(decoding: unescapedChars, as: UTF8.self)
                 let parsedString = parser.macroNamespace.parseString(unescapedString) { diagnostic in
                     // The parse failed
-                    if diagnostic.level == MacroExpressionDiagnostic.Level.error
-                    {
+                    if diagnostic.level == MacroExpressionDiagnostic.Level.error {
                         parseSucceeded = false
                         diagnosticsHandler("Unable to parse string: \(unescapedString)")
                     }
                 }
                 // If the parse succeeded, then set the expression to return.
-                if parseSucceeded
-                {
+                if parseSucceeded {
                     expr = MacroConditionStringConstantExpression(parsedString)
                 }
 
@@ -322,280 +285,226 @@ public class MacroConditionExpression: CustomStringConvertible, @unchecked Senda
         return expr
     }
 
-    public var description: String
-    {
+    public var description: String {
         return "[\(type(of: self))]"
     }
 }
 
-
 // MARK: Concrete subclasses
 
-
 /// Abstract base class for expressions that whose natural return type is a string.  These can still be converted to booleans using evaluateAsBoolean()
-private class MacroConditionStringExpression: MacroConditionExpression, @unchecked Sendable
-{
-    override func evaluateAsString(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> String
-    {
+private class MacroConditionStringExpression: MacroConditionExpression, @unchecked Sendable {
+    override func evaluateAsString(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> String {
         fatalError("This method is a subclass responsibility.")
     }
 
-    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool
-    {
+    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool {
         return evaluateAsString(scope, lookup: lookup).boolValue
     }
 }
 
 /// A constant string condition expression.
-private final class MacroConditionStringConstantExpression: MacroConditionStringExpression, @unchecked Sendable
-{
+private final class MacroConditionStringConstantExpression: MacroConditionStringExpression, @unchecked Sendable {
     let macroExpr: MacroStringExpression
 
-    init(_ macroExpr: MacroStringExpression)
-    {
+    init(_ macroExpr: MacroStringExpression) {
         self.macroExpr = macroExpr
     }
 
-    override func evaluateAsString(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> String
-    {
+    override func evaluateAsString(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> String {
         return scope.evaluate(macroExpr, lookup: lookup)
     }
 
-    override var description: String
-    {
+    override var description: String {
         return "'\(macroExpr.stringRep)'"
     }
 }
 
 /// Abstract base class for expressions that whose natural return type is a boolean.  These can still be converted to strings using evaluateAsString().
-private class MacroConditionBooleanExpression: MacroConditionExpression, @unchecked Sendable
-{
-    override func evaluateAsString(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> String
-    {
+private class MacroConditionBooleanExpression: MacroConditionExpression, @unchecked Sendable {
+    override func evaluateAsString(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> String {
         return evaluateAsBoolean(scope, lookup: lookup) ? "YES" : "NO"
     }
 
-    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool
-    {
+    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool {
         fatalError("This method is a subclass responsibility.")
     }
 }
 
 // True and False constant expressions are not presently used.
 @available(*, unavailable)
-private final class MacroConditionTrueConstantExpression: MacroConditionBooleanExpression, @unchecked Sendable
-{
-    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool
-    {
+private final class MacroConditionTrueConstantExpression: MacroConditionBooleanExpression, @unchecked Sendable {
+    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool {
         return true
     }
 
-    override var description: String
-    {
+    override var description: String {
         return "YES"
     }
 }
 
 // True and False constant expressions are not presently used.
 @available(*, unavailable)
-private final class MacroConditionFalseConstantExpression: MacroConditionBooleanExpression, @unchecked Sendable
-{
-    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool
-    {
+private final class MacroConditionFalseConstantExpression: MacroConditionBooleanExpression, @unchecked Sendable {
+    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool {
         return false
     }
 
-    override var description: String
-    {
+    override var description: String {
         return "NO"
     }
 }
 
 /// Abstract base class for boolean expressions that operate on a single operand (either boolean or string).
-private class MacroConditionUnaryBooleanExpression: MacroConditionExpression, @unchecked Sendable
-{
+private class MacroConditionUnaryBooleanExpression: MacroConditionExpression, @unchecked Sendable {
     let expr: MacroConditionExpression?
 
-    init(_ expr: MacroConditionExpression?)
-    {
+    init(_ expr: MacroConditionExpression?) {
         self.expr = expr
     }
 
-    override var description: String
-    {
+    override var description: String {
         return "(\(type(of: self)) \(String(describing: expr)) )"
     }
 }
 
-private final class MacroConditionLogicalNOTExpression: MacroConditionUnaryBooleanExpression, @unchecked Sendable
-{
-    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool
-    {
+private final class MacroConditionLogicalNOTExpression: MacroConditionUnaryBooleanExpression, @unchecked Sendable {
+    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool {
         let value = (expr != nil ? expr!.evaluateAsBoolean(scope, lookup: lookup) : false)
         return value == false
     }
 
-    override var description: String
-    {
+    override var description: String {
         return "(NOT \(String(describing: expr)) )"
     }
 }
 
 /// Abstract base class for boolean expressions that operate on two operands (either booleans or strings).
-private class MacroConditionBinaryBooleanExpression: MacroConditionBooleanExpression, @unchecked Sendable
-{
+private class MacroConditionBinaryBooleanExpression: MacroConditionBooleanExpression, @unchecked Sendable {
     let leftExpr: MacroConditionExpression?
     let rightExpr: MacroConditionExpression?
 
-    init(leftExpr: MacroConditionExpression?, rightExpr: MacroConditionExpression?)
-    {
+    init(leftExpr: MacroConditionExpression?, rightExpr: MacroConditionExpression?) {
         self.leftExpr = leftExpr
         self.rightExpr = rightExpr
     }
 
-    override var description: String
-    {
+    override var description: String {
         return "(\(type(of: self)) \(String(describing: leftExpr)) \(String(describing: rightExpr)))"
     }
 }
 
-private final class MacroConditionEqualityExpression: MacroConditionBinaryBooleanExpression, @unchecked Sendable
-{
-    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool
-    {
+private final class MacroConditionEqualityExpression: MacroConditionBinaryBooleanExpression, @unchecked Sendable {
+    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool {
         // We don't know if the left and right expressions are booleans or strings (in fact, each could be different), but string comparison encompasses everything boolean comparison does and also lets us do things like "$(X) == 'YES'", so we go with that here.  Any subexpression that is boolean will be converted to a string for the purposes of the comparison.
         let leftString = leftExpr != nil ? leftExpr!.evaluateAsString(scope, lookup: lookup) : ""
         let rightString = rightExpr != nil ? rightExpr!.evaluateAsString(scope, lookup: lookup) : ""
         return (leftString == rightString)
     }
 
-    override var description: String
-    {
+    override var description: String {
         return "(\(String(describing: leftExpr)) EQ \(String(describing: rightExpr)) )"
     }
 }
 
-private final class MacroConditionInequalityExpression: MacroConditionBinaryBooleanExpression, @unchecked Sendable
-{
-    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool
-    {
+private final class MacroConditionInequalityExpression: MacroConditionBinaryBooleanExpression, @unchecked Sendable {
+    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool {
         // We don't know if the left and right expressions are booleans or strings (in fact, each could be different), but string comparison encompasses everything boolean comparison does and also lets us do things like "$(X) == 'YES'", so we go with that here.  Any subexpression that is boolean will be converted to a string for the purposes of the comparison.
         let leftString = leftExpr != nil ? leftExpr!.evaluateAsString(scope, lookup: lookup) : ""
         let rightString = rightExpr != nil ? rightExpr!.evaluateAsString(scope, lookup: lookup) : ""
         return (leftString != rightString)
     }
 
-    override var description: String
-    {
+    override var description: String {
         return "(\(String(describing: leftExpr)) NEQ \(String(describing: rightExpr)) )"
     }
 }
 
-private final class MacroConditionLogicalANDExpression: MacroConditionBinaryBooleanExpression, @unchecked Sendable
-{
-    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool
-    {
+private final class MacroConditionLogicalANDExpression: MacroConditionBinaryBooleanExpression, @unchecked Sendable {
+    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool {
         // We implicitly treat any subexpressions that are actually strings as boolean evaluations, e.g. "'NO' ^ ( 'X' == 'X')" evaluates to false ('NO' is treated as boolean false).
         let leftBoolValue = leftExpr != nil ? leftExpr!.evaluateAsBoolean(scope, lookup: lookup) : false
         let rightBoolValue = rightExpr != nil ? rightExpr!.evaluateAsBoolean(scope, lookup: lookup) : false
         return leftBoolValue && rightBoolValue
     }
 
-    override var description: String
-    {
+    override var description: String {
         return "(\(String(describing: leftExpr)) AND \(String(describing: rightExpr)) )"
     }
 }
 
-private final class MacroConditionLogicalORExpression: MacroConditionBinaryBooleanExpression, @unchecked Sendable
-{
-    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool
-    {
+private final class MacroConditionLogicalORExpression: MacroConditionBinaryBooleanExpression, @unchecked Sendable {
+    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool {
         // We implicitly treat any subexpressions that are actually strings as boolean evaluations, e.g. "'YES' || ( 'X' == 'X')" evaluates to true ('YES' is treated as boolean true).
         let leftBoolValue = leftExpr != nil ? leftExpr!.evaluateAsBoolean(scope, lookup: lookup) : false
         let rightBoolValue = rightExpr != nil ? rightExpr!.evaluateAsBoolean(scope, lookup: lookup) : false
         return leftBoolValue || rightBoolValue
     }
 
-    override var description: String
-    {
+    override var description: String {
         return "(\(String(describing: leftExpr)) OR \(String(describing: rightExpr)) )"
     }
 }
 
 // XOR is not presently used.
 @available(*, unavailable)
-private final class MacroConditionLogicalXORExpression: MacroConditionBinaryBooleanExpression, @unchecked Sendable
-{
-    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool
-    {
+private final class MacroConditionLogicalXORExpression: MacroConditionBinaryBooleanExpression, @unchecked Sendable {
+    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool {
         // We implicitly treat any subexpressions that are actually strings as boolean evaluations, e.g. "'NO' ^ ( 'X' == 'X')" evaluates to false ('NO' is treated as boolean false).
         let leftBoolValue = leftExpr != nil ? leftExpr!.evaluateAsBoolean(scope, lookup: lookup) : false
         let rightBoolValue = rightExpr != nil ? rightExpr!.evaluateAsBoolean(scope, lookup: lookup) : false
         return leftBoolValue == rightBoolValue
     }
 
-    override var description: String
-    {
+    override var description: String {
         return "(\(String(describing: leftExpr)) XOR \(String(describing: rightExpr)) )"
     }
 }
 
-private final class MacroConditionContainsExpression: MacroConditionBinaryBooleanExpression, @unchecked Sendable
-{
-    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool
-    {
+private final class MacroConditionContainsExpression: MacroConditionBinaryBooleanExpression, @unchecked Sendable {
+    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool {
         // As the contains operator works on strings, we're assuming that both expressions, left and right, will be strings. Also of note, we currently assume the substring search will be case insensitive. It might be good in the future to allow the user to specify case sensitivity vs. non-sensitivity. As a point of comparison, NSPredicate does this by appending '[c]' to the operator.
         let leftString = leftExpr != nil ? leftExpr!.evaluateAsString(scope, lookup: lookup) : ""
         let rightString = rightExpr != nil ? rightExpr!.evaluateAsString(scope, lookup: lookup) : ""
         return leftString.contains(rightString)
     }
 
-    override var description: String
-    {
+    override var description: String {
         return "(\(String(describing: leftExpr)) CONTAINS \(String(describing: rightExpr)) )"
     }
 }
 
 /// A ternary conditional expression.
-private final class MacroConditionTernaryConditionalExpression: MacroConditionExpression, @unchecked Sendable
-{
+private final class MacroConditionTernaryConditionalExpression: MacroConditionExpression, @unchecked Sendable {
     let condExpr: MacroConditionExpression?
     let thenExpr: MacroConditionExpression?
     let elseExpr: MacroConditionExpression?
 
-    init(condExpr: MacroConditionExpression?, thenExpr: MacroConditionExpression?, elseExpr: MacroConditionExpression?)
-    {
+    init(condExpr: MacroConditionExpression?, thenExpr: MacroConditionExpression?, elseExpr: MacroConditionExpression?) {
         self.condExpr = condExpr
         self.thenExpr = thenExpr
         self.elseExpr = elseExpr
     }
 
-    override func evaluateAsString(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> String
-    {
+    override func evaluateAsString(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> String {
         // We implicitly treat the condition expression as a boolean expression; if it's a string, it will be evaluated as a boolean.  We treat the then or else expression as a string, however, since that is non-lossy while a boolean would be lossy.  If the then or else expression, respectively, is a boolean expression, it will be converted to a string.
         let condBoolValue = condExpr != nil ? condExpr!.evaluateAsBoolean(scope, lookup: lookup) : false
         let resultExpr = condBoolValue ? thenExpr : elseExpr
         return resultExpr != nil ? resultExpr!.evaluateAsString(scope, lookup: lookup) : ""
     }
 
-    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool
-    {
+    override func evaluateAsBoolean(_ scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> Bool {
         return evaluateAsString(scope, lookup: lookup).boolValue
     }
 
-    override var description: String
-    {
+    override var description: String {
         return "(\(String(describing: condExpr)) ? \(String(describing: thenExpr)) : \(String(describing: elseExpr)) )"
     }
 }
 
-
 // MARK: Scanning
 
-
-private enum TokenType: String
-{
+private enum TokenType: String {
     // Not all of these are presently used.
     case invalid
     case string
@@ -617,8 +526,7 @@ private enum TokenType: String
     case eof
 }
 
-private struct Token: CustomStringConvertible
-{
+private struct Token: CustomStringConvertible {
     /// The token type.
     var type: TokenType
 
@@ -631,29 +539,25 @@ private struct Token: CustomStringConvertible
     /// Byte length of token in the string.
     var length: Int
 
-    fileprivate var description: String
-    {
+    fileprivate var description: String {
         return "<\(type.rawValue):o=\(offset),l=\(length)>"
     }
 }
 
-private class ScannerState
-{
+private class ScannerState {
     /// UTF-8 byte buffer that’s being scanned.
     let bytes: [UInt8]
 
     /// Index of the next character to read in the string.
     var currIdx: Int
 
-    init(_ string: String)
-    {
+    init(_ string: String) {
         self.bytes = [UInt8](string.utf8)
         self.currIdx = 0
     }
 
     /// Scans ``bytes`` until the next token has been created, and returns it.
-    func getNextToken() -> Token
-    {
+    func getNextToken() -> Token {
         // Skip whitespace.
         scanUntil({ !self.isAtWhitespace })
 
@@ -661,106 +565,96 @@ private class ScannerState
         var token = Token(type: .invalid, flags: 0, offset: currIdx, length: 0)
         switch currChar
         {
-        case 0:         // EOF
+        case 0:  // EOF
             token.type = .eof
             token.length = 0
             break
 
-        case 61:        // '='
+        case 61:  // '='
             advance()
-            if currChar == 61
-            {
+            if currChar == 61 {
                 // We found a '=='
                 token.type = .equals
                 token.length = 2
                 advance()
             }
-            // Otherwise we just found a '='
+        // Otherwise we just found a '='
 
-        case 33:        // '!'
+        case 33:  // '!'
             advance()
-            if currChar == 61
-            {
+            if currChar == 61 {
                 // We found a '!='
                 token.type = .notEquals
                 token.length = 2
                 advance()
-            }
-            else
-            {
+            } else {
                 // We found a '!'
                 token.type = .not
                 token.length = 1
             }
 
-        case 38:        // '&'
+        case 38:  // '&'
             advance()
-            if currChar == 38
-            {
+            if currChar == 38 {
                 // We found a '&&'
                 token.type = .and
                 token.length = 2
                 advance()
             }
-            // Otherwise we just found a '&'
+        // Otherwise we just found a '&'
 
-        case 124:       // '|'
+        case 124:  // '|'
             advance()
-            if currChar == 124
-            {
+            if currChar == 124 {
                 // We found a '||'
                 token.type = .or
                 token.length = 2
                 advance()
             }
-            // Otherwise we just found a '|'
+        // Otherwise we just found a '|'
 
-        case 63:        // '?'
+        case 63:  // '?'
             token.type = .questionMark
             token.length = 1
             advance()
 
-        case 58:        // ':'
+        case 58:  // ':'
             token.type = .colon
             token.length = 1
             advance()
 
-        case 40:        // '('
+        case 40:  // '('
             token.type = .leftParen
             token.length = 1
             advance()
 
-        case 41:        // ')'
+        case 41:  // ')'
             token.type = .rightParen
             token.length = 1
             advance()
 
-        case 39, 34:        // '\'' and '\"'
+        case 39, 34:  // '\'' and '\"'
             // Scanning a quoted string.
             // Save the quote character and advance the token's index beyond it.
             let quoteChar = currChar
             let startIdx = currIdx
             token.offset += 1
             // Scan until the matching quote, if there is one.
-            repeat
-            {
+            repeat {
                 advance()
-                if currChar == 92 { advance() }     // Skip '\\'
-            } while currChar != quoteChar  &&  !isAtEndOfStream
+                if currChar == 92 { advance() }  // Skip '\\'
+            } while currChar != quoteChar && !isAtEndOfStream
             var endIdx = currIdx
-            if currChar == quoteChar
-            {
+            if currChar == quoteChar {
                 // Skip over the trailing quote.
                 advance()
                 endIdx = currIdx
-            }
-            else
-            {
+            } else {
                 // unterminated quote... what to do?
-                endIdx += 1    // Simulate a quote so that the math works out when setting token.length below
+                endIdx += 1  // Simulate a quote so that the math works out when setting token.length below
             }
             token.type = .string
-            token.length = ((endIdx - 2) - startIdx)   // excludes the leading and trailing quotes
+            token.length = ((endIdx - 2) - startIdx)  // excludes the leading and trailing quotes
 
         default:
             // Scan until we reach whitespace or end-of-string.  Then record the range of what we scanned.
@@ -770,40 +664,26 @@ private class ScannerState
             token.length = (currIdx - startIdx)
 
             // Recognize keywords
-            if token.length == 2  &&  bytes[startIdx ..< currIdx] == "or"
-            {
+            if token.length == 2 && bytes[startIdx..<currIdx] == "or" {
                 token.type = .or
-            }
-            else if token.length == 3  &&  bytes[startIdx ..< currIdx] == "and"
-            {
+            } else if token.length == 3 && bytes[startIdx..<currIdx] == "and" {
                 token.type = .and
-            }
-            else if token.length == 2  &&  bytes[startIdx ..< currIdx] == "is"
-            {
+            } else if token.length == 2 && bytes[startIdx..<currIdx] == "is" {
                 token.type = .equals
-            }
-            else if token.length == 5  &&  bytes[startIdx ..< currIdx] == "isnot"
-            {
+            } else if token.length == 5 && bytes[startIdx..<currIdx] == "isnot" {
                 token.type = .notEquals
-            }
-            else if token.length == 7  &&  bytes[startIdx ..< currIdx] == "matches"
-            {
+            } else if token.length == 7 && bytes[startIdx..<currIdx] == "matches" {
                 token.type = .matches
-            }
-            else if token.length == 2  &&  bytes[startIdx ..< currIdx] == "in"
-            {
+            } else if token.length == 2 && bytes[startIdx..<currIdx] == "in" {
                 token.type = .in
-            }
-            else if token.length == 8  &&  bytes[startIdx ..< currIdx] == "contains"
-            {
+            } else if token.length == 8 && bytes[startIdx..<currIdx] == "contains" {
                 token.type = .contains
             }
         }
 
-        if token.type == .invalid  &&  token.length == 0
-        {
+        if token.type == .invalid && token.length == 0 {
             // Invalid token -- adjust the length so that the error message becomes useful.  We do this by extending the token until the next whitespace character.
-            while ((token.offset + token.length) < bytes.count)  &&  bytes[token.offset + token.length] > 32  // ' '
+            while ((token.offset + token.length) < bytes.count) && bytes[token.offset + token.length] > 32  // ' '
             {
                 token.length += 1
             }
@@ -815,87 +695,73 @@ private class ScannerState
     }
 
     /// Returns the UTF-8 byte at the current position, which is zero if the cursor is currently at the very end of the string.
-    private var currChar: UInt8
-    {
+    private var currChar: UInt8 {
         assert(currIdx <= bytes.count)
         return (currIdx < bytes.count) ? bytes[currIdx] : 0
     }
 
     /// Returns the UTF-8 byte at the position immediately after the current position, which is zero if the cursor is currently at either the very end of the string or the position before the very end.
-    private var nextChar: UInt8
-    {
+    private var nextChar: UInt8 {
         assert(currIdx <= bytes.count)
         return (currIdx + 1 < bytes.count) ? bytes[currIdx + 1] : 0
     }
 
     /// Returns the UTF-8 byte at the position immediately after the position immediately after the current position, which is zero if the cursor is currently at either the very end of the string, at the position before the very end, or at the position before that.
-    private var nextNextChar: UInt8
-    {
+    private var nextNextChar: UInt8 {
         assert(currIdx <= bytes.count)
         return (currIdx + 2 < bytes.count) ? bytes[currIdx + 2] : 0
     }
 
     /// Advances the character to the next position, or does nothing if the cursor is currently already at end-of-string.
-    private func advance(_ offset: Int = 1)
-    {
+    private func advance(_ offset: Int = 1) {
         assert(currIdx <= bytes.count)
         currIdx = min(currIdx + offset, bytes.count)
     }
 
     /// Returns true if and only if the cursor is currently at end-of-string.
-    private var isAtEndOfStream: Bool
-    {
+    private var isAtEndOfStream: Bool {
         assert(currIdx <= bytes.count)
         return currIdx == bytes.count
     }
 
     /// Returns true if and only if the cursor is currently at a whitespace character.  The characters considered whitespace are the same as the `isspace()` function, i.e. space (` `), horizontal tab (`\t`), vertical tab (`\v`), carriage return (`\r`), newline (`\n`), and form feed (`\f`).
-    private var isAtWhitespace: Bool
-    {
+    private var isAtWhitespace: Bool {
         return currChar == /* ' ' */ 32 || (currChar >= /* '\t' */ 9 && currChar <= /* '\r' */ 13)
     }
 
     /// Advances the cursor until it reaches end-of-string or until the block (which is invoked for each character) returns true.  Leaves the cursor at the character (if any) that caused the scan to stop.  Returns the (possibly empty) substring from the starting position to (but not including) the stop position.
-    private func scanUntil(_ block: (UInt8) -> Bool)
-    {
+    private func scanUntil(_ block: (UInt8) -> Bool) {
         // Record the starting index, and advance until we reach end-of-string or one of the specified stop characters.  After that we return the (possibly empty) substring.
         while !(isAtEndOfStream || block(currChar)) { advance() }
     }
 
-    private func scanUntil(_ block: () -> Bool)
-    {
+    private func scanUntil(_ block: () -> Bool) {
         // Record the starting index, and advance until we reach end-of-string or one of the specified stop characters.  After that we return the (possibly empty) substring.
         while !(isAtEndOfStream || block()) { advance() }
     }
 
-    func stringForToken(_ token: Token) -> String
-    {
-        return String(decoding: bytes[token.offset ..< token.offset+token.length], as: UTF8.self)
+    func stringForToken(_ token: Token) -> String {
+        return String(decoding: bytes[token.offset..<token.offset + token.length], as: UTF8.self)
     }
 
 }
 
-
 // MARK: Parsing
 
-
-private class ParserState
-{
+private class ParserState {
     var scanner: ScannerState
     var nextToken: Token
 
     let macroNamespace: MacroNamespace
 
-    init(_ scanner: ScannerState, _ macroNamespace: MacroNamespace)
-    {
+    init(_ scanner: ScannerState, _ macroNamespace: MacroNamespace) {
         self.scanner = scanner
         self.nextToken = scanner.getNextToken()
 
         self.macroNamespace = macroNamespace
     }
 
-    func step()
-    {
+    func step() {
         self.nextToken = scanner.getNextToken()
     }
 }
diff --git a/Sources/SWBMacro/MacroConditionParameter.swift b/Sources/SWBMacro/MacroConditionParameter.swift
index 9726b8ea..be85f56a 100644
--- a/Sources/SWBMacro/MacroConditionParameter.swift
+++ b/Sources/SWBMacro/MacroConditionParameter.swift
@@ -26,7 +26,7 @@ public final class MacroConditionParameter: Hashable, CustomStringConvertible, E
         hasher.combine(ObjectIdentifier(self))
     }
 
-    public static func ==(lhs: MacroConditionParameter, rhs: MacroConditionParameter) -> Bool {
+    public static func == (lhs: MacroConditionParameter, rhs: MacroConditionParameter) -> Bool {
         return lhs === rhs
     }
 
diff --git a/Sources/SWBMacro/MacroConditionSet.swift b/Sources/SWBMacro/MacroConditionSet.swift
index 8894baf8..b323298c 100644
--- a/Sources/SWBMacro/MacroConditionSet.swift
+++ b/Sources/SWBMacro/MacroConditionSet.swift
@@ -12,7 +12,7 @@
 
 public import SWBUtil
 
-public final class MacroConditionSet : Serializable, CustomStringConvertible, Sendable {
+public final class MacroConditionSet: Serializable, CustomStringConvertible, Sendable {
     /// The conditions, ordered from highest to lowest priority.
     public let conditions: Array<MacroCondition>
 
@@ -23,7 +23,7 @@ public final class MacroConditionSet : Serializable, CustomStringConvertible, Se
 
     /// Returns the condition for the parameter, if any.
     public subscript(_ parameter: MacroConditionParameter) -> MacroCondition? {
-        return conditions.first{ $0.parameter === parameter }
+        return conditions.first { $0.parameter === parameter }
     }
 
     /// Evaluates the condition against the dictionary of parameter values, returning `true` if there’s a match and `false` if not.  Missing values are interpreted as the empty value, and only match the condition if the `fnmatch()`-style pattern is `*` (meaning that it matches everything).
@@ -33,7 +33,7 @@ public final class MacroConditionSet : Serializable, CustomStringConvertible, Se
     }
 
     public var description: String {
-        return conditions.map{ "[\($0)]" }.joined(separator: "")
+        return conditions.map { "[\($0)]" }.joined(separator: "")
     }
 
     // Serialization
@@ -51,7 +51,7 @@ public final class MacroConditionSet : Serializable, CustomStringConvertible, Se
 }
 
 extension MacroConditionSet: Equatable {
-    public static func ==(lhs: MacroConditionSet, rhs: MacroConditionSet) -> Bool {
+    public static func == (lhs: MacroConditionSet, rhs: MacroConditionSet) -> Bool {
         return lhs.conditions == rhs.conditions
     }
 }
diff --git a/Sources/SWBMacro/MacroConfigFileDiagnostic.swift b/Sources/SWBMacro/MacroConfigFileDiagnostic.swift
index ccfb3811..9154619c 100644
--- a/Sources/SWBMacro/MacroConfigFileDiagnostic.swift
+++ b/Sources/SWBMacro/MacroConfigFileDiagnostic.swift
@@ -72,7 +72,7 @@ public struct MacroConfigFileDiagnostic: Sendable {
 }
 
 extension MacroConfigFileDiagnostic: Equatable {
-    public static func ==(lhs: MacroConfigFileDiagnostic, rhs: MacroConfigFileDiagnostic) -> Bool {
+    public static func == (lhs: MacroConfigFileDiagnostic, rhs: MacroConfigFileDiagnostic) -> Bool {
         if lhs.kind != rhs.kind { return false }
         if lhs.level != rhs.level { return false }
         if lhs.message != rhs.message { return false }
diff --git a/Sources/SWBMacro/MacroConfigFileParser.swift b/Sources/SWBMacro/MacroConfigFileParser.swift
index 63610a08..8611109d 100644
--- a/Sources/SWBMacro/MacroConfigFileParser.swift
+++ b/Sources/SWBMacro/MacroConfigFileParser.swift
@@ -53,7 +53,6 @@ public final class MacroConfigFileParser {
     /// Index of the start of the current line in the byte array.
     private var currentLineStartIdx: Int = 0
 
-
     /// Initializes the macro expression parser with the given string and delegate.  How the string is parsed depends on the particular parse method that’s invoked, such as `parseAsString()` or `parseAsStringList()`, and not on the configuration of the parser.
     public init(byteString: ByteString, path: Path, delegate: (any MacroConfigFileParserDelegate)?) {
         self.delegate = delegate
@@ -70,78 +69,71 @@ public final class MacroConfigFileParser {
     /// Returns the current column number of the parser. Column numbers are one-based.
     public var columnNumber: Int { return currIdx - currentLineStartIdx + 1 }
 
-    /*
-
-    Grammar:
-
-      xcconfig:
-        line
-
-      line:
-        "" // empty
-        "#" directive
-        assignment ';'?
-
-      directive:
-        "include" '\"' string '\"'
-        "include?" '\"' string '\"'
-
-      assignment:
-        macro '='
-        macro '=' value
-        macro conditions '=' value
-
-      conditions:
-        condition
-        conditions condition
-
-      condition:
-        '[' condition-parameter '=' condition-pattern ']'
-
-      condition-parameter:
-        anything-except-equals-sign-and-right-bracket+
-
-      condition-pattern:
-        anything-except-right-bracket+
-
-      comment:
-        '/' '/' anything-except-newline '\n'
-
-      end-of-line:
-        '\n'
-        '\r'
-        '\r' '\n'
-        <unicode line separator>
-        <unicode paragraph separator>
-
-    */
-
+    /**
+     * Grammar:
+     *
+     *   xcconfig:
+     *     line
+     *
+     *   line:
+     *     "" // empty
+     *     "#" directive
+     *     assignment ';'?
+     *
+     *   directive:
+     *     "include" '\"' string '\"'
+     *     "include?" '\"' string '\"'
+     *
+     *   assignment:
+     *     macro '='
+     *     macro '=' value
+     *     macro conditions '=' value
+     *
+     *   conditions:
+     *     condition
+     *     conditions condition
+     *
+     *   condition:
+     *     '[' condition-parameter '=' condition-pattern ']'
+     *
+     *   condition-parameter:
+     *     anything-except-equals-sign-and-right-bracket+
+     *
+     *   condition-pattern:
+     *     anything-except-right-bracket+
+     *
+     *   comment:
+     *     '/' '/' anything-except-newline '\n'
+     *
+     *   end-of-line:
+     *     '\n'
+     *     '\r'
+     *     '\r' '\n'
+     *     <unicode line separator>
+     *     <unicode paragraph separator>
+     *
+     **/
 
     /// Checks whether the cursor is at the end of a line, i.e. either at a line terminator (\n, \r, \r\n, or a UTF8-coded Unicode Line Separator or Paragraph Separator) or at the end of the entire input.
     private var isAtEndOfLine: Bool {
         return isAtEndOfStream || currChar == /* '\n' */ 10 || currChar == /* '\r' */ 13 || (currChar == 0xE2 && nextChar == 0x80 && (nextNextChar == /* Unicode Line Separator */ 0xA8 || nextNextChar == /* Unicode Paragraph Separator */ 0xA9))
     }
 
-
     /// Checks whether the cursor is at the start of a `//` style comment.
     private var isAtStartOfComment: Bool {
         return currChar == /* '/' */ 47 && nextChar == /* '/' */ 47
     }
 
-
     /// If the cursor is at an end-of-line (as determined by `isAtEOL()`), it is advanced past the end-of-line and `currLine` is incremented.  Otherwise this function does nothing.  Note that an end-of-line may be one, two, or three bytes in length.
     private func scanEOL() {
         var advancement = 0
         if currChar == /* '\n' */ 10 {
             advancement = 1
-        }
-        else if currChar == /* '\r' */ 13 {
+        } else if currChar == /* '\r' */ 13 {
             advancement = (nextChar == /* '\n' */ 10) ? 2 : 1
-        }
-        else if currChar == 0xE2 && nextChar == 0x80 && (nextNextChar == 0xA8 || nextNextChar == 0xA9) {
+        } else if currChar == 0xE2 && nextChar == 0x80 && (nextNextChar == 0xA8 || nextNextChar == 0xA9) {
             advancement = 3
-        }
-        else {
+        } else {
             return
         }
         advance(advancement)
@@ -149,25 +141,21 @@ public final class MacroConfigFileParser {
         currentLineStartIdx = currIdx
     }
 
-
     /// Advances the cursor until it reaches the next line terminator or end-of-stream. Does nothing if the cursor is already at the end of a line or of the stream.
     private func skipRestOfLine() {
         while !isAtEndOfLine { advance() }
     }
 
-
     /// Advances the cursor past spaces, tabs, and comments (but doesn’t go past an end-of-line).
     private func skipWhitespaceAndComments() {
         while !isAtEndOfStream {
             if currChar.isASCIISpace {
                 // Normal whitespace — skip to the next byte.
                 advance()
-            }
-            else if isAtStartOfComment {
+            } else if isAtStartOfComment {
                 // Start of single-line comment.  Skip the rest of the line.
                 skipRestOfLine()
-            }
-            else {
+            } else {
                 break
             }
         }
@@ -183,7 +171,7 @@ public final class MacroConfigFileParser {
             // FIXME: We should really handle escapes here too.
             let markIdx = currIdx
             scanUntil({ self.isAtEndOfLine || $0 == /* '\"' */ 34 })
-            let fileName = String(decoding: bytes[markIdx ..< currIdx], as: UTF8.self)
+            let fileName = String(decoding: bytes[markIdx..<currIdx], as: UTF8.self)
 
             // If we found a doublequote, we have a string, otherwise we have an unterminated quote.
             if currChar == /* '\"' */ 34 {
@@ -213,8 +201,7 @@ public final class MacroConfigFileParser {
         if isAtEndOfLine {
             // An empty line.
             return
-        }
-        else if currChar != /* '#' */ 35 {
+        } else if currChar != /* '#' */ 35 {
             // We stopped at something other than a ‘#’ character.  That’s unexpected.
             delegate?.handleDiagnostic(MacroConfigFileDiagnostic(kind: .unexpectedCharacter, level: .error, message: "expected a preprocessor directive, but found \(Character(Unicode.Scalar(currChar)))", lineNumber: lineNumber), parser: self)
             skipRestOfLine()
@@ -238,7 +225,7 @@ public final class MacroConfigFileParser {
         // Collect the directive keyword.
         let markIdx = currIdx
         scanUntil({ self.isAtWhitespace })
-        let directive = String(decoding: bytes[markIdx ..< currIdx], as: UTF8.self)
+        let directive = String(decoding: bytes[markIdx..<currIdx], as: UTF8.self)
 
         // Check for known directives.
         var includeIsOptional = false
@@ -263,21 +250,18 @@ public final class MacroConfigFileParser {
 
                         // In order to detect cycles, we need to keep track of when we complete parsing a config file.
                         delegate?.endPreprocessorInclusion()
-                    }
-                    else {
+                    } else {
                         // We couldn't parse the included file, so we return.  (We expected that the delegate would emit any errors.)
                         skipRestOfLine()
                         return
                     }
-                }
-                else {
+                } else {
                     // If we have extra stuff at the end of the line, we report an error.
                     delegate?.handleDiagnostic(MacroConfigFileDiagnostic(kind: .unexpectedCharacter, level: .error, message: "unexpected character at end of line: ‘\(Character(Unicode.Scalar(currChar)))’", lineNumber: lineNumber), parser: self)
                     skipRestOfLine()
                     return
                 }
-            }
-            else {
+            } else {
                 // parseQuotedString has already emitted and error and skipped the rest of the line.
                 return
             }
@@ -300,8 +284,7 @@ public final class MacroConfigFileParser {
         if isAtEndOfLine {
             // An empty line.
             return
-        }
-        else if !isValidMacroName1stChar(currChar) {
+        } else if !isValidMacroName1stChar(currChar) {
             // We stopped at something other than a valid macro name.  That’s unexpected.
             delegate?.handleDiagnostic(MacroConfigFileDiagnostic(kind: .unexpectedCharacter, level: .error, message: "expected a macro name, but found \(Character(Unicode.Scalar(currChar)))", lineNumber: lineNumber), parser: self)
             skipRestOfLine()
@@ -313,7 +296,7 @@ public final class MacroConfigFileParser {
         let markIdx = currIdx
         advance()
         scanUntil({ !isValidMacroNameNthChar($0) })
-        let name = String(decoding: bytes[markIdx ..< currIdx], as: UTF8.self)
+        let name = String(decoding: bytes[markIdx..<currIdx], as: UTF8.self)
 
         // Otherwise, we were able to collect the macro name.  Whitespace is fine at this point.
         skipWhitespaceAndComments()
@@ -331,13 +314,12 @@ public final class MacroConfigFileParser {
             }
             let paramMarkIdx = currIdx
             scanUntil(isAtConditionSeparator)
-            let param = String(decoding: bytes[paramMarkIdx ..< currIdx], as: UTF8.self)
+            let param = String(decoding: bytes[paramMarkIdx..<currIdx], as: UTF8.self)
             if isAtEndOfLine {
                 delegate?.handleDiagnostic(MacroConfigFileDiagnostic(kind: .unexpectedCharacter, level: .error, message: "unterminated macro condition on line \(lineNumber)", lineNumber: lineNumber), parser: self)
                 skipRestOfLine()
                 return
-            }
-            else if currChar == /* ']' */ 93 {
+            } else if currChar == /* ']' */ 93 {
                 delegate?.handleDiagnostic(MacroConfigFileDiagnostic(kind: .unexpectedCharacter, level: .error, message: "expected to find ‘=’ in macro condition", lineNumber: lineNumber), parser: self)
                 skipRestOfLine()
                 return
@@ -350,7 +332,7 @@ public final class MacroConfigFileParser {
             // Collect the condition parameter pattern.
             let patternMarkIdx = currIdx
             scanUntil({ self.isAtEndOfLine || $0 == /* ']' */ 93 })
-            let pattern = String(decoding: bytes[patternMarkIdx ..< currIdx], as: UTF8.self)
+            let pattern = String(decoding: bytes[patternMarkIdx..<currIdx], as: UTF8.self)
             if isAtEndOfLine {
                 delegate?.handleDiagnostic(MacroConfigFileDiagnostic(kind: .unexpectedCharacter, level: .error, message: "unterminated macro condition", lineNumber: lineNumber), parser: self)
                 skipRestOfLine()
@@ -381,13 +363,13 @@ public final class MacroConfigFileParser {
         let startLine = currLine
         let startColumn = currIdx - startOfLine
 
-        var chunks : [String] = []
+        var chunks: [String] = []
         while let chunk = parseNonListAssignmentRHS() {
             // we have already ensured chunk doesn't have trailing spaces
             if chunk.hasSuffix("\\") {
                 // we should drop the line continuation character from the chunk
                 let trimmed = chunk.dropLast().trimmingCharacters(in: .whitespaces)
-                if !trimmed.isEmpty { // no need to add empty lines
+                if !trimmed.isEmpty {  // no need to add empty lines
                     chunks.append(String(trimmed))
                 }
                 // and then we should read yet another line as the new chunk
@@ -413,7 +395,6 @@ public final class MacroConfigFileParser {
         }
         // MARK: by here we know we are not dealing with purely whitespace line.
 
-
         // Now the value. We mostly just collect characters, but one quirk of the Xcode semantics is that `//` will still start a single-line comment.
 
         let valueMarkIdx = currIdx
@@ -426,25 +407,24 @@ public final class MacroConfigFileParser {
         }
 
         // Trim any trailing whitespace off of the end of the value.
-        while endIdx > valueMarkIdx && bytes[endIdx-1].isASCIISpace {
+        while endIdx > valueMarkIdx && bytes[endIdx - 1].isASCIISpace {
             endIdx -= 1
         }
 
         // Trim any trailing semicolon (and preceding whitespace).
-        if bytes[endIdx-1] == /* ';' */ 59 {
+        if bytes[endIdx - 1] == /* ';' */ 59 {
             endIdx -= 1
-            while endIdx > valueMarkIdx && bytes[endIdx-1].isASCIISpace {
+            while endIdx > valueMarkIdx && bytes[endIdx - 1].isASCIISpace {
                 endIdx -= 1
             }
         }
 
         // Make the value into a string.
-        let value = String(decoding: bytes[valueMarkIdx ..< endIdx], as: UTF8.self)
+        let value = String(decoding: bytes[valueMarkIdx..<endIdx], as: UTF8.self)
 
         return value
     }
 
-
     /// Parses the input string as a sequence of lines.  Each line is terminated by one of: \n, \r, \r\n, Unicode Line Separator, or Unicode Paragraph Separator.  Single-line comments starting with `//` are supported and elided from the input text.  Any remaining non-empty line is expected to be either a preprocessor directive (indicated by a `#` as the first non-whitespace character) or a macro value assignment statement (parsed separately).
     public func parse() {
         // We consider the input string to be a sequence of lines of text.
@@ -455,16 +435,13 @@ public final class MacroConfigFileParser {
             // We may have reached the end of the line, or a preprocessor directive, or a macro value assignment.
             if isAtEndOfLine {
                 // A completely empty line.
-            }
-            else if currChar == /* '#' */ 35 {
+            } else if currChar == /* '#' */ 35 {
                 // A preprocessor directive.
                 parsePreprocessorDirective()
-            }
-            else if isValidMacroName1stChar(currChar) {
+            } else if isValidMacroName1stChar(currChar) {
                 // A macro value assignment.
                 parseMacroValueAssignment()
-            }
-            else if !isAtEndOfLine {
+            } else if !isAtEndOfLine {
                 // Anything else is an error.
                 delegate?.handleDiagnostic(MacroConfigFileDiagnostic(kind: .unexpectedCharacter, level: .error, message: "unexpected character ‘\(Character(Unicode.Scalar(currChar)))’", lineNumber: lineNumber), parser: self)
                 skipRestOfLine()
@@ -483,7 +460,6 @@ public final class MacroConfigFileParser {
         finalColumnNumber = columnNumber
     }
 
-
     /// Returns the UTF-8 byte at the current position, which is zero if the cursor is currently at the very end of the string.
     private var currChar: UInt8 {
         assert(currIdx <= bytes.count)
@@ -533,7 +509,7 @@ public final class MacroConfigFileParser {
     /// Public static function to parse a macro name (with a possible condition set suffix) into a name string and a condition set.
     public static func parseMacroNameAndConditionSet(_ string: String) -> (String?, [(param: String, pattern: String)]?) {
         // We do this using our existing parsing code.
-        class SingleMacroNameDelegate : MacroConfigFileParserDelegate {
+        class SingleMacroNameDelegate: MacroConfigFileParserDelegate {
             var macroName: String?
             var conditions: [(param: String, pattern: String)]?
             func foundPreprocessorInclusion(_ fileName: String, optional: Bool, parser: MacroConfigFileParser) -> MacroConfigFileParser? {
@@ -556,7 +532,6 @@ public final class MacroConfigFileParser {
     }
 }
 
-
 /// Returns true if and only if `ch` is an uppercase or lowercase letter in the ASCII range (i.e., it matches '[A-Za-z]').
 private func isAlpha(_ ch: UInt8) -> Bool {
     return (ch >= /* 'A' */ 65 && ch <= /* 'Z' */ 90) || (ch >= /* 'a' */ 97 && ch <= /* 'z' */ 122)
@@ -577,7 +552,6 @@ private func isValidMacroNameNthChar(_ ch: UInt8) -> Bool {
     return isAlpha(ch) || isDigit(ch) || ch == /* '_' */ 95
 }
 
-
 /// Encapsulates the callbacks that a .xcconfig file parser invokes during a parse.  All methods are optional.  Separating the actions into a protocol allows the .xcconfig parser to be used for a variety of tasks, and makes it easier to test and profile.  The parser is passed to each of the delegate methods, and its `position` property can be used to access the current index in the original string.  The parser is as lenient as possible, and tries to recover from errors as well as possible in order to preserve the Xcode semantics.  The delegate is guaranteed to see the entire contents of the input string, regardless of how many errors are discovered (some of that contents might be misparsed in the wake of errors, however).
 public protocol MacroConfigFileParserDelegate {
 
diff --git a/Sources/SWBMacro/MacroDeclaration.swift b/Sources/SWBMacro/MacroDeclaration.swift
index 9ae5d4a9..46c76399 100644
--- a/Sources/SWBMacro/MacroDeclaration.swift
+++ b/Sources/SWBMacro/MacroDeclaration.swift
@@ -33,7 +33,7 @@ public class MacroDeclaration: Hashable, CustomStringConvertible, Encodable, @un
     }
 
     /// Tests for quality based on the identities of the two macro declarations.
-    public static func ==(lhs: MacroDeclaration, rhs: MacroDeclaration) -> Bool {
+    public static func == (lhs: MacroDeclaration, rhs: MacroDeclaration) -> Bool {
         return lhs === rhs
     }
 
diff --git a/Sources/SWBMacro/MacroEvaluationProgram.swift b/Sources/SWBMacro/MacroEvaluationProgram.swift
index 530329c5..e6b97fcb 100644
--- a/Sources/SWBMacro/MacroEvaluationProgram.swift
+++ b/Sources/SWBMacro/MacroEvaluationProgram.swift
@@ -377,33 +377,32 @@ final class MacroEvaluationProgram: Serializable, Sendable {
         for instr in instructions {
             switch instr {
 
-              case .appendLiteral(let s):
+            case .appendLiteral(let s):
                 // Emit a literal sequence of characters to the result buffer.  Even an empty string can have significant meaning if it causes a pending list element separator to be made real, so we don’t take any shortcuts here by checking for empty string or anything like that.  Any instruction that is actually unnecessary should have already been optimized out by the instruction generation logic anyway.
                 (subresults.last ?? resultBuilder).append(s)
 
-              case .appendStringFormOnlyLiteral(let s):
+            case .appendStringFormOnlyLiteral(let s):
                 // Emit a literal sequence of characters to the result buffer, as with `.appendLiteral`, but only if 'alwaysEvalAsString' is true.  This is used for whitespace, quotes, and escape characters that appear in the string form but not the string list form.  This allows the same macro evaluation program to be used for both the string form and the string list form.
                 if alwaysEvalAsString {
                     (subresults.last ?? resultBuilder).append(s)
                 }
 
-              case .setNeedsListSeparator(let s):
+            case .setNeedsListSeparator(let s):
                 // Either set a list separator or add a string-list-form-only substring (such as whitespace) to the result buffer, depending on whether or not the caller wants us to always execute the evaluation program as a string.  Note that we don’t look at `allEvalsAreStrings` here — that refers to evaluation of any embedded macro references.
                 if alwaysEvalAsString {
                     // Add the whitespace which was captured for this separator in the string form.
                     (subresults.last ?? resultBuilder).append(s)
-                }
-                else {
+                } else {
                     // Tell the result builder that we’ll need a list element separator.  This doesn’t add one immediately, but rather sets a flag so that the next `.appendLiteral` instruction will cause a list separator to be added.  This allows us to, for example, concatenate a completely empty array without getting extraneous list separators.
                     (subresults.last ?? resultBuilder).setNeedsListElementSeparator()
                 }
 
-              case .beginSubresult:
+            case .beginSubresult:
                 // Push a new, empty buffer onto the top of the subresult stack.  This must be balanced by one of the below instructions that use and pop result buffers off the stack.
                 let subresult = MacroEvaluationResultBuilder()
                 subresults.append(subresult)
 
-              case .evalNamedMacro(let asString, let preservesOriginal):
+            case .evalNamedMacro(let asString, let preservesOriginal):
                 // Pop the topmost subresult buffer, and use its contents as the name of a macro to evaluate.  It’s an internal error if the subresult stack is empty.
                 let nb = subresults.popLast()!
                 let s = nb.buildString()
@@ -413,8 +412,7 @@ final class MacroEvaluationProgram: Serializable, Sendable {
                     if let value = context.nextValueForMacro(macro) {
                         // We found a value, so we evaluate its associated "macro evaluation program” into it the topmost subresult buffer.  Note that multiple programs often contribute to the same buffer, e.g. in "$(X)/$(Y)".
                         value.expression.evaluate(context: MacroEvaluationContext(scope: context.scope, macro: macro, value: value, parent: context), resultBuilder: subresults.last!, alwaysEvalAsString: asString || alwaysEvalAsString)
-                    }
-                    else {
+                    } else {
                         if preservesOriginal {
                             // If we are preserving the original string, we append it now.
                             (subresults.last ?? resultBuilder).append("$" + s)
@@ -425,20 +423,19 @@ final class MacroEvaluationProgram: Serializable, Sendable {
                             }
                         }
                     }
-                }
-                else {
+                } else {
                     // It’s an unknown macro, so we cannot possibly have any definition for it — this should really be reported back as an error, and we should refine the API so that we can tell the calling context about it.  For now we silently append either the original string, if we've been asked to preserve it.
                     if preservesOriginal {
                         (subresults.last ?? resultBuilder).append("$" + s)
                     }
                 }
 
-              case .mergeSubresult:
+            case .mergeSubresult:
                 // Pop the topmost subresult buffer, and merge its contents into the buffer below it buffer.  It’s an internal error if the subresult stack is empty.
                 let nb = subresults.popLast()!
                 (subresults.last ?? resultBuilder).appendContentsOfResultBuilder(nb)
 
-              case .applyRetrievalOperator(let op):
+            case .applyRetrievalOperator(let op):
                 // Pop the topmost subresult buffer, and apply the retrieval operator to each of its elements.  This results in a new equivalent subresult buffer, which we then push.  It’s an internal error if the subresult stack is empty.
                 let sb = subresults.popLast()!
                 let nb = MacroEvaluationResultBuilder()
@@ -448,7 +445,7 @@ final class MacroEvaluationProgram: Serializable, Sendable {
                 }
                 subresults.append(nb)
 
-              case .applyReplacementOperator(let op):
+            case .applyReplacementOperator(let op):
                 // Pop the topmost subresult buffer, and apply the retrieval operator to each of its elements.  This results in a new equivalent subresult buffer, which we then push.  It’s an internal error if the subresult stack is empty.
                 let operand = subresults.popLast()!.buildString()
                 let sb = subresults.popLast()!
@@ -458,8 +455,7 @@ final class MacroEvaluationProgram: Serializable, Sendable {
                         nb.append(op.apply(to: elem, withReplacement: operand))
                         nb.setNeedsListElementSeparator()
                     }
-                }
-                else {
+                } else {
                     // Special case: If the subresult buffer is empty, but the operator wants to be applied even to empty results, then we do so here, applying it to an empty string.
                     if op.applyToEmptyResult {
                         nb.append(op.apply(to: "", withReplacement: operand))
@@ -508,7 +504,6 @@ final class MacroEvaluationProgram: Serializable, Sendable {
     }
 }
 
-
 /// A helper class to build a MacroEvaluationProgram.  Regular clients of macro evaluation don’t need to be aware of this class.
 final class MacroEvaluationProgramBuilder {
 
@@ -526,7 +521,6 @@ final class MacroEvaluationProgramBuilder {
     }
 }
 
-
 /// Lets a macro expression evaluator program build a result (either a string or a string list).  Conceptually, the result consists of a sequence of literal string fragments separated by “list element separators”, which demarcate the subranges of the result string that form the string list elements.  Both string and string list results are supported using the same function (a string and a single-element string list are the same thing, in practical terms).  This approach of a single string demarcated by separators is conceptually quite similar to how, for example, a continuous stream of audio data is separated into tracks using “cue sheet split points” on a CD.  In the case of macro expression evaluation, this approach avoids many of the special cases that would otherwise occur when evaluating a string list that refers to a mixture of string and string list subexpressions.
 final class MacroEvaluationResultBuilder {
 
@@ -545,7 +539,7 @@ final class MacroEvaluationResultBuilder {
     fileprivate private(set) var hasHadAnyTextAppended = false
 
     /// Create a macro result builder.
-    init() { }
+    init() {}
 
     /// If the “needs list element separator” flag has been set, this function adds a list separator for the index corresponding to the current end of the accumulator string, and clears the flag.  Otherwise, this function does nothing.  Clients never invoke this function directly — instead, they note the need for a list element separator and let it be created the next time anything is appended.
     private func applyPendingListElementSeparatorIfNeeded() {
diff --git a/Sources/SWBMacro/MacroEvaluationScope.swift b/Sources/SWBMacro/MacroEvaluationScope.swift
index 0c4c5e14..8157c7d8 100644
--- a/Sources/SWBMacro/MacroEvaluationScope.swift
+++ b/Sources/SWBMacro/MacroEvaluationScope.swift
@@ -27,12 +27,18 @@ private extension MacroValueAssignmentTable {
 
 /// A lightweight parameterized “view” of a MacroValueAssignmentTable, allowing clients to evaluate macro expressions under a particular set of conditions.  In the future a MacroEvaluationScope will also bind conditions to affect the values that are found in the table.  Unlike many of the other classes in the macro evaluation subsystem, MacroEvaluationScope is a prominent class from a client perspective — after declaring macros, parsing macro expressions, and creating macro-to-expression tables, all actual evaluation occurs through a MacroEvaluationScope.
 public final class MacroEvaluationScope: Serializable, Sendable {
-    static let evaluations = Statistic("MacroEvaluationScope.evaluations",
-        "The number of evaluation requests.")
-    static let evaluationsComputed = Statistic("MacroEvaluationScope.evaluationsComputed",
-        "The number of evaluations which were actually computed (not cached).")
-    static let exprEvaluations = Statistic("MacroEvaluationScope.exprEvaluations",
-        "The number of expression evaluation requests.")
+    static let evaluations = Statistic(
+        "MacroEvaluationScope.evaluations",
+        "The number of evaluation requests."
+    )
+    static let evaluationsComputed = Statistic(
+        "MacroEvaluationScope.evaluationsComputed",
+        "The number of evaluations which were actually computed (not cached)."
+    )
+    static let exprEvaluations = Statistic(
+        "MacroEvaluationScope.exprEvaluations",
+        "The number of expression evaluation requests."
+    )
 
     private struct SubscopeKey: Hashable {
         let parameter: MacroConditionParameter
@@ -227,8 +233,6 @@ public final class MacroEvaluationScope: Serializable, Sendable {
         return compute()
     }
 
-
-
     /// Evaluate the given string macro and return the result.
     ///
     /// - Parameter lookup: If provided, this closure will be invoked for each initial macro lookup to potentially supply an alternate expression to evaluate.
@@ -274,9 +278,9 @@ public final class MacroEvaluationScope: Serializable, Sendable {
                         serializer.serialize(parm.name)
                         serializer.serialize(values)
                     }
-                }   // key-value pair
-            }   // conditionParameterValues
-        }   // the whole scope
+                }  // key-value pair
+            }  // conditionParameterValues
+        }  // the whole scope
     }
 
     public init(from deserializer: any Deserializer) throws {
@@ -297,8 +301,7 @@ public final class MacroEvaluationScope: Serializable, Sendable {
             let parm: MacroConditionParameter
             if let aParm = delegate.namespace.lookupConditionParameter(parmName) {
                 parm = aParm
-            }
-            else {
+            } else {
                 parm = delegate.namespace.declareConditionParameter(parmName)
             }
 
diff --git a/Sources/SWBMacro/MacroExpression.swift b/Sources/SWBMacro/MacroExpression.swift
index e54655c5..5fba8eb2 100644
--- a/Sources/SWBMacro/MacroExpression.swift
+++ b/Sources/SWBMacro/MacroExpression.swift
@@ -13,7 +13,7 @@
 public import SWBUtil
 
 /// A macro value expression is a parsed representation of a string that might contain macro references.  Parsed macro expressions are immutable, and depend only on the contents of the input string.  Macro names are currently bound after parsing, so macro expressions are in fact independent of the namespace that was used to parse them.  There is no public API on MacroExpression to evaluate it in a MacroEvaluationScope — instead, use the `evaluate()` method on MacroEvaluationScope.
-public class MacroExpression : PolymorphicSerializable, CustomStringConvertible, @unchecked Sendable {
+public class MacroExpression: PolymorphicSerializable, CustomStringConvertible, @unchecked Sendable {
 
     /// String representation from which the expression was instantiated.
     public let stringRep: String
@@ -64,23 +64,23 @@ public class MacroExpression : PolymorphicSerializable, CustomStringConvertible,
     public static let implementations: [SerializableTypeCode: any PolymorphicSerializable.Type] = [
         0: MacroExpression.self,
         1: MacroStringExpression.self,
-        2: MacroStringListExpression.self
-        ]
+        2: MacroStringListExpression.self,
+    ]
 }
 
 extension MacroExpression: Equatable {
-    public static func ==(lhs: MacroExpression, rhs: MacroExpression) -> Bool {
+    public static func == (lhs: MacroExpression, rhs: MacroExpression) -> Bool {
         // Two MacroExpressions are the same if they are of the same type and have the same string representation.
         return type(of: lhs) == type(of: rhs) && lhs.stringRep == rhs.stringRep
     }
 }
 
 /// Represents a macro expression that can be evaluated as a string.
-public final class MacroStringExpression : MacroExpression, Encodable, @unchecked Sendable {
+public final class MacroStringExpression: MacroExpression, Encodable, @unchecked Sendable {
 }
 
 /// Represents a macro expression that can be evaluated as a string list.
-public final class MacroStringListExpression : MacroExpression, Encodable, @unchecked Sendable {
+public final class MacroStringListExpression: MacroExpression, Encodable, @unchecked Sendable {
 }
 
 /// Support static storage of parsed string expressions.
diff --git a/Sources/SWBMacro/MacroExpressionDiagnostic.swift b/Sources/SWBMacro/MacroExpressionDiagnostic.swift
index d67ae774..43d03652 100644
--- a/Sources/SWBMacro/MacroExpressionDiagnostic.swift
+++ b/Sources/SWBMacro/MacroExpressionDiagnostic.swift
@@ -72,7 +72,7 @@ public struct MacroExpressionDiagnostic: CustomDebugStringConvertible, Sendable
 }
 
 extension MacroExpressionDiagnostic: Equatable {
-    public static func ==(lhs: MacroExpressionDiagnostic, rhs: MacroExpressionDiagnostic) -> Bool {
+    public static func == (lhs: MacroExpressionDiagnostic, rhs: MacroExpressionDiagnostic) -> Bool {
         if lhs.string != rhs.string { return false }
         if lhs.range != rhs.range { return false }
         if lhs.kind != rhs.kind { return false }
diff --git a/Sources/SWBMacro/MacroExpressionParsing.swift b/Sources/SWBMacro/MacroExpressionParsing.swift
index 601927a4..93039216 100644
--- a/Sources/SWBMacro/MacroExpressionParsing.swift
+++ b/Sources/SWBMacro/MacroExpressionParsing.swift
@@ -34,11 +34,9 @@ public final class MacroExpressionParser {
         self.currIdx = utf8.startIndex
     }
 
-
     /// Returns the current position of the scanner, as an index into the input string (which can be accessed through the `string` property).  This is commonly used by custom implementations of the parser delegate function callbacks — the description of each callback function specifies the guaranteed position of the parser in the input string at the time the callback function is invoked.
     private var position: Input.Index { return currIdx }
 
-
     /// Parses the contents of the input string as a macro expression using string semantics, i.e. one that doesn’t attach special significance to quotes and whitespace.  The parser’s delegate methods are invoked as the expression is parsed — this includes methods for detecting warnings and errors.  In accordance with historical semantics, parsing tries to recover after errors, so that as many errors as possible can be detected in one parse.
     public func parseAsString() {
         // Check for the edge case of a completely empty string.
@@ -53,8 +51,7 @@ public final class MacroExpressionParser {
             if currChar == UInt8(ascii: "$") {
                 // We found a substitution subexpression of some kind.  We parse it, invoking delegate methods and advancing the cursor as we go.
                 parseSubstitutionSubexpression(alwaysEvalAsString: true)
-            }
-            else {
+            } else {
                 // Collect literal characters until we either find another substitution subexpression or reach end-of-string.
                 if let literal = scanUntil(UInt8(ascii: "$")) {
                     // We found at least one literal character, so tell the delegate about it.
@@ -67,7 +64,6 @@ public final class MacroExpressionParser {
         assert(isAtEnd)
     }
 
-
     /// Parses the contents of the input string as a macro expression using string list semantics, i.e. one that respects quotes and backslashes, and that treats unquoted whitespace as string list element separators.  The parser’s delegate methods are invoked as the expression is parsed — this includes methods for detecting warnings and errors.  Of special note is that the delegate’s “list element separator” callback is invoked between list elements.  In accordance with historical semantics, parsing tries to recover after errors, so that as many errors as possible can be detected in one parse.
     public func parseAsStringList() {
         // Capture unquoted unescaped whitespace to be emitted only when evaluating as a string.  We don't capture it as a list separator because we never have a separator before the first element of the list.
@@ -98,7 +94,6 @@ public final class MacroExpressionParser {
         assert(isAtEnd)
     }
 
-
     /// Private function that parses a chunk of whitespace, stopping at end-of-string or at the first non-whitespace character.  The cursor is expected to already be positioned at the first whitespace character of the chunk.  The parser’s delegate methods are invoked as the whitespace is traversed — this includes methods for detecting warnings and errors.
     private func parseWhitespace(asListSeparator parseAsListSeparator: Bool) {
         // If we're not at a whitespace character then we return.  (In principle this should never happen.)
@@ -110,14 +105,12 @@ public final class MacroExpressionParser {
 
         // If directed to capture the whitespace as a list separator, then we do so - *except* that if the whitespace is at the end of the string, then we don't treat it as a list separator.
         if parseAsListSeparator && !isAtEnd {
-            delegate.foundListElementSeparator(utf8[markIdx ..< currIdx], parser: self)
-        }
-        else {
-            delegate.foundStringFormOnlyLiteralStringFragment(utf8[markIdx ..< currIdx], parser: self)
+            delegate.foundListElementSeparator(utf8[markIdx..<currIdx], parser: self)
+        } else {
+            delegate.foundStringFormOnlyLiteralStringFragment(utf8[markIdx..<currIdx], parser: self)
         }
     }
 
-
     /// Private function that parses an entire substitution subexpresson, including its delimiters (if any).  This function expects to be called with the cursor positioned at the `$` character that starts the subexpression (this is asserted).  If `alwaysEvalAsString` is true, the delegate will be informed that this subexpression should always evaluate as a string — if it is false, then it should evaluate as either a string or a string list, depending on circumstances.  This does not affect parsing, but the delegate is expected to record this flag to use during macro expression evaluation.  This is used to pass down context about whether or not, for example, a particular substitution expression occurs inside quotes.  The parser’s delegate methods are invoked as the expression is parsed — this includes methods for detecting warnings and errors.  In accordance with historical semantics, parsing tries to recover after errors, so that as many errors as possible can be detected in one parse.
     private func parseSubstitutionSubexpression(alwaysEvalAsString: Bool) {
         // We expect to be called with the cursor positioned at the ‘$’ that starts the substitution expression (this is a private method and that assumption is part of our documented contract).
@@ -137,8 +130,7 @@ public final class MacroExpressionParser {
 
             // Also tell the delegate that we’ve found a literal ‘$’ (historically, we’ve treated dangling ‘$’ characters as literal).
             delegate.foundLiteralStringFragment(utf8[origIdx..<currIdx], parser: self)
-        }
-        else if let closeDelim = getClosingDelimiter(currChar!) {
+        } else if let closeDelim = getClosingDelimiter(currChar!) {
             // We found the start of a macro subexpression.  We parse it, keeping in mind that it might consist of other subexpressions nested to an arbitrary depth.
 
             // Check for deprecated delimiters.
@@ -166,8 +158,7 @@ public final class MacroExpressionParser {
             if isAtEnd {
                 // We unexpectedly reached end-of-string before we found a closing delimiter, so we emit an error.
                 delegate.handleDiagnostic(MacroExpressionDiagnostic(string: string, range: origIdx..<currIdx, kind: .unterminatedMacroSubexpression, level: .error), parser: self)
-            }
-            else if currIdx == nameIdx {
+            } else if currIdx == nameIdx {
                 // We didn’t reach end-of-string but we also didn’t find a macro name at all, so we emit an error.
                 delegate.handleDiagnostic(MacroExpressionDiagnostic(string: string, range: currIdx..<currIdx, kind: .missingMacroName, level: .error), parser: self)
             }
@@ -187,21 +178,18 @@ public final class MacroExpressionParser {
                 if isAtEnd {
                     // We unexpectedly reached end-of-string, so we emit an error.
                     delegate.handleDiagnostic(MacroExpressionDiagnostic(string: string, range: currIdx..<currIdx, kind: .unterminatedMacroSubexpression, level: .error), parser: self)
-                }
-                else if currChar == UInt8(ascii: ":") || currChar == closeDelim {
+                } else if currChar == UInt8(ascii: ":") || currChar == closeDelim {
                     // We have a retrieval operator, which retrieves a part of the evaluated macro value (e.g. extracts a directory, a file name, or file suffix).
 
                     // Check if we have an operator name.
                     if let operName = possibleOperName {
                         // We have an operator name, so we tell the delegate that we found a retrieval operator.
                         delegate.foundRetrievalOperator(operName, parser: self)
-                    }
-                    else {
+                    } else {
                         // We don’t have an operator name, so we report an error.
                         delegate.handleDiagnostic(MacroExpressionDiagnostic(string: string, range: currIdx..<currIdx, kind: .missingOperatorName, level: .error), parser: self)
                     }
-                }
-                else if currChar == UInt8(ascii: "=") {
+                } else if currChar == UInt8(ascii: "=") {
                     // We have a replacement operator, which replaces a part of the evaluated macro value with a different value (e.g. changes a suffix).
 
                     // Skip past the ‘=’ character.  This might put us at end-of-string; the logic below handles that correctly.
@@ -226,16 +214,14 @@ public final class MacroExpressionParser {
                             // We unexpectedly reached end-of-string, so we emit an error.
                             delegate.handleDiagnostic(MacroExpressionDiagnostic(string: string, range: currIdx..<currIdx, kind: .unterminatedMacroSubexpression, level: .error), parser: self)
                         }
-                    }
-                    else {
+                    } else {
                         // We don’t have an operator name, so we report an error.
                         delegate.handleDiagnostic(MacroExpressionDiagnostic(string: string, range: currIdx..<currIdx, kind: .missingOperatorName, level: .error), parser: self)
 
                         // Skip ahead until the next ‘:’ or closing delimiter, without emitting them as literals.
                         scanUntil(UInt8(ascii: ":"), closeDelim)
                     }
-                }
-                else {
+                } else {
                     // Otherwise, we have found an invalid character for an operator name.
                     delegate.handleDiagnostic(MacroExpressionDiagnostic(string: string, range: currIdx..<utf8.index(after: currIdx), kind: .invalidOperatorCharacter, level: .error), parser: self)
 
@@ -251,8 +237,7 @@ public final class MacroExpressionParser {
             if currChar == closeDelim {
                 advance()
             }
-        }
-        else if isValidMacroName1stChar(currChar) {
+        } else if isValidMacroName1stChar(currChar) {
             // Looks like a valid expression of the deprecated form “$MACRO” (without parentheses).
             let nameIdx = currIdx
 
@@ -271,7 +256,7 @@ public final class MacroExpressionParser {
             assert(currIdx > nameIdx)
 
             // Tell the delegate about the literal string we found.
-            delegate.foundLiteralStringFragment(utf8[nameIdx ..< currIdx], parser: self)
+            delegate.foundLiteralStringFragment(utf8[nameIdx..<currIdx], parser: self)
 
             // Check to see if we stopped at a substitution expression, and if it’s followed by a `(`.  This is kind of a hack for projects that have malformed macro expressions.  See <rdar://problem/12769727> and <rdar://problem/13174585>.
             if currChar == UInt8(ascii: "$") && nextChar == UInt8(ascii: "(") {
@@ -281,16 +266,14 @@ public final class MacroExpressionParser {
 
             // Tell the delegate that we’ve found the end of the macro name.
             delegate.foundEndOfMacroName(wasBracketed: false, parser: self)
-        }
-        else {
+        } else {
             // We found a ‘$’ character followed by something other than parentheses or an alphanumeric character.  We treat it as a literal ‘$’.
             let fragment = utf8[origIdx..<currIdx]
 
             // If we two consecutive ‘$’ characters, we skip the second one of them, so we end up with just a literal ‘$’ (this is because “$$” is an escape for “$”).
             if currChar == UInt8(ascii: "$") {
                 advance()
-            }
-            else {
+            } else {
                 // FIXME: Should we also warn about stray ‘$’ characters? Doing so would might cause a lot of noise for expressions that in Xcode work fine today (with the ‘$’ getting treated as a literal).
             }
 
@@ -302,7 +285,6 @@ public final class MacroExpressionParser {
         delegate.foundEndOfSubstitutionSubexpression(alwaysEvalAsString: alwaysEvalAsString, parser: self)
     }
 
-
     /// Private function that parses a delimited fragment of a substitution subexpresson.  The value of the `alwaysEvalAsString` flag will be passed down to any invocations of parseSubstitutionSubexpression() performed by this function.  This function stops parsing when it reaches the end-of-string or a colon character or the delimiter given as a parameter.  The parser’s delegate methods are invoked as the subexpression fragment is parsed — this includes methods for detecting warnings and errors.  In accordance with historical semantics, parsing tries to recover after errors, so that as many errors as possible can be detected in one parse.
     private func parseSubstitutionSubexpressionFragment(alwaysEvalAsString: Bool, delimiter: UInt8) {
         // Loop over the rest of the string (breaking out if we reach either a colon or the closing delimiter we were given).
@@ -327,7 +309,6 @@ public final class MacroExpressionParser {
         assert(isAtEnd || currChar == UInt8(ascii: ":") || currChar == delimiter)
     }
 
-
     /// Private function that parses a single element of a quoted null-terminated string, stopping at end-of-string or at the first unquoted, unescaped whitespace.  The cursor is expected to already be positioned at the first non-whitespace character of the string element.  The parser’s delegate methods are invoked as the subexpression fragment is parsed — this includes methods for detecting warnings and errors.  In accordance with historical semantics, parsing tries to recover after errors, so that as many errors as possible can be detected in one parse.
     private func parseQuotedExpressionStringElement() {
         // We’ll be moving over the input string.  As we do, we keep track of when we’re inside double quotes, single quotes, or no quotes at all.
@@ -345,84 +326,75 @@ public final class MacroExpressionParser {
             // Check for and handle characters that have semantic meaning.
             if currChar == UInt8(ascii: "\\") {
                 // Escape character — we treat the next character literally.
-                if markIdx < currIdx { delegate.foundLiteralStringFragment(utf8[markIdx ..< currIdx], parser: self); markIdx = currIdx }
+                if markIdx < currIdx { delegate.foundLiteralStringFragment(utf8[markIdx..<currIdx], parser: self); markIdx = currIdx }
                 // Record the escape character itself as a character to be emitted literally when evaluating the expression as a string (rather than a string-list).
-                delegate.foundStringFormOnlyLiteralStringFragment(utf8[currIdx ... currIdx], parser: self)
+                delegate.foundStringFormOnlyLiteralStringFragment(utf8[currIdx...currIdx], parser: self)
                 advance()
                 if isAtEnd {
                     // We ran out of characters — emit an error and leave.
                     delegate.handleDiagnostic(MacroExpressionDiagnostic(string: string, range: markIdx..<currIdx, kind: .trailingEscapeCharacter, level: .error), parser: self)
-                }
-                else {
+                } else {
                     // Otherwise, exclude the backslash from the literal range, and advance past the literal character.  This might put us at the end, which is OK.
                     markIdx = currIdx
                     advance()
                 }
-            }
-            else if currChar == UInt8(ascii: "$") {
+            } else if currChar == UInt8(ascii: "$") {
                 // Dollar character — we parse it as a substitution subexpression.  If we’re inside quotes, the delegate will be asked to always evaluate it as a string.
-                if markIdx < currIdx { delegate.foundLiteralStringFragment(utf8[markIdx ..< currIdx], parser: self); markIdx = currIdx }
-                parseSubstitutionSubexpression(alwaysEvalAsString:(currentQuotes != .noQuotes))
+                if markIdx < currIdx { delegate.foundLiteralStringFragment(utf8[markIdx..<currIdx], parser: self); markIdx = currIdx }
+                parseSubstitutionSubexpression(alwaysEvalAsString: (currentQuotes != .noQuotes))
                 markIdx = currIdx
-            }
-            else if currChar == UInt8(ascii: "\"") && currentQuotes != .singleQuotes {
+            } else if currChar == UInt8(ascii: "\"") && currentQuotes != .singleQuotes {
                 // Double quotes — we toggle the quote state and advance to the next character.  But we special-case consecutive quotes to make sure we emit an empty literal.
-                if markIdx < currIdx { delegate.foundLiteralStringFragment(utf8[markIdx ..< currIdx], parser: self); markIdx = currIdx }
+                if markIdx < currIdx { delegate.foundLiteralStringFragment(utf8[markIdx..<currIdx], parser: self); markIdx = currIdx }
                 assert(currentQuotes == .noQuotes || currentQuotes == .doubleQuotes)
                 // Record the quote character itself as a character to be emitted literally when evaluating the expression as a string (rather than a string-list).
-                delegate.foundStringFormOnlyLiteralStringFragment(utf8[currIdx ... currIdx], parser: self)
+                delegate.foundStringFormOnlyLiteralStringFragment(utf8[currIdx...currIdx], parser: self)
                 advance()
                 if currentQuotes == .noQuotes && currChar == UInt8(ascii: "\"") {
                     // Deal with a pair of adjacent double-quotes (we emit an empty string fragment, which is important it happens to be a list element).
                     delegate.foundLiteralStringFragment(utf8[currIdx..<currIdx], parser: self)
                     // Record the quote character itself as a character to be emitted literally when evaluating the expression as a string (rather than a string-list).
-                    delegate.foundStringFormOnlyLiteralStringFragment(utf8[currIdx ... currIdx], parser: self)
+                    delegate.foundStringFormOnlyLiteralStringFragment(utf8[currIdx...currIdx], parser: self)
                     advance()
-                }
-                else {
+                } else {
                     // Toggle the current quote state.
                     currentQuotes = (currentQuotes == .noQuotes) ? .doubleQuotes : .noQuotes
                 }
                 // Either way, we move up the marked starting index for the next literal fragment.
                 markIdx = currIdx
-            }
-            else if currChar == UInt8(ascii: "\'") && currentQuotes != .doubleQuotes {
+            } else if currChar == UInt8(ascii: "\'") && currentQuotes != .doubleQuotes {
                 // Single quotes — we toggle the quote state and advance to the next character.  But we special-case consecutive quotes to make sure we emit an empty literal.
-                if markIdx < currIdx { delegate.foundLiteralStringFragment(utf8[markIdx ..< currIdx], parser: self); markIdx = currIdx }
+                if markIdx < currIdx { delegate.foundLiteralStringFragment(utf8[markIdx..<currIdx], parser: self); markIdx = currIdx }
                 assert(currentQuotes == .noQuotes || currentQuotes == .singleQuotes)
                 // Record the quote character itself as a character to be emitted literally when evaluating the expression as a string (rather than a string-list).
-                delegate.foundStringFormOnlyLiteralStringFragment(utf8[currIdx ... currIdx], parser: self)
+                delegate.foundStringFormOnlyLiteralStringFragment(utf8[currIdx...currIdx], parser: self)
                 advance()
                 if currentQuotes == .noQuotes && currChar == UInt8(ascii: "\'") {
                     // Deal with a pair of adjacent single-quotes (we emit an empty string fragment, which is important it happens to be a list element).
                     delegate.foundLiteralStringFragment(utf8[currIdx..<currIdx], parser: self)
                     // Record the quote character itself as a character to be emitted literally when evaluating the expression as a string (rather than a string-list).
-                    delegate.foundStringFormOnlyLiteralStringFragment(utf8[currIdx ... currIdx], parser: self)
+                    delegate.foundStringFormOnlyLiteralStringFragment(utf8[currIdx...currIdx], parser: self)
                     advance()
-                }
-                else {
+                } else {
                     // Toggle the current quote state.
                     currentQuotes = (currentQuotes == .noQuotes) ? .singleQuotes : .noQuotes
                 }
                 // Either way, we move up the marked starting index for the next literal fragment.
                 markIdx = currIdx
-            }
-            else if currentQuotes == .noQuotes && isAtWhitespace {
+            } else if currentQuotes == .noQuotes && isAtWhitespace {
                 // Unquoted, unescaped whitespace — we’re done with this list element.
                 break
-            }
-            else {
+            } else {
                 // Otherwise, just keep advancing until we reach a semantically meaningful character.
                 advance()
             }
-        }
-        while !isAtEnd
+        } while !isAtEnd
 
         // We expect to have ended up with the current scanner position on either a whitespace character or at end-of-string.
         precondition(isAtEnd || isAtWhitespace)
 
         // Emit any literal string fragment that we’ve skipped over but haven’t yet emitted.
-        if markIdx < currIdx { delegate.foundLiteralStringFragment(utf8[markIdx ..< currIdx], parser: self) }
+        if markIdx < currIdx { delegate.foundLiteralStringFragment(utf8[markIdx..<currIdx], parser: self) }
 
         // If we’ve reached end-of-string but we’re still inside quotes, we have an unterminated-quote situation.
         if currentQuotes != .noQuotes {
@@ -430,7 +402,6 @@ public final class MacroExpressionParser {
         }
     }
 
-
     /// Returns the character at the current position, or nil if the cursor is currently at the very end of the string.
     private var currChar: UInt8? {
         assert(currIdx <= utf8.endIndex)
@@ -473,7 +444,7 @@ public final class MacroExpressionParser {
         // Record the starting index, and advance until we reach end-of-string or one of the specified stop characters.  After that we return the (possibly empty) substring.
         let origIdx = currIdx
         while !(isAtEnd || block(currChar!)) { advance() }
-        return currIdx > origIdx ? utf8[origIdx ..< currIdx] : nil
+        return currIdx > origIdx ? utf8[origIdx..<currIdx] : nil
     }
 
     /// Convenience function that the cursor until it reaches end-of-string or the specified stop character, leaving the cursor at the character (if any) that caused the scan to stop.  Returns the substring from the starting position to (but not including) the stop position, or nil if no characters at all were scanned.
@@ -495,14 +466,13 @@ public final class MacroExpressionParser {
     }
 }
 
-
 /// Private function that returns the closing delimiter that corresponds to a particular opening delimiter, or nil if `ch` is not, in fact, an opening delimiter.  In addition to the official delimiter pair `(`...`)`, the current implementation of this function supports the deprecated delimiter pairs `{`...`}` and `[`...`]`.  The parser will emit a deprecated-delimiter warning for any delimiter pair other than `(`...`)`.
 private func getClosingDelimiter(_ ch: UInt8) -> UInt8? {
     // The set of delimiters we support is historical.  We do emit warnings about delimiters other than ‘(’.
     switch ch {
-    case UInt8(ascii: "("): return UInt8(ascii:  ")")
-    case UInt8(ascii:  "{"): return UInt8(ascii:  "}")
-    case UInt8(ascii:  "["): return UInt8(ascii:  "]")
+    case UInt8(ascii: "("): return UInt8(ascii: ")")
+    case UInt8(ascii: "{"): return UInt8(ascii: "}")
+    case UInt8(ascii: "["): return UInt8(ascii: "]")
     default: return nil
     }
 }
@@ -530,7 +500,6 @@ private func isValidOperatorNameChar(_ chOpt: UInt8?) -> Bool {
     return isAlpha(ch) || (ch >= UInt8(ascii: "0") && ch <= UInt8(ascii: "9")) || ch == UInt8(ascii: "-") || ch == UInt8(ascii: "+") || ch == UInt8(ascii: ".") || ch == UInt8(ascii: "_")
 }
 
-
 /// Encapsulates the callbacks that a macro expression parser invokes during a parse.  All methods are optional.  Separating the actions into a protocol allows the macro expression parser to be used for a variety of tasks, and makes it easier to test and profile.  The parser is passed to each of the delegate methods, and its `position` property can be used to access the current index in the original string.  The parser is as lenient as possible, and tries to recover from errors as well as possible in order to preserve the Xcode semantics.  The delegate is guaranteed to see the entire contents of the input string, regardless of how many errors are discovered (some of that contents might be misparsed as literals after errors have been found, however).
 public protocol MacroExpressionParserDelegate {
     typealias Input = MacroExpressionParser.Input
diff --git a/Sources/SWBMacro/MacroNamespace.swift b/Sources/SWBMacro/MacroNamespace.swift
index eb42c54b..8f675991 100644
--- a/Sources/SWBMacro/MacroNamespace.swift
+++ b/Sources/SWBMacro/MacroNamespace.swift
@@ -17,16 +17,20 @@ import Synchronization
 ///
 /// This class *is* thread-safe (macros may be declared and looked up concurrently).
 public final class MacroNamespace: CustomDebugStringConvertible, Encodable, Sendable {
-    static let parsedStrings = Statistic("MacroNamespace.parsedStrings",
-        "The number of strings which were parsed into macro expressions.")
-    static let parsedLists = Statistic("MacroNamespace.parsedLists",
-        "The number of lists which were parsed into macro expression.")
+    static let parsedStrings = Statistic(
+        "MacroNamespace.parsedStrings",
+        "The number of strings which were parsed into macro expressions."
+    )
+    static let parsedLists = Statistic(
+        "MacroNamespace.parsedLists",
+        "The number of lists which were parsed into macro expression."
+    )
 
     /// Parent namespace.  All declarations in the parent namespace are visible to this namespace, and the same rules regarding type conflicts apply.
     let parentNamespace: MacroNamespace?
 
     /// Maps macro names to declarations.  Each declaration is of one of the concrete subclasses of MacroDeclaration, based on its type.
-    private let macroRegistry = LockedValue<Dictionary<String,MacroDeclaration>>([:])
+    private let macroRegistry = LockedValue<Dictionary<String, MacroDeclaration>>([:])
 
     private enum CodingKeys: String, CodingKey {
         case parentNamespace
@@ -135,7 +139,7 @@ public final class MacroNamespace: CustomDebugStringConvertible, Encodable, Send
     }
 
     /// Maps condition parameter names to condition parameters.  Each declaration is an instance of MacroConditionParameter.
-    private let conditionParameters = LockedValue<Dictionary<String,MacroConditionParameter>>([:])
+    private let conditionParameters = LockedValue<Dictionary<String, MacroConditionParameter>>([:])
 
     /// Looks up and returns the macro condition parameter that's associated with ‘name’, if any.  The name is not allowed to be the empty string.
     public func lookupConditionParameter(_ name: String) -> MacroConditionParameter? {
@@ -216,8 +220,7 @@ public final class MacroNamespace: CustomDebugStringConvertible, Encodable, Send
             // Emit an instruction to replace the subresult buffer at the top of the buffer stack with the result of applying a ‘retrieval’ operator to it.
             if let op = MacroEvaluationProgram.MacroEvaluationRetrievalOperator(String(operatorName)!) {
                 programBuilder.emit(.applyRetrievalOperator(op))
-            }
-            else {
+            } else {
                 // The operator was unrecognized, so emit an error.
                 handleDiagnostic(MacroExpressionDiagnostic(string: parser.string, range: parser.currIdx..<parser.currIdx, kind: .unknownRetrievalOperator, level: .error), parser: parser)
             }
@@ -230,15 +233,14 @@ public final class MacroNamespace: CustomDebugStringConvertible, Encodable, Send
             // Emit an instruction to pop the current subresult buffer from the top of the buffer stack, using it as the operand for the replacement, and to then replace the subresult buffer at the top of the buffer stack with the result of applying a ‘replacement’ operator to it.
             if let op = MacroEvaluationProgram.MacroEvaluationReplacementOperator(String(operatorName)!) {
                 programBuilder.emit(.applyReplacementOperator(op))
-            }
-            else {
+            } else {
                 // The operator was unrecognized, so emit an error.
                 handleDiagnostic(MacroExpressionDiagnostic(string: parser.string, range: parser.currIdx..<parser.currIdx, kind: .unknownReplacementOperator, level: .error), parser: parser)
             }
         }
         func foundEndOfSubstitutionSubexpression(alwaysEvalAsString: Bool, parser: MacroExpressionParser) {
             // If this substitution subexpression is one in which we should always evaluate a string, we decrement the “evaluate-as-string nesting level” to balance its increment in `foundStartOfSubstitutionSubexpression()`.
-             if alwaysEvalAsString { alwaysEvalAsStringNestingLevel -= 1 }
+            if alwaysEvalAsString { alwaysEvalAsStringNestingLevel -= 1 }
 
             // Emit and instruction to pop the current subresult buffer from the top of the buffer stack and append it to the next subresult buffer on the stack.
             programBuilder.emit(.mergeSubresult)
@@ -263,12 +265,12 @@ public final class MacroNamespace: CustomDebugStringConvertible, Encodable, Send
         return _parseLiteralString(string, allowSubstitutionPrefix: allowSubstitutionPrefix)
     }
     private func _parseLiteralString(_ string: String, allowSubstitutionPrefix: Bool) -> MacroStringExpression {
-#if DEBUG
-        // We make it an error in debug builds to try and parse '$(' as a literal unless we've explicitly specified it's ok. Otherwise, it is almost certainly (but not necessarily) a programmatic error if it ever does.
-        if !allowSubstitutionPrefix, string.contains("$(") {
-            fatalError("pushing literal string containing a possible macro reference: \(string)')")
-        }
-#endif
+        #if DEBUG
+            // We make it an error in debug builds to try and parse '$(' as a literal unless we've explicitly specified it's ok. Otherwise, it is almost certainly (but not necessarily) a programmatic error if it ever does.
+            if !allowSubstitutionPrefix, string.contains("$(") {
+                fatalError("pushing literal string containing a possible macro reference: \(string)')")
+            }
+        #endif
 
         let emitter = MacroEvaluationProgramBuilder()
         emitter.emit(MacroEvaluationProgram.EvalInstr.appendLiteral(string))
@@ -277,14 +279,14 @@ public final class MacroNamespace: CustomDebugStringConvertible, Encodable, Send
 
     /// "Parses" `strings` as a list of literal strings.
     public func parseLiteralStringList(_ strings: [String]) -> MacroStringListExpression {
-#if DEBUG
-        for string in strings {
-            // We make it an error in debug builds to try and parse '$(' as a literal. This never comes up in our test suite, and it is almost certainly (but not necessarily) a programmatic error when if it ever does.
-            if string.contains("$(") {
-                fatalError("pushing literal string containing a possible macro reference: \(string)')")
+        #if DEBUG
+            for string in strings {
+                // We make it an error in debug builds to try and parse '$(' as a literal. This never comes up in our test suite, and it is almost certainly (but not necessarily) a programmatic error when if it ever does.
+                if string.contains("$(") {
+                    fatalError("pushing literal string containing a possible macro reference: \(string)')")
+                }
             }
-        }
-#endif
+        #endif
 
         let emitter = MacroEvaluationProgramBuilder()
         var needsListSeparator = false
@@ -378,7 +380,7 @@ public final class MacroNamespace: CustomDebugStringConvertible, Encodable, Send
                     return nil
                 }
             }
-            return parseForMacro(macro, value:strings, diagnosticsHandler: diagnosticsHandler)
+            return parseForMacro(macro, value: strings, diagnosticsHandler: diagnosticsHandler)
 
         default:
             return nil
@@ -404,14 +406,14 @@ public final class MacroNamespace: CustomDebugStringConvertible, Encodable, Send
                 // if this setting key is matched by any `associatedTypesForKeysMatching`, use the associatedType provided
                 if let associatedType = associatedTypesForKeysMatching?.first(where: { key.contains($0.key) })?.value {
                     switch associatedType {
-                        case .boolean: return lookupOrDeclareMacro(BooleanMacroDeclaration.self, macroName)
-                        case .string: return lookupOrDeclareMacro(StringMacroDeclaration.self, macroName)
-                        case .stringList: return lookupOrDeclareMacro(StringListMacroDeclaration.self, macroName)
-                        case .userDefined: return lookupOrDeclareMacro(UserDefinedMacroDeclaration.self, macroName)
-                        case .path: return lookupOrDeclareMacro(PathMacroDeclaration.self, macroName)
-                        case .pathList: return lookupOrDeclareMacro(PathListMacroDeclaration.self, macroName)
+                    case .boolean: return lookupOrDeclareMacro(BooleanMacroDeclaration.self, macroName)
+                    case .string: return lookupOrDeclareMacro(StringMacroDeclaration.self, macroName)
+                    case .stringList: return lookupOrDeclareMacro(StringListMacroDeclaration.self, macroName)
+                    case .userDefined: return lookupOrDeclareMacro(UserDefinedMacroDeclaration.self, macroName)
+                    case .path: return lookupOrDeclareMacro(PathMacroDeclaration.self, macroName)
+                    case .pathList: return lookupOrDeclareMacro(PathListMacroDeclaration.self, macroName)
                     }
-                // If this is a user defined table, unknown settings should be treated as user defined.
+                    // If this is a user defined table, unknown settings should be treated as user defined.
                 } else if allowUserDefined {
                     return lookupOrDeclareMacro(UserDefinedMacroDeclaration.self, macroName)
                 } else {
@@ -427,13 +429,11 @@ public final class MacroNamespace: CustomDebugStringConvertible, Encodable, Send
             if let parsedMacroName = parsedName {
                 macroName = parsedMacroName
                 if let conditions = parsedConditions {
-                    conditionSet = MacroConditionSet(conditions: conditions.map{ MacroCondition(parameter: declareConditionParameter($0.0), valuePattern: $0.1) })
-                }
-                else {
+                    conditionSet = MacroConditionSet(conditions: conditions.map { MacroCondition(parameter: declareConditionParameter($0.0), valuePattern: $0.1) })
+                } else {
                     conditionSet = nil
                 }
-            }
-            else {
+            } else {
                 // If we can't parse a name and condition, then use the original key as the name.  c.f. <rdar://problem/29271127>
                 macroName = key
                 conditionSet = nil
@@ -458,7 +458,7 @@ public final class MacroNamespace: CustomDebugStringConvertible, Encodable, Send
     /// This just takes a `[String: String]` dictionary and marshals the values as `PropertyListItem.string` values, then calls `parseTable([String: PropertyListItem], ...)` to parse the resulting table.
     public func parseTable(_ settings: [String: String], allowUserDefined: Bool, associatedTypesForKeysMatching: [String: MacroType]? = nil, diagnosticsHandler: ((MacroExpressionDiagnostic) -> Void)? = nil) throws -> MacroValueAssignmentTable {
         var settingsCopy = [String: PropertyListItem]()
-        for (key,value) in settings {
+        for (key, value) in settings {
             settingsCopy[key] = .plString(value)
         }
         return try self.parseTable(settingsCopy, allowUserDefined: allowUserDefined, associatedTypesForKeysMatching: associatedTypesForKeysMatching, diagnosticsHandler: diagnosticsHandler)
@@ -531,7 +531,7 @@ public final class MacroNamespace: CustomDebugStringConvertible, Encodable, Send
 
     /// The table to use for parsed string expression interning, if installed.
     static var stringExpressionInterningTable: Registry<String, MacroStringExpression>? {
-        return interningState.withLock{ $0._stringExpressionInterningTable }
+        return interningState.withLock { $0._stringExpressionInterningTable }
     }
 }
 
diff --git a/Sources/SWBMacro/MacroValueAssignmentTable.swift b/Sources/SWBMacro/MacroValueAssignmentTable.swift
index 6357b827..6ce4061f 100644
--- a/Sources/SWBMacro/MacroValueAssignmentTable.swift
+++ b/Sources/SWBMacro/MacroValueAssignmentTable.swift
@@ -76,7 +76,6 @@ public struct MacroValueAssignmentTable: Serializable, Sendable {
         push(macro, namespace.parseLiteralStringList(literal), conditions: conditions)
     }
 
-
     /// Adds a mapping from `macro` to `value`, inserting it ahead of any already existing assignment for the same macro.  Unless the value refers to the lower-precedence expression (using `$(inherited)` notation), any existing assignments are shadowed but not removed.
     package mutating func push(_ macro: MacroDeclaration, _ value: MacroExpression, conditions: MacroConditionSet? = nil, locationRef: InternedMacroValueAssignmentLocation? = nil) {
         assert(namespace.lookupMacroDeclaration(macro.name) === macro)
@@ -182,14 +181,12 @@ public struct MacroValueAssignmentTable: Serializable, Sendable {
                     // Assignment is conditioned on the specified parameter; we need to evaluate it in order to decide what to do.
                     if effectiveConditionValue.evaluate(condition) == true {
                         // Condition evaluates to true, so we push an assignment with a condition set that excludes the condition.
-                        let filteredConditions = conditions.conditions.filter{ $0.parameter != parameter }
+                        let filteredConditions = conditions.conditions.filter { $0.parameter != parameter }
                         table.push(macro, assignment.expression, conditions: filteredConditions.isEmpty ? nil : MacroConditionSet(conditions: filteredConditions), locationRef: assignment._location)
-                    }
-                    else {
+                    } else {
                         // Condition evaluates to false, so we elide the assignment.
                     }
-                }
-                else {
+                } else {
                     // Assignment isn't conditioned on the specified parameter, so we just push it as-is.
                     table.push(macro, assignment.expression, conditions: assignment.conditions, locationRef: assignment._location)
                 }
@@ -245,14 +242,14 @@ public struct MacroValueAssignmentTable: Serializable, Sendable {
             case .path: serializer.serialize(4)
             case .pathList: serializer.serialize(5)
             }
-            serializer.endAggregate()   // MacroDeclaration key
+            serializer.endAggregate()  // MacroDeclaration key
             // Serialize the MacroValueAssignment.
             serializer.serialize(asgn)
-            serializer.endAggregate()   // key-value pair
+            serializer.endAggregate()  // key-value pair
         }
-        serializer.endAggregate()       // valueAssignments
+        serializer.endAggregate()  // valueAssignments
 
-        serializer.endAggregate()       // the whole table
+        serializer.endAggregate()  // the whole table
     }
 
     public init(from deserializer: any Deserializer) throws {
@@ -289,8 +286,7 @@ public struct MacroValueAssignmentTable: Serializable, Sendable {
                 }
                 guard aDecl.type == type else { throw DeserializerError.incorrectType("Mismatched type for MacroDeclaration \(name): expected '\(type)', found '\(aDecl.type)' from code '\(typeCode)'.") }
                 decl = aDecl
-            }
-            else {
+            } else {
                 // Declare the declaration using the type we deserialized.
                 switch typeCode {
                 case 0: decl = delegate.namespace.lookupOrDeclareMacro(BooleanMacroDeclaration.self, name)
@@ -452,7 +448,7 @@ package struct InternedMacroValueAssignmentLocation: Serializable, Sendable {
         self.endColumn = endColumn
     }
 
-    public func serialize<T>(to serializer: T) where T : SWBUtil.Serializer {
+    public func serialize<T>(to serializer: T) where T: SWBUtil.Serializer {
         serializer.beginAggregate(5)
         serializer.serialize(pathRef)
         serializer.serialize(startLine)
@@ -487,10 +483,9 @@ private func insertCopiesOfMacroValueAssignmentNodes(_ srcAsgn: MacroValueAssign
     }
 
     if let srcNext = srcAsgn.next {
-        return MacroValueAssignment(expression: srcAsgn.expression, conditions:srcAsgn.conditions, next: insertCopiesOfMacroValueAssignmentNodes(srcNext, inFrontOf: dstAsgn), locationRef: srcAsgn._location)
-    }
-    else {
-        return MacroValueAssignment(expression: srcAsgn.expression, conditions:srcAsgn.conditions, next: dstAsgn, locationRef: srcAsgn._location)
+        return MacroValueAssignment(expression: srcAsgn.expression, conditions: srcAsgn.conditions, next: insertCopiesOfMacroValueAssignmentNodes(srcNext, inFrontOf: dstAsgn), locationRef: srcAsgn._location)
+    } else {
+        return MacroValueAssignment(expression: srcAsgn.expression, conditions: srcAsgn.conditions, next: dstAsgn, locationRef: srcAsgn._location)
     }
 }
 
diff --git a/Sources/SWBProjectModel/IDE/IDEPIFGUID.swift b/Sources/SWBProjectModel/IDE/IDEPIFGUID.swift
index 1e516d74..8955d1ff 100644
--- a/Sources/SWBProjectModel/IDE/IDEPIFGUID.swift
+++ b/Sources/SWBProjectModel/IDE/IDEPIFGUID.swift
@@ -13,7 +13,7 @@
 import Foundation
 
 /// A unique identifier for a PIF object.  It doesn't have to be unique globally; just within the workspace.
-public class IDEPIFGUID : CustomStringConvertible {
+public class IDEPIFGUID: CustomStringConvertible {
 
     /// Immutable string containing the string representation; right now, this is the only representation we carry.
     public let stringRepresentation: String
diff --git a/Sources/SWBProjectModel/IDE/IDEPIFObject.swift b/Sources/SWBProjectModel/IDE/IDEPIFObject.swift
index 68fba333..97e04106 100644
--- a/Sources/SWBProjectModel/IDE/IDEPIFObject.swift
+++ b/Sources/SWBProjectModel/IDE/IDEPIFObject.swift
@@ -12,9 +12,8 @@
 
 import Foundation
 
-
 /// Protocol describing top-level PIF objects.
-public protocol IDEPIFObject : IDEPIFGenerating {
+public protocol IDEPIFObject: IDEPIFGenerating {
     /// The name of the PIF object type (workspace, project, or target).
     static var pifObjectTypeName: String { get }
     /// Returns the list of subobjects.
diff --git a/Sources/SWBProjectModel/IDE/IDEPIFObjectInfo.swift b/Sources/SWBProjectModel/IDE/IDEPIFObjectInfo.swift
index 4078a5a2..ad88c48a 100644
--- a/Sources/SWBProjectModel/IDE/IDEPIFObjectInfo.swift
+++ b/Sources/SWBProjectModel/IDE/IDEPIFObjectInfo.swift
@@ -22,8 +22,10 @@ public class IDEPIFObjectInfo {
     public internal(set) var generatePIF: PIFGeneratingClosure
 
     /// Initializes the IDEPIFObjectInfo with a \p signature (a sort of digest that indicates whether the PIF needs to be regenerated) and a PIF generation \p block that will be invoked if it does.  The generator block might not be invoked if the signature is the same as in a previous invocation.
-    public init(signature: String,
-                generatePIF: @escaping PIFGeneratingClosure) {
+    public init(
+        signature: String,
+        generatePIF: @escaping PIFGeneratingClosure
+    ) {
         self.signature = signature
         self.generatePIF = generatePIF
     }
diff --git a/Sources/SWBProjectModel/IDE/IDESwiftPackageExtensions.swift b/Sources/SWBProjectModel/IDE/IDESwiftPackageExtensions.swift
index 1d4d4d26..45c29cc6 100644
--- a/Sources/SWBProjectModel/IDE/IDESwiftPackageExtensions.swift
+++ b/Sources/SWBProjectModel/IDE/IDESwiftPackageExtensions.swift
@@ -22,20 +22,19 @@ public protocol PIFRepresentable {
     func serialize(to serializer: any IDEPIFSerializer) -> PIFDict
 }
 
-
-extension PIF.Project : PIFRepresentable {
+extension PIF.Project: PIFRepresentable {
 
     public func serialize(to serializer: any IDEPIFSerializer) -> PIFDict {
-        var dict : PIFDict = [
+        var dict: PIFDict = [
             PIFKey_guid: id,
             PIFKey_Project_name: name,
-            PIFKey_Project_isPackage: isPackage ? "true" : "false" ,
+            PIFKey_Project_isPackage: isPackage ? "true" : "false",
             PIFKey_path: path,
             PIFKey_Project_projectDirectory: projectDir,
-            PIFKey_buildConfigurations: buildConfigs.map{ $0.serialize(to: serializer) },
+            PIFKey_buildConfigurations: buildConfigs.map { $0.serialize(to: serializer) },
             PIFKey_Project_defaultConfigurationName: "Release",
             PIFKey_Project_groupTree: mainGroup.serialize(to: serializer),
-            PIFKey_Project_targets: targets.compactMap{ $0.signature },
+            PIFKey_Project_targets: targets.compactMap { $0.signature },
         ]
 
         if let developmentRegion {
@@ -46,7 +45,7 @@ extension PIF.Project : PIFRepresentable {
     }
 }
 
-extension PIF.Group : PIFRepresentable {
+extension PIF.Group: PIFRepresentable {
 
     public func serialize(to serializer: any IDEPIFSerializer) -> PIFDict {
         return [
@@ -55,12 +54,12 @@ extension PIF.Group : PIFRepresentable {
             PIFKey_Reference_sourceTree: pathBase.asString,
             PIFKey_path: path,
             PIFKey_name: name ?? path,
-            PIFKey_Reference_children: subitems.map{ ($0 as! (any PIFRepresentable)).serialize(to: serializer) }
+            PIFKey_Reference_children: subitems.map { ($0 as! (any PIFRepresentable)).serialize(to: serializer) },
         ]
     }
 }
 
-extension PIF.FileReference : PIFRepresentable {
+extension PIF.FileReference: PIFRepresentable {
 
     private func fileTypeIdentifier(for path: String) -> String {
         // FIXME: We need real logic here.  <rdar://problem/33634352> [SwiftPM] When generating PIF, we need a standard way to determine the file type
@@ -93,7 +92,6 @@ extension PIF.FileReference : PIFRepresentable {
         case "y", "ym", "ymm", "ypp", "yp", "yxx":
             return "sourcecode.yacc"
 
-
         // FIXME: This is probably now more important because of resources support.
         case "xcassets":
             return "folder.assetcatalog"
@@ -118,7 +116,7 @@ extension PIF.FileReference : PIFRepresentable {
             return "folder.rkassets"
 
         default:
-            return SwiftBuildFileType.all.first{ $0.fileTypes.contains(pathExtension) }?.fileTypeIdentifier ?? "file"
+            return SwiftBuildFileType.all.first { $0.fileTypes.contains(pathExtension) }?.fileTypeIdentifier ?? "file"
         }
     }
 
@@ -129,12 +127,12 @@ extension PIF.FileReference : PIFRepresentable {
             PIFKey_Reference_sourceTree: pathBase.asString,
             PIFKey_path: path,
             // FIXME: We need a real solution here (or: could we not omit the file type and let it be inferred?)
-            PIFKey_Reference_fileType: fileType ?? fileTypeIdentifier(for: path)
+            PIFKey_Reference_fileType: fileType ?? fileTypeIdentifier(for: path),
         ]
     }
 }
 
-extension PIF.BaseTarget : PIFRepresentable {
+extension PIF.BaseTarget: PIFRepresentable {
     public func serialize(to serializer: any IDEPIFSerializer) -> PIFDict {
         _serialize(to: serializer)
     }
@@ -143,7 +141,7 @@ extension PIF.BaseTarget : PIFRepresentable {
 extension PIF.PlatformFilter: PIFRepresentable {
     public func serialize(to serializer: any IDEPIFSerializer) -> PIFDict {
         if environment.isEmpty {
-            return [ "platform": platform ]
+            return ["platform": platform]
         } else {
             return [
                 "platform": platform,
@@ -153,46 +151,46 @@ extension PIF.PlatformFilter: PIFRepresentable {
     }
 }
 
-extension PIF.HeadersBuildPhase : PIFRepresentable {
+extension PIF.HeadersBuildPhase: PIFRepresentable {
 
     public func serialize(to serializer: any IDEPIFSerializer) -> PIFDict {
         return [
             PIFKey_type: "com.apple.buildphase.headers",
             PIFKey_guid: id,
-            PIFKey_BuildPhase_buildFiles: files.map{ $0.serialize(to: serializer) },
+            PIFKey_BuildPhase_buildFiles: files.map { $0.serialize(to: serializer) },
         ]
     }
 }
 
-extension PIF.SourcesBuildPhase : PIFRepresentable {
+extension PIF.SourcesBuildPhase: PIFRepresentable {
 
     public func serialize(to serializer: any IDEPIFSerializer) -> PIFDict {
         return [
             PIFKey_type: "com.apple.buildphase.sources",
             PIFKey_guid: id,
-            PIFKey_BuildPhase_buildFiles: files.map{ $0.serialize(to: serializer) },
+            PIFKey_BuildPhase_buildFiles: files.map { $0.serialize(to: serializer) },
         ]
     }
 }
 
-extension PIF.FrameworksBuildPhase : PIFRepresentable {
+extension PIF.FrameworksBuildPhase: PIFRepresentable {
 
     public func serialize(to serializer: any IDEPIFSerializer) -> PIFDict {
         return [
             PIFKey_type: "com.apple.buildphase.frameworks",
             PIFKey_guid: id,
-            PIFKey_BuildPhase_buildFiles: files.map{ $0.serialize(to: serializer) },
+            PIFKey_BuildPhase_buildFiles: files.map { $0.serialize(to: serializer) },
         ]
     }
 }
 
-extension PIF.CopyFilesBuildPhase : PIFRepresentable {
+extension PIF.CopyFilesBuildPhase: PIFRepresentable {
 
     public func serialize(to serializer: any IDEPIFSerializer) -> PIFDict {
         return [
             PIFKey_type: "com.apple.buildphase.copy-files",
             PIFKey_guid: id,
-            PIFKey_BuildPhase_buildFiles: files.map{ $0.serialize(to: serializer) },
+            PIFKey_BuildPhase_buildFiles: files.map { $0.serialize(to: serializer) },
             PIFKey_BuildPhase_destinationSubfolder: destinationSubfolder.pathString,
             PIFKey_BuildPhase_destinationSubpath: destinationSubpath,
             PIFKey_BuildPhase_runOnlyForDeploymentPostprocessing: (runOnlyForDeploymentPostprocessing ? "true" : "false"),
@@ -200,7 +198,7 @@ extension PIF.CopyFilesBuildPhase : PIFRepresentable {
     }
 }
 
-extension PIF.ShellScriptBuildPhase : PIFRepresentable {
+extension PIF.ShellScriptBuildPhase: PIFRepresentable {
 
     public func serialize(to serializer: any IDEPIFSerializer) -> PIFDict {
         return [
@@ -209,14 +207,14 @@ extension PIF.ShellScriptBuildPhase : PIFRepresentable {
             PIFKey_BuildPhase_name: name,
             PIFKey_BuildPhase_shellPath: shellPath,
             PIFKey_BuildPhase_scriptContents: scriptContents,
-            PIFKey_BuildPhase_buildFiles: files.map{ $0.serialize(to: serializer) },
+            PIFKey_BuildPhase_buildFiles: files.map { $0.serialize(to: serializer) },
             PIFKey_BuildPhase_inputFilePaths: inputPaths,
             PIFKey_BuildPhase_outputFilePaths: outputPaths,
             PIFKey_BuildPhase_emitEnvironment: emitEnvironment ? "true" : "false",
             PIFKey_BuildPhase_sandboxingOverride: sandboxingOverride.valueForPIF,
             PIFKey_BuildPhase_alwaysOutOfDate: alwaysOutOfDate ? "true" : "false",
             PIFKey_BuildPhase_runOnlyForDeploymentPostprocessing: runOnlyForDeploymentPostprocessing ? "true" : "false",
-            PIFKey_BuildPhase_originalObjectID: originalObjectID
+            PIFKey_BuildPhase_originalObjectID: originalObjectID,
         ]
     }
 }
@@ -226,12 +224,12 @@ extension PIF.CopyBundleResourcesBuildPhase: PIFRepresentable {
         return [
             PIFKey_type: "com.apple.buildphase.resources",
             PIFKey_guid: id,
-            PIFKey_BuildPhase_buildFiles: files.map{ $0.serialize(to: serializer) },
+            PIFKey_BuildPhase_buildFiles: files.map { $0.serialize(to: serializer) },
         ]
     }
 }
 
-extension PIF.BuildRule : PIFRepresentable {
+extension PIF.BuildRule: PIFRepresentable {
 
     public func serialize(to serializer: any IDEPIFSerializer) -> PIFDict {
         var dict = PIFDict()
@@ -294,7 +292,7 @@ extension PIF.CustomTask: PIFRepresentable {
     }
 }
 
-extension PIF.BuildFile : PIFRepresentable {
+extension PIF.BuildFile: PIFRepresentable {
 
     public func serialize(to serializer: any IDEPIFSerializer) -> PIFDict {
         switch self.ref {
@@ -303,7 +301,7 @@ extension PIF.BuildFile : PIFRepresentable {
             dict[PIFKey_guid] = id
             dict[PIFKey_BuildFile_fileReference] = refId
             dict[PIFKey_BuildFile_headerVisibility] = headerVisibility?.rawValue
-            dict[PIFKey_platformFilters] = platformFilters.map{ $0.serialize(to: serializer) }
+            dict[PIFKey_platformFilters] = platformFilters.map { $0.serialize(to: serializer) }
 
             dict[PIFKey_BuildFile_codeSignOnCopy] = codeSignOnCopy ? "true" : "false"
             dict[PIFKey_BuildFile_removeHeadersOnCopy] = removeHeadersOnCopy ? "true" : "false"
@@ -331,13 +329,13 @@ extension PIF.BuildFile : PIFRepresentable {
             return [
                 PIFKey_guid: id,
                 PIFKey_BuildFile_targetReference: refId,
-                PIFKey_platformFilters: platformFilters.map{ $0.serialize(to: serializer) }
+                PIFKey_platformFilters: platformFilters.map { $0.serialize(to: serializer) },
             ]
         }
     }
 }
 
-extension PIF.BuildConfig : PIFRepresentable {
+extension PIF.BuildConfig: PIFRepresentable {
 
     public func serialize(to serializer: any IDEPIFSerializer) -> PIFDict {
         return [
@@ -349,16 +347,16 @@ extension PIF.BuildConfig : PIFRepresentable {
     }
 }
 
-extension PIF.ImpartedBuildProperties : PIFRepresentable {
+extension PIF.ImpartedBuildProperties: PIFRepresentable {
 
     public func serialize(to serializer: any IDEPIFSerializer) -> PIFDict {
         return [
-            PIFKey_BuildConfiguration_buildSettings: settings.serialize(to: serializer),
+            PIFKey_BuildConfiguration_buildSettings: settings.serialize(to: serializer)
         ]
     }
 }
 
-extension PIF.BuildSettings : PIFRepresentable {
+extension PIF.BuildSettings: PIFRepresentable {
 
     public func serialize(to serializer: any IDEPIFSerializer) -> PIFDict {
         // Borderline hacky, but the main thing is that adding or changing a build setting does not require any changes to the property list representation code.  Using a hand-coded serializer might be more efficient but not even remotely as robust, and robustness is the key factor for this use case, as there aren't going to be millions of BuildSettings structs.
diff --git a/Sources/SWBProjectModel/PIFGenerationModel.swift b/Sources/SWBProjectModel/PIFGenerationModel.swift
index fdbe73a4..e0d3f2b8 100644
--- a/Sources/SWBProjectModel/PIFGenerationModel.swift
+++ b/Sources/SWBProjectModel/PIFGenerationModel.swift
@@ -102,7 +102,7 @@ public enum PIF {
         @discardableResult public func addAggregateTarget(id idOpt: String? = nil, name: String) -> AggregateTarget {
             let id = idOpt ?? nextTargetId
             precondition(!id.isEmpty)
-            precondition(!targets.contains{ $0.id == id })
+            precondition(!targets.contains { $0.id == id })
             precondition(!name.isEmpty)
             let target = AggregateTarget(id: id, name: name)
             targets.append(target)
@@ -112,7 +112,7 @@ public enum PIF {
         /// Creates and adds a new empty build configuration, i.e. one that does not initially have any build settings.  The name must not be empty and must not be equal to the name of any existing build configuration in the project.
         @discardableResult public func addBuildConfig(name: String, settings: BuildSettings = BuildSettings(), impartedBuildSettings: BuildSettings) -> BuildConfig {
             precondition(!name.isEmpty)
-            precondition(!buildConfigs.contains{ $0.name == name })
+            precondition(!buildConfigs.contains { $0.name == name })
             let id = "\(self.id)::BUILDCONFIG_\(buildConfigs.count)"
             let buildConfig = BuildConfig(id: id, name: name, settings: settings, impartedBuildSettings: impartedBuildSettings)
             buildConfigs.append(buildConfig)
@@ -164,7 +164,7 @@ public enum PIF {
     }
 
     /// A reference to a file system entity (a file, folder, etc).
-    public class FileReference : Reference {
+    public class FileReference: Reference {
         public var fileType: String?
         public var expectedSignature: String?
 
@@ -176,7 +176,7 @@ public enum PIF {
     }
 
     /// A group that can contain References (FileReferences and other Groups).  The resolved path of a group is used as the base path for any child references whose source tree type is GroupRelative.
-    public class Group : Reference {
+    public class Group: Reference {
         public var subitems = [Reference]()
 
         private var nextRefId: String {
@@ -224,7 +224,7 @@ public enum PIF {
         /// Creates and adds a new empty build configuration, i.e. one that does not initially have any build settings.  The name must not be empty and must not be equal to the name of any existing build configuration in the target.
         @discardableResult public func addBuildConfig(name: String, settings: BuildSettings = BuildSettings(), impartedBuildSettings: BuildSettings) -> BuildConfig {
             precondition(!name.isEmpty)
-            precondition(!buildConfigs.contains{ $0.name == name })
+            precondition(!buildConfigs.contains { $0.name == name })
             let id = "\(self.id)::BUILDCONFIG_\(buildConfigs.count)"
             let buildConfig = BuildConfig(id: id, name: name, settings: settings, impartedBuildSettings: impartedBuildSettings)
             buildConfigs.append(buildConfig)
@@ -260,20 +260,22 @@ public enum PIF {
                 PIFKey_type: "aggregate",
                 PIFKey_guid: id,
                 PIFKey_name: name,
-                PIFKey_Target_dependencies: dependencies.map { [
-                    PIFKey_guid: $0.targetId,
-                    PIFKey_platformFilters: $0.platformFilters.map{ $0.serialize(to: serializer) }
-                ] },
-                PIFKey_Target_buildRules: buildRules.map{ $0.serialize(to: serializer) },
-                PIFKey_Target_buildPhases: buildPhases.map{ ($0 as! (any PIFRepresentable)).serialize(to: serializer) },
+                PIFKey_Target_dependencies: dependencies.map {
+                    [
+                        PIFKey_guid: $0.targetId,
+                        PIFKey_platformFilters: $0.platformFilters.map { $0.serialize(to: serializer) },
+                    ]
+                },
+                PIFKey_Target_buildRules: buildRules.map { $0.serialize(to: serializer) },
+                PIFKey_Target_buildPhases: buildPhases.map { ($0 as! (any PIFRepresentable)).serialize(to: serializer) },
                 PIFKey_Target_customTasks: customTasks.map { $0.serialize(to: serializer) },
-                PIFKey_buildConfigurations: buildConfigs.map{ $0.serialize(to: serializer) },
+                PIFKey_buildConfigurations: buildConfigs.map { $0.serialize(to: serializer) },
             ]
         }
     }
 
     /// An Xcode target, representing a single entity to build.
-    public class Target : BaseTarget {
+    public class Target: BaseTarget {
         public var productName: String
         public var productType: ProductType
         public var productReference: FileReference?
@@ -338,10 +340,12 @@ public enum PIF {
 
         /// Adds a "copy files" build phase, i.e. one that copies files to an arbitrary location relative to the product.
         @discardableResult public func addCopyFilesBuildPhase(destinationSubfolder: CopyFilesBuildPhase.DestinationSubfolder, destinationSubpath: String = "", runOnlyForDeploymentPostprocessing: Bool = false) -> CopyFilesBuildPhase {
-            let phase = CopyFilesBuildPhase(id: nextBuildPhaseId,
-                                            destinationSubfolder: destinationSubfolder,
-                                            destinationSubpath: destinationSubpath,
-                                            runOnlyForDeploymentPostprocessing: runOnlyForDeploymentPostprocessing)
+            let phase = CopyFilesBuildPhase(
+                id: nextBuildPhaseId,
+                destinationSubfolder: destinationSubfolder,
+                destinationSubpath: destinationSubpath,
+                runOnlyForDeploymentPostprocessing: runOnlyForDeploymentPostprocessing
+            )
             buildPhases.append(phase)
             return phase
         }
@@ -375,7 +379,8 @@ public enum PIF {
                 alwaysOutOfDate: alwaysOutOfDate,
                 runOnlyForDeploymentPostprocessing: runOnlyForDeploymentPostprocessing,
                 originalObjectID: originalObjectID,
-                insertAtFront: insertAtFront)
+                insertAtFront: insertAtFront
+            )
         }
 
         /// Adds a "shell script" build phase, i.e. one that runs a custom shell script as part of the build.
@@ -405,7 +410,8 @@ public enum PIF {
                 runOnlyForDeploymentPostprocessing: runOnlyForDeploymentPostprocessing,
                 originalObjectID: originalObjectID,
                 sandboxingOverride: sandboxingOverride,
-                alwaysRunForInstallHdrs: alwaysRunForInstallHdrs)
+                alwaysRunForInstallHdrs: alwaysRunForInstallHdrs
+            )
             if insertAtFront {
                 buildPhases.insert(phase, at: 0)
             } else {
@@ -429,7 +435,7 @@ public enum PIF {
         public func addDependency(on targetId: String, platformFilters: Set<PlatformFilter>, linkProduct: Bool) {
             super.addDependency(on: targetId, platformFilters: platformFilters)
             if linkProduct {
-                let frameworksPhase = buildPhases.first{ $0 is FrameworksBuildPhase } ?? addFrameworksBuildPhase()
+                let frameworksPhase = buildPhases.first { $0 is FrameworksBuildPhase } ?? addFrameworksBuildPhase()
                 frameworksPhase.addBuildFile(productOf: targetId, platformFilters: platformFilters)
             }
         }
@@ -440,24 +446,24 @@ public enum PIF {
 
         /// Convenience function to add a file reference to the Headers build phase, after creating it if needed.
         @discardableResult public func addHeaderFile(ref: FileReference) -> BuildFile {
-            let headerPhase = buildPhases.first{ $0 is HeadersBuildPhase } ?? addHeadersBuildPhase()
+            let headerPhase = buildPhases.first { $0 is HeadersBuildPhase } ?? addHeadersBuildPhase()
             return headerPhase.addBuildFile(fileRef: ref)
         }
 
         /// Convenience function to add a file reference to the Sources build phase, after creating it if needed.
         @discardableResult public func addSourceFile(ref: FileReference, generatedCodeVisibility: BuildFile.GeneratedCodeVisibility?) -> BuildFile {
-            let sourcesPhase = buildPhases.first{ $0 is SourcesBuildPhase } ?? addSourcesBuildPhase()
+            let sourcesPhase = buildPhases.first { $0 is SourcesBuildPhase } ?? addSourcesBuildPhase()
             return sourcesPhase.addBuildFile(fileRef: ref, generatedCodeVisibility: generatedCodeVisibility)
         }
 
         @discardableResult public func addSourceFile(ref: FileReference) -> BuildFile {
-            let sourcesPhase = buildPhases.first{ $0 is SourcesBuildPhase } ?? addSourcesBuildPhase()
+            let sourcesPhase = buildPhases.first { $0 is SourcesBuildPhase } ?? addSourcesBuildPhase()
             return sourcesPhase.addBuildFile(fileRef: ref, generatedCodeVisibility: nil)
         }
 
         /// Convenience function to add a file reference to the Frameworks build phase, after creating it if needed.
         @discardableResult public func addLibrary(ref: FileReference, platformFilters: Set<PlatformFilter>, codeSignOnCopy: Bool = false, removeHeadersOnCopy: Bool = false) -> BuildFile {
-            let frameworksPhase = buildPhases.first{ $0 is FrameworksBuildPhase } ?? addFrameworksBuildPhase()
+            let frameworksPhase = buildPhases.first { $0 is FrameworksBuildPhase } ?? addFrameworksBuildPhase()
             return frameworksPhase.addBuildFile(fileRef: ref, platformFilters: platformFilters, codeSignOnCopy: codeSignOnCopy, removeHeadersOnCopy: removeHeadersOnCopy)
         }
 
@@ -470,7 +476,7 @@ public enum PIF {
         }
 
         @discardableResult public func addResourceFile(ref: FileReference, platformFilters: Set<PlatformFilter>, resourceRule: BuildFile.ResourceRule? = nil) -> BuildFile {
-            let resourcesPhase = buildPhases.first{ $0 is CopyBundleResourcesBuildPhase } ?? addCopyBundleResourcesBuildPhase()
+            let resourcesPhase = buildPhases.first { $0 is CopyBundleResourcesBuildPhase } ?? addCopyBundleResourcesBuildPhase()
             return resourcesPhase.addBuildFile(fileRef: ref, platformFilters: platformFilters, resourceRule: resourceRule)
         }
 
@@ -489,11 +495,13 @@ public enum PIF {
                     PIFKey_guid: id,
                     PIFKey_name: name,
                     PIFKey_Target_customTasks: customTasks.map { $0.serialize(to: serializer) },
-                    PIFKey_Target_dependencies: dependencies.map{ [
-                        PIFKey_guid: $0.targetId,
-                        PIFKey_platformFilters: $0.platformFilters.map{ $0.serialize(to: serializer) }
-                    ] },
-                    PIFKey_buildConfigurations: buildConfigs.map{ $0.serialize(to: serializer) },
+                    PIFKey_Target_dependencies: dependencies.map {
+                        [
+                            PIFKey_guid: $0.targetId,
+                            PIFKey_platformFilters: $0.platformFilters.map { $0.serialize(to: serializer) },
+                        ]
+                    },
+                    PIFKey_buildConfigurations: buildConfigs.map { $0.serialize(to: serializer) },
                 ]
                 // Add the framework build phase, if present.
                 if let phase = buildPhases.first as? PIF.FrameworksBuildPhase {
@@ -509,17 +517,17 @@ public enum PIF {
                 PIFKey_type: "standard",
                 PIFKey_guid: id,
                 PIFKey_name: name,
-                PIFKey_Target_dependencies: dependencies.map{ ["guid": $0.targetId, "platformFilters": $0.platformFilters.map{ $0.serialize(to: serializer) }] },
+                PIFKey_Target_dependencies: dependencies.map { ["guid": $0.targetId, "platformFilters": $0.platformFilters.map { $0.serialize(to: serializer) }] },
                 PIFKey_Target_productTypeIdentifier: productType.asString,
                 PIFKey_Target_productReference: [
                     PIFKey_type: "file",
                     PIFKey_guid: "PRODUCTREF-\(id)",
                     PIFKey_name: productName,
                 ],
-                PIFKey_Target_buildRules: buildRules.map{ $0.serialize(to: serializer) },
-                PIFKey_Target_buildPhases: buildPhases.map{ ($0 as! (any PIFRepresentable)).serialize(to: serializer) },
+                PIFKey_Target_buildRules: buildRules.map { $0.serialize(to: serializer) },
+                PIFKey_Target_buildPhases: buildPhases.map { ($0 as! (any PIFRepresentable)).serialize(to: serializer) },
                 PIFKey_Target_customTasks: customTasks.map { $0.serialize(to: serializer) },
-                PIFKey_buildConfigurations: buildConfigs.map{ $0.serialize(to: serializer) },
+                PIFKey_buildConfigurations: buildConfigs.map { $0.serialize(to: serializer) },
             ]
             if let dynamicTargetVariant {
                 result[PIFKey_Target_dynamicTargetVariantGuid] = dynamicTargetVariant.id
@@ -581,28 +589,28 @@ public enum PIF {
     }
 
     /// A "headers" build phase, i.e. one that copies headers into a directory of the product, after suitable processing.
-    public class HeadersBuildPhase : BuildPhase {
+    public class HeadersBuildPhase: BuildPhase {
         public override init(id: String) {
             super.init(id: id)
         }
     }
 
     /// A "sources" build phase, i.e. one that compiles sources and provides them to be linked into the executable code of the product.
-    public class SourcesBuildPhase : BuildPhase {
+    public class SourcesBuildPhase: BuildPhase {
         public override init(id: String) {
             super.init(id: id)
         }
     }
 
     /// A "frameworks" build phase, i.e. one that links compiled code and libraries into the executable of the product.
-    public class FrameworksBuildPhase : BuildPhase {
+    public class FrameworksBuildPhase: BuildPhase {
         public override init(id: String) {
             super.init(id: id)
         }
     }
 
     /// A "copy files" build phase, i.e. one that copies files to an arbitrary location relative to the product.
-    public class CopyFilesBuildPhase : BuildPhase {
+    public class CopyFilesBuildPhase: BuildPhase {
         public let destinationSubfolder: DestinationSubfolder
         public let destinationSubpath: String
         public let runOnlyForDeploymentPostprocessing: Bool
@@ -642,7 +650,7 @@ public enum PIF {
     }
 
     /// A "shell script" build phase, i.e. one that runs a custom shell script.
-    public class ShellScriptBuildPhase : BuildPhase {
+    public class ShellScriptBuildPhase: BuildPhase {
         public var name: String
         public var scriptContents: String
         public var shellPath: String
@@ -693,7 +701,7 @@ public enum PIF {
         }
     }
 
-    public class CopyBundleResourcesBuildPhase : BuildPhase {
+    public class CopyBundleResourcesBuildPhase: BuildPhase {
         public override init(id: String) {
             super.init(id: id)
         }
@@ -1049,7 +1057,7 @@ public enum PIF {
         public var WATCHOS_DEPLOYMENT_TARGET: String?
 
         @available(*, deprecated, renamed: "GENERATE_PRELINK_OBJECT_FILE")
-        public var GENERATE_MASTER_OBJECT_FILE: String? // ignore-unacceptable-language
+        public var GENERATE_MASTER_OBJECT_FILE: String?  // ignore-unacceptable-language
     }
 }
 
diff --git a/Sources/SWBProtocol/AsyncSequence.swift b/Sources/SWBProtocol/AsyncSequence.swift
index 55ac8e6c..743cdb75 100644
--- a/Sources/SWBProtocol/AsyncSequence.swift
+++ b/Sources/SWBProtocol/AsyncSequence.swift
@@ -101,7 +101,7 @@ extension AsyncSequence where Self.Element == UInt8 {
     }
 }
 
-extension AsyncIPCMessageSequence: Sendable where Base: Sendable { }
+extension AsyncIPCMessageSequence: Sendable where Base: Sendable {}
 
 @available(*, unavailable)
-extension AsyncIPCMessageSequence.AsyncIterator: Sendable { }
+extension AsyncIPCMessageSequence.AsyncIterator: Sendable {}
diff --git a/Sources/SWBProtocol/BuildAction.swift b/Sources/SWBProtocol/BuildAction.swift
index 443bc4f0..ad852f34 100644
--- a/Sources/SWBProtocol/BuildAction.swift
+++ b/Sources/SWBProtocol/BuildAction.swift
@@ -13,8 +13,8 @@
 public import SWBUtil
 
 public enum BuildAction: String, Serializable, Codable, CaseIterable, Comparable, Sendable {
-    case analyze = "analyze" // used by legacy target-based builds using xcodebuild
-    case archive = "archive" // used by legacy target-based builds using xcodebuild
+    case analyze = "analyze"  // used by legacy target-based builds using xcodebuild
+    case archive = "archive"  // used by legacy target-based builds using xcodebuild
     case clean = "clean"
     case build = "build"
     case exportLoc = "exportloc"
@@ -72,7 +72,7 @@ public enum BuildAction: String, Serializable, Codable, CaseIterable, Comparable
         }
     }
 
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serialize(rawValue)
     }
 
diff --git a/Sources/SWBProtocol/BuildOperationMessages.swift b/Sources/SWBProtocol/BuildOperationMessages.swift
index 2f7c774d..e7677ad5 100644
--- a/Sources/SWBProtocol/BuildOperationMessages.swift
+++ b/Sources/SWBProtocol/BuildOperationMessages.swift
@@ -80,18 +80,20 @@ public enum BuildOperationTargetType: SerializableCodable, Equatable, Sendable {
 
     public func encode(to encoder: any Swift.Encoder) throws {
         var container = encoder.singleValueContainer()
-        try container.encode({ () -> CodingKeys in
-            switch self {
-            case .aggregate:
-                return .aggregate
-            case .external:
-                return .external
-            case .packageProduct:
-                return .packageProduct
-            case .standard:
-                return .standard
-            }
-        }().rawValue)
+        try container.encode(
+            { () -> CodingKeys in
+                switch self {
+                case .aggregate:
+                    return .aggregate
+                case .external:
+                    return .external
+                case .packageProduct:
+                    return .packageProduct
+                case .standard:
+                    return .standard
+                }
+            }().rawValue
+        )
     }
 }
 
@@ -562,7 +564,7 @@ public struct BuildOperationMetrics: Equatable, Codable, Sendable {
         counters.isEmpty && taskCounters.isEmpty
     }
 
-    public init(counters: [Counter : Int], taskCounters: [String: [TaskCounter: Int]]) {
+    public init(counters: [Counter: Int], taskCounters: [String: [TaskCounter: Int]]) {
         self.counters = counters
         self.taskCounters = taskCounters
     }
@@ -930,10 +932,10 @@ public struct BuildOperationConsoleOutputEmitted: Message, Equatable, Serializab
     }
 
     public enum CodingKeys: CodingKey {
-        case data // legacy key
+        case data  // legacy key
         case data2
         case taskID
-        case taskSignature // legacy key
+        case taskSignature  // legacy key
         case taskSignature2
         case targetID
     }
@@ -991,7 +993,7 @@ public struct BuildOperationDiagnosticEmitted: Message, Equatable, SerializableC
 
         enum TaskCodingKeys: CodingKey {
             case taskID
-            case taskSignature // legacy key
+            case taskSignature  // legacy key
             case taskSignature2
             case targetID
         }
@@ -1002,7 +1004,7 @@ public struct BuildOperationDiagnosticEmitted: Message, Equatable, SerializableC
 
         enum GlobalTaskCodingKeys: CodingKey {
             case taskID
-            case taskSignature // legacy key
+            case taskSignature  // legacy key
             case taskSignature2
         }
 
diff --git a/Sources/SWBProtocol/DependencyGraphMessages.swift b/Sources/SWBProtocol/DependencyGraphMessages.swift
index bb2b6815..232f78fc 100644
--- a/Sources/SWBProtocol/DependencyGraphMessages.swift
+++ b/Sources/SWBProtocol/DependencyGraphMessages.swift
@@ -71,10 +71,8 @@ public struct DependencyGraphResponse: Message, SerializableCodable, Equatable {
     }
 }
 
-
 // MARK: Getting declared dependency info
 
-
 public struct DumpBuildDependencyInfoRequest: SessionChannelBuildMessage, RequestMessage, SerializableCodable, Equatable {
     public typealias ResponseMessage = VoidResponse
 
@@ -100,7 +98,6 @@ public struct DumpBuildDependencyInfoRequest: SessionChannelBuildMessage, Reques
     }
 }
 
-
 // MARK: Registering messages
 
 let dependencyGraphMessageTypes: [any Message.Type] = [
diff --git a/Sources/SWBProtocol/LocalizationMessages.swift b/Sources/SWBProtocol/LocalizationMessages.swift
index 5e61a679..0e5fcfc7 100644
--- a/Sources/SWBProtocol/LocalizationMessages.swift
+++ b/Sources/SWBProtocol/LocalizationMessages.swift
@@ -54,5 +54,5 @@ public struct LocalizationInfoResponse: Message, Equatable, SerializableCodable
 
 let localizationMessageTypes: [any Message.Type] = [
     LocalizationInfoRequest.self,
-    LocalizationInfoResponse.self
+    LocalizationInfoResponse.self,
 ]
diff --git a/Sources/SWBProtocol/MacroEvaluationMessages.swift b/Sources/SWBProtocol/MacroEvaluationMessages.swift
index faea9a3a..c37a8142 100644
--- a/Sources/SWBProtocol/MacroEvaluationMessages.swift
+++ b/Sources/SWBProtocol/MacroEvaluationMessages.swift
@@ -12,14 +12,12 @@
 
 public import SWBUtil
 
-
 public enum MacroEvaluationRequestLevel: Equatable, Sendable, SerializableCodable {
     case defaults
     case project(_ guid: String)
     case target(_ guid: String)
 }
 
-
 /// Requests a macro evaluation scope handle in a session.
 ///
 /// This is a flexible message in that the project, target, and build parameters are all optional, but the handler `CreateMacroEvaluationScopeMsg.handle()` will request the handle for the appropriate scope based on which fields were passed.
@@ -58,7 +56,6 @@ public struct DiscardMacroEvaluationScope: SessionMessage, RequestMessage, Equat
     }
 }
 
-
 /// The context within which a macro evaluation should occur.
 public enum MacroEvaluationRequestContext: Equatable, Sendable, SerializableCodable {
     /// A `Settings` handle, if called by something which is holding on to a handle.
diff --git a/Sources/SWBProtocol/Message.swift b/Sources/SWBProtocol/Message.swift
index c703e376..8fa8bd8c 100644
--- a/Sources/SWBProtocol/Message.swift
+++ b/Sources/SWBProtocol/Message.swift
@@ -369,7 +369,7 @@ public struct AppleSystemFrameworkNamesRequest: RequestMessage, Equatable, Pendi
         self.xcodeAppPath = developerPath?.dirname.dirname
     }
 
-    public func legacySerialize<T>(to serializer: T) where T : SWBUtil.Serializer {
+    public func legacySerialize<T>(to serializer: T) where T: SWBUtil.Serializer {
         serializer.serializeAggregate(2) {
             serializer.serialize(self.xcodeAppPath)
             serializer.serialize(self.developerPath)
@@ -398,7 +398,7 @@ public struct ProductTypeSupportsMacCatalystRequest: RequestMessage, Equatable,
         self.productTypeIdentifier = productTypeIdentifier
     }
 
-    public func legacySerialize<T>(to serializer: T) where T : SWBUtil.Serializer {
+    public func legacySerialize<T>(to serializer: T) where T: SWBUtil.Serializer {
         serializer.serializeAggregate(3) {
             serializer.serialize(self.xcodeAppPath)
             serializer.serialize(self.developerPath)
@@ -433,17 +433,17 @@ public struct CreateSessionRequest: RequestMessage, Equatable, SerializableCodab
     public let appPath: Path?
     public let cachePath: Path?
     public let inferiorProductsPath: Path?
-    public let environment: [String:String]?
+    public let environment: [String: String]?
 
     public init(name: String, developerPath: Path?, cachePath: Path?, inferiorProductsPath: Path?) {  // ABI compatibility
         self.init(name: name, developerPath: developerPath, cachePath: cachePath, inferiorProductsPath: inferiorProductsPath, environment: nil)
     }
 
-    public init(name: String, developerPath: Path?, cachePath: Path?, inferiorProductsPath: Path?, environment: [String:String]?) { // ABI Compatibility
+    public init(name: String, developerPath: Path?, cachePath: Path?, inferiorProductsPath: Path?, environment: [String: String]?) {  // ABI Compatibility
         self.init(name: name, developerPath: developerPath, resourceSearchPaths: [], cachePath: cachePath, inferiorProductsPath: inferiorProductsPath, environment: environment)
     }
 
-    public init(name: String, developerPath: Path?, resourceSearchPaths: [Path], cachePath: Path?, inferiorProductsPath: Path?, environment: [String:String]?) { // API/ABI compatibility
+    public init(name: String, developerPath: Path?, resourceSearchPaths: [Path], cachePath: Path?, inferiorProductsPath: Path?, environment: [String: String]?) {  // API/ABI compatibility
         self.name = name
         self.developerPath = developerPath
         self.developerPath2 = nil
@@ -454,7 +454,7 @@ public struct CreateSessionRequest: RequestMessage, Equatable, SerializableCodab
         self.environment = environment
     }
 
-    public init(name: String, developerPath: DeveloperPath?, resourceSearchPaths: [Path], cachePath: Path?, inferiorProductsPath: Path?, environment: [String:String]?) {
+    public init(name: String, developerPath: DeveloperPath?, resourceSearchPaths: [Path], cachePath: Path?, inferiorProductsPath: Path?, environment: [String: String]?) {
         self.name = name
         self.developerPath2 = developerPath
         switch developerPath {
@@ -500,7 +500,7 @@ public struct CreateSessionResponse: Message {
         self.diagnostics = try deserializer.deserialize()
     }
 
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         serializer.beginAggregate(2)
         serializer.serialize(self.sessionID)
         serializer.serialize(self.diagnostics)
@@ -549,9 +549,9 @@ public struct SetSessionSystemInfoRequest: SessionMessage, RequestMessage, Equat
         serializer.beginAggregate(3)
         serializer.serialize(sessionHandle)
         let osVersion = self.operatingSystemVersion.zeroPadded(toMinimumNumberOfComponents: 3)
-        serializer.serialize(osVersion.rawValue[0])     // major
-        serializer.serialize(osVersion.rawValue[1])     // minor
-        serializer.serialize(osVersion.rawValue[2])     // update
+        serializer.serialize(osVersion.rawValue[0])  // major
+        serializer.serialize(osVersion.rawValue[1])  // minor
+        serializer.serialize(osVersion.rawValue[2])  // update
         serializer.serialize(self.productBuildVersion)
         serializer.serialize(self.nativeArchitecture)
     }
@@ -662,7 +662,7 @@ public struct ListSessionsRequest: RequestMessage, Equatable {
 
     public static let name = "LIST_SESSIONS"
 
-    public init() { }
+    public init() {}
 
     public init(from deserializer: any Deserializer) throws {
         try deserializer.beginAggregate(0)
@@ -902,13 +902,13 @@ public struct TransferSessionPIFObjectsLegacyRequest: SessionMessage, RequestMes
     public init(from deserializer: any Deserializer) throws {
         try deserializer.beginAggregate(2)
         self.sessionHandle = try deserializer.deserialize()
-        self.objects = (try deserializer.deserialize() as [ObjectData]).map{ $0.data }
+        self.objects = (try deserializer.deserialize() as [ObjectData]).map { $0.data }
     }
 
     public func serialize<T: Serializer>(to serializer: T) {
         serializer.beginAggregate(2)
         serializer.serialize(self.sessionHandle)
-        serializer.serialize(self.objects.map{ ObjectData($0) })
+        serializer.serialize(self.objects.map { ObjectData($0) })
     }
 }
 
@@ -1185,69 +1185,70 @@ public struct IPCMessage: Serializable, Sendable {
     static let extraMessageTypes: [any Message.Type] = []
 
     /// All known message types.
-    static let messageTypes: [any Message.Type] = [
-        PingRequest.self,
-        SetConfigItemRequest.self,
-        ClearAllCachesRequest.self,
-
-        GetPlatformsRequest.self,
-        GetSDKsRequest.self,
-        GetSpecsRequest.self,
-        GetStatisticsRequest.self,
-        GetToolchainsRequest.self,
-        GetBuildSettingsDescriptionRequest.self,
-        ExecuteCommandLineToolRequest.self,
-
-        CreateSessionRequest.self,
-        CreateSessionResponse.self,
-        SetSessionSystemInfoRequest.self,
-        SetSessionUserInfoRequest.self,
-        SetSessionUserPreferencesRequest.self,
-        LookupToolchainRequest.self,
-        LookupToolchainResponse.self,
-        ListSessionsRequest.self,
-        ListSessionsResponse.self,
-        WaitForQuiescenceRequest.self,
-        DeleteSessionRequest.self,
-
-        SetSessionWorkspaceContainerPathRequest.self,
-        SetSessionPIFRequest.self,
-        TransferSessionPIFRequest.self,
-        TransferSessionPIFResponse.self,
-        TransferSessionPIFObjectsRequest.self,
-        TransferSessionPIFObjectsLegacyRequest.self,
-        AuditSessionPIFRequest.self,
-        IncrementalPIFLookupFailureRequest.self,
-
-        WorkspaceInfoRequest.self,
-        WorkspaceInfoResponse.self,
-
-        CreateXCFrameworkRequest.self,
-
-        AppleSystemFrameworkNamesRequest.self,
-        ProductTypeSupportsMacCatalystRequest.self,
-        DeveloperPathRequest.self,
-
-        // TODO: Delete once all clients are no longer calling the public APIs which invoke this message
-        AvailableAppExtensionPointIdentifiersRequest.self,
-        MacCatalystUnavailableFrameworkNamesRequest.self,
-
-        ErrorResponse.self,
-        BoolResponse.self,
-        StringResponse.self,
-        StringListResponse.self
-    ] + buildOperationMessageTypes
-      + macroEvaluationMessageTypes
-      + planningOperationMessageTypes
-      + taskConstructionMessageTypes
-      + indexingMessageTypes
-      + previewInfoMessageTypes
-      + projectDescriptorMessageTypes
-      + documentationMessageTypes
-      + localizationMessageTypes
-      + dependencyClosureMessageTypes
-      + dependencyGraphMessageTypes
-      + buildDescriptionMessages
+    static let messageTypes: [any Message.Type] =
+        [
+            PingRequest.self,
+            SetConfigItemRequest.self,
+            ClearAllCachesRequest.self,
+
+            GetPlatformsRequest.self,
+            GetSDKsRequest.self,
+            GetSpecsRequest.self,
+            GetStatisticsRequest.self,
+            GetToolchainsRequest.self,
+            GetBuildSettingsDescriptionRequest.self,
+            ExecuteCommandLineToolRequest.self,
+
+            CreateSessionRequest.self,
+            CreateSessionResponse.self,
+            SetSessionSystemInfoRequest.self,
+            SetSessionUserInfoRequest.self,
+            SetSessionUserPreferencesRequest.self,
+            LookupToolchainRequest.self,
+            LookupToolchainResponse.self,
+            ListSessionsRequest.self,
+            ListSessionsResponse.self,
+            WaitForQuiescenceRequest.self,
+            DeleteSessionRequest.self,
+
+            SetSessionWorkspaceContainerPathRequest.self,
+            SetSessionPIFRequest.self,
+            TransferSessionPIFRequest.self,
+            TransferSessionPIFResponse.self,
+            TransferSessionPIFObjectsRequest.self,
+            TransferSessionPIFObjectsLegacyRequest.self,
+            AuditSessionPIFRequest.self,
+            IncrementalPIFLookupFailureRequest.self,
+
+            WorkspaceInfoRequest.self,
+            WorkspaceInfoResponse.self,
+
+            CreateXCFrameworkRequest.self,
+
+            AppleSystemFrameworkNamesRequest.self,
+            ProductTypeSupportsMacCatalystRequest.self,
+            DeveloperPathRequest.self,
+
+            // TODO: Delete once all clients are no longer calling the public APIs which invoke this message
+            AvailableAppExtensionPointIdentifiersRequest.self,
+            MacCatalystUnavailableFrameworkNamesRequest.self,
+
+            ErrorResponse.self,
+            BoolResponse.self,
+            StringResponse.self,
+            StringListResponse.self,
+        ] + buildOperationMessageTypes
+        + macroEvaluationMessageTypes
+        + planningOperationMessageTypes
+        + taskConstructionMessageTypes
+        + indexingMessageTypes
+        + previewInfoMessageTypes
+        + projectDescriptorMessageTypes
+        + documentationMessageTypes
+        + localizationMessageTypes
+        + dependencyClosureMessageTypes
+        + dependencyGraphMessageTypes
+        + buildDescriptionMessages
 
     /// Reverse name mapping.
     static let messageNameToID: [String: any Message.Type] = {
diff --git a/Sources/SWBProtocol/MessageSupport.swift b/Sources/SWBProtocol/MessageSupport.swift
index 65e79bfc..3326b6c0 100644
--- a/Sources/SWBProtocol/MessageSupport.swift
+++ b/Sources/SWBProtocol/MessageSupport.swift
@@ -72,8 +72,8 @@ public enum BuildCommandMessagePayload: SerializableCodable, Equatable, Sendable
         case .migrate:
             break
         case let .generateAssemblyCode(buildOnlyTheseFiles),
-             let .generatePreprocessedFile(buildOnlyTheseFiles),
-             let .singleFileBuild(buildOnlyTheseFiles):
+            let .generatePreprocessedFile(buildOnlyTheseFiles),
+            let .singleFileBuild(buildOnlyTheseFiles):
             try container.encode(buildOnlyTheseFiles, forKey: .files)
         case let .prepareForIndexing(buildOnlyTheseTargets, enableIndexBuildArena):
             try container.encode(buildOnlyTheseTargets, forKey: .targets)
@@ -457,7 +457,7 @@ public struct PreviewInfoTargetDependencyInfo: Codable, Equatable, Sendable {
 
     public init(
         productModuleName: String,
-        objectFileInputMap: [String : Set<String>],
+        objectFileInputMap: [String: Set<String>],
         linkCommandLine: [String],
         linkerWorkingDirectory: String?,
         swiftEnableOpaqueTypeErasure: Bool,
@@ -561,10 +561,12 @@ public struct LocalizationInfoMessagePayload: SerializableCodable, Equatable, Se
     /// Paths to generated source code files holding string symbols, keyed by xcstrings file path.
     public var generatedSymbolFilesByXCStringsPath = [Path: Set<Path>]()
 
-    public init(targetIdentifier: String,
-                compilableXCStringsPaths: Set<Path>,
-                producedStringsdataPaths: [LocalizationInfoBuildPortion: Set<Path>],
-                effectivePlatformName: String?) {
+    public init(
+        targetIdentifier: String,
+        compilableXCStringsPaths: Set<Path>,
+        producedStringsdataPaths: [LocalizationInfoBuildPortion: Set<Path>],
+        effectivePlatformName: String?
+    ) {
         self.targetIdentifier = targetIdentifier
         self.compilableXCStringsPaths = compilableXCStringsPaths
         self.producedStringsdataPaths = producedStringsdataPaths
diff --git a/Sources/SWBProtocol/PIFKeyConstants.swift b/Sources/SWBProtocol/PIFKeyConstants.swift
index 59292d3c..4f215c1c 100644
--- a/Sources/SWBProtocol/PIFKeyConstants.swift
+++ b/Sources/SWBProtocol/PIFKeyConstants.swift
@@ -15,127 +15,127 @@ import Foundation
 // MARK: PIF key constant definitions
 
 // Generic keys used by multiple kinds of objects
-public let PIFKey_guid                          = "guid"
-public let PIFKey_name                          = "name"
-public let PIFKey_path                          = "path"
-public let PIFKey_type                          = "type"
-public let PIFKey_buildConfigurations           = "buildConfigurations"
-public let PIFKey_impartedBuildProperties       = "impartedBuildProperties"
-public let PIFKey_platformFilters               = "platformFilters"
+public let PIFKey_guid = "guid"
+public let PIFKey_name = "name"
+public let PIFKey_path = "path"
+public let PIFKey_type = "type"
+public let PIFKey_buildConfigurations = "buildConfigurations"
+public let PIFKey_impartedBuildProperties = "impartedBuildProperties"
+public let PIFKey_platformFilters = "platformFilters"
 
 // Keys specific to workspaces
-public let PIFKey_Workspace_projects    = "projects"
+public let PIFKey_Workspace_projects = "projects"
 
 // Keys specific to projects
-public let PIFKey_Project_projectDirectory              = "projectDirectory"
-public let PIFKey_Project_name                          = "projectName"
-public let PIFKey_Project_isPackage                     = "projectIsPackage"
-public let PIFKey_Project_targets                       = "targets"
-public let PIFKey_Project_groupTree                     = "groupTree"
-public let PIFKey_Project_defaultConfigurationName      = "defaultConfigurationName"
-public let PIFKey_Project_developmentRegion             = "developmentRegion"
-public let PIFKey_Project_classPrefix                   = "classPrefix"
-public let PIFKey_Project_appPreferencesBuildSettings   = "appPreferencesBuildSettings"
+public let PIFKey_Project_projectDirectory = "projectDirectory"
+public let PIFKey_Project_name = "projectName"
+public let PIFKey_Project_isPackage = "projectIsPackage"
+public let PIFKey_Project_targets = "targets"
+public let PIFKey_Project_groupTree = "groupTree"
+public let PIFKey_Project_defaultConfigurationName = "defaultConfigurationName"
+public let PIFKey_Project_developmentRegion = "developmentRegion"
+public let PIFKey_Project_classPrefix = "classPrefix"
+public let PIFKey_Project_appPreferencesBuildSettings = "appPreferencesBuildSettings"
 
 // Keys specific to references
-public let PIFKey_Reference_sourceTree         = "sourceTree"
-public let PIFKey_Reference_fileType           = "fileType"
-public let PIFKey_Reference_producingTarget    = "producingTarget"
-public let PIFKey_Reference_regionVariantName  = "regionVariantName"
-public let PIFKey_Reference_remoteReference    = "remoteReference"
-public let PIFKey_Reference_children           = "children"
-public let PIFKey_Reference_fileTextEncoding   = "fileTextEncoding"
-public let PIFKey_Reference_expectedSignature  = "expectedSignature"
+public let PIFKey_Reference_sourceTree = "sourceTree"
+public let PIFKey_Reference_fileType = "fileType"
+public let PIFKey_Reference_producingTarget = "producingTarget"
+public let PIFKey_Reference_regionVariantName = "regionVariantName"
+public let PIFKey_Reference_remoteReference = "remoteReference"
+public let PIFKey_Reference_children = "children"
+public let PIFKey_Reference_fileTextEncoding = "fileTextEncoding"
+public let PIFKey_Reference_expectedSignature = "expectedSignature"
 
 // Keys specific to targets
-public let PIFKey_Target_productReference          = "productReference"
-public let PIFKey_Target_productTypeIdentifier     = "productTypeIdentifier"
-public let PIFKey_Target_dependencies              = "dependencies"
-public let PIFKey_Target_buildPhases               = "buildPhases"
-public let PIFKey_Target_buildRules                = "buildRules"
-public let PIFKey_Target_customTasks               = "customTasks"
+public let PIFKey_Target_productReference = "productReference"
+public let PIFKey_Target_productTypeIdentifier = "productTypeIdentifier"
+public let PIFKey_Target_dependencies = "dependencies"
+public let PIFKey_Target_buildPhases = "buildPhases"
+public let PIFKey_Target_buildRules = "buildRules"
+public let PIFKey_Target_customTasks = "customTasks"
 public let PIFKey_Target_performanceTestsBaselinesPath = "performanceTestsBaselinesPath"
 public let PIFKey_Target_predominantSourceCodeLanguage = "predominantSourceCodeLanguage"
-public let PIFKey_Target_isPackageTarget           = "isPackageTarget"
-public let PIFKey_Target_provisioningSourceData    = "provisioningSourceData"
+public let PIFKey_Target_isPackageTarget = "isPackageTarget"
+public let PIFKey_Target_provisioningSourceData = "provisioningSourceData"
 public let PIFKey_Target_developmentTeamIdentifier = "developmentTeamIdentifier"
-public let PIFKey_Target_frameworksBuildPhase      = "frameworksBuildPhase"
-public let PIFKey_Target_dynamicTargetVariantGuid  = "dynamicTargetVariantGuid"
-public let PIFKey_Target_approvedByUser            = "approvedByUser"
+public let PIFKey_Target_frameworksBuildPhase = "frameworksBuildPhase"
+public let PIFKey_Target_dynamicTargetVariantGuid = "dynamicTargetVariantGuid"
+public let PIFKey_Target_approvedByUser = "approvedByUser"
 
 // Keys specific to external targets
-public let PIFKey_ExternalTarget_toolPath                           = "toolPath"
-public let PIFKey_ExternalTarget_arguments                          = "arguments"
-public let PIFKey_ExternalTarget_workingDirectory                   = "workingDirectory"
-public let PIFKey_ExternalTarget_passBuildSettingsInEnvironment     = "passBuildSettingsInEnvironment"
+public let PIFKey_ExternalTarget_toolPath = "toolPath"
+public let PIFKey_ExternalTarget_arguments = "arguments"
+public let PIFKey_ExternalTarget_workingDirectory = "workingDirectory"
+public let PIFKey_ExternalTarget_passBuildSettingsInEnvironment = "passBuildSettingsInEnvironment"
 
 // Keys specific to build phases
-public let PIFKey_BuildPhase_buildFiles                             = "buildFiles"
-public let PIFKey_BuildPhase_destinationSubfolder                   = "destinationSubfolder"
-public let PIFKey_BuildPhase_destinationSubpath                     = "destinationSubpath"
-public let PIFKey_BuildPhase_emitEnvironment                        = "emitEnvironment"
-public let PIFKey_BuildPhase_sandboxingOverride                     = "sandboxingOverride"
-public let PIFKey_BuildPhase_inputFilePaths                         = "inputFilePaths"
-public let PIFKey_BuildPhase_inputFileListPaths                     = "inputFileListPaths"
-public let PIFKey_BuildPhase_name                                   = "name"
-public let PIFKey_BuildPhase_originalObjectID                       = "originalObjectID"
-public let PIFKey_BuildPhase_outputFilePaths                        = "outputFilePaths"
-public let PIFKey_BuildPhase_outputFileListPaths                    = "outputFileListPaths"
-public let PIFKey_BuildPhase_runOnlyForDeploymentPostprocessing     = "runOnlyForDeploymentPostprocessing"
-public let PIFKey_BuildPhase_shellPath                              = "shellPath"
-public let PIFKey_BuildPhase_scriptContents                         = "scriptContents"
-public let PIFKey_BuildPhase_dependencyFileFormat                   = "dependencyFileFormat"
-public let PIFKey_BuildPhase_dependencyFilePaths                    = "dependencyFilePaths"
-public let PIFKey_BuildPhase_alwaysOutOfDate                        = "alwaysOutOfDate"
-public let PIFKey_BuildPhase_alwaysRunForInstallHdrs                = "alwaysRunForInstallHdrs"
+public let PIFKey_BuildPhase_buildFiles = "buildFiles"
+public let PIFKey_BuildPhase_destinationSubfolder = "destinationSubfolder"
+public let PIFKey_BuildPhase_destinationSubpath = "destinationSubpath"
+public let PIFKey_BuildPhase_emitEnvironment = "emitEnvironment"
+public let PIFKey_BuildPhase_sandboxingOverride = "sandboxingOverride"
+public let PIFKey_BuildPhase_inputFilePaths = "inputFilePaths"
+public let PIFKey_BuildPhase_inputFileListPaths = "inputFileListPaths"
+public let PIFKey_BuildPhase_name = "name"
+public let PIFKey_BuildPhase_originalObjectID = "originalObjectID"
+public let PIFKey_BuildPhase_outputFilePaths = "outputFilePaths"
+public let PIFKey_BuildPhase_outputFileListPaths = "outputFileListPaths"
+public let PIFKey_BuildPhase_runOnlyForDeploymentPostprocessing = "runOnlyForDeploymentPostprocessing"
+public let PIFKey_BuildPhase_shellPath = "shellPath"
+public let PIFKey_BuildPhase_scriptContents = "scriptContents"
+public let PIFKey_BuildPhase_dependencyFileFormat = "dependencyFileFormat"
+public let PIFKey_BuildPhase_dependencyFilePaths = "dependencyFilePaths"
+public let PIFKey_BuildPhase_alwaysOutOfDate = "alwaysOutOfDate"
+public let PIFKey_BuildPhase_alwaysRunForInstallHdrs = "alwaysRunForInstallHdrs"
 
 // Keys specific to build files
-public let PIFKey_BuildFile_fileReference               = "fileReference"
-public let PIFKey_BuildFile_targetReference             = "targetReference"
-public let PIFKey_BuildFile_additionalCompilerOptions   = "additionalCompilerOptions"
-public let PIFKey_BuildFile_assetTags                   = "assetTags"
-public let PIFKey_BuildFile_decompress                  = "decompress"
-public let PIFKey_BuildFile_headerVisibility            = "headerVisibility"
-public let PIFKey_BuildFile_migCodegenFiles             = "migCodegenFiles"
-public let PIFKey_BuildFile_intentsCodegenFiles         = "intentsCodegenFiles"
-public let PIFKey_BuildFile_intentsCodegenVisibility    = "intentsCodegenVisibility"
-public let PIFKey_BuildFile_codeSignOnCopy              = "codeSignOnCopy"
-public let PIFKey_BuildFile_removeHeadersOnCopy         = "removeHeadersOnCopy"
-public let PIFKey_BuildFile_linkUsingSearchPath         = "linkUsingSearchPath"
-public let PIFKey_BuildFile_shouldLinkWeakly            = "shouldLinkWeakly"
+public let PIFKey_BuildFile_fileReference = "fileReference"
+public let PIFKey_BuildFile_targetReference = "targetReference"
+public let PIFKey_BuildFile_additionalCompilerOptions = "additionalCompilerOptions"
+public let PIFKey_BuildFile_assetTags = "assetTags"
+public let PIFKey_BuildFile_decompress = "decompress"
+public let PIFKey_BuildFile_headerVisibility = "headerVisibility"
+public let PIFKey_BuildFile_migCodegenFiles = "migCodegenFiles"
+public let PIFKey_BuildFile_intentsCodegenFiles = "intentsCodegenFiles"
+public let PIFKey_BuildFile_intentsCodegenVisibility = "intentsCodegenVisibility"
+public let PIFKey_BuildFile_codeSignOnCopy = "codeSignOnCopy"
+public let PIFKey_BuildFile_removeHeadersOnCopy = "removeHeadersOnCopy"
+public let PIFKey_BuildFile_linkUsingSearchPath = "linkUsingSearchPath"
+public let PIFKey_BuildFile_shouldLinkWeakly = "shouldLinkWeakly"
 public let PIFKey_BuildFile_shouldWarnIfNoRuleToProcess = "shouldWarnIfNoRuleToProcess"
-public let PIFKey_BuildFile_resourceRule                = "resourceRule"
+public let PIFKey_BuildFile_resourceRule = "resourceRule"
 
 // Keys specific to build rules
-public let PIFKey_BuildRule_fileTypeIdentifier                  = "fileTypeIdentifier"
-public let PIFKey_BuildRule_filePatterns                        = "filePatterns"
-public let PIFKey_BuildRule_compilerSpecificationIdentifier     = "compilerSpecificationIdentifier"
-public let PIFKey_BuildRule_scriptContents                      = "scriptContents"
-public let PIFKey_BuildRule_inputFilePaths                      = "inputFilePaths"
-public let PIFKey_BuildRule_inputFileListPaths                  = "inputFileListPaths"
-public let PIFKey_BuildRule_outputFilePaths                     = "outputFilePaths"
-public let PIFKey_BuildRule_outputFileListPaths                 = "outputFileListPaths"
-public let PIFKey_BuildRule_outputFilesCompilerFlags            = "outputFilesCompilerFlags"
-public let PIFKey_BuildRule_dependencyFileFormat                = "dependencyFileFormat"
-public let PIFKey_BuildRule_dependencyFilePaths                 = "dependencyFilePaths"
-public let PIFKey_BuildRule_runOncePerArchitecture              = "runOncePerArchitecture"
+public let PIFKey_BuildRule_fileTypeIdentifier = "fileTypeIdentifier"
+public let PIFKey_BuildRule_filePatterns = "filePatterns"
+public let PIFKey_BuildRule_compilerSpecificationIdentifier = "compilerSpecificationIdentifier"
+public let PIFKey_BuildRule_scriptContents = "scriptContents"
+public let PIFKey_BuildRule_inputFilePaths = "inputFilePaths"
+public let PIFKey_BuildRule_inputFileListPaths = "inputFileListPaths"
+public let PIFKey_BuildRule_outputFilePaths = "outputFilePaths"
+public let PIFKey_BuildRule_outputFileListPaths = "outputFileListPaths"
+public let PIFKey_BuildRule_outputFilesCompilerFlags = "outputFilesCompilerFlags"
+public let PIFKey_BuildRule_dependencyFileFormat = "dependencyFileFormat"
+public let PIFKey_BuildRule_dependencyFilePaths = "dependencyFilePaths"
+public let PIFKey_BuildRule_runOncePerArchitecture = "runOncePerArchitecture"
 
 // Keys specific to custom tasks
-public let PIFKey_CustomTask_commandLine           = "commandLine"
-public let PIFKey_CustomTask_environment           = "environment"
-public let PIFKey_CustomTask_workingDirectory      = "workingDirectory"
-public let PIFKey_CustomTask_executionDescription  = "executionDescription"
-public let PIFKey_CustomTask_inputFilePaths        = "inputFilePaths"
-public let PIFKey_CustomTask_outputFilePaths       = "outputFilePaths"
-public let PIFKey_CustomTask_enableSandboxing      = "enableSandboxing"
-public let PIFKey_CustomTask_preparesForIndexing   = "preparesForIndexing"
+public let PIFKey_CustomTask_commandLine = "commandLine"
+public let PIFKey_CustomTask_environment = "environment"
+public let PIFKey_CustomTask_workingDirectory = "workingDirectory"
+public let PIFKey_CustomTask_executionDescription = "executionDescription"
+public let PIFKey_CustomTask_inputFilePaths = "inputFilePaths"
+public let PIFKey_CustomTask_outputFilePaths = "outputFilePaths"
+public let PIFKey_CustomTask_enableSandboxing = "enableSandboxing"
+public let PIFKey_CustomTask_preparesForIndexing = "preparesForIndexing"
 
 // Special value for PIFKey_BuildRule_fileTypeIdentifier
-public let PIFKey_BuildRule_fileTypeIdentifier_pattern_proxy    = "pattern.proxy"
+public let PIFKey_BuildRule_fileTypeIdentifier_pattern_proxy = "pattern.proxy"
 
 // Special value for PIFKey_BuildRule_compilerSpecificationIdentifier
-public let PIFKey_BuildRule_compilerSpecificationIdentifier_com_apple_compilers_proxy_script  = "com.apple.compilers.proxy.script"
+public let PIFKey_BuildRule_compilerSpecificationIdentifier_com_apple_compilers_proxy_script = "com.apple.compilers.proxy.script"
 
 // Keys specific to build configurations
-public let PIFKey_BuildConfiguration_buildSettings                      = "buildSettings"
-public let PIFKey_BuildConfiguration_baseConfigurationFileReference     = "baseConfigurationFileReference"
+public let PIFKey_BuildConfiguration_buildSettings = "buildSettings"
+public let PIFKey_BuildConfiguration_baseConfigurationFileReference = "baseConfigurationFileReference"
diff --git a/Sources/SWBProtocol/PlanningOperationMessages.swift b/Sources/SWBProtocol/PlanningOperationMessages.swift
index 80f3fa91..385abea4 100644
--- a/Sources/SWBProtocol/PlanningOperationMessages.swift
+++ b/Sources/SWBProtocol/PlanningOperationMessages.swift
@@ -15,7 +15,6 @@ import Foundation
 
 // MARK: General planning operation messages
 
-
 /// Inform the client that a planning operation will start.
 public struct PlanningOperationWillStart: SessionMessage, Equatable {
     public static let name = "PLANNING_OPERATION_WILL_START"
@@ -68,7 +67,6 @@ public struct PlanningOperationDidFinish: SessionMessage, Equatable {
     }
 }
 
-
 // MARK: Getting provisioning task inputs from the client
 
 /// The source data to send to the client for it to generate the provisioning task inputs for the service.
@@ -142,7 +140,7 @@ public struct ProvisioningTaskInputsSourceData: Serializable, Equatable, Sendabl
         self.projectEntitlementsFile = try deserializer.deserialize()
         let projectEntitlementsBytes: [UInt8]? = try deserializer.deserialize()
         self.projectEntitlements = try projectEntitlementsBytes.map { try PropertyList.fromBytes($0) }
-        _ = try deserializer.deserialize() as Bool // Deprecated field, kept for compatibility
+        _ = try deserializer.deserialize() as Bool  // Deprecated field, kept for compatibility
         self.signingCertificateIdentifier = try deserializer.deserialize()
         self.signingRequiresTeam = try deserializer.deserialize()
         self.sdkRoot = try deserializer.deserialize()
@@ -157,7 +155,7 @@ public struct ProvisioningTaskInputsSourceData: Serializable, Equatable, Sendabl
     public func serialize<T: Serializer>(to serializer: T) {
         serializer.serializeAggregate(21) {
             serializer.serialize(configurationName)
-            serializer.serialize(false) // Deprecated field, kept for compatibility
+            serializer.serialize(false)  // Deprecated field, kept for compatibility
             serializer.serialize(provisioningProfileSupport)
             serializer.serialize(provisioningProfileSpecifier)
             serializer.serialize(provisioningProfileUUID)
@@ -170,7 +168,7 @@ public struct ProvisioningTaskInputsSourceData: Serializable, Equatable, Sendabl
             serializer.serialize(projectEntitlementsFile)
             // FIXME: <rdar://problem/40036582> We have no way to handle any errors in PropertyListItem.asBytes() here.
             serializer.serialize(projectEntitlements.map { try? $0.asBytes(.binary) } ?? nil)
-            serializer.serialize(false) // Deprecated field, kept for compatibility
+            serializer.serialize(false)  // Deprecated field, kept for compatibility
             serializer.serialize(signingCertificateIdentifier)
             serializer.serialize(signingRequiresTeam)
             serializer.serialize(sdkRoot)
@@ -212,7 +210,7 @@ public struct GetProvisioningTaskInputsRequest: SessionMessage, Equatable {
         self.targetGUID = try deserializer.deserialize()
         self.configuredTargetHandle = try deserializer.deserialize()
         // This used to be the settingsHandle, but it hasn't been used for a long time.
-        _ =  try deserializer.deserialize() as String
+        _ = try deserializer.deserialize() as String
         self.sourceData = try deserializer.deserialize()
     }
 
@@ -261,7 +259,7 @@ public struct ProvisioningTaskInputsResponse: SessionMessage, RequestMessage, Eq
     public let errors: [[String: String]]
     public let warnings: [String]
 
-    public init(sessionHandle: String, planningOperationHandle: String, configuredTargetHandle: String, identityHash: String?, identitySerialNumber:String?, identityName: String?, profileName: String?, profileUUID: String?, profilePath: String?, designatedRequirements: String?, signedEntitlements: PropertyListItem?, simulatedEntitlements: PropertyListItem?, appIdentifierPrefix: String?, teamIdentifierPrefix: String?, isEnterpriseTeam: Bool?, useSigningTool: Bool?, signingToolKeyPath: String?, signingToolKeyID: String?, signingToolKeyIssuerID: String?, keychainPath: String?, errors: [[String: String]], warnings: [String]) {
+    public init(sessionHandle: String, planningOperationHandle: String, configuredTargetHandle: String, identityHash: String?, identitySerialNumber: String?, identityName: String?, profileName: String?, profileUUID: String?, profilePath: String?, designatedRequirements: String?, signedEntitlements: PropertyListItem?, simulatedEntitlements: PropertyListItem?, appIdentifierPrefix: String?, teamIdentifierPrefix: String?, isEnterpriseTeam: Bool?, useSigningTool: Bool?, signingToolKeyPath: String?, signingToolKeyID: String?, signingToolKeyIssuerID: String?, keychainPath: String?, errors: [[String: String]], warnings: [String]) {
         self.sessionHandle = sessionHandle
         self.planningOperationHandle = planningOperationHandle
         self.configuredTargetHandle = configuredTargetHandle
@@ -366,8 +364,6 @@ public struct ProvisioningTaskInputsResponse: SessionMessage, RequestMessage, Eq
     }
 }
 
-
-
 let planningOperationMessageTypes: [any Message.Type] = [
     PlanningOperationWillStart.self,
     PlanningOperationDidFinish.self,
diff --git a/Sources/SWBProtocol/ProjectDescriptorTypes.swift b/Sources/SWBProtocol/ProjectDescriptorTypes.swift
index 8b1b51b8..ed66e7e3 100644
--- a/Sources/SWBProtocol/ProjectDescriptorTypes.swift
+++ b/Sources/SWBProtocol/ProjectDescriptorTypes.swift
@@ -202,7 +202,7 @@ public struct DestinationInfo: Codable, Equatable, Hashable, Comparable, Seriali
         self.isSimulator = isSimulator
     }
 
-    public static func <(lhs: DestinationInfo, rhs: DestinationInfo) -> Bool {
+    public static func < (lhs: DestinationInfo, rhs: DestinationInfo) -> Bool {
         return lhs.platformName.localizedCompare(rhs.platformName) == .orderedAscending
     }
 
@@ -525,7 +525,7 @@ public struct ProductDescription: Equatable, Hashable, Serializable, Sendable {
         team: String?,
         infoPlistPath: String?,
         iconPath: String?
-        ) {
+    ) {
         self.displayName = displayName
         self.productName = productName
         self.identifier = identifier
diff --git a/Sources/SWBProtocol/ProjectModel/BuildPhase.swift b/Sources/SWBProtocol/ProjectModel/BuildPhase.swift
index 38fd1b07..b462c7df 100644
--- a/Sources/SWBProtocol/ProjectModel/BuildPhase.swift
+++ b/Sources/SWBProtocol/ProjectModel/BuildPhase.swift
@@ -13,7 +13,7 @@
 public import SWBUtil
 
 public class BuildPhase: PolymorphicSerializable, @unchecked Sendable {
-    public static let implementations: [SerializableTypeCode : any PolymorphicSerializable.Type] = [
+    public static let implementations: [SerializableTypeCode: any PolymorphicSerializable.Type] = [
         0: AppleScriptBuildPhase.self,
         1: CopyFilesBuildPhase.self,
         2: FrameworksBuildPhase.self,
diff --git a/Sources/SWBProtocol/ProjectModel/BuildRule.swift b/Sources/SWBProtocol/ProjectModel/BuildRule.swift
index 5a33fe71..9437b2f1 100644
--- a/Sources/SWBProtocol/ProjectModel/BuildRule.swift
+++ b/Sources/SWBProtocol/ProjectModel/BuildRule.swift
@@ -30,7 +30,8 @@ public struct BuildRule: Sendable {
             outputs: [ShellScriptOutputInfo],
             outputFileLists: [MacroExpressionSource],
             dependencyInfo: DependencyInfo?,
-            runOncePerArchitecture: Bool)
+            runOncePerArchitecture: Bool
+        )
     }
 
     public struct ShellScriptOutputInfo: Sendable {
diff --git a/Sources/SWBProtocol/ProjectModel/CustomTask.swift b/Sources/SWBProtocol/ProjectModel/CustomTask.swift
index 68380303..de309de9 100644
--- a/Sources/SWBProtocol/ProjectModel/CustomTask.swift
+++ b/Sources/SWBProtocol/ProjectModel/CustomTask.swift
@@ -72,4 +72,3 @@ public struct CustomTask: SerializableCodable, Sendable {
         self.preparesForIndexing = try container.decode(Bool.self, forKey: .preparesForIndexing)
     }
 }
-
diff --git a/Sources/SWBProtocol/ProjectModel/ProvisioningSourceData.swift b/Sources/SWBProtocol/ProjectModel/ProvisioningSourceData.swift
index f7dadb64..9bf51dc2 100644
--- a/Sources/SWBProtocol/ProjectModel/ProvisioningSourceData.swift
+++ b/Sources/SWBProtocol/ProjectModel/ProvisioningSourceData.swift
@@ -42,7 +42,6 @@ extension ProvisioningSourceData: Encodable, Decodable {
     }
 }
 
-
 // MARK: SerializableCodable
 
 extension ProvisioningSourceData: PendingSerializableCodable {
@@ -59,10 +58,10 @@ extension ProvisioningSourceData: PendingSerializableCodable {
         self.configurationName = try deserializer.deserialize()
         self.provisioningStyle = try deserializer.deserialize()
         if count > 3 {
-            _ = try deserializer.deserialize() as Bool          // appIDHasFeaturesEnabled
+            _ = try deserializer.deserialize() as Bool  // appIDHasFeaturesEnabled
         }
         if count > 4 {
-            _ = try deserializer.deserialize() as String        // legacyTeamID
+            _ = try deserializer.deserialize() as String  // legacyTeamID
         }
         self.bundleIdentifierFromInfoPlist = try deserializer.deserialize()
     }
diff --git a/Sources/SWBProtocol/ProjectModel/Reference.swift b/Sources/SWBProtocol/ProjectModel/Reference.swift
index 7d6b02b5..87c0392b 100644
--- a/Sources/SWBProtocol/ProjectModel/Reference.swift
+++ b/Sources/SWBProtocol/ProjectModel/Reference.swift
@@ -13,7 +13,7 @@
 public import SWBUtil
 
 public class Reference: PolymorphicSerializable, @unchecked Sendable {
-    public static let implementations: [SerializableTypeCode : any PolymorphicSerializable.Type] = [
+    public static let implementations: [SerializableTypeCode: any PolymorphicSerializable.Type] = [
         0: FileReference.self,
         1: VersionGroup.self,
         2: VariantGroup.self,
@@ -74,13 +74,13 @@ public struct FileTextEncoding: Hashable, CustomStringConvertible, Sendable {
         self.rawValue = rawValue
     }
 
-    public static let utf8 = FileTextEncoding("utf-8") // 4
-    public static let utf16 = FileTextEncoding("utf-16") // 10
-    public static let utf16be = FileTextEncoding("utf-16be") // 0x90000100
-    public static let utf16le = FileTextEncoding("utf-16le") // 0x94000100
-    public static let utf32 = FileTextEncoding("utf-32") // 0x8c000100
-    public static let utf32be = FileTextEncoding("utf-32be") // 0x98000100
-    public static let utf32le = FileTextEncoding("utf-32le") // 0x9c000100
+    public static let utf8 = FileTextEncoding("utf-8")  // 4
+    public static let utf16 = FileTextEncoding("utf-16")  // 10
+    public static let utf16be = FileTextEncoding("utf-16be")  // 0x90000100
+    public static let utf16le = FileTextEncoding("utf-16le")  // 0x94000100
+    public static let utf32 = FileTextEncoding("utf-32")  // 0x8c000100
+    public static let utf32be = FileTextEncoding("utf-32be")  // 0x98000100
+    public static let utf32le = FileTextEncoding("utf-32le")  // 0x9c000100
 
     public var description: String {
         return rawValue
diff --git a/Sources/SWBProtocol/ProjectModel/Target.swift b/Sources/SWBProtocol/ProjectModel/Target.swift
index 5be1d244..95fc32f8 100644
--- a/Sources/SWBProtocol/ProjectModel/Target.swift
+++ b/Sources/SWBProtocol/ProjectModel/Target.swift
@@ -21,7 +21,7 @@ public struct TargetGUID: RawRepresentable, Hashable, Sendable, Codable {
 }
 
 public class Target: PolymorphicSerializable, @unchecked Sendable {
-    public static let implementations: [SerializableTypeCode : any PolymorphicSerializable.Type] = [
+    public static let implementations: [SerializableTypeCode: any PolymorphicSerializable.Type] = [
         0: StandardTarget.self,
         1: AggregateTarget.self,
         2: ExternalTarget.self,
diff --git a/Sources/SWBQNXPlatform/Plugin.swift b/Sources/SWBQNXPlatform/Plugin.swift
index 37b9bde2..fd418759 100644
--- a/Sources/SWBQNXPlatform/Plugin.swift
+++ b/Sources/SWBQNXPlatform/Plugin.swift
@@ -44,7 +44,7 @@ struct QNXPlatformSpecsExtension: SpecificationsExtension {
 struct QNXEnvironmentExtension: EnvironmentExtension {
     let plugin: QNXPlugin
 
-    func additionalEnvironmentVariables(context: any EnvironmentExtensionAdditionalEnvironmentVariablesContext) async throws -> [String : String] {
+    func additionalEnvironmentVariables(context: any EnvironmentExtensionAdditionalEnvironmentVariablesContext) async throws -> [String: String] {
         if let latest = try? await plugin.cachedQNXSDPInstallations(host: context.hostOperatingSystem).first {
             return .init(latest.environment)
         }
@@ -55,15 +55,18 @@ struct QNXEnvironmentExtension: EnvironmentExtension {
 struct QNXPlatformExtension: PlatformInfoExtension {
     func additionalPlatforms(context: any PlatformInfoExtensionAdditionalPlatformsContext) throws -> [(path: Path, data: [String: PropertyListItem])] {
         [
-            (.root, [
-                "Type": .plString("Platform"),
-                "Name": .plString("qnx"),
-                "Identifier": .plString("qnx"),
-                "Description": .plString("qnx"),
-                "FamilyName": .plString("QNX"),
-                "FamilyIdentifier": .plString("qnx"),
-                "IsDeploymentPlatform": .plString("YES"),
-            ])
+            (
+                .root,
+                [
+                    "Type": .plString("Platform"),
+                    "Name": .plString("qnx"),
+                    "Identifier": .plString("qnx"),
+                    "Description": .plString("qnx"),
+                    "FamilyName": .plString("QNX"),
+                    "FamilyIdentifier": .plString("qnx"),
+                    "IsDeploymentPlatform": .plString("YES"),
+                ]
+            )
         ]
     }
 }
@@ -71,7 +74,7 @@ struct QNXPlatformExtension: PlatformInfoExtension {
 struct QNXSDKRegistryExtension: SDKRegistryExtension {
     let plugin: QNXPlugin
 
-    func additionalSDKs(context: any SDKRegistryExtensionAdditionalSDKsContext) async throws -> [(path: Path, platform: SWBCore.Platform?, data: [String : PropertyListItem])] {
+    func additionalSDKs(context: any SDKRegistryExtensionAdditionalSDKsContext) async throws -> [(path: Path, platform: SWBCore.Platform?, data: [String: PropertyListItem])] {
         guard let qnxPlatform = context.platformRegistry.lookup(name: "qnx") else {
             return []
         }
@@ -105,34 +108,41 @@ struct QNXSDKRegistryExtension: SDKRegistryExtension {
             "LINKER_DRIVER": "qcc",
         ]
 
-        return [(qnxSdk.sysroot, qnxPlatform, [
-            "Type": .plString("SDK"),
-            "Version": .plString(qnxSdk.version?.description ?? "0.0.0"),
-            "CanonicalName": .plString("qnx"),
-            "IsBaseSDK": .plBool(true),
-            "DefaultProperties": .plDict([
-                "PLATFORM_NAME": .plString("qnx"),
-                "QNX_TARGET": .plString(qnxSdk.path.str),
-                "QNX_HOST": .plString(qnxSdk.hostPath?.str ?? ""),
-            ].merging(defaultProperties, uniquingKeysWith: { _, new in new })),
-            "CustomProperties": .plDict([
-                // Unlike most platforms, the QNX version goes on the environment field rather than the system field
-                // FIXME: Make this configurable in a better way so we don't need to push build settings at the SDK definition level
-                "LLVM_TARGET_TRIPLE_OS_VERSION": .plString("nto"),
-                "LLVM_TARGET_TRIPLE_SUFFIX": .plString("-qnx"),
-            ]),
-            "SupportedTargets": .plDict([
-                "qnx": .plDict([
-                    "Archs": .plArray([.plString("aarch64"), .plString("x86_64")]),
-                    "LLVMTargetTripleEnvironment": .plString("qnx\(qnxSdk.version?.description ?? "0.0.0")"),
-                    "LLVMTargetTripleSys": .plString("nto"),
-                    "LLVMTargetTripleVendor": .plString("unknown"), // FIXME: pc for x86_64!
-                ])
-            ]),
-            "Toolchains": .plArray([
-                .plString("qnx")
-            ])
-        ])]
+        return [
+            (
+                qnxSdk.sysroot, qnxPlatform,
+                [
+                    "Type": .plString("SDK"),
+                    "Version": .plString(qnxSdk.version?.description ?? "0.0.0"),
+                    "CanonicalName": .plString("qnx"),
+                    "IsBaseSDK": .plBool(true),
+                    "DefaultProperties": .plDict(
+                        [
+                            "PLATFORM_NAME": .plString("qnx"),
+                            "QNX_TARGET": .plString(qnxSdk.path.str),
+                            "QNX_HOST": .plString(qnxSdk.hostPath?.str ?? ""),
+                        ].merging(defaultProperties, uniquingKeysWith: { _, new in new })
+                    ),
+                    "CustomProperties": .plDict([
+                        // Unlike most platforms, the QNX version goes on the environment field rather than the system field
+                        // FIXME: Make this configurable in a better way so we don't need to push build settings at the SDK definition level
+                        "LLVM_TARGET_TRIPLE_OS_VERSION": .plString("nto"),
+                        "LLVM_TARGET_TRIPLE_SUFFIX": .plString("-qnx"),
+                    ]),
+                    "SupportedTargets": .plDict([
+                        "qnx": .plDict([
+                            "Archs": .plArray([.plString("aarch64"), .plString("x86_64")]),
+                            "LLVMTargetTripleEnvironment": .plString("qnx\(qnxSdk.version?.description ?? "0.0.0")"),
+                            "LLVMTargetTripleSys": .plString("nto"),
+                            "LLVMTargetTripleVendor": .plString("unknown"),  // FIXME: pc for x86_64!
+                        ])
+                    ]),
+                    "Toolchains": .plArray([
+                        .plString("qnx")
+                    ]),
+                ]
+            )
+        ]
     }
 }
 
@@ -158,7 +168,8 @@ struct QNXToolchainRegistryExtension: ToolchainRegistryExtension {
                 defaultSettingsWhenPrimary: [:],
                 executableSearchPaths: [toolchainPath.join("usr").join("bin")],
                 testingLibraryPlatformNames: [],
-                fs: context.fs)
+                fs: context.fs
+            )
         ]
     }
 }
diff --git a/Sources/SWBQNXPlatform/QNXSDP.swift b/Sources/SWBQNXPlatform/QNXSDP.swift
index 67a71c49..b1cd2518 100644
--- a/Sources/SWBQNXPlatform/QNXSDP.swift
+++ b/Sources/SWBQNXPlatform/QNXSDP.swift
@@ -69,11 +69,11 @@ struct QNXSDP: Sendable {
         case .windows:
             path.join("host").join("win64").join("x86_64")
         case .macOS:
-            path.join("host").join("darwin").join("x86_64") // only supported in QNX SDP 7
+            path.join("host").join("darwin").join("x86_64")  // only supported in QNX SDP 7
         case .linux:
             path.join("host").join("linux").join("x86_64")
         default:
-            nil // unsupported host
+            nil  // unsupported host
         }
     }
 
diff --git a/Sources/SWBServiceCore/Request.swift b/Sources/SWBServiceCore/Request.swift
index 25f6725c..92868d1b 100644
--- a/Sources/SWBServiceCore/Request.swift
+++ b/Sources/SWBServiceCore/Request.swift
@@ -47,16 +47,16 @@ public final class Request: Sendable {
         self.name = name
     }
 
-#if DEBUG
-    /// Validate that every request is completed, in debug builds.
-    deinit {
-        completed.withLock { completed in
-            if !completed {
-                fatalError("unexpected incomplete request: \(self)")
+    #if DEBUG
+        /// Validate that every request is completed, in debug builds.
+        deinit {
+            completed.withLock { completed in
+                if !completed {
+                    fatalError("unexpected incomplete request: \(self)")
+                }
             }
         }
-    }
-#endif
+    #endif
 
     /// Send a message to the client.
     public func send(_ message: any Message) {
diff --git a/Sources/SWBServiceCore/Service.swift b/Sources/SWBServiceCore/Service.swift
index 4dce3f68..f92843b6 100644
--- a/Sources/SWBServiceCore/Service.swift
+++ b/Sources/SWBServiceCore/Service.swift
@@ -15,9 +15,9 @@ public import SWBProtocol
 public import SWBUtil
 
 #if canImport(System)
-public import System
+    public import System
 #else
-public import SystemPackage
+    public import SystemPackage
 #endif
 
 /// A generic named message handler.
diff --git a/Sources/SWBServiceCore/ServiceEntryPoint.swift b/Sources/SWBServiceCore/ServiceEntryPoint.swift
index 8e3964cf..49a3356e 100644
--- a/Sources/SWBServiceCore/ServiceEntryPoint.swift
+++ b/Sources/SWBServiceCore/ServiceEntryPoint.swift
@@ -14,19 +14,19 @@ import SWBLibc
 import SWBUtil
 
 #if canImport(System)
-public import System
+    public import System
 #else
-public import SystemPackage
+    public import SystemPackage
 #endif
 
 extension Service {
     public static func main(_ setupFileDescriptors: (_ inputFD: FileDescriptor, _ outputFD: FileDescriptor) async throws -> Void) async throws {
         #if os(macOS)
-        do {
-            try await Debugger.waitForXcodeAutoAttachIfEnabled()
-        } catch {
-            throw StubError.error("Failed to attach debugger: \(error)")
-        }
+            do {
+                try await Debugger.waitForXcodeAutoAttachIfEnabled()
+            } catch {
+                throw StubError.error("Failed to attach debugger: \(error)")
+            }
         #endif
 
         // When launched as a subprocess, we expect our standard input and output to be the message stream, and standard error to be a console output stream.
diff --git a/Sources/SWBServiceCore/ServiceHostConnection.swift b/Sources/SWBServiceCore/ServiceHostConnection.swift
index 59d1a172..c35f6f6d 100644
--- a/Sources/SWBServiceCore/ServiceHostConnection.swift
+++ b/Sources/SWBServiceCore/ServiceHostConnection.swift
@@ -15,9 +15,9 @@ import SWBUtil
 import Foundation
 
 #if canImport(System)
-import System
+    import System
 #else
-import SystemPackage
+    import SystemPackage
 #endif
 
 /// Convert a count to a UInt8 buffer.
@@ -94,12 +94,12 @@ final class ServiceHostConnection: @unchecked Sendable {
             let totalSize = headerSize + payloadSize
 
             #if DEBUG
-            // A well behaved client would not send a negative payloadSize, but this can happen when we hit <rdar://problem/62081788>.
-            // In that case, consider all remaining bytes to be bogus and drop them.
-            if payloadSize < 0 {
-                count = 0
-                break
-            }
+                // A well behaved client would not send a negative payloadSize, but this can happen when we hit <rdar://problem/62081788>.
+                // In that case, consider all remaining bytes to be bogus and drop them.
+                if payloadSize < 0 {
+                    count = 0
+                    break
+                }
             #endif
 
             // If we do not have a complete message, we are done.
@@ -141,10 +141,10 @@ final class ServiceHostConnection: @unchecked Sendable {
             var error: (any Error)?
             while !self.isSuspended.withLock({ $0 }) {
                 #if DEBUG
-                // Work around <rdar://problem/62081788> read syscall can sometimes return a value greater than the count parameter
-                // We set the whole buffer to 0xFF so that parts that are not written will be interpreted as a payload with a negative length.
-                // This is only a mitigation that may not catch all cases.
-                tmp.update(repeating: 0xFF)
+                    // Work around <rdar://problem/62081788> read syscall can sometimes return a value greater than the count parameter
+                    // We set the whole buffer to 0xFF so that parts that are not written will be interpreted as a payload with a negative length.
+                    // This is only a mitigation that may not catch all cases.
+                    tmp.update(repeating: 0xFF)
                 #endif
 
                 // Read data.
@@ -164,9 +164,9 @@ final class ServiceHostConnection: @unchecked Sendable {
                     break
                 }
                 #if DEBUG
-                if result > tmpBufferSize {
-                    log("warning: read returned more bytes than requested: \(result) > \(tmpBufferSize)")
-                }
+                    if result > tmpBufferSize {
+                        log("warning: read returned more bytes than requested: \(result) > \(tmpBufferSize)")
+                    }
                 #endif
 
                 // Extract all the messages, combining into a contiguous buffer first if necessary.
diff --git a/Sources/SWBTaskConstruction/DiagnosticSupport.swift b/Sources/SWBTaskConstruction/DiagnosticSupport.swift
index 640d210f..6a6dca94 100644
--- a/Sources/SWBTaskConstruction/DiagnosticSupport.swift
+++ b/Sources/SWBTaskConstruction/DiagnosticSupport.swift
@@ -17,10 +17,10 @@ package import SWBUtil
 func auxiliaryFileCommand(_ path: Path) -> String {
     switch path.fileExtension {
     case "hmap":
-        break // Headermaps are per target, so we can't add any information here.
+        break  // Headermaps are per target, so we can't add any information here.
     case "LinkFileList":
         return "produces product '\(path.basenameWithoutSuffix)'"
-    case "modulemap", "yaml": // VFS or module overlay
+    case "modulemap", "yaml":  // VFS or module overlay
         if let moduleName = potentialModuleNameFromPath(path) {
             return "produces module '\(moduleName)'"
         }
diff --git a/Sources/SWBTaskConstruction/ProductPlanning/BuildPlan.swift b/Sources/SWBTaskConstruction/ProductPlanning/BuildPlan.swift
index 81649982..4192538b 100644
--- a/Sources/SWBTaskConstruction/ProductPlanning/BuildPlan.swift
+++ b/Sources/SWBTaskConstruction/ProductPlanning/BuildPlan.swift
@@ -94,11 +94,11 @@ package final class BuildPlan: StaleFileRemovalContext {
         // Compute a collated list of result contexts and task producers, so we can do a single parallel dispatch.
         //
         // This computation is cheap, so this is overall more efficient than trying to interleave them with our current infrastructure.
-        let messageShortening =  planRequest.workspaceContext.userPreferences.activityTextShorteningLevel
+        let messageShortening = planRequest.workspaceContext.userPreferences.activityTextShorteningLevel
         let (productPlans, globalProductPlan) = await planner.productPlans()
-        let productPlanResultContexts = productPlans.map{ ProductPlanResultContext(for: $0) }
-        let producersToEvaluate = productPlanResultContexts.flatMap{ context in
-            return context.productPlan.taskProducers.map{ (resultContext: context, producer: $0) }
+        let productPlanResultContexts = productPlans.map { ProductPlanResultContext(for: $0) }
+        let producersToEvaluate = productPlanResultContexts.flatMap { context in
+            return context.productPlan.taskProducers.map { (resultContext: context, producer: $0) }
         }
 
         // Due to the nature of task producers having no relationship with respect to ordering amongst other task producers, it is necessary to allow task producers within a particular context to build up any information that may be necessary for other task producers to consume. It is important to note that this mechanism is not intended to share information across individual task producers, but rather, it is to be used to build up contextual information that can be used from the `generateTasks()` phase.
@@ -119,7 +119,8 @@ package final class BuildPlan: StaleFileRemovalContext {
                 var preplannedCount = 0
                 for await _ in progressStream {
                     preplannedCount += 1
-                    let statusMessage = messageShortening >= .allDynamicText
+                    let statusMessage =
+                        messageShortening >= .allDynamicText
                         ? "Pre-planning \(activityMessageFractionString(preplannedCount, over: producersToEvaluate.count))"
                         : "Pre-Planning from \(preplannedCount) of \(producersToEvaluate.count) task producers"
 
@@ -156,7 +157,8 @@ package final class BuildPlan: StaleFileRemovalContext {
                 var evaluatedCount = 0
                 for await _ in progressStream {
                     evaluatedCount += 1
-                    let statusMessage = messageShortening >= .allDynamicText
+                    let statusMessage =
+                        messageShortening >= .allDynamicText
                         ? "Planning \(activityMessageFractionString(evaluatedCount, over: producersToEvaluate.count))"
                         : "Constructing from \(evaluatedCount) of \(producersToEvaluate.count) task producers"
 
@@ -186,7 +188,7 @@ package final class BuildPlan: StaleFileRemovalContext {
             await group.waitForAll()
         }
 
-        await aggregationQueue.sync{ }
+        await aggregationQueue.sync {}
         if delegate.cancelled {
             // Reset any deferred producers, which may participate in cycles.
             for context in productPlanResultContexts {
@@ -239,7 +241,7 @@ package final class BuildPlan: StaleFileRemovalContext {
         }
 
         // Wait for task validation.
-        await aggregationQueue.sync{ }
+        await aggregationQueue.sync {}
         if delegate.cancelled {
             return nil
         }
@@ -289,15 +291,17 @@ package final class BuildPlan: StaleFileRemovalContext {
     }
 
     static func unexpectedDuplicateTasksWithIdentifier(_ tasks: [any PlannedTask], _ workspace: Workspace, _ delegate: any TaskPlanningDelegate) {
-        delegate.emit(Diagnostic(behavior: .error,
-                                 location: .unknown,
-                                 data: DiagnosticData("Unexpected duplicate tasks"),
-                                 childDiagnostics: tasks.map({ .task($0.execTask) }).richFormattedRuleInfo(workspace: workspace)))
+        delegate.emit(
+            Diagnostic(
+                behavior: .error,
+                location: .unknown,
+                data: DiagnosticData("Unexpected duplicate tasks"),
+                childDiagnostics: tasks.map({ .task($0.execTask) }).richFormattedRuleInfo(workspace: workspace)
+            )
+        )
     }
 }
 
-
-
 /// This context stores the results of task generation for a product plan.  It is used by a build plan to collect results of task generation, and once task generation is complete to compute the final set of planned tasks to be used for a product plan by evaluating task validity criteria..
 ///
 /// This class is not thread-safe; the build plan is expected to build up the context in a manner that accounts for that.
diff --git a/Sources/SWBTaskConstruction/ProductPlanning/BuildPlanDumping.swift b/Sources/SWBTaskConstruction/ProductPlanning/BuildPlanDumping.swift
index a321ccc9..c26da16d 100644
--- a/Sources/SWBTaskConstruction/ProductPlanning/BuildPlanDumping.swift
+++ b/Sources/SWBTaskConstruction/ProductPlanning/BuildPlanDumping.swift
@@ -28,7 +28,7 @@ package extension BuildPlan {
         // Emit a separate file for each target, inside a separate subdirectory for each project.
         for (target, plannedTasks) in tasksByTarget {
             // Get a hold of the product plan and macro evaluation scope.
-            let productPlan = productPlans.first{ $0.forTarget == target }!
+            let productPlan = productPlans.first { $0.forTarget == target }!
             let scope = target.map { target in productPlan.taskProducerContext.globalProductPlan.getTargetSettings(target).globalScope } ?? productPlan.taskProducerContext.globalProductPlan.getWorkspaceSettings().globalScope
 
             // Figure out the name of the project.
@@ -65,9 +65,12 @@ package extension BuildPlan {
 
                 // Emit a version of the command line arguments array that back-maps as many strings as possible to macro refs.
                 let commandLine = task.execTask.commandLineAsStrings.map { (commandLineArg: String) -> String in
-                    literalPathsFromLongestToShortest.reduce(commandLineArg, { (result: String, path: String) -> String in
-                        result.replacingOccurrences(of: path, with: literalPathsToMacroRefs[path]!)
-                    })
+                    literalPathsFromLongestToShortest.reduce(
+                        commandLineArg,
+                        { (result: String, path: String) -> String in
+                            result.replacingOccurrences(of: path, with: literalPathsToMacroRefs[path]!)
+                        }
+                    )
                 }
                 output <<< "command: \(commandLine.quotedStringListRepresentation)\n"
             }
diff --git a/Sources/SWBTaskConstruction/ProductPlanning/ProductPlan.swift b/Sources/SWBTaskConstruction/ProductPlanning/ProductPlan.swift
index db7e6c7e..a0c16198 100644
--- a/Sources/SWBTaskConstruction/ProductPlanning/ProductPlan.swift
+++ b/Sources/SWBTaskConstruction/ProductPlanning/ProductPlan.swift
@@ -28,8 +28,7 @@ package protocol GlobalProductPlanDelegate: CoreClientTargetDiagnosticProducingD
 /// Information on the global build plan.
 ///
 /// This class encapsulates the information on the global product plan which is made available to each individual product to use during planning.
-package final class GlobalProductPlan: GlobalTargetInfoProvider
-{
+package final class GlobalProductPlan: GlobalTargetInfoProvider {
     /// The build plan request.
     package let planRequest: BuildPlanRequest
 
@@ -171,17 +170,17 @@ package final class GlobalProductPlan: GlobalTargetInfoProvider
     let targetToProducingTargetForNearestEnclosingProduct: [ConfiguredTarget: ConfiguredTarget]
 
     /// A map of `MH_BUNDLE` targets to any clients of that target.
-    let clientsOfBundlesByTarget: [ConfiguredTarget:[ConfiguredTarget]]
+    let clientsOfBundlesByTarget: [ConfiguredTarget: [ConfiguredTarget]]
 
     private static let dynamicMachOTypes = ["mh_execute", "mh_dylib", "mh_bundle"]
 
     // Checks that we have either been passed a configuration override for packages or we are building Debug/Release.
     private static func verifyPackageConfigurationOverride(planRequest: BuildPlanRequest) {
         #if DEBUG
-        if !planRequest.workspaceContext.workspace.projects.filter({ $0.isPackage }).isEmpty {
-            let parameters = planRequest.buildRequest.parameters
-            assert(parameters.configuration == nil || parameters.packageConfigurationOverride != nil || parameters.configuration == "Debug" || parameters.configuration == "Release")
-        }
+            if !planRequest.workspaceContext.workspace.projects.filter({ $0.isPackage }).isEmpty {
+                let parameters = planRequest.buildRequest.parameters
+                assert(parameters.configuration == nil || parameters.packageConfigurationOverride != nil || parameters.configuration == "Debug" || parameters.configuration == "Release")
+            }
         #endif
     }
 
@@ -255,12 +254,14 @@ package final class GlobalProductPlan: GlobalTargetInfoProvider
     }
 
     // Compute the dependents of targets producing bundles. This information is used later to propagate Info.plist entries from codeless bundles to their clients.
-    private static func computeBundleClients(buildGraph: TargetBuildGraph, buildRequestContext: BuildRequestContext) -> [ConfiguredTarget:[ConfiguredTarget]] {
-        var clientsOfBundlesByTarget = [ConfiguredTarget:[ConfiguredTarget]]()
-        let bundleTargets = Set(buildGraph.allTargets.filter {
-            let settings = buildRequestContext.getCachedSettings($0.parameters, target: $0.target)
-            return settings.globalScope.evaluate(BuiltinMacros.MACH_O_TYPE) == "mh_bundle"
-        })
+    private static func computeBundleClients(buildGraph: TargetBuildGraph, buildRequestContext: BuildRequestContext) -> [ConfiguredTarget: [ConfiguredTarget]] {
+        var clientsOfBundlesByTarget = [ConfiguredTarget: [ConfiguredTarget]]()
+        let bundleTargets = Set(
+            buildGraph.allTargets.filter {
+                let settings = buildRequestContext.getCachedSettings($0.parameters, target: $0.target)
+                return settings.globalScope.evaluate(BuiltinMacros.MACH_O_TYPE) == "mh_bundle"
+            }
+        )
         for configuredTarget in buildGraph.allTargets {
             for match in bundleTargets.intersection(buildGraph.dependencies(of: configuredTarget)) {
                 clientsOfBundlesByTarget[match, default: []].append(configuredTarget)
@@ -314,8 +315,7 @@ package final class GlobalProductPlan: GlobalTargetInfoProvider
                 for target in hostedTargets {
                     hostTargetForTargets[target] = hostTarget
                 }
-            }
-            else {
+            } else {
                 // Emit a warning for a target which defines a TEST_HOST which can't be mapped to a target.
                 for hostedTarget in hostedTargets {
                     delegate.warning(.overrideTarget(hostedTarget), "Unable to find a target which creates the host product for value of $(TEST_HOST) '\(hostPath.str)'", location: .buildSetting(BuiltinMacros.TEST_HOST), component: .targetIntegrity)
@@ -405,7 +405,8 @@ package final class GlobalProductPlan: GlobalTargetInfoProvider
                 targetsRequiredToBuildForIndexing.formUnion(transitiveClosure([configuredTarget], successors: buildGraph.dependencies(of:)).0)
             }
             if targetSettings.platform?.name == targetSettings.globalScope.evaluate(BuiltinMacros.HOST_PLATFORM),
-               targetSettings.productType?.conformsTo(identifier: "com.apple.product-type.tool") == true {
+                targetSettings.productType?.conformsTo(identifier: "com.apple.product-type.tool") == true
+            {
                 let executablePath = targetSettings.globalScope.evaluate(BuiltinMacros.TARGET_BUILD_DIR).join(targetSettings.globalScope.evaluate(BuiltinMacros.EXECUTABLE_PATH)).normalize()
                 targetsByCommandLineToolProductPath[executablePath] = configuredTarget
             }
@@ -515,9 +516,9 @@ package final class GlobalProductPlan: GlobalTargetInfoProvider
     }
 
     /// Compute the build properties imparted on each target in the graph.
-    private static func computeImpartedBuildProperties(planRequest: BuildPlanRequest, getLinkageGraph: @Sendable () async throws -> TargetLinkageGraph, delegate: any GlobalProductPlanDelegate) async -> ([ConfiguredTarget:[SWBCore.ImpartedBuildProperties]], [ConfiguredTarget:OrderedSet<LinkedDependency>]) {
-        var impartedBuildPropertiesByTarget = [ConfiguredTarget:[SWBCore.ImpartedBuildProperties]]()
-        var directlyLinkedDependenciesByTarget = [ConfiguredTarget:OrderedSet<LinkedDependency>]()
+    private static func computeImpartedBuildProperties(planRequest: BuildPlanRequest, getLinkageGraph: @Sendable () async throws -> TargetLinkageGraph, delegate: any GlobalProductPlanDelegate) async -> ([ConfiguredTarget: [SWBCore.ImpartedBuildProperties]], [ConfiguredTarget: OrderedSet<LinkedDependency>]) {
+        var impartedBuildPropertiesByTarget = [ConfiguredTarget: [SWBCore.ImpartedBuildProperties]]()
+        var directlyLinkedDependenciesByTarget = [ConfiguredTarget: OrderedSet<LinkedDependency>]()
 
         // We can skip computing contributing properties entirely if no target declares any and if there are no package products in the graph.
         let targetsContributingProperties = planRequest.buildGraph.allTargets.filter { !$0.target.hasImpartedBuildProperties || $0.target.type == .packageProduct }
@@ -531,7 +532,7 @@ package final class GlobalProductPlan: GlobalTargetInfoProvider
                     configuredTargets: AnyCollection(configuredTargets),
                     diagnosticDelegate: delegate
                 )
-                var bundleLoaderByTarget = [ConfiguredTarget:ConfiguredTarget]()
+                var bundleLoaderByTarget = [ConfiguredTarget: ConfiguredTarget]()
                 for (bundleLoaderTarget, targetsUsingThatBundleLoader) in targetsByBundleLoader {
                     for targetUsingBundleLoader in targetsUsingThatBundleLoader {
                         bundleLoaderByTarget[targetUsingBundleLoader] = bundleLoaderTarget
@@ -592,7 +593,7 @@ package final class GlobalProductPlan: GlobalTargetInfoProvider
     }
 
     /// Construct the semantic gate nodes used to order work across targets.
-    private static func constructTargetGateNodes(buildGraph: TargetBuildGraph, provisioningInputs: [ConfiguredTarget: ProvisioningTaskInputs], buildRequestContext: BuildRequestContext, impartedBuildPropertiesByTarget: [ConfiguredTarget:[SWBCore.ImpartedBuildProperties]], enableIndexBuildArena: Bool, nodeCreationDelegate: (any TaskPlanningNodeCreationDelegate)?) -> [ConfiguredTarget: TargetGateNodes] {
+    private static func constructTargetGateNodes(buildGraph: TargetBuildGraph, provisioningInputs: [ConfiguredTarget: ProvisioningTaskInputs], buildRequestContext: BuildRequestContext, impartedBuildPropertiesByTarget: [ConfiguredTarget: [SWBCore.ImpartedBuildProperties]], enableIndexBuildArena: Bool, nodeCreationDelegate: (any TaskPlanningNodeCreationDelegate)?) -> [ConfiguredTarget: TargetGateNodes] {
         var targetGateNodes = [ConfiguredTarget: TargetGateNodes]()
         for configuredTarget in buildGraph.allTargets {
             // If we have a delegate to do so, then create virtual nodes for the target used to order this target's tasks with respect to other target's tasks - both fundamental target ordering, and orderings for eager compilation.
@@ -662,7 +663,7 @@ package final class GlobalProductPlan: GlobalTargetInfoProvider
             return [:]
         }
 
-        let targetsWithBundleLoaderMap = Dictionary(grouping: targetsWithBundleLoader, by: { $0.0 }).mapValues{ $0.compactMap{ $0.1 } }
+        let targetsWithBundleLoaderMap = Dictionary(grouping: targetsWithBundleLoader, by: { $0.0 }).mapValues { $0.compactMap { $0.1 } }
 
         // We only need to care about targets that actually have some imparted properties.
         let executablePathToTarget: [(Path, ConfiguredTarget)] = configuredTargets.map {
@@ -670,7 +671,7 @@ package final class GlobalProductPlan: GlobalTargetInfoProvider
             let path = settings.globalScope.evaluate(BuiltinMacros.BUILT_PRODUCTS_DIR).join(settings.globalScope.evaluate(BuiltinMacros.EXECUTABLE_PATH)).normalize()
             return (path, $0)
         }
-        let executablePathToTargetsMap = Dictionary(grouping: executablePathToTarget, by: { $0.0 }).mapValues{ $0.compactMap{ $0.1 } }
+        let executablePathToTargetsMap = Dictionary(grouping: executablePathToTarget, by: { $0.0 }).mapValues { $0.compactMap { $0.1 } }
 
         var result: [ConfiguredTarget: [ConfiguredTarget]] = [:]
         for (execName, targets) in executablePathToTargetsMap {
@@ -707,7 +708,7 @@ package final class GlobalProductPlan: GlobalTargetInfoProvider
             //
             // We'll probably want to allow this for root packages in the future.
             let dependencies = planRequest.buildGraph.dependencies(of: target)
-            let dependsOnAnUnsafeTarget = dependencies.first{ unsafeFlagsTargets.contains($0) }
+            let dependsOnAnUnsafeTarget = dependencies.first { unsafeFlagsTargets.contains($0) }
             if let unsafeTarget = dependsOnAnUnsafeTarget {
                 diagnosticDelegate.error(.overrideTarget(target), "The package product '\(unsafeTarget.target.name)' cannot be used as a dependency of this target because it uses unsafe build flags.", component: .targetIntegrity)
             }
@@ -761,7 +762,7 @@ package final class GlobalProductPlan: GlobalTargetInfoProvider
         }
     }
 
-    func resolveDiamondProblemsInPackages(dependenciesByTarget: [ConfiguredTarget:OrderedSet<LinkedDependency>], diagnosticDelegate: any TargetDiagnosticProducingDelegate) {
+    func resolveDiamondProblemsInPackages(dependenciesByTarget: [ConfiguredTarget: OrderedSet<LinkedDependency>], diagnosticDelegate: any TargetDiagnosticProducingDelegate) {
         // Repeatedly check for diamonds until we do not find any more. This should always converge since worst case we will stop once all static package targets have been converted to dynamic ones, but we will also terminate if we somehow end up in a stable state with more than zero remaining diamonds.
         var lastDiamonds = 0, currentDiamonds = 0
         repeat {
@@ -809,7 +810,7 @@ package final class GlobalProductPlan: GlobalTargetInfoProvider
     }
 
     // Checks whether we have any duplicated occurrences of the same package product in the graph.
-    func checkForDiamondProblemsInPackageProductLinkage(dependenciesByTarget: [ConfiguredTarget:OrderedSet<LinkedDependency>], diagnosticDelegate: any TargetDiagnosticProducingDelegate) -> Int {
+    func checkForDiamondProblemsInPackageProductLinkage(dependenciesByTarget: [ConfiguredTarget: OrderedSet<LinkedDependency>], diagnosticDelegate: any TargetDiagnosticProducingDelegate) -> Int {
         func emitError(for name: String, targetName: String, andOther: String, conflicts: Bool = false) {
             if errorComponentsList.insert(ErrorComponents(name: name, targetName: targetName, andOther: andOther, conflicts: conflicts)).inserted {
                 if conflicts {
@@ -821,8 +822,8 @@ package final class GlobalProductPlan: GlobalTargetInfoProvider
         }
 
         // First, we need to determine which top-level targets link a certain package product or target.
-        var topLevelLinkingTargetsByPackageProduct = [ConfiguredTarget:Set<ConfiguredTarget>]()
-        var topLevelLinkingTargetsByPackageTarget = [ConfiguredTarget:Set<ConfiguredTarget>]()
+        var topLevelLinkingTargetsByPackageProduct = [ConfiguredTarget: Set<ConfiguredTarget>]()
+        var topLevelLinkingTargetsByPackageTarget = [ConfiguredTarget: Set<ConfiguredTarget>]()
 
         for (configuredTarget, dependencies) in dependenciesByTarget {
             // We are only interested in targets which link dynamically.
@@ -839,11 +840,13 @@ package final class GlobalProductPlan: GlobalTargetInfoProvider
             }.filter { packageProduct in
                 // Ignore if we already converted this to a dynamic target.
                 if dynamicallyBuildingTargets.contains(packageProduct.target.target) {
-                    packageTargetsToSkip.append(contentsOf: packageProduct.target.target.dependencies.compactMap {
-                        planRequest.workspaceContext.workspace.target(for: $0.guid)
-                    }.filter {
-                        $0.type != .packageProduct
-                    })
+                    packageTargetsToSkip.append(
+                        contentsOf: packageProduct.target.target.dependencies.compactMap {
+                            planRequest.workspaceContext.workspace.target(for: $0.guid)
+                        }.filter {
+                            $0.type != .packageProduct
+                        }
+                    )
                     return false
                 }
                 // Find the configured targets for target dependencies.
@@ -1034,9 +1037,14 @@ package final class GlobalProductPlan: GlobalTargetInfoProvider
         // FIXME: This is another client that would like to be uncontended on the computation-for-key case.
         return moduleInfo.getOrInsert(configuredTarget) {
             let settings = getTargetSettings(configuredTarget)
-            return GlobalProductPlan.computeModuleInfo(workspaceContext: planRequest.workspaceContext, target: configuredTarget.target, settings: settings, diagnosticHandler: { message, location, component, essential in
-                delegate.warning(.overrideTarget(configuredTarget), message, location: location, component: component)
-            })
+            return GlobalProductPlan.computeModuleInfo(
+                workspaceContext: planRequest.workspaceContext,
+                target: configuredTarget.target,
+                settings: settings,
+                diagnosticHandler: { message, location, component, essential in
+                    delegate.warning(.overrideTarget(configuredTarget), message, location: location, component: component)
+                }
+            )
         }
     }
 
@@ -1342,8 +1350,7 @@ private class WrappingDelegate: TargetDependencyResolverDelegate {
 }
 
 /// A ProductPlan represents the work required to figure out how to build a ConfiguredTarget within a WorkspaceContext.  The work is modeled in the form of a list of TaskProducers which generate the tasks to run, and any shared immutable data which multiple task producers might need access to.
-package final class ProductPlan
-{
+package final class ProductPlan {
     /// Rule name used for the task of 'prepare-for-index' a target, before any compilation can occur.
     package static let preparedForIndexPreCompilationRuleName = "PrepareForIndexPreCompilation"
 
@@ -1367,8 +1374,7 @@ package final class ProductPlan
     /// The task producer context for this plan.
     let taskProducerContext: TaskProducerContext
 
-    init(path: Path, taskProducers: [any TaskProducer], forTarget: ConfiguredTarget?, targetTaskInfo: TargetGateNodes?, taskProducerContext: TaskProducerContext)
-    {
+    init(path: Path, taskProducers: [any TaskProducer], forTarget: ConfiguredTarget?, targetTaskInfo: TargetGateNodes?, taskProducerContext: TaskProducerContext) {
         self.path = path
         self.taskProducers = taskProducers
         self.forTarget = forTarget
diff --git a/Sources/SWBTaskConstruction/ProductPlanning/ProductPlanner.swift b/Sources/SWBTaskConstruction/ProductPlanning/ProductPlanner.swift
index d6e50110..e2022e08 100644
--- a/Sources/SWBTaskConstruction/ProductPlanning/ProductPlanner.swift
+++ b/Sources/SWBTaskConstruction/ProductPlanning/ProductPlanner.swift
@@ -24,16 +24,14 @@ import SWBMacro
 }
 
 /// A ProductPlanner is responsible for taking the inputs to a build (the workspace context and build request) and generating a set of product plans containing task producers which can produce tasks which will create those products.  There will be one product plan per configured target in the build request.
-package struct ProductPlanner
-{
+package struct ProductPlanner {
     /// The request for which the planner is constructing plans.
     let planRequest: BuildPlanRequest
 
     /// The delegate to use to construct planned items.
     let delegate: any TaskPlanningDelegate
 
-    package init(planRequest: BuildPlanRequest, taskPlanningDelegate: any TaskPlanningDelegate)
-    {
+    package init(planRequest: BuildPlanRequest, taskPlanningDelegate: any TaskPlanningDelegate) {
         self.planRequest = planRequest
         self.delegate = taskPlanningDelegate
     }
@@ -75,14 +73,15 @@ private struct WorkspaceProductPlanBuilder {
 
         let targetContexts = targetProductPlans.map(\.taskProducerContext)
 
-        var taskProducers: [any TaskProducer] = [
-            CreateBuildDirectoryTaskProducer(context: globalTaskProducerContext, targetContexts: targetContexts),
-            XCFrameworkTaskProducer(context: globalTaskProducerContext, targetContexts: targetContexts),
-            SDKStatCacheTaskProducer(context: globalTaskProducerContext, targetContexts: targetContexts),
-            HeadermapVFSTaskProducer(context: globalTaskProducerContext, targetContexts: targetContexts),
-            PCHModuleMapTaskProducer(context: globalTaskProducerContext, targetContexts: targetContexts),
-            BuildDependencyInfoTaskProducer(context: globalTaskProducerContext, targetContexts: targetContexts),
-        ] + (globalProductPlan.planRequest.buildRequest.enableIndexBuildArena ? [IndexBuildVFSDirectoryRemapTaskProducer(context: globalTaskProducerContext)] : [])
+        var taskProducers: [any TaskProducer] =
+            [
+                CreateBuildDirectoryTaskProducer(context: globalTaskProducerContext, targetContexts: targetContexts),
+                XCFrameworkTaskProducer(context: globalTaskProducerContext, targetContexts: targetContexts),
+                SDKStatCacheTaskProducer(context: globalTaskProducerContext, targetContexts: targetContexts),
+                HeadermapVFSTaskProducer(context: globalTaskProducerContext, targetContexts: targetContexts),
+                PCHModuleMapTaskProducer(context: globalTaskProducerContext, targetContexts: targetContexts),
+                BuildDependencyInfoTaskProducer(context: globalTaskProducerContext, targetContexts: targetContexts),
+            ] + (globalProductPlan.planRequest.buildRequest.enableIndexBuildArena ? [IndexBuildVFSDirectoryRemapTaskProducer(context: globalTaskProducerContext)] : [])
 
         for taskProducerExtension in await taskProducerExtensions(globalTaskProducerContext.workspaceContext) {
             for globalTaskProducer in taskProducerExtension.globalTaskProducers {
@@ -94,8 +93,7 @@ private struct WorkspaceProductPlanBuilder {
     }
 }
 
-private struct ProductPlanBuilder
-{
+private struct ProductPlanBuilder {
     /// The configured target for which we are creating a plan.
     let configuredTarget: ConfiguredTarget
 
@@ -105,17 +103,14 @@ private struct ProductPlanBuilder
     /// The delegate to use to construct planned items.
     let delegate: any TaskPlanningDelegate
 
-    init(configuredTarget: ConfiguredTarget, workspaceContext: WorkspaceContext, delegate: any TaskPlanningDelegate)
-    {
+    init(configuredTarget: ConfiguredTarget, workspaceContext: WorkspaceContext, delegate: any TaskPlanningDelegate) {
         self.configuredTarget = configuredTarget
         self.workspaceContext = workspaceContext
         self.delegate = delegate
     }
 
-
     /// Create the product plan.
-    func createProductPlan(_ targetTaskInfo: TargetGateNodes, _ globalProductPlan: GlobalProductPlan) async -> ProductPlan
-    {
+    func createProductPlan(_ targetTaskInfo: TargetGateNodes, _ globalProductPlan: GlobalProductPlan) async -> ProductPlan {
         // Create the context object for the task producers.
         // FIXME: Either each task producer should get its own file path resolver, or the path resolver's caching logic needs to be thread-safe.
         let taskProducerContext = TargetTaskProducerContext(configuredTarget: configuredTarget, workspaceContext: workspaceContext, targetTaskInfo: targetTaskInfo, globalProductPlan: globalProductPlan, delegate: delegate)
@@ -123,8 +118,7 @@ private struct ProductPlanBuilder
         // Compute the path of the product.
         // FIXME: Figure out how to represent targets which don't have a product path (e.g, aggregate and external targets).  Maybe use their PIF GUID?
         var path = Path("placeholder")
-        if let standardTarget = self.configuredTarget.target as? StandardTarget
-        {
+        if let standardTarget = self.configuredTarget.target as? StandardTarget {
             path = taskProducerContext.settings.filePathResolver.resolveAbsolutePath(standardTarget.productReference)
         }
 
@@ -139,19 +133,14 @@ private struct ProductPlanBuilder
     }
 }
 
-
 // MARK: Target extensions to create task producers.
 
-
-protocol ProductPlanBuilding
-{
+protocol ProductPlanBuilding {
     func taskProducers(_ taskProducerContext: TargetTaskProducerContext) async -> [any TaskProducer]
 }
 
-extension Target: ProductPlanBuilding
-{
-    func taskProducers(_ taskProducerContext: TargetTaskProducerContext) async -> [any TaskProducer]
-    {
+extension Target: ProductPlanBuilding {
+    func taskProducers(_ taskProducerContext: TargetTaskProducerContext) async -> [any TaskProducer] {
         switch self
         {
         case let target as StandardTarget:
@@ -172,8 +161,7 @@ extension Target: ProductPlanBuilding
     }
 }
 
-extension BuildPhaseTarget
-{
+extension BuildPhaseTarget {
     /// The base name used by phase start and end nodes set up for task producers for this target.
     func phaseNodeRoot(_ configuredTarget: ConfiguredTarget?) -> String {
         return configuredTarget?.guid.stringValue ?? "target-\(self.name)-\(self.guid)"
@@ -183,31 +171,32 @@ extension BuildPhaseTarget
     ///
     /// - parameter startPhaseNode: The start phase node for tasks created by the producer of the first build phase.  If passed, then all tasks created by the producer for the first build phase will run after all tasks on which this node depends (presumably as set up by our caller).  If nil, then a new start node will be created, and the tasks will run independently of any tasks previously created by the caller.
     /// - returns: A tuple consisting of the list of task producers created, and the end phase node of the producer for the last build phase.  This end phase node can be used by the caller to order further producers to make their tasks run after the tasks for the build phases.
-    func buildPhaseTargetTaskProducers(_ taskProducerContext: TargetTaskProducerContext, startPhaseNodes: [PlannedVirtualNode]? = nil) -> (taskProducers: [any TaskProducer], endPhaseNode: PlannedVirtualNode)
-    {
+    func buildPhaseTargetTaskProducers(_ taskProducerContext: TargetTaskProducerContext, startPhaseNodes: [PlannedVirtualNode]? = nil) -> (taskProducers: [any TaskProducer], endPhaseNode: PlannedVirtualNode) {
         // All headers phases should run ahead of other phases, unless they follow an unsandboxed script.
         let earlyHeadersPhaseGUIDs: Set<String>
         if taskProducerContext.settings.globalScope.evaluate(BuiltinMacros.RESCHEDULE_INDEPENDENT_HEADERS_PHASES) {
-            earlyHeadersPhaseGUIDs = Set(buildPhases.prefix(while: {
-                if let shellScriptPhase = $0 as? ShellScriptBuildPhase {
-                    if !taskProducerContext.settings.globalScope.evaluate(BuiltinMacros.ENABLE_USER_SCRIPT_SANDBOXING) {
-                        return false
-                    }
-                    // FIXME: Refactor output file list parsing so we can call into it here.
-                    if shellScriptPhase.outputFileListPaths.count > 0 {
-                        return false
-                    }
-                    for outputExpr in shellScriptPhase.outputFilePaths {
-                        let output = Path(taskProducerContext.settings.globalScope.evaluate(outputExpr))
-                        if taskProducerContext.lookupFileType(fileName: output.basename)?.conformsToAny(taskProducerContext.compilationRequirementOutputFileTypes) == true {
+            earlyHeadersPhaseGUIDs = Set(
+                buildPhases.prefix(while: {
+                    if let shellScriptPhase = $0 as? ShellScriptBuildPhase {
+                        if !taskProducerContext.settings.globalScope.evaluate(BuiltinMacros.ENABLE_USER_SCRIPT_SANDBOXING) {
                             return false
                         }
+                        // FIXME: Refactor output file list parsing so we can call into it here.
+                        if shellScriptPhase.outputFileListPaths.count > 0 {
+                            return false
+                        }
+                        for outputExpr in shellScriptPhase.outputFilePaths {
+                            let output = Path(taskProducerContext.settings.globalScope.evaluate(outputExpr))
+                            if taskProducerContext.lookupFileType(fileName: output.basename)?.conformsToAny(taskProducerContext.compilationRequirementOutputFileTypes) == true {
+                                return false
+                            }
+                        }
+                        return true
+                    } else {
+                        return true
                     }
-                    return true
-                } else {
-                    return true
-                }
-            }).filter({ $0 is HeadersBuildPhase }).map(\.guid))
+                }).filter({ $0 is HeadersBuildPhase }).map(\.guid)
+            )
         } else {
             earlyHeadersPhaseGUIDs = []
         }
@@ -231,8 +220,7 @@ extension BuildPhaseTarget
         var taskProducers = [any TaskProducer]()
 
         var startPhaseNodes = startPhaseNodes ?? [taskProducerContext.createVirtualNode(phaseNodeRoot(taskProducerContext.configuredTarget) + "-start")]
-        for (i, fusedPhase) in fusedPhases.enumerated()
-        {
+        for (i, fusedPhase) in fusedPhases.enumerated() {
             let endFusedPhaseNode = taskProducerContext.createVirtualNode(phaseNodeRoot(taskProducerContext.configuredTarget) + "-fused-phase" + String(i) + "-" + fusedPhase.map { $0.name.asLegalRfc1034Identifier.lowercased() }.joined(separator: "&"))
             let endFusedPhaseTask = taskProducerContext.createPhaseEndTask(inputs: startPhaseNodes, output: endFusedPhaseNode, mustPrecede: [taskProducerContext.targetEndTask])
 
@@ -262,13 +250,15 @@ extension BuildPhaseTarget
         guard taskProducerContext.settings.globalScope.evaluate(BuiltinMacros.FUSE_BUILD_PHASES) else {
             return false
         }
-        guard (taskProducerContext.configuredTarget?.target as? StandardTarget)?.buildRules.contains(where: {
-            if case .shellScript = $0.actionSpecifier {
-                return true
-            } else {
-                return false
-            }
-        }) != true || SWBFeatureFlag.allowBuildPhaseFusionWithCustomShellScriptBuildRules.value else {
+        guard
+            (taskProducerContext.configuredTarget?.target as? StandardTarget)?.buildRules.contains(where: {
+                if case .shellScript = $0.actionSpecifier {
+                    return true
+                } else {
+                    return false
+                }
+            }) != true || SWBFeatureFlag.allowBuildPhaseFusionWithCustomShellScriptBuildRules.value
+        else {
             // If the target has a shell script build rule, it may not be safe to parallelize if it specifies incorrect dependencies.
             return false
         }
@@ -314,10 +304,8 @@ extension BuildPhaseTarget
     }
 }
 
-extension StandardTarget
-{
-    func standardTargetTaskProducers(_ taskProducerContext: TargetTaskProducerContext) async -> [any TaskProducer]
-    {
+extension StandardTarget {
+    func standardTargetTaskProducers(_ taskProducerContext: TargetTaskProducerContext) async -> [any TaskProducer] {
         let taskProducerExtensions = await taskProducerExtensions(taskProducerContext.workspaceContext)
 
         var taskProducers = [any TaskProducer]()
@@ -451,19 +439,15 @@ extension StandardTarget
     }
 }
 
-extension AggregateTarget
-{
-    func aggregateTargetTaskProducers(_ taskProducerContext: TargetTaskProducerContext) -> [any TaskProducer]
-    {
+extension AggregateTarget {
+    func aggregateTargetTaskProducers(_ taskProducerContext: TargetTaskProducerContext) -> [any TaskProducer] {
         // TODO: We should probably check that only build phases useful in an aggregate target are present here.
         return super.buildPhaseTargetTaskProducers(taskProducerContext).taskProducers
     }
 }
 
-extension ExternalTarget
-{
-    func externalTargetTaskProducers(_ taskProducerContext: TaskProducerContext) -> [any TaskProducer]
-    {
+extension ExternalTarget {
+    func externalTargetTaskProducers(_ taskProducerContext: TaskProducerContext) -> [any TaskProducer] {
         if !customTasks.isEmpty {
             taskProducerContext.error("custom tasks are not yet supported in external targets")
         }
@@ -471,10 +455,8 @@ extension ExternalTarget
     }
 }
 
-extension PackageProductTarget
-{
-    func packageProductTargetTaskProducers(_ taskProducerContext: TargetTaskProducerContext) -> [any TaskProducer]
-    {
+extension PackageProductTarget {
+    func packageProductTargetTaskProducers(_ taskProducerContext: TargetTaskProducerContext) -> [any TaskProducer] {
         if !customTasks.isEmpty {
             taskProducerContext.error("custom tasks are not yet supported in package product targets")
         }
diff --git a/Sources/SWBTaskConstruction/TaskProducerSandboxing.swift b/Sources/SWBTaskConstruction/TaskProducerSandboxing.swift
index 802b7c98..5ecfc3f0 100644
--- a/Sources/SWBTaskConstruction/TaskProducerSandboxing.swift
+++ b/Sources/SWBTaskConstruction/TaskProducerSandboxing.swift
@@ -44,7 +44,7 @@ extension TaskProducerContext {
         //   * the generic template for sandboxes
 
         sandboxProfileContents <<< "(version 1)" <<< "\n"
-        sandboxProfileContents <<< "(allow default)" <<< "\n" // Required; Removing this will cause testEnsureProperlyDeclaredInputOutputSucceeds to fail
+        sandboxProfileContents <<< "(allow default)" <<< "\n"  // Required; Removing this will cause testEnsureProperlyDeclaredInputOutputSucceeds to fail
 
         // TODO: rdar://87285630 (User script sandboxing: network requests)
         // Ideally we'd like the build system to track HTTP artifacts and guide the users to include them as dependencies.
diff --git a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/BuildRuleTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/BuildRuleTaskProducer.swift
index fd52d6ff..99662615 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/BuildRuleTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/BuildRuleTaskProducer.swift
@@ -42,14 +42,15 @@ final class BuildRuleTaskProducer: StandardTaskProducer, TaskProducer, ShellBase
     }
 
     func pathForResolvedFileList(_ scope: MacroEvaluationScope, prefix: String, fileList: Path) -> Path {
-        let checksumRawData = [
-            scope.evaluate(BuiltinMacros.EFFECTIVE_PLATFORM_NAME),
-            buildPhase.guid,
-            action.identifier,
-            scope.evaluate(BuiltinMacros.CURRENT_VARIANT),
-            scope.evaluate(BuiltinMacros.CURRENT_ARCH),
-            fileList.str,
-        ] + cbc.inputs.map { $0.absolutePath.str }
+        let checksumRawData =
+            [
+                scope.evaluate(BuiltinMacros.EFFECTIVE_PLATFORM_NAME),
+                buildPhase.guid,
+                action.identifier,
+                scope.evaluate(BuiltinMacros.CURRENT_VARIANT),
+                scope.evaluate(BuiltinMacros.CURRENT_ARCH),
+                fileList.str,
+            ] + cbc.inputs.map { $0.absolutePath.str }
 
         return scope.evaluate(BuiltinMacros.TEMP_DIR).join("\(prefix)-\(checksumRawData.joined(separator: "\n").md5())-\(fileList.basenameWithoutSuffix)-resolved.xcfilelist")
     }
@@ -95,7 +96,7 @@ final class BuildRuleTaskProducer: StandardTaskProducer, TaskProducer, ShellBase
         let inputPath = input.absolutePath
         let inputDir = inputPath.dirname
         let inputName = inputPath.basename
-        let (inputBase,inputSuffix) = Path(inputName).splitext()
+        let (inputBase, inputSuffix) = Path(inputName).splitext()
         var inputVariables: [MacroDeclaration: String] = [
             BuiltinMacros.INPUT_FILE_PATH: inputPath.str,
             BuiltinMacros.INPUT_FILE_DIR: inputDir.str,
@@ -137,7 +138,7 @@ final class BuildRuleTaskProducer: StandardTaskProducer, TaskProducer, ShellBase
         }
 
         // Add the input file variables.
-        for (macro,name) in inputVariables {
+        for (macro, name) in inputVariables {
             environment[macro.name] = name
         }
 
@@ -196,7 +197,7 @@ final class BuildRuleTaskProducer: StandardTaskProducer, TaskProducer, ShellBase
                 dependencyData = .dependencyInfo(path)
 
             case .makefiles(let paths):
-                let paths = paths.map{ context.makeAbsolute(Path(cbc.scope.evaluate($0, lookup: lookup))).normalize() }
+                let paths = paths.map { context.makeAbsolute(Path(cbc.scope.evaluate($0, lookup: lookup))).normalize() }
                 outputs.append(contentsOf: paths)
                 dependencyData = .makefiles(paths)
             }
@@ -204,8 +205,8 @@ final class BuildRuleTaskProducer: StandardTaskProducer, TaskProducer, ShellBase
             dependencyData = nil
         }
 
-        var inputNodes = inputs.map{ createNodeForRule(delegate, cbc: cbc, context: context, path: $0) }
-        var outputNodes = outputs.map{ delegate.createNode($0) as (any PlannedNode) }
+        var inputNodes = inputs.map { createNodeForRule(delegate, cbc: cbc, context: context, path: $0) }
+        var outputNodes = outputs.map { delegate.createNode($0) as (any PlannedNode) }
 
         await handleFileLists(&tasks, &inputNodes, &outputNodes, &environment, cbc.scope, inputFileLists, outputFileLists, lookup: lookup)
 
diff --git a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/CopyFilesTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/CopyFilesTaskProducer.swift
index 3daa8d31..5f75ec89 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/CopyFilesTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/CopyFilesTaskProducer.swift
@@ -83,10 +83,12 @@ class CopyFilesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, FilesBasedBui
         //
         // FIXME: The latter feature here is rarely used, and not very flexible as any target which needs other copy phases won't be able to disable them selectively.
         let buildComponents = scope.evaluate(BuiltinMacros.BUILD_COMPONENTS)
-        guard buildComponents.contains("build")
+        guard
+            buildComponents.contains("build")
                 || buildComponents.contains("installLoc")
                 || (buildComponents.contains("api") && scope.evaluate(BuiltinMacros.INSTALLAPI_COPY_PHASE))
-                || (buildComponents.contains("headers") && scope.evaluate(BuiltinMacros.INSTALLHDRS_COPY_PHASE)) else {
+                || (buildComponents.contains("headers") && scope.evaluate(BuiltinMacros.INSTALLHDRS_COPY_PHASE))
+        else {
             return []
         }
 
@@ -265,8 +267,7 @@ class CopyFilesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, FilesBasedBui
                 if strParts.count > 1, firstPart == firstPartToRemove {
                     let subpath = strParts[1...].joined(separator: Path.pathSeparatorString)
                     subpathsToExclude.append(subpath)
-                }
-                else if firstPart != firstPartToRemove {
+                } else if firstPart != firstPartToRemove {
                     // If string is *only* firstPartToRemove then we don't add it.
                     subpathsToExclude.append(string)
                 }
@@ -281,8 +282,7 @@ class CopyFilesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, FilesBasedBui
             var shouldSkipCopyingBinary = false
             if mergingTargets.contains(configuredTarget) {
                 shouldSkipCopyingBinary = true
-            }
-            else {
+            } else {
                 for dependency in context.globalProductPlan.dependencies(of: configuredTarget) {
                     if mergingTargets.contains(dependency) {
                         shouldSkipCopyingBinary = true
@@ -300,8 +300,7 @@ class CopyFilesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, FilesBasedBui
                 // If this is a standalone binary product then we skip copying it altogether.  Otherwise PBXCp will exclude the subpaths we add to the list here.
                 if productType.isWrapper {
                     addSubpath(settings.globalScope.evaluate(BuiltinMacros.EXECUTABLE_PATH).str, removingFirstPartIfEqualTo: settings.globalScope.evaluate(BuiltinMacros.FULL_PRODUCT_NAME).str)
-                }
-                else {
+                } else {
                     // Skip standalone binary altogether by returning out of this method.
                     return
                 }
@@ -354,7 +353,6 @@ class CopyFilesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, FilesBasedBui
                         }
                     }
 
-
                     // If we should skip copying it, then we set up the subpaths to exclude.
                     if shouldSkipCopyingBinary {
                         // If this is a standalone binary product then we skip copying it altogether.  Otherwise PBXCp will exclude the subpaths we add to the list here.
@@ -439,16 +437,14 @@ class CopyFilesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, FilesBasedBui
                         // With deep bundles, we also report the Versions/A folder as an output, because that's what codesign signs.
                         additionalPresumedOutputs.append(delegate.createNode(dst.join(versionRelativePath)))
                         additionalPresumedOutputs.append(delegate.createNode(dst.join(versionRelativePath).join(frameworkName)))
-                    }
-                    else {
+                    } else {
                         additionalPresumedOutputs.append(delegate.createNode(dst.join(frameworkName)))
                     }
                 case let .bundle(shallow):
                     let bundleName = dst.basenameWithoutSuffix
                     if !shallow {
                         additionalPresumedOutputs.append(delegate.createNode(dst.join("Contents/MacOS").join(bundleName)))
-                    }
-                    else {
+                    } else {
                         additionalPresumedOutputs.append(delegate.createNode(dst.join(bundleName)))
                     }
                 case nil:
diff --git a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/FilesBasedBuildPhaseTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/FilesBasedBuildPhaseTaskProducer.swift
index 37612eb5..6a0312e1 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/FilesBasedBuildPhaseTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/FilesBasedBuildPhaseTaskProducer.swift
@@ -27,17 +27,14 @@ extension FileToBuild {
     }
 }
 
-
 extension TaskProducerContext: InputFileGroupingStrategyContext {
     public var fs: any FSProxy {
         return workspaceContext.fs
     }
 }
 
-
 // MARK:
 
-
 /// Context for grouping files in the build phase, and processing the groups.
 package final class BuildFilesProcessingContext: BuildFileFilteringContext {
     package let excludedSourceFileNames: [String]
@@ -153,8 +150,7 @@ package final class BuildFilesProcessingContext: BuildFileFilteringContext {
 
             // If we get here, then either we validated a rule action, or we decided to add the file-to-build as an ungrouped file.
             ruleAction = addAsUngrouped ? nil : provisionalRuleAction
-        }
-        else {
+        } else {
             // If it isn't the output of some task, then we always use the matching rule action (or lack thereof) which we found.
             ruleAction = provisionalRuleAction
         }
@@ -185,8 +181,7 @@ package final class BuildFilesProcessingContext: BuildFileFilteringContext {
         if let identFromRuleAction = ruleAction?.inputFileGroupingStrategies.lazy.compactMap({ $0.determineGroupIdentifier(groupable: ftb) }).first {
             groupIdent = identFromRuleAction
             isCollectionGroup = true
-        }
-        else {
+        } else {
             groupIdent = path.str
             isCollectionGroup = false
         }
@@ -200,12 +195,14 @@ package final class BuildFilesProcessingContext: BuildFileFilteringContext {
         }
 
         // Find or create the group for the identifier we got back.
-        let group = groupsByIdent[groupIdent] ?? {
-            // We didn’t already have a group for this identifier, so create one now.
-            let group = FileToBuildGroup(groupIdent, action: ruleAction)
-            addFileGroup(group, isCollectionGroup)
-            return group
-        }()
+        let group =
+            groupsByIdent[groupIdent]
+            ?? {
+                // We didn’t already have a group for this identifier, so create one now.
+                let group = FileToBuildGroup(groupIdent, action: ruleAction)
+                addFileGroup(group, isCollectionGroup)
+                return group
+            }()
 
         // Append the file to the group.
         group.files.append(ftb)
@@ -215,8 +212,7 @@ package final class BuildFilesProcessingContext: BuildFileFilteringContext {
         // Add it to the appropriate list.
         if isCollectionGroup {
             collectionGroups.append(group)
-        }
-        else {
+        } else {
             singletonGroups.append(group)
         }
         // We skip adding the group to the index if instructed - typically because the build phase isn't resolving build rules.
@@ -326,7 +322,7 @@ extension PluginManager {
     ///
     /// Asset Catalogs would be one example of this, so that they can generate symbols.
     func fileTypesProducingGeneratedSources() -> [String] {
-        var compileToSwiftFileTypes : [String] = []
+        var compileToSwiftFileTypes: [String] = []
         for groupingStragegyExtensions in extensions(of: InputFileGroupingStrategyExtensionPoint.self) {
             compileToSwiftFileTypes.append(contentsOf: groupingStragegyExtensions.fileTypesCompilingToSwiftSources())
         }
@@ -336,7 +332,6 @@ extension PluginManager {
 
 // MARK:
 
-
 /// Protocol for build phase tasks producers which are based around processing file references.
 protocol FilesBasedBuildPhaseTaskProducer: AnyObject, TaskProducer {
     /// The type of build phase managed by this producer.
@@ -478,12 +473,11 @@ package class FilesBasedBuildPhaseTaskProducerBase: PhasedTaskProducer {
                     // If we're processing a single language for installLoc, then unwrap the variant group into a separate item for each of its child references.
                     if installlocSpecificLanguages {
                         try unwrapResolveAndAdd(variantGroup: asVariantGroup, for: buildFile)
-                    }
-                    else {
+                    } else {
                         // If the first item in the variant group is an IB document with Base localization, then we need to handle it specially, since it may contain a mix of IB documents and strings files.
                         // An exception to this is when String Catalogs are in play.
                         if let baseReference = asVariantGroup.children.first as? SWBCore.FileReference, SpecRegistry.interfaceBuilderDocumentFileTypeIdentifiers.contains(baseReference.fileTypeIdentifier), baseReference.regionVariantName == "Base" {
-                            var ibDocRefs = [SWBCore.FileReference]() // These are specifically override nibs, not including Base.
+                            var ibDocRefs = [SWBCore.FileReference]()  // These are specifically override nibs, not including Base.
                             var hasStringCatalog = false
 
                             // Iterate over the children of the group - skipping the first reference - to put them into buckets.
@@ -496,19 +490,15 @@ package class FilesBasedBuildPhaseTaskProducerBase: PhasedTaskProducer {
                                     if SpecRegistry.interfaceBuilderDocumentFileTypeIdentifiers.contains(fileRef.fileTypeIdentifier) {
                                         // If it's an IB document, then remember it.
                                         ibDocRefs.append(fileRef)
-                                    }
-                                    else if fileRef.fileTypeIdentifier == "text.plist.strings" {
+                                    } else if fileRef.fileTypeIdentifier == "text.plist.strings" {
                                         // If it's a .strings file, then we'll just include it in the variant group.
-                                    }
-                                    else if fileRef.fileTypeIdentifier == "text.json.xcstrings" {
+                                    } else if fileRef.fileTypeIdentifier == "text.json.xcstrings" {
                                         // If it has a String Catalog, remember that.
                                         hasStringCatalog = true
-                                    }
-                                    else {
+                                    } else {
                                         // FIXME: If there's something in the variant group that isn't an IB document or a .strings file, then what should we do about it?
                                     }
-                                }
-                                else {
+                                } else {
                                     // FIXME: If this isn't a file reference, what should we do about it?
                                 }
                             }
@@ -542,14 +532,12 @@ package class FilesBasedBuildPhaseTaskProducerBase: PhasedTaskProducer {
                                     addResolvedItem(buildFile: nil, path: path, reference: reference, fileType: fileType)
                                 }
                             }
-                        }
-                        else {
+                        } else {
                             // If the first reference is not an IB document, or does not have base localization, then we unwrap the variant group into a separate item for each of its child references.
                             try unwrapResolveAndAdd(variantGroup: asVariantGroup, for: buildFile)
                         }
                     }
-                }
-                else {
+                } else {
                     func isXCFrameworkWrapper(_ path: Path, fileType: FileTypeSpec) -> Bool {
                         guard let xcframeworkFileSpec = context.lookupFileType(identifier: "wrapper.xcframework") else {
                             return false
@@ -582,15 +570,13 @@ package class FilesBasedBuildPhaseTaskProducerBase: PhasedTaskProducer {
 
                                 if let fileType = fileTypeSpec(for: library) {
                                     addResolvedItem(buildFile: buildFile, path: libraryTargetPath, reference: reference, fileType: fileType)
-                                }
-                                else {
+                                } else {
                                     // This error should actually never be reached as we should have provided this error earlier.
                                     context.error("Unsupported library type: '\(libraryTargetPath.fileSuffix)'")
                                 }
                             }
                         }
-                    }
-                    else {
+                    } else {
                         // The reference is not a variant group, so add it as a single item.
                         addResolvedItem(buildFile: buildFile, path: path, reference: reference, fileType: fileType)
                     }
@@ -618,7 +604,7 @@ package class FilesBasedBuildPhaseTaskProducerBase: PhasedTaskProducer {
         var compileToSwiftFiles = [ResolvedBuildFile]()
         var otherBuildFiles = [ResolvedBuildFile]()
         for resolvedBuildFile in resolvedBuildFiles {
-            if compileToSwiftFileTypes.contains (where: { identifier in resolvedBuildFile.fileTypeSpec.conformsTo(identifier: identifier)}) {
+            if compileToSwiftFileTypes.contains(where: { identifier in resolvedBuildFile.fileTypeSpec.conformsTo(identifier: identifier) }) {
                 compileToSwiftFiles.append(resolvedBuildFile)
             } else {
                 otherBuildFiles.append(resolvedBuildFile)
@@ -747,21 +733,21 @@ package class FilesBasedBuildPhaseTaskProducerBase: PhasedTaskProducer {
     }
 
     /// Add the tasks for the given rule.
-    private func addTasksForRule<T: FilesBasedBuildPhaseTaskProducer>( groupContext: inout GroupContext, _ producer: T, _ rule: any BuildRuleAction, _ group: FileToBuildGroup, _ buildFilesContext: BuildFilesProcessingContext, _ scope: MacroEvaluationScope, _ tasks: inout [any PlannedTask]) async {
+    private func addTasksForRule<T: FilesBasedBuildPhaseTaskProducer>(groupContext: inout GroupContext, _ producer: T, _ rule: any BuildRuleAction, _ group: FileToBuildGroup, _ buildFilesContext: BuildFilesProcessingContext, _ scope: MacroEvaluationScope, _ tasks: inout [any PlannedTask]) async {
         // Do the necessary work, ending up with an array of output paths.
         let outputs: [FileToBuild]
         if let priorOutputs = outputsProducedByArchNeutralToolSpec[group] {
             // If we already have the output paths because the input group has previously been processed by an architecture-neutral tool spec (for a different arch or variant), then we re-use those paths.
             outputs = priorOutputs
-        }
-        else {
+        } else {
             // Otherwise we construct tasks for the input group.
             let result = await appendGeneratedTasks(&tasks) { delegate in
-                let scope = !rule.isArchitectureNeutral ? scope : (
-                    scope
+                let scope =
+                    !rule.isArchitectureNeutral
+                    ? scope
+                    : (scope
                         .subscope(binding: BuiltinMacros.variantCondition, to: "normal")
-                        .subscope(binding: BuiltinMacros.archCondition, to: "undefined_arch")
-                )
+                        .subscope(binding: BuiltinMacros.archCondition, to: "undefined_arch"))
                 await constructTasksForRule(rule, group, buildFilesContext, scope, delegate)
             }
             outputs = result.outputs
@@ -840,8 +826,8 @@ package class FilesBasedBuildPhaseTaskProducerBase: PhasedTaskProducer {
         do {
             try context.workspaceContext.fs.traverse(path) { subPath in
                 if let relativePath = subPath.relativeSubpath(from: path),
-                   context.workspaceContext.fs.isDirectory(subPath) &&
-                   subPath.join(".").isValidLocalizedContent(scope) {
+                    context.workspaceContext.fs.isDirectory(subPath) && subPath.join(".").isValidLocalizedContent(scope)
+                {
                     localizedContent.append(Path(relativePath))
                 }
             }
@@ -882,14 +868,14 @@ package class FilesBasedBuildPhaseTaskProducerBase: PhasedTaskProducer {
 
         // Don't process output files which are already in a product headers folder.
         let publicDestDirPath = TargetHeaderInfo.destDirPath(for: HeaderVisibility.public, scope: scope)
-            guard !publicDestDirPath.isAncestor(of: ftb.absolutePath) else {
-                return false
-            }
+        guard !publicDestDirPath.isAncestor(of: ftb.absolutePath) else {
+            return false
+        }
 
         let privateDestDirPath = TargetHeaderInfo.destDirPath(for: HeaderVisibility.private, scope: scope)
-            guard !privateDestDirPath.isAncestor(of: ftb.absolutePath) else {
-                return false
-            }
+        guard !privateDestDirPath.isAncestor(of: ftb.absolutePath) else {
+            return false
+        }
 
         return true
     }
diff --git a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/HeadersTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/HeadersTaskProducer.swift
index 80037abe..1b1ea6d2 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/HeadersTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/HeadersTaskProducer.swift
@@ -60,7 +60,8 @@ final class HeadersTaskProducer: FilesBasedBuildPhaseTaskProducerBase, FilesBase
                 // If `-b` was passed we can map directly from the copied header to the original. If it isn't, all the
                 // lines will be out of sync and thus we can't add the mapping.
                 if let constructedTask = generatedTasks.tasks.only as? ConstructedTask,
-                   constructedTask.commandLine.contains(where: { $0 == "-b" }) {
+                    constructedTask.commandLine.contains(where: { $0 == "-b" })
+                {
                     context.addCopiedPath(src: ftb.absolutePath.str, dst: output.str)
                 }
             } else {
diff --git a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/ResourcesTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/ResourcesTaskProducer.swift
index aee06f4f..65183082 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/ResourcesTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/ResourcesTaskProducer.swift
@@ -21,8 +21,7 @@ final class ResourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, FilesBa
 
     func shouldProcessResources(_ scope: MacroEvaluationScope) -> Bool {
         // Resources are processed only when the "build" component is present.
-        guard scope.evaluate(BuiltinMacros.BUILD_COMPONENTS).contains("build") ||
-            scope.evaluate(BuiltinMacros.BUILD_COMPONENTS).contains("installLoc") else { return false }
+        guard scope.evaluate(BuiltinMacros.BUILD_COMPONENTS).contains("build") || scope.evaluate(BuiltinMacros.BUILD_COMPONENTS).contains("installLoc") else { return false }
 
         // Resources are processed only if $(UNLOCALIZED_RESOURCES_FOLDER_PATH) is defined.
         guard !scope.evaluate(BuiltinMacros.UNLOCALIZED_RESOURCES_FOLDER_PATH).isEmpty else { return false }
@@ -76,7 +75,7 @@ final class ResourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, FilesBa
                     self.createOnDemandResourcesPlistTask(assetPacks, delegate)
 
                     // Emit AssetPackManifest[Template].plist (check for <rdar://problem/19679943>)
-                    let hasCustomAssetPackManifest = resourcesTasks.contains{ $0.outputs.contains { ["AssetPackManifest.plist", "AssetPackManifestTemplate.plist"].contains($0.path.basename) } }
+                    let hasCustomAssetPackManifest = resourcesTasks.contains { $0.outputs.contains { ["AssetPackManifest.plist", "AssetPackManifestTemplate.plist"].contains($0.path.basename) } }
                     if !hasCustomAssetPackManifest {
                         let orderingInputs: [any PlannedNode] = resourcesTasks.flatMap { $0.outputs }
                         self.context.createAssetPackManifestSpec.constructAssetPackManifestTask(self.context, assetPacks, orderingInputs: orderingInputs, scope, delegate)
@@ -229,12 +228,13 @@ final class ResourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, FilesBa
 
         // Return any files provided by the product type
         if let productType = context.productType {
-            additionalFilesToBuild += productType.buildPhaseFileRefAdditions["com.apple.buildphase.resources"]?.compactMap { file in
-                let path = Path(scope.evaluate(file.path))
-                guard path.isAbsolute else { context.error("unexpected non-absolute path from \(productType.identifier) buildPhaseFileRefAdditions \(file.path.stringRep): \(path.str)"); return nil }
+            additionalFilesToBuild +=
+                productType.buildPhaseFileRefAdditions["com.apple.buildphase.resources"]?.compactMap { file in
+                    let path = Path(scope.evaluate(file.path))
+                    guard path.isAbsolute else { context.error("unexpected non-absolute path from \(productType.identifier) buildPhaseFileRefAdditions \(file.path.stringRep): \(path.str)"); return nil }
 
-                return FileToBuild(absolutePath: path, inferringTypeUsing: context, regionVariantName: scope.evaluate(file.regionVariantName).nilIfEmpty)
-            } ?? []
+                    return FileToBuild(absolutePath: path, inferringTypeUsing: context, regionVariantName: scope.evaluate(file.regionVariantName).nilIfEmpty)
+                } ?? []
         }
 
         return additionalFilesToBuild
diff --git a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/ShellBasedTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/ShellBasedTaskProducer.swift
index 0bb632e7..42446146 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/ShellBasedTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/ShellBasedTaskProducer.swift
@@ -16,7 +16,7 @@ import SWBMacro
 import Foundation
 
 protocol ShellBasedTaskProducer {
-    func handleFileLists(_ tasks: inout [any PlannedTask], _ inputs: inout [any PlannedNode], _ outputs: inout [any PlannedNode], _ environment: inout [String: String] , _ scope: MacroEvaluationScope, _ inputFileLists: [any PlannedNode], _ outputFileLists: [any PlannedNode], lookup: @escaping ((MacroDeclaration) -> MacroExpression?)) async
+    func handleFileLists(_ tasks: inout [any PlannedTask], _ inputs: inout [any PlannedNode], _ outputs: inout [any PlannedNode], _ environment: inout [String: String], _ scope: MacroEvaluationScope, _ inputFileLists: [any PlannedNode], _ outputFileLists: [any PlannedNode], lookup: @escaping ((MacroDeclaration) -> MacroExpression?)) async
 
     func pathForResolvedFileList(_ scope: MacroEvaluationScope, prefix: String, fileList: Path) -> Path
 
@@ -30,7 +30,8 @@ protocol ShellBasedTaskProducer {
 extension ShellBasedTaskProducer where Self: StandardTaskProducer {
     func parseXCFileList<T>(_ path: Path, scope: MacroEvaluationScope, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil, transform: (Path) -> T = { $0 }) throws -> [T] {
         let contents = try readFileContents(path).asString
-        return contents
+        return
+            contents
             .split(separator: "\n")
             .compactMap { line in
                 let line = line.trimmingCharacters(in: .whitespaces)
@@ -50,8 +51,7 @@ extension ShellBasedTaskProducer where Self: StandardTaskProducer {
             return try parseXCFileList(path, scope: scope, lookup: lookup) { path -> (any PlannedNode) in
                 if isInputList && (SWBFeatureFlag.treatScriptInputsAsDirectoryNodes.value || scope.evaluate(BuiltinMacros.USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES)) {
                     return context.createDirectoryTreeNode(context.makeAbsolute(path).normalize(), excluding: [])
-                }
-                else {
+                } else {
                     return context.createNode(context.makeAbsolute(path).normalize())
                 }
             }
@@ -62,7 +62,7 @@ extension ShellBasedTaskProducer where Self: StandardTaskProducer {
         }
     }
 
-    func handleFileLists(_ tasks: inout [any PlannedTask], _ inputs: inout [any PlannedNode], _ outputs: inout [any PlannedNode], _ environment: inout [String: String] , _ scope: MacroEvaluationScope, _ inputFileLists: [any PlannedNode], _ outputFileLists: [any PlannedNode], lookup: @escaping ((MacroDeclaration) -> MacroExpression?) = { _ in nil }) async {
+    func handleFileLists(_ tasks: inout [any PlannedTask], _ inputs: inout [any PlannedNode], _ outputs: inout [any PlannedNode], _ environment: inout [String: String], _ scope: MacroEvaluationScope, _ inputFileLists: [any PlannedNode], _ outputFileLists: [any PlannedNode], lookup: @escaping ((MacroDeclaration) -> MacroExpression?) = { _ in nil }) async {
         // The set of both the input and the output file lists need to be tracked as inputs to the script as they are required to exist before the task can actually run.
         inputs += inputFileLists
         inputs += outputFileLists
diff --git a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/ShellScriptTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/ShellScriptTaskProducer.swift
index fedc42f6..a56e2f3e 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/ShellScriptTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/ShellScriptTaskProducer.swift
@@ -46,7 +46,8 @@ final class ShellScriptTaskProducer: PhasedTaskProducer, TaskProducer, ShellBase
             }
 
             // Get all of the paths from the xcfilelist; we'll process them later.
-            let groups: [[Path]] = xcfilelistPaths
+            let groups: [[Path]] =
+                xcfilelistPaths
                 .map { xcfilelist in
                     let outputs: [Path]
                     do {
@@ -168,7 +169,6 @@ final class ShellScriptTaskProducer: PhasedTaskProducer, TaskProducer, ShellBase
         // Lastly, we need to inspect the contents of the file lists and append their paths accordingly.
         await handleFileLists(&tasks, &inputs, &outputs, &environment, scope, inputFileLists, outputFileLists)
 
-
         let enabledIndexBuildArena = scope.evaluate(BuiltinMacros.INDEX_ENABLE_BUILD_ARENA)
         let disableScriptExecutionForIndexBuild = scope.evaluate(BuiltinMacros.INDEX_DISABLE_SCRIPT_EXECUTION)
         let forceScriptExecutionForIndexBuild = scope.evaluate(BuiltinMacros.INDEX_FORCE_SCRIPT_EXECUTION)
@@ -214,7 +214,7 @@ final class ShellScriptTaskProducer: PhasedTaskProducer, TaskProducer, ShellBase
             isSandboxingEnabled = ShellScriptTaskProducer.isSandboxingEnabled(context, shellScriptBuildPhase)
         }
 
-        inputs.append(scriptFileNode)       // The generated script file is also an input.
+        inputs.append(scriptFileNode)  // The generated script file is also an input.
 
         // Determine if the shell script should always be run. NOTE!! This must come before the virtual output node creation.
         let alwaysExecuteTask = outputs.isEmpty || self.shellScriptBuildPhase.alwaysOutOfDate
@@ -263,8 +263,8 @@ final class ShellScriptTaskProducer: PhasedTaskProducer, TaskProducer, ShellBase
                 dependencyData = .dependencyInfo(path)
 
             case .makefiles(let paths):
-                let paths = paths.map{ context.makeAbsolute(Path(scope.evaluate($0))).normalize() }
-                outputs.append(contentsOf: paths.map{ context.createNode($0) })
+                let paths = paths.map { context.makeAbsolute(Path(scope.evaluate($0))).normalize() }
+                outputs.append(contentsOf: paths.map { context.createNode($0) })
                 dependencyData = .makefiles(paths)
             }
         } else {
@@ -303,8 +303,6 @@ final class ShellScriptTaskProducer: PhasedTaskProducer, TaskProducer, ShellBase
         return tasks
     }
 
-
-
     /// Construct the tasks for an individual shell-script build rule.
     ///
     /// NOTE: External targets are basically shell scripts. It lives here because the behavior shares some significant logical pieces with the behavior of shell script build phases.
diff --git a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/SourcesTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/SourcesTaskProducer.swift
index c8e6296f..6f80bbc4 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/SourcesTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/SourcesTaskProducer.swift
@@ -308,7 +308,7 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
     ///
     /// We override this to auto-attach tasks to the generated headers completion ordering gate.
     @discardableResult
-    package override func appendGeneratedTasks( _ tasks: inout [any PlannedTask], options: TaskOrderingOptions? = nil, body: (any TaskGenerationDelegate) async -> Void) async -> (tasks: [any PlannedTask], outputs: [FileToBuild]) {
+    package override func appendGeneratedTasks(_ tasks: inout [any PlannedTask], options: TaskOrderingOptions? = nil, body: (any TaskGenerationDelegate) async -> Void) async -> (tasks: [any PlannedTask], outputs: [FileToBuild]) {
         return await super.appendGeneratedTasks(&tasks, options: options) { delegate in
             await body(SourcesPhaseBasedTaskGenerationDelegate(producer: self, userPreferences: context.workspaceContext.userPreferences, delegate: delegate))
         }
@@ -354,7 +354,7 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
                 }
             case .namedReference(let name, let fileTypeIdentifier):
                 settingsForRef = nil
-                absolutePath = Path(name) // This path isn't actually absolute, but `LinkerSpec.LibrarySpecifier` supports that case.
+                absolutePath = Path(name)  // This path isn't actually absolute, but `LinkerSpec.LibrarySpecifier` supports that case.
                 if let type = context.lookupFileType(identifier: fileTypeIdentifier) {
                     fileType = type
                 } else {
@@ -475,8 +475,7 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
                             if fileType.isEmbeddableInProduct {
                                 return absolutePath
                             }
-                        }
-                        catch {}
+                        } catch {}
                     default:
                         return nil
                     }
@@ -554,8 +553,7 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
                     topLevelItemPath = absolutePath
                     if shouldGenerateDSYM(settingsForRef.globalScope) {
                         dsymPath = scope.evaluate(BuiltinMacros.DWARF_DSYM_FOLDER_PATH).join(scope.evaluate(BuiltinMacros.DWARF_DSYM_FILE_NAME))
-                    }
-                    else {
+                    } else {
                         dsymPath = nil
                     }
                 } else {
@@ -659,8 +657,8 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
                 let metadata: ArtifactBundleMetadata
                 do {
                     metadata = try context.globalProductPlan.artifactBundleMetadataCache.getOrInsert(absolutePath) {
-                       try ArtifactBundleMetadata.parse(at: absolutePath, fileSystem: context.fs)
-                   }
+                        try ArtifactBundleMetadata.parse(at: absolutePath, fileSystem: context.fs)
+                    }
                 } catch {
                     context.error("failed to parse artifact bundle metadata for '\(absolutePath)': \(error.localizedDescription)")
                     return nil
@@ -674,9 +672,11 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
                         var foundMatch = false
                         let currentTripleString = scope.evaluate(BuiltinMacros.SWIFT_TARGET_TRIPLE)
                         for variant in artifact.variants {
-                            if variant.supportedTriples == nil || variant.supportedTriples?.contains(where: {
-                                normalizedTriplesCompareDisregardingOSVersions($0, currentTripleString)
-                            }) == true {
+                            if variant.supportedTriples == nil
+                                || variant.supportedTriples?.contains(where: {
+                                    normalizedTriplesCompareDisregardingOSVersions($0, currentTripleString)
+                                }) == true
+                            {
                                 foundMatch = true
                                 return LinkerSpec.LibrarySpecifier(
                                     kind: .static,
@@ -717,7 +717,7 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
 
         let newInputs = inputs.filter { !prepareTargetForIndexInputsObjectSet.contains(ObjectIdentifier($0)) }
         prepareTargetForIndexInputs.append(contentsOf: newInputs)
-        prepareTargetForIndexInputsObjectSet.formUnion(newInputs.map{ ObjectIdentifier($0) })
+        prepareTargetForIndexInputsObjectSet.formUnion(newInputs.map { ObjectIdentifier($0) })
     }
 
     package func prepare() {
@@ -828,7 +828,7 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
         let buildVariants = scope.evaluate(BuiltinMacros.BUILD_VARIANTS)
         var dsymBundle: Path!
         var dsymutilOutputs = [Path]()
-        var perVariantOutputPaths: [String:Set<Path>] = [:]
+        var perVariantOutputPaths: [String: Set<Path>] = [:]
         var allLinkedLibraries = [LinkerSpec.LibrarySpecifier]()
         for variant in buildVariants {
             // Enter the per-variant scope.
@@ -849,7 +849,7 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
 
             assert(
                 (linkedBinaryPreviewDylibNode == nil && linkedBinaryPreviewBlankInjectionDylibNode == nil)
-                || (linkedBinaryPreviewDylibNode != nil && linkedBinaryPreviewBlankInjectionDylibNode != nil),
+                    || (linkedBinaryPreviewDylibNode != nil && linkedBinaryPreviewBlankInjectionDylibNode != nil),
                 "A debug dylib and blank injection dylib are either both present or absent."
             )
 
@@ -877,35 +877,43 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
                 // FIXME: We should do this in parallel.
                 let buildFilesContext = BuildFilesProcessingContext(scope, belongsToPreferredArch: preferredArch == nil || preferredArch == arch, currentArchSpec: currentArchSpec)
                 var perArchTasks: [any PlannedTask] = []
-                await groupAndAddTasksForFiles(self, buildFilesContext, scope, filterToAPIRules: isForAPI, filterToHeaderRules: isForHeaders, &perArchTasks, extraResolvedBuildFiles: {
-                    var result: [(Path, FileTypeSpec, Bool)] = []
-
-                    if let generateVersionInfoFileTask {
-                        result.append((generateVersionInfoFileTask.outputs.first!.path, context.lookupFileType(languageDialect: .c)!, /* shouldUsePrefixHeader */ false))
-                    }
+                await groupAndAddTasksForFiles(
+                    self,
+                    buildFilesContext,
+                    scope,
+                    filterToAPIRules: isForAPI,
+                    filterToHeaderRules: isForHeaders,
+                    &perArchTasks,
+                    extraResolvedBuildFiles: {
+                        var result: [(Path, FileTypeSpec, Bool)] = []
+
+                        if let generateVersionInfoFileTask {
+                            result.append((generateVersionInfoFileTask.outputs.first!.path, context.lookupFileType(languageDialect: .c)!, /* shouldUsePrefixHeader */ false))
+                        }
 
-                    if let generateKernelExtensionModuleInfoFileTask {
-                        result.append((generateKernelExtensionModuleInfoFileTask.outputs.first!.path, context.lookupFileType(languageDialect: .c)!, /* shouldUsePrefixHeader */ false))
-                    }
+                        if let generateKernelExtensionModuleInfoFileTask {
+                            result.append((generateKernelExtensionModuleInfoFileTask.outputs.first!.path, context.lookupFileType(languageDialect: .c)!, /* shouldUsePrefixHeader */ false))
+                        }
 
-                    if let packageTargetBundleAccessorResult {
-                        result.append((packageTargetBundleAccessorResult.fileToBuild, packageTargetBundleAccessorResult.fileToBuildFileType, /* shouldUsePrefixHeader */ false))
-                    }
+                        if let packageTargetBundleAccessorResult {
+                            result.append((packageTargetBundleAccessorResult.fileToBuild, packageTargetBundleAccessorResult.fileToBuildFileType, /* shouldUsePrefixHeader */ false))
+                        }
 
-                    if let bundleLookupHelperResult {
-                        result.append((bundleLookupHelperResult.fileToBuild, bundleLookupHelperResult.fileToBuildFileType, /* shouldUsePrefixHeader */ false))
-                    }
+                        if let bundleLookupHelperResult {
+                            result.append((bundleLookupHelperResult.fileToBuild, bundleLookupHelperResult.fileToBuildFileType, /* shouldUsePrefixHeader */ false))
+                        }
 
-                    if let embedInCodeAccessorResult {
-                        result.append((embedInCodeAccessorResult.fileToBuild, embedInCodeAccessorResult.fileToBuildFileType, /* shouldUsePrefixHeader */ false))
-                    }
+                        if let embedInCodeAccessorResult {
+                            result.append((embedInCodeAccessorResult.fileToBuild, embedInCodeAccessorResult.fileToBuildFileType, /* shouldUsePrefixHeader */ false))
+                        }
 
-                    if scope.evaluate(BuiltinMacros.GENERATE_TEST_ENTRY_POINT) {
-                        result.append((scope.evaluate(BuiltinMacros.GENERATED_TEST_ENTRY_POINT_PATH), context.lookupFileType(fileName: "sourcecode.swift")!,  /* shouldUsePrefixHeader */ false))
-                    }
+                        if scope.evaluate(BuiltinMacros.GENERATE_TEST_ENTRY_POINT) {
+                            result.append((scope.evaluate(BuiltinMacros.GENERATED_TEST_ENTRY_POINT_PATH), context.lookupFileType(fileName: "sourcecode.swift")!, /* shouldUsePrefixHeader */ false))
+                        }
 
-                    return result
-                }())
+                        return result
+                    }()
+                )
 
                 // Collect the list of object files.
                 var linkerInputNodes: [any PlannedNode] = []
@@ -948,8 +956,8 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
                 allLinkedLibraries.append(contentsOf: librariesToLink)
 
                 // Insert the object files present in the framework build phase to the linker inputs.
-                let objectsInFrameworkPhase = librariesToLink.filter{ $0.kind == .object }
-                linkerInputNodes.append(contentsOf: objectsInFrameworkPhase.map{ $0.path }.map(context.createNode))
+                let objectsInFrameworkPhase = librariesToLink.filter { $0.kind == .object }
+                linkerInputNodes.append(contentsOf: objectsInFrameworkPhase.map { $0.path }.map(context.createNode))
 
                 if !SWBFeatureFlag.enableLinkerInputsFromLibrarySpecifiers.value {
                     // If this flag isn't enabled we still want the dylib to be a dependency for this task.
@@ -1027,8 +1035,7 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
                     if let outputPreviewDylib, let outputPreviewBlankInjectionDylib {
                         singleArchPreviewDylibBinaries.append(outputPreviewDylib)
                         singleArchInjectionDylibBinaries.append(outputPreviewBlankInjectionDylib)
-                    }
-                    else {
+                    } else {
                         singleArchBinaries.append(output)
                     }
 
@@ -1146,32 +1153,35 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
                                 // rdar://127248825 (Pre-link the debug dylib and emit a new empty dylib that Previews can load to get in front of dyld)
                                 libraries = [outputPreviewDylibLibrary]
 
-                                ldflags = [
-                                    // Create a __TEXT section with the relative path to the preview dylib (we don't want to statically link it; instead the entry point provided by libPreviewsJITStubExecutor.a will load it on demand)
-                                    "-Xlinker", "-sectcreate",
-                                    "-Xlinker", "__TEXT",
-                                    "-Xlinker", "__debug_dylib",
-                                    "-Xlinker", previewsDylibRelativePathFile.str,
-                                ] + (entryPointFile.map {
+                                ldflags =
                                     [
-                                        // Create a __TEXT section with the name of the original entry point
+                                        // Create a __TEXT section with the relative path to the preview dylib (we don't want to statically link it; instead the entry point provided by libPreviewsJITStubExecutor.a will load it on demand)
                                         "-Xlinker", "-sectcreate",
                                         "-Xlinker", "__TEXT",
-                                        "-Xlinker", "__debug_entry",
-                                        "-Xlinker", $0.str,
+                                        "-Xlinker", "__debug_dylib",
+                                        "-Xlinker", previewsDylibRelativePathFile.str,
                                     ]
-                                } ?? []) + (installNameFile.map {
-                                    [
-                                        // Create a __TEXT section with the client name of the original binary, which
-                                        // becomes the install name of the debug/blank dylib
-                                        "-Xlinker", "-sectcreate",
-                                        "-Xlinker", "__TEXT",
-                                        "-Xlinker", "__debug_instlnm",
-                                        "-Xlinker", $0.str,
+                                    + (entryPointFile.map {
+                                        [
+                                            // Create a __TEXT section with the name of the original entry point
+                                            "-Xlinker", "-sectcreate",
+                                            "-Xlinker", "__TEXT",
+                                            "-Xlinker", "__debug_entry",
+                                            "-Xlinker", $0.str,
+                                        ]
+                                    } ?? [])
+                                    + (installNameFile.map {
+                                        [
+                                            // Create a __TEXT section with the client name of the original binary, which
+                                            // becomes the install name of the debug/blank dylib
+                                            "-Xlinker", "-sectcreate",
+                                            "-Xlinker", "__TEXT",
+                                            "-Xlinker", "__debug_instlnm",
+                                            "-Xlinker", $0.str,
+                                        ]
+                                    } ?? []) + [
+                                        "-Xlinker", "-filelist", "-Xlinker", executorLinkFileListPath.str,
                                     ]
-                                } ?? []) + [
-                                    "-Xlinker", "-filelist", "-Xlinker", executorLinkFileListPath.str,
-                                ]
                             } else {
                                 libraries = [outputPreviewDylibLibrary]
                                 ldflags = []
@@ -1221,19 +1231,27 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
                 // FIXME: We should do this in parallel.
                 let buildFilesContext = BuildFilesProcessingContext(scope, belongsToPreferredArch: preferredArch == nil || preferredArch == arch, currentArchSpec: currentArchSpec)
                 var perArchTasks: [any PlannedTask] = []
-                await groupAndAddTasksForFiles(self, buildFilesContext, scope, filterToAPIRules: isForAPI, filterToHeaderRules: isForHeaders, &perArchTasks, extraResolvedBuildFiles: {
-                    var result: [(Path, FileTypeSpec, Bool)] = []
-
-                    if let packageTargetBundleAccessorResult {
-                        result.append((packageTargetBundleAccessorResult.fileToBuild, packageTargetBundleAccessorResult.fileToBuildFileType, /* shouldUsePrefixHeader */ false))
-                    }
+                await groupAndAddTasksForFiles(
+                    self,
+                    buildFilesContext,
+                    scope,
+                    filterToAPIRules: isForAPI,
+                    filterToHeaderRules: isForHeaders,
+                    &perArchTasks,
+                    extraResolvedBuildFiles: {
+                        var result: [(Path, FileTypeSpec, Bool)] = []
+
+                        if let packageTargetBundleAccessorResult {
+                            result.append((packageTargetBundleAccessorResult.fileToBuild, packageTargetBundleAccessorResult.fileToBuildFileType, /* shouldUsePrefixHeader */ false))
+                        }
 
-                    if let bundleLookupHelperResult {
-                        result.append((bundleLookupHelperResult.fileToBuild, bundleLookupHelperResult.fileToBuildFileType, /* shouldUsePrefixHeader */ false))
-                    }
+                        if let bundleLookupHelperResult {
+                            result.append((bundleLookupHelperResult.fileToBuild, bundleLookupHelperResult.fileToBuildFileType, /* shouldUsePrefixHeader */ false))
+                        }
 
-                    return result
-                }())
+                        return result
+                    }()
+                )
 
                 // Add all the collected per-arch tasks.
                 tasks.append(contentsOf: perArchTasks)
@@ -1253,8 +1271,7 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
                 await appendGeneratedTasks(&tasks, options: [.linking, .linkingRequirement, .unsignedProductRequirement]) { delegate in
                     await context.lipoSpec.constructTasks(CommandBuildContext(producer: context, scope: scope, inputs: singleArchBinaries.map { FileToBuild(context: context, absolutePath: $0) }, output: binaryOutput, commandOrderingOutputs: [linkedBinaryNode]), delegate)
                 }
-            }
-            else if singleArchBinaries.count == 1, archs.count > 1, let singleArchBinaryPath = singleArchBinaries.first {
+            } else if singleArchBinaries.count == 1, archs.count > 1, let singleArchBinaryPath = singleArchBinaries.first {
                 // If there's only one binary but multiple architectures defined for the target, then for some reason we didn't produce a binary for any of the others - probably due to a strange target configuration.  If so, then we should create a copy task to copy the single-arch binary to the final location.
                 let productBinaryPath = scope.evaluate(BuiltinMacros.TARGET_BUILD_DIR).join(scope.evaluate(BuiltinMacros.EXECUTABLE_PATH))
                 if singleArchBinaryPath != productBinaryPath {
@@ -1266,7 +1283,8 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
 
             if singleArchPreviewDylibBinaries.count > 1,
                 let binaryPreviewDylibOutput,
-                let linkedBinaryPreviewDylibNode {
+                let linkedBinaryPreviewDylibNode
+            {
                 await appendGeneratedTasks(&tasks, options: [.linking, .linkingRequirement, .unsignedProductRequirement]) { delegate in
                     await context.lipoSpec.constructTasks(CommandBuildContext(producer: context, scope: scope, inputs: singleArchPreviewDylibBinaries.map { FileToBuild(context: context, absolutePath: $0) }, output: binaryPreviewDylibOutput, commandOrderingOutputs: [linkedBinaryPreviewDylibNode]), delegate)
                 }
@@ -1274,7 +1292,8 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
 
             if singleArchInjectionDylibBinaries.count > 1,
                 binaryPreviewDylibOutput != nil,
-                let linkedBinaryPreviewBlankInjectionDylibNode {
+                let linkedBinaryPreviewBlankInjectionDylibNode
+            {
                 await appendGeneratedTasks(&tasks, options: [.linking, .unsignedProductRequirement]) { delegate in
                     await context.lipoSpec.constructTasks(CommandBuildContext(producer: context, scope: scope, inputs: singleArchInjectionDylibBinaries.map { FileToBuild(context: context, absolutePath: $0) }, output: binaryPreviewBlankInjectionDylibOutput, commandOrderingOutputs: [linkedBinaryPreviewBlankInjectionDylibNode]), delegate)
                 }
@@ -1296,7 +1315,8 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
                 let binary = binaryPreviewDylibOutput ?? binaryOutput
                 let binaryOrderingInput = linkedBinaryPreviewDylibNode ?? linkedBinaryNode
 
-                let output = dsymBundle
+                let output =
+                    dsymBundle
                     .join("Contents").join("Resources").join("DWARF")
                     .join(binary.basename)
 
@@ -1326,8 +1346,7 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
                         // If the library has a known dSYM file, then pass the path to the directory of that dSYM.  If there isn'r one, then pass the path to the directory containing the library, since our best guess is that the dSYM will be alongside the library.
                         if let dsymPath = library.dsymPath {
                             dsymSearchPaths.append(dsymPath.dirname.str)
-                        }
-                        else {
+                        } else {
                             dsymSearchPaths.append(libraryPath.dirname.str)
                         }
                     }
@@ -1341,7 +1360,8 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
 
                 if binaryPreviewDylibOutput != nil {
                     let inputs = [FileToBuild(context: context, absolutePath: binaryOutput)]
-                    let output = dsymBundle
+                    let output =
+                        dsymBundle
                         .join("Contents").join("Resources").join("DWARF")
                         .join(binaryOutput.basename)
                     await appendGeneratedTasks(&tasks, usePhasedOrdering: false) { delegate in
@@ -1470,8 +1490,7 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
                                 if strParts.count > 1, firstPart == firstPartToRemove {
                                     let subpath = strParts[1...].joined(separator: Path.pathSeparatorString)
                                     subpathsToInclude.append(subpath)
-                                }
-                                else if firstPart != firstPartToRemove {
+                                } else if firstPart != firstPartToRemove {
                                     // If string is *only* firstPartToRemove then we don't add it.
                                     subpathsToInclude.append(string)
                                 }
@@ -1506,13 +1525,11 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
                                         }
                                         additionalPresumedOutputs.append(pathToSign.join(copiedFileSettings.globalScope.evaluate(BuiltinMacros.EXECUTABLE_NAME)))
                                     }
-                                }
-                                else {
+                                } else {
                                     // Don't add any paths - this will result in us just copying the unwrapped product.
                                 }
                             }
-                        }
-                        else if let xcframeworkSourcePath = library.xcframeworkSourcePath {
+                        } else if let xcframeworkSourcePath = library.xcframeworkSourcePath {
                             // Copying an XCFramework component which is marked as mergeable.
                             var xcFramework: XCFramework? = nil
                             do {
@@ -1559,7 +1576,7 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
                                         addSubpath(contentsPath.join("_CodeSignature").str, removingFirstPartIfEqualTo: library.libraryPath.str)
                                         addSubpath(contentsPath.join("Info.plist").str, removingFirstPartIfEqualTo: library.libraryPath.str)
                                         if library.supportedPlatform == "macos" {
-                                        // For deep frameworks (macOS), we also need to copy the symlinks for the binary and the Versions/Current directory, since those are how dyld accesses the binary.
+                                            // For deep frameworks (macOS), we also need to copy the symlinks for the binary and the Versions/Current directory, since those are how dyld accesses the binary.
                                             addSubpath(binaryPath.basename, removingFirstPartIfEqualTo: library.libraryPath.str)
                                             addSubpath(contentsPath.dirname.join("Current").str, removingFirstPartIfEqualTo: library.libraryPath.str)
                                         }
@@ -1866,51 +1883,51 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
         let escapedBundleName = bundleName.asLegalCIdentifier
 
         let headerFileContents = """
-        #import <Foundation/Foundation.h>
+            #import <Foundation/Foundation.h>
 
-        __BEGIN_DECLS
+            __BEGIN_DECLS
 
-        NSBundle* \(escapedBundleName)_SWIFTPM_MODULE_BUNDLE(void);
+            NSBundle* \(escapedBundleName)_SWIFTPM_MODULE_BUNDLE(void);
 
-        #define SWIFTPM_MODULE_BUNDLE \(escapedBundleName)_SWIFTPM_MODULE_BUNDLE()
+            #define SWIFTPM_MODULE_BUNDLE \(escapedBundleName)_SWIFTPM_MODULE_BUNDLE()
 
-        __END_DECLS
-        """
+            __END_DECLS
+            """
 
         let implFileContents = """
-        #import <Foundation/Foundation.h>
+            #import <Foundation/Foundation.h>
 
-        NS_ASSUME_NONNULL_BEGIN
+            NS_ASSUME_NONNULL_BEGIN
 
-        @interface \(escapedBundleName)_SWIFTPM_MODULE_BUNDLER_FINDER : NSObject
-        @end
+            @interface \(escapedBundleName)_SWIFTPM_MODULE_BUNDLER_FINDER : NSObject
+            @end
 
-        @implementation \(escapedBundleName)_SWIFTPM_MODULE_BUNDLER_FINDER
-        @end
+            @implementation \(escapedBundleName)_SWIFTPM_MODULE_BUNDLER_FINDER
+            @end
 
-        NSBundle* \(escapedBundleName)_SWIFTPM_MODULE_BUNDLE() {
-            NSString *bundleName = @"\(escapedBundleName)";
+            NSBundle* \(escapedBundleName)_SWIFTPM_MODULE_BUNDLE() {
+                NSString *bundleName = @"\(escapedBundleName)";
 
-            NSArray<NSURL*> *candidates = @[
-                NSBundle.mainBundle.resourceURL,
-                [NSBundle bundleForClass:[\(escapedBundleName)_SWIFTPM_MODULE_BUNDLER_FINDER class]].resourceURL,
-                NSBundle.mainBundle.bundleURL
-            ];
+                NSArray<NSURL*> *candidates = @[
+                    NSBundle.mainBundle.resourceURL,
+                    [NSBundle bundleForClass:[\(escapedBundleName)_SWIFTPM_MODULE_BUNDLER_FINDER class]].resourceURL,
+                    NSBundle.mainBundle.bundleURL
+                ];
 
-            for (NSURL* candidate in candidates) {
-                NSURL *bundlePath = [candidate URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.bundle", bundleName]];
+                for (NSURL* candidate in candidates) {
+                    NSURL *bundlePath = [candidate URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.bundle", bundleName]];
 
-                NSBundle *bundle = [NSBundle bundleWithURL:bundlePath];
-                if (bundle != nil) {
-                    return bundle;
+                    NSBundle *bundle = [NSBundle bundleWithURL:bundlePath];
+                    if (bundle != nil) {
+                        return bundle;
+                    }
                 }
-            }
 
-            @throw [[NSException alloc] initWithName:@"SwiftPMResourcesAccessor" reason:[NSString stringWithFormat:@"unable to find bundle named %@", bundleName] userInfo:nil];
-        }
+                @throw [[NSException alloc] initWithName:@"SwiftPMResourcesAccessor" reason:[NSString stringWithFormat:@"unable to find bundle named %@", bundleName] userInfo:nil];
+            }
 
-        NS_ASSUME_NONNULL_END
-        """
+            NS_ASSUME_NONNULL_END
+            """
 
         var tasks = [any PlannedTask]()
         await appendGeneratedTasks(&tasks) { delegate in
@@ -1925,7 +1942,9 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
     private func generatePackageTargetBundleAccessorForSwift(_ scope: MacroEvaluationScope, bundleName: String) async -> GeneratedResourceAccessorResult {
         let filePath = scope.evaluate(BuiltinMacros.DERIVED_SOURCES_DIR).join("resource_bundle_accessor.swift")
 
-        let contents = bundleName.isEmpty ? """
+        let contents =
+            bundleName.isEmpty
+            ? """
             import class Foundation.Bundle
 
             extension Foundation.Bundle {
@@ -1934,7 +1953,8 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
                     return Foundation.Bundle(for: BundleFinder.self)
                 }()
             }
-            """ : """
+            """
+            : """
             import class Foundation.Bundle
             import class Foundation.ProcessInfo
             import struct Foundation.URL
@@ -2065,10 +2085,12 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
     }
 
     private func generateKernelExtensionModuleInfoFile(_ scope: MacroEvaluationScope) -> (Path, ByteString) {
-        let module = (name:    scope.evaluate(BuiltinMacros.MODULE_NAME),
-                      version: scope.evaluate(BuiltinMacros.MODULE_VERSION),
-                      start:   scope.evaluate(BuiltinMacros.MODULE_START),
-                      stop:    scope.evaluate(BuiltinMacros.MODULE_STOP))
+        let module = (
+            name: scope.evaluate(BuiltinMacros.MODULE_NAME),
+            version: scope.evaluate(BuiltinMacros.MODULE_VERSION),
+            start: scope.evaluate(BuiltinMacros.MODULE_START),
+            stop: scope.evaluate(BuiltinMacros.MODULE_STOP)
+        )
 
         let path = scope.evaluate(BuiltinMacros.DERIVED_FILE_DIR).join(scope.evaluate(BuiltinMacros.PRODUCT_NAME) + "_info.c")
 
@@ -2108,16 +2130,16 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
     /// enabled and we should return that as a library to link!
     private func previewsDylibForTestHost() -> [LinkerSpec.LibrarySpecifier] {
         guard let target = self.context.configuredTarget,
-              let testHost = self.context.globalProductPlan.hostTargetForTargets[target] else
-        {
+            let testHost = self.context.globalProductPlan.hostTargetForTargets[target]
+        else {
             return []
         }
 
         // Only consider linking the debug dylib if it is present in the test host.
         let hostSettings = self.context.globalProductPlan.getTargetSettings(testHost)
         guard let targetBuildDir = hostSettings.globalScope.evaluate(BuiltinMacros.TARGET_BUILD_DIR).nilIfEmpty,
-              let previewsDylibPath = hostSettings.globalScope.evaluate(BuiltinMacros.EXECUTABLE_DEBUG_DYLIB_PATH).nilIfEmpty else
-        {
+            let previewsDylibPath = hostSettings.globalScope.evaluate(BuiltinMacros.EXECUTABLE_DEBUG_DYLIB_PATH).nilIfEmpty
+        else {
             return []
         }
 
@@ -2129,14 +2151,16 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
 
         let fullPath = targetBuildDir.join(Path(previewsDylibPath))
 
-        return [.init(
-            kind: .dynamic,
-            path: fullPath,
-            mode: .normal,
-            useSearchPaths: false,
-            swiftModulePaths: [:],
-            swiftModuleAdditionalLinkerArgResponseFilePaths: [:]
-        )]
+        return [
+            .init(
+                kind: .dynamic,
+                path: fullPath,
+                mode: .normal,
+                useSearchPaths: false,
+                swiftModulePaths: [:],
+                swiftModuleAdditionalLinkerArgResponseFilePaths: [:]
+            )
+        ]
     }
 
 }
diff --git a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/SwiftPackageCopyFilesTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/SwiftPackageCopyFilesTaskProducer.swift
index 814cb269..e8d4665e 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/SwiftPackageCopyFilesTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/SwiftPackageCopyFilesTaskProducer.swift
@@ -115,7 +115,7 @@ final class SwiftPackageCopyFilesTaskProducer: CopyFilesTaskProducer {
                 }
 
             case .unknown(_):
-                return false // Embedding unknown files will likely only end up tripping up validation, so we should not do that.
+                return false  // Embedding unknown files will likely only end up tripping up validation, so we should not do that.
             }
         }
 
@@ -161,13 +161,13 @@ final class SwiftPackageCopyFilesTaskProducer: CopyFilesTaskProducer {
                 let platformFilters = buildFiles.map { $0.platformFilters }
                 let aggregatedPlatformFilters: Set<PlatformFilter>
                 if platformFilters.contains(where: { $0.isEmpty }) {
-                    aggregatedPlatformFilters = [] // If any build file supports all platforms, we embed for all platforms.
+                    aggregatedPlatformFilters = []  // If any build file supports all platforms, we embed for all platforms.
                 } else {
                     aggregatedPlatformFilters = platformFilters.reduce([]) { $0.union($1) }
                 }
 
                 let target: Target
-                if case .targetProduct(let guid) = firstBuildFile.buildableItem, let _target = context.workspaceContext.workspace.target(for: guid)  {
+                if case .targetProduct(let guid) = firstBuildFile.buildableItem, let _target = context.workspaceContext.workspace.target(for: guid) {
                     target = _target
                 } else {
                     // If this isn't a target product reference, it has to be a `binaryTarget` which does not support platform filters by definition, so we can return the first build file instead.
@@ -187,7 +187,7 @@ final class SwiftPackageCopyFilesTaskProducer: CopyFilesTaskProducer {
     private let generatedBuildPhase: CopyFilesBuildPhase
 
     init(_ context: TargetTaskProducerContext, phaseStartNodes: [any PlannedNode], phaseEndNode: any PlannedNode, phaseEndTask: any PlannedTask, frameworksBuildPhase: FrameworksBuildPhase?) {
-        let configuredTarget = context.configuredTarget! // We assume a `TargetTaskProducerContext` always has an associated configured target.
+        let configuredTarget = context.configuredTarget!  // We assume a `TargetTaskProducerContext` always has an associated configured target.
 
         let guid = "\(configuredTarget.target.guid)-package-copy-files-phase"
         let buildFiles = Self.buildFilesForPackages(context: context, frameworksBuildPhase: frameworksBuildPhase)
diff --git a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/CopySwiftPackageResourcesTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/CopySwiftPackageResourcesTaskProducer.swift
index 1a7938e7..886d8b3e 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/CopySwiftPackageResourcesTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/CopySwiftPackageResourcesTaskProducer.swift
@@ -29,10 +29,12 @@ final class CopySwiftPackageResourcesTaskProducer: PhasedTaskProducer, TaskProdu
         //
         // FIXME: The latter feature here is rarely used, and not very flexible as any target which needs other copy phases won't be able to disable them selectively.
         let buildComponents = scope.evaluate(BuiltinMacros.BUILD_COMPONENTS)
-        guard buildComponents.contains("build")
+        guard
+            buildComponents.contains("build")
                 || buildComponents.contains("installLoc")
                 || (buildComponents.contains("api") && scope.evaluate(BuiltinMacros.INSTALLAPI_COPY_PHASE))
-                || (buildComponents.contains("headers") && scope.evaluate(BuiltinMacros.INSTALLHDRS_COPY_PHASE)) else {
+                || (buildComponents.contains("headers") && scope.evaluate(BuiltinMacros.INSTALLHDRS_COPY_PHASE))
+        else {
             return []
         }
 
diff --git a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/CustomTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/CustomTaskProducer.swift
index 823ca369..42cc1949 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/CustomTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/CustomTaskProducer.swift
@@ -79,7 +79,8 @@ final class CustomTaskProducer: PhasedTaskProducer, TaskProducer {
                     execDescription: context.settings.globalScope.evaluate(customTask.executionDescription),
                     preparesForIndexing: customTask.preparesForIndexing,
                     enableSandboxing: customTask.enableSandboxing,
-                    showEnvironment: true)
+                    showEnvironment: true
+                )
             }
         }
 
diff --git a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/GenerateAppPlaygroundAssetCatalogTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/GenerateAppPlaygroundAssetCatalogTaskProducer.swift
index 3d6ec042..be3617cd 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/GenerateAppPlaygroundAssetCatalogTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/GenerateAppPlaygroundAssetCatalogTaskProducer.swift
@@ -19,8 +19,9 @@ extension BuildPhaseTarget {
         let buildFilesProcessingContext = BuildFilesProcessingContext(scope)
         return buildFiles.compactMap { buildFile in
             guard let resolvedBuildFileInfo = try? context.resolveBuildFileReference(buildFile),
-                  !buildFilesProcessingContext.isExcluded(resolvedBuildFileInfo.absolutePath, filters: buildFile.platformFilters),
-                  resolvedBuildFileInfo.fileType.conformsTo(fileType) else {
+                !buildFilesProcessingContext.isExcluded(resolvedBuildFileInfo.absolutePath, filters: buildFile.platformFilters),
+                resolvedBuildFileInfo.fileType.conformsTo(fileType)
+            else {
                 return nil
             }
 
@@ -42,18 +43,18 @@ final class GenerateAppPlaygroundAssetCatalogTaskProducer: PhasedTaskProducer, T
 
         if !scope.evaluate(BuiltinMacros.APP_PLAYGROUND_GENERATE_ASSET_CATALOG) { return [] }
 
-        let assetCatalogsBeingBuilt = (context.configuredTarget?.target as? BuildPhaseTarget)?.assetCatalogsToBuild(
-            context: context,
-            scope: scope
-        ) ?? []
+        let assetCatalogsBeingBuilt =
+            (context.configuredTarget?.target as? BuildPhaseTarget)?.assetCatalogsToBuild(
+                context: context,
+                scope: scope
+            ) ?? []
 
         let assetCatalogToBeGenerated = scope.evaluate(BuiltinMacros.APP_PLAYGROUND_GENERATED_ASSET_CATALOG_FILE)
 
         let specialArgs: [String]
         if !assetCatalogsBeingBuilt.isEmpty {
             specialArgs = ["-assetCatalogResourcePaths"] + assetCatalogsBeingBuilt.map { $0.absolutePath.str }
-        }
-        else {
+        } else {
             specialArgs = []
         }
 
diff --git a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/HeadermapTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/HeadermapTaskProducer.swift
index 06e81ce1..1f6ce34a 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/HeadermapTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/HeadermapTaskProducer.swift
@@ -19,7 +19,7 @@ final class HeadermapTaskProducer: PhasedTaskProducer, TaskProducer {
         return .immediate
     }
 
-    func generateTasks() async -> [any PlannedTask]     {
+    func generateTasks() async -> [any PlannedTask] {
         let scope = context.settings.globalScope
 
         // Headermaps are generated only when the "build" or when "api" component is present.
@@ -165,7 +165,6 @@ final class HeadermapTaskProducer: PhasedTaskProducer, TaskProducer {
         return (hmap, diagnostics)
     }
 
-
     /// Construct the headermap for the "own target headers" separate headermap.
     ///
     /// This headermap is used to ensure that a targets own headers are always found first, and that they can be found via any angle bracket style ('<Header.h>' or '<Target/Header.h>'). It is also used to make available the target's "project headers" via bracket style includes. The *intent* (judgement aside) was that this allowed projects to change headers from internal (Swift sense) to public without needing to update source code.
@@ -373,7 +372,6 @@ final class HeadermapTaskProducer: PhasedTaskProducer, TaskProducer {
 
 }
 
-
 /// Performance testing entry point to headermap construction.
 package func perfTestHeadermapProducer(planRequest: BuildPlanRequest, delegate: any TaskPlanningDelegate) async -> [String: [any PlannedTask]] {
     let targetTaskInfo = TargetGateNodes(startNode: MakePlannedPathNode(Path("a")), endNode: MakePlannedPathNode(Path("b")), unsignedProductReadyNode: MakePlannedPathNode(Path("c")), willSignNode: MakePlannedPathNode(Path("d")))
@@ -382,14 +380,14 @@ package func perfTestHeadermapProducer(planRequest: BuildPlanRequest, delegate:
     for configuredTarget in planRequest.buildGraph.allTargets {
         let context = TargetTaskProducerContext(configuredTarget: configuredTarget, workspaceContext: planRequest.workspaceContext, targetTaskInfo: targetTaskInfo, globalProductPlan: globalProductPlan, delegate: delegate)
         let headermapProducer = HeadermapTaskProducer(context, phaseStartNodes: [context.createVirtualNode("headermap-start")], phaseEndNode: context.createVirtualNode("headermap-end"))
-        let tasks = await headermapProducer.generateTasks().map { $0 } + context.takeDeferredProducers().flatMap{ await $0() }
+        let tasks = await headermapProducer.generateTasks().map { $0 } + context.takeDeferredProducers().flatMap { await $0() }
         result[configuredTarget.target.name] = tasks
     }
     return result
 }
 
 extension Sequence {
-    fileprivate func flatMap<SegmentOfResult>(_ transform: (Self.Element) async throws -> SegmentOfResult) async rethrows -> [SegmentOfResult.Element] where SegmentOfResult : Sequence {
+    fileprivate func flatMap<SegmentOfResult>(_ transform: (Self.Element) async throws -> SegmentOfResult) async rethrows -> [SegmentOfResult.Element] where SegmentOfResult: Sequence {
         var result: [SegmentOfResult.Element] = []
         for element in self {
             try await result.append(contentsOf: transform(element))
diff --git a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/InfoPlistTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/InfoPlistTaskProducer.swift
index 4e2c8a49..b659e93b 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/InfoPlistTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/InfoPlistTaskProducer.swift
@@ -34,15 +34,11 @@ final class InfoPlistTaskProducer: PhasedTaskProducer, TaskProducer {
     }
 }
 
-
 // MARK: Product Type Extensions
 
-
-private extension ProductTypeSpec
-{
+private extension ProductTypeSpec {
     /// Add the Info.plist tasks required by the product.
-    func addInfoPlistTasks(_ producer: StandardTaskProducer, _ scope: MacroEvaluationScope, _ tasks: inout [any PlannedTask]) async
-    {
+    func addInfoPlistTasks(_ producer: StandardTaskProducer, _ scope: MacroEvaluationScope, _ tasks: inout [any PlannedTask]) async {
         // FIXME: We cannot yet use inheritance based mechanisms to implement this.
         switch self
         {
@@ -106,10 +102,8 @@ private extension ProductTypeSpec
     }
 }
 
-private extension BundleProductTypeSpec
-{
-    func archForUIRequiredDeviceCapabilities(_ scope: MacroEvaluationScope) -> String?
-    {
+private extension BundleProductTypeSpec {
+    func archForUIRequiredDeviceCapabilities(_ scope: MacroEvaluationScope) -> String? {
         // <rdar://problem/20364499> BUILD: Set appropriate build/Info.plist flags for apps building arm64 only
         // <rdar://problem/22810408> Xcode does not include UIRequiredDeviceCapabilities key in an extension of tvOS app
 
@@ -136,7 +130,7 @@ private extension BundleProductTypeSpec
         case "appletvos":
             let validIdentifiers = Set([
                 "com.apple.product-type.application",
-                "com.apple.product-type.tv-app-extension"
+                "com.apple.product-type.tv-app-extension",
             ])
 
             return validIdentifiers.contains(identifier) ? requiredArch : nil
@@ -145,8 +139,7 @@ private extension BundleProductTypeSpec
         }
     }
 
-    func addBundleInfoPlistTasks(_ producer: StandardTaskProducer, _ scope: MacroEvaluationScope, _ tasks: inout [any PlannedTask]) async
-    {
+    func addBundleInfoPlistTasks(_ producer: StandardTaskProducer, _ scope: MacroEvaluationScope, _ tasks: inout [any PlannedTask]) async {
         let context = producer.context
 
         let buildComponents = scope.evaluate(BuiltinMacros.BUILD_COMPONENTS)
@@ -173,7 +166,7 @@ private extension BundleProductTypeSpec
             let targetBuildDirPkginfoPath: Path?
             if scope.evaluate(BuiltinMacros.GENERATE_PKGINFO_FILE) && !pkginfoPath.isEmpty && !scope.evaluate(BuiltinMacros.BUILD_COMPONENTS).contains("installLoc") {
                 targetBuildDirPkginfoPath = targetBuildDir.join(pkginfoPath)
-            }  else {
+            } else {
                 targetBuildDirPkginfoPath = nil
             }
 
@@ -226,42 +219,34 @@ private extension BundleProductTypeSpec
     }
 }
 
-
-private extension ToolProductTypeSpec
-{
-    func addToolInfoPlistTasks(_ producer: StandardTaskProducer, _ scope: MacroEvaluationScope, _ tasks: inout [any PlannedTask]) async
-    {
+private extension ToolProductTypeSpec {
+    func addToolInfoPlistTasks(_ producer: StandardTaskProducer, _ scope: MacroEvaluationScope, _ tasks: inout [any PlannedTask]) async {
         let context = producer.context
 
         // Only add Info.plist tasks when building.
         guard scope.evaluate(BuiltinMacros.BUILD_COMPONENTS).contains("build") else { return }
 
         // Check if we are creating an Info.plist section for a tool.
-        if scope.evaluate(BuiltinMacros.CREATE_INFOPLIST_SECTION_IN_BINARY)
-        {
+        if scope.evaluate(BuiltinMacros.CREATE_INFOPLIST_SECTION_IN_BINARY) {
             // Process the Info.plist file, if used.
             let infoplistFile = scope.effectiveInputInfoPlistPath()
             let infoplistPath = scope.evaluate(BuiltinMacros.INFOPLIST_PATH)
-            if !infoplistFile.isEmpty
-            {
+            if !infoplistFile.isEmpty {
                 let rawPlistPath = context.makeAbsolute(infoplistFile)
 
                 // Create the "empty.plist" file, if needed.
                 await addCreateEmptyInfoPlistTaskIfNeeded(producer, scope, &tasks)
 
                 // Create the processed output.  This is done per-variant-per-arch since there may be content in the source which varies based on those factors.  And each such slice of the final tool ends up with a separate final Info.plist embedded in it.
-                for variant in scope.evaluate(BuiltinMacros.BUILD_VARIANTS)
-                {
+                for variant in scope.evaluate(BuiltinMacros.BUILD_VARIANTS) {
                     let scope = scope.subscope(binding: BuiltinMacros.variantCondition, to: variant)
-                    for arch in scope.evaluate(BuiltinMacros.ARCHS)
-                    {
+                    for arch in scope.evaluate(BuiltinMacros.ARCHS) {
                         let scope = scope.subscopeBindingArchAndTriple(arch: arch)
 
                         // Preprocess the file, if requested.
                         let preprocessedPlistPath = await addInfoPlistPreprocessTaskIfNeeded(rawPlistPath, basename: infoplistPath.basename, producer, scope, &tasks) ?? rawPlistPath
 
-                        await producer.appendGeneratedTasks(&tasks)
-                        { delegate in
+                        await producer.appendGeneratedTasks(&tasks) { delegate in
                             await context.infoPlistSpec.constructInfoPlistTasks(CommandBuildContext(producer: context, scope: scope, inputs: [FileToBuild(context: context, absolutePath: preprocessedPlistPath)], output: scope.evaluate(BuiltinMacros.PROCESSED_INFOPLIST_PATH)), delegate)
                         }
                     }
diff --git a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ModuleMapTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ModuleMapTaskProducer.swift
index 26124e5c..ff9b2cc8 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ModuleMapTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ModuleMapTaskProducer.swift
@@ -162,7 +162,7 @@ final class ModuleMapTaskProducer: PhasedTaskProducer, TaskProducer {
     }
 
     @discardableResult
-    override func appendGeneratedTasks( _ tasks: inout [any PlannedTask], options: TaskOrderingOptions? = nil, body: (any TaskGenerationDelegate) async -> Void) async -> (tasks: [any PlannedTask], outputs: [FileToBuild]) {
+    override func appendGeneratedTasks(_ tasks: inout [any PlannedTask], options: TaskOrderingOptions? = nil, body: (any TaskGenerationDelegate) async -> Void) async -> (tasks: [any PlannedTask], outputs: [FileToBuild]) {
         return await super.appendGeneratedTasks(&tasks, options: options) { delegate in
             //
             await body(ModuleMapPhaseBasedTaskGenerationDelegate(delegate: delegate, copyHeadersCompletionTasks: copyHeadersCompletionTasks))
@@ -202,7 +202,7 @@ final class ModuleMapTaskProducer: PhasedTaskProducer, TaskProducer {
                     let moduleMapExtensionPath = moduleMapTmpPath.appendingFileNameSuffix("-swiftextension")
                     let moduleMapExtensionFile = FileToBuild(context: context, absolutePath: context.makeAbsolute(moduleMapExtensionPath))
                     await appendGeneratedTasks(&tasks) { delegate in
-                        context.writeFileSpec.constructFileTasks(CommandBuildContext(producer: context, scope: scope, inputs: [], output: moduleMapExtensionPath), delegate, contents: moduleMapExtension, permissions: nil, preparesForIndexing: true, additionalTaskOrderingOptions:  [.immediate, .ignorePhaseOrdering])
+                        context.writeFileSpec.constructFileTasks(CommandBuildContext(producer: context, scope: scope, inputs: [], output: moduleMapExtensionPath), delegate, contents: moduleMapExtension, permissions: nil, preparesForIndexing: true, additionalTaskOrderingOptions: [.immediate, .ignorePhaseOrdering])
                         if unifdef {
                             let originalModuleMapPath = moduleMapTmpPath.appendingFileNameSuffix("-original")
                             await context.unifdefSpec.constructTasks(CommandBuildContext(producer: context, scope: scope, inputs: [moduleMapSourceFile], output: originalModuleMapPath), delegate)
@@ -392,7 +392,7 @@ final class ModuleMapTaskProducer: PhasedTaskProducer, TaskProducer {
             let moduleName = scope.evaluate(BuiltinMacros.PRODUCT_MODULE_NAME)
 
             let interfaceHeaderName = scope.evaluate(BuiltinMacros.SWIFT_OBJC_INTERFACE_HEADER_NAME)
-            assert(!interfaceHeaderName.isEmpty) // implied by exportsSwiftObjCAPI
+            assert(!interfaceHeaderName.isEmpty)  // implied by exportsSwiftObjCAPI
 
             // Swift only module map contents is a top level framework module. Swift contents
             // for a mixed module map is a submodule of the top level framework module (whose
@@ -418,7 +418,7 @@ final class ModuleMapTaskProducer: PhasedTaskProducer, TaskProducer {
         let moduleName = scope.evaluate(BuiltinMacros.PRODUCT_MODULE_NAME)
 
         let interfaceHeaderName = scope.evaluate(BuiltinMacros.SWIFT_OBJC_INTERFACE_HEADER_NAME)
-        assert(!interfaceHeaderName.isEmpty) // implied by exportsSwiftObjCAPI
+        assert(!interfaceHeaderName.isEmpty)  // implied by exportsSwiftObjCAPI
 
         outputStream <<< "\n"
         outputStream <<< "module \(try moduleName.asModuleIdentifierString()).__Swift {\n"
diff --git a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ModuleVerifierTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ModuleVerifierTaskProducer.swift
index 82628e96..ce612f1e 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ModuleVerifierTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ModuleVerifierTaskProducer.swift
@@ -129,8 +129,9 @@ final class ModuleVerifierTaskProducer: PhasedTaskProducer, TaskProducer {
         var fallbackToExternal = false
         var deferredTasks: [any PlannedTask] = []
         await self.appendGeneratedTasks(&deferredTasks, usePhasedOrdering: false, options: .compilation) { delegate in
-            let targetDiagnostics = ModuleVerifierTargetSet.verifyTargets(targets: targets, targetVariants: targetVariants)
-                                  + ModuleVerifierTargetSet.verifyLanguages(languages: languages, standards: languageStandards)
+            let targetDiagnostics =
+                ModuleVerifierTargetSet.verifyTargets(targets: targets, targetVariants: targetVariants)
+                + ModuleVerifierTargetSet.verifyLanguages(languages: languages, standards: languageStandards)
             var failed = false
             for diag in targetDiagnostics {
                 delegate.diagnosticsEngine.emit(diag)
@@ -167,7 +168,8 @@ final class ModuleVerifierTaskProducer: PhasedTaskProducer, TaskProducer {
                     main: outputPath.join("Test.\(fileExtension)"),
                     header: outputPath.join("Test.framework/Headers/Test.h"),
                     moduleMap: outputPath.join("Test.framework/Modules/module.modulemap"),
-                    dir: outputPath)
+                    dir: outputPath
+                )
                 inputsByLanguage[language] = outputs
                 let inputContext = CommandBuildContext(producer: self.context, scope: scope, inputs: inputs, commandOrderingInputs: commandOrderingInputs)
                 await self.context.clangModuleVerifierInputGeneratorSpec.constructTasks(inputContext, delegate, alwaysExecuteTask: alwaysExecuteTask, language: language.rawValue, mainOutput: outputs.main, headerOutput: outputs.header, moduleMapOutput: outputs.moduleMap)
@@ -251,7 +253,7 @@ final class ModuleVerifierTaskProducer: PhasedTaskProducer, TaskProducer {
         otherCFlags += otherVerifierFlags.drop(while: { $0 != "--" }).dropFirst()
         var otherCPlusPlusFlags = workspaceScope.evaluate(BuiltinMacros.OTHER_CPLUSPLUSFLAGS)
         otherCPlusPlusFlags += [
-            "-fcxx-modules",
+            "-fcxx-modules"
         ]
         otherCPlusPlusFlags += otherCFlags
 
@@ -295,7 +297,7 @@ final class ModuleVerifierTaskProducer: PhasedTaskProducer, TaskProducer {
         passthrough(BuiltinMacros.CLANG_ENABLE_COMPILE_CACHE)
         passthrough(BuiltinMacros.COMPILATION_CACHE_CAS_PATH)
         passthrough(BuiltinMacros.SDK_STAT_CACHE_PATH)
-        passthrough(BuiltinMacros.INDEX_ENABLE_BUILD_ARENA) // Needed by clang explicit modules
+        passthrough(BuiltinMacros.INDEX_ENABLE_BUILD_ARENA)  // Needed by clang explicit modules
         passthrough(BuiltinMacros.CLANG_EXPLICIT_MODULES_OUTPUT_PATH)
         passthrough(BuiltinMacros.CLANG_USE_RESPONSE_FILE)
         table.push(BuiltinMacros.CLANG_MODULE_LSV, literal: enableLSV)
@@ -311,13 +313,14 @@ final class ModuleVerifierTaskProducer: PhasedTaskProducer, TaskProducer {
         let buildScope = MacroEvaluationScope(table: table)
 
         let buildInputs = [
-            FileToBuild(context: self.context, absolutePath: inputs.main),
-        ]
-        let buildOrderingInputs = commandOrderingInputs + [
-            delegate.createNode(fileNameMapPath),
-            delegate.createNode(inputs.header),
-            delegate.createNode(inputs.moduleMap),
+            FileToBuild(context: self.context, absolutePath: inputs.main)
         ]
+        let buildOrderingInputs =
+            commandOrderingInputs + [
+                delegate.createNode(fileNameMapPath),
+                delegate.createNode(inputs.header),
+                delegate.createNode(inputs.moduleMap),
+            ]
         let buildContext = CommandBuildContext(producer: self.context, scope: buildScope, inputs: buildInputs, commandOrderingInputs: buildOrderingInputs)
 
         await self.context.clangModuleVerifierSpec.constructTasks(buildContext, delegate)
@@ -419,9 +422,11 @@ final class ModuleVerifierTaskProducer: PhasedTaskProducer, TaskProducer {
 
         let specRegistry = context.workspaceContext.core.specRegistry
         let headerFileTypes = specRegistry.headerFileTypes
-        let moduleAffectingCombinations = [(BuiltinMacros.PUBLIC_HEADERS_FOLDER_PATH, headerFileTypes),
-                                           (BuiltinMacros.PRIVATE_HEADERS_FOLDER_PATH, headerFileTypes),
-                                           (BuiltinMacros.MODULES_FOLDER_PATH, [specRegistry.modulemapFileType])]
+        let moduleAffectingCombinations = [
+            (BuiltinMacros.PUBLIC_HEADERS_FOLDER_PATH, headerFileTypes),
+            (BuiltinMacros.PRIVATE_HEADERS_FOLDER_PATH, headerFileTypes),
+            (BuiltinMacros.MODULES_FOLDER_PATH, [specRegistry.modulemapFileType]),
+        ]
         for (macro, fileTypes) in moduleAffectingCombinations {
             for rootDirectory in rootDirectories {
                 addPaths(for: macro, joinedTo: rootDirectory, fileTypes: fileTypes)
diff --git a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ProductPostprocessingTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ProductPostprocessingTaskProducer.swift
index 8fbddd3c..a95b2bf3 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ProductPostprocessingTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ProductPostprocessingTaskProducer.swift
@@ -163,7 +163,6 @@ final class ProductPostprocessingTaskProducer: PhasedTaskProducer, TaskProducer
         return tasks
     }
 
-
     // MARK: Copy aside
 
     /// Creates a task to copy aside the symboled product to the SYMROOT during an install build.
@@ -191,13 +190,11 @@ final class ProductPostprocessingTaskProducer: PhasedTaskProducer, TaskProducer
                 // Since a build might have multiple targets which generate the same product name, we want to avoid collisions when computing the destination here.  So for installed products we place them at their INSTALL_PATH relative to the SYMROOT, and for uninstalled products we place them at $(SYMROOT)/UninstalledProducts/$(PROJECT_NAME)/$(TARGET_NAME).
                 if scope.evaluate(BuiltinMacros.SKIP_INSTALL) || scope.evaluate(BuiltinMacros.INSTALL_PATH).isEmpty {
                     output = buildDir.join("UninstalledProducts").join(context.settings.project?.name).join(context.settings.target?.name).join(fullProductName)
-                }
-                else {
+                } else {
                     let installPath = scope.evaluate(Static { BuiltinMacros.namespace.parseString("$(INSTALL_PATH)$(TARGET_BUILD_SUBPATH)") })
-                    output = buildDir.join(installPath, preserveRoot:true).join(fullProductName)
+                    output = buildDir.join(installPath, preserveRoot: true).join(fullProductName)
                 }
-            }
-            else {
+            } else {
                 // Right now we use the old, flat layout until we can enable the hierarchical layout by default.
                 output = buildDir.join(fullProductName)
             }
@@ -207,7 +204,6 @@ final class ProductPostprocessingTaskProducer: PhasedTaskProducer, TaskProducer
         }
     }
 
-
     // MARK: Stripping
 
     private func addStripSymbolsTasks(_ scope: MacroEvaluationScope, _ tasks: inout [any PlannedTask]) {
@@ -372,7 +368,6 @@ final class ProductPostprocessingTaskProducer: PhasedTaskProducer, TaskProducer
         }
     }
 
-
     // MARK: Code signing
 
     /// Returns a list of files to sign for the current product.
@@ -560,7 +555,6 @@ final class ProductPostprocessingTaskProducer: PhasedTaskProducer, TaskProducer
     }
 }
 
-
 // MARK: Product Type Extensions
 
 extension ProductTypeSpec {
@@ -724,7 +718,7 @@ private extension ProductTypeSpec {
                     // FIXME: headerDestPaths should only be used for framework targets when determining outputPath
                     // until rdar://81762676 (Dylib targets inconsistently writes headers to BUILD_PRODUCTS_DIR
                     // based install vs normal build) has been resolved.
-                    let outputPath : Path
+                    let outputPath: Path
                     let tapiVisibility: TAPIFileList.HeaderVisibility
                     switch visibility {
                     case .public?:
@@ -774,17 +768,24 @@ private extension ProductTypeSpec {
             postProcessingProducer.uniqueAuxiliaryFilePaths.insert(jsonPath)
         }
 
-
         return jsonPath
     }
 }
 
 /// Adds the InstallAPI tasks that are common between framework and dylib targets.
 /// This function will determine if Swift and TAPI-based InstallAPI actions took place during the build.
-func addCommonInstallAPITasks(_ producer: PhasedTaskProducer, _ scope: MacroEvaluationScope, inputs: [FileToBuild],
-                              headerDependencyInputs: [any PlannedNode],
-                              tapiOutputNode: PlannedPathNode, tapiOrderingNode: PlannedVirtualNode, phaseStartNodes: [any PlannedNode],
-                              phaseEndTask: any PlannedTask, jsonPath: Path?, destination: InstallAPIDestination) async -> [any PlannedTask] {
+func addCommonInstallAPITasks(
+    _ producer: PhasedTaskProducer,
+    _ scope: MacroEvaluationScope,
+    inputs: [FileToBuild],
+    headerDependencyInputs: [any PlannedNode],
+    tapiOutputNode: PlannedPathNode,
+    tapiOrderingNode: PlannedVirtualNode,
+    phaseStartNodes: [any PlannedNode],
+    phaseEndTask: any PlannedTask,
+    jsonPath: Path?,
+    destination: InstallAPIDestination
+) async -> [any PlannedTask] {
     let buildComponents = scope.evaluate(BuiltinMacros.BUILD_COMPONENTS)
     var dependencyInputs = headerDependencyInputs
     // Only add dSYM dependency iff this the task is installAPI verification.
@@ -792,7 +793,7 @@ func addCommonInstallAPITasks(_ producer: PhasedTaskProducer, _ scope: MacroEval
     if buildComponents.contains("build") && !(destination == .eagerLinkingTBDDir) && tapiReadDSYM {
         let dsymBundle = scope.evaluate(BuiltinMacros.DWARF_DSYM_FOLDER_PATH)
             .join(scope.evaluate(BuiltinMacros.DWARF_DSYM_FILE_NAME))
-        dependencyInputs.append(producer.context.createDirectoryTreeNode(dsymBundle, excluding:[""]))
+        dependencyInputs.append(producer.context.createDirectoryTreeNode(dsymBundle, excluding: [""]))
     }
 
     let variant = scope.evaluate(BuiltinMacros.CURRENT_VARIANT)
@@ -861,7 +862,8 @@ private extension FrameworkProductTypeSpec {
         if !scope.evaluate(BuiltinMacros.SUPPORTS_TEXT_BASED_API) && !producer.targetContext.supportsEagerLinking(scope: scope) {
             // If the target has no installed headers, it is not an error for it not to support InstallAPI.
             guard let targetInfo = targetHeaderInfo,
-                  !targetInfo.publicHeaders.isEmpty || !targetInfo.privateHeaders.isEmpty else {
+                !targetInfo.publicHeaders.isEmpty || !targetInfo.privateHeaders.isEmpty
+            else {
                 return
             }
 
@@ -898,7 +900,7 @@ private extension FrameworkProductTypeSpec {
         let tapiInputNode = producer.context.createNode(scope.evaluate(BuiltinMacros.TARGET_BUILD_DIR).join(scope.evaluate(BuiltinMacros.WRAPPER_NAME)))
 
         guard let jsonPath = await addFileListInstallAPITasks(targetHeaderInfo, true, producer, tapiInfo: tapiInfo, scope, &tasks, &tapiInputNodes) else {
-            return // we've already emitted an error
+            return  // we've already emitted an error
         }
 
         // NOTE: These must be captured here; they are mutable and used to define the task order gating.
@@ -908,8 +910,18 @@ private extension FrameworkProductTypeSpec {
         producer.context.addDeferredProducer {
             let inputs = [FileToBuild(context: producer.context, absolutePath: tapiInputNode.path)]
 
-            return await addCommonInstallAPITasks(producer, scope, inputs: inputs, headerDependencyInputs: tapiInputNodes, tapiOutputNode: tapiOutputNode, tapiOrderingNode: tapiOrderingNode,
-                                            phaseStartNodes: phaseStartNodes, phaseEndTask: phaseEndTask, jsonPath: jsonPath, destination: destination)
+            return await addCommonInstallAPITasks(
+                producer,
+                scope,
+                inputs: inputs,
+                headerDependencyInputs: tapiInputNodes,
+                tapiOutputNode: tapiOutputNode,
+                tapiOrderingNode: tapiOrderingNode,
+                phaseStartNodes: phaseStartNodes,
+                phaseEndTask: phaseEndTask,
+                jsonPath: jsonPath,
+                destination: destination
+            )
         }
     }
 
@@ -982,7 +994,8 @@ private extension LibraryProductTypeSpec {
         if !scope.evaluate(BuiltinMacros.SUPPORTS_TEXT_BASED_API) && !producer.targetContext.supportsEagerLinking(scope: scope) {
             // If the target has no installed headers, it is not an error for it not to support InstallAPI.
             guard let targetHeaderInfo = targetHeaderInfo,
-                  !targetHeaderInfo.publicHeaders.isEmpty || !targetHeaderInfo.privateHeaders.isEmpty else {
+                !targetHeaderInfo.publicHeaders.isEmpty || !targetHeaderInfo.privateHeaders.isEmpty
+            else {
                 return
             }
 
@@ -1015,7 +1028,7 @@ private extension LibraryProductTypeSpec {
         var tapiInputNodes = [any PlannedNode]()
 
         guard let jsonPath = await addFileListInstallAPITasks(targetHeaderInfo, false, producer, tapiInfo: tapiInfo, scope, &tasks, &tapiInputNodes) else {
-            return // we've already emitted an error
+            return  // we've already emitted an error
         }
 
         // NOTE: These must be captured here; they are mutable and used to define the task order gating.
@@ -1023,8 +1036,18 @@ private extension LibraryProductTypeSpec {
         let phaseEndTask = producer.phaseEndTask
 
         producer.context.addDeferredProducer {
-            return await addCommonInstallAPITasks(producer, scope, inputs: [], headerDependencyInputs: tapiInputNodes, tapiOutputNode: tapiOutputNode, tapiOrderingNode: tapiOrderingNode,
-                                            phaseStartNodes: phaseStartNodes, phaseEndTask: phaseEndTask, jsonPath: jsonPath, destination: destination)
+            return await addCommonInstallAPITasks(
+                producer,
+                scope,
+                inputs: [],
+                headerDependencyInputs: tapiInputNodes,
+                tapiOutputNode: tapiOutputNode,
+                tapiOrderingNode: tapiOrderingNode,
+                phaseStartNodes: phaseStartNodes,
+                phaseEndTask: phaseEndTask,
+                jsonPath: jsonPath,
+                destination: destination
+            )
         }
     }
 
diff --git a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ProductStructureTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ProductStructureTaskProducer.swift
index 633ae43f..d5edc113 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ProductStructureTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ProductStructureTaskProducer.swift
@@ -19,8 +19,7 @@ final class ProductStructureTaskProducer: PhasedTaskProducer, TaskProducer {
         return .immediate
     }
 
-    func generateTasks() async -> [any PlannedTask]
-    {
+    func generateTasks() async -> [any PlannedTask] {
         var tasks = [any PlannedTask]()
         let settings = context.settings
         let scope = settings.globalScope
@@ -31,8 +30,7 @@ final class ProductStructureTaskProducer: PhasedTaskProducer, TaskProducer {
         // Generate tasks to create directories defining the product structure.
         let targetBuildDir = self.context.settings.globalScope.evaluate(BuiltinMacros.TARGET_BUILD_DIR)
         var outputPaths = Set<Path>()
-        for directory in PackageTypeSpec.productStructureDirectories
-        {
+        for directory in PackageTypeSpec.productStructureDirectories {
             let buildSetting = directory.buildSetting
             let subDir = context.settings.globalScope.evaluate(buildSetting)
 
@@ -67,9 +65,9 @@ final class ProductStructureTaskProducer: PhasedTaskProducer, TaskProducer {
         if !scope.evaluate(BuiltinMacros.BUILD_COMPONENTS).contains("installLoc") {
 
             // Generate tasks to create symbolic links in the product structure.
-            for descriptor in productType.productStructureSymlinkDescriptors(scope)
-            {
-                let destinationPath = descriptor.toPath.isAbsolute
+            for descriptor in productType.productStructureSymlinkDescriptors(scope) {
+                let destinationPath =
+                    descriptor.toPath.isAbsolute
                     ? descriptor.toPath
                     : descriptor.location.dirname.join(descriptor.effectiveToPath ?? descriptor.toPath).normalize()
 
@@ -105,15 +103,11 @@ final class ProductStructureTaskProducer: PhasedTaskProducer, TaskProducer {
 
 }
 
-
 // MARK: Product Type Extensions
 
-
-private extension ProductTypeSpec
-{
+private extension ProductTypeSpec {
     /// Create the tasks to make the symlinks to the products in the `BUILT_PRODUCTS_DIR`, if appropriate.
-    func addBuiltProductsDirSymlinkTasks(_ producer: StandardTaskProducer, _ settings: Settings, _ tasks: inout [any PlannedTask]) async
-    {
+    func addBuiltProductsDirSymlinkTasks(_ producer: StandardTaskProducer, _ settings: Settings, _ tasks: inout [any PlannedTask]) async {
         let scope = settings.globalScope
 
         // Only create symlink tasks when using deployment locations.
@@ -131,42 +125,33 @@ private extension ProductTypeSpec
             if let asXCTestBundle = self as? XCTestBundleProductTypeSpec {
                 await asXCTestBundle.addXCTestBundleBuiltProductsDirSymlinkTasks(producer, scope, &tasks)
             }
-        }
-        else if let asDynamicLibrary = self as? DynamicLibraryProductTypeSpec {
+        } else if let asDynamicLibrary = self as? DynamicLibraryProductTypeSpec {
             await asDynamicLibrary.addDynamicLibraryBuiltProductsDirSymlinkTasks(producer, settings, &tasks)
-        }
-        else if let asStandalone = self as? StandaloneExecutableProductTypeSpec {
+        } else if let asStandalone = self as? StandaloneExecutableProductTypeSpec {
             await asStandalone.addStandaloneExecutableBuiltProductsDirSymlinkTasks(producer, scope, &tasks)
-        }
-        else {
+        } else {
             fatalError("unknown product type: \(self)")
         }
     }
 }
 
-private extension BundleProductTypeSpec
-{
+private extension BundleProductTypeSpec {
     /// Create the task to make the symlink to the product in the `BUILT_PRODUCTS_DIR`, if appropriate.
-    func addBundleBuiltProductsDirSymlinkTasks(_ producer: StandardTaskProducer, _ scope: MacroEvaluationScope, _ tasks: inout [any PlannedTask]) async
-    {
+    func addBundleBuiltProductsDirSymlinkTasks(_ producer: StandardTaskProducer, _ scope: MacroEvaluationScope, _ tasks: inout [any PlannedTask]) async {
         let context = producer.context
         // FIXME: This is in essence the same logic as for standalone products except for using WRAPPER_NAME, just diverged because the variants are top-level for them. We should reconcile, maybe by introducing a generic notion for "why" this is different.
         let targetWrapper = scope.evaluate(BuiltinMacros.TARGET_BUILD_DIR).join(scope.evaluate(BuiltinMacros.WRAPPER_NAME))
         let builtWrapper = scope.evaluate(BuiltinMacros.BUILT_PRODUCTS_DIR).join(scope.evaluate(BuiltinMacros.WRAPPER_NAME))
 
-        await producer.appendGeneratedTasks(&tasks)
-        { delegate in
+        await producer.appendGeneratedTasks(&tasks) { delegate in
             context.symlinkSpec.constructSymlinkTask(CommandBuildContext(producer: context, scope: scope, inputs: [], output: builtWrapper, preparesForIndexing: true), delegate, toPath: targetWrapper, makeRelative: true, repairViaOwnershipAnalysis: true)
         }
     }
 }
 
-
-private extension DynamicLibraryProductTypeSpec
-{
+private extension DynamicLibraryProductTypeSpec {
     /// Create the tasks to make the symlink(s) to the dynamic library(s) in the `BUILT_PRODUCTS_DIR`, if appropriate.  There will be one such symlink per build variant.
-    func addDynamicLibraryBuiltProductsDirSymlinkTasks(_ producer: StandardTaskProducer, _ settings: Settings, _ tasks: inout [any PlannedTask]) async
-    {
+    func addDynamicLibraryBuiltProductsDirSymlinkTasks(_ producer: StandardTaskProducer, _ settings: Settings, _ tasks: inout [any PlannedTask]) async {
         let scope = settings.globalScope
 
         // Only add symlink tasks when building API or just building.
@@ -175,8 +160,9 @@ private extension DynamicLibraryProductTypeSpec
 
         let shouldUseInstallAPI = ProductPostprocessingTaskProducer.shouldUseInstallAPI(scope, settings)
         // Condensed from LibraryProductTypeSpec.addDynamicLibraryInstallAPITasks(:::::).
-        let willProduceTBD = (buildComponents.contains("api") || (addDynamicLibrarySymlinks && scope.evaluate(BuiltinMacros.TAPI_ENABLE_VERIFICATION_MODE)))
-                             && (scope.evaluate(BuiltinMacros.SUPPORTS_TEXT_BASED_API) || (((producer as? PhasedTaskProducer)?.targetContext.supportsEagerLinking(scope: scope)) ?? false))
+        let willProduceTBD =
+            (buildComponents.contains("api") || (addDynamicLibrarySymlinks && scope.evaluate(BuiltinMacros.TAPI_ENABLE_VERIFICATION_MODE)))
+            && (scope.evaluate(BuiltinMacros.SUPPORTS_TEXT_BASED_API) || (((producer as? PhasedTaskProducer)?.targetContext.supportsEagerLinking(scope: scope)) ?? false))
         // Only make a symlink for targets that use the default extension/suffix. Some projects have multiple dynamic libraries
         // with the same product name but different executable extensions. They all end up with the same TAPI_OUTPUT_PATH, and
         // there's no good way to resolve that, so only make symlinks for tbds that go with dylibs.
@@ -191,22 +177,18 @@ private extension DynamicLibraryProductTypeSpec
         }
 
         // Add a symlink per-variant.
-        for variant in scope.evaluate(BuiltinMacros.BUILD_VARIANTS)
-        {
-            if addTBDSymlinks
-            {
+        for variant in scope.evaluate(BuiltinMacros.BUILD_VARIANTS) {
+            if addTBDSymlinks {
                 await addDynamicLibraryTBDBuiltProductsDirSymlinkTasks(producer, scope, variant, &tasks)
             }
-            if addDynamicLibrarySymlinks
-            {
+            if addDynamicLibrarySymlinks {
                 await addStandaloneExecutableBuiltProductsDirSymlinkTasks(producer, scope, variant, &tasks)
             }
         }
     }
 
     /// Create the task to make the symlink to the TBD in the `BUILT_PRODUCTS_DIR` for a single build variant, if appropriate.
-    func addDynamicLibraryTBDBuiltProductsDirSymlinkTasks(_ producer: StandardTaskProducer, _ scope: MacroEvaluationScope, _ variant: String, _ tasks: inout [any PlannedTask]) async
-    {
+    func addDynamicLibraryTBDBuiltProductsDirSymlinkTasks(_ producer: StandardTaskProducer, _ scope: MacroEvaluationScope, _ variant: String, _ tasks: inout [any PlannedTask]) async {
         // Enter the per-variant scope.
         let scope = scope.subscope(binding: BuiltinMacros.variantCondition, to: variant)
 
@@ -217,18 +199,15 @@ private extension DynamicLibraryProductTypeSpec
         let relativeTargetWrapper = targetWrapper.relativeSubpath(from: scope.evaluate(BuiltinMacros.TARGET_BUILD_DIR))
         let builtWrapper = scope.evaluate(BuiltinMacros.BUILT_PRODUCTS_DIR).join(relativeTargetWrapper)
 
-        await producer.appendGeneratedTasks(&tasks)
-        { delegate in
+        await producer.appendGeneratedTasks(&tasks) { delegate in
             context.symlinkSpec.constructSymlinkTask(CommandBuildContext(producer: context, scope: scope, inputs: [], output: builtWrapper, preparesForIndexing: true), delegate, toPath: targetWrapper, makeRelative: true, repairViaOwnershipAnalysis: false)
         }
     }
 }
 
-private extension StandaloneExecutableProductTypeSpec
-{
+private extension StandaloneExecutableProductTypeSpec {
     /// Create the tasks to make the symlink(s) to the product(s) in the `BUILT_PRODUCTS_DIR`, if appropriate.  There will be one such symlink per build variant.
-    func addStandaloneExecutableBuiltProductsDirSymlinkTasks(_ producer: StandardTaskProducer, _ scope: MacroEvaluationScope, _ tasks: inout [any PlannedTask]) async
-    {
+    func addStandaloneExecutableBuiltProductsDirSymlinkTasks(_ producer: StandardTaskProducer, _ scope: MacroEvaluationScope, _ tasks: inout [any PlannedTask]) async {
         // Only add symlink tasks when building.
         guard scope.evaluate(BuiltinMacros.BUILD_COMPONENTS).contains("build") else { return }
 
@@ -238,15 +217,13 @@ private extension StandaloneExecutableProductTypeSpec
         }
 
         // Add a symlink per-variant.
-        for variant in scope.evaluate(BuiltinMacros.BUILD_VARIANTS)
-        {
+        for variant in scope.evaluate(BuiltinMacros.BUILD_VARIANTS) {
             await addStandaloneExecutableBuiltProductsDirSymlinkTasks(producer, scope, variant, &tasks)
         }
     }
 
     /// Create the task to make the symlink to the product in the `BUILT_PRODUCTS_DIR` for a single build variant, if appropriate.
-    func addStandaloneExecutableBuiltProductsDirSymlinkTasks(_ producer: StandardTaskProducer, _ scope: MacroEvaluationScope, _ variant: String, _ tasks: inout [any PlannedTask]) async
-    {
+    func addStandaloneExecutableBuiltProductsDirSymlinkTasks(_ producer: StandardTaskProducer, _ scope: MacroEvaluationScope, _ variant: String, _ tasks: inout [any PlannedTask]) async {
         // Enter the per-variant scope.
         let scope = scope.subscope(binding: BuiltinMacros.variantCondition, to: variant)
 
@@ -255,15 +232,13 @@ private extension StandaloneExecutableProductTypeSpec
         let targetWrapper = scope.evaluate(BuiltinMacros.TARGET_BUILD_DIR).join(scope.evaluate(BuiltinMacros.EXECUTABLE_PATH))
         let builtWrapper = scope.evaluate(BuiltinMacros.BUILT_PRODUCTS_DIR).join(scope.evaluate(BuiltinMacros.EXECUTABLE_PATH))
 
-        await producer.appendGeneratedTasks(&tasks)
-        { delegate in
+        await producer.appendGeneratedTasks(&tasks) { delegate in
             context.symlinkSpec.constructSymlinkTask(CommandBuildContext(producer: context, scope: scope, inputs: [], output: builtWrapper, preparesForIndexing: true), delegate, toPath: targetWrapper, makeRelative: true, repairViaOwnershipAnalysis: false)
         }
     }
 }
 
-private extension XCTestBundleProductTypeSpec
-{
+private extension XCTestBundleProductTypeSpec {
     func addXCTestBundleBuiltProductsDirSymlinkTasks(_ producer: StandardTaskProducer, _ scope: MacroEvaluationScope, _ tasks: inout [any PlannedTask]) async {
         let buildComponents = scope.evaluate(BuiltinMacros.BUILD_COMPONENTS)
 
@@ -276,8 +251,7 @@ private extension XCTestBundleProductTypeSpec
             let targetWrapper = scope.unmodifiedTargetBuildDir.join(scope.evaluate(BuiltinMacros.XCTRUNNER_PRODUCT_NAME))
             let builtWrapper = scope.evaluate(BuiltinMacros.BUILT_PRODUCTS_DIR).join(scope.evaluate(BuiltinMacros.XCTRUNNER_PRODUCT_NAME))
 
-            await producer.appendGeneratedTasks(&tasks)
-            { delegate in
+            await producer.appendGeneratedTasks(&tasks) { delegate in
                 context.symlinkSpec.constructSymlinkTask(CommandBuildContext(producer: context, scope: scope, inputs: [], output: builtWrapper, preparesForIndexing: true), delegate, toPath: targetWrapper, makeRelative: true, repairViaOwnershipAnalysis: true)
             }
         }
diff --git a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/SDKStatCacheTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/SDKStatCacheTaskProducer.swift
index 887b8419..0398d80d 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/SDKStatCacheTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/SDKStatCacheTaskProducer.swift
@@ -31,16 +31,23 @@ final class SDKStatCacheTaskProducer: StandardTaskProducer, TaskProducer {
             var toolPath: Path
         }
 
-        let cacheDescriptors = await Dictionary(targetContexts.asyncFilter {
-            await $0.shouldUseSDKStatCache()
-        }.map {
-            (CacheDescriptor(sdkRoot: $0.settings.globalScope.evaluate(BuiltinMacros.SDKROOT).str,
-                            cachePath: Path($0.settings.globalScope.evaluate(BuiltinMacros.SDK_STAT_CACHE_PATH)).normalize(),
-                            toolPath: $0.executableSearchPaths.lookup(Path("clang-stat-cache"))?.normalize() ?? Path("clang-stat-cache")),
-                            $0.settings.globalScope.evaluate(BuiltinMacros.SDK_STAT_CACHE_VERBOSE_LOGGING))
-        }, uniquingKeysWith: {
-            $0 || $1
-        })
+        let cacheDescriptors = await Dictionary(
+            targetContexts.asyncFilter {
+                await $0.shouldUseSDKStatCache()
+            }.map {
+                (
+                    CacheDescriptor(
+                        sdkRoot: $0.settings.globalScope.evaluate(BuiltinMacros.SDKROOT).str,
+                        cachePath: Path($0.settings.globalScope.evaluate(BuiltinMacros.SDK_STAT_CACHE_PATH)).normalize(),
+                        toolPath: $0.executableSearchPaths.lookup(Path("clang-stat-cache"))?.normalize() ?? Path("clang-stat-cache")
+                    ),
+                    $0.settings.globalScope.evaluate(BuiltinMacros.SDK_STAT_CACHE_VERBOSE_LOGGING)
+                )
+            },
+            uniquingKeysWith: {
+                $0 || $1
+            }
+        )
 
         await appendGeneratedTasks(&tasks) { delegate in
             for (cacheDescriptor, verbose) in cacheDescriptors {
diff --git a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/SanitizerTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/SanitizerTaskProducer.swift
index 0783e5de..8ee12993 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/SanitizerTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/SanitizerTaskProducer.swift
@@ -121,7 +121,7 @@ final class SanitizerTaskProducer: PhasedTaskProducer, TaskProducer {
 
         guard context.fs.exists(libraryPath) else {
             if sanitizer.errorForMissingLibrary(on: context.settings.platform) {
-                context.error("Unable to copy \(sanitizerName) Sanitizer library: Could not determine where it lives." )
+                context.error("Unable to copy \(sanitizerName) Sanitizer library: Could not determine where it lives.")
             }
             return
         }
diff --git a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/SwiftFrameworkABICheckerTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/SwiftFrameworkABICheckerTaskProducer.swift
index 6b52df82..82e6fc0e 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/SwiftFrameworkABICheckerTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/SwiftFrameworkABICheckerTaskProducer.swift
@@ -20,8 +20,7 @@ fileprivate func supportSwiftABIChecking(_ context: TaskProducerContext) -> Bool
     // swift-api-digester is run only when the "build" component is present.
     guard scope.evaluate(BuiltinMacros.BUILD_COMPONENTS).contains("build") else { return false }
 
-    guard scope.evaluate(BuiltinMacros.SWIFT_API_DIGESTER_MODE) == .api ||
-          (scope.evaluate(BuiltinMacros.SWIFT_EMIT_MODULE_INTERFACE) && scope.evaluate(BuiltinMacros.SWIFT_ENABLE_LIBRARY_EVOLUTION)) else {
+    guard scope.evaluate(BuiltinMacros.SWIFT_API_DIGESTER_MODE) == .api || (scope.evaluate(BuiltinMacros.SWIFT_EMIT_MODULE_INTERFACE) && scope.evaluate(BuiltinMacros.SWIFT_ENABLE_LIBRARY_EVOLUTION)) else {
         // BUILD_LIBRARY_FOR_DISTRIBUTION is the option clients should use (it's also what is exposed in the
         // Build Settings editor) and is what SWIFT_EMIT_MODULE_INTERFACE uses by default, but they are
         // configurable independently.
@@ -60,8 +59,7 @@ final class SwiftFrameworkABICheckerTaskProducer: PhasedTaskProducer, TaskProduc
         return .immediate
     }
 
-    func generateTasks() async -> [any PlannedTask]
-    {
+    func generateTasks() async -> [any PlannedTask] {
         var tasks = [any PlannedTask]()
         let scope = context.settings.globalScope
         // If running this tool is disabled via build setting, then we can abort this task provider.
diff --git a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/SwiftStandardLibrariesTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/SwiftStandardLibrariesTaskProducer.swift
index 1735c324..d9303f9d 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/SwiftStandardLibrariesTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/SwiftStandardLibrariesTaskProducer.swift
@@ -19,8 +19,7 @@ final class SwiftStandardLibrariesTaskProducer: PhasedTaskProducer, TaskProducer
         return [.immediate, .unsignedProductRequirement]
     }
 
-    func generateTasks() async -> [any PlannedTask]
-    {
+    func generateTasks() async -> [any PlannedTask] {
         var tasks = [any PlannedTask]()
         let scope = context.settings.globalScope
 
@@ -41,13 +40,11 @@ final class SwiftStandardLibrariesTaskProducer: PhasedTaskProducer, TaskProducer
         let buildingAnySwiftSourceFiles = (context.configuredTarget?.target as? BuildPhaseTarget)?.sourcesBuildPhase?.containsSwiftSources(context.workspaceContext.workspace, context, scope, context.filePathResolver) ?? false
 
         // Determine whether we want to embed swift libraries.
-        var shouldEmbedSwiftLibraries = (buildingAnySwiftSourceFiles  &&  productType.supportsEmbeddingSwiftStandardLibraries(producer: context))
+        var shouldEmbedSwiftLibraries = (buildingAnySwiftSourceFiles && productType.supportsEmbeddingSwiftStandardLibraries(producer: context))
         // If ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES then we will override our earlier reasoning if the product is a wrapper.
-        if !shouldEmbedSwiftLibraries  &&  scope.evaluate(BuiltinMacros.ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES)
-        {
+        if !shouldEmbedSwiftLibraries && scope.evaluate(BuiltinMacros.ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES) {
             // If the product is not a wrapper, then we emit a warning that we won't run the tool, and return.
-            guard productType.isWrapper else
-            {
+            guard productType.isWrapper else {
                 context.warning("Not running swift-stdlib-tool: ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES is enabled, but the product type '\(productType.identifier)' is not a wrapper type.")
                 return []
             }
@@ -55,8 +52,7 @@ final class SwiftStandardLibrariesTaskProducer: PhasedTaskProducer, TaskProducer
         }
 
         // Run the swift-stdlib-tool if we've determined that we should do so.
-        if shouldEmbedSwiftLibraries
-        {
+        if shouldEmbedSwiftLibraries {
             // Cache fo evaluated build settings we'll need multiple times.
             let targetBuildDir = scope.evaluate(BuiltinMacros.TARGET_BUILD_DIR)
 
@@ -71,22 +67,22 @@ final class SwiftStandardLibrariesTaskProducer: PhasedTaskProducer, TaskProducer
                 BuiltinMacros.SYSTEM_EXTENSIONS_FOLDER_PATH,
                 BuiltinMacros.EXTENSIONS_FOLDER_PATH,
             ]
-            foldersToScan.append(contentsOf: embeddedContentDirectoryMacros.compactMap { macro in
-                guard let subpath = scope.evaluate(macro).nilIfEmpty else {
-                    return nil
+            foldersToScan.append(
+                contentsOf: embeddedContentDirectoryMacros.compactMap { macro in
+                    guard let subpath = scope.evaluate(macro).nilIfEmpty else {
+                        return nil
+                    }
+                    return targetBuildDir.join(subpath).str
                 }
-                return targetBuildDir.join(subpath).str
-            })
+            )
 
             // Add explicit paths to any linked frameworks, even if they are not copied in to the product.
             //
             // This allows EMBEDDED_CONTENT_CONTAINS_SWIFT to be used for things like Objective-C unit test bundles which are testing Swift frameworks.
-            if let frameworksBuildPhase = (context.configuredTarget!.target as? BuildPhaseTarget)?.frameworksBuildPhase
-            {
+            if let frameworksBuildPhase = (context.configuredTarget!.target as? BuildPhaseTarget)?.frameworksBuildPhase {
                 for buildFile in frameworksBuildPhase.buildFiles where currentPlatformFilter.matches(buildFile.platformFilters) {
                     guard let (_, refPath, fileType) = try? context.resolveBuildFileReference(buildFile) else { continue }
-                    if refPath.isAbsolute  &&  fileType.conformsTo(context.getSpec("wrapper.framework") as! FileTypeSpec)
-                    {
+                    if refPath.isAbsolute && fileType.conformsTo(context.getSpec("wrapper.framework") as! FileTypeSpec) {
                         foldersToScan.append(refPath.str)
                     }
                 }
@@ -107,8 +103,8 @@ final class SwiftStandardLibrariesTaskProducer: PhasedTaskProducer, TaskProducer
             let supportsSpanNatively = context.platform?.supportsSwiftSpanNatively(scope, forceNextMajorVersion: false, considerTargetDeviceOSVersion: true)
             let backDeploySwiftSpan = supportsSpanNatively != nil && supportsSpanNatively != true
 
-            let cbc = CommandBuildContext(producer: context, scope: scope, inputs: [ input ])
-            let foldersToScanExpr: MacroStringListExpression? = foldersToScan.count > 0 ? scope.namespace.parseLiteralStringList(foldersToScan): nil
+            let cbc = CommandBuildContext(producer: context, scope: scope, inputs: [input])
+            let foldersToScanExpr: MacroStringListExpression? = foldersToScan.count > 0 ? scope.namespace.parseLiteralStringList(foldersToScan) : nil
             await appendGeneratedTasks(&tasks) { delegate in
                 await context.swiftStdlibToolSpec.constructSwiftStdLibraryToolTask(cbc, delegate, foldersToScan: foldersToScanExpr, filterForSwiftOS: filterForSwiftOS, backDeploySwiftConcurrency: backDeploySwiftConcurrency, backDeploySwiftSpan: backDeploySwiftSpan)
             }
diff --git a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/TAPISymbolExtractorTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/TAPISymbolExtractorTaskProducer.swift
index d823806e..c604e1f5 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/TAPISymbolExtractorTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/TAPISymbolExtractorTaskProducer.swift
@@ -177,12 +177,13 @@ final class TAPISymbolExtractorTaskProducer: PhasedTaskProducer, TaskProducer {
 
                 // If this header is among the target's header build files we check if it has any platform filters.
                 // If this header is generated then it won't have any platform filters.
-                let platformFilters = headerBuildFiles.filter({
-                    if let resolvedFile = try? producer.context.resolveBuildFileReference($0) {
-                        return resolvedFile.absolutePath == path
-                    }
-                    return false
-                }).only?.platformFilters ?? []
+                let platformFilters =
+                    headerBuildFiles.filter({
+                        if let resolvedFile = try? producer.context.resolveBuildFileReference($0) {
+                            return resolvedFile.absolutePath == path
+                        }
+                        return false
+                    }).only?.platformFilters ?? []
 
                 // Skip the header if it is excluded or filtered out.
                 guard !buildFilesContext.isExcluded(path, filters: platformFilters) else {
@@ -192,7 +193,7 @@ final class TAPISymbolExtractorTaskProducer: PhasedTaskProducer, TaskProducer {
                 // FIXME: headerDestPaths should only be used for framework targets when determining outputPath
                 // until rdar://81762676 (Dylib targets inconsistently writes headers to BUILD_PRODUCTS_DIR
                 // based install vs normal build) has been resolved.
-                let outputPath : Path
+                let outputPath: Path
                 switch visibility {
                 case .public:
                     outputPath = isFramework ? headerDestPaths.publicPath.join(path.basename) : TargetHeaderInfo.outputPath(for: path, visibility: .public, scope: scope)
@@ -211,7 +212,7 @@ final class TAPISymbolExtractorTaskProducer: PhasedTaskProducer, TaskProducer {
                 // without the truncation for the command ordering input nodes.
                 let inputNodePath: Path
                 if isFramework {
-                    let outputPathVisibility: HeaderVisibility = visibility == .public ? .public : .private // convert between two different visibility enums
+                    let outputPathVisibility: HeaderVisibility = visibility == .public ? .public : .private  // convert between two different visibility enums
                     inputNodePath = TargetHeaderInfo.outputPath(for: path, visibility: outputPathVisibility, scope: scope)
                 } else {
                     inputNodePath = outputPath
@@ -239,7 +240,7 @@ final class TAPISymbolExtractorTaskProducer: PhasedTaskProducer, TaskProducer {
                     }
                 }
             }
-            if headerVisibilityToProcess.contains(nil) { // project visible headers
+            if headerVisibilityToProcess.contains(nil) {  // project visible headers
                 for fileRef in documentationHeaderInfo.projectHeaders {
                     if let header = computeProductHeader(for: fileRef, isFramework: isFramework, visibility: .project, inputNodes: &inputNodes) {
                         headers.append(header)
@@ -265,7 +266,7 @@ final class TAPISymbolExtractorTaskProducer: PhasedTaskProducer, TaskProducer {
             // If the build system generates a module map, the umbrella header can be accessed via the module info. If there's an existing
             // module map file we need to parse the potential umbrella header information from that file instead.
             if let umbrellaHeaderName = findUmbrellaHeaderFromGeneratedModuleMap(moduleInfo) ?? findUmbrellaHeaderFromExistingModuleMap(moduleInfo),
-               let umbrellaHeaderIndex = headerList.firstIndex(where: { $0.visibility == .public && $0.path.basename == umbrellaHeaderName })
+                let umbrellaHeaderIndex = headerList.firstIndex(where: { $0.visibility == .public && $0.path.basename == umbrellaHeaderName })
             {
                 let umbrellaHeader = headerList.remove(at: umbrellaHeaderIndex)
                 headerList.insert(umbrellaHeader, at: 0)
diff --git a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/TargetOrderTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/TargetOrderTaskProducer.swift
index eba021d2..ecd15820 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/TargetOrderTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/TargetOrderTaskProducer.swift
@@ -207,11 +207,15 @@ final class TargetOrderTaskProducer: StandardTaskProducer, TaskProducer {
             inputs.append(contentsOf: context.globalProductPlan.xcframeworkContext.outputFiles(for: configuredTarget).map(context.createNode))
         }
 
-        return context.createGateTask(inputs, output: output, taskConfiguration: {
-            $0.forTarget = context.configuredTarget
-            $0.makeGate()
-            $0.targetDependencies = resolvedTargetDependencies
-        })
+        return context.createGateTask(
+            inputs,
+            output: output,
+            taskConfiguration: {
+                $0.forTarget = context.configuredTarget
+                $0.makeGate()
+                $0.targetDependencies = resolvedTargetDependencies
+            }
+        )
     }
 
     private var _allowEagerCompilation: Bool?
@@ -287,7 +291,7 @@ final class TargetOrderTaskProducer: StandardTaskProducer, TaskProducer {
         // The inputs are (the appropriate gate nodes from the lookup closure of) all of the targets the configuredTarget immediately depends on.  This is a superset of the dependencies, which are all of the immediate (explicit + implicit) targets the configuredTarget is declared to depend on.
         var inputs = [any PlannedNode]()
         let dependencies = context.globalProductPlan.resolvedDependencies(of: configuredTarget)
-        for dependency in dependencies  {
+        for dependency in dependencies {
             if dependency.target !== configuredTarget {
                 // FIXME: If lookup() returns nil here, doesn't this mean the two lists we return will be out-of-sync?  Is that bad?
                 if let input = lookup(dependency.target, configuredTarget) {
diff --git a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/XCTestProductTypeTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/XCTestProductTypeTaskProducer.swift
index 02ad1ea6..2dfcd116 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/XCTestProductTypeTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/XCTestProductTypeTaskProducer.swift
@@ -58,10 +58,8 @@ final class XCTestProductTaskProducer: PhasedTaskProducer, TaskProducer {
     }
 }
 
-
 // MARK:
 
-
 /// The `XCTestProductPostprocessingTaskProducer` generates postprocessing tasks specific the XCTest product type.  This producer's tasks involve assembling or modifying content outside of the test target's own product, often in an enclosing wrapper (the application being tested, or the test runner), so this producer is ordered after the test target's own postprocessing task producer.
 final class XCTestProductPostprocessingTaskProducer: PhasedTaskProducer, TaskProducer {
     func generateTasks() async -> [any PlannedTask] {
@@ -149,34 +147,40 @@ final class XCTestProductPostprocessingTaskProducer: PhasedTaskProducer, TaskPro
                     outputPath = testRunnerDstPath.join(subpath)
                     let orderingOutput = context.createVirtualNode("Preprocess \(outputPath.str)")
                     let cbc = CommandBuildContext(producer: context, scope: scope, inputs: [FileToBuild(absolutePath: inputPath, inferringTypeUsing: context)] + (infoPlistPath.map { [FileToBuild(context: context, absolutePath: $0)] } ?? []), output: outputPath, commandOrderingOutputs: [orderingOutput])
-                    await context.copyPlistSpec.constructTasks(cbc, delegate, specialArgs: [
-                        "--macro-expansion",
-                        "WRAPPEDPRODUCTNAME",
-                        scope.evaluate(BuiltinMacros.PRODUCT_NAME) + "-Runner",
-
-                        "--macro-expansion",
-                        "WRAPPEDPRODUCTBUNDLEIDENTIFIER",
-                        wrappedBundleIdentifier(for: scope.evaluate(BuiltinMacros.PRODUCT_BUNDLE_IDENTIFIER)),
-
-                        "--macro-expansion",
-                        "TESTPRODUCTNAME",
-                        scope.evaluate(BuiltinMacros.PRODUCT_NAME),
-
-                        "--macro-expansion",
-                        "TESTPRODUCTBUNDLEIDENTIFIER",
-                        scope.evaluate(BuiltinMacros.PRODUCT_BUNDLE_IDENTIFIER),
-                    ] + (infoPlistPath.map {
-                        ["--copy-value", "UIDeviceFamily", $0.str]
-                    } ?? []), toolLookup: { decl in
-                        switch decl {
-                        case BuiltinMacros.VALIDATE_PLIST_FILES_WHILE_COPYING:
-                            return scope.namespace.parseLiteralString("YES")
-                        case BuiltinMacros.PLIST_FILE_OUTPUT_FORMAT:
-                            return scope.namespace.parseLiteralString("XML")
-                        default:
-                            return nil
+                    await context.copyPlistSpec.constructTasks(
+                        cbc,
+                        delegate,
+                        specialArgs: [
+                            "--macro-expansion",
+                            "WRAPPEDPRODUCTNAME",
+                            scope.evaluate(BuiltinMacros.PRODUCT_NAME) + "-Runner",
+
+                            "--macro-expansion",
+                            "WRAPPEDPRODUCTBUNDLEIDENTIFIER",
+                            wrappedBundleIdentifier(for: scope.evaluate(BuiltinMacros.PRODUCT_BUNDLE_IDENTIFIER)),
+
+                            "--macro-expansion",
+                            "TESTPRODUCTNAME",
+                            scope.evaluate(BuiltinMacros.PRODUCT_NAME),
+
+                            "--macro-expansion",
+                            "TESTPRODUCTBUNDLEIDENTIFIER",
+                            scope.evaluate(BuiltinMacros.PRODUCT_BUNDLE_IDENTIFIER),
+                        ]
+                            + (infoPlistPath.map {
+                                ["--copy-value", "UIDeviceFamily", $0.str]
+                            } ?? []),
+                        toolLookup: { decl in
+                            switch decl {
+                            case BuiltinMacros.VALIDATE_PLIST_FILES_WHILE_COPYING:
+                                return scope.namespace.parseLiteralString("YES")
+                            case BuiltinMacros.PLIST_FILE_OUTPUT_FORMAT:
+                                return scope.namespace.parseLiteralString("XML")
+                            default:
+                                return nil
+                            }
                         }
-                    })
+                    )
                     runnerSigningInputNodes.append(orderingOutput)
                     continue
 
@@ -224,8 +228,7 @@ final class XCTestProductPostprocessingTaskProducer: PhasedTaskProducer, TaskPro
 
                 runnerSigningInputNodes.append(orderingOutput)
             }
-        }
-        catch {
+        } catch {
             // FIXME: For some reason using error.localizedDescription here results in a link error...
             delegate.error("unable to create tasks to copy XCTRunner.app: unknown error")
             return
@@ -233,9 +236,10 @@ final class XCTestProductPostprocessingTaskProducer: PhasedTaskProducer, TaskPro
 
         if !scope.evaluate(BuiltinMacros.SKIP_COPYING_TEST_FRAMEWORKS) {
             // Copy the testing frameworks into the runner's Frameworks directory and re-sign them with the developer's identity.  We treat these tasks as peers to the tasks above which copy the runner.
-            var frameworkPaths = Self.xctestLibraryAndFrameworkPaths(scope, context.platform, context.workspaceContext.fs) + [
-                Self.swiftTestingFrameworkPath(scope, context.platform, context.workspaceContext.fs)
-            ]
+            var frameworkPaths =
+                Self.xctestLibraryAndFrameworkPaths(scope, context.platform, context.workspaceContext.fs) + [
+                    Self.swiftTestingFrameworkPath(scope, context.platform, context.workspaceContext.fs)
+                ]
 
             for platformExtension in context.workspaceContext.core.pluginManager.extensions(of: PlatformInfoExtensionPoint.self) {
                 frameworkPaths.append(contentsOf: platformExtension.additionalTestLibraryPaths(scope: scope, platform: context.platform, fs: context.workspaceContext.fs))
@@ -263,7 +267,8 @@ final class XCTestProductPostprocessingTaskProducer: PhasedTaskProducer, TaskPro
             runnerSigningInputNodes.append(context.createVirtualNode("CodeSign \(testBundlePath.normalize().str)"))
 
             // Pass the runner's binary as an input and an output since it is being mutated.
-            let runnerBinarySubpathExpr = !scope.evaluate(BuiltinMacros._WRAPPER_CONTENTS_DIR).isEmpty
+            let runnerBinarySubpathExpr =
+                !scope.evaluate(BuiltinMacros._WRAPPER_CONTENTS_DIR).isEmpty
                 ? scope.namespace.parseString("$(_WRAPPER_CONTENTS_DIR)/MacOS/$(PRODUCT_NAME)-Runner")
                 : scope.namespace.parseString("/$(PRODUCT_NAME)-Runner")
             let runnerBinaryPath = testRunnerDstPath.join(scope.evaluate(runnerBinarySubpathExpr), preserveRoot: true)
@@ -297,10 +302,8 @@ final class XCTestProductPostprocessingTaskProducer: PhasedTaskProducer, TaskPro
         }
     }
 
-
     // MARK: Utility methods
 
-
     static fileprivate func copyAndReSignTestFramework(from srcPath: Path, to dstPath: Path, _ producer: StandardTaskProducer, _ scope: MacroEvaluationScope, _ delegate: any TaskGenerationDelegate, commandOrderingInputs: [any PlannedNode] = [], commandOrderingOutput: inout (any PlannedNode)?) async {
         // Copy the test framework.
         let context = producer.context
@@ -322,98 +325,96 @@ final class XCTestProductPostprocessingTaskProducer: PhasedTaskProducer, TaskPro
 
     /// The path to the copy of `Testing.framework` which should be used by clients.
     static fileprivate func swiftTestingFrameworkPath(_ scope: MacroEvaluationScope, _ platform: Platform?, _ fs: any FSProxy) -> Path {
-         let testingFrameworkPath = Path(scope.evaluate(BuiltinMacros.PLATFORM_DIR)).join("Developer/Library/Frameworks/Testing.framework")
-         return fs.exists(testingFrameworkPath) ? testingFrameworkPath : Path("")
-     }
-
-     /// The paths to libraries and frameworks produced by the XCTest project, including `XCTest.framework` and some
-     /// of its dependencies, which should be used by clients.
-     ///
-     /// - Note: This does not include `Testing.framework`, since it is not produced as part of the XCTest project,
-     ///   despite the fact that some of the XCTest libraries depend on it.
-     ///
-     /// The directory where the libraries and frameworks whose paths this function returns are located may be
-     /// overridden if `scope` sets `INTERNAL_TEST_LIBRARIES_OVERRIDE_PATH`.
-     static fileprivate func xctestLibraryAndFrameworkPaths(
-         includingBundleInject includeBundleInject: Bool = false,
-         _ scope: MacroEvaluationScope,
-         _ platform: Platform?,
-         _ fs: any FSProxy
-     ) -> [Path] {
-         func testLibrariesOverridePath() -> Path? {
-             let path = Path(scope.evaluate(BuiltinMacros.INTERNAL_TEST_LIBRARIES_OVERRIDE_PATH))
-             if !path.isEmpty, path.isAbsolute {
-                 return path
-             } else {
-                 return nil
-             }
-         }
-         let testLibrariesOverridePath = testLibrariesOverridePath()
-
-         let frameworksDir = testLibrariesOverridePath ?? XCTestBundleProductTypeSpec.getPlatformDeveloperVariantLibraryPath(scope, platform).join("Frameworks")
-         let privateFrameworksDir = testLibrariesOverridePath ?? XCTestBundleProductTypeSpec.getPlatformDeveloperVariantLibraryPath(scope, platform).join("PrivateFrameworks")
-         let usrLibDir = testLibrariesOverridePath ?? XCTestBundleProductTypeSpec.getPlatformDeveloperVariantLibraryPath(scope, platform).dirname.join("usr/lib")
-
-         var result: [Path] = []
-
-         let publicFrameworkNames = [
-             "XCTest.framework",
-         ]
-         for publicFrameworkName in publicFrameworkNames {
-             result.append(frameworksDir.join(publicFrameworkName))
-         }
-
-         let subFrameworkNames = [
-             "XCUnit.framework",
-             "XCUIAutomation.framework",
-         ]
-         for subFrameworkName in subFrameworkNames {
-             let pathInPublicFrameworksDir = frameworksDir.join(subFrameworkName)
-             lazy var pathInPrivateFrameworksDir = privateFrameworksDir.join(subFrameworkName)
-             if fs.exists(pathInPublicFrameworksDir) {
-                 result.append(pathInPublicFrameworksDir)
-             } else if fs.exists(pathInPrivateFrameworksDir) {
-                 result.append(pathInPrivateFrameworksDir)
-             }
-         }
-
-         let privateFrameworkNames = [
-             "XCTestCore.framework",
-             "XCTestSupport.framework",
-             "XCTAutomationSupport.framework",
-         ]
-         for privateFrameworkName in privateFrameworkNames {
-             result.append(privateFrameworksDir.join(privateFrameworkName))
-         }
-
-         var libraryNames = [
-             "libXCTestSwiftSupport.dylib",
-         ]
-         if includeBundleInject {
-             libraryNames.append("libXCTestBundleInject.dylib")
-         }
-         for libraryName in libraryNames {
-             result.append(usrLibDir.join(libraryName))
-         }
-
-         return result
-     }
-}
+        let testingFrameworkPath = Path(scope.evaluate(BuiltinMacros.PLATFORM_DIR)).join("Developer/Library/Frameworks/Testing.framework")
+        return fs.exists(testingFrameworkPath) ? testingFrameworkPath : Path("")
+    }
 
+    /// The paths to libraries and frameworks produced by the XCTest project, including `XCTest.framework` and some
+    /// of its dependencies, which should be used by clients.
+    ///
+    /// - Note: This does not include `Testing.framework`, since it is not produced as part of the XCTest project,
+    ///   despite the fact that some of the XCTest libraries depend on it.
+    ///
+    /// The directory where the libraries and frameworks whose paths this function returns are located may be
+    /// overridden if `scope` sets `INTERNAL_TEST_LIBRARIES_OVERRIDE_PATH`.
+    static fileprivate func xctestLibraryAndFrameworkPaths(
+        includingBundleInject includeBundleInject: Bool = false,
+        _ scope: MacroEvaluationScope,
+        _ platform: Platform?,
+        _ fs: any FSProxy
+    ) -> [Path] {
+        func testLibrariesOverridePath() -> Path? {
+            let path = Path(scope.evaluate(BuiltinMacros.INTERNAL_TEST_LIBRARIES_OVERRIDE_PATH))
+            if !path.isEmpty, path.isAbsolute {
+                return path
+            } else {
+                return nil
+            }
+        }
+        let testLibrariesOverridePath = testLibrariesOverridePath()
 
-// MARK:
+        let frameworksDir = testLibrariesOverridePath ?? XCTestBundleProductTypeSpec.getPlatformDeveloperVariantLibraryPath(scope, platform).join("Frameworks")
+        let privateFrameworksDir = testLibrariesOverridePath ?? XCTestBundleProductTypeSpec.getPlatformDeveloperVariantLibraryPath(scope, platform).join("PrivateFrameworks")
+        let usrLibDir = testLibrariesOverridePath ?? XCTestBundleProductTypeSpec.getPlatformDeveloperVariantLibraryPath(scope, platform).dirname.join("usr/lib")
 
+        var result: [Path] = []
+
+        let publicFrameworkNames = [
+            "XCTest.framework"
+        ]
+        for publicFrameworkName in publicFrameworkNames {
+            result.append(frameworksDir.join(publicFrameworkName))
+        }
+
+        let subFrameworkNames = [
+            "XCUnit.framework",
+            "XCUIAutomation.framework",
+        ]
+        for subFrameworkName in subFrameworkNames {
+            let pathInPublicFrameworksDir = frameworksDir.join(subFrameworkName)
+            lazy var pathInPrivateFrameworksDir = privateFrameworksDir.join(subFrameworkName)
+            if fs.exists(pathInPublicFrameworksDir) {
+                result.append(pathInPublicFrameworksDir)
+            } else if fs.exists(pathInPrivateFrameworksDir) {
+                result.append(pathInPrivateFrameworksDir)
+            }
+        }
+
+        let privateFrameworkNames = [
+            "XCTestCore.framework",
+            "XCTestSupport.framework",
+            "XCTAutomationSupport.framework",
+        ]
+        for privateFrameworkName in privateFrameworkNames {
+            result.append(privateFrameworksDir.join(privateFrameworkName))
+        }
+
+        var libraryNames = [
+            "libXCTestSwiftSupport.dylib"
+        ]
+        if includeBundleInject {
+            libraryNames.append("libXCTestBundleInject.dylib")
+        }
+        for libraryName in libraryNames {
+            result.append(usrLibDir.join(libraryName))
+        }
+
+        return result
+    }
+}
+
+// MARK:
 
 /// The `XCTestHostTaskProducer` generates tasks relevant to a target whose product is the host for products of XCTest targets.  For example, embedding the XCTest-related frameworks and libraries in the host product.
 final class XCTestHostTaskProducer: PhasedTaskProducer, TaskProducer {
     func generateTasks() async -> [any PlannedTask] {
         let scope = context.settings.globalScope
         var tasks: [any PlannedTask] = []
-            if isTestHostTarget() {
-                await appendGeneratedTasks(&tasks) { delegate in
-                    await generateTestHostTasks(scope, delegate)
-                }
+        if isTestHostTarget() {
+            await appendGeneratedTasks(&tasks) { delegate in
+                await generateTestHostTasks(scope, delegate)
             }
+        }
         return tasks
     }
 
@@ -434,9 +435,10 @@ final class XCTestHostTaskProducer: PhasedTaskProducer, TaskProducer {
             let frameworksPath = scope.evaluate(BuiltinMacros.TARGET_BUILD_DIR).join(scope.evaluate(BuiltinMacros.FRAMEWORKS_FOLDER_PATH))
             // NOTE: If any new paths are added here, they may also need to be added to the list of those not to be scanned by the CopySwiftLibs task, in executableIsXCTestSupportLibrary() in EmbedSwiftStdLibTaskAction.swift.
             // NOTE: If any new paths are added here, they may also need to be added to the list of those not to be scanned by the CopySwiftLibs task, in executableIsTestSupportLibrary() in EmbedSwiftStdLibTaskAction.swift.
-            var srcPaths = XCTestProductPostprocessingTaskProducer.xctestLibraryAndFrameworkPaths(includingBundleInject: true, scope, context.platform, context.workspaceContext.fs) + [
-                XCTestProductPostprocessingTaskProducer.swiftTestingFrameworkPath(scope, context.platform, context.workspaceContext.fs)
-            ]
+            var srcPaths =
+                XCTestProductPostprocessingTaskProducer.xctestLibraryAndFrameworkPaths(includingBundleInject: true, scope, context.platform, context.workspaceContext.fs) + [
+                    XCTestProductPostprocessingTaskProducer.swiftTestingFrameworkPath(scope, context.platform, context.workspaceContext.fs)
+                ]
 
             for platformExtension in context.workspaceContext.core.pluginManager.extensions(of: PlatformInfoExtensionPoint.self) {
                 srcPaths.append(contentsOf: platformExtension.additionalTestLibraryPaths(scope: scope, platform: context.platform, fs: context.workspaceContext.fs))
diff --git a/Sources/SWBTaskConstruction/TaskProducers/StandardTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/StandardTaskProducer.swift
index f7825797..db3f7924 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/StandardTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/StandardTaskProducer.swift
@@ -66,7 +66,7 @@ open class StandardTaskProducer {
         let delegate = ProducerBasedTaskGenerationDelegate(producer: self, context: context, taskOptions: options)
         await body(delegate)
         tasks.append(contentsOf: delegate.tasks)
-        return (tasks: delegate.tasks, outputs: delegate.outputs )
+        return (tasks: delegate.tasks, outputs: delegate.outputs)
     }
 
     func diagnosticFilenameMapContents() async throws -> ByteString {
@@ -85,7 +85,6 @@ open class StandardTaskProducer {
     }
 }
 
-
 /// Abstract base class for phased task producers.  All tasks generated by such a producer will be grouped between two nodes so they will all run after tasks before the start node, and before tasks after the end node.  It is the responsibility of the creator of these producers to create them with nodes which reflect the desired ordering.
 open class PhasedTaskProducer: StandardTaskProducer {
     /// The phase start nodes.
diff --git a/Sources/SWBTaskConstruction/TaskProducers/TaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/TaskProducer.swift
index 7a2e024e..4d857c33 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/TaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/TaskProducer.swift
@@ -30,8 +30,7 @@ enum TaskProducerPhase {
 }
 
 /// A TaskProducer embodies a set of work which needs to be done create the tasks which, when run, will generate all or part of the product of a ProductPlan.
-package protocol TaskProducer
-{
+package protocol TaskProducer {
     /// Immutable data available to the task producer.
     var context: TaskProducerContext { get }
 
@@ -45,15 +44,13 @@ package protocol TaskProducer
     func prepare() async
 }
 
-extension TaskProducer
-{
+extension TaskProducer {
     /// By default, most task producers should not need to make use of this functionality.
     package func prepare() async {}
 }
 
 /// Context of immutable data available to a task producer.
-public class TaskProducerContext: StaleFileRemovalContext, BuildFileResolution
-{
+public class TaskProducerContext: StaleFileRemovalContext, BuildFileResolution {
     /// The workspace context.
     public let workspaceContext: WorkspaceContext
 
@@ -294,8 +291,7 @@ public class TaskProducerContext: StaleFileRemovalContext, BuildFileResolution
     /// - parameter workspaceContext: The containing workspace and context.
     /// - parameter globalProductPlan: The high-level global build information.
     /// - parameter delegate: The delegate to use for task construction.
-    init(configuredTarget: ConfiguredTarget? = nil, workspaceContext: WorkspaceContext, globalProductPlan: GlobalProductPlan, delegate: any TaskPlanningDelegate)
-    {
+    init(configuredTarget: ConfiguredTarget? = nil, workspaceContext: WorkspaceContext, globalProductPlan: GlobalProductPlan, delegate: any TaskPlanningDelegate) {
         self.workspaceContext = workspaceContext
         self.configuredTarget = configuredTarget
         self.globalProductPlan = globalProductPlan
@@ -329,7 +325,7 @@ public class TaskProducerContext: StaleFileRemovalContext, BuildFileResolution
         }
         self.buildRuleSet = LeveledBuildRuleSet(ruleSets: [
             BasicBuildRuleSet(rules: projectBuildRules),
-            DisambiguatingBuildRuleSet(rules: settings.systemBuildRules, enableDebugActivityLogs: workspaceContext.userPreferences.enableDebugActivityLogs)
+            DisambiguatingBuildRuleSet(rules: settings.systemBuildRules, enableDebugActivityLogs: workspaceContext.userPreferences.enableDebugActivityLogs),
         ])
 
         self.project = configuredTarget.map { workspaceContext.workspace.project(for: $0.target) }
@@ -760,24 +756,26 @@ public class TaskProducerContext: StaleFileRemovalContext, BuildFileResolution
 
         // Otherwise, we are producing a binary if we have a Sources build phase and either that phase is not empty or we're generating a versioning stub file.
         guard let target = configuredTarget?.target as? SWBCore.BuildPhaseTarget,
-            let sourcesBuildPhase = target.sourcesBuildPhase else {
+            let sourcesBuildPhase = target.sourcesBuildPhase
+        else {
             return false
         }
 
         let context = BuildFilesProcessingContext(scope)
 
-        let hasObjectProducingSources = sourcesBuildPhase.buildFiles.filter {
-            guard let buildFile = try? resolveBuildFileReference($0), !context.isExcluded(buildFile.absolutePath, filters: $0.platformFilters) else {
-                return false
-            }
+        let hasObjectProducingSources =
+            sourcesBuildPhase.buildFiles.filter {
+                guard let buildFile = try? resolveBuildFileReference($0), !context.isExcluded(buildFile.absolutePath, filters: $0.platformFilters) else {
+                    return false
+                }
 
-            // AppleScript files don't produce object files either directly or transitively, so they cannot (for most definitions of "cannot") contribute to a linked Mach-O being produced.
-            if buildFile.fileType.identifier == "sourcecode.applescript" {
-                return false
-            }
+                // AppleScript files don't produce object files either directly or transitively, so they cannot (for most definitions of "cannot") contribute to a linked Mach-O being produced.
+                if buildFile.fileType.identifier == "sourcecode.applescript" {
+                    return false
+                }
 
-            return true
-        }.count > 0 || scope.generatesAppleGenericVersioningFile(context) || scope.generatesKernelExtensionModuleInfoFile(context, settings, sourcesBuildPhase)
+                return true
+            }.count > 0 || scope.generatesAppleGenericVersioningFile(context) || scope.generatesKernelExtensionModuleInfoFile(context, settings, sourcesBuildPhase)
 
         // We will produce a binary if we have sources.
         if hasObjectProducingSources {
@@ -944,17 +942,21 @@ public class TaskProducerContext: StaleFileRemovalContext, BuildFileResolution
 
     /// Report an error that is caused by a missing package product.
     func missingPackageProduct(_ packageName: String, _ buildFile: BuildFile, _ buildPhase: BuildPhase) {
-        error("Missing package product '\(packageName)'",
+        error(
+            "Missing package product '\(packageName)'",
             location: .buildFile(buildFileGUID: buildFile.guid, buildPhaseGUID: buildPhase.guid, targetGUID: configuredTarget?.target.guid ?? ""),
-            component: .packageResolution)
+            component: .packageResolution
+        )
     }
 
     func missingNamedReference(_ name: String, _ buildFile: BuildFile, _ buildPhase: BuildPhase) {
         // TODO: Semantic build file locations end up going to the General tab in Xcode, but here we have our first use case where we ALWAYS want it to go to the Build Phases tab.
         // Will need to figure out a way to abstract this into the diagnostics model which doesn't directly map to Xcode's UI. Perhaps an `exact` flag?
-        error("This \(buildPhase.name) build phase contains a reference to a missing file '\(name)'.",
+        error(
+            "This \(buildPhase.name) build phase contains a reference to a missing file '\(name)'.",
             location: .buildFile(buildFileGUID: buildFile.guid, buildPhaseGUID: buildPhase.guid, targetGUID: configuredTarget?.target.guid ?? ""),
-            component: .targetIntegrity)
+            component: .targetIntegrity
+        )
     }
 
     func emitFileExclusionDiagnostic(_ exclusionReason: BuildFileExclusionReason, _ context: any BuildFileFilteringContext, _ path: Path, _ filters: Set<PlatformFilter>, _ buildFileLocation: Diagnostic.Location?) {
@@ -970,10 +972,18 @@ public class TaskProducerContext: StaleFileRemovalContext, BuildFileResolution
         case let .patternLists(excludePattern):
             let excl = context.excludedSourceFileNames.joined(separator: " ")
             let incl = context.includedSourceFileNames.joined(separator: " ")
-            self.delegate.emit(configuredTarget.map { .overrideTarget($0) } ?? .default, Diagnostic(behavior: .note, location: buildFileLocation ?? .unknown, data: DiagnosticData("Skipping '\(path.str)' because it is excluded by EXCLUDED_SOURCE_FILE_NAMES pattern: \(excludePattern)"), childDiagnostics: [
-                Diagnostic(behavior: .note, location: .buildSetting(name: BuiltinMacros.EXCLUDED_SOURCE_FILE_NAMES.name), data: DiagnosticData("EXCLUDED_SOURCE_FILE_NAMES: \(excl)")),
-                Diagnostic(behavior: .note, location: .buildSetting(name: BuiltinMacros.INCLUDED_SOURCE_FILE_NAMES.name), data: DiagnosticData("INCLUDED_SOURCE_FILE_NAMES: \(incl)")),
-            ]))
+            self.delegate.emit(
+                configuredTarget.map { .overrideTarget($0) } ?? .default,
+                Diagnostic(
+                    behavior: .note,
+                    location: buildFileLocation ?? .unknown,
+                    data: DiagnosticData("Skipping '\(path.str)' because it is excluded by EXCLUDED_SOURCE_FILE_NAMES pattern: \(excludePattern)"),
+                    childDiagnostics: [
+                        Diagnostic(behavior: .note, location: .buildSetting(name: BuiltinMacros.EXCLUDED_SOURCE_FILE_NAMES.name), data: DiagnosticData("EXCLUDED_SOURCE_FILE_NAMES: \(excl)")),
+                        Diagnostic(behavior: .note, location: .buildSetting(name: BuiltinMacros.INCLUDED_SOURCE_FILE_NAMES.name), data: DiagnosticData("INCLUDED_SOURCE_FILE_NAMES: \(incl)")),
+                    ]
+                )
+            )
         }
     }
 
@@ -1015,13 +1025,11 @@ public class TaskProducerContext: StaleFileRemovalContext, BuildFileResolution
     private func onDemandResourcesAssetTagPriority(tag: String) -> Double? {
         if onDemandResourcesInitialInstallTags.contains(tag) {
             return 1.0
-        }
-        else if let index = onDemandResourcesPrefetchOrder.firstIndex(of: tag) {
+        } else if let index = onDemandResourcesPrefetchOrder.firstIndex(of: tag) {
             let count = onDemandResourcesPrefetchOrder.count
             if count == 1 {
                 return 0.5
-            }
-            else {
+            } else {
                 return (Double(count - 1 - index) / Double(count - 1)) * 0.9 + 0.05
             }
         }
@@ -1208,7 +1216,7 @@ extension TaskProducerContext: Hashable {
         hasher.combine(ObjectIdentifier(self))
     }
 
-    public static func ==(lhs: TaskProducerContext, rhs: TaskProducerContext) -> Bool {
+    public static func == (lhs: TaskProducerContext, rhs: TaskProducerContext) -> Bool {
         return lhs === rhs
     }
 }
@@ -1319,8 +1327,8 @@ extension TaskProducerContext: CommandProducer {
             // a facility for doing that, we approximate by checking if the target contains
             // any Swift sources.
             guard let standardTarget = targetDependency.target as? SWBCore.StandardTarget,
-                  let sourcesBuildPhase = standardTarget.sourcesBuildPhase,
-                  sourcesBuildPhase.containsSwiftSources(self.workspaceContext.workspace, self, dependencyScope, self.filePathResolver)
+                let sourcesBuildPhase = standardTarget.sourcesBuildPhase,
+                sourcesBuildPhase.containsSwiftSources(self.workspaceContext.workspace, self, dependencyScope, self.filePathResolver)
             else {
                 return nil
             }
@@ -1337,16 +1345,18 @@ extension TaskProducerContext: CommandProducer {
                     return nil
                 }
                 // Currently there is no more than one compatibility arch; first might not be correct otherwise
-                guard let compatibleArch = archSpec.compatibilityArchs.first(where: { compatibleArch in
-                    dependencyArchs.contains(compatibleArch)
-                }) else {
+                guard
+                    let compatibleArch = archSpec.compatibilityArchs.first(where: { compatibleArch in
+                        dependencyArchs.contains(compatibleArch)
+                    })
+                else {
                     return nil
                 }
                 arch = compatibleArch
             }
 
-
-            return dependencyScope
+            return
+                dependencyScope
                 .subscope(binding: BuiltinMacros.variantCondition, to: variant)
                 .subscopeBindingArchAndTriple(arch: arch)
         }
@@ -1360,14 +1370,12 @@ extension TaskProducerContext: CommandProducer {
     public func supportsEagerLinking(scope: MacroEvaluationScope) -> Bool {
         let buildComponents = scope.evaluate(BuiltinMacros.BUILD_COMPONENTS)
         // Currently, eager linking (using TBDs to unblock linking early within a build invocation) and building with installapi (using TBDs to unblock linking between build invocations) are mutually exclusive.
-        return buildComponents.contains("build") &&
-            !scope.evaluate(BuiltinMacros.SUPPORTS_TEXT_BASED_API) &&
-            scope.evaluate(BuiltinMacros.SWIFT_USE_INTEGRATED_DRIVER) && // Prerequisite for eager linking
-            !SwiftCompilerSpec.shouldUseWholeModuleOptimization(for: scope).result && // off for WMO
-            scope.evaluate(BuiltinMacros.EAGER_LINKING) && // Optimization is currently opt-in via this build setting
-            settings.productType?.supportsEagerLinking == true && // The optimization is only valid for supported product types
-            compileSourcesExportOnlySwiftSymbols(scope: scope) && // All exported symbols from compile sources must be from Swift sources
-            !linkedLibrariesMayIntroduceExportedSymbols(scope: scope) // We must not be linking anything that introduces exported symbols
+        return buildComponents.contains("build") && !scope.evaluate(BuiltinMacros.SUPPORTS_TEXT_BASED_API) && scope.evaluate(BuiltinMacros.SWIFT_USE_INTEGRATED_DRIVER)  // Prerequisite for eager linking
+            && !SwiftCompilerSpec.shouldUseWholeModuleOptimization(for: scope).result  // off for WMO
+            && scope.evaluate(BuiltinMacros.EAGER_LINKING)  // Optimization is currently opt-in via this build setting
+            && settings.productType?.supportsEagerLinking == true  // The optimization is only valid for supported product types
+            && compileSourcesExportOnlySwiftSymbols(scope: scope)  // All exported symbols from compile sources must be from Swift sources
+            && !linkedLibrariesMayIntroduceExportedSymbols(scope: scope)  // We must not be linking anything that introduces exported symbols
     }
 
     public func projectHeaderInfo(for target: Target) async -> ProjectHeaderInfo? {
@@ -1388,7 +1396,8 @@ extension TaskProducerContext: CommandProducer {
         let isBundleProductType = productType?.conformsTo(identifier: "com.apple.product-type.bundle") ?? false
         let isStaticLibrary = scope.evaluate(BuiltinMacros.MACH_O_TYPE) == "staticlib"
         let isObject = scope.evaluate(BuiltinMacros.MACH_O_TYPE) == "mh_object"
-        let result = (isBuild || isLocExport)
+        let result =
+            (isBuild || isLocExport)
             && !indexEnableBuildArena
             && (isBundleProductType || isStaticLibrary || isObject)
             && isApplePlatform
@@ -1405,10 +1414,7 @@ extension TaskProducerContext: CommandProducer {
         let indexEnableBuildArena = scope.evaluate(BuiltinMacros.INDEX_ENABLE_BUILD_ARENA)
         let machOType = scope.evaluate(BuiltinMacros.MACH_O_TYPE)
         let isBundleProductType = productType?.conformsTo(identifier: "com.apple.product-type.bundle") ?? false
-        return ((isBuild || isLocInstall) &&
-                !indexEnableBuildArena &&
-                machOType != "staticlib" &&
-                isBundleProductType)
+        return ((isBuild || isLocInstall) && !indexEnableBuildArena && machOType != "staticlib" && isBundleProductType)
     }
 
     public var targetRequiredToBuildForIndexing: Bool {
@@ -1433,7 +1439,8 @@ extension TaskProducerContext: CommandProducer {
 extension TaskProducerContext {
     private func compileSourcesExportOnlySwiftSymbols(scope: MacroEvaluationScope) -> Bool {
         guard let buildPhaseTarget = configuredTarget?.target as? BuildPhaseTarget,
-              let sourcesBuildPhase = buildPhaseTarget.sourcesBuildPhase else { return false }
+            let sourcesBuildPhase = buildPhaseTarget.sourcesBuildPhase
+        else { return false }
 
         // Ensure that the sources build phase only includes swift source files or source files which won't contribute exported symbols.
         // FIXME: Various types of sources which generate code that doesn't export any symbols could probably be added here.
@@ -1444,25 +1451,26 @@ extension TaskProducerContext {
             scope.subscopeBindingArchAndTriple(arch: arch)
         }) {
             let context = BuildFilesProcessingContext(archSpecificSubscope)
-            guard !sourcesBuildPhase.buildFiles.contains(where: { buildFile in
-                guard let resolvedBuildFileInfo = try? resolveBuildFileReference(buildFile),
-                      !context.isExcluded(resolvedBuildFileInfo.absolutePath, filters: buildFile.platformFilters) else { return false }
-
-                var fileIsOfOtherType = true
-                for type in [swiftFileType, applescriptFileType, doccFileType] {
-                    if resolvedBuildFileInfo.fileType.conformsTo(type) == true {
-                        fileIsOfOtherType = false
-                        break
+            guard
+                !sourcesBuildPhase.buildFiles.contains(where: { buildFile in
+                    guard let resolvedBuildFileInfo = try? resolveBuildFileReference(buildFile),
+                        !context.isExcluded(resolvedBuildFileInfo.absolutePath, filters: buildFile.platformFilters)
+                    else { return false }
+
+                    var fileIsOfOtherType = true
+                    for type in [swiftFileType, applescriptFileType, doccFileType] {
+                        if resolvedBuildFileInfo.fileType.conformsTo(type) == true {
+                            fileIsOfOtherType = false
+                            break
+                        }
                     }
-                }
-                return fileIsOfOtherType
-            }) else { return false }
+                    return fileIsOfOtherType
+                })
+            else { return false }
 
             // Check that we're not generating any C sources with exported symbols based on build settings.
             guard !archSpecificSubscope.generatesKernelExtensionModuleInfoFile(context, settings, sourcesBuildPhase) else { return false }
-            guard !archSpecificSubscope.generatesAppleGenericVersioningFile(context) ||
-                    archSpecificSubscope.evaluate(BuiltinMacros.VERSION_INFO_EXPORT_DECL).split(separator: " ").contains("static") ||
-                    ["", "apple-generic-hidden"].contains(scope.evaluate(BuiltinMacros.VERSIONING_SYSTEM)) else {
+            guard !archSpecificSubscope.generatesAppleGenericVersioningFile(context) || archSpecificSubscope.evaluate(BuiltinMacros.VERSION_INFO_EXPORT_DECL).split(separator: " ").contains("static") || ["", "apple-generic-hidden"].contains(scope.evaluate(BuiltinMacros.VERSIONING_SYSTEM)) else {
                 return false
             }
         }
@@ -1484,7 +1492,8 @@ extension TaskProducerContext {
     /// Compute the flattened list of build files from the frameworks build phase after expanding package product targets.
     func computeFlattenedFrameworksPhaseBuildFiles(_ buildFilesContext: BuildFilesProcessingContext) -> [BuildFile] {
         guard let buildPhaseTarget = configuredTarget?.target as? BuildPhaseTarget,
-              let frameworksPhase = buildPhaseTarget.frameworksBuildPhase else { return [] }
+            let frameworksPhase = buildPhaseTarget.frameworksBuildPhase
+        else { return [] }
 
         // The ordered list of output files.
         var result = [BuildFile]()
@@ -1505,9 +1514,10 @@ extension TaskProducerContext {
             for buildFile in phase.buildFiles {
                 // If this is a package producer reference, visit it recursively.
                 if case .targetProduct(let guid) = buildFile.buildableItem,
-                   case let target as PackageProductTarget = workspaceContext.workspace.target(for: guid),
-                   let frameworksBuildPhase = target.frameworksBuildPhase,
-                   buildFilesContext.currentPlatformFilter.matches(buildFile.platformFilters) {
+                    case let target as PackageProductTarget = workspaceContext.workspace.target(for: guid),
+                    let frameworksBuildPhase = target.frameworksBuildPhase,
+                    buildFilesContext.currentPlatformFilter.matches(buildFile.platformFilters)
+                {
                     if globalProductPlan.dynamicallyBuildingTargets.contains(target) {
                         result.append(buildFile)
                     } else {
@@ -1713,7 +1723,6 @@ class ProducerBasedTaskGenerationDelegate: TaskGenerationDelegate {
     }
 }
 
-
 /// This class adapts the TaskGenerationDelegate protocol used by the Core to that provided by the producer delegate API, to provide phase ordering among tasks created by different `PhasedTaskProducers`.
 ///
 /// This delegate auto-attaches constructed tasks to the phase ordering gates.
diff --git a/Sources/SWBTaskConstruction/TaskProducers/WorkspaceTaskProducers/CreateBuildDirectoryTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/WorkspaceTaskProducers/CreateBuildDirectoryTaskProducer.swift
index 12cd9961..b437f015 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/WorkspaceTaskProducers/CreateBuildDirectoryTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/WorkspaceTaskProducers/CreateBuildDirectoryTaskProducer.swift
@@ -26,33 +26,35 @@ final class CreateBuildDirectoryTaskProducer: StandardTaskProducer, TaskProducer
     func prepare() {
         let containsSwiftPackages = context.globalProductPlan.planRequest.buildGraph.containsSwiftPackages
         let buildDirectoryContext = context.globalProductPlan.buildDirectories
-        buildDirectoryContext.add(targetContexts.flatMap { (targetContext: TaskProducerContext) -> [Path] in
-            // Package products only group dependent targets or carry imparted settings, but never build any content of their own, so we should not create any build directories for them.
-            if targetContext.configuredTarget?.target.type == .packageProduct {
-                return []
-            }
-            return targetContext.workspaceContext.buildDirectoryMacros.flatMap { macro -> [Path] in
-                let scope = targetContext.settings.globalScope
-                let path = scope.evaluate(macro)
+        buildDirectoryContext.add(
+            targetContexts.flatMap { (targetContext: TaskProducerContext) -> [Path] in
+                // Package products only group dependent targets or carry imparted settings, but never build any content of their own, so we should not create any build directories for them.
+                if targetContext.configuredTarget?.target.type == .packageProduct {
+                    return []
+                }
+                return targetContext.workspaceContext.buildDirectoryMacros.flatMap { macro -> [Path] in
+                    let scope = targetContext.settings.globalScope
+                    let path = scope.evaluate(macro)
 
-                switch macro {
-                case BuiltinMacros.BUILT_PRODUCTS_DIR:
-                    // If the workspace contains any packages, eagerly create the "PackageFrameworks" directory. As part of "rdar://72205262 (Explore moving away from two target approach for dynamic targets to changing linkage directly in Swift Build)", we should instead compute any search paths to "PackageFrameworks" dynamically to avoid this.
-                    if containsSwiftPackages {
-                        return [path, path.join("PackageFrameworks")]
-                    }
-                case BuiltinMacros.DSTROOT:
-                    // Skip generating DSTROOT if DEPLOYMENT_LOCATION is not enabled.
-                    if !scope.evaluate(BuiltinMacros.DEPLOYMENT_LOCATION) {
-                        return []
+                    switch macro {
+                    case BuiltinMacros.BUILT_PRODUCTS_DIR:
+                        // If the workspace contains any packages, eagerly create the "PackageFrameworks" directory. As part of "rdar://72205262 (Explore moving away from two target approach for dynamic targets to changing linkage directly in Swift Build)", we should instead compute any search paths to "PackageFrameworks" dynamically to avoid this.
+                        if containsSwiftPackages {
+                            return [path, path.join("PackageFrameworks")]
+                        }
+                    case BuiltinMacros.DSTROOT:
+                        // Skip generating DSTROOT if DEPLOYMENT_LOCATION is not enabled.
+                        if !scope.evaluate(BuiltinMacros.DEPLOYMENT_LOCATION) {
+                            return []
+                        }
+                    default:
+                        break
                     }
-                default:
-                    break
-                }
 
-                return [path]
+                    return [path]
+                }
             }
-        })
+        )
         buildDirectoryContext.freeze()
     }
 
diff --git a/Sources/SWBTaskConstruction/TaskProducers/WorkspaceTaskProducers/HeadermapVFSTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/WorkspaceTaskProducers/HeadermapVFSTaskProducer.swift
index f719ff12..ee79dd4a 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/WorkspaceTaskProducers/HeadermapVFSTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/WorkspaceTaskProducers/HeadermapVFSTaskProducer.swift
@@ -33,22 +33,25 @@ final class HeadermapVFSTaskProducer: StandardTaskProducer, TaskProducer {
 
         var tasks = [any PlannedTask]()
         do {
-            let vfsContentsByPath = try Dictionary(try await targetContexts.concurrentMap(maximumParallelism: 100) { (targetContext: TaskProducerContext) async throws -> (Path, ByteString)? in
-                let targetScope = targetContext.settings.globalScope
-                let vfsSetting = targetScope.evaluate(BuiltinMacros.CPP_HEADERMAP_PRODUCT_HEADERS_VFS_FILE)
-                guard targetContext.configuredTarget?.target is SWBCore.StandardTarget, targetScope.evaluate(BuiltinMacros.USE_HEADERMAP), !vfsSetting.isEmpty else {
-                    return nil
-                }
-                let vfsPath = self.context.makeAbsolute(vfsSetting)
-
-                let contents = try await targetContext.constructVFSContents()
-                return (vfsPath, contents)
-            }.compactMap { $0 }, uniquingKeysWith: { first, second in
-                guard first == second else {
-                    throw StubError.error("Unexpected difference in VFS content.\nFirst: \(first.asString)\nSecond:\(second.asString)")
+            let vfsContentsByPath = try Dictionary(
+                try await targetContexts.concurrentMap(maximumParallelism: 100) { (targetContext: TaskProducerContext) async throws -> (Path, ByteString)? in
+                    let targetScope = targetContext.settings.globalScope
+                    let vfsSetting = targetScope.evaluate(BuiltinMacros.CPP_HEADERMAP_PRODUCT_HEADERS_VFS_FILE)
+                    guard targetContext.configuredTarget?.target is SWBCore.StandardTarget, targetScope.evaluate(BuiltinMacros.USE_HEADERMAP), !vfsSetting.isEmpty else {
+                        return nil
+                    }
+                    let vfsPath = self.context.makeAbsolute(vfsSetting)
+
+                    let contents = try await targetContext.constructVFSContents()
+                    return (vfsPath, contents)
+                }.compactMap { $0 },
+                uniquingKeysWith: { first, second in
+                    guard first == second else {
+                        throw StubError.error("Unexpected difference in VFS content.\nFirst: \(first.asString)\nSecond:\(second.asString)")
+                    }
+                    return first
                 }
-                return first
-            })
+            )
 
             for (vfsPath, contents) in vfsContentsByPath {
                 await appendGeneratedTasks(&tasks) { delegate in
@@ -175,11 +178,16 @@ extension TaskProducerContext {
                 let contentsFolderString = scope.evaluate(BuiltinMacros.CONTENTS_FOLDER_PATH).str
                 let wrapperNameString = scope.evaluate(BuiltinMacros.WRAPPER_NAME).str
 
-                let moduleInfo = GlobalProductPlan.computeModuleInfo(workspaceContext: globalProductPlan.planRequest.workspaceContext, target: target, settings: settings, diagnosticHandler: { message, location, component, essential in
-                    if essential {
-                        error(message, location: location, component: component)
+                let moduleInfo = GlobalProductPlan.computeModuleInfo(
+                    workspaceContext: globalProductPlan.planRequest.workspaceContext,
+                    target: target,
+                    settings: settings,
+                    diagnosticHandler: { message, location, component, essential in
+                        if essential {
+                            error(message, location: location, component: component)
+                        }
                     }
-                })
+                )
                 if let moduleInfo = moduleInfo {
                     let moduleMapSourcePath = mapToTempFilesOnly ? moduleInfo.moduleMapPaths.tmpPath : moduleInfo.moduleMapPaths.sourcePath
                     if !moduleMapSourcePath.isEmpty {
@@ -200,7 +208,7 @@ extension TaskProducerContext {
                     // Only invoke the closure for this file if the file is really going to be generated.
                     if moduleInfo.exportsSwiftObjCAPI {
                         let generatedSwiftHeaderPath = SwiftCompilerSpec.generatedObjectiveCHeaderOutputPath(scope)
-                        let swiftHeaderName = scope.evaluate(BuiltinMacros.SWIFT_OBJC_INTERFACE_HEADER_NAME) // if exportsSwiftObjCAPI, then swiftHeaderName is not empty
+                        let swiftHeaderName = scope.evaluate(BuiltinMacros.SWIFT_OBJC_INTERFACE_HEADER_NAME)  // if exportsSwiftObjCAPI, then swiftHeaderName is not empty
                         // FIXME: The calculation of swiftHeaderPath below seems like an unfortunate hard-coding of an algorithm that should be elsewhere; it comes from commit ce4151bf9e in HeadermapTaskProducer.swift originally.
                         // FIXME: It's also not clear under what conditions this calculation will be different from SwiftCompilerSpec.generatedObjectiveCHeaderOutputPath(), but if it is (now or someday) we invoke the closure.
                         let swiftHeaderPath = builtProductsDir.join(publicHeadersFolderPseudoPath).join(swiftHeaderName)
diff --git a/Sources/SWBTaskConstruction/TaskProducers/WorkspaceTaskProducers/PCHModuleMapTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/WorkspaceTaskProducers/PCHModuleMapTaskProducer.swift
index 0a608fe6..47b041ed 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/WorkspaceTaskProducers/PCHModuleMapTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/WorkspaceTaskProducers/PCHModuleMapTaskProducer.swift
@@ -28,36 +28,41 @@ final class PCHModuleMapTaskProducer: StandardTaskProducer, TaskProducer {
         var tasks = [any PlannedTask]()
 
         do {
-            let prefixHeadersToPrecompile = try Dictionary(try await targetContexts.concurrentMap(maximumParallelism: 100) { (targetContext: TaskProducerContext) async throws -> (Path, ByteString)? in
-                let scope = targetContext.settings.globalScope
+            let prefixHeadersToPrecompile = try Dictionary(
+                try await targetContexts.concurrentMap(maximumParallelism: 100) { (targetContext: TaskProducerContext) async throws -> (Path, ByteString)? in
+                    let scope = targetContext.settings.globalScope
 
-                // If there is not prefix header, we are done.
-                var prefixHeader = scope.evaluate(BuiltinMacros.GCC_PREFIX_HEADER)
-                guard !prefixHeader.isEmpty else {
-                    return nil
-                }
+                    // If there is not prefix header, we are done.
+                    var prefixHeader = scope.evaluate(BuiltinMacros.GCC_PREFIX_HEADER)
+                    guard !prefixHeader.isEmpty else {
+                        return nil
+                    }
 
-                // Make the path absolute.
-                prefixHeader = targetContext.createNode(prefixHeader).path
+                    // Make the path absolute.
+                    prefixHeader = targetContext.createNode(prefixHeader).path
 
-                let prefixModuleMapFile = ClangCompilerSpec.getPrefixHeaderModuleMap(prefixHeader, scope)
+                    let prefixModuleMapFile = ClangCompilerSpec.getPrefixHeaderModuleMap(prefixHeader, scope)
 
-                if let prefixModuleMapFile {
-                    let moduleMapContents = ByteString(encodingAsUTF8: """
-                    module __PCH {
-                        header "\(prefixHeader.str)"
-                        export *
+                    if let prefixModuleMapFile {
+                        let moduleMapContents = ByteString(
+                            encodingAsUTF8: """
+                                module __PCH {
+                                    header "\(prefixHeader.str)"
+                                    export *
+                                }
+                                """
+                        )
+                        return (prefixModuleMapFile, moduleMapContents)
                     }
-                    """)
-                    return (prefixModuleMapFile, moduleMapContents)
-                }
-                return nil
-            }.compactMap{ $0 }, uniquingKeysWith: { first, second in
-                guard first == second else {
-                    throw StubError.error("Unexpected difference in PCH module map content.\nFirst: \(first.asString)\nSecond:\(second.asString)")
+                    return nil
+                }.compactMap { $0 },
+                uniquingKeysWith: { first, second in
+                    guard first == second else {
+                        throw StubError.error("Unexpected difference in PCH module map content.\nFirst: \(first.asString)\nSecond:\(second.asString)")
+                    }
+                    return first
                 }
-                return first
-            })
+            )
 
             for (prefixModuleMapFilePath, moduleMapContents) in prefixHeadersToPrecompile {
                 await appendGeneratedTasks(&tasks) { delegate in
diff --git a/Sources/SWBTaskConstruction/TaskProducers/WorkspaceTaskProducers/XCFrameworkTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/WorkspaceTaskProducers/XCFrameworkTaskProducer.swift
index a855ddae..738d6896 100644
--- a/Sources/SWBTaskConstruction/TaskProducers/WorkspaceTaskProducers/XCFrameworkTaskProducer.swift
+++ b/Sources/SWBTaskConstruction/TaskProducers/WorkspaceTaskProducers/XCFrameworkTaskProducer.swift
@@ -104,8 +104,7 @@ final class XCFrameworkTaskProducer: StandardTaskProducer, TaskProducer {
 
                         return (library, outputDirectory)
                     }
-                }
-                catch {
+                } catch {
                     context.error(error.localizedDescription)
                 }
             }
@@ -130,8 +129,7 @@ final class XCFrameworkTaskProducer: StandardTaskProducer, TaskProducer {
                 let expectedSignatures: [String]?
                 if let expectedSignature = config.expectedSignature {
                     expectedSignatures = [expectedSignature]
-                }
-                else {
+                } else {
                     expectedSignatures = nil
                 }
 
diff --git a/Sources/SWBTaskExecution/BuildDescription.swift b/Sources/SWBTaskExecution/BuildDescription.swift
index f2279da3..b0e67737 100644
--- a/Sources/SWBTaskExecution/BuildDescription.swift
+++ b/Sources/SWBTaskExecution/BuildDescription.swift
@@ -246,10 +246,12 @@ package final class BuildDescription: Serializable, Sendable, Encodable, Cacheab
         if case let .prepareForIndexing(targetsToPrepare?, _) = buildRequest.buildCommand {
             var nodesToBuild: [BuildNodeToPrepareForIndex] = []
             for targetToPrepare in targetsToPrepare {
-                let foundTargets = self.allConfiguredTargets.filter{ $0.target.guid == targetToPrepare.guid }
-                guard let selectedTarget = foundTargets.one(by: {
-                    buildRequestContext.selectConfiguredTargetForIndex($0, $1, hasEnabledIndexBuildArena: buildRequest.enableIndexBuildArena, runDestination: buildRequest.parameters.activeRunDestination)
-                }) else {
+                let foundTargets = self.allConfiguredTargets.filter { $0.target.guid == targetToPrepare.guid }
+                guard
+                    let selectedTarget = foundTargets.one(by: {
+                        buildRequestContext.selectConfiguredTargetForIndex($0, $1, hasEnabledIndexBuildArena: buildRequest.enableIndexBuildArena, runDestination: buildRequest.parameters.activeRunDestination)
+                    })
+                else {
                     continue
                 }
                 for task in taskStore.tasksForTarget(selectedTarget) {
@@ -605,21 +607,21 @@ package final class BuildDescriptionBuilder {
 
                 allOutputs.insert(Ref(MakePlannedVirtualNode(staleFileRemovalIdentifier)))
                 // It's a matter of convenience (I think - mhr) that the SFR task key here is the same as the SFR node added to "outputs" - they could be different, if we want them to be.
-                commandDefinitions["<\(staleFileRemovalIdentifier)>"] = OutputByteStream().writingJSONObject({
-                    $0["tool"] = "stale-file-removal"
-                    $0["expectedOutputs"] = outputPaths.map { $0.str }
-
-                    // Unwrap the configured target, as target-independent tasks don't have a set of root paths.
-                    if let configuredTarget = configuredTarget, let rootPaths = rootPathsPerTarget[configuredTarget] {
-                        $0["roots"] = rootPaths.map { $0.str }
-                    }
+                commandDefinitions["<\(staleFileRemovalIdentifier)>"] =
+                    OutputByteStream().writingJSONObject({
+                        $0["tool"] = "stale-file-removal"
+                        $0["expectedOutputs"] = outputPaths.map { $0.str }
+
+                        // Unwrap the configured target, as target-independent tasks don't have a set of root paths.
+                        if let configuredTarget = configuredTarget, let rootPaths = rootPathsPerTarget[configuredTarget] {
+                            $0["roots"] = rootPaths.map { $0.str }
+                        }
 
-                    $0["outputs"] = ["<\(staleFileRemovalIdentifier)>"]
-                }).bytes
+                        $0["outputs"] = ["<\(staleFileRemovalIdentifier)>"]
+                    }).bytes
             }
         }
 
-
         // Create the root target node.
         do {
             // The roots are any outputs which are never declared as an input.
@@ -628,11 +630,12 @@ package final class BuildDescriptionBuilder {
             let allRootIdentifiers = allOutputs.subtracting(allInputs).map({ $0.instance.identifier }).sorted()
 
             let stableIdentifier = "<all>"
-            commandDefinitions[stableIdentifier] = OutputByteStream().writingJSONObject({
-                $0["tool"] = "phony"
-                $0["inputs"] = allRootIdentifiers
-                $0["outputs"] = ["<all>"]
-            }).bytes
+            commandDefinitions[stableIdentifier] =
+                OutputByteStream().writingJSONObject({
+                    $0["tool"] = "phony"
+                    $0["inputs"] = allRootIdentifiers
+                    $0["outputs"] = ["<all>"]
+                }).bytes
         }
 
         func encodeIfNeeded(_ value: ByteString) -> ByteString {
@@ -653,7 +656,7 @@ package final class BuildDescriptionBuilder {
             "name": encodeIfNeeded("basic"),
             "version": ByteString(encodingAsUTF8: String(BuildDescription.manifestClientVersion)),
             "file-system": encodeIfNeeded(ByteString(encodingAsUTF8: fs.fileSystemMode.manifestLabel)),
-            "perform-ownership-analysis": SWBFeatureFlag.performOwnershipAnalysis.value ? encodeIfNeeded("yes") : encodeIfNeeded("no")
+            "perform-ownership-analysis": SWBFeatureFlag.performOwnershipAnalysis.value ? encodeIfNeeded("yes") : encodeIfNeeded("no"),
         ]
 
         let sections = [
@@ -673,8 +676,7 @@ package final class BuildDescriptionBuilder {
         // Pass the manifest data to the delegate.
         do {
             try delegate.recordManifest(targetDefinitions: targetDefinitions, toolDefinitions: toolDefinitions, nodeDefinitions: nodeDefinitions, commandDefinitions: commandDefinitions)
-        }
-        catch {
+        } catch {
             throw StubError.error("unable to record manifest to build description delegate: \(error)")
         }
 
@@ -694,8 +696,7 @@ package final class BuildDescriptionBuilder {
         let buildDescription: BuildDescription
         do {
             buildDescription = try BuildDescription(inDir: path, signature: signature, taskStore: frozenTaskStore, allOutputPaths: allOutputPaths, rootPathsPerTarget: rootPathsPerTarget, moduleCachePathsPerTarget: moduleCachePathsPerTarget, artifactInfoPerTarget: artifactInfoPerTarget, casValidationInfos: casValidationInfos, settingsPerTarget: settingsPerTarget, taskActionMap: taskActionMap, targetTaskCounts: targetTaskCounts, moduleSessionFilePath: moduleSessionFilePath, diagnostics: diagnosticsEngines.mapValues { engine in engine.diagnostics }, fs: fs, invalidationPaths: invalidationPaths, recursiveSearchPathResults: recursiveSearchPathResults, copiedPathMap: copiedPathMap, targetDependencies: targetDependencies, definingTargetsByModuleName: definingTargetsByModuleName, bypassActualTasks: bypassActualTasks, targetsBuildInParallel: targetsBuildInParallel, emitFrontendCommandLines: emitFrontendCommandLines)
-        }
-        catch {
+        } catch {
             throw StubError.error("unable to create build description: \(error)")
         }
 
@@ -703,8 +704,7 @@ package final class BuildDescriptionBuilder {
         do {
             try fs.createDirectory(buildDescription.manifestPath.dirname, recursive: true)
             try fs.write(buildDescription.manifestPath, contents: manifest.bytes, atomically: true)
-        }
-        catch {
+        } catch {
             throw StubError.error("unable to write manifest to '\(buildDescription.manifestPath.str)': \(error)")
         }
 
@@ -739,7 +739,7 @@ package final class BuildDescriptionBuilder {
         }
         if let info = mutatingTasks[Ref(task)], !info.commandDependencies.isEmpty {
             // If this is a mutating command, we must rewrite out any mutated input nodes...
-            inputs = inputs.filter{ !mutatedNodes.contains(Ref($0)) }
+            inputs = inputs.filter { !mutatedNodes.contains(Ref($0)) }
 
             // ... and append all the necessary command dependencies.
             //
@@ -767,7 +767,7 @@ package final class BuildDescriptionBuilder {
 
             // If this is a mutating command, we must rewrite out any mutated actual output nodes (downstream edges must be either themselves mutating, or depend on some other gate to introduce an ordering between them).
             if !info.commandDependencies.isEmpty {
-                outputs = outputs.filter{ !mutatedNodes.contains(Ref($0)) }
+                outputs = outputs.filter { !mutatedNodes.contains(Ref($0)) }
 
                 // We currently require producers to have defined an extra virtual node to use for the purposes of forcing the ordering of this command.
                 if outputs.isEmpty {
@@ -791,11 +791,11 @@ package final class BuildDescriptionBuilder {
             commandDefinitions[identifier.rawValue] = definition.bytes
 
             // Use this map later to diagnose the attempts to define multiple producers for an output
-            taskOutputMap[Ref(task), default:[]].append(contentsOf: outputs)
+            taskOutputMap[Ref(task), default: []].append(contentsOf: outputs)
 
             // Update the global input and output list.
-            allInputs.formUnion(inputs.map{ Ref($0) })
-            allOutputs.formUnion(outputs.map{ Ref($0) })
+            allInputs.formUnion(inputs.map { Ref($0) })
+            allOutputs.formUnion(outputs.map { Ref($0) })
         }
     }
 
@@ -809,14 +809,13 @@ package final class BuildDescriptionBuilder {
             // Add it to the definitions map.
             let identifier = node.identifier
             let newDefinition = definition.bytes
-                assert(!nodeDefinitions.contains(identifier) || nodeDefinitions[identifier] == newDefinition, "non-unique node identifier '\(identifier)'")
-                nodeDefinitions[identifier] = newDefinition
-            }
+            assert(!nodeDefinitions.contains(identifier) || nodeDefinitions[identifier] == newDefinition, "non-unique node identifier '\(identifier)'")
+            nodeDefinitions[identifier] = newDefinition
+        }
     }
 
     // MARK: Adding commands for PlannedTasks.
 
-
     /// Add a phony command definition for a task.
     ///
     /// - parameter task: The task to associate with the command.
@@ -1027,13 +1026,13 @@ extension BuildDescription {
     // FIXME: Bypass actual tasks should go away, eventually.
     //
     // FIXME: This layering isn't working well, we are plumbing a bunch of stuff through here just because we don't want to talk to TaskConstruction.
-    static package func construct(workspace: Workspace, tasks: [any PlannedTask], path: Path, signature: BuildDescriptionSignature, buildCommand: BuildCommand, diagnostics: [ConfiguredTarget?: [Diagnostic]] = [:], indexingInfo: [(forTarget: ConfiguredTarget?, path: Path, indexingInfo: any SourceFileIndexingInfo)] = [], fs: any FSProxy = localFS, bypassActualTasks: Bool = false, targetsBuildInParallel: Bool = true, emitFrontendCommandLines: Bool = false, moduleSessionFilePath: Path? = nil, invalidationPaths: [Path] = [], recursiveSearchPathResults: [RecursiveSearchPathResolver.CachedResult] = [], copiedPathMap: [String: String] = [:], rootPathsPerTarget: [ConfiguredTarget:[Path]] = [:], moduleCachePathsPerTarget: [ConfiguredTarget: [Path]] = [:], artifactInfoPerTarget: [ConfiguredTarget: ArtifactInfo] = [:], casValidationInfos: [BuildDescription.CASValidationInfo] = [], staleFileRemovalIdentifierPerTarget: [ConfiguredTarget?: String] = [:], settingsPerTarget: [ConfiguredTarget: Settings] = [:], delegate: any BuildDescriptionConstructionDelegate, targetDependencies: [TargetDependencyRelationship] = [], definingTargetsByModuleName: [String: OrderedSet<ConfiguredTarget>], userPreferences: UserPreferences) async throws -> BuildDescription? {
+    static package func construct(workspace: Workspace, tasks: [any PlannedTask], path: Path, signature: BuildDescriptionSignature, buildCommand: BuildCommand, diagnostics: [ConfiguredTarget?: [Diagnostic]] = [:], indexingInfo: [(forTarget: ConfiguredTarget?, path: Path, indexingInfo: any SourceFileIndexingInfo)] = [], fs: any FSProxy = localFS, bypassActualTasks: Bool = false, targetsBuildInParallel: Bool = true, emitFrontendCommandLines: Bool = false, moduleSessionFilePath: Path? = nil, invalidationPaths: [Path] = [], recursiveSearchPathResults: [RecursiveSearchPathResolver.CachedResult] = [], copiedPathMap: [String: String] = [:], rootPathsPerTarget: [ConfiguredTarget: [Path]] = [:], moduleCachePathsPerTarget: [ConfiguredTarget: [Path]] = [:], artifactInfoPerTarget: [ConfiguredTarget: ArtifactInfo] = [:], casValidationInfos: [BuildDescription.CASValidationInfo] = [], staleFileRemovalIdentifierPerTarget: [ConfiguredTarget?: String] = [:], settingsPerTarget: [ConfiguredTarget: Settings] = [:], delegate: any BuildDescriptionConstructionDelegate, targetDependencies: [TargetDependencyRelationship] = [], definingTargetsByModuleName: [String: OrderedSet<ConfiguredTarget>], userPreferences: UserPreferences) async throws -> BuildDescription? {
         var diagnostics = diagnostics
 
         // We operate on the sorted tasks here to ensure that the list of task additional inputs is deterministic.
         //
         // We need to sort on the stable identifiers in order to ensure the uniqueness of the sort.
-        let sortedTasks = tasks.sorted{ $0.identifier < $1.identifier }
+        let sortedTasks = tasks.sorted { $0.identifier < $1.identifier }
 
         let messageShortening = userPreferences.activityTextShorteningLevel
 
@@ -1127,7 +1126,7 @@ extension BuildDescription {
             if delegate.cancelled { return nil }
 
             // FIXME: Make this more efficient.
-            let mutatedNodes = Set<Ref<any PlannedNode>>(task.inputs.map{ Ref($0) }).intersection(Set<Ref<any PlannedNode>>(task.outputs.map{ Ref($0) }))
+            let mutatedNodes = Set<Ref<any PlannedNode>>(task.inputs.map { Ref($0) }).intersection(Set<Ref<any PlannedNode>>(task.outputs.map { Ref($0) }))
             for node in mutatedNodes {
                 let info = mutableNodes.getOrInsert(node) { MutableNodeInfo() }
                 info.mutatingTasks.append(task)
@@ -1171,10 +1170,13 @@ extension BuildDescription {
                 let childDiagnostics = creators.map({ .task($0.execTask) }).richFormattedRuleInfo(workspace: workspace)
 
                 diagnostics[nil, default: []].append(
-                    Diagnostic(behavior: .error,
-                               location: .unknown,
-                               data: DiagnosticData("Multiple commands produce '\(node.instance.path.str)'"),
-                               childDiagnostics: childDiagnostics))
+                    Diagnostic(
+                        behavior: .error,
+                        location: .unknown,
+                        data: DiagnosticData("Multiple commands produce '\(node.instance.path.str)'"),
+                        childDiagnostics: childDiagnostics
+                    )
+                )
             }
         }
 
@@ -1196,24 +1198,28 @@ extension BuildDescription {
             // This works because we enforce that every mutating command *must* be strongly ordered w.r.t. the creator and the other mutators, so that we know the order they should run in.
             func distance(from origin: any PlannedTask, to predecessor: any PlannedTask) -> Int? {
                 let ignoring = node
-                return minimumDistance(from: Ref(origin), to: Ref(predecessor), successors: { taskRef in
+                return minimumDistance(
+                    from: Ref(origin),
+                    to: Ref(predecessor),
+                    successors: { taskRef in
                         let task = taskRef.instance
                         var inputNodes = task.inputs
                         if let extraInputs = taskAdditionalInputs[Ref(task)] {
                             inputNodes += extraInputs.nodes
                         }
-                    let inputs = inputNodes.flatMap { input -> [Ref<any PlannedTask>] in
+                        let inputs = inputNodes.flatMap { input -> [Ref<any PlannedTask>] in
                             if input === ignoring { return [] }
 
-                            return producers[Ref(input)]?.map{ Ref($0) } ?? []
+                            return producers[Ref(input)]?.map { Ref($0) } ?? []
                         }
                         return inputs
-                    })
+                    }
+                )
             }
             let orderedMutatingTasks = info.mutatingTasks.sorted(by: {
-                    // A task precedes another iff there is exists some path to it.
-                    return distance(from: $1, to: $0) != nil
-                })
+                // A task precedes another iff there is exists some path to it.
+                return distance(from: $1, to: $0) != nil
+            })
 
             // Starting with the creator, create a command trigger for the next command in the mutating task chain.
             var producer = creator
@@ -1253,9 +1259,16 @@ extension BuildDescription {
                     var path = !isDirectory ? inputPath.dirname : inputPath
                     while !path.isEmpty && !path.isRoot {
                         if let tasks = paths[path] {
-                            diagnostics[nil, default: []].append(Diagnostic(behavior: .error, location: .unknown, data: DiagnosticData("Multiple commands produce conflicting outputs"), childDiagnostics: ([(pathString(inputPath, isDirectory: isDirectory), inputTask)] + tasks.map { task in (pathString(path, isDirectory: true), task) }).map { (path, task) in
-                                Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("\(path) (for task: \(task.ruleInfo))"))
-                            }))
+                            diagnostics[nil, default: []].append(
+                                Diagnostic(
+                                    behavior: .error,
+                                    location: .unknown,
+                                    data: DiagnosticData("Multiple commands produce conflicting outputs"),
+                                    childDiagnostics: ([(pathString(inputPath, isDirectory: isDirectory), inputTask)] + tasks.map { task in (pathString(path, isDirectory: true), task) }).map { (path, task) in
+                                        Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("\(path) (for task: \(task.ruleInfo))"))
+                                    }
+                                )
+                            )
                         }
                         path = path.dirname
                     }
@@ -1269,7 +1282,8 @@ extension BuildDescription {
             var ownedDirectories = DirectoryOutputs()
 
             // Create a list of tuples of all output nodes in the graph, and their creator tasks, sorted by depth (which is the same as lexicographic order in this case). The list may contain multiple entries for the same output path, if multiple tasks in the graph (erroneously) produce the same output. Assumes paths are normalized.
-            let outputNodesAndTasks = sortedTasks
+            let outputNodesAndTasks =
+                sortedTasks
                 .flatMap { task in task is GateTask ? [] : task.outputs.map { output in (output, task) } }
                 .sorted(by: { $0.0.path < $1.0.path })
 
@@ -1365,15 +1379,15 @@ extension BuildDescription {
 
                     try await group.waitForAll()
                 }
-            } catch is CancellationError  {
+            } catch is CancellationError {
                 return nil
             }
         }
 
         // Diagnose attempts to define multiple producers (tasks) for an output.
-        var outputsSet = Set<Ref<any PlannedNode>>() // for identifying duplicate output nodes across tasks
+        var outputsSet = Set<Ref<any PlannedNode>>()  // for identifying duplicate output nodes across tasks
         for (_, task) in sortedTasks.enumerated() {
-            let amendedOutputs = builder.taskOutputMap[Ref(task)] ?? [] // get the amended outputs of the task
+            let amendedOutputs = builder.taskOutputMap[Ref(task)] ?? []  // get the amended outputs of the task
             for output in amendedOutputs {
                 if outputsSet.contains(Ref(output)) {
                     // This condition should almost never appear on a user projects, but we surface   it as an error versus an assert in case there are valid situations where the user can author a project    that would hit it.
@@ -1498,7 +1512,7 @@ package extension PlannedNode {
 }
 
 extension BuildDescription.CASValidationInfo: Serializable {
-    package func serialize<T>(to serializer: T) where T : Serializer {
+    package func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serializeAggregate(2) {
             serializer.serialize(options)
             serializer.serialize(llvmCasExec)
@@ -1520,7 +1534,7 @@ extension BuildDescription.CASValidationInfo: Hashable {
         hasher.combine(options.casPath)
         hasher.combine(llvmCasExec)
     }
-    static package func ==(lhs: Self, rhs: Self) -> Bool {
+    static package func == (lhs: Self, rhs: Self) -> Bool {
         return lhs.options.casPath == rhs.options.casPath && lhs.llvmCasExec == rhs.llvmCasExec
     }
 }
diff --git a/Sources/SWBTaskExecution/BuildDescriptionManager.swift b/Sources/SWBTaskExecution/BuildDescriptionManager.swift
index e119cd92..525ee9eb 100644
--- a/Sources/SWBTaskExecution/BuildDescriptionManager.swift
+++ b/Sources/SWBTaskExecution/BuildDescriptionManager.swift
@@ -70,12 +70,18 @@ package enum BuildDescriptionMemoryCacheEvictionPolicy: Sendable, Hashable {
 ///
 /// It is intended to manage the construction of descriptions for incoming build requests (or other operations requiring a complete build description), and to work with the build descriptions to efficiently cache the results.
 package final class BuildDescriptionManager: Sendable {
-    static let descriptionsRequested = Statistic("BuildDescriptionManager.descriptionRequests",
-        "The number of build descriptions which were requested.")
-    static let descriptionsComputed = Statistic("BuildDescriptionManager.descriptionsComputed",
-        "The number of build descriptions which were computed.")
-    static let descriptionsLoaded = Statistic("BuildDescriptionManager.descriptionsLoaded",
-        "The number of build descriptions which were loaded from disk.")
+    static let descriptionsRequested = Statistic(
+        "BuildDescriptionManager.descriptionRequests",
+        "The number of build descriptions which were requested."
+    )
+    static let descriptionsComputed = Statistic(
+        "BuildDescriptionManager.descriptionsComputed",
+        "The number of build descriptions which were computed."
+    )
+    static let descriptionsLoaded = Statistic(
+        "BuildDescriptionManager.descriptionsLoaded",
+        "The number of build descriptions which were loaded from disk."
+    )
 
     /// The queue used to serialize access to the on-disk description cache.
     /// Right now this is only used to write the serialized cached descriptions to disk on a background thread and to remove them from disk, but not to read them or to access the index.  In order for this to be a problem, this description would need to be evicted from the in-memory cache and a new request for this description would need to come in before the description has been written.  A further refinement of this could involve ensuring that the in-memory copy never gets evicted until the on-disk copy has been written, or providing more sophisticated read/white synchronization of the individual on-disk cache items.
@@ -109,26 +115,32 @@ package final class BuildDescriptionManager: Sendable {
     package init(fs: any FSProxy, buildDescriptionMemoryCacheEvictionPolicy: BuildDescriptionMemoryCacheEvictionPolicy, maxCacheSize: (inMemory: Int, onDisk: Int) = (4, 4)) {
         self.fs = fs
         self.inMemoryCachedBuildDescriptions = withHeavyCacheGlobalState(isolated: buildDescriptionMemoryCacheEvictionPolicy == .never) {
-            HeavyCache(maximumSize: maxCacheSize.inMemory, evictionPolicy: {
-                switch buildDescriptionMemoryCacheEvictionPolicy {
-                case .never:
-                    .never
-                case .default(let totalCostLimit):
-                    .default(totalCostLimit: totalCostLimit, willEvictCallback: { buildDescription in
-                        // Capture the path to a local variable so that the buildDescription instance isn't retained by OSLog's autoclosure message parameter.
-                        let packagePath = buildDescription.packagePath
-                        #if canImport(os)
-                        OSLog.log("Evicted cached build description at '\(packagePath.str)'")
-                        #endif
-                    })
-                }
-            }())
+            HeavyCache(
+                maximumSize: maxCacheSize.inMemory,
+                evictionPolicy: {
+                    switch buildDescriptionMemoryCacheEvictionPolicy {
+                    case .never:
+                        .never
+                    case .default(let totalCostLimit):
+                        .default(
+                            totalCostLimit: totalCostLimit,
+                            willEvictCallback: { buildDescription in
+                                // Capture the path to a local variable so that the buildDescription instance isn't retained by OSLog's autoclosure message parameter.
+                                let packagePath = buildDescription.packagePath
+                                #if canImport(os)
+                                    OSLog.log("Evicted cached build description at '\(packagePath.str)'")
+                                #endif
+                            }
+                        )
+                    }
+                }()
+            )
         }
         self.maxCacheSize = maxCacheSize
     }
 
     package func waitForBuildDescriptionSerialization() async {
-        await onDiskCacheAccessQueue.sync { }
+        await onDiskCacheAccessQueue.sync {}
     }
 
     /// Construct the appropriate build plan for a plan request.
@@ -140,7 +152,6 @@ package final class BuildDescriptionManager: Sendable {
         return await BuildPlan(planRequest: planRequest, taskPlanningDelegate: BuildSystemTaskPlanningDelegate(buildDescriptionPath: descriptionPath, clientDelegate, constructionDelegate: constructionDelegate, qos: planRequest.buildRequest.qos, fileSystem: localFS))
     }
 
-
     /// Construct the build description to use for a particular workspace and request.
     ///
     /// NOTE: This is primarily accessible for performance testing purposes, actual clients should prefer to access via the cached methods.
@@ -180,8 +191,8 @@ package final class BuildDescriptionManager: Sendable {
 
         // Compute the default configuration name, platform and root paths per target
         var staleFileRemovalIdentifierPerTarget = [ConfiguredTarget?: String]()
-        var settingsPerTarget = [ConfiguredTarget:Settings]()
-        var rootPathsPerTarget = [ConfiguredTarget:[Path]]()
+        var settingsPerTarget = [ConfiguredTarget: Settings]()
+        var rootPathsPerTarget = [ConfiguredTarget: [Path]]()
         var moduleCachePathsPerTarget = [ConfiguredTarget: [Path]]()
         var artifactInfoPerTarget = [ConfiguredTarget: ArtifactInfo]()
 
@@ -312,7 +323,7 @@ package final class BuildDescriptionManager: Sendable {
         func signature(cacheDir: Path) throws -> BuildDescriptionSignature {
             switch self {
             case .newOrCached(let planRequest, _, _, _): return try BuildDescriptionSignature.buildDescriptionSignature(planRequest, cacheDir: cacheDir)
-            case .cachedOnly(let buildDescriptionID, _, _, _, _):  return BuildDescriptionSignature.buildDescriptionSignature(buildDescriptionID)
+            case .cachedOnly(let buildDescriptionID, _, _, _, _): return BuildDescriptionSignature.buildDescriptionSignature(buildDescriptionID)
             }
         }
     }
@@ -422,16 +433,20 @@ package final class BuildDescriptionManager: Sendable {
     }
 
     package func releaseBuildDescription(id: BuildDescriptionID) {
-        self.retainedBuildDescriptions.update(BuildDescriptionSignature.buildDescriptionSignature(id), update: {
-            let newCount = $0.1 - 1
-            if newCount == 0 {
-                return nil
-            } else {
-                return ($0.0, newCount)
+        self.retainedBuildDescriptions.update(
+            BuildDescriptionSignature.buildDescriptionSignature(id),
+            update: {
+                let newCount = $0.1 - 1
+                if newCount == 0 {
+                    return nil
+                } else {
+                    return ($0.0, newCount)
+                }
+            },
+            default: {
+                nil
             }
-        }, default: {
-            nil
-        })
+        )
     }
 
     /// Returns the path in which the`XCBuildData` directory will live. That location is uses to cache build descriptions for a particular workspace and request, the manifest, and the `build.db` database for llbuild.
@@ -490,7 +505,6 @@ package final class BuildDescriptionManager: Sendable {
         let userPreferences = request.workspaceContext.userPreferences
         let messageShortening = userPreferences.activityTextShorteningLevel
 
-
         if messageShortening != .full || userPreferences.enableDebugActivityLogs {
             constructionDelegate.updateProgress(statusMessage: "Attempting to load build description from disk", showInLog: request.workspaceContext.userPreferences.enableDebugActivityLogs)
         }
@@ -512,15 +526,23 @@ package final class BuildDescriptionManager: Sendable {
 
         // Output the difference in signatures for debugging if we already had a build plan
         if request.workspaceContext.userPreferences.enableDebugActivityLogs,
-           !request.isForIndex || request.isIndexWorkspaceDescription {
+            !request.isForIndex || request.isIndexWorkspaceDescription
+        {
             let lastBuildPlanRequest = request.isForIndex ? lastIndexBuildPlanRequest.withLock({ $0 }) : lastBuildPlanRequest.withLock({ $0 })
             if let planRequest = request.planRequest, let lastBuildPlanRequest = lastBuildPlanRequest {
                 do {
                     if let diff = try BuildDescriptionSignature.compareBuildDescriptionSignatures(planRequest, lastBuildPlanRequest, onDiskPath) {
-                        constructionDelegate.emit(Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("New build description required because the signature changed"), childDiagnostics: [
-                            Diagnostic(behavior: .note, location: .path(diff.previousSignaturePath), data: DiagnosticData("Previous signature: \(diff.previousSignaturePath.str)")),
-                            Diagnostic(behavior: .note, location: .path(diff.currentSignaturePath), data: DiagnosticData("Current signature: \(diff.currentSignaturePath.str)")),
-                        ]))
+                        constructionDelegate.emit(
+                            Diagnostic(
+                                behavior: .note,
+                                location: .unknown,
+                                data: DiagnosticData("New build description required because the signature changed"),
+                                childDiagnostics: [
+                                    Diagnostic(behavior: .note, location: .path(diff.previousSignaturePath), data: DiagnosticData("Previous signature: \(diff.previousSignaturePath.str)")),
+                                    Diagnostic(behavior: .note, location: .path(diff.currentSignaturePath), data: DiagnosticData("Current signature: \(diff.currentSignaturePath.str)")),
+                                ]
+                            )
+                        )
                     }
                 } catch {
                     constructionDelegate.emit(Diagnostic(behavior: .error, location: .unknown, data: DiagnosticData("\(error)")))
@@ -600,8 +622,7 @@ package final class BuildDescriptionManager: Sendable {
             if let buildRequestJSON = request.buildRequest.jsonRepresentation {
                 try self.fs.write(buildDescription.buildRequestPath, contents: ByteString(buildRequestJSON))
             }
-        }
-        catch {
+        } catch {
             // Ignore errors - the failure case is that the description will be recreated for a later build if it's not still in memory.  This is a performance hit, but should only occur in strange cases (e.g., the cache directory is not writable, the disk is full, etc.) and is not (I hope) worth nagging the user about.
         }
     }
@@ -665,10 +686,8 @@ package final class BuildDescriptionManager: Sendable {
     }
 }
 
-
 // MARK:
 
-
 /// The delegate for planning BuildSystem compatible tasks.
 private final class BuildSystemTaskPlanningDelegate: TaskPlanningDelegate {
     private let diagnosticsEngines = LockedValue<[ConfiguredTarget?: DiagnosticsEngine]>([:])
diff --git a/Sources/SWBTaskExecution/BuildDescriptionSignature.swift b/Sources/SWBTaskExecution/BuildDescriptionSignature.swift
index c711afae..b9f9147f 100644
--- a/Sources/SWBTaskExecution/BuildDescriptionSignature.swift
+++ b/Sources/SWBTaskExecution/BuildDescriptionSignature.swift
@@ -85,12 +85,14 @@ package struct BuildDescriptionSignatureComponents: Codable, Hashable, Sendable
                 buildParameters: $0.parameters,
                 provisioningInputs: request.provisioningInputs(for: $0),
                 macroConfigSignature: request.buildRequestContext.getCachedSettings($0.parameters, target: $0.target).macroConfigSignature,
-                specializeGuidForActiveRunDestination: $0.specializeGuidForActiveRunDestination)
+                specializeGuidForActiveRunDestination: $0.specializeGuidForActiveRunDestination
+            )
         }
         projects = request.workspaceContext.workspace.projects.map {
             ProjectMetadata(
                 name: $0.name,
-                macroConfigSignature: request.buildRequestContext.getCachedSettings(request.buildRequest.parameters, project: $0).macroConfigSignature)
+                macroConfigSignature: request.buildRequestContext.getCachedSettings(request.buildRequest.parameters, project: $0).macroConfigSignature
+            )
         }
         systemInfo = request.workspaceContext.systemInfo
         userInfo = request.workspaceContext.userInfo
diff --git a/Sources/SWBTaskExecution/BuiltinTaskActionsExtension.swift b/Sources/SWBTaskExecution/BuiltinTaskActionsExtension.swift
index 299a2962..6f589277 100644
--- a/Sources/SWBTaskExecution/BuiltinTaskActionsExtension.swift
+++ b/Sources/SWBTaskExecution/BuiltinTaskActionsExtension.swift
@@ -16,7 +16,7 @@ public struct BuiltinTaskActionsExtension: TaskActionExtension {
     public init() {
     }
 
-    public var taskActionImplementations: [SerializableTypeCode : any PolymorphicSerializable.Type] {
+    public var taskActionImplementations: [SerializableTypeCode: any PolymorphicSerializable.Type] {
         [
             1: AuxiliaryFileTaskAction.self,
             2: CopyPlistTaskAction.self,
diff --git a/Sources/SWBTaskExecution/DynamicTaskSpecs/ClangCachingOutputMaterializerDynamicTaskSpec.swift b/Sources/SWBTaskExecution/DynamicTaskSpecs/ClangCachingOutputMaterializerDynamicTaskSpec.swift
index d5e22064..f1c93242 100644
--- a/Sources/SWBTaskExecution/DynamicTaskSpecs/ClangCachingOutputMaterializerDynamicTaskSpec.swift
+++ b/Sources/SWBTaskExecution/DynamicTaskSpecs/ClangCachingOutputMaterializerDynamicTaskSpec.swift
@@ -31,7 +31,7 @@ public struct ClangCachingOutputMaterializerTaskKey: Serializable, CustomDebugSt
         self.outputName = outputName
     }
 
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serializeAggregate(4) {
             serializer.serialize(libclangPath)
             serializer.serialize(casOptions)
diff --git a/Sources/SWBTaskExecution/DynamicTaskSpecs/ClangCachingTaskCacheKey.swift b/Sources/SWBTaskExecution/DynamicTaskSpecs/ClangCachingTaskCacheKey.swift
index d128d5d9..beed2b9c 100644
--- a/Sources/SWBTaskExecution/DynamicTaskSpecs/ClangCachingTaskCacheKey.swift
+++ b/Sources/SWBTaskExecution/DynamicTaskSpecs/ClangCachingTaskCacheKey.swift
@@ -24,7 +24,7 @@ public struct ClangCachingTaskCacheKey: Serializable, CustomDebugStringConvertib
         self.cacheKey = cacheKey
     }
 
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serializeAggregate(3) {
             serializer.serialize(libclangPath)
             serializer.serialize(casOptions)
diff --git a/Sources/SWBTaskExecution/DynamicTaskSpecs/ClangModuleDependencyGraph.swift b/Sources/SWBTaskExecution/DynamicTaskSpecs/ClangModuleDependencyGraph.swift
index 2f787667..13b31bcf 100644
--- a/Sources/SWBTaskExecution/DynamicTaskSpecs/ClangModuleDependencyGraph.swift
+++ b/Sources/SWBTaskExecution/DynamicTaskSpecs/ClangModuleDependencyGraph.swift
@@ -33,7 +33,7 @@ package final class ClangModuleDependencyGraph {
             /// Dependency info for an explicitly-built module.
             case module(pcmOutputPath: Path)
 
-            package func serialize<T>(to serializer: T) where T : SWBUtil.Serializer {
+            package func serialize<T>(to serializer: T) where T: SWBUtil.Serializer {
                 serializer.serializeAggregate(2) {
                     switch self {
                     case .command:
@@ -88,7 +88,7 @@ package final class ClangModuleDependencyGraph {
                 self.arguments = arguments
             }
 
-            package func serialize<T>(to serializer: T) where T : Serializer {
+            package func serialize<T>(to serializer: T) where T: Serializer {
                 serializer.serializeAggregate(2) {
                     serializer.serialize(cacheKey)
                     serializer.serialize(arguments)
@@ -164,7 +164,7 @@ package final class ClangModuleDependencyGraph {
             self.usesSerializedDiagnostics = usesSerializedDiagnostics
         }
 
-        package func serialize<T>(to serializer: T) where T : Serializer {
+        package func serialize<T>(to serializer: T) where T: Serializer {
             serializer.serializeAggregate(10) {
                 serializer.serialize(kind)
                 serializer.serialize(files)
@@ -206,7 +206,7 @@ package final class ClangModuleDependencyGraph {
     private var scannerRegistry: [LibclangRegistryKey: LibclangWithScanner] = [:]
 
     package func waitForCompletion() async {
-        await registryQueue.sync(flags: .barrier) { }
+        await registryQueue.sync(flags: .barrier) {}
     }
 
     private struct LibclangWithScanner {
@@ -316,7 +316,8 @@ package final class ClangModuleDependencyGraph {
     ) throws -> ScanResult {
         let clangWithScanner = try libclangWithScanner(forPath: libclangPath, casOptions: casOptions, cacheFallbackIfNotAvailable: cacheFallbackIfNotAvailable, core: core)
 
-        let (compilerLauncher, compiler, originalFileArgs) = usesCompilerLauncher
+        let (compilerLauncher, compiler, originalFileArgs) =
+            usesCompilerLauncher
             ? (fileCommandLine[0], fileCommandLine[1], fileCommandLine[2...])
             : (nil, fileCommandLine[0], fileCommandLine[1...])
 
@@ -370,7 +371,7 @@ package final class ClangModuleDependencyGraph {
                             return depModules
                         }
 
-                        let nameToIdx: [String: Int] = depModules.map{ $0.name + ":" + $0.context_hash }.enumerated().reduce(into: [:]) { (dict, indexAndKey) in
+                        let nameToIdx: [String: Int] = depModules.map { $0.name + ":" + $0.context_hash }.enumerated().reduce(into: [:]) { (dict, indexAndKey) in
                             let (index, key) = indexAndKey
                             dict[key] = index
                         }
@@ -444,7 +445,8 @@ package final class ClangModuleDependencyGraph {
                                     scanningCommandLine: scanningCommandLine,
                                     transitiveIncludeTreeIDs: transitiveIncludeTreeIDs,
                                     transitiveCompileCommandCacheKeys: transitiveCommandCacheKeys,
-                                    usesSerializedDiagnostics: usesSerializedDiagnostics)
+                                    usesSerializedDiagnostics: usesSerializedDiagnostics
+                                )
                                 if reportRequiredTargetDependencies != .no, let targetDependencies = definingTargetsByModuleName[module.name] {
                                     requiredTargetDependencies.withLock {
                                         for targetDependency in targetDependencies {
@@ -526,7 +528,8 @@ package final class ClangModuleDependencyGraph {
             scanningCommandLine: scanningCommandLine,
             transitiveIncludeTreeIDs: transitiveIncludeTreeIDs,
             transitiveCompileCommandCacheKeys: transitiveCommandCacheKeys,
-            usesSerializedDiagnostics: usesSerializedDiagnostics)
+            usesSerializedDiagnostics: usesSerializedDiagnostics
+        )
         try recordedDependencyInfoRegistry.getOrInsert(scanningOutputPath, isValid: { _ in true }) {
             try register(path: scanningOutputPath, dependencyInfo: dependencyInfo, fileSystem: fileSystem)
         }
@@ -571,8 +574,12 @@ package final class ClangModuleDependencyGraph {
         }
     }
 
-    package func generateReproducer(forFailedDependency dependency: DependencyInfo,
-                                    libclangPath: Path, casOptions: CASOptions?, location: String?) throws -> String? {
+    package func generateReproducer(
+        forFailedDependency dependency: DependencyInfo,
+        libclangPath: Path,
+        casOptions: CASOptions?,
+        location: String?
+    ) throws -> String? {
         let clangWithScanner = try libclangWithScanner(
             forPath: libclangPath,
             casOptions: casOptions,
@@ -583,7 +590,10 @@ package final class ClangModuleDependencyGraph {
             return nil
         }
         return try clangWithScanner.scanner.generateReproducer(
-            commandLine: dependency.scanningCommandLine, workingDirectory: dependency.workingDirectory.str, location: location)
+            commandLine: dependency.scanningCommandLine,
+            workingDirectory: dependency.workingDirectory.str,
+            location: location
+        )
     }
 
     package var isEmpty: Bool {
@@ -621,19 +631,21 @@ package final class ClangModuleDependencyGraph {
             summaryCSV.writeRow([moduleName, "\(variants.count)"])
             summaryMessage += "\(moduleName): \(variants.count == 1 ? "1 variant" : "\(variants.count) variants")\n"
 
-            let mergeResult = nWayMerge(variants.map {
-                (["CWD: \($0.workingDirectory.str)"] + ($0.commands.only?.arguments ?? [])).filter {
-                    if ["pcm", "dia", "d"].contains(Path($0).fileExtension) {
-                        // Filter differences in module paths, they are a function of the other args
-                        return false
-                    } else if $0.hasPrefix("llvmcas://") {
-                        // Filter differences in CAS URLs, they are a function of the other args
-                        return false
-                    } else {
-                        return true
+            let mergeResult = nWayMerge(
+                variants.map {
+                    (["CWD: \($0.workingDirectory.str)"] + ($0.commands.only?.arguments ?? [])).filter {
+                        if ["pcm", "dia", "d"].contains(Path($0).fileExtension) {
+                            // Filter differences in module paths, they are a function of the other args
+                            return false
+                        } else if $0.hasPrefix("llvmcas://") {
+                            // Filter differences in CAS URLs, they are a function of the other args
+                            return false
+                        } else {
+                            return true
+                        }
                     }
                 }
-            }).filter {
+            ).filter {
                 if $0.elementOf.count == variants.count {
                     // Don't report args common to all variants
                     return false
diff --git a/Sources/SWBTaskExecution/DynamicTaskSpecs/CompilationCachingDataPruner.swift b/Sources/SWBTaskExecution/DynamicTaskSpecs/CompilationCachingDataPruner.swift
index 6b9a2949..6b6ba197 100644
--- a/Sources/SWBTaskExecution/DynamicTaskSpecs/CompilationCachingDataPruner.swift
+++ b/Sources/SWBTaskExecution/DynamicTaskSpecs/CompilationCachingDataPruner.swift
@@ -25,7 +25,7 @@ package struct ClangCachingPruneDataTaskKey: Hashable, Serializable, CustomDebug
         self.casOptions = casOptions
     }
 
-    package func serialize<T>(to serializer: T) where T : Serializer {
+    package func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serializeAggregate(2) {
             serializer.serialize(path)
             serializer.serialize(casOptions)
@@ -81,11 +81,11 @@ package final class CompilationCachingDataPruner: Sendable {
     ) {
         let casOpts = key.casOptions
         guard casOpts.limitingStrategy != .discarded else {
-            return // No need to prune, CAS directory is getting deleted.
+            return  // No need to prune, CAS directory is getting deleted.
         }
         let inserted = state.withLock { $0.prunedCASes.insert(key).inserted }
         guard inserted else {
-            return // already pruned
+            return  // already pruned
         }
 
         startedAction()
@@ -108,8 +108,8 @@ package final class CompilationCachingDataPruner: Sendable {
                 executionDescription: "Clang caching pruning \(casPath) using \(libclangPath)",
                 signature: signature,
                 target: nil,
-                parentActivity: nil)
-            { activityID in
+                parentActivity: nil
+            ) { activityID in
                 let status: BuildOperationTaskEnded.Status
                 do {
                     let dbSize = try ByteCount(casDBs.getOndiskSize())
@@ -150,11 +150,11 @@ package final class CompilationCachingDataPruner: Sendable {
     ) {
         let casOpts = key.casOptions
         guard casOpts.limitingStrategy != .discarded else {
-            return // No need to prune, CAS directory is getting deleted.
+            return  // No need to prune, CAS directory is getting deleted.
         }
         let inserted = state.withLock { $0.prunedCASes.insert(key).inserted }
         guard inserted else {
-            return // already pruned
+            return  // already pruned
         }
 
         startedAction()
@@ -177,8 +177,8 @@ package final class CompilationCachingDataPruner: Sendable {
                 executionDescription: "Swift caching pruning \(casPath) using \(swiftscanPath)",
                 signature: signature,
                 target: nil,
-                parentActivity: nil)
-            { activityID in
+                parentActivity: nil
+            ) { activityID in
                 let status: BuildOperationTaskEnded.Status
                 do {
                     let dbSize = try ByteCount(casDBs.getStorageSize())
@@ -219,11 +219,11 @@ package final class CompilationCachingDataPruner: Sendable {
     ) {
         let casOpts = key.casOptions
         guard casOpts.limitingStrategy != .discarded else {
-            return // No need to prune, CAS directory is getting deleted.
+            return  // No need to prune, CAS directory is getting deleted.
         }
         let inserted = state.withLock { $0.prunedCASes.insert(key).inserted }
         guard inserted else {
-            return // already pruned
+            return  // already pruned
         }
 
         startedAction()
@@ -246,8 +246,8 @@ package final class CompilationCachingDataPruner: Sendable {
                 executionDescription: "Pruning \(casPath) using \(path)",
                 signature: signature,
                 target: nil,
-                parentActivity: nil)
-            { activityID in
+                parentActivity: nil
+            ) { activityID in
                 let status: BuildOperationTaskEnded.Status
                 do {
                     let dbSize = try? ByteCount(toolchainCAS.getOnDiskSize())
diff --git a/Sources/SWBTaskExecution/DynamicTaskSpecs/CompilationCachingUploader.swift b/Sources/SWBTaskExecution/DynamicTaskSpecs/CompilationCachingUploader.swift
index b159d23c..82e19ea6 100644
--- a/Sources/SWBTaskExecution/DynamicTaskSpecs/CompilationCachingUploader.swift
+++ b/Sources/SWBTaskExecution/DynamicTaskSpecs/CompilationCachingUploader.swift
@@ -16,7 +16,7 @@ import SWBUtil
 import Foundation
 
 #if canImport(os)
-import os
+    import os
 #endif
 
 /// Manages uploading compilation caching outputs in the background, when a remote cache is enabled.
@@ -63,7 +63,7 @@ package final class CompilationCachingUploader {
     ) {
         let inserted = lock.withLock { uploadedKeys.insert(cacheKey).inserted }
         guard inserted else {
-            return // already uploaded
+            return  // already uploaded
         }
 
         startedUpload()
@@ -123,7 +123,7 @@ package final class CompilationCachingUploader {
     ) {
         let inserted = lock.withLock { uploadedKeys.insert(cacheKey).inserted }
         guard inserted else {
-            return // already uploaded
+            return  // already uploaded
         }
 
         startedUpload()
@@ -144,9 +144,11 @@ package final class CompilationCachingUploader {
             if enableDiagnosticRemarks {
                 for output in try swiftCompilation.getOutputs() {
                     activityReporter.emit(
-                        diagnostic: Diagnostic(behavior: .note,
-                                               location: .unknown,
-                                               data: DiagnosticData("uploaded CAS output \(output.kindName): \(output.casID)")),
+                        diagnostic: Diagnostic(
+                            behavior: .note,
+                            location: .unknown,
+                            data: DiagnosticData("uploaded CAS output \(output.kindName): \(output.casID)")
+                        ),
                         for: activityID,
                         signature: signature
                     )
diff --git a/Sources/SWBTaskExecution/DynamicTaskSpecs/DynamicTaskOperationContext.swift b/Sources/SWBTaskExecution/DynamicTaskSpecs/DynamicTaskOperationContext.swift
index c9545df7..fc2a56b9 100644
--- a/Sources/SWBTaskExecution/DynamicTaskSpecs/DynamicTaskOperationContext.swift
+++ b/Sources/SWBTaskExecution/DynamicTaskSpecs/DynamicTaskOperationContext.swift
@@ -54,7 +54,7 @@ public final class DynamicTaskOperationContext {
 
 /// Opaque "token" used to enforce that ``DynamicTaskOperationContext/waitForCompletion()`` is always called immediately prior to invoking ``DynamicTaskOperationContext/reset(completionToken:)``.
 package struct DynamicTaskOperationContextCompletionToken: Sendable {
-    fileprivate init() { }
+    fileprivate init() {}
     consuming fileprivate func run(body: () -> Void) {
         body()
     }
diff --git a/Sources/SWBTaskExecution/DynamicTaskSpecs/PrecompileClangModuleDynamicTaskSpec.swift b/Sources/SWBTaskExecution/DynamicTaskSpecs/PrecompileClangModuleDynamicTaskSpec.swift
index 6bc16e1f..e0ab80aa 100644
--- a/Sources/SWBTaskExecution/DynamicTaskSpecs/PrecompileClangModuleDynamicTaskSpec.swift
+++ b/Sources/SWBTaskExecution/DynamicTaskSpecs/PrecompileClangModuleDynamicTaskSpec.swift
@@ -91,7 +91,7 @@ final class PrecompileClangModuleDynamicTaskSpec: DynamicTaskSpec {
             self.fileNameMapPath = fileNameMapPath
         }
 
-        func serialize<T>(to serializer: T) where T : SWBUtil.Serializer {
+        func serialize<T>(to serializer: T) where T: SWBUtil.Serializer {
             serializer.serializeAggregate(3) {
                 serializer.serialize(serializedDiagnosticsPath)
                 serializer.serialize(fileNameMapPath)
diff --git a/Sources/SWBTaskExecution/DynamicTaskSpecs/SwiftCachingTaskKeys.swift b/Sources/SWBTaskExecution/DynamicTaskSpecs/SwiftCachingTaskKeys.swift
index dd7c4981..089ee8b8 100644
--- a/Sources/SWBTaskExecution/DynamicTaskSpecs/SwiftCachingTaskKeys.swift
+++ b/Sources/SWBTaskExecution/DynamicTaskSpecs/SwiftCachingTaskKeys.swift
@@ -24,7 +24,7 @@ public struct SwiftCachingKeyQueryTaskKey: Serializable, CustomDebugStringConver
         self.compilerLocation = compilerLocation
     }
 
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serializeAggregate(3) {
             serializer.serialize(casOptions)
             serializer.serialize(cacheKeys)
@@ -62,7 +62,7 @@ public struct SwiftCachingOutputMaterializerTaskKey: Serializable, CustomDebugSt
         self.compilerLocation = compilerLocation
     }
 
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serializeAggregate(4) {
             serializer.serialize(casOptions)
             serializer.serialize(casID)
diff --git a/Sources/SWBTaskExecution/DynamicTaskSpecs/SwiftDriverJobDynamicTaskSpec.swift b/Sources/SWBTaskExecution/DynamicTaskSpecs/SwiftDriverJobDynamicTaskSpec.swift
index 127e3047..035662a7 100644
--- a/Sources/SWBTaskExecution/DynamicTaskSpecs/SwiftDriverJobDynamicTaskSpec.swift
+++ b/Sources/SWBTaskExecution/DynamicTaskSpecs/SwiftDriverJobDynamicTaskSpec.swift
@@ -35,7 +35,7 @@ public struct SwiftDriverJobTaskKey: Serializable, CustomDebugStringConvertible
         self.casOptions = casOptions
     }
 
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serializeAggregate(8) {
             serializer.serialize(identifier)
             serializer.serialize(variant)
@@ -80,7 +80,7 @@ public struct SwiftDriverExplicitDependencyJobTaskKey: Serializable, CustomDebug
         self.casOptions = casOptions
     }
 
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serializeAggregate(5) {
             serializer.serialize(arch)
             serializer.serialize(driverJobKey)
@@ -125,7 +125,7 @@ struct SwiftDriverJobDynamicTaskPayload: TaskPayload {
         self.casOptions = try deserializer.deserialize()
     }
 
-    func serialize<T>(to serializer: T) where T : Serializer {
+    func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serializeAggregate(4) {
             serializer.serialize(expectedOutputs)
             serializer.serialize(isUsingWholeModuleOptimization)
@@ -139,7 +139,7 @@ final class SwiftDriverJobDynamicTaskSpec: DynamicTaskSpec {
     func buildExecutableTask(dynamicTask: DynamicTask, context: DynamicTaskOperationContext) throws -> any ExecutableTask {
         let commandLinePrefix: [ByteString] = [
             "builtin-swiftTaskExecution",
-            "--"
+            "--",
         ]
         var commandLine: [ByteString]
         let expectedOutputs: [Path]
@@ -150,59 +150,60 @@ final class SwiftDriverJobDynamicTaskSpec: DynamicTaskSpec {
         let compilerLocation: LibSwiftDriver.CompilerLocation
         let casOpts: CASOptions?
         switch dynamicTask.taskKey {
-            case .swiftDriverJob(let key):
-                guard let job = try context.swiftModuleDependencyGraph.queryPlannedBuild(for: key.identifier).plannedTargetJob(for: key.driverJobKey)?.driverJob else {
-                    throw StubError.error("Failed to lookup Swift driver job \(key.driverJobKey) in build plan \(key.identifier)")
-                }
-                commandLine = commandLinePrefix + job.commandLine
-                expectedOutputs = job.outputs
-                ruleInfo = ["Swift\(job.ruleInfoType)", key.variant, key.arch, job.descriptionForLifecycle] + job.displayInputs.map(\.str)
-                forTarget = dynamicTask.target
-                descriptionForLifecycle = job.descriptionForLifecycle
-                isUsingWholeModuleOptimization = key.isUsingWholeModuleOptimization
-                compilerLocation = key.compilerLocation
-                casOpts = key.casOptions
-            case .swiftDriverExplicitDependencyJob(let key):
-                guard let job = context.swiftModuleDependencyGraph.plannedExplicitDependencyBuildJob(for: key.driverJobKey)?.driverJob else {
-                    throw StubError.error("Failed to lookup explicit modules Swift driver job \(key.driverJobKey)")
-                }
-                commandLine = commandLinePrefix + job.commandLine
-                expectedOutputs = job.outputs
-                assert(expectedOutputs.count > 0, "Explicit modules job was expected to have at least one primary output")
-                ruleInfo = ["SwiftExplicitDependency\(job.ruleInfoType)", key.arch, expectedOutputs.first?.str ?? "<unknown>"]
-                forTarget = nil
-                descriptionForLifecycle = job.descriptionForLifecycle
-                // WMO doesn't apply to explicit module builds
-                isUsingWholeModuleOptimization = false
-                compilerLocation = key.compilerLocation
-                casOpts = key.casOptions
-            default:
-                fatalError("Unexpected dynamic task: \(dynamicTask)")
+        case .swiftDriverJob(let key):
+            guard let job = try context.swiftModuleDependencyGraph.queryPlannedBuild(for: key.identifier).plannedTargetJob(for: key.driverJobKey)?.driverJob else {
+                throw StubError.error("Failed to lookup Swift driver job \(key.driverJobKey) in build plan \(key.identifier)")
+            }
+            commandLine = commandLinePrefix + job.commandLine
+            expectedOutputs = job.outputs
+            ruleInfo = ["Swift\(job.ruleInfoType)", key.variant, key.arch, job.descriptionForLifecycle] + job.displayInputs.map(\.str)
+            forTarget = dynamicTask.target
+            descriptionForLifecycle = job.descriptionForLifecycle
+            isUsingWholeModuleOptimization = key.isUsingWholeModuleOptimization
+            compilerLocation = key.compilerLocation
+            casOpts = key.casOptions
+        case .swiftDriverExplicitDependencyJob(let key):
+            guard let job = context.swiftModuleDependencyGraph.plannedExplicitDependencyBuildJob(for: key.driverJobKey)?.driverJob else {
+                throw StubError.error("Failed to lookup explicit modules Swift driver job \(key.driverJobKey)")
+            }
+            commandLine = commandLinePrefix + job.commandLine
+            expectedOutputs = job.outputs
+            assert(expectedOutputs.count > 0, "Explicit modules job was expected to have at least one primary output")
+            ruleInfo = ["SwiftExplicitDependency\(job.ruleInfoType)", key.arch, expectedOutputs.first?.str ?? "<unknown>"]
+            forTarget = nil
+            descriptionForLifecycle = job.descriptionForLifecycle
+            // WMO doesn't apply to explicit module builds
+            isUsingWholeModuleOptimization = false
+            compilerLocation = key.compilerLocation
+            casOpts = key.casOptions
+        default:
+            fatalError("Unexpected dynamic task: \(dynamicTask)")
         }
 
         if !supportsParseableOutput(for: ruleInfo) {
             commandLine = commandLine.filter({ $0 != "-frontend-parseable-output" })
         }
 
-        return Task(type: self,
-                    payload:
-                        SwiftDriverJobDynamicTaskPayload(
-                            expectedOutputs: expectedOutputs,
-                            isUsingWholeModuleOptimization: isUsingWholeModuleOptimization,
-                            compilerLocation: compilerLocation,
-                            casOptions: casOpts
-                        ),
-                    forTarget: forTarget,
-                    ruleInfo: ruleInfo,
-                    commandLine: commandLine.map { .literal($0) },
-                    environment: dynamicTask.environment,
-                    workingDirectory: dynamicTask.workingDirectory,
-                    showEnvironment: dynamicTask.showEnvironment,
-                    execDescription: descriptionForLifecycle,
-                    preparesForIndexing: true,
-                    showCommandLineInLog: false,
-                    isDynamic: true
-                )
+        return Task(
+            type: self,
+            payload:
+                SwiftDriverJobDynamicTaskPayload(
+                    expectedOutputs: expectedOutputs,
+                    isUsingWholeModuleOptimization: isUsingWholeModuleOptimization,
+                    compilerLocation: compilerLocation,
+                    casOptions: casOpts
+                ),
+            forTarget: forTarget,
+            ruleInfo: ruleInfo,
+            commandLine: commandLine.map { .literal($0) },
+            environment: dynamicTask.environment,
+            workingDirectory: dynamicTask.workingDirectory,
+            showEnvironment: dynamicTask.showEnvironment,
+            execDescription: descriptionForLifecycle,
+            preparesForIndexing: true,
+            showCommandLineInLog: false,
+            isDynamic: true
+        )
     }
 
     var payloadType: (any TaskPayload.Type)? {
@@ -217,13 +218,10 @@ final class SwiftDriverJobDynamicTaskSpec: DynamicTaskSpec {
         if supportsParseableOutput(for: task.ruleInfo) {
             return SwiftCommandOutputParser.self
         } else {
-            return serializedDiagnosticsPaths(task).isEmpty ?
-                        GenericOutputParser.self :
-                        SerializedDiagnosticsOutputParser.self
+            return serializedDiagnosticsPaths(task).isEmpty ? GenericOutputParser.self : SerializedDiagnosticsOutputParser.self
         }
     }
 
-
     func serializedDiagnosticsPaths(_ task: any ExecutableTask) -> [Path] {
         if supportsParseableOutput(for: task.ruleInfo) {
             return []
@@ -252,19 +250,19 @@ final class SwiftDriverJobDynamicTaskSpec: DynamicTaskSpec {
 
     func buildTaskAction(dynamicTaskKey: DynamicTaskKey, context: DynamicTaskOperationContext) throws -> TaskAction {
         switch dynamicTaskKey {
-            case .swiftDriverJob(let key):
+        case .swiftDriverJob(let key):
             guard let job = try context.swiftModuleDependencyGraph.queryPlannedBuild(for: key.identifier).plannedTargetJob(for: key.driverJobKey) else {
                 throw StubError.error("Failed to lookup Swift driver job \(key.driverJobKey) in build plan \(key.identifier)")
             }
             return SwiftDriverJobTaskAction(job, variant: key.variant, arch: key.arch, identifier: .targetCompile(key.identifier), isUsingWholeModuleOptimization: key.isUsingWholeModuleOptimization)
-            case .swiftDriverExplicitDependencyJob(let key):
-                // WMO doesn't apply to explicit module builds
-                guard let job = context.swiftModuleDependencyGraph.plannedExplicitDependencyBuildJob(for: key.driverJobKey) else {
-                    throw StubError.error("Failed to lookup explicit module Swift driver job \(key.driverJobKey)")
-                }
+        case .swiftDriverExplicitDependencyJob(let key):
+            // WMO doesn't apply to explicit module builds
+            guard let job = context.swiftModuleDependencyGraph.plannedExplicitDependencyBuildJob(for: key.driverJobKey) else {
+                throw StubError.error("Failed to lookup explicit module Swift driver job \(key.driverJobKey)")
+            }
             return SwiftDriverJobTaskAction(job, variant: nil, arch: key.arch, identifier: .explicitDependency, isUsingWholeModuleOptimization: false)
-            default:
-                fatalError("Unexpected dynamic task key: \(dynamicTaskKey)")
+        default:
+            fatalError("Unexpected dynamic task key: \(dynamicTaskKey)")
         }
     }
 }
diff --git a/Sources/SWBTaskExecution/DynamicTaskSpecs/SwiftDriverPlanningDynamicTaskSpec.swift b/Sources/SWBTaskExecution/DynamicTaskSpecs/SwiftDriverPlanningDynamicTaskSpec.swift
index ef3b5711..64556dae 100644
--- a/Sources/SWBTaskExecution/DynamicTaskSpecs/SwiftDriverPlanningDynamicTaskSpec.swift
+++ b/Sources/SWBTaskExecution/DynamicTaskSpecs/SwiftDriverPlanningDynamicTaskSpec.swift
@@ -21,7 +21,7 @@ public struct SwiftDriverPlanningTaskKey: Serializable, CustomDebugStringConvert
         self.swiftPayload = swiftPayload
     }
 
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serializeAggregate(1) {
             serializer.serialize(swiftPayload)
         }
@@ -50,19 +50,20 @@ final class SwiftDriverPlanningDynamicTaskSpec: DynamicTaskSpec {
             fatalError("Attempted to request a driver planning operation with no driver payload")
         }
 
-        return Task(type: self,
-                    payload: key.swiftPayload,
-                    forTarget: dynamicTask.target,
-                    ruleInfo: driverPayload.ruleInfo,
-                    commandLine: driverPayload.commandLine.map { .literal(ByteString(encodingAsUTF8: $0)) },
-                    environment: dynamicTask.environment,
-                    workingDirectory: dynamicTask.workingDirectory,
-                    showEnvironment: dynamicTask.showEnvironment,
-                    execDescription: "Planning Swift module \(driverPayload.moduleName) (\(driverPayload.architecture))",
-                    preparesForIndexing: true,
-                    priority: .unblocksDownstreamTasks,
-                    isDynamic: true
-                )
+        return Task(
+            type: self,
+            payload: key.swiftPayload,
+            forTarget: dynamicTask.target,
+            ruleInfo: driverPayload.ruleInfo,
+            commandLine: driverPayload.commandLine.map { .literal(ByteString(encodingAsUTF8: $0)) },
+            environment: dynamicTask.environment,
+            workingDirectory: dynamicTask.workingDirectory,
+            showEnvironment: dynamicTask.showEnvironment,
+            execDescription: "Planning Swift module \(driverPayload.moduleName) (\(driverPayload.architecture))",
+            preparesForIndexing: true,
+            priority: .unblocksDownstreamTasks,
+            isDynamic: true
+        )
     }
 
     func buildTaskAction(dynamicTaskKey: DynamicTaskKey, context: DynamicTaskOperationContext) -> TaskAction {
diff --git a/Sources/SWBTaskExecution/ProjectPlanner.swift b/Sources/SWBTaskExecution/ProjectPlanner.swift
index 287c35b7..2b3cd98b 100644
--- a/Sources/SWBTaskExecution/ProjectPlanner.swift
+++ b/Sources/SWBTaskExecution/ProjectPlanner.swift
@@ -25,48 +25,53 @@ package struct ProjectPlanner {
     }
 
     package func describeArchivableProducts(input: [SchemeInput]) -> [ProductTupleDescription] {
-        return Array(Set(input.flatMap { scheme in
-            return [scheme.analyze, scheme.archive, scheme.profile, scheme.run, scheme.test].flatMap { (input: ActionInput) -> [ProductTupleDescription] in
-                let parameters = BuildParameters(action: input)
-                return input.targetIdentifiers.flatMap { (targetIdentifier: String) -> [ProductTupleDescription] in
-                    guard let target = workspaceContext.workspace.target(for: targetIdentifier) else { return [] }
-                    let settings = buildRequestContext.getCachedSettings(parameters, target: target)
-                    return settings.globalScope.evaluate(BuiltinMacros.SUPPORTED_PLATFORMS).compactMap { supportedPlatform in
-                        guard let platform = workspaceContext.core.platformRegistry.lookup(name: supportedPlatform) else { return nil }
-                        let settings = buildRequestContext.getCachedSettings(BuildParameters(action: input, platform: platform), target: target)
-                        let productName = settings.globalScope.evaluate(BuiltinMacros.PRODUCT_NAME)
-                        let team = settings.globalScope.evaluate(BuiltinMacros.DEVELOPMENT_TEAM).nilIfEmpty
-                        return ProductTupleDescription(
-                            displayName: productName,
-                            productName: productName,
-                            productType: {
-                                switch settings.globalScope.evaluate(BuiltinMacros.PRODUCT_TYPE) {
-                                case "com.apple.product-type.application", "com.apple.product-type.application.watchapp2", "com.apple.product-type.application.on-demand-install-capable":
-                                    return .app
-                                case "com.apple.product-type.tool":
-                                    return .tool
-                                case "com.apple.product-type.framework", "com.apple.product-type.framework.static", "com.apple.product-type.library.dynamic", "com.apple.product-type.library.static":
-                                    return .library
-                                case "com.apple.product-type.watchkit2-extension":
-                                    return .appex
-                                case "com.apple.product-type.bundle.unit-test",
-                                    "com.apple.product-type.bundle.ui-testing",
-                                    "com.apple.product-type.bundle.multi-device-ui-testing":
-                                    return .tests
-                                default:
-                                    return .none
-                                }
-                            }(),
-                            identifier: target.guid,
-                            team: team,
-                            bundleIdentifier: settings.globalScope.evaluate(BuiltinMacros.PRODUCT_BUNDLE_IDENTIFIER).nilIfEmpty,
-                            destination: DestinationInfo(platformName: settings.globalScope.evaluate(BuiltinMacros.PLATFORM_DISPLAY_NAME), isSimulator: settings.globalScope.evaluate(BuiltinMacros.PLATFORM_NAME).hasSuffix("simulator")),
-                            containingSchemes: [scheme.name],
-                            iconPath: nil)
+        return Array(
+            Set(
+                input.flatMap { scheme in
+                    return [scheme.analyze, scheme.archive, scheme.profile, scheme.run, scheme.test].flatMap { (input: ActionInput) -> [ProductTupleDescription] in
+                        let parameters = BuildParameters(action: input)
+                        return input.targetIdentifiers.flatMap { (targetIdentifier: String) -> [ProductTupleDescription] in
+                            guard let target = workspaceContext.workspace.target(for: targetIdentifier) else { return [] }
+                            let settings = buildRequestContext.getCachedSettings(parameters, target: target)
+                            return settings.globalScope.evaluate(BuiltinMacros.SUPPORTED_PLATFORMS).compactMap { supportedPlatform in
+                                guard let platform = workspaceContext.core.platformRegistry.lookup(name: supportedPlatform) else { return nil }
+                                let settings = buildRequestContext.getCachedSettings(BuildParameters(action: input, platform: platform), target: target)
+                                let productName = settings.globalScope.evaluate(BuiltinMacros.PRODUCT_NAME)
+                                let team = settings.globalScope.evaluate(BuiltinMacros.DEVELOPMENT_TEAM).nilIfEmpty
+                                return ProductTupleDescription(
+                                    displayName: productName,
+                                    productName: productName,
+                                    productType: {
+                                        switch settings.globalScope.evaluate(BuiltinMacros.PRODUCT_TYPE) {
+                                        case "com.apple.product-type.application", "com.apple.product-type.application.watchapp2", "com.apple.product-type.application.on-demand-install-capable":
+                                            return .app
+                                        case "com.apple.product-type.tool":
+                                            return .tool
+                                        case "com.apple.product-type.framework", "com.apple.product-type.framework.static", "com.apple.product-type.library.dynamic", "com.apple.product-type.library.static":
+                                            return .library
+                                        case "com.apple.product-type.watchkit2-extension":
+                                            return .appex
+                                        case "com.apple.product-type.bundle.unit-test",
+                                            "com.apple.product-type.bundle.ui-testing",
+                                            "com.apple.product-type.bundle.multi-device-ui-testing":
+                                            return .tests
+                                        default:
+                                            return .none
+                                        }
+                                    }(),
+                                    identifier: target.guid,
+                                    team: team,
+                                    bundleIdentifier: settings.globalScope.evaluate(BuiltinMacros.PRODUCT_BUNDLE_IDENTIFIER).nilIfEmpty,
+                                    destination: DestinationInfo(platformName: settings.globalScope.evaluate(BuiltinMacros.PLATFORM_DISPLAY_NAME), isSimulator: settings.globalScope.evaluate(BuiltinMacros.PLATFORM_NAME).hasSuffix("simulator")),
+                                    containingSchemes: [scheme.name],
+                                    iconPath: nil
+                                )
+                            }
+                        }
                     }
                 }
-            }
-        }))
+            )
+        )
     }
 
     // TODO: This is a stub for testing, real implementation will be done in rdar://problem/56446029
@@ -83,11 +88,13 @@ package struct ProjectPlanner {
     // TODO: This is a stub for testing, real implementation will be done in rdar://problem/56446029
     package func describeSchemes(input: [SchemeInput]) -> [SchemeDescription] {
         return input.map { scheme in
-            let actions = ActionsInfo(analyze: actionInfo(scheme.analyze),
-                        archive: actionInfo(scheme.archive),
-                        profile: actionInfo(scheme.profile),
-                        run: actionInfo(scheme.run),
-                        test: actionInfo(scheme.test))
+            let actions = ActionsInfo(
+                analyze: actionInfo(scheme.analyze),
+                archive: actionInfo(scheme.archive),
+                profile: actionInfo(scheme.profile),
+                run: actionInfo(scheme.run),
+                test: actionInfo(scheme.test)
+            )
             return SchemeDescription(name: scheme.name, disambiguatedName: scheme.name, isShared: scheme.isShared, isAutogenerated: scheme.isAutogenerated, actions: actions)
         }
     }
diff --git a/Sources/SWBTaskExecution/Task.swift b/Sources/SWBTaskExecution/Task.swift
index 5f332737..87df487c 100644
--- a/Sources/SWBTaskExecution/Task.swift
+++ b/Sources/SWBTaskExecution/Task.swift
@@ -126,9 +126,11 @@ package final class Task: ExecutableTask, Serializable, Encodable {
         case .direct(let directStorage):
             return EnvironmentBindings(directStorage.environmentBindings)
         case .interned(let internedStorage):
-            return EnvironmentBindings(internedStorage.handles.environmentBindings.map {
-                (internedStorage.stringArena.lookup(handle: $0), internedStorage.stringArena.lookup(handle: $1))
-            })
+            return EnvironmentBindings(
+                internedStorage.handles.environmentBindings.map {
+                    (internedStorage.stringArena.lookup(handle: $0), internedStorage.stringArena.lookup(handle: $1))
+                }
+            )
         }
     }
 
@@ -233,7 +235,7 @@ package final class Task: ExecutableTask, Serializable, Encodable {
             showEnvironment: builder.showEnvironment,
             execDescription: builder.execDescription,
             // FIXME: This cast is unfortunate.
-            action: builder.action.map{ $0 as! TaskAction },
+            action: builder.action.map { $0 as! TaskAction },
             preparesForIndexing: builder.preparesForIndexing,
             llbuildControlDisabled: builder.llbuildControlDisabled,
             targetDependencies: builder.targetDependencies,
@@ -313,18 +315,17 @@ package final class Task: ExecutableTask, Serializable, Encodable {
             // Make sure each configured target object is serialized only once.
             if let index = delegate.configuredTargetIndexes[configuredTarget] {
                 // We already have an index into the configured target list, so serialize it.
-                serializer.serialize(1)         // Placeholder indicating the next element is an index
+                serializer.serialize(1)  // Placeholder indicating the next element is an index
                 serializer.serialize(index)
             } else {
                 // This configured target has not been serialized before, so serialize it and add it to our delegate's index map.
-                serializer.serialize(0)         // Placeholder indicating the next element is a serialized ConfiguredTarget
+                serializer.serialize(0)  // Placeholder indicating the next element is a serialized ConfiguredTarget
                 serializer.serialize(configuredTarget)
                 delegate.configuredTargetIndexes[configuredTarget] = delegate.currentConfiguredTargetIndex
                 delegate.currentConfiguredTargetIndex += 1
             }
             serializer.endAggregate()
-        }
-        else {
+        } else {
             serializer.serializeNil()
         }
         serializer.serialize(ruleInfo)
@@ -384,8 +385,7 @@ package final class Task: ExecutableTask, Serializable, Encodable {
 
         if deserializer.deserializeNil() {
             self.forTarget = nil
-        }
-        else {
+        } else {
             guard let delegate = deserializer.delegate as? (any ConfiguredTargetDeserializerDelegate) else { throw DeserializerError.invalidDelegate("delegate must be a ConfiguredTargetDeserializerDelegate") }
 
             // Deserialize the configured target by deserializing it if we haven't seen it before, or by looking it up via the delegate if we have.
@@ -446,12 +446,14 @@ package final class Task: ExecutableTask, Serializable, Encodable {
                 return .parentPath(stringArena.intern(path.str))
             }
         }
-        return .init(ruleInfo: ruleInfo.map { stringArena.intern($0) },
-                     commandLine: internedCommandLine,
-                     additionalSignatureData: stringArena.intern(additionalSignatureData),
-                     inputPathStrings: inputPaths.map { stringArena.intern($0.str) },
-                     outputPathStrings: outputPaths.map { stringArena.intern($0.str) },
-                     environmentBindings: environment.bindings.map { (stringArena.intern($0.0), stringArena.intern($0.1)) })
+        return .init(
+            ruleInfo: ruleInfo.map { stringArena.intern($0) },
+            commandLine: internedCommandLine,
+            additionalSignatureData: stringArena.intern(additionalSignatureData),
+            inputPathStrings: inputPaths.map { stringArena.intern($0.str) },
+            outputPathStrings: outputPaths.map { stringArena.intern($0.str) },
+            environmentBindings: environment.bindings.map { (stringArena.intern($0.0), stringArena.intern($0.1)) }
+        )
     }
 
     internal init(task: Task, internedStorageHandles: Task.Storage.InternedStorage.Handles, frozenByteStringArena: FrozenByteStringArena, frozenStringArena: FrozenStringArena) {
@@ -486,12 +488,11 @@ extension Task: Hashable {
         hasher.combine(ObjectIdentifier(self))
     }
 
-    package static func ==(lhs: Task, rhs: Task) -> Bool {
+    package static func == (lhs: Task, rhs: Task) -> Bool {
         return lhs === rhs
     }
 }
 
-
 /// A delegate which must be used to deserialize a `Task`.
 package protocol TaskDeserializerDelegate: DeserializerDelegate {
     /// The specification registry to use to look up `CommandLineToolSpec`s for deserializing Task.type properties.
@@ -508,7 +509,8 @@ extension GateTask {
 extension ConstructedTask {
     /// Add the task to the given build description builder.
     func addToDescription(_ builder: BuildDescriptionBuilder) throws {
-        let allowMissingInputs = (ruleInfo.first == "PhaseScriptExecution" ? !SWBFeatureFlag.disableShellScriptAllowsMissingInputs.value : false)
+        let allowMissingInputs =
+            (ruleInfo.first == "PhaseScriptExecution" ? !SWBFeatureFlag.disableShellScriptAllowsMissingInputs.value : false)
             || ruleInfo.first == "ValidateDevelopmentAssets"
 
         // Handle custom tasks.
@@ -552,8 +554,7 @@ public enum RequiredTargetDependencyReason: CustomStringConvertible {
 /// The interface used for interactions between running tasks and the controlling execution environment.
 /// A `TaskExecutionDelegate` performs operations commonly needed by a task, such as file I/O.
 /// This protocol enables task behavior to be more easily tested.
-public protocol TaskExecutionDelegate
-{
+public protocol TaskExecutionDelegate {
     /// The proxy to use for file system access.
     var fs: any FSProxy { get }
 
@@ -594,8 +595,7 @@ package protocol BuildOutputDelegate: TargetDiagnosticProducingDelegate {
 }
 
 /// A `TaskOutputDelegate` handles output emitted by a task.
-public protocol TaskOutputDelegate: DiagnosticProducingDelegate
-{
+public protocol TaskOutputDelegate: DiagnosticProducingDelegate {
     var startTime: Date { get }
 
     /// Emit output log data.
@@ -620,8 +620,7 @@ public protocol TaskOutputDelegate: DiagnosticProducingDelegate
     var result: TaskResult? { get }
 }
 
-package extension TaskOutputDelegate
-{
+package extension TaskOutputDelegate {
     /// Emit an error message.
     func emitError(_ message: String) {
         error(message)
@@ -649,8 +648,7 @@ package extension TaskOutputDelegate
 }
 
 /// Convenience function for writing inline text output.
-extension TaskOutputDelegate
-{
+extension TaskOutputDelegate {
     func emitOutput(_ body: (OutputByteStream) -> Void) {
         let stream = OutputByteStream()
         body(stream)
diff --git a/Sources/SWBTaskExecution/TaskActionExtensionPoint.swift b/Sources/SWBTaskExecution/TaskActionExtensionPoint.swift
index 04e3ca33..697f1f1d 100644
--- a/Sources/SWBTaskExecution/TaskActionExtensionPoint.swift
+++ b/Sources/SWBTaskExecution/TaskActionExtensionPoint.swift
@@ -22,12 +22,15 @@ public struct TaskActionExtensionPoint: ExtensionPoint {
     // MARK: - actual extension point
 
     package static func taskActionImplementations(pluginManager: any PluginManager) throws -> [SerializableTypeCode: any PolymorphicSerializable.Type] {
-        return try pluginManager.extensions(of: Self.self).reduce([:], { implementations, ext in
-            for (code, _) in ext.taskActionImplementations where implementations[code] != nil {
-                throw StubError.error("Multiple implementations for task action implementation type code: \(code)")
+        return try pluginManager.extensions(of: Self.self).reduce(
+            [:],
+            { implementations, ext in
+                for (code, _) in ext.taskActionImplementations where implementations[code] != nil {
+                    throw StubError.error("Multiple implementations for task action implementation type code: \(code)")
+                }
+                return implementations.addingContents(of: ext.taskActionImplementations)
             }
-            return implementations.addingContents(of: ext.taskActionImplementations)
-        })
+        )
     }
 }
 
diff --git a/Sources/SWBTaskExecution/TaskActions/ClangCachingKeyQueryTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/ClangCachingKeyQueryTaskAction.swift
index 40d5ecd5..57cbef9d 100644
--- a/Sources/SWBTaskExecution/TaskActions/ClangCachingKeyQueryTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/ClangCachingKeyQueryTaskAction.swift
@@ -41,11 +41,13 @@ public final class ClangCachingKeyQueryTaskAction: TaskAction {
         outputDelegate: any TaskOutputDelegate
     ) async -> CommandResult {
         let clangModuleDependencyGraph = dynamicExecutionDelegate.operationContext.clangModuleDependencyGraph
-        do  {
-            guard let casDBs = try clangModuleDependencyGraph.getCASDatabases(
-                libclangPath: key.libclangPath,
-                casOptions: key.casOptions
-            ) else {
+        do {
+            guard
+                let casDBs = try clangModuleDependencyGraph.getCASDatabases(
+                    libclangPath: key.libclangPath,
+                    casOptions: key.casOptions
+                )
+            else {
                 throw StubError.error("unable to use CAS databases")
             }
 
diff --git a/Sources/SWBTaskExecution/TaskActions/ClangCachingMaterializeKeyTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/ClangCachingMaterializeKeyTaskAction.swift
index 8192aa71..148874ae 100644
--- a/Sources/SWBTaskExecution/TaskActions/ClangCachingMaterializeKeyTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/ClangCachingMaterializeKeyTaskAction.swift
@@ -66,11 +66,13 @@ public final class ClangCachingMaterializeKeyTaskAction: TaskAction {
         state.reset()
 
         let clangModuleDependencyGraph = dynamicExecutionDelegate.operationContext.clangModuleDependencyGraph
-        do  {
-            guard let casDBs = try clangModuleDependencyGraph.getCASDatabases(
-                libclangPath: taskKey.libclangPath,
-                casOptions: taskKey.casOptions
-            ) else {
+        do {
+            guard
+                let casDBs = try clangModuleDependencyGraph.getCASDatabases(
+                    libclangPath: taskKey.libclangPath,
+                    casOptions: taskKey.casOptions
+                )
+            else {
                 throw StubError.error("unable to use CAS databases")
             }
 
@@ -117,7 +119,7 @@ public final class ClangCachingMaterializeKeyTaskAction: TaskAction {
             do {
                 guard let cachedComp = try casDBs.getLocalCachedCompilation(cacheKey: taskKey.cacheKey) else {
                     state = .done
-                    return // compilation key not found.
+                    return  // compilation key not found.
                 }
                 let numOutputsToDownload = requestCompilationOutputs(cachedComp, dynamicExecutionDelegate: dynamicExecutionDelegate, jobTaskIDBase: jobTaskIDBase)
                 if numOutputsToDownload == 0 {
diff --git a/Sources/SWBTaskExecution/TaskActions/ClangCachingOutputMaterializerTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/ClangCachingOutputMaterializerTaskAction.swift
index b7388e0d..a84acade 100644
--- a/Sources/SWBTaskExecution/TaskActions/ClangCachingOutputMaterializerTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/ClangCachingOutputMaterializerTaskAction.swift
@@ -41,11 +41,13 @@ public final class ClangCachingOutputMaterializerTaskAction: TaskAction {
         outputDelegate: any TaskOutputDelegate
     ) async -> CommandResult {
         let clangModuleDependencyGraph = dynamicExecutionDelegate.operationContext.clangModuleDependencyGraph
-        do  {
-            guard let casDBs = try clangModuleDependencyGraph.getCASDatabases(
-                libclangPath: key.libclangPath,
-                casOptions: key.casOptions
-            ) else {
+        do {
+            guard
+                let casDBs = try clangModuleDependencyGraph.getCASDatabases(
+                    libclangPath: key.libclangPath,
+                    casOptions: key.casOptions
+                )
+            else {
                 throw StubError.error("unable to use CAS databases")
             }
 
diff --git a/Sources/SWBTaskExecution/TaskActions/ClangCompileTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/ClangCompileTaskAction.swift
index b81d59f3..03ef49a8 100644
--- a/Sources/SWBTaskExecution/TaskActions/ClangCompileTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/ClangCompileTaskAction.swift
@@ -171,12 +171,12 @@ public final class ClangCompileTaskAction: TaskAction, BuildValueValidatingTaskA
         }
     }
 
-   override public func performTaskAction(
-    _ task: any ExecutableTask,
-    dynamicExecutionDelegate: any DynamicTaskExecutionDelegate,
+    override public func performTaskAction(
+        _ task: any ExecutableTask,
+        dynamicExecutionDelegate: any DynamicTaskExecutionDelegate,
         executionDelegate: any TaskExecutionDelegate,
-    clientDelegate: any TaskExecutionClientDelegate,
-    outputDelegate: any TaskOutputDelegate
+        clientDelegate: any TaskExecutionClientDelegate,
+        outputDelegate: any TaskOutputDelegate
     ) async -> CommandResult {
         defer {
             if let error = state.executionError {
@@ -211,7 +211,7 @@ public final class ClangCompileTaskAction: TaskAction, BuildValueValidatingTaskA
             return .failed
         }
 
-        let commandLines = dependencyInfo.commands.map{$0.arguments}
+        let commandLines = dependencyInfo.commands.map { $0.arguments }
 
         // By default, don't print the frontend command lines, to avoid introducing too much noise in the log.
         if executionDelegate.userPreferences.enableDebugActivityLogs || executionDelegate.emitFrontendCommandLines {
@@ -320,16 +320,15 @@ public final class ClangCompileTaskAction: TaskAction, BuildValueValidatingTaskA
                         outputDelegate.emitOutput(ByteString(encodingAsUTF8: commandString) + "\n")
                     }
 
-                    let shouldGenerateReproducer = (lastResult == .failed) &&
-                        (explicitModulesPayload.shouldGenerateReproducerForErrors ||
-                         (outputDelegate.result?.isCrashed ?? false))
+                    let shouldGenerateReproducer = (lastResult == .failed) && (explicitModulesPayload.shouldGenerateReproducerForErrors || (outputDelegate.result?.isCrashed ?? false))
                     if shouldGenerateReproducer {
                         do {
                             if let reproducerMessage = try clangModuleDependencyGraph.generateReproducer(
-                                    forFailedDependency: dependencyInfo,
-                                    libclangPath: explicitModulesPayload.libclangPath,
-                                    casOptions: explicitModulesPayload.casOptions,
-                                    location: explicitModulesPayload.reproducerOutputPath?.str) {
+                                forFailedDependency: dependencyInfo,
+                                libclangPath: explicitModulesPayload.libclangPath,
+                                casOptions: explicitModulesPayload.casOptions,
+                                location: explicitModulesPayload.reproducerOutputPath?.str
+                            ) {
                                 outputDelegate.emitOutput(ByteString(encodingAsUTF8: reproducerMessage) + "\n")
                             }
                         } catch {
@@ -369,8 +368,9 @@ public final class ClangCompileTaskAction: TaskAction, BuildValueValidatingTaskA
         taskID: inout UInt
     ) throws {
         guard let casOptions,
-              casOptions.enableIntegratedCacheQueries,
-              casOptions.hasRemoteCache else {
+            casOptions.enableIntegratedCacheQueries,
+            casOptions.hasRemoteCache
+        else {
             return
         }
 
@@ -489,7 +489,8 @@ public final class ClangCompileTaskAction: TaskAction, BuildValueValidatingTaskA
     ) throws {
         let payload: DependencyValidationInfo.Payload
         if let traceFilePath,
-           let traceData = try parseTraceData(Data(fileSystem.read(traceFilePath))) {
+            let traceData = try parseTraceData(Data(fileSystem.read(traceFilePath)))
+        {
 
             outputDelegate.incrementTaskCounter(.headerDependenciesValidatedTasks)
             if isModular {
diff --git a/Sources/SWBTaskExecution/TaskActions/ClangModuleVerifierInputGeneratorTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/ClangModuleVerifierInputGeneratorTaskAction.swift
index 12b8e497..4c09cc39 100644
--- a/Sources/SWBTaskExecution/TaskActions/ClangModuleVerifierInputGeneratorTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/ClangModuleVerifierInputGeneratorTaskAction.swift
@@ -28,7 +28,7 @@ public final class ClangModuleVerifierInputGeneratorTaskAction: TaskAction {
 
         init?(commandLine: some Sequence<String>, outputDelegate: any TaskOutputDelegate) {
             var iterator = commandLine.makeIterator()
-            _ = iterator.next() // Skip argv[0]
+            _ = iterator.next()  // Skip argv[0]
             guard let inputFramework = iterator.next().map(Path.init) else {
                 outputDelegate.emitError("no input framework specified")
                 return nil
@@ -138,9 +138,14 @@ public final class ClangModuleVerifierInputGeneratorTaskAction: TaskAction {
         }
 
         do {
-            try fs.write(options.mainOutput, contents: ByteString(encodingAsUTF8: """
-            \(options.language.includeStatement) <Test/Test.h>
-            """))
+            try fs.write(
+                options.mainOutput,
+                contents: ByteString(
+                    encodingAsUTF8: """
+                        \(options.language.includeStatement) <Test/Test.h>
+                        """
+                )
+            )
         } catch {
             outputDelegate.emitError("failed to write \(options.mainOutput): \(error)")
             return .failed
@@ -154,10 +159,12 @@ public final class ClangModuleVerifierInputGeneratorTaskAction: TaskAction {
                 if !output.isEmpty {
                     output += "\n";
                 }
-                output += ByteString(encodingAsUTF8: """
-                // Private
-                \(framework.allModularPrivateHeaderIncludes(language: options.language))
-                """)
+                output += ByteString(
+                    encodingAsUTF8: """
+                        // Private
+                        \(framework.allModularPrivateHeaderIncludes(language: options.language))
+                        """
+                )
             }
 
             try fs.write(options.headerOutput, contents: output)
@@ -166,14 +173,17 @@ public final class ClangModuleVerifierInputGeneratorTaskAction: TaskAction {
             return .failed
         }
         do {
-            try fs.write(options.moduleMapOutput, contents: """
-            framework module Test {
-                umbrella header "Test.h"
-
-                export *
-                module * { export * }
-            }
-            """)
+            try fs.write(
+                options.moduleMapOutput,
+                contents: """
+                    framework module Test {
+                        umbrella header "Test.h"
+
+                        export *
+                        module * { export * }
+                    }
+                    """
+            )
         } catch {
             outputDelegate.emitError("failed to write \(options.moduleMapOutput): \(error)")
             return .failed
diff --git a/Sources/SWBTaskExecution/TaskActions/ClangScanTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/ClangScanTaskAction.swift
index 8ba55c67..5693a265 100644
--- a/Sources/SWBTaskExecution/TaskActions/ClangScanTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/ClangScanTaskAction.swift
@@ -40,8 +40,7 @@ public final class ClangScanTaskAction: TaskAction, BuildValueValidatingTaskActi
             // Skip the executable.
             let programName = generator.next() ?? "<<missing program name>>"
 
-        argumentIteration:
-            while let arg = generator.next() {
+            argumentIteration: while let arg = generator.next() {
                 switch arg {
                 case "-o":
                     if let outputPath = generator.next() {
diff --git a/Sources/SWBTaskExecution/TaskActions/CodeSignTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/CodeSignTaskAction.swift
index c059f6a8..4f9de770 100644
--- a/Sources/SWBTaskExecution/TaskActions/CodeSignTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/CodeSignTaskAction.swift
@@ -14,14 +14,12 @@ public import SWBCore
 public import SWBUtil
 import Foundation
 
-
 public final class CodeSignTaskAction: TaskAction {
     public override class var toolIdentifier: String {
         "code-sign-task"
     }
 
-    public override init()
-    {
+    public override init() {
         super.init()
     }
 
@@ -51,14 +49,11 @@ public final class CodeSignTaskAction: TaskAction {
 
     // Serialization
 
-
-    public override func serialize<T: Serializer>(to serializer: T)
-    {
+    public override func serialize<T: Serializer>(to serializer: T) {
         super.serialize(to: serializer)
     }
 
-    public required init(from deserializer: any Deserializer) throws
-    {
+    public required init(from deserializer: any Deserializer) throws {
         try super.init(from: deserializer)
     }
 }
diff --git a/Sources/SWBTaskExecution/TaskActions/ConstructStubExecutorInputFileListTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/ConstructStubExecutorInputFileListTaskAction.swift
index ebb79347..74f80e08 100644
--- a/Sources/SWBTaskExecution/TaskActions/ConstructStubExecutorInputFileListTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/ConstructStubExecutorInputFileListTaskAction.swift
@@ -81,8 +81,7 @@ public final class ConstructStubExecutorInputFileListTaskAction: TaskAction {
                     outputDelegate.emitWarning(
                         "Only \(slicesWithEntryPointSection.count) out of \(slices.count) slices in the debug dylib MachO contained Swift entry point sections. Using stub executor library with Swift entry point."
                     )
-                }
-                else {
+                } else {
                     outputDelegate.emitNote("Using stub executor library with Swift entry point.")
                 }
                 chosenLibraryPath = swiftEntryLibraryVariantPath
@@ -94,8 +93,7 @@ public final class ConstructStubExecutorInputFileListTaskAction: TaskAction {
             try fs.write(fileListPath, contents: ByteString(encodingAsUTF8: "\(chosenLibraryPath.str)\n"))
 
             return .succeeded
-        }
-        catch {
+        } catch {
             outputDelegate.emitError("Unable to process debug dylib: \(error.localizedDescription)")
             return .failed
         }
diff --git a/Sources/SWBTaskExecution/TaskActions/CopyPlistTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/CopyPlistTaskAction.swift
index 3e8f06ea..a7dc001b 100644
--- a/Sources/SWBTaskExecution/TaskActions/CopyPlistTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/CopyPlistTaskAction.swift
@@ -105,8 +105,7 @@ public final class CopyPlistTaskAction: TaskAction {
             let generator = commandLine.makeIterator()
             // Skip the executable.
             let programName = generator.next() ?? "<<missing program name>>"
-        argumentParsing:
-            while let arg = generator.next() {
+            argumentParsing: while let arg = generator.next() {
                 switch arg {
                 case "--":
                     break argumentParsing
@@ -168,7 +167,7 @@ public final class CopyPlistTaskAction: TaskAction {
             }
 
             // All remaining arguments are input paths.
-            let inputs = generator.map { Path($0 )}
+            let inputs = generator.map { Path($0) }
 
             // Diagnose missing inputs.
             if inputs.isEmpty {
@@ -234,8 +233,7 @@ public final class CopyPlistTaskAction: TaskAction {
             let contents: ByteString
             do {
                 contents = try executionDelegate.fs.read(input)
-            }
-            catch {
+            } catch {
                 outputDelegate.emitError("unable to read input file '\(input.str)': \(error.localizedDescription)")
                 return .failed
             }
@@ -247,8 +245,7 @@ public final class CopyPlistTaskAction: TaskAction {
                 // FIXME: The native build system would remove the old file if it existed, perform the copy, then update the mod time on the new file.
                 do {
                     try executionDelegate.fs.write(output, contents: contents)
-                }
-                catch {
+                } catch {
                     outputDelegate.emitError("unable to write file '\(output.str)': \(error.localizedDescription)")
                     return .failed
                 }
@@ -258,11 +255,15 @@ public final class CopyPlistTaskAction: TaskAction {
                 do {
                     // Rev-lock hack
                     var contents = try ByteString(PropertyList.fromBytes(contents.bytes).asBytes(.xml))
-                    contents = ByteString(Array(contents.unsafeStringValue
-                        .replacingOccurrences(of: ">WRAPPEDPRODUCTNAME<", with: ">$(WRAPPEDPRODUCTNAME)<")
-                        .replacingOccurrences(of: ">WRAPPEDPRODUCTBUNDLEIDENTIFIER<", with: ">$(WRAPPEDPRODUCTBUNDLEIDENTIFIER)<")
-                        .replacingOccurrences(of: ">TESTPRODUCTNAME<", with: ">$(TESTPRODUCTNAME)<")
-                        .replacingOccurrences(of: ">TESTPRODUCTBUNDLEIDENTIFIER<", with: ">$(TESTPRODUCTBUNDLEIDENTIFIER)<").utf8))
+                    contents = ByteString(
+                        Array(
+                            contents.unsafeStringValue
+                                .replacingOccurrences(of: ">WRAPPEDPRODUCTNAME<", with: ">$(WRAPPEDPRODUCTNAME)<")
+                                .replacingOccurrences(of: ">WRAPPEDPRODUCTBUNDLEIDENTIFIER<", with: ">$(WRAPPEDPRODUCTBUNDLEIDENTIFIER)<")
+                                .replacingOccurrences(of: ">TESTPRODUCTNAME<", with: ">$(TESTPRODUCTNAME)<")
+                                .replacingOccurrences(of: ">TESTPRODUCTBUNDLEIDENTIFIER<", with: ">$(TESTPRODUCTBUNDLEIDENTIFIER)<").utf8
+                        )
+                    )
 
                     let p = try PropertyList.fromBytes(contents.bytes)
                     if !options.macroExpansions.isEmpty {
@@ -307,8 +308,7 @@ public final class CopyPlistTaskAction: TaskAction {
                 // FIXME: The native build system would remove the old file if it existed, then perform the copy.
                 do {
                     try executionDelegate.fs.write(output, contents: ByteString(outputData))
-                }
-                catch {
+                } catch {
                     outputDelegate.emitError("unable to write file '\(output.str)': \(error.localizedDescription)")
                     return .failed
                 }
@@ -319,17 +319,13 @@ public final class CopyPlistTaskAction: TaskAction {
         return .succeeded
     }
 
-
     // Serialization
 
-
-    public override func serialize<T: Serializer>(to serializer: T)
-    {
+    public override func serialize<T: Serializer>(to serializer: T) {
         super.serialize(to: serializer)
     }
 
-    public required init(from deserializer: any Deserializer) throws
-    {
+    public required init(from deserializer: any Deserializer) throws {
         try super.init(from: deserializer)
     }
 }
diff --git a/Sources/SWBTaskExecution/TaskActions/CopyTiffTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/CopyTiffTaskAction.swift
index df1675af..ff569109 100644
--- a/Sources/SWBTaskExecution/TaskActions/CopyTiffTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/CopyTiffTaskAction.swift
@@ -55,8 +55,7 @@ public final class CopyTiffTaskAction: TaskAction {
             let generator = commandLine.makeIterator()
             // Skip the executable.
             let programName = generator.next() ?? "<<missing program name>>"
-        argumentParsing:
-            while let arg = generator.next() {
+            argumentParsing: while let arg = generator.next() {
                 switch arg {
                 case "--":
                     break argumentParsing
@@ -86,7 +85,7 @@ public final class CopyTiffTaskAction: TaskAction {
             }
 
             // All remaining arguments are input paths.
-            let inputs = generator.map { Path($0 )}
+            let inputs = generator.map { Path($0) }
 
             // Diagnose missing inputs.
             if inputs.isEmpty {
@@ -167,8 +166,7 @@ public final class CopyTiffTaskAction: TaskAction {
                 let contents: ByteString
                 do {
                     contents = try executionDelegate.fs.read(input)
-                }
-                catch {
+                } catch {
                     outputDelegate.emitError("unable to read input file '\(input.str)': \(error.localizedDescription)")
                     return .failed
                 }
@@ -176,8 +174,7 @@ public final class CopyTiffTaskAction: TaskAction {
                 // FIXME: The native build system would remove the old file if it existed, perform the copy, then update the mod time on the new file.
                 do {
                     try executionDelegate.fs.write(output, contents: contents)
-                }
-                catch {
+                } catch {
                     outputDelegate.emitError("unable to write file '\(output.str)': \(error.localizedDescription)")
                     return .failed
                 }
@@ -187,17 +184,13 @@ public final class CopyTiffTaskAction: TaskAction {
         return .succeeded
     }
 
-
     // Serialization
 
-
-    public override func serialize<T: Serializer>(to serializer: T)
-    {
+    public override func serialize<T: Serializer>(to serializer: T) {
         super.serialize(to: serializer)
     }
 
-    public required init(from deserializer: any Deserializer) throws
-    {
+    public required init(from deserializer: any Deserializer) throws {
         try super.init(from: deserializer)
     }
 }
diff --git a/Sources/SWBTaskExecution/TaskActions/CreateBuildDirectoryTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/CreateBuildDirectoryTaskAction.swift
index 664383ab..88d7b9a6 100644
--- a/Sources/SWBTaskExecution/TaskActions/CreateBuildDirectoryTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/CreateBuildDirectoryTaskAction.swift
@@ -39,7 +39,7 @@ public final class CreateBuildDirectoryTaskAction: TaskAction {
             try fs.setCreatedByBuildSystemAttribute(directoryPath)
         } catch {
             #if canImport(Darwin)
-            outputDelegate?.emitWarning("Failed to set build system attribute on \(directoryPath.str): \(error.localizedDescription)")
+                outputDelegate?.emitWarning("Failed to set build system attribute on \(directoryPath.str): \(error.localizedDescription)")
             #endif
         }
 
@@ -54,7 +54,7 @@ public final class CreateBuildDirectoryTaskAction: TaskAction {
         outputDelegate: any TaskOutputDelegate
     ) async -> CommandResult {
         let generator = task.commandLineAsStrings.makeIterator()
-        _ = generator.next() // consume program name
+        _ = generator.next()  // consume program name
 
         guard let directory = generator.next() else {
             outputDelegate.emitError("wrong number of arguments")
diff --git a/Sources/SWBTaskExecution/TaskActions/EmbedSwiftStdLibTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/EmbedSwiftStdLibTaskAction.swift
index 38501d22..84b0ad11 100644
--- a/Sources/SWBTaskExecution/TaskActions/EmbedSwiftStdLibTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/EmbedSwiftStdLibTaskAction.swift
@@ -23,17 +23,18 @@ fileprivate func executableFileNameMatchesSwiftRuntimeLibPattern(_ fileName: Str
 
 fileprivate extension MachO {
     func allSwiftLibNames() throws -> Set<String> {
-        return try Set(self.slices()
-            .flatMap { try $0.linkedLibraryPaths() }
-            .compactMap { (lib: String) -> String? in
-                let pcs = Path(lib)
-                if (pcs.dirname.str == "@rpath" || pcs.dirname == Path("/usr/lib/swift")) && executableFileNameMatchesSwiftRuntimeLibPattern(pcs.basename) {
-                    return pcs.basename
-                }
-                else {
-                    return nil
+        return try Set(
+            self.slices()
+                .flatMap { try $0.linkedLibraryPaths() }
+                .compactMap { (lib: String) -> String? in
+                    let pcs = Path(lib)
+                    if (pcs.dirname.str == "@rpath" || pcs.dirname == Path("/usr/lib/swift")) && executableFileNameMatchesSwiftRuntimeLibPattern(pcs.basename) {
+                        return pcs.basename
+                    } else {
+                        return nil
+                    }
                 }
-        })
+        )
     }
 }
 
@@ -50,22 +51,20 @@ fileprivate struct Executable: Hashable {
     init(path: Path, object: MachO) throws {
         self.path = path
 
-        let swiftABIVersions = try object.slices().compactMap{ try $0.swiftABIVersion() }
+        let swiftABIVersions = try object.slices().compactMap { try $0.swiftABIVersion() }
         if swiftABIVersions.isEmpty {
             self.swiftABIVersion = nil
-        }
-        else {
+        } else {
             let uniqueVersions = Set(swiftABIVersions)
             if uniqueVersions.count > 1 {
                 throw StubError.error("Expected a single Swift ABI version in \(path.str) but found \(swiftABIVersions)")
-            }
-            else {
+            } else {
                 self.swiftABIVersion = swiftABIVersions.first!
             }
         }
 
         self.linkedSwiftLibNames = try object.allSwiftLibNames()
-        self.uuids = try object.slices().compactMap{ try $0.uuid() }
+        self.uuids = try object.slices().compactMap { try $0.uuid() }
     }
 
     public func hash(into hasher: inout Hasher) {
@@ -88,7 +87,7 @@ public final class EmbedSwiftStdLibTaskAction: TaskAction {
         /// Combined parent + task environment
         let effectiveEnvironment: [String: String]
 
-        var fs : any FSProxy { return executionDelegate.fs }
+        var fs: any FSProxy { return executionDelegate.fs }
 
         var verbose: Int = 0
 
@@ -165,7 +164,7 @@ public final class EmbedSwiftStdLibTaskAction: TaskAction {
         var backDeploySwiftSpan = false
 
         // The allowed list of libraries that should *not* be filtered when `filterForSwiftOS=true`.
-        let allowedLibsForSwiftOS = ["libswiftXCTest" ]
+        let allowedLibsForSwiftOS = ["libswiftXCTest"]
 
         // The allowed list of libraries that should *not* be filtered when `backDeploySwiftConcurrency=true`.
         let allowedLibsForSwiftConcurrency = ["libswift_Concurrency"]
@@ -177,7 +176,7 @@ public final class EmbedSwiftStdLibTaskAction: TaskAction {
             return path.isAbsolute ? path : task.workingDirectory.join(path)
         }
 
-        func logV(_ msg : @autoclosure () -> String) {
+        func logV(_ msg: @autoclosure () -> String) {
             if verbose > 0 {
                 outputController.emitOutputLock.withLock {
                     outputDelegate.emitOutput { $0 <<< msg() <<< "\n" }
@@ -185,7 +184,7 @@ public final class EmbedSwiftStdLibTaskAction: TaskAction {
             }
         }
 
-        func logVV(_ msg : @autoclosure () -> String) {
+        func logVV(_ msg: @autoclosure () -> String) {
             if verbose > 1 {
                 outputController.emitOutputLock.withLock {
                     outputDelegate.emitOutput { $0 <<< msg() <<< "\n" }
@@ -253,7 +252,7 @@ public final class EmbedSwiftStdLibTaskAction: TaskAction {
                     return p
                 }
 
-                func setSingleOccurrence<T>(_ result: inout T?, _ getValue : @autoclosure () throws -> T) throws {
+                func setSingleOccurrence<T>(_ result: inout T?, _ getValue: @autoclosure () throws -> T) throws {
                     guard result == nil else { throw StubError.error("Failed to parse arguments: expected a single \(arg) argument") }
                     result = try getValue()
                 }
@@ -275,8 +274,7 @@ public final class EmbedSwiftStdLibTaskAction: TaskAction {
                     let path = absolutePath(Path(try argParam()))
                     if let exe = try executableIfValid(path: path) {
                         scanExecutables.insert(exe)
-                    }
-                    else {
+                    } else {
                         logV("Failed to scan executable: \(path.str)")
                     }
 
@@ -395,14 +393,14 @@ public final class EmbedSwiftStdLibTaskAction: TaskAction {
             // Fix up srcDir and platform values.
             if srcDir == nil && platform == nil {
                 throw StubError.error("at least one of --source-libraries and --platform must be set")
-            }
-            else if let srcDir = srcDir, platform == nil {
+            } else if let srcDir = srcDir, platform == nil {
                 // src_dir is set but platform is not.
                 // Pick platform from src_dir's name.
                 platform = srcDir.basename
             }
 
-            srcDirs = srcDir != nil
+            srcDirs =
+                srcDir != nil
                 ? OrderedSet([srcDir!])
                 : OrderedSet(effectiveSourceDirectories(toolchainsDirs, platform: platform!))
             logVV("Effective srcDirs:\n\(srcDirs.elements.map{$0.str}.joined(separator: "\n"))")
@@ -475,8 +473,8 @@ public final class EmbedSwiftStdLibTaskAction: TaskAction {
                 func incrementCounter(_ counter: BuildOperationMetrics.Counter, by amount: Int) {}
                 func incrementTaskCounter(_ counter: BuildOperationMetrics.TaskCounter, by amount: Int) {}
 
-                var counters: [BuildOperationMetrics.Counter : Int] = [:]
-                var taskCounters: [BuildOperationMetrics.TaskCounter : Int] = [:]
+                var counters: [BuildOperationMetrics.Counter: Int] = [:]
+                var taskCounters: [BuildOperationMetrics.TaskCounter: Int] = [:]
 
                 let underlyingDelegate: any TaskOutputDelegate
                 var output = ByteString()
@@ -527,12 +525,18 @@ public final class EmbedSwiftStdLibTaskAction: TaskAction {
             }
 
             guard !failed else {
-                throw RunProcessNonZeroExitError(args: args, workingDirectory: task.workingDirectory, environment: .init(effectiveEnvironment), status: {
-                    if case let .exit(exitStatus, _) = processDelegate.outputDelegate.result {
-                        return exitStatus
-                    }
-                    return .uncaughtSignal(0)
-                }(), mergedOutput: output)
+                throw RunProcessNonZeroExitError(
+                    args: args,
+                    workingDirectory: task.workingDirectory,
+                    environment: .init(effectiveEnvironment),
+                    status: {
+                        if case let .exit(exitStatus, _) = processDelegate.outputDelegate.result {
+                            return exitStatus
+                        }
+                        return .uncaughtSignal(0)
+                    }(),
+                    mergedOutput: output
+                )
             }
 
             return output
@@ -545,8 +549,7 @@ public final class EmbedSwiftStdLibTaskAction: TaskAction {
         func copyFile(src: Path, dst: Path, stripBitcode: Bool) async throws {
             if stripBitcode {
                 try await copyAndStripBitcode(src: src, dst: dst)
-            }
-            else {
+            } else {
                 try fs.copy(src, to: dst)
             }
         }
@@ -590,7 +593,6 @@ public final class EmbedSwiftStdLibTaskAction: TaskAction {
             }
         }
 
-
         func queryCodeSignature(codesign: Path, _ file: Path) async throws -> ByteString {
             logV("Probing signature of \(file.str)")
             return try await runProcess([codesign.str, "-r-", "--display", file.str])
@@ -602,8 +604,7 @@ public final class EmbedSwiftStdLibTaskAction: TaskAction {
                 if fs.exists(tmpFilePath) {
                     do {
                         try fs.remove(tmpFilePath)
-                    }
-                    catch {
+                    } catch {
                         logV("Failed to remove: '\(tmpFilePath.str)': \(error)")
                     }
                 }
@@ -672,8 +673,7 @@ public final class EmbedSwiftStdLibTaskAction: TaskAction {
                     // Some of the Swift runtime libs don't use Swift, so we allow either an empty swiftVersion or a swiftVersion which satisfies the requested swiftVersion.
                     if !exe.usesSwift || exe.swiftABIVersion == swiftVersion {
                         return exe
-                    }
-                    else {
+                    } else {
                         foundNameMatches.append(exe)
                     }
                 }
@@ -688,14 +688,12 @@ public final class EmbedSwiftStdLibTaskAction: TaskAction {
             if !isOptional {
                 let versionStr = ignoreABIVersion ? "" : " for Swift ABI version \(swiftVersion)"
                 throw StubError.error("Could not find \(name)\(versionStr)")
-            }
-            else {
+            } else {
                 return nil
             }
         }
 
-        func collectTransitiveDependencies(srcDirs: OrderedSet<Path>, executables: Set<Executable>, swiftVersion: SwiftABIVersion, requireAllDependencies: Bool, discoveredDependencyInfo: inout DependencyInfo) throws -> Set <Executable>
-        {
+        func collectTransitiveDependencies(srcDirs: OrderedSet<Path>, executables: Set<Executable>, swiftVersion: SwiftABIVersion, requireAllDependencies: Bool, discoveredDependencyInfo: inout DependencyInfo) throws -> Set<Executable> {
             var worklist = Array(executables)
             var result = Set<Executable>()
             var consideredLibNames = Set<String>()
@@ -729,31 +727,30 @@ public final class EmbedSwiftStdLibTaskAction: TaskAction {
 
             // Pick a Swift version that all executables have to agree on.
             let swiftVersionOpt = try scanExecutables.reduce(nil) { (memo: (SwiftABIVersion, Executable)?, newExe: Executable) throws -> (SwiftABIVersion, Executable)? in
-                switch  (memo?.0,                   newExe.swiftABIVersion) {
-                case    (_,                         nil):
+                switch (memo?.0, newExe.swiftABIVersion) {
+                case (_, nil):
                     return memo
 
-                case    (nil,                       .some(let newVersion)):
+                case (nil, .some(let newVersion)):
                     return (newVersion, newExe)
 
-                case    (.some(let prevVersion),    .some(let newVersion)):
+                case (.some(let prevVersion), .some(let newVersion)):
                     guard prevVersion != newVersion else { return memo }
 
                     let mismatch = scanExecutables.first { object -> Bool in
                         return object.swiftABIVersion != nil && object.swiftABIVersion! != newVersion
-                        }!
+                    }!
 
                     let paths = [mismatch.path.str, newExe.path.str].sorted()
                     let message = "The following binaries use incompatible versions of Swift:\n\(paths.joined(separator: "\n"))"
                     if ignoreABIVersion {
                         self.outputDelegate.emitWarning(message)
                         return memo
-                    }
-                    else {
+                    } else {
                         throw StubError.error(message)
                     }
                 }
-                }?.0
+            }?.0
 
             // Discovered dependency paths, collected during processing, emitted at the end.
             var discoveredDependencyInfo = DependencyInfo(version: "swift-stdlib-tool")
@@ -771,14 +768,17 @@ public final class EmbedSwiftStdLibTaskAction: TaskAction {
             }
 
             // Collect Swift library names from the input files and follow dependencies recursively.
-            let dependencies = try collectTransitiveDependencies(srcDirs: srcDirs,
-                                                                 executables: scanExecutables,
-                                                                 swiftVersion: swiftVersion,
-                                                                 requireAllDependencies: false, // If the library does not exist in srcDirs then assume the user wrote their own library named libswift* and is handling it elsewhere.
-                                                                 discoveredDependencyInfo: &discoveredDependencyInfo)
+            let dependencies = try collectTransitiveDependencies(
+                srcDirs: srcDirs,
+                executables: scanExecutables,
+                swiftVersion: swiftVersion,
+                requireAllDependencies: false,  // If the library does not exist in srcDirs then assume the user wrote their own library named libswift* and is handling it elsewhere.
+                discoveredDependencyInfo: &discoveredDependencyInfo
+            )
 
             // The list of dependencies needs to be pruned based on the filtering mechanism. Under normal circumstances, no libraries are expected to be allowed.
-            let swiftLibs = dependencies
+            let swiftLibs =
+                dependencies
                 .filter {
                     let item = $0.path.basenameWithoutSuffix
 
@@ -798,15 +798,17 @@ public final class EmbedSwiftStdLibTaskAction: TaskAction {
 
             // Collect all the Swift libraries that the user requested with --resource-library.
 
-            let resourceLibrariesExecutables = try Set(resourceLibraries.map{ obj throws -> Executable in
-                return try findSwiftLib(srcDirs: srcDirs, name: obj, swiftVersion: swiftVersion, isOptional: false)!
-            })
+            let resourceLibrariesExecutables = try Set(
+                resourceLibraries.map { obj throws -> Executable in
+                    return try findSwiftLib(srcDirs: srcDirs, name: obj, swiftVersion: swiftVersion, isOptional: false)!
+                }
+            )
 
             let swiftLibsForResources: Set<Executable> = try collectTransitiveDependencies(
                 srcDirs: srcDirs,
                 executables: resourceLibrariesExecutables,
                 swiftVersion: swiftVersion,
-                requireAllDependencies: true, // These are system libraries and they should be complete.
+                requireAllDependencies: true,  // These are system libraries and they should be complete.
                 discoveredDependencyInfo: &discoveredDependencyInfo
             ).union(resourceLibrariesExecutables)
 
@@ -888,8 +890,7 @@ public final class EmbedSwiftStdLibTaskAction: TaskAction {
             }
 
             return .succeeded
-        }
-        catch {
+        } catch {
             outputDelegate.emitError("\(error)")
             return .failed
         }
diff --git a/Sources/SWBTaskExecution/TaskActions/FileCopyTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/FileCopyTaskAction.swift
index f3bbb3f6..197c6bdf 100644
--- a/Sources/SWBTaskExecution/TaskActions/FileCopyTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/FileCopyTaskAction.swift
@@ -16,10 +16,8 @@ import SWBLibc
 public import SWBCore
 
 /// Concrete implementation of the in-process file-copying task.
-public final class FileCopyTaskAction: TaskAction
-{
-    public override class var toolIdentifier: String
-    {
+public final class FileCopyTaskAction: TaskAction {
+    public override class var toolIdentifier: String {
         return "file-copy"
     }
 
@@ -122,9 +120,16 @@ public final class FileCopyTaskAction: TaskAction
                 try await withTemporaryDirectory { tempDir in
                     let commandLine = try context.stubCommandLine(frameworkPath: frameworkPath, isDeepBundle: isDeepBundle, platformRegistry: executionDelegate.platformRegistry, sdkRegistry: executionDelegate.sdkRegistry, tempDir: tempDir)
 
-                    outputDelegate.emit(Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("Injecting stub binary into codeless framework"), childDiagnostics: (commandLine.compileAndLink.flatMap { [$0.compile, $0.link] } + [commandLine.lipo]).map { commandLine in
-                        Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData(UNIXShellCommandCodec(encodingStrategy: .singleQuotes, encodingBehavior: .fullCommandLine).encode(commandLine)))
-                    }))
+                    outputDelegate.emit(
+                        Diagnostic(
+                            behavior: .note,
+                            location: .unknown,
+                            data: DiagnosticData("Injecting stub binary into codeless framework"),
+                            childDiagnostics: (commandLine.compileAndLink.flatMap { [$0.compile, $0.link] } + [commandLine.lipo]).map { commandLine in
+                                Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData(UNIXShellCommandCodec(encodingStrategy: .singleQuotes, encodingBehavior: .fullCommandLine).encode(commandLine)))
+                            }
+                        )
+                    )
 
                     var exists: Bool = false
                     if isDeepBundle && !executionDelegate.fs.isSymlink(frameworkPath.join(frameworkPath.basenameWithoutSuffix), &exists) {
diff --git a/Sources/SWBTaskExecution/TaskActions/GenericCachingTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/GenericCachingTaskAction.swift
index e46de075..73c4e82a 100644
--- a/Sources/SWBTaskExecution/TaskActions/GenericCachingTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/GenericCachingTaskAction.swift
@@ -52,7 +52,7 @@ public final class GenericCachingTaskAction: TaskAction {
         try super.init(from: deserializer)
     }
 
-    public override func serialize<T>(to serializer: T) where T : Serializer {
+    public override func serialize<T>(to serializer: T) where T: Serializer {
         serializer.beginAggregate(7)
         serializer.serialize(enableCacheDebuggingRemarks)
         serializer.serialize(enableTaskSandboxEnforcement)
@@ -77,10 +77,12 @@ public final class GenericCachingTaskAction: TaskAction {
 
         defer {
             if cas.supportsPruning {
-                dynamicExecutionDelegate.operationContext.compilationCachingDataPruner.pruneCAS(cas,
-                                                                                                key: .init(path: casOptions.casPath, casOptions: casOptions),
-                                                                                                activityReporter: dynamicExecutionDelegate,
-                                                                                                fileSystem: executionDelegate.fs)
+                dynamicExecutionDelegate.operationContext.compilationCachingDataPruner.pruneCAS(
+                    cas,
+                    key: .init(path: casOptions.casPath, casOptions: casOptions),
+                    activityReporter: dynamicExecutionDelegate,
+                    fileSystem: executionDelegate.fs
+                )
             }
         }
 
@@ -172,12 +174,14 @@ public final class GenericCachingTaskAction: TaskAction {
                 emitCacheDebuggingRemark("remapped command line: \(remappedCommandLine.joined(separator: " "))")
                 let remappedTempPath = sandboxDirectory.join("temp")
                 try executionDelegate.fs.createDirectory(remappedTempPath)
-                let remappedEnvironment = EnvironmentBindings(cacheKey.environmentBindings.bindings + [
-                    ("TMPDIR", remappedTempPath.str),
-                    ("TEMP", remappedTempPath.str),
-                    ("TEMPDIR", remappedTempPath.str),
-                    ("TMP", remappedTempPath.str)
-                ])
+                let remappedEnvironment = EnvironmentBindings(
+                    cacheKey.environmentBindings.bindings + [
+                        ("TMPDIR", remappedTempPath.str),
+                        ("TEMP", remappedTempPath.str),
+                        ("TEMPDIR", remappedTempPath.str),
+                        ("TMP", remappedTempPath.str),
+                    ]
+                )
                 emitCacheDebuggingRemark("remapped environment: \(remappedEnvironment.bindingsDictionary)")
 
                 let sandboxArgs = enableTaskSandboxEnforcement ? try Self.prepareSandboxEnforcementArgs(sandboxDirectory: sandboxDirectory, developerDirectory: developerDirectory, executionDelegate: executionDelegate) : []
@@ -243,54 +247,54 @@ public final class GenericCachingTaskAction: TaskAction {
     static func prepareSandboxEnforcementArgs(sandboxDirectory: Path, developerDirectory: Path, executionDelegate: any TaskExecutionDelegate) throws -> [String] {
         // We only support enforcement of the task sandbox on a macOS host
         #if os(macOS)
-        let sandboxPath = sandboxDirectory.join("sandbox.sb")
-        let sandboxProfile: ByteString = """
-        (version 1)
-        (allow default)
-
-        (deny network*)
-
-        (deny file-write*)
-        (allow file-write* (subpath "/dev/")) ; Allow writes to locations such as /dev/null
-
-        (deny file-read* (subpath "/Users/")) ; Block access to most locations under user control, while allowing reads to parts of the system required by frameworks and tools
-        (allow file-read* (subpath (param "XCODE"))) ; Allow reads into Xcode.app
-
-        ; Allow reads and writes to cache and logs directories
-        (allow file-read* file-write* (subpath (param "USER_CACHE_DIR")))
-        (allow file-read* file-write* (subpath (param "DARWIN_USER_CACHE_DIR")))
-        (allow file-read* file-write* (subpath (param "DARWIN_USER_TEMP_DIR")))
-        (allow file-read* file-write* (subpath (param "USER_LOGS_DIR")))
-        (allow file-read* file-write* (subpath (param "USER_DEVELOPER_DIR")))
-
-        ; Allow reads and writes to the task sandbox location
-        (allow file-read* file-write* (subpath (param "TASK_SANDBOX")))
-
-        ; Allow reads and writes to specific files required by system frameworks and libraries
-        (allow file-read-data file-write-data
-          (regex
-            #"/\\.CFUserTextEncoding$"
-            #"^/usr/share/nls/"
-            #"^/usr/share/zoneinfo /var/db/timezone/zoneinfo/"
-          ))
-
-        (allow file-read-metadata)
-        """
-        try executionDelegate.fs.write(sandboxPath, contents: sandboxProfile)
-
-         return [
-            "/usr/bin/sandbox-exec",
-            "-D", "TASK_SANDBOX=\(sandboxDirectory.str)",
-            "-D", "XCODE=\(developerDirectory.dirname.dirname.str)",
-            "-D", "USER_CACHE_DIR=\(Path.homeDirectory.join("Library/Caches").str)",
-            "-D", "DARWIN_USER_CACHE_DIR=\(userCacheDir().str)",
-            "-D", "DARWIN_USER_TEMP_DIR=\(try executionDelegate.fs.realpath(Path.temporaryDirectory).str)",
-            "-D", "USER_LOGS_DIR=\(Path.homeDirectory.join("Library/Logs").str)",
-            "-D", "USER_DEVELOPER_DIR=\(Path.homeDirectory.join("Library/Developer").str)",
-            "-f", sandboxPath.str
-        ]
+            let sandboxPath = sandboxDirectory.join("sandbox.sb")
+            let sandboxProfile: ByteString = """
+                (version 1)
+                (allow default)
+
+                (deny network*)
+
+                (deny file-write*)
+                (allow file-write* (subpath "/dev/")) ; Allow writes to locations such as /dev/null
+
+                (deny file-read* (subpath "/Users/")) ; Block access to most locations under user control, while allowing reads to parts of the system required by frameworks and tools
+                (allow file-read* (subpath (param "XCODE"))) ; Allow reads into Xcode.app
+
+                ; Allow reads and writes to cache and logs directories
+                (allow file-read* file-write* (subpath (param "USER_CACHE_DIR")))
+                (allow file-read* file-write* (subpath (param "DARWIN_USER_CACHE_DIR")))
+                (allow file-read* file-write* (subpath (param "DARWIN_USER_TEMP_DIR")))
+                (allow file-read* file-write* (subpath (param "USER_LOGS_DIR")))
+                (allow file-read* file-write* (subpath (param "USER_DEVELOPER_DIR")))
+
+                ; Allow reads and writes to the task sandbox location
+                (allow file-read* file-write* (subpath (param "TASK_SANDBOX")))
+
+                ; Allow reads and writes to specific files required by system frameworks and libraries
+                (allow file-read-data file-write-data
+                  (regex
+                    #"/\\.CFUserTextEncoding$"
+                    #"^/usr/share/nls/"
+                    #"^/usr/share/zoneinfo /var/db/timezone/zoneinfo/"
+                  ))
+
+                (allow file-read-metadata)
+                """
+            try executionDelegate.fs.write(sandboxPath, contents: sandboxProfile)
+
+            return [
+                "/usr/bin/sandbox-exec",
+                "-D", "TASK_SANDBOX=\(sandboxDirectory.str)",
+                "-D", "XCODE=\(developerDirectory.dirname.dirname.str)",
+                "-D", "USER_CACHE_DIR=\(Path.homeDirectory.join("Library/Caches").str)",
+                "-D", "DARWIN_USER_CACHE_DIR=\(userCacheDir().str)",
+                "-D", "DARWIN_USER_TEMP_DIR=\(try executionDelegate.fs.realpath(Path.temporaryDirectory).str)",
+                "-D", "USER_LOGS_DIR=\(Path.homeDirectory.join("Library/Logs").str)",
+                "-D", "USER_DEVELOPER_DIR=\(Path.homeDirectory.join("Library/Developer").str)",
+                "-f", sandboxPath.str,
+            ]
         #else
-        return []
+            return []
         #endif
     }
 }
@@ -412,11 +416,11 @@ fileprivate final class CapturingTaskOutputDelegate: TaskOutputDelegate {
         underlyingTaskOutputDelegate.incrementTaskCounter(counter, by: amount)
     }
 
-    var counters: [BuildOperationMetrics.Counter : Int] {
+    var counters: [BuildOperationMetrics.Counter: Int] {
         underlyingTaskOutputDelegate.counters
     }
 
-    var taskCounters: [BuildOperationMetrics.TaskCounter : Int] {
+    var taskCounters: [BuildOperationMetrics.TaskCounter: Int] {
         underlyingTaskOutputDelegate.taskCounters
     }
 
diff --git a/Sources/SWBTaskExecution/TaskActions/InfoPlistProcessorTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/InfoPlistProcessorTaskAction.swift
index 225cc2c8..e381b9f0 100644
--- a/Sources/SWBTaskExecution/TaskActions/InfoPlistProcessorTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/InfoPlistProcessorTaskAction.swift
@@ -20,10 +20,8 @@ import class Foundation.PropertyListSerialization
 import class Foundation.NSError
 
 /// Concrete implementation of the Info.plist processor in-process task.
-public final class InfoPlistProcessorTaskAction: TaskAction
-{
-    public override class var toolIdentifier: String
-    {
+public final class InfoPlistProcessorTaskAction: TaskAction {
+    public override class var toolIdentifier: String {
         return "info-plist-processor"
     }
 
@@ -45,8 +43,7 @@ public final class InfoPlistProcessorTaskAction: TaskAction
     private var requiredArchitecture: String? = nil
     private var outputFormat: PropertyListSerialization.PropertyListFormat? = nil
 
-    public init(_ contextPath: Path)
-    {
+    public init(_ contextPath: Path) {
         self.contextPath = contextPath
         super.init()
     }
@@ -77,8 +74,7 @@ public final class InfoPlistProcessorTaskAction: TaskAction
         let productType = context.productType
         let platform = context.platform
         // Parse the arguments and cache them.  We only have to do this the first time the task is run, since the task won't change from run to run, and it cannot be run multiple times in parallel in the same process.
-        if configParsingResult == nil
-        {
+        if configParsingResult == nil {
             // The compiler won't let us just do a tuple assignment of the method return value here.  c.f <rdar://problem/24317727>
             let (result, messages) = parseConfiguration(task, context: context)
             configParsingResult = result
@@ -86,8 +82,7 @@ public final class InfoPlistProcessorTaskAction: TaskAction
         }
         // We do, however, have to emit the messages and handle a bad exit code on each run.
         configParsingMessages?.emitMessages(outputDelegate)
-        if configParsingResult! != .succeeded
-        {
+        if configParsingResult! != .succeeded {
             return configParsingResult!
         }
 
@@ -110,32 +105,23 @@ public final class InfoPlistProcessorTaskAction: TaskAction
         // Read the property list from the file.  We assume this method will emit any appropriate messages during reading.
         // We will modify the plist in place throughout the course of the tool until we finally have the contents we want to write out.
         let contentsData: ByteString
-        do
-        {
+        do {
             contentsData = try executionDelegate.fs.read(inputPath)
-        }
-        catch let e
-        {
+        } catch let e {
             outputDelegate.emitError("unable to read input file '\(inputPath.str)': \(e.localizedDescription)")
             return .failed
         }
         var (plist, inputFormat): (PropertyListItem, PropertyListSerialization.PropertyListFormat)
-        do
-        {
+        do {
             (plist, inputFormat) = try PropertyList.fromBytesWithFormat(contentsData.bytes)
-        }
-        catch let error as NSError
-        {
+        } catch let error as NSError {
             outputDelegate.emitError("unable to read property list from file: \(inputPath.str): \(error.localizedDescription)")
             return .failed
-        }
-        catch
-        {
+        } catch {
             outputDelegate.emitError("unable to read property list from file: \(inputPath.str): unknown error")
             return .failed
         }
 
-
         // Confirm that the property list is a dictionary.
         guard case let .plDict(plistDict) = plist else { outputDelegate.emitError("contents of file is not a dictionary: \(inputPath.str)"); return .failed }
 
@@ -148,31 +134,25 @@ public final class InfoPlistProcessorTaskAction: TaskAction
                     return .failed
                 }
                 plist = .plDict(plistDict.addingContents(of: infoPlistFileContentsDict))
-            }
-            catch {
+            } catch {
                 outputDelegate.emitError("unable to create property list from string '\(infoPlistFileContents)': \(error.localizedDescription)")
                 return .failed
             }
         }
 
-
         // Load the additional content files, if any, and merge their content into the input plist.
-        for path in additionalContentFilePaths
-        {
+        for path in additionalContentFilePaths {
             let additionalContentResult = addAdditionalContent(from: path, &plist, context: context, executionDelegate, outputDelegate)
-            guard additionalContentResult == .succeeded else
-            {
+            guard additionalContentResult == .succeeded else {
                 // addAdditionalContent() will have emitted any issues as it executed.
                 return additionalContentResult
             }
         }
 
-        for path in privacyFileContentFilePaths
-        {
+        for path in privacyFileContentFilePaths {
             if let privacyFile = scanForPrivacyFile(at: path, fs: executionDelegate.fs) {
                 let additionalPrivacyContentResult = addAppPrivacyContent(from: privacyFile, &plist, executionDelegate, outputDelegate)
-                guard additionalPrivacyContentResult == .succeeded else
-                {
+                guard additionalPrivacyContentResult == .succeeded else {
                     // addAppPrivacyContent() will have emitted any issues as it executed.
                     return additionalPrivacyContentResult
                 }
@@ -180,19 +160,16 @@ public final class InfoPlistProcessorTaskAction: TaskAction
         }
 
         // If we were passed any required architecture, then we apply it to the value of the 'UIRequiredDeviceCapabilities' key, by setting it and removing any others.
-        if requiredArchitecture != nil
-        {
+        if requiredArchitecture != nil {
             let result = setRequiredDeviceCapabilities(&plist, context: context, outputDelegate: outputDelegate)
-            if result != .succeeded
-            {
+            if result != .succeeded {
                 return result
             }
         }
 
         // Add the data from the additional info property in the platform to the plist.
         let additionalInfoResult = addAdditionalEntriesFromPlatform(&plist, context: context, outputDelegate: outputDelegate)
-        if additionalInfoResult != .succeeded
-        {
+        if additionalInfoResult != .succeeded {
             // addAdditionalEntriesFromPlatform() will have emitted any issues as it executed.
             return additionalInfoResult
         }
@@ -230,34 +207,36 @@ public final class InfoPlistProcessorTaskAction: TaskAction
         }
 
         // Elide any empty string values for a specific set of keys (bad things happen in the system if an Info.plist has an empty value for any of these keys).
-        plist = plist.byElidingRecursivelyEmptyStringValuesInDictionaries(Set<String>([
-            "CFBundleDevelopmentRegion",
-            "CFBundleExecutable",
-            "CFBundleGetInfoString",
-            "CFBundleIconFile",
-            "CFBundleIdentifier",
-            "CFBundleName",
-            "CFBundlePackageType",
-            "CFBundleResourceSpecification",
-            "CFBundleShortVersionString",
-            "CFBundleSignature",
-            "CFBundleTypeIconFile",
-            "CFBundleTypeRole",
-            "CFBundleVersion",
-            "NSDocumentClass",
-            "NSHelpFile",
-            "NSHumanReadableCopyright",
-            "NSMainNibFile",
-            "NSPrincipalClass",
-            "NSStickerSharingLevel",
-
-            // These aren't harmful to the system if they're empty, but will cause App Store submission to fail, so elide them as well.
-            "BuildMachineOSBuild",
-            "DTSwiftPlaygroundsBuild",
-            "DTSwiftPlaygroundsVersion",
-            "DTXcode",
-            "DTXcodeBuild",
-        ]))
+        plist = plist.byElidingRecursivelyEmptyStringValuesInDictionaries(
+            Set<String>([
+                "CFBundleDevelopmentRegion",
+                "CFBundleExecutable",
+                "CFBundleGetInfoString",
+                "CFBundleIconFile",
+                "CFBundleIdentifier",
+                "CFBundleName",
+                "CFBundlePackageType",
+                "CFBundleResourceSpecification",
+                "CFBundleShortVersionString",
+                "CFBundleSignature",
+                "CFBundleTypeIconFile",
+                "CFBundleTypeRole",
+                "CFBundleVersion",
+                "NSDocumentClass",
+                "NSHelpFile",
+                "NSHumanReadableCopyright",
+                "NSMainNibFile",
+                "NSPrincipalClass",
+                "NSStickerSharingLevel",
+
+                // These aren't harmful to the system if they're empty, but will cause App Store submission to fail, so elide them as well.
+                "BuildMachineOSBuild",
+                "DTSwiftPlaygroundsBuild",
+                "DTSwiftPlaygroundsVersion",
+                "DTXcode",
+                "DTXcodeBuild",
+            ])
+        )
 
         // Convert the PropertyListItem to a Dictionary so we can inject content
         guard case .plDict(var plistDict) = plist else {
@@ -273,8 +252,7 @@ public final class InfoPlistProcessorTaskAction: TaskAction
         let deploymentTarget: Version?
         if let deploymentTargetMacro = platform?.deploymentTargetMacro {
             deploymentTarget = try? Version(scope.evaluate(deploymentTargetMacro))
-        }
-        else {
+        } else {
             deploymentTarget = nil
         }
 
@@ -325,8 +303,7 @@ public final class InfoPlistProcessorTaskAction: TaskAction
             if numDocumentTypes > 0, plistDict["LSSupportsOpeningDocumentsInPlace"] == nil, plistDict["UISupportsDocumentBrowser"] == nil {
                 outputDelegate.emitWarning("The application supports opening files, but doesn't declare whether it supports opening them in place. You can add an LSSupportsOpeningDocumentsInPlace entry or an UISupportsDocumentBrowser entry to your Info.plist to declare support.")
             }
-        }
-        else if platform?.familyName == "macOS", !disableInfoPlistPlatformEditing {
+        } else if platform?.familyName == "macOS", !disableInfoPlistPlatformEditing {
             if numDocumentTypes > 0, let sodip = plistDict["LSSupportsOpeningDocumentsInPlace"], sodip.boolValue == false {
                 outputDelegate.emitError("'LSSupportsOpeningDocumentsInPlace = NO' is not supported on macOS. Either remove the entry or set it to YES, and also ensure that the application does open documents in place on macOS.")
                 return .failed
@@ -371,49 +348,35 @@ public final class InfoPlistProcessorTaskAction: TaskAction
         return .succeeded
     }
 
-
     // MARK: Parsing the configuration
 
-
-    private func parseConfiguration(_ task: any ExecutableTask, context: InfoPlistProcessorTaskActionContext) -> (CommandResult, TaskActionMessageCollection)
-    {
+    private func parseConfiguration(_ task: any ExecutableTask, context: InfoPlistProcessorTaskActionContext) -> (CommandResult, TaskActionMessageCollection) {
         let messages = TaskActionMessageCollection()
         let commandLine = [String](task.commandLineAsStrings)
 
-        var i = 1                     // Skip over the tool name
-        while i < commandLine.count
-        {
+        var i = 1  // Skip over the tool name
+        while i < commandLine.count {
             let option = commandLine[i]
             switch option
             {
             case "-format":
                 // The '-format' option takes a single argument: 'openstep', 'xml', or 'binary'.
-                if commandLine.count > i+1
-                {
+                if commandLine.count > i + 1 {
                     // The argument is the format in which to write the output.
                     i += 1
                     let arg = commandLine[i]
-                    if arg == "openstep"
-                    {
+                    if arg == "openstep" {
                         outputFormat = .openStep
-                    }
-                    else if arg == "xml"
-                    {
+                    } else if arg == "xml" {
                         outputFormat = .xml
-                    }
-                    else if arg == "binary"
-                    {
+                    } else if arg == "binary" {
                         outputFormat = .binary
-                    }
-                    else
-                    {
+                    } else {
                         // Unrecognized argument to -format.
                         messages.addMessage(.error("unrecognized argument to \(option): '\(arg)' (use 'openstep', 'xml', or 'binary')"))
                         return (.failed, messages)
                     }
-                }
-                else
-                {
+                } else {
                     // No argument to -format.
                     messages.addMessage(.error("missing argument for \(option) (use 'openstep', 'xml', or 'binary')"))
                     return (.failed, messages)
@@ -421,25 +384,19 @@ public final class InfoPlistProcessorTaskAction: TaskAction
 
             case "-genpkginfo":
                 // The '-pkginfo' option takes a single argument: the path of the pkginfo file to generate.
-                if commandLine.count > i+1
-                {
+                if commandLine.count > i + 1 {
                     // The argument is the output path.
                     i += 1
                     let arg = commandLine[i]
-                    if pkgInfoPath == nil
-                    {
+                    if pkgInfoPath == nil {
                         // We don't already have a pkginfo path; we do now.
                         pkgInfoPath = Path(arg)
-                    }
-                    else
-                    {
+                    } else {
                         // We already have a pkginfo path.
                         messages.addMessage(.error("multiple pkginfo paths specified"))
                         return (.failed, messages)
                     }
-                }
-                else
-                {
+                } else {
                     // No argument to -genpkginfo.
                     messages.addMessage(.error("missing argument for \(option)"))
                     return (.failed, messages)
@@ -466,32 +423,25 @@ public final class InfoPlistProcessorTaskAction: TaskAction
 
             case "-platform":
                 // The '-platform' option takes a single argument: the name of the platform for which the Info.plist is being generated.
-                if commandLine.count > i+1
-                {
+                if commandLine.count > i + 1 {
                     // The argument is the platform name.
                     i += 1
                     let arg = commandLine[i]
-                    if platformName == nil
-                    {
+                    if platformName == nil {
                         // We don't already have a platform name; we do now.
                         platformName = arg
 
                         // If the platform name we were passed differs from the platform we were configured with, then emit an error.
-                        if platformName! != context.platform?.name
-                        {
+                        if platformName! != context.platform?.name {
                             messages.addMessage(.error("argument to -platform '\(platformName!)' differs from platform being targeted '\(context.platform?.name ?? "")'"))
                             return (.failed, messages)
                         }
-                    }
-                    else
-                    {
+                    } else {
                         // We already have a pkginfo path.
                         messages.addMessage(.error("multiple platform names specified"))
                         return (.failed, messages)
                     }
-                }
-                else
-                {
+                } else {
                     // No argument to -platform.
                     messages.addMessage(.error("missing argument for \(option)"))
                     return (.failed, messages)
@@ -507,25 +457,19 @@ public final class InfoPlistProcessorTaskAction: TaskAction
 
             case "-resourcerulesfile":
                 // The '-resourcerulesfile' option takes a single argument: the name (or path) of the resource rules file.
-                if commandLine.count > i+1
-                {
+                if commandLine.count > i + 1 {
                     // The argument is the resource rules file.
                     i += 1
                     let arg = commandLine[i]
-                    if resourceRulesFileName == nil
-                    {
+                    if resourceRulesFileName == nil {
                         // We don't already have a resource rules file; we do now.
                         resourceRulesFileName = Path(arg)
-                    }
-                    else
-                    {
+                    } else {
                         // We already have a pkginfo path.
                         messages.addMessage(.error("multiple resource rules files specified"))
                         return (.failed, messages)
                     }
-                }
-                else
-                {
+                } else {
                     // No argument to -resourcerulesfile.
                     messages.addMessage(.error("missing argument for \(option)"))
                     return (.failed, messages)
@@ -533,15 +477,12 @@ public final class InfoPlistProcessorTaskAction: TaskAction
 
             case "-additionalcontentfile":
                 // The '-additionalcontentfile' option takes a single argument: the name of the additional content file.  There may be more than one such file passed.
-                if commandLine.count > i+1
-                {
+                if commandLine.count > i + 1 {
                     // The argument is the additional content file.
                     i += 1
                     let arg = commandLine[i]
                     additionalContentFilePaths.append(Path(arg))
-                }
-                else
-                {
+                } else {
                     // No argument to -additionalcontentfile.
                     messages.addMessage(.error("missing argument for \(option)"))
                     return (.failed, messages)
@@ -549,14 +490,11 @@ public final class InfoPlistProcessorTaskAction: TaskAction
 
             case "-scanforprivacyfile":
                 // The '-scanforprivacyfile' option takes a single argument: the path of the path to scan for an `PrivacyInfo.xcprivacy` file.  There may be more than one such path passed.
-                if commandLine.count > i+1
-                {
+                if commandLine.count > i + 1 {
                     i += 1
                     let arg = commandLine[i]
                     privacyFileContentFilePaths.append(Path(arg))
-                }
-                else
-                {
+                } else {
                     // No argument to -scanforprivacyfile.
                     messages.addMessage(.error("missing argument for \(option)"))
                     return (.failed, messages)
@@ -570,7 +508,7 @@ public final class InfoPlistProcessorTaskAction: TaskAction
                     return (.failed, messages)
                 }
 
-                guard commandLine.count > i+1 else {
+                guard commandLine.count > i + 1 else {
                     messages.addMessage(.error("missing argument for \(option)"))
                     return (.failed, messages)
                 }
@@ -582,44 +520,33 @@ public final class InfoPlistProcessorTaskAction: TaskAction
 
             case "-o":
                 // The '-o' option takes a single argument: the output path.
-                if commandLine.count > i+1
-                {
+                if commandLine.count > i + 1 {
                     // The argument is the resource rules file.
                     i += 1
                     let arg = commandLine[i]
-                    if outputPath == nil
-                    {
+                    if outputPath == nil {
                         // We don't already have a resource rules file; we do now.
                         outputPath = Path(arg)
-                    }
-                    else
-                    {
+                    } else {
                         // We already have a pkginfo path.
                         messages.addMessage(.error("multiple output files specified"))
                         return (.failed, messages)
                     }
-                }
-                else
-                {
+                } else {
                     // No argument to -o.
                     messages.addMessage(.error("missing argument for \(option)"))
                     return (.failed, messages)
                 }
 
             default:
-                if option.hasPrefix("-")
-                {
+                if option.hasPrefix("-") {
                     // Unknown option.
                     messages.addMessage(.error("unrecognized option: \(option)"))
                     return (.failed, messages)
-                }
-                else if inputPath == nil
-                {
+                } else if inputPath == nil {
                     // If we don't already have an input path, then we use this as the input path.
                     inputPath = Path(option)
-                }
-                else
-                {
+                } else {
                     // It's an input path and we already have one; that's not allowed.
                     messages.addMessage(.error("multiple input files specified"))
                     return (.failed, messages)
@@ -692,8 +619,7 @@ public final class InfoPlistProcessorTaskAction: TaskAction
 
     /// Produce a collection of default Info.plist keys based on content in the project, taking platform and product type into account.
     /// Could be done through InfoPlistAdditions properties in product types, but that would result in more duplication at this point
-    private func defaultInfoPlistContent(scope: MacroEvaluationScope, platform: Platform?, productType: ProductTypeSpec?) -> [String: PropertyListItem]
-    {
+    private func defaultInfoPlistContent(scope: MacroEvaluationScope, platform: Platform?, productType: ProductTypeSpec?) -> [String: PropertyListItem] {
         var content: [String: PropertyListItem] = [:]
 
         // The general theory of this method is that we now have a bunch of INFOPLIST_KEY-prefixed build settings that are used to define sufficiently simple Info.plist content, and we go to those (which will either have appropriate backstops set as necessary, or be empty) to determine the content to generate.
@@ -701,8 +627,10 @@ public final class InfoPlistProcessorTaskAction: TaskAction
         /// Get the macro name corresponding to the given Info.plist key name.
         /// This accommodates platform-specific override names like UISomething~ipad, which may use proper capitalization in the build setting.
         func macroNameForInfoPlistKey(key: String, prefix: String) -> String {
-            let replacements = [ "~iphone": "_iPhone",
-                                 "~ipad": "_iPad" ]
+            let replacements = [
+                "~iphone": "_iPhone",
+                "~ipad": "_iPad",
+            ]
             var adjustedKey = key
             for (infoPlistPart, macroNamePart) in replacements {
                 adjustedKey = adjustedKey.replacingOccurrences(of: infoPlistPart, with: macroNamePart)
@@ -738,69 +666,70 @@ public final class InfoPlistProcessorTaskAction: TaskAction
 
         // Note that for flexibility, instead of rigidly assigning only some values for some platforms, we (mostly) rely on the templates to specify the right values for the platforms involved, and to leave values they don't care about unspecified.
 
-        let generatedInfoPlistKeys: [String] = [
-            // General
+        let generatedInfoPlistKeys: [String] =
+            [
+                // General
 
-            "CFBundleDisplayName",
-            "LSApplicationCategoryType",
-            "NSHumanReadableCopyright",
-            "NSPrincipalClass",
-            "ITSAppUsesNonExemptEncryption",
-            "ITSEncryptionExportComplianceCode",
-            "NSLocationTemporaryUsageDescriptionDictionary",
+                "CFBundleDisplayName",
+                "LSApplicationCategoryType",
+                "NSHumanReadableCopyright",
+                "NSPrincipalClass",
+                "ITSAppUsesNonExemptEncryption",
+                "ITSEncryptionExportComplianceCode",
+                "NSLocationTemporaryUsageDescriptionDictionary",
 
-            // macOS
+                // macOS
 
-            "LSBackgroundOnly",
-            "LSUIElement",
-            "NSMainNibFile",
-            "NSMainStoryboardFile",
+                "LSBackgroundOnly",
+                "LSUIElement",
+                "NSMainNibFile",
+                "NSMainStoryboardFile",
 
-            // iOS and Derived
+                // iOS and Derived
 
-            "UILaunchStoryboardName",
-            "UIMainStoryboardFile",
-            "UIRequiredDeviceCapabilities",
-            "UISupportedInterfaceOrientations",
-            "UIUserInterfaceStyle",
+                "UILaunchStoryboardName",
+                "UIMainStoryboardFile",
+                "UIRequiredDeviceCapabilities",
+                "UISupportedInterfaceOrientations",
+                "UIUserInterfaceStyle",
 
-            // iOS
+                // iOS
 
-            "LSSupportsOpeningDocumentsInPlace",
-            "NSSensorKitPrivacyPolicyURL",
-            "NSSupportsLiveActivities",
-            "NSSupportsLiveActivitiesFrequentUpdates",
-            "UIApplicationSupportsIndirectInputEvents",
-            "UIRequiresFullScreen",
-            "UIStatusBarHidden",
-            "UIStatusBarStyle",
-            "UISupportedInterfaceOrientations~ipad",
-            "UISupportedInterfaceOrientations~iphone",
-            "UISupportsDocumentBrowser",
+                "LSSupportsOpeningDocumentsInPlace",
+                "NSSensorKitPrivacyPolicyURL",
+                "NSSupportsLiveActivities",
+                "NSSupportsLiveActivitiesFrequentUpdates",
+                "UIApplicationSupportsIndirectInputEvents",
+                "UIRequiresFullScreen",
+                "UIStatusBarHidden",
+                "UIStatusBarStyle",
+                "UISupportedInterfaceOrientations~ipad",
+                "UISupportedInterfaceOrientations~iphone",
+                "UISupportsDocumentBrowser",
 
-            // watchOS
+                // watchOS
 
-            "CLKComplicationPrincipalClass",
-            "WKApplication",
-            "WKCompanionAppBundleIdentifier",
-            "WKExtensionDelegateClassName",
-            "WKRunsIndependentlyOfCompanionApp",
-            "WKWatchOnly",
-            "WKSupportsLiveActivityLaunchAttributeTypes",
+                "CLKComplicationPrincipalClass",
+                "WKApplication",
+                "WKCompanionAppBundleIdentifier",
+                "WKExtensionDelegateClassName",
+                "WKRunsIndependentlyOfCompanionApp",
+                "WKWatchOnly",
+                "WKSupportsLiveActivityLaunchAttributeTypes",
 
-            // Metal
+                // Metal
 
-            "MetalCaptureEnabled",
+                "MetalCaptureEnabled",
 
-            // Game Controller and Game Mode
+                // Game Controller and Game Mode
 
-            "GCSupportsControllerUserInteraction",
-            "GCSupportsGameMode",
+                "GCSupportsControllerUserInteraction",
+                "GCSupportsGameMode",
 
-            // Sticker Packs
+                // Sticker Packs
 
-            "NSStickerSharingLevel",
-        ] + usageDescriptionStringKeys
+                "NSStickerSharingLevel",
+            ] + usageDescriptionStringKeys
 
         for key in generatedInfoPlistKeys {
             updateContentWithInfoPlistKeyMacroValue(&content, key)
@@ -824,7 +753,7 @@ public final class InfoPlistProcessorTaskAction: TaskAction
         updateContent(&content, key: "CFBundlePackageType", buildSetting: BuiltinMacros.PRODUCT_BUNDLE_PACKAGE_TYPE.name)
         updateContent(&content, key: "CFBundleShortVersionString", buildSetting: BuiltinMacros.MARKETING_VERSION.name)
 
-        content["CFBundleInfoDictionaryVersion"] = .plString("6.0") // TODO: consider removing this since it likely isn't needed
+        content["CFBundleInfoDictionaryVersion"] = .plString("6.0")  // TODO: consider removing this since it likely isn't needed
 
         // iOS and Derived Platforms - Special Cases
 
@@ -869,36 +798,26 @@ public final class InfoPlistProcessorTaskAction: TaskAction
     }
 
     /// Add the keys from the `AdditionalInfo` dictionary in the platform to the Info.plist.  Only keys which do not exist in the input plist will be added.  This will modify the  input `plist` in place.
-    private func addAdditionalEntriesFromPlatform(_ plist: inout PropertyListItem, context: InfoPlistProcessorTaskActionContext, outputDelegate: any TaskOutputDelegate) -> CommandResult
-    {
+    private func addAdditionalEntriesFromPlatform(_ plist: inout PropertyListItem, context: InfoPlistProcessorTaskActionContext, outputDelegate: any TaskOutputDelegate) -> CommandResult {
         // If we were passed a platform with -platform, then we use its additional info.
-        if platformName != nil
-        {
+        if platformName != nil {
             // Only do anything if the platform's additional info is not empty.
-            if context.platform?.additionalInfoPlistEntries.count > 0
-            {
+            if context.platform?.additionalInfoPlistEntries.count > 0 {
                 guard case .plDict(let dict) = plist else { outputDelegate.emitError("Info.plist contents are not a dictionary prior to adding additional entries from platform"); return .failed }
                 var plistDict = dict
 
                 // Go through the additional entries from the platform and add them to the plist dictionary.  But only if they're not already present in the plist.
-                for (key, plValue) in context.platform?.additionalInfoPlistEntries ?? [:] where plistDict[key] == nil
-                {
-                    if case .plString(let value) = plValue
-                    {
+                for (key, plValue) in context.platform?.additionalInfoPlistEntries ?? [:] where plistDict[key] == nil {
+                    if case .plString(let value) = plValue {
                         // In the past, the <some string> convention was used to indicate that the value for this key should be the value in the platform's properties.  It looks like no platform circa Xcode 9.0 uses this convention anymore, so we no longer support it and we warn if we find such a key - we should encourage platforms to use actual build setting evaluation instead.
-                        if value.hasPrefix("<")  &&  value.hasSuffix(">")  &&  value.count > 2
-                        {
+                        if value.hasPrefix("<") && value.hasSuffix(">") && value.count > 2 {
                             outputDelegate.emitWarning("key '\(key)' in 'AdditionalInfo' dictionary for platform \(context.platform?.displayName ?? "") uses unsupported bracket evaluation convention for its value '\(value)'")
                             plistDict[key] = plValue
-                        }
-                        else
-                        {
+                        } else {
                             // String values which aren't surrounded by <>.
                             plistDict[key] = plValue
                         }
-                    }
-                    else
-                    {
+                    } else {
                         // Non-string values.
                         plistDict[key] = plValue
                     }
@@ -917,20 +836,17 @@ public final class InfoPlistProcessorTaskAction: TaskAction
         let contentsData: ByteString
         do {
             contentsData = try executionDelegate.fs.read(path)
-        }
-        catch {
+        } catch {
             outputDelegate.emitError("unable to read additional content file '\(path.str)': \(error.localizedDescription)")
             return .failed
         }
         let additionalPlist: PropertyListItem
         do {
             (additionalPlist, _) = try PropertyList.fromBytesWithFormat(contentsData.bytes)
-        }
-        catch let error as NSError {
+        } catch let error as NSError {
             outputDelegate.emitError("unable to read property list from additional content file: \(path.str): \(error.localizedDescription)")
             return .failed
-        }
-        catch {
+        } catch {
             outputDelegate.emitError("unable to read property list from additional content file: \(path.str): unknown error")
             return .failed
         }
@@ -953,8 +869,7 @@ public final class InfoPlistProcessorTaskAction: TaskAction
             if key == "UIRequiredDeviceCapabilities" {
                 if let mergedCapabilitiesResult = mergeUIRequiredDeviceCapabilities(valueToMerge, from: path, into: workingValue, from: inputPath!, outputDelegate) {
                     plistDict[key] = mergedCapabilitiesResult
-                }
-                else {
+                } else {
                     return .failed
                 }
             } else if (key == "CFBundleIcons" || key.hasPrefix("CFBundleIcons~")) && context.scope.evaluate(BuiltinMacros.INFOPLIST_ENABLE_CFBUNDLEICONS_MERGE) {
@@ -990,8 +905,7 @@ public final class InfoPlistProcessorTaskAction: TaskAction
                         outputDelegate.emitError("tried to merge \(valueToMerge.typeDisplayString) value for key '\(key)' onto \(workingValue.typeDisplayString) value")
                         return .failed
                     }
-                }
-                else {
+                } else {
                     // If the key isn't defined, then we can just set it.
                     plistDict[key] = valueToMerge
                 }
@@ -1011,20 +925,17 @@ public final class InfoPlistProcessorTaskAction: TaskAction
         let contentsData: ByteString
         do {
             contentsData = try executionDelegate.fs.read(path)
-        }
-        catch {
+        } catch {
             outputDelegate.emitError("unable to read privacy file '\(path.str)': \(error.localizedDescription)")
             return .failed
         }
         let privacyPlist: PropertyListItem
         do {
             (privacyPlist, _) = try PropertyList.fromBytesWithFormat(contentsData.bytes)
-        }
-        catch let error as NSError {
+        } catch let error as NSError {
             outputDelegate.emitError("unable to read property list from privacy file: \(path.str): \(error.localizedDescription)")
             return .failed
-        }
-        catch {
+        } catch {
             outputDelegate.emitError("unable to read property list from privacy file: \(path.str): unknown error")
             return .failed
         }
@@ -1042,8 +953,8 @@ public final class InfoPlistProcessorTaskAction: TaskAction
         var trackedDomains = plistDict[trackedDomainsKey]?.arrayValue ?? []
         if let additionalTrackedDomains = privacyDict[trackedDomainsKey]?.arrayValue {
             // It's import to both remove duplicates and sort the items to ensure stable file contents.
-            var set = Set<String>(trackedDomains.compactMap( { $0.stringValue }))
-            for domain in additionalTrackedDomains.compactMap( { $0.stringValue }) {
+            var set = Set<String>(trackedDomains.compactMap({ $0.stringValue }))
+            for domain in additionalTrackedDomains.compactMap({ $0.stringValue }) {
                 set.insert(domain)
             }
             trackedDomains = set.sorted().map { PropertyListItem.plString($0) }
@@ -1099,7 +1010,7 @@ public final class InfoPlistProcessorTaskAction: TaskAction
                 if plistDict["UIDeviceFamily"] != nil {
                     outputDelegate.emitWarning("User supplied UIDeviceFamily key in the Info.plist will be overwritten. Please use the build setting TARGETED_DEVICE_FAMILY and remove UIDeviceFamily from your Info.plist.")
                 }
-                plistDict["UIDeviceFamily"] = .plArray(effectiveDevices.sorted().map{ .plInt($0) })
+                plistDict["UIDeviceFamily"] = .plArray(effectiveDevices.sorted().map { .plInt($0) })
             }
         }
 
@@ -1141,22 +1052,22 @@ public final class InfoPlistProcessorTaskAction: TaskAction
         /// Mapping of all keys known to not be supported on some platforms to the info about which platforms they are or aren't supported on.
         let keyPlatformSupport: [String: PlatformFamilySupportInfo] = [
             // Keys not supported on macOS, watchOS.
-            "LSRequiresIPhoneOS":               .notSupportedOn(Set(["macOS", "watchOS"])),
+            "LSRequiresIPhoneOS": .notSupportedOn(Set(["macOS", "watchOS"])),
 
             // Keys only supported on macOS.
-            "LSBackgroundOnly":                 .supportedOnlyOn(Set(["macOS"])),
-            "LSUIElement":                      .supportedOnlyOn(Set(["macOS"])),
-            "NSDocumentClass":                  .supportedOnlyOn(Set(["macOS"])),
-            "NSServices":                       .supportedOnlyOn(Set(["macOS"])),
-            "NSSupportsAutomaticTermination":   .supportedOnlyOn(Set(["macOS"])),
-            "NSSupportsSuddenTermination":      .supportedOnlyOn(Set(["macOS"])),
+            "LSBackgroundOnly": .supportedOnlyOn(Set(["macOS"])),
+            "LSUIElement": .supportedOnlyOn(Set(["macOS"])),
+            "NSDocumentClass": .supportedOnlyOn(Set(["macOS"])),
+            "NSServices": .supportedOnlyOn(Set(["macOS"])),
+            "NSSupportsAutomaticTermination": .supportedOnlyOn(Set(["macOS"])),
+            "NSSupportsSuddenTermination": .supportedOnlyOn(Set(["macOS"])),
 
             // Keys only supported on macOS, iOS, tvOS.
-            "LSApplicationCategoryType":        .supportedOnlyOn(Set(["macOS", "iOS", "tvOS"])),
+            "LSApplicationCategoryType": .supportedOnlyOn(Set(["macOS", "iOS", "tvOS"])),
         ]
 
         /// Mapping of all the values for keys known to not be supported on some platforms to the info about which platforms they are or aren't supported on.
-        let keyValuesPlatformSupport: [String:[String:PlatformFamilySupportInfo]] = [
+        let keyValuesPlatformSupport: [String: [String: PlatformFamilySupportInfo]] = [
             "UIBackgroundModes": [
                 "audio": .supportedOnlyOn(["iOS", "tvOS", "watchOS", "xrOS"]),
                 "location": .supportedOnlyOn(["iOS", "watchOS"]),
@@ -1188,11 +1099,10 @@ public final class InfoPlistProcessorTaskAction: TaskAction
                     let reason: String
                     if let platform = platforms.only {
                         reason = "only supported on \(platform)"
-                    }
-                    else {
+                    } else {
                         reason = "not supported on \(context.platform?.familyDisplayName ?? "")"
                     }
-                    remove(unsupportedKey: key,  reason)
+                    remove(unsupportedKey: key, reason)
                 }
             }
         }
@@ -1215,11 +1125,10 @@ public final class InfoPlistProcessorTaskAction: TaskAction
                         let reason: String
                         if let platform = platforms.only {
                             reason = "only supported on \(platform)"
-                        }
-                        else {
+                        } else {
                             reason = "not supported on \(context.platform?.familyDisplayName ?? "")"
                         }
-                        remove(unsupportedValue: value, from: key,  reason)
+                        remove(unsupportedValue: value, from: key, reason)
                     }
                 }
             }
@@ -1266,7 +1175,7 @@ public final class InfoPlistProcessorTaskAction: TaskAction
         if let oldValue {
             switch (oldValue, newValue) {
             case (.plArray(let oldArray), .plArray(let newArray)):
-                        // Both values are arrays - we append the contents of newValue to oldValue, making sure not to add the same value twice.
+                // Both values are arrays - we append the contents of newValue to oldValue, making sure not to add the same value twice.
                 // (This would be easier if PropertyListItem were hashable and we could create an OrderedSet here.)
                 var resultArray = oldArray
                 for item in newArray {
@@ -1282,8 +1191,7 @@ public final class InfoPlistProcessorTaskAction: TaskAction
                 for item in oldArray {
                     if let key = item.stringValue {
                         oldDict[key] = .plBool(true)
-                    }
-                    else {
+                    } else {
                         outputDelegate.emitError("all values in 'UIRequiredDeviceCapabilities' must be strings (file \(oldValuePath)")
                         return nil
                     }
@@ -1296,8 +1204,7 @@ public final class InfoPlistProcessorTaskAction: TaskAction
                 for item in newArray {
                     if let key = item.stringValue {
                         newDict[key] = .plBool(true)
-                    }
-                    else {
+                    } else {
                         outputDelegate.emitError("all values in 'UIRequiredDeviceCapabilities' must be strings (file \(newValuePath)")
                         return nil
                     }
@@ -1319,21 +1226,18 @@ public final class InfoPlistProcessorTaskAction: TaskAction
                 }
                 return nil
             }
-        }
-        else {
+        } else {
             // If oldValue is empty then we can just set it to newValue, as long as it is an array or a dictionary.
             if newValue.arrayValue != nil || newValue.dictValue != nil {
                 return newValue
-            }
-            else {
+            } else {
                 outputDelegate.emitError("'UIRequiredDeviceCapabilities' must be an array or dictionary but it is \(newValue.typeDisplayString.withIndefiniteArticle) (file \(oldValuePath.str))")
                 return nil
             }
         }
     }
 
-    private func setRequiredDeviceCapabilities(_ plist: inout PropertyListItem, context: InfoPlistProcessorTaskActionContext, outputDelegate: any TaskOutputDelegate) -> CommandResult
-    {
+    private func setRequiredDeviceCapabilities(_ plist: inout PropertyListItem, context: InfoPlistProcessorTaskActionContext, outputDelegate: any TaskOutputDelegate) -> CommandResult {
         guard case .plDict(var plistDict) = plist else {
             outputDelegate.emitError("Info.plist contents are not a dictionary prior to setting required device capabilities")
             return .failed
@@ -1406,8 +1310,7 @@ public final class InfoPlistProcessorTaskAction: TaskAction
                         outputDelegate.warning("User-supplied CFBundleIdentifier value '\(identifierString)' in the Info.plist must be the same as the PRODUCT_BUNDLE_IDENTIFIER build setting value '\(buildSettingIdentifierString)'.", location: .buildSetting(BuiltinMacros.PRODUCT_BUNDLE_IDENTIFIER))
                     }
                 }
-            }
-            else {
+            } else {
                 outputDelegate.emitWarning("the value for Bundle Identifier must be of type string, but is \(identifier.typeDisplayString.withIndefiniteArticle)")
             }
         }
@@ -1430,14 +1333,12 @@ public final class InfoPlistProcessorTaskAction: TaskAction
             if minimumSystemVersionStr.isEmpty {
                 outputDelegate.emitWarning("\(minimumSystemVersionKey) is explicitly set to empty - setting to value of \(deploymentTargetName) '\(deploymentTarget.description)'.")
                 plistDict[minimumSystemVersionKey] = .plString(deploymentTarget.description)
-            }
-            else if let minimumSystemVersion = try? Version(minimumSystemVersionStr) {
+            } else if let minimumSystemVersion = try? Version(minimumSystemVersionStr) {
                 if minimumSystemVersion < deploymentTarget {
                     outputDelegate.emitWarning("\(minimumSystemVersionKey) of '\(minimumSystemVersionStr)' is less than the value of \(deploymentTargetName) '\(deploymentTarget.description)' - setting to '\(deploymentTarget.description)'.")
                     plistDict[minimumSystemVersionKey] = .plString(deploymentTarget.description)
                 }
-            }
-            else {
+            } else {
                 outputDelegate.emitError("\(minimumSystemVersionKey) '\(minimumSystemVersionStr)' is not a valid version.")
                 return false
             }
@@ -1460,7 +1361,7 @@ public final class InfoPlistProcessorTaskAction: TaskAction
                 case iOS
                 case tvOS
                 case watchOS
-                case visionOS = "xrOS" // must be "xrOS" as it's compared against Platform.familyName
+                case visionOS = "xrOS"  // must be "xrOS" as it's compared against Platform.familyName
             }
 
             /// The values of the key that are deprecated, if only specific values are deprecated. `nil` indicates the key as a whole is deprecated.
@@ -1491,19 +1392,26 @@ public final class InfoPlistProcessorTaskAction: TaskAction
         let plistKeyDeprecationInfo: [PropertyListKeyPath: DeprecationInfo] = [
             "UILaunchImages": .init(moreInfo: .alternate("launch storyboards"), deprecationVersions: [.iOS: Version(), .tvOS: Version(13)]),
             "CLKComplicationSupportedFamilies": .init(moreInfo: .alternate("the ClockKit complications API"), deprecationVersions: [.watchOS: Version(7)]),
-            PropertyListKeyPath(.dict(.equal("NSAppTransportSecurity")), .dict(.equal("NSExceptionDomains")), .dict(.any), .any(.equal("NSExceptionMinimumTLSVersion"))): .init(values: [.plString("TLSv1.0"), .plString("TLSv1.1")], moreInfo: .alternate("TLSv1.2 or TLSv1.3"), deprecationVersions: [
-                .macOS: Version(12),
-                .iOS: Version(15),
-                .tvOS: Version(15),
-                .watchOS: Version(8)
-            ]),
-            "UIRequiresFullScreen": .init(moreInfo: .ignored("See the UIRequiresFullScreen documentation for more details."), deprecationVersions: [
-                .macOS: Version(26),
-                .iOS: Version(26),
-                .tvOS: Version(26),
-                .watchOS: Version(26),
-                .visionOS: Version(26),
-            ])
+            PropertyListKeyPath(.dict(.equal("NSAppTransportSecurity")), .dict(.equal("NSExceptionDomains")), .dict(.any), .any(.equal("NSExceptionMinimumTLSVersion"))): .init(
+                values: [.plString("TLSv1.0"), .plString("TLSv1.1")],
+                moreInfo: .alternate("TLSv1.2 or TLSv1.3"),
+                deprecationVersions: [
+                    .macOS: Version(12),
+                    .iOS: Version(15),
+                    .tvOS: Version(15),
+                    .watchOS: Version(8),
+                ]
+            ),
+            "UIRequiresFullScreen": .init(
+                moreInfo: .ignored("See the UIRequiresFullScreen documentation for more details."),
+                deprecationVersions: [
+                    .macOS: Version(26),
+                    .iOS: Version(26),
+                    .tvOS: Version(26),
+                    .watchOS: Version(26),
+                    .visionOS: Version(26),
+                ]
+            ),
         ]
 
         for (key, info) in plistKeyDeprecationInfo.sorted(byKey: <) {
@@ -1567,8 +1475,7 @@ public final class InfoPlistProcessorTaskAction: TaskAction
     private func scanForPrivacyFile(at path: Path, fs: any FSProxy) -> Path? {
         do {
             return try fs.traverse(path) { $0.basename == "PrivacyInfo.xcprivacy" ? $0 : nil }.first
-        }
-        catch {}
+        } catch {}
 
         return nil
     }
@@ -1595,7 +1502,8 @@ public final class InfoPlistProcessorTaskAction: TaskAction
         }
 
         // Get the package type code and signature (a.k.a. creator) code from the Info.plist.  We do various correctness checks.  One of the more interesting restrictions is that both the type code and the signature code have to be convertible to Mac OS Roman encoding.  The reason for this is that both four-character codes are really OSTypes, which were implicitly encoded in Mac OS Roman back in historical times.
-        let pkgInfoBytes = (OutputByteStream()
+        let pkgInfoBytes =
+            (OutputByteStream()
             <<< getFourCharCode(forKey: "CFBundlePackageType")
             <<< getFourCharCode(forKey: "CFBundleSignature")).bytes
         do {
@@ -1605,32 +1513,25 @@ public final class InfoPlistProcessorTaskAction: TaskAction
         }
     }
 
-
     // Serialization
 
-
-    public override func serialize<T: Serializer>(to serializer: T)
-    {
+    public override func serialize<T: Serializer>(to serializer: T) {
         serializer.beginAggregate(2)
         serializer.serialize(contextPath)
         super.serialize(to: serializer)
         serializer.endAggregate()
     }
 
-    public required init(from deserializer: any Deserializer) throws
-    {
+    public required init(from deserializer: any Deserializer) throws {
         try deserializer.beginAggregate(2)
         self.contextPath = try deserializer.deserialize()
         try super.init(from: deserializer)
     }
 }
 
-
-private extension PropertyListItem
-{
+private extension PropertyListItem {
     /// Specialized private method to transform a property list by removing any keys which are in the set `keys` from any dictionary in the plist where the value for that key is empty.
-    func byElidingRecursivelyEmptyStringValuesInDictionaries(_ keysToElide: Set<String>) -> PropertyListItem
-    {
+    func byElidingRecursivelyEmptyStringValuesInDictionaries(_ keysToElide: Set<String>) -> PropertyListItem {
         switch self
         {
         case .plArray(let value):
@@ -1640,14 +1541,12 @@ private extension PropertyListItem
         case .plDict(let value):
             // Handle this dictionary.
             var result = [String: PropertyListItem]()
-            for (key, item) in value
-            {
+            for (key, item) in value {
                 switch item
                 {
                 case .plString(let value):
                     // For strings, we elide it only if the key is in keysToElide and the value is empty.
-                    if !value.isEmpty || !keysToElide.contains(key)
-                    {
+                    if !value.isEmpty || !keysToElide.contains(key) {
                         result[key] = item
                     }
 
diff --git a/Sources/SWBTaskExecution/TaskActions/LinkAssetCatalogTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/LinkAssetCatalogTaskAction.swift
index 3a30eaa6..fb417304 100644
--- a/Sources/SWBTaskExecution/TaskActions/LinkAssetCatalogTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/LinkAssetCatalogTaskAction.swift
@@ -147,7 +147,7 @@ public final class LinkAssetCatalogTaskAction: TaskAction {
                     try executionDelegate.fs.remove(path)
                 }
                 try executionDelegate.fs.copy(sourceDependencies, to: path)
-            case .makefile, .makefiles, .makefileIgnoringSubsequentOutputs,  nil:
+            case .makefile, .makefiles, .makefileIgnoringSubsequentOutputs, nil:
                 throw StubError.error("Unexpected dependency data style")
             }
 
@@ -203,14 +203,16 @@ extension FSProxy {
     }
 
     func relativeFilePaths(directory: Path) throws -> Set<Path> {
-        try Set(traverse(directory) { path -> Path? in
-            guard !isDirectory(path) else {
-                return nil
-            }
-            guard let subpath = path.relativeSubpath(from: directory) else {
-                throw StubError.error("Could not compute path of \(path.str) relative to \(directory.str)")
+        try Set(
+            traverse(directory) { path -> Path? in
+                guard !isDirectory(path) else {
+                    return nil
+                }
+                guard let subpath = path.relativeSubpath(from: directory) else {
+                    throw StubError.error("Could not compute path of \(path.str) relative to \(directory.str)")
+                }
+                return Path(subpath)
             }
-            return Path(subpath)
-        })
+        )
     }
 }
diff --git a/Sources/SWBTaskExecution/TaskActions/MergeInfoPlistTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/MergeInfoPlistTaskAction.swift
index 73f0a0cd..2c25a930 100644
--- a/Sources/SWBTaskExecution/TaskActions/MergeInfoPlistTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/MergeInfoPlistTaskAction.swift
@@ -35,9 +35,16 @@ public final class MergeInfoPlistTaskAction: TaskAction {
 
         do {
             guard let byteString = try Set(inputs.map { try executionDelegate.fs.read($0) }).only else {
-                outputDelegate.emit(Diagnostic(behavior: .error, location: .unknown, data: DiagnosticData("Info.plist preprocessing produced variable content across multiple architectures and/or build variants, which is not allowed for bundle targets."), childDiagnostics: inputs.map { input in
-                    Diagnostic(behavior: .note, location: .path(input), data: DiagnosticData("Using preprocessed file: \(input.str)"))
-                }))
+                outputDelegate.emit(
+                    Diagnostic(
+                        behavior: .error,
+                        location: .unknown,
+                        data: DiagnosticData("Info.plist preprocessing produced variable content across multiple architectures and/or build variants, which is not allowed for bundle targets."),
+                        childDiagnostics: inputs.map { input in
+                            Diagnostic(behavior: .note, location: .path(input), data: DiagnosticData("Using preprocessed file: \(input.str)"))
+                        }
+                    )
+                )
                 return .failed
             }
 
diff --git a/Sources/SWBTaskExecution/TaskActions/ODRAssetPackManifestTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/ODRAssetPackManifestTaskAction.swift
index 24142a60..52e6e633 100644
--- a/Sources/SWBTaskExecution/TaskActions/ODRAssetPackManifestTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/ODRAssetPackManifestTaskAction.swift
@@ -43,13 +43,11 @@ public final class ODRAssetPackManifestTaskAction: TaskAction {
                 // a) if ASSET_PACK_MANIFEST_URL_PREFIX is set to anything other than the empty string, we use it, and append the name of the asset pack to it (note that we do -not- insert a path separator, to allow prefixes like "http://myserver/script?pack=").
                 guard let suffix = assetPackPath.basename.addingPercentEncoding(withAllowedCharacters: allowedChars) else { throw StubError.error("could not percent-encode \(assetPackPath.basename)") }
                 return assetPackManifestURLPrefix.appending(suffix)
-            }
-            else if embedAssetPacksInProductBundle {
+            } else if embedAssetPacksInProductBundle {
                 // b) otherwise, if the ASSET_PACK_FOLDER_PATH path is inside the Resources directory of the main product bundle, we use the relative path to that Resources directory as the URL,
                 guard let subPath = assetPackPath.relativeSubpath(from: unlocalizedProductResourcesDir) else { throw StubError.error("expected path \(assetPackPath.str) to be a subpath of \(unlocalizedProductResourcesDir.str)") }
                 return subPath
-            }
-            else {
+            } else {
                 // c) otherwise, we use a full http://127.0.0.1/full/path.assetpack path with an absolute path to the asset pack
                 guard let suffix = assetPackPath.str.addingPercentEncoding(withAllowedCharacters: allowedChars) else { throw StubError.error("could not percent-encode \(assetPackPath.str)") }
                 return "http://127.0.0.1".appending(suffix)
@@ -64,8 +62,7 @@ public final class ODRAssetPackManifestTaskAction: TaskAction {
                 let infoPlist: PropertyListItem
                 do {
                     infoPlist = try PropertyList.fromPath(infoPlistPath, fs: executionDelegate.fs)
-                }
-                catch {
+                } catch {
                     throw StubError.error("failed to load \(infoPlistPath.str): \(error)")
                 }
 
@@ -76,8 +73,7 @@ public final class ODRAssetPackManifestTaskAction: TaskAction {
                 if let priorityItem = dict["Priority"] {
                     guard case .plDouble(let p) = priorityItem else { throw StubError.error("expected number in \(infoPlistPath.str) : Priority") }
                     priority = p
-                }
-                else {
+                } else {
                     priority = nil
                 }
 
@@ -91,8 +87,7 @@ public final class ODRAssetPackManifestTaskAction: TaskAction {
 
             let plistData = try AssetPackManifestPlist(resources: Set(resources)).propertyListItem.asBytes(.binary)
             try executionDelegate.fs.write(outputPath, contents: ByteString(plistData))
-        }
-        catch {
+        } catch {
             outputDelegate.emitError("\(error)")
             return .failed
         }
diff --git a/Sources/SWBTaskExecution/TaskActions/PrecompileClangModuleTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/PrecompileClangModuleTaskAction.swift
index 598c1a54..9f0c38e2 100644
--- a/Sources/SWBTaskExecution/TaskActions/PrecompileClangModuleTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/PrecompileClangModuleTaskAction.swift
@@ -147,9 +147,11 @@ final public class PrecompileClangModuleTaskAction: TaskAction, BuildValueValida
             return .failed
         }
 
-        for node in (dependencyInfo.files.map {
-            ExecutionNode(identifier: $0.str)
-        }) {
+        for node
+            in (dependencyInfo.files.map {
+                ExecutionNode(identifier: $0.str)
+            })
+        {
             dynamicExecutionDelegate.discoveredDependencyNode(node)
         }
 
@@ -231,10 +233,11 @@ final public class PrecompileClangModuleTaskAction: TaskAction, BuildValueValida
                 if case .some(.exit(.uncaughtSignal, _)) = outputDelegate.result {
                     do {
                         if let reproducerMessage = try clangModuleDependencyGraph.generateReproducer(
-                                forFailedDependency: dependencyInfo,
-                                libclangPath: key.libclangPath,
-                                casOptions: key.casOptions,
-                                location: key.reproducerOutputPath?.str) {
+                            forFailedDependency: dependencyInfo,
+                            libclangPath: key.libclangPath,
+                            casOptions: key.casOptions,
+                            location: key.reproducerOutputPath?.str
+                        ) {
                             outputDelegate.emitOutput(ByteString(encodingAsUTF8: reproducerMessage) + "\n")
                         }
                     } catch {
diff --git a/Sources/SWBTaskExecution/TaskActions/ProcessProductEntitlementsTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/ProcessProductEntitlementsTaskAction.swift
index 02c45f8e..3d781b73 100644
--- a/Sources/SWBTaskExecution/TaskActions/ProcessProductEntitlementsTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/ProcessProductEntitlementsTaskAction.swift
@@ -19,8 +19,7 @@ public import SWBUtil
 public import SWBMacro
 
 /// Concrete implementation of task for processing product entitlements.
-public final class ProcessProductEntitlementsTaskAction: TaskAction
-{
+public final class ProcessProductEntitlementsTaskAction: TaskAction {
     /// The merged entitlements.
     let entitlements: PropertyListItem
 
@@ -45,8 +44,7 @@ public final class ProcessProductEntitlementsTaskAction: TaskAction
     /// The timestamp of the latest modification of the entitlements on `init`
     let entitlementsModificationTimestamp: Result<Date, StubError>?
 
-    public init(fs: any FSProxy, entitlements: PropertyListItem, entitlementsVariant: EntitlementsVariant, allowEntitlementsModification: Bool, entitlementsDestination: EntitlementsDestination, destinationPlatformName: String, entitlementsFilePath: Path?)
-    {
+    public init(fs: any FSProxy, entitlements: PropertyListItem, entitlementsVariant: EntitlementsVariant, allowEntitlementsModification: Bool, entitlementsDestination: EntitlementsDestination, destinationPlatformName: String, entitlementsFilePath: Path?) {
         self.entitlements = entitlements
         self.entitlementsVariant = entitlementsVariant
         self.allowEntitlementsModification = allowEntitlementsModification
@@ -72,11 +70,9 @@ public final class ProcessProductEntitlementsTaskAction: TaskAction
     }
 
     /// The parsed command line options.
-    private struct Options
-    {
+    private struct Options {
         /// The output format of the task.
-        enum FormatKind: String
-        {
+        enum FormatKind: String {
             /// Preserve the format of the input file.
             case sameAsInput = "none"
             /// Convert to binary.
@@ -86,8 +82,7 @@ public final class ProcessProductEntitlementsTaskAction: TaskAction
 
             // Note that Foundation no longer supports writing the OpenStep plist format.
 
-            init?(name: String)
-            {
+            init?(name: String) {
                 switch name
                 {
                 case "openstep":
@@ -96,23 +91,18 @@ public final class ProcessProductEntitlementsTaskAction: TaskAction
 
                 default:
                     // Otherwise we initialize from the raw value, if possible.
-                    if let value = FormatKind(rawValue: name)
-                    {
+                    if let value = FormatKind(rawValue: name) {
                         self = value
                         return
-                    }
-                    else
-                    {
+                    } else {
                         return nil
                     }
                 }
             }
         }
 
-        static func emitUsage(_ name: String, _ outputDelegate: any TaskOutputDelegate)
-        {
-            outputDelegate.emitOutput
-            { stream in
+        static func emitUsage(_ name: String, _ outputDelegate: any TaskOutputDelegate) {
+            outputDelegate.emitOutput { stream in
                 stream <<< "usage: \(name) -entitlements [-format <name>] <input-file> -o <output-path>\n"
                 stream <<< "  -entitlements\n"
                 stream <<< "      Handle entitlements in the input file.  This option is required.\n"
@@ -135,16 +125,14 @@ public final class ProcessProductEntitlementsTaskAction: TaskAction
         /// The path to the output file.
         let outputPath: Path
 
-        init?(_ commandLine: AnySequence<String>, _ outputDelegate: any TaskOutputDelegate)
-        {
+        init?(_ commandLine: AnySequence<String>, _ outputDelegate: any TaskOutputDelegate) {
             var format = FormatKind.sameAsInput
             var processEntitlements = false
             var inputPath: Path? = nil
             var foundOutputPathOption = false
             var outputPath: Path? = nil
             var hadErrors = false
-            func error(_ message: String)
-            {
+            func error(_ message: String) {
                 outputDelegate.emitError(message)
                 hadErrors = true
             }
@@ -153,9 +141,7 @@ public final class ProcessProductEntitlementsTaskAction: TaskAction
             let generator = commandLine.makeIterator()
             // Skip the executable.
             let programName = generator.next() ?? "<<missing program name>>"
-        argumentParsing:
-            while let arg = generator.next()
-            {
+            argumentParsing: while let arg = generator.next() {
                 switch arg
                 {
                 case "-entitlements":
@@ -164,13 +150,11 @@ public final class ProcessProductEntitlementsTaskAction: TaskAction
 
                 case "-format":
                     // The '-format' option takes a single argument: 'xml', 'binary', 'openstep' or 'none'.
-                    guard let name = generator.next() else
-                    {
+                    guard let name = generator.next() else {
                         error("missing argument for option: \(arg)")
                         continue
                     }
-                    guard let kind = FormatKind(name: name) else
-                    {
+                    guard let kind = FormatKind(name: name) else {
                         error("failed to parse option: \(arg) \(name)")
                         continue
                     }
@@ -179,8 +163,7 @@ public final class ProcessProductEntitlementsTaskAction: TaskAction
                 case "-o":
                     // The '-o' argument take a single parameter: the output path.
                     foundOutputPathOption = true
-                    guard let value = generator.next() else
-                    {
+                    guard let value = generator.next() else {
                         error("missing argument for option: \(arg)")
                         continue
                     }
@@ -202,21 +185,18 @@ public final class ProcessProductEntitlementsTaskAction: TaskAction
             }
 
             // Diagnose missing -entitlements option.
-            if !processEntitlements
-            {
+            if !processEntitlements {
                 error("missing required option: -entitlements")
             }
 
             // Diagnose missing output path option.
-            if outputPath == nil && !foundOutputPathOption
-            {
+            if outputPath == nil && !foundOutputPathOption {
                 error("missing required option: -o")
                 outputPath = Path("<<error>>")
             }
 
             // If there were errors, emit the usage and return an error.
-            if hadErrors
-            {
+            if hadErrors {
                 outputDelegate.emitOutput("\n")
                 Options.emitUsage(programName, outputDelegate)
                 return nil
@@ -230,13 +210,11 @@ public final class ProcessProductEntitlementsTaskAction: TaskAction
         }
     }
 
-    public override class var toolIdentifier: String
-    {
+    public override class var toolIdentifier: String {
         return "process-product-entitlements"
     }
 
-    public override func getSignature(_ task: any ExecutableTask, executionDelegate: any TaskExecutionDelegate) -> ByteString
-    {
+    public override func getSignature(_ task: any ExecutableTask, executionDelegate: any TaskExecutionDelegate) -> ByteString {
         // If the scheme command changes then our signature changes so we have to re-run.
         return super.getSignature(task, executionDelegate: executionDelegate) + ByteString(encodingAsUTF8: executionDelegate.schemeCommand?.description ?? "<nil>")
     }
@@ -254,7 +232,7 @@ public final class ProcessProductEntitlementsTaskAction: TaskAction
         }
 
         // Make paths absolute.
-//        let input = task.workingDirectory.join(options.inputPath)     // Not presently used
+        //        let input = task.workingDirectory.join(options.inputPath)     // Not presently used
         let output = task.workingDirectory.join(options.outputPath)
 
         // Updating entitlements is not something that is actively encouraged or supported, however, this is a compatibility pain point for certain projects that we need to maintain some ability to do this. A better approach is to plumb this through the system so that we can track this as a proper dependency mechanism, potentially through our virtual task producers... however, until then, we enable this functionality for those existing clients.
@@ -285,8 +263,7 @@ public final class ProcessProductEntitlementsTaskAction: TaskAction
                 if !self.allowEntitlementsModification {
                     outputDelegate.emitError("Entitlements file \"\(entitlementsFilePath.basename)\" was modified during the build, which is not supported. You can disable this error by setting 'CODE_SIGN_ALLOW_ENTITLEMENTS_MODIFICATION' to 'YES', however this may cause the built product's code signature or provisioning profile to contain incorrect entitlements.")
                     return .failed
-                }
-                else {
+                } else {
                     let plist: PropertyListItem
                     do {
                         plist = try PropertyList.fromBytes(executionDelegate.fs.read(entitlementsFilePath).bytes)
@@ -309,8 +286,7 @@ public final class ProcessProductEntitlementsTaskAction: TaskAction
 
         do {
             try executionDelegate.fs.write(output, contents: ByteString(effectiveEntitlements.asBytes(.xml)))
-        }
-        catch let error as NSError {
+        } catch let error as NSError {
             outputDelegate.emitError("could not write entitlements file '\(output.str)': \(error.localizedDescription)")
             return .failed
         }
@@ -344,9 +320,11 @@ public final class ProcessProductEntitlementsTaskAction: TaskAction
         }
 
         static var allEntitlements: [String: PropertyListItem] {
-            return Dictionary(uniqueKeysWithValues: allCases.map { entitlement in
-                return (entitlement.key, entitlement.value)
-            })
+            return Dictionary(
+                uniqueKeysWithValues: allCases.map { entitlement in
+                    return (entitlement.key, entitlement.value)
+                }
+            )
         }
     }
 
@@ -388,14 +366,10 @@ public final class ProcessProductEntitlementsTaskAction: TaskAction
         return .plDict(augmentedDict)
     }
 
-
     // Serialization
 
-
-    public override func serialize<T: Serializer>(to serializer: T)
-    {
-        serializer.serializeAggregate(8)
-        {
+    public override func serialize<T: Serializer>(to serializer: T) {
+        serializer.serializeAggregate(8) {
             // FIXME: <rdar://problem/40036582> We have no way to handle any errors in PropertyListItem.asBytes() here.
             serializer.serialize(try? entitlements.asBytes(.binary))
             serializer.serialize(entitlementsVariant)
@@ -408,8 +382,7 @@ public final class ProcessProductEntitlementsTaskAction: TaskAction
         }
     }
 
-    public required init(from deserializer: any Deserializer) throws
-    {
+    public required init(from deserializer: any Deserializer) throws {
         try deserializer.beginAggregate(8)
         self.entitlements = try PropertyList.fromBytes(try deserializer.deserialize())
         self.entitlementsVariant = try deserializer.deserialize()
diff --git a/Sources/SWBTaskExecution/TaskActions/ProcessProductProvisioningProfileTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/ProcessProductProvisioningProfileTaskAction.swift
index e78375a2..03652a62 100644
--- a/Sources/SWBTaskExecution/TaskActions/ProcessProductProvisioningProfileTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/ProcessProductProvisioningProfileTaskAction.swift
@@ -17,22 +17,17 @@ public import SWBCore
 import SWBLibc
 public import SWBUtil
 
-
 /// Concrete implementation of task for processing the provisioning profile for a product.
-public final class ProcessProductProvisioningProfileTaskAction: TaskAction
-{
-    public override init()
-    {
+public final class ProcessProductProvisioningProfileTaskAction: TaskAction {
+    public override init() {
         // Presently this class' initializer doesn't do anything extra - all parameters are passed in as command-line options.
         super.init()
     }
 
     /// The parsed command line options.
-    private struct Options
-    {
+    private struct Options {
         /// The output format of the task.
-        enum FormatKind: String
-        {
+        enum FormatKind: String {
             /// Preserve the format of the input file.
             case sameAsInput = "none"
             /// Convert to binary.
@@ -42,8 +37,7 @@ public final class ProcessProductProvisioningProfileTaskAction: TaskAction
 
             // Note that Foundation no longer supports writing the OpenStep plist format.
 
-            init?(name: String)
-            {
+            init?(name: String) {
                 switch name
                 {
                 case "openstep":
@@ -52,23 +46,18 @@ public final class ProcessProductProvisioningProfileTaskAction: TaskAction
 
                 default:
                     // Otherwise we initialize from the raw value, if possible.
-                    if let value = FormatKind(rawValue: name)
-                    {
+                    if let value = FormatKind(rawValue: name) {
                         self = value
                         return
-                    }
-                    else
-                    {
+                    } else {
                         return nil
                     }
                 }
             }
         }
 
-        static func emitUsage(_ name: String, _ outputDelegate: any TaskOutputDelegate)
-        {
-            outputDelegate.emitOutput
-            { stream in
+        static func emitUsage(_ name: String, _ outputDelegate: any TaskOutputDelegate) {
+            outputDelegate.emitOutput { stream in
                 stream <<< "usage: \(name) [-format <name>] <input-file> -o <output-path>\n"
                 stream <<< "  --format {none|binary|xml}\n"
                 stream <<< "      The output format of the entitlements.\n"
@@ -86,15 +75,13 @@ public final class ProcessProductProvisioningProfileTaskAction: TaskAction
         /// The path to the output file.
         let outputPath: Path
 
-        init?(_ commandLine: AnySequence<String>, _ outputDelegate: any TaskOutputDelegate)
-        {
+        init?(_ commandLine: AnySequence<String>, _ outputDelegate: any TaskOutputDelegate) {
             var format = FormatKind.sameAsInput
             var inputPath: Path? = nil
             var foundOutputPathOption = false
             var outputPath: Path? = nil
             var hadErrors = false
-            func error(_ message: String)
-            {
+            func error(_ message: String) {
                 outputDelegate.emitError(message)
                 hadErrors = true
             }
@@ -103,20 +90,16 @@ public final class ProcessProductProvisioningProfileTaskAction: TaskAction
             let generator = commandLine.makeIterator()
             // Skip the executable.
             let programName = generator.next() ?? "<<missing program name>>"
-        argumentParsing:
-            while let arg = generator.next()
-            {
+            argumentParsing: while let arg = generator.next() {
                 switch arg
                 {
                 case "-format":
                     // The '-format' option takes a single argument: 'xml', 'binary', 'openstep' or 'none'.
-                    guard let name = generator.next() else
-                    {
+                    guard let name = generator.next() else {
                         error("missing argument for option: \(arg)")
                         continue
                     }
-                    guard let kind = FormatKind(name: name) else
-                    {
+                    guard let kind = FormatKind(name: name) else {
                         error("failed to parse option: \(arg) \(name)")
                         continue
                     }
@@ -125,8 +108,7 @@ public final class ProcessProductProvisioningProfileTaskAction: TaskAction
                 case "-o":
                     // The '-o' argument take a single parameter: the output path.
                     foundOutputPathOption = true
-                    guard let value = generator.next() else
-                    {
+                    guard let value = generator.next() else {
                         error("missing argument for option: \(arg)")
                         continue
                     }
@@ -148,22 +130,19 @@ public final class ProcessProductProvisioningProfileTaskAction: TaskAction
             }
 
             // Diagnose missing input path.
-            if inputPath == nil
-            {
+            if inputPath == nil {
                 error("no input file specified")
                 inputPath = Path("<<error>>")
             }
 
             // Diagnose missing output path option.
-            if outputPath == nil && !foundOutputPathOption
-            {
+            if outputPath == nil && !foundOutputPathOption {
                 error("missing required option: -o")
                 outputPath = Path("<<error>>")
             }
 
             // If there were errors, emit the usage and return an error.
-            if hadErrors
-            {
+            if hadErrors {
                 outputDelegate.emitOutput("\n")
                 Options.emitUsage(programName, outputDelegate)
                 return nil
@@ -176,8 +155,7 @@ public final class ProcessProductProvisioningProfileTaskAction: TaskAction
         }
     }
 
-    public override class var toolIdentifier: String
-    {
+    public override class var toolIdentifier: String {
         return "process-product-provisioning-profile"
     }
 
@@ -189,23 +167,19 @@ public final class ProcessProductProvisioningProfileTaskAction: TaskAction
         outputDelegate: any TaskOutputDelegate
     ) async -> CommandResult {
         // Parse the arguments.
-        guard let options = Options(task.commandLineAsStrings, outputDelegate) else
-        {
+        guard let options = Options(task.commandLineAsStrings, outputDelegate) else {
             return .failed
         }
 
         // Make paths absolute.
-        let input = task.workingDirectory.join(options.inputPath)     // Not presently used
+        let input = task.workingDirectory.join(options.inputPath)  // Not presently used
         let output = task.workingDirectory.join(options.outputPath)
 
         // Read the input file.
         let contents: ByteString
-        do
-        {
+        do {
             contents = try executionDelegate.fs.read(input)
-        }
-        catch let e
-        {
+        } catch let e {
             outputDelegate.emitError("unable to read input file '\(input.str)': \(e.localizedDescription)")
             return .failed
         }
@@ -230,12 +204,9 @@ public final class ProcessProductProvisioningProfileTaskAction: TaskAction
             guard let (plist, _) = validateAsPropertyList(contents, outputDelegate) else { return .failed }
 
             let outBytes: [UInt8]
-            do
-            {
+            do {
                 try outBytes = plist.asBytes(outputFormat!)
-            }
-            catch
-            {
+            } catch {
                 let errorDescription = (error as NSError).localizedDescription
                 outputDelegate.emitError("unable to create \(options.format.rawValue) property list data: \(errorDescription)")
                 return .failed
@@ -244,12 +215,9 @@ public final class ProcessProductProvisioningProfileTaskAction: TaskAction
         }
 
         // Finally we can write the output file.
-        do
-        {
+        do {
             try executionDelegate.fs.write(output, contents: outContents)
-        }
-        catch let error as NSError
-        {
+        } catch let error as NSError {
             outputDelegate.emitError("could not write profile file: \(output.str): \(error.localizedDescription)")
             return .failed
         }
@@ -260,8 +228,7 @@ public final class ProcessProductProvisioningProfileTaskAction: TaskAction
     /// Validate that the given `contents` are a property list, with the root item being a dictionary, and return the parsed property list.
     ///
     /// If validation fails, then messages will be emitted to the `outputDelegate`, and nil will be returned.
-    private func validateAsPropertyList(_ contents: ByteString, _ outputDelegate: any TaskOutputDelegate) -> (PropertyListItem, PropertyListSerialization.PropertyListFormat)?
-    {
+    private func validateAsPropertyList(_ contents: ByteString, _ outputDelegate: any TaskOutputDelegate) -> (PropertyListItem, PropertyListSerialization.PropertyListFormat)? {
         // Validate it as a property list.  The top-level item must be a dictionary.
         let plist: PropertyListItem
         let format: PropertyListSerialization.PropertyListFormat
@@ -272,8 +239,7 @@ public final class ProcessProductProvisioningProfileTaskAction: TaskAction
             outputDelegate.emitError("unable to read input file as a property list: \(errorDescription)")
             return nil
         }
-        guard case .plDict = plist else
-        {
+        guard case .plDict = plist else {
             outputDelegate.emitError("input file is not a dictionary")
             return nil
         }
@@ -281,20 +247,15 @@ public final class ProcessProductProvisioningProfileTaskAction: TaskAction
         return (plist, format)
     }
 
-
     // Serialization
 
-
-    public override func serialize<T: Serializer>(to serializer: T)
-    {
-        serializer.serializeAggregate(1)
-        {
+    public override func serialize<T: Serializer>(to serializer: T) {
+        serializer.serializeAggregate(1) {
             super.serialize(to: serializer)
         }
     }
 
-    public required init(from deserializer: any Deserializer) throws
-    {
+    public required init(from deserializer: any Deserializer) throws {
         try deserializer.beginAggregate(1)
         try super.init(from: deserializer)
     }
diff --git a/Sources/SWBTaskExecution/TaskActions/ProcessXCFrameworkTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/ProcessXCFrameworkTaskAction.swift
index aacfd3fb..01be8587 100644
--- a/Sources/SWBTaskExecution/TaskActions/ProcessXCFrameworkTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/ProcessXCFrameworkTaskAction.swift
@@ -24,7 +24,7 @@ public final class ProcessXCFrameworkTaskAction: TaskAction {
     public override func performTaskAction(_ task: any ExecutableTask, dynamicExecutionDelegate: any DynamicTaskExecutionDelegate, executionDelegate: any TaskExecutionDelegate, clientDelegate: any TaskExecutionClientDelegate, outputDelegate: any TaskOutputDelegate) async -> CommandResult {
 
         let generator = task.commandLineAsStrings.makeIterator()
-        _ = generator.next() // consume program name
+        _ = generator.next()  // consume program name
 
         var xcframeworkPath: Path?
         var platform: String?
@@ -119,15 +119,13 @@ public final class ProcessXCFrameworkTaskAction: TaskAction {
             if skipSignatureValidation {
                 // NOTE: Always emit the warning when enabled as this can cause issues in other environments, such as CI.
                 outputDelegate.emitWarning("XCFramework signature validation is being skipped. Remove `DISABLE_XCFRAMEWORK_SIGNATURE_VALIDATION` to disable this warning.")
-            }
-            else if await !validateExpectedSignature(path, expectedSignatures: expectedSignatures, outputDelegate: outputDelegate) {
+            } else if await !validateExpectedSignature(path, expectedSignatures: expectedSignatures, outputDelegate: outputDelegate) {
                 return .failed
             }
 
             try xcframework.copy(library: library, from: path, to: target, fs: fs)
             return .succeeded
-        }
-        catch {
+        } catch {
             outputDelegate.emitError(error.localizedDescription)
             return .failed
         }
@@ -156,10 +154,15 @@ public final class ProcessXCFrameworkTaskAction: TaskAction {
 
             guard !signatures.isEmpty else {
                 // NOTE: This is likely an internal tooling error or adoption bring-up issue, so soft-error here.
-                let diagnostic = Diagnostic(behavior: .error, location: location, data: DiagnosticData("Expected signatures are malformed"), childDiagnostics: [
-                    Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("Expected signatures: \(expectedSignatures.joined(separator: ","))")),
-                    Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("Replace or remove the expected signature data.")),
-                ])
+                let diagnostic = Diagnostic(
+                    behavior: .error,
+                    location: location,
+                    data: DiagnosticData("Expected signatures are malformed"),
+                    childDiagnostics: [
+                        Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("Expected signatures: \(expectedSignatures.joined(separator: ","))")),
+                        Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("Replace or remove the expected signature data.")),
+                    ]
+                )
                 outputDelegate.emit(diagnostic)
                 return false
             }
@@ -185,8 +188,7 @@ public final class ProcessXCFrameworkTaskAction: TaskAction {
 
             outputDelegate.emit(diagnostic)
             return false
-        }
-        catch let CodeSignatureInfo.Error.codesignVerificationFailed(description, output) {
+        } catch let CodeSignatureInfo.Error.codesignVerificationFailed(description, output) {
             let childDiagnostics = [
                 Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData(description)),
                 Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData(output)),
@@ -196,8 +198,7 @@ public final class ProcessXCFrameworkTaskAction: TaskAction {
 
             outputDelegate.emit(diagnostic)
             return false
-        }
-        catch {
+        } catch {
             let childDiagnostics = [Diagnostic(behavior: .note, location: .unknown, data: DiagnosticData("Unable to load signature information for '\(path.str)'. error=\(error.localizedDescription)"))]
             let message = "The signature of “\(path.basename)” cannot be validated and may have been compromised."
             let diagnostic = Diagnostic(behavior: .error, location: location, data: DiagnosticData(message), childDiagnostics: childDiagnostics)
@@ -218,7 +219,7 @@ public final class ProcessXCFrameworkTaskAction: TaskAction {
             let parts = s.split(separator: ":", maxSplits: 3).map { String($0) }
 
             guard let s = parts.first else { return nil }
-            guard let type =  CodeSignatureInfo.SignatureType(rawValue: s) else { return nil }
+            guard let type = CodeSignatureInfo.SignatureType(rawValue: s) else { return nil }
             signatureType = type
 
             guard parts.count >= 2 else { return nil }
diff --git a/Sources/SWBTaskExecution/TaskActions/RegisterExecutionPolicyExceptionTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/RegisterExecutionPolicyExceptionTaskAction.swift
index 4d2725e2..dc3a1fec 100644
--- a/Sources/SWBTaskExecution/TaskActions/RegisterExecutionPolicyExceptionTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/RegisterExecutionPolicyExceptionTaskAction.swift
@@ -18,7 +18,7 @@ public import SWBCore
 
 // Weak-linked because the framework isn't available in all contexts
 #if canImport(ExecutionPolicy)
-@_weakLinked import ExecutionPolicy
+    @_weakLinked import ExecutionPolicy
 #endif
 
 /// Concrete implementation of task for registering a built bundle or binary with the system to speed up execution policy checks.
@@ -89,20 +89,20 @@ public final class RegisterExecutionPolicyExceptionTaskAction: TaskAction {
         }
 
         #if canImport(ExecutionPolicy)
-        if #_hasSymbol(EPExecutionPolicy.self) {
-            do {
-                // EPExecutionPolicy manages an XPC connection to syspolicyd, and we only need one per process.
-                // Further, concurrent deallocations of EPExecutionPolicy can trigger an ASan issue in libxpc <rdar://76685500>
-                enum Static {
-                    static let shared = EPExecutionPolicy()
+            if #_hasSymbol(EPExecutionPolicy.self) {
+                do {
+                    // EPExecutionPolicy manages an XPC connection to syspolicyd, and we only need one per process.
+                    // Further, concurrent deallocations of EPExecutionPolicy can trigger an ASan issue in libxpc <rdar://76685500>
+                    enum Static {
+                        static let shared = EPExecutionPolicy()
+                    }
+
+                    // Register the file.
+                    try Static.shared.addException(for: URL(fileURLWithPath: options.input.str))
+                } catch {
+                    // We don't ever fail if blessing fails, and the failure information is not particularly interesting to users.
                 }
-
-                // Register the file.
-                try Static.shared.addException(for: URL(fileURLWithPath: options.input.str))
-            } catch {
-                // We don't ever fail if blessing fails, and the failure information is not particularly interesting to users.
             }
-        }
         #endif
 
         return .succeeded
diff --git a/Sources/SWBTaskExecution/TaskActions/SignatureCollectionTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/SignatureCollectionTaskAction.swift
index 229198e0..62a33985 100644
--- a/Sources/SWBTaskExecution/TaskActions/SignatureCollectionTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/SignatureCollectionTaskAction.swift
@@ -39,13 +39,13 @@ public final class SignatureCollectionTaskAction: TaskAction {
 
         let input: Path
         let output: Path
-        let additionalInfo: [String:String]
+        let additionalInfo: [String: String]
         let skipValidation: Bool
 
         init?(_ commandLine: AnySequence<String>, _ outputDelegate: any TaskOutputDelegate) {
             var inputArg: String? = nil
             var outputArg: String? = nil
-            var additionalInfo: [String:String] = [:]
+            var additionalInfo: [String: String] = [:]
             var skipSignatureValidation: Bool = false
 
             var hadErrors: Bool = false
@@ -139,8 +139,7 @@ public final class SignatureCollectionTaskAction: TaskAction {
             let base = options.output.dirname
             try executionDelegate.fs.createDirectory(base, recursive: true)
             try executionDelegate.fs.write(options.output, contents: ByteString(data))
-        }
-        catch {
+        } catch {
             outputDelegate.emitError("signature-collection failed: \(error.localizedDescription)")
             return .failed
         }
diff --git a/Sources/SWBTaskExecution/TaskActions/SwiftCachingKeyQueryTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/SwiftCachingKeyQueryTaskAction.swift
index abe3c70f..ad16f423 100644
--- a/Sources/SWBTaskExecution/TaskActions/SwiftCachingKeyQueryTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/SwiftCachingKeyQueryTaskAction.swift
@@ -39,7 +39,7 @@ public final class SwiftCachingKeyQueryTaskAction: TaskAction {
         outputDelegate: any TaskOutputDelegate
     ) async -> CommandResult {
         let swiftModuleDependencyGraph = dynamicExecutionDelegate.operationContext.swiftModuleDependencyGraph
-        do  {
+        do {
             guard let cas = try swiftModuleDependencyGraph.getCASDatabases(casOptions: key.casOptions, compilerLocation: key.compilerLocation) else {
                 throw StubError.error("unable to use CAS databases")
             }
@@ -86,4 +86,3 @@ public final class SwiftCachingKeyQueryTaskAction: TaskAction {
         try super.init(from: deserializer)
     }
 }
-
diff --git a/Sources/SWBTaskExecution/TaskActions/SwiftCachingMaterializeKeyTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/SwiftCachingMaterializeKeyTaskAction.swift
index 0883b6f4..e63555a6 100644
--- a/Sources/SWBTaskExecution/TaskActions/SwiftCachingMaterializeKeyTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/SwiftCachingMaterializeKeyTaskAction.swift
@@ -66,7 +66,7 @@ public final class SwiftCachingMaterializeKeyTaskAction: TaskAction {
         state.reset()
 
         let swiftModuleDependencyGraph = dynamicExecutionDelegate.operationContext.swiftModuleDependencyGraph
-        do  {
+        do {
             guard let cas = try swiftModuleDependencyGraph.getCASDatabases(casOptions: taskKey.casOptions, compilerLocation: taskKey.compilerLocation) else {
                 throw StubError.error("unable to use CAS databases")
             }
@@ -96,9 +96,11 @@ public final class SwiftCachingMaterializeKeyTaskAction: TaskAction {
                 )
                 state = .waitingForKeyQuery(jobTaskIDBase: 1, cas: cas, keys: taskKey.cacheKeys)
             } else {
-                if try requestCompilationOutputs(compOutputs,
-                                                 dynamicExecutionDelegate: dynamicExecutionDelegate,
-                                                 jobTaskIDBase: 1) != 0 {
+                if try requestCompilationOutputs(
+                    compOutputs,
+                    dynamicExecutionDelegate: dynamicExecutionDelegate,
+                    jobTaskIDBase: 1
+                ) != 0 {
                     state = .waitingForOutputDownloads
                 } else {
                     state = .done
@@ -127,11 +129,13 @@ public final class SwiftCachingMaterializeKeyTaskAction: TaskAction {
                 }
                 guard cachedComps.count == keys.count else {
                     state = .done
-                    return // compilation key not found.
+                    return  // compilation key not found.
                 }
-                if try requestCompilationOutputs(cachedComps,
-                                                 dynamicExecutionDelegate: dynamicExecutionDelegate,
-                                                 jobTaskIDBase: jobTaskIDBase) != 0 {
+                if try requestCompilationOutputs(
+                    cachedComps,
+                    dynamicExecutionDelegate: dynamicExecutionDelegate,
+                    jobTaskIDBase: jobTaskIDBase
+                ) != 0 {
                     state = .waitingForOutputDownloads
                 } else {
                     state = .done
@@ -157,10 +161,12 @@ public final class SwiftCachingMaterializeKeyTaskAction: TaskAction {
         let numRequested = try cachedComps.reduce(into: UInt(0)) { (numRequested, cachedComp) in
             try cachedComp.getOutputs().forEach { output in
                 if output.isMaterialized { return }
-                let outputMaterializeKey = SwiftCachingOutputMaterializerTaskKey(casOptions: taskKey.casOptions,
-                                                                                 casID: output.casID,
-                                                                                 outputKind: output.kindName,
-                                                                                 compilerLocation: taskKey.compilerLocation)
+                let outputMaterializeKey = SwiftCachingOutputMaterializerTaskKey(
+                    casOptions: taskKey.casOptions,
+                    casID: output.casID,
+                    outputKind: output.kindName,
+                    compilerLocation: taskKey.compilerLocation
+                )
                 dynamicExecutionDelegate.requestDynamicTask(
                     toolIdentifier: SwiftCachingOutputMaterializerTaskAction.toolIdentifier,
                     taskKey: .swiftCachingOutputMaterializer(outputMaterializeKey),
@@ -210,4 +216,3 @@ public final class SwiftCachingMaterializeKeyTaskAction: TaskAction {
         try super.init(from: deserializer)
     }
 }
-
diff --git a/Sources/SWBTaskExecution/TaskActions/SwiftCachingOutputMaterializerTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/SwiftCachingOutputMaterializerTaskAction.swift
index fd917d34..54677c1e 100644
--- a/Sources/SWBTaskExecution/TaskActions/SwiftCachingOutputMaterializerTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/SwiftCachingOutputMaterializerTaskAction.swift
@@ -41,7 +41,7 @@ public final class SwiftCachingOutputMaterializerTaskAction: TaskAction {
         outputDelegate: any TaskOutputDelegate
     ) async -> CommandResult {
         let swiftModuleDependencyGraph = dynamicExecutionDelegate.operationContext.swiftModuleDependencyGraph
-        do  {
+        do {
             guard let cas = try swiftModuleDependencyGraph.getCASDatabases(casOptions: key.casOptions, compilerLocation: key.compilerLocation) else {
                 throw StubError.error("unable to use CAS databases")
             }
@@ -81,4 +81,3 @@ public final class SwiftCachingOutputMaterializerTaskAction: TaskAction {
         try super.init(from: deserializer)
     }
 }
-
diff --git a/Sources/SWBTaskExecution/TaskActions/SwiftDriverJobSchedulingTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/SwiftDriverJobSchedulingTaskAction.swift
index def85286..2bad7f0e 100644
--- a/Sources/SWBTaskExecution/TaskActions/SwiftDriverJobSchedulingTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/SwiftDriverJobSchedulingTaskAction.swift
@@ -23,26 +23,25 @@ open class SwiftDriverJobSchedulingTaskAction: TaskAction {
         return ""
     }
 
-
-     private enum State {
-         /// The action is in it's initial state, and has not yet performed any work
-         case initial
-         /// The action is waiting for execution inputs to be produced. Execution inputs include everything that would be considered an input to a standalone invocation of the driver (source files, output file map, gate tasks, etc.).
-         case waitingForExecutionInputs(openExecutionInputIDs: Set<UInt>, jobTaskIDBase: UInt)
-         /// The action has requested a planning task for a target, and is waiting for the resulting planned build.
-         case planning(jobTaskIDBase: UInt)
-         /// A planned build is available, and the action is requesting and running tasks for individual jobs.
-         case requestingDriverJobs(primaryJobsTaskIDs: Set<UInt>, secondaryJobTaskIDs: Set<UInt>, discoveredJobTaskIDs: Set<UInt>, jobTaskIDBase: UInt)
-
-         /// A dependency of the action failed.
-         case failedDependencies
-         /// The action failed internally
-         case executionError(any Error)
-
-         mutating func reset() {
-             self = .initial
-         }
-     }
+    private enum State {
+        /// The action is in it's initial state, and has not yet performed any work
+        case initial
+        /// The action is waiting for execution inputs to be produced. Execution inputs include everything that would be considered an input to a standalone invocation of the driver (source files, output file map, gate tasks, etc.).
+        case waitingForExecutionInputs(openExecutionInputIDs: Set<UInt>, jobTaskIDBase: UInt)
+        /// The action has requested a planning task for a target, and is waiting for the resulting planned build.
+        case planning(jobTaskIDBase: UInt)
+        /// A planned build is available, and the action is requesting and running tasks for individual jobs.
+        case requestingDriverJobs(primaryJobsTaskIDs: Set<UInt>, secondaryJobTaskIDs: Set<UInt>, discoveredJobTaskIDs: Set<UInt>, jobTaskIDBase: UInt)
+
+        /// A dependency of the action failed.
+        case failedDependencies
+        /// The action failed internally
+        case executionError(any Error)
+
+        mutating func reset() {
+            self = .initial
+        }
+    }
 
     private var state = State.initial
 
@@ -92,16 +91,18 @@ open class SwiftDriverJobSchedulingTaskAction: TaskAction {
             }
             // If all execution inputs are now available, request the driver planning task and move to the `planning` state.
             if openExecutionInputIDs.isEmpty {
-                dynamicExecutionDelegate.requestDynamicTask(toolIdentifier: SwiftDriverTaskAction.toolIdentifier,
-                                                            taskKey: .swiftDriverPlanning(.init(swiftPayload: payload)),
-                                                            taskID: jobTaskIDBase - 1,
-                                                            singleUse: true,
-                                                            workingDirectory: task.workingDirectory,
-                                                            environment: task.environment,
-                                                            forTarget: task.forTarget,
-                                                            priority: .unblocksDownstreamTasks,
-                                                            showEnvironment: task.showEnvironment,
-                                                            reason: .wasScheduledBySwiftDriver)
+                dynamicExecutionDelegate.requestDynamicTask(
+                    toolIdentifier: SwiftDriverTaskAction.toolIdentifier,
+                    taskKey: .swiftDriverPlanning(.init(swiftPayload: payload)),
+                    taskID: jobTaskIDBase - 1,
+                    singleUse: true,
+                    workingDirectory: task.workingDirectory,
+                    environment: task.environment,
+                    forTarget: task.forTarget,
+                    priority: .unblocksDownstreamTasks,
+                    showEnvironment: task.showEnvironment,
+                    reason: .wasScheduledBySwiftDriver
+                )
                 state = .planning(jobTaskIDBase: jobTaskIDBase)
             }
             return
@@ -260,7 +261,6 @@ open class SwiftDriverJobSchedulingTaskAction: TaskAction {
         return .succeeded
     }
 
-
     open func primaryJobs(for plannedBuild: LibSwiftDriver.PlannedBuild, driverPayload: SwiftDriverPayload) -> ArraySlice<LibSwiftDriver.PlannedBuild.PlannedSwiftDriverJob> {
         assertionFailure("Subclass responsibility")
         return []
@@ -299,26 +299,34 @@ open class SwiftDriverJobSchedulingTaskAction: TaskAction {
         }
     }
 
-    internal func constructDriverJobTaskKey(driverPayload: SwiftDriverPayload,
-                                            plannedJob: LibSwiftDriver.PlannedBuild.PlannedSwiftDriverJob) -> DynamicTaskKey {
+    internal func constructDriverJobTaskKey(
+        driverPayload: SwiftDriverPayload,
+        plannedJob: LibSwiftDriver.PlannedBuild.PlannedSwiftDriverJob
+    ) -> DynamicTaskKey {
         let key: DynamicTaskKey
         if plannedJob.driverJob.categorizer.isExplicitDependencyBuild {
-            key = .swiftDriverExplicitDependencyJob(SwiftDriverExplicitDependencyJobTaskKey(
-                arch: driverPayload.architecture,
-                driverJobKey: plannedJob.key,
-                driverJobSignature: plannedJob.signature,
-                compilerLocation: driverPayload.compilerLocation,
-                casOptions: driverPayload.casOptions))
+            key = .swiftDriverExplicitDependencyJob(
+                SwiftDriverExplicitDependencyJobTaskKey(
+                    arch: driverPayload.architecture,
+                    driverJobKey: plannedJob.key,
+                    driverJobSignature: plannedJob.signature,
+                    compilerLocation: driverPayload.compilerLocation,
+                    casOptions: driverPayload.casOptions
+                )
+            )
         } else {
-            key = .swiftDriverJob(SwiftDriverJobTaskKey(
-                identifier: driverPayload.uniqueID,
-                variant: driverPayload.variant,
-                arch: driverPayload.architecture,
-                driverJobKey: plannedJob.key,
-                driverJobSignature: plannedJob.signature,
-                isUsingWholeModuleOptimization: driverPayload.isUsingWholeModuleOptimization,
-                compilerLocation: driverPayload.compilerLocation,
-                casOptions: driverPayload.casOptions))
+            key = .swiftDriverJob(
+                SwiftDriverJobTaskKey(
+                    identifier: driverPayload.uniqueID,
+                    variant: driverPayload.variant,
+                    arch: driverPayload.architecture,
+                    driverJobKey: plannedJob.key,
+                    driverJobSignature: plannedJob.signature,
+                    isUsingWholeModuleOptimization: driverPayload.isUsingWholeModuleOptimization,
+                    compilerLocation: driverPayload.compilerLocation,
+                    casOptions: driverPayload.casOptions
+                )
+            )
         }
         return key
     }
@@ -328,10 +336,10 @@ open class SwiftDriverJobSchedulingTaskAction: TaskAction {
             let isExplicitDependencyBuildJob = plannedJob.driverJob.categorizer.isExplicitDependencyBuild
             let taskID: UInt
             switch plannedJob.key {
-                case .targetJob(let index):
-                    taskID = UInt(index) + jobTaskIDBase
-                case .explicitDependencyJob(let index):
-                    taskID = UInt(index) + jobTaskIDBase + UInt(plannedBuild.targetBuildJobCount)
+            case .targetJob(let index):
+                taskID = UInt(index) + jobTaskIDBase
+            case .explicitDependencyJob(let index):
+                taskID = UInt(index) + jobTaskIDBase + UInt(plannedBuild.targetBuildJobCount)
             }
             cacheTaskID?(taskID)
             let taskKey = constructDriverJobTaskKey(driverPayload: driverPayload, plannedJob: plannedJob)
diff --git a/Sources/SWBTaskExecution/TaskActions/SwiftDriverJobTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/SwiftDriverJobTaskAction.swift
index 3af00355..1c6c76fb 100644
--- a/Sources/SWBTaskExecution/TaskActions/SwiftDriverJobTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/SwiftDriverJobTaskAction.swift
@@ -83,15 +83,15 @@ public final class SwiftDriverJobTaskAction: TaskAction, BuildValueValidatingTas
         case explicitDependency
         case targetCompile(_ identifier: String)
 
-        public func serialize<T>(to serializer: T) where T : Serializer {
+        public func serialize<T>(to serializer: T) where T: Serializer {
             serializer.beginAggregate(2)
             switch self {
-                case .explicitDependency:
-                    serializer.serialize(0)
-                    serializer.serializeNil()
-                case .targetCompile(let identifier):
-                    serializer.serialize(1)
-                    serializer.serialize(identifier)
+            case .explicitDependency:
+                serializer.serialize(0)
+                serializer.serializeNil()
+            case .targetCompile(let identifier):
+                serializer.serialize(1)
+                serializer.serialize(identifier)
             }
             serializer.endAggregate()
         }
@@ -100,14 +100,14 @@ public final class SwiftDriverJobTaskAction: TaskAction, BuildValueValidatingTas
             try deserializer.beginAggregate(2)
             let code: Int = try deserializer.deserialize()
             switch code {
-                case 0:
-                    guard deserializer.deserializeNil() else { throw DeserializerError.deserializationFailed("Unexpected associated value for SwiftDriverJobIdentifier.") }
-                    self = .explicitDependency
-                case 1:
-                    let string: String = try deserializer.deserialize()
-                    self = .targetCompile(string)
-                default:
-                    throw DeserializerError.incorrectType("Unexpected type code for SwiftDriverJobIdentifier: \(code)")
+            case 0:
+                guard deserializer.deserializeNil() else { throw DeserializerError.deserializationFailed("Unexpected associated value for SwiftDriverJobIdentifier.") }
+                self = .explicitDependency
+            case 1:
+                let string: String = try deserializer.deserialize()
+                self = .targetCompile(string)
+            default:
+                throw DeserializerError.incorrectType("Unexpected type code for SwiftDriverJobIdentifier: \(code)")
             }
         }
     }
@@ -127,7 +127,7 @@ public final class SwiftDriverJobTaskAction: TaskAction, BuildValueValidatingTas
         super.init()
     }
 
-    public override func serialize<T>(to serializer: T) where T : Serializer {
+    public override func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serializeAggregate(6) {
             serializer.serialize(driverJob)
             serializer.serialize(variant)
@@ -178,11 +178,13 @@ public final class SwiftDriverJobTaskAction: TaskAction, BuildValueValidatingTas
             fatalError("Unexpected payload type: \(type(of: task.payload)).")
         }
         let taskID = state.jobTaskIDBase
-        if try Self.maybeRequestCachingKeyMaterialization(plannedJob: driverJob,
-                                                          dynamicExecutionDelegate: dynamicExecutionDelegate,
-                                                          casOptions: payload.casOptions,
-                                                          compilerLocation: payload.compilerLocation,
-                                                          taskID: taskID) {
+        if try Self.maybeRequestCachingKeyMaterialization(
+            plannedJob: driverJob,
+            dynamicExecutionDelegate: dynamicExecutionDelegate,
+            casOptions: payload.casOptions,
+            compilerLocation: payload.compilerLocation,
+            taskID: taskID
+        ) {
             state.openDependencies.insert(taskID)
         }
         state.cacheJobRequested = true
@@ -200,20 +202,25 @@ public final class SwiftDriverJobTaskAction: TaskAction, BuildValueValidatingTas
         }
     }
 
-    internal func constructDriverJobTaskKey(variant: String?,
-                                            arch: String,
-                                            plannedJob: LibSwiftDriver.PlannedBuild.PlannedSwiftDriverJob,
-                                            identifier: String?,
-                                            compilerLocation: LibSwiftDriver.CompilerLocation,
-                                            casOptions: CASOptions?) -> DynamicTaskKey {
+    internal func constructDriverJobTaskKey(
+        variant: String?,
+        arch: String,
+        plannedJob: LibSwiftDriver.PlannedBuild.PlannedSwiftDriverJob,
+        identifier: String?,
+        compilerLocation: LibSwiftDriver.CompilerLocation,
+        casOptions: CASOptions?
+    ) -> DynamicTaskKey {
         let key: DynamicTaskKey
         if plannedJob.driverJob.categorizer.isExplicitDependencyBuild {
-            key = .swiftDriverExplicitDependencyJob(SwiftDriverExplicitDependencyJobTaskKey(
-                arch: arch,
-                driverJobKey: plannedJob.key,
-                driverJobSignature: plannedJob.signature,
-                compilerLocation: compilerLocation,
-                casOptions: casOptions))
+            key = .swiftDriverExplicitDependencyJob(
+                SwiftDriverExplicitDependencyJobTaskKey(
+                    arch: arch,
+                    driverJobKey: plannedJob.key,
+                    driverJobSignature: plannedJob.signature,
+                    compilerLocation: compilerLocation,
+                    casOptions: casOptions
+                )
+            )
         } else {
             guard let variant else {
                 fatalError("Expected variant for non-explicit-module job: \(plannedJob.driverJob.descriptionForLifecycle)")
@@ -221,15 +228,18 @@ public final class SwiftDriverJobTaskAction: TaskAction, BuildValueValidatingTas
             guard let jobID = identifier else {
                 fatalError("Expected job identifier for target compile: \(plannedJob.driverJob.descriptionForLifecycle)")
             }
-            key = .swiftDriverJob(SwiftDriverJobTaskKey(
-                identifier: jobID,
-                variant: variant,
-                arch: arch,
-                driverJobKey: plannedJob.key,
-                driverJobSignature: plannedJob.signature,
-                isUsingWholeModuleOptimization: isUsingWholeModuleOptimization,
-                compilerLocation: compilerLocation,
-                casOptions: casOptions))
+            key = .swiftDriverJob(
+                SwiftDriverJobTaskKey(
+                    identifier: jobID,
+                    variant: variant,
+                    arch: arch,
+                    driverJobKey: plannedJob.key,
+                    driverJobSignature: plannedJob.signature,
+                    isUsingWholeModuleOptimization: isUsingWholeModuleOptimization,
+                    compilerLocation: compilerLocation,
+                    casOptions: casOptions
+                )
+            )
         }
         return key
     }
@@ -246,28 +256,30 @@ public final class SwiftDriverJobTaskAction: TaskAction, BuildValueValidatingTas
             let jobDependencies: [LibSwiftDriver.PlannedBuild.PlannedSwiftDriverJob]
             var jobID: String? = nil
             switch self.identifier {
-                case .targetCompile(let identifierStr):
-                    let plannedBuild = try graph.queryPlannedBuild(for: identifierStr)
-                    jobDependencies = plannedBuild.dependencies(for: driverJob)
-                    jobID = identifierStr
-                case .explicitDependency:
-                    guard let explicitBuildJob = graph.plannedExplicitDependencyBuildJob(for: self.driverJob.key) else {
-                        state.executionError = "Could not query build containing explicit dependency build job: \(self.driverJob.driverJob.descriptionForLifecycle)"
-                        return
-                    }
-                    jobDependencies = graph.explicitDependencies(for: explicitBuildJob)
+            case .targetCompile(let identifierStr):
+                let plannedBuild = try graph.queryPlannedBuild(for: identifierStr)
+                jobDependencies = plannedBuild.dependencies(for: driverJob)
+                jobID = identifierStr
+            case .explicitDependency:
+                guard let explicitBuildJob = graph.plannedExplicitDependencyBuildJob(for: self.driverJob.key) else {
+                    state.executionError = "Could not query build containing explicit dependency build job: \(self.driverJob.driverJob.descriptionForLifecycle)"
+                    return
+                }
+                jobDependencies = graph.explicitDependencies(for: explicitBuildJob)
             }
 
             let jobTaskIDBase = UInt((task.executionInputs ?? []).count)
             // For each depended-upon job, request a dynamic task.
             for (index, dependency) in jobDependencies.enumerated() {
                 let isExplicitDependencyBuildJob = dependency.driverJob.categorizer.isExplicitDependencyBuild
-                let taskKey = constructDriverJobTaskKey(variant: variant,
-                                                        arch: arch,
-                                                        plannedJob: dependency,
-                                                        identifier: jobID,
-                                                        compilerLocation: payload.compilerLocation,
-                                                        casOptions: payload.casOptions)
+                let taskKey = constructDriverJobTaskKey(
+                    variant: variant,
+                    arch: arch,
+                    plannedJob: dependency,
+                    identifier: jobID,
+                    compilerLocation: payload.compilerLocation,
+                    casOptions: payload.casOptions
+                )
                 let taskID = jobTaskIDBase + UInt(index)
                 state.openDependencies.insert(taskID)
                 dynamicExecutionDelegate.requestDynamicTask(
@@ -304,11 +316,11 @@ public final class SwiftDriverJobTaskAction: TaskAction, BuildValueValidatingTas
             let graph = dynamicExecutionDelegate.operationContext.swiftModuleDependencyGraph
             let jobDependencies: [LibSwiftDriver.PlannedBuild.PlannedSwiftDriverJob]
             switch self.identifier {
-                case .targetCompile(let identifier):
-                    let plannedBuild = try graph.queryPlannedBuild(for: identifier)
-                    jobDependencies = plannedBuild.dependencies(for: driverJob)
-                case .explicitDependency:
-                    jobDependencies = graph.explicitDependencies(for: driverJob)
+            case .targetCompile(let identifier):
+                let plannedBuild = try graph.queryPlannedBuild(for: identifier)
+                jobDependencies = plannedBuild.dependencies(for: driverJob)
+            case .explicitDependency:
+                jobDependencies = graph.explicitDependencies(for: driverJob)
             }
 
             let dependencyIdentifier = Int(dependencyID)
@@ -346,15 +358,15 @@ public final class SwiftDriverJobTaskAction: TaskAction, BuildValueValidatingTas
         // Explicit dependency build jobs do not update the delegate's (driver's)
         // state (incl. incremental), so we do not require access to their planned build.
         switch self.identifier {
-            case .targetCompile(let identifier):
-                do {
-                    let graph = dynamicExecutionDelegate.operationContext.swiftModuleDependencyGraph
-                    plannedBuild = try graph.queryPlannedBuild(for: identifier)
-                } catch {
-                    state.executionError = "Unable to get planned build for identifier \(identifier): \(error.localizedDescription)"
-                }
-            case .explicitDependency:
-                break
+        case .targetCompile(let identifier):
+            do {
+                let graph = dynamicExecutionDelegate.operationContext.swiftModuleDependencyGraph
+                plannedBuild = try graph.queryPlannedBuild(for: identifier)
+            } catch {
+                state.executionError = "Unable to get planned build for identifier \(identifier): \(error.localizedDescription)"
+            }
+        case .explicitDependency:
+            break
         }
 
         defer {
@@ -396,9 +408,9 @@ public final class SwiftDriverJobTaskAction: TaskAction, BuildValueValidatingTas
 
             // FIXME: rdar://134664046 (Add an EnvironmentBlock type to represent environment variables)
             #if os(Windows)
-            if let value = environment.removeValue(forKey: "PATH") {
-                environment["Path"] = value
-            }
+                if let value = environment.removeValue(forKey: "PATH") {
+                    environment["Path"] = value
+                }
             #endif
         } else {
             environment = task.environment.bindingsDictionary
@@ -413,7 +425,7 @@ public final class SwiftDriverJobTaskAction: TaskAction, BuildValueValidatingTas
                 let plannedBuild: LibSwiftDriver.PlannedBuild?
                 let driverJob: LibSwiftDriver.PlannedBuild.PlannedSwiftDriverJob
                 let arguments: [String]
-                let environment: [String : String]
+                let environment: [String: String]
                 let outputDelegate: any TaskOutputDelegate
 
                 private(set) var output: ByteString = ""
@@ -430,7 +442,7 @@ public final class SwiftDriverJobTaskAction: TaskAction, BuildValueValidatingTas
                     return _commandResult
                 }
 
-                init(plannedBuild: LibSwiftDriver.PlannedBuild?, driverJob: LibSwiftDriver.PlannedBuild.PlannedSwiftDriverJob, arguments: [String], environment: [String : String], outputDelegate: any TaskOutputDelegate) {
+                init(plannedBuild: LibSwiftDriver.PlannedBuild?, driverJob: LibSwiftDriver.PlannedBuild.PlannedSwiftDriverJob, arguments: [String], environment: [String: String], outputDelegate: any TaskOutputDelegate) {
                     self.plannedBuild = plannedBuild
                     self.driverJob = driverJob
                     self.arguments = arguments
@@ -520,14 +532,17 @@ public final class SwiftDriverJobTaskAction: TaskAction, BuildValueValidatingTas
             }
 
             if let db = cas,
-               let casOpts = payload.casOptions,
-               try await Self.replayCachedCommand(cas: db,
-                                                  plannedJob: driverJob,
-                                                  commandLine: options.commandLine,
-                                                  dynamicExecutionDelegate: dynamicExecutionDelegate,
-                                                  outputDelegate: outputDelegate,
-                                                  enableDiagnosticRemarks: casOpts.enableDiagnosticRemarks) {
-                    return .succeeded
+                let casOpts = payload.casOptions,
+                try await Self.replayCachedCommand(
+                    cas: db,
+                    plannedJob: driverJob,
+                    commandLine: options.commandLine,
+                    dynamicExecutionDelegate: dynamicExecutionDelegate,
+                    outputDelegate: outputDelegate,
+                    enableDiagnosticRemarks: casOpts.enableDiagnosticRemarks
+                )
+            {
+                return .succeeded
             }
 
             try await spawn(commandLine: options.commandLine, environment: environment, workingDirectory: task.workingDirectory, dynamicExecutionDelegate: dynamicExecutionDelegate, clientDelegate: clientDelegate, processDelegate: delegate)
@@ -554,12 +569,14 @@ public final class SwiftDriverJobTaskAction: TaskAction, BuildValueValidatingTas
             // If has remote cache, start uploading task.
             if let db = cas, let casOpts = payload.casOptions, casOpts.hasRemoteCache, delegate.commandResult == .succeeded {
                 // upload only if succeed
-                try Self.upload(cas: db,
-                                plannedJob: driverJob,
-                                dynamicExecutionDelegate: dynamicExecutionDelegate,
-                                outputDelegate: outputDelegate,
-                                enableDiagnosticRemarks: casOpts.enableDiagnosticRemarks,
-                                enableStrictCASErrors: casOpts.enableStrictCASErrors)
+                try Self.upload(
+                    cas: db,
+                    plannedJob: driverJob,
+                    dynamicExecutionDelegate: dynamicExecutionDelegate,
+                    outputDelegate: outputDelegate,
+                    enableDiagnosticRemarks: casOpts.enableDiagnosticRemarks,
+                    enableStrictCASErrors: casOpts.enableStrictCASErrors
+                )
             }
 
             if delegate.commandResult == .failed && !executionDelegate.userPreferences.enableDebugActivityLogs && !executionDelegate.emitFrontendCommandLines {
@@ -585,8 +602,9 @@ public final class SwiftDriverJobTaskAction: TaskAction, BuildValueValidatingTas
         taskID: UInt
     ) throws -> Bool {
         guard let casOptions,
-              casOptions.enableIntegratedCacheQueries,
-              casOptions.hasRemoteCache else {
+            casOptions.enableIntegratedCacheQueries,
+            casOptions.hasRemoteCache
+        else {
             return false
         }
         let cacheQueryKey = SwiftCachingKeyQueryTaskKey(casOptions: casOptions, cacheKeys: plannedJob.driverJob.cacheKeys, compilerLocation: compilerLocation)
@@ -600,19 +618,21 @@ public final class SwiftDriverJobTaskAction: TaskAction, BuildValueValidatingTas
             forTarget: nil,
             priority: .network,
             showEnvironment: false,
-            reason: .wasCompilationCachingQuery)
+            reason: .wasCompilationCachingQuery
+        )
         return true
     }
 
     /// Attempts to replay a previously cached compilation, using data from the local CAS.
     ///
     /// - Returns: `true` if the the cached compilation outputs were found and replayed, `false` otherwise.
-    static func replayCachedCommand(cas: SwiftCASDatabases,
-                                    plannedJob: LibSwiftDriver.PlannedBuild.PlannedSwiftDriverJob,
-                                    commandLine: [String],
-                                    dynamicExecutionDelegate: any DynamicTaskExecutionDelegate,
-                                    outputDelegate: any TaskOutputDelegate,
-                                    enableDiagnosticRemarks: Bool
+    static func replayCachedCommand(
+        cas: SwiftCASDatabases,
+        plannedJob: LibSwiftDriver.PlannedBuild.PlannedSwiftDriverJob,
+        commandLine: [String],
+        dynamicExecutionDelegate: any DynamicTaskExecutionDelegate,
+        outputDelegate: any TaskOutputDelegate,
+        enableDiagnosticRemarks: Bool
     ) async throws -> Bool {
         let cacheKeys = plannedJob.driverJob.cacheKeys
         guard !cacheKeys.isEmpty else { return false }
@@ -648,7 +668,7 @@ public final class SwiftDriverJobTaskAction: TaskAction, BuildValueValidatingTas
             }
 
             // Replay after all checks are done.
-            let instance = try cas.createReplayInstance(cmd: Array(commandLine.dropFirst(1))) // drop executable name
+            let instance = try cas.createReplayInstance(cmd: Array(commandLine.dropFirst(1)))  // drop executable name
             let replayResults: [Result<SwiftCacheReplayResult, any Error>] = await comps.concurrentMap(maximumParallelism: 10) { comp in
                 do {
                     return .success(try cas.replayCompilation(instance: instance, compilation: comp))
@@ -681,12 +701,13 @@ public final class SwiftDriverJobTaskAction: TaskAction, BuildValueValidatingTas
         return result
     }
 
-    static func upload(cas: SwiftCASDatabases,
-                       plannedJob: LibSwiftDriver.PlannedBuild.PlannedSwiftDriverJob,
-                       dynamicExecutionDelegate: any DynamicTaskExecutionDelegate,
-                       outputDelegate: any TaskOutputDelegate,
-                       enableDiagnosticRemarks: Bool,
-                       enableStrictCASErrors: Bool
+    static func upload(
+        cas: SwiftCASDatabases,
+        plannedJob: LibSwiftDriver.PlannedBuild.PlannedSwiftDriverJob,
+        dynamicExecutionDelegate: any DynamicTaskExecutionDelegate,
+        outputDelegate: any TaskOutputDelegate,
+        enableDiagnosticRemarks: Bool,
+        enableStrictCASErrors: Bool
     ) throws {
         let cacheKeys = plannedJob.driverJob.cacheKeys
         guard !cacheKeys.isEmpty else { return }
@@ -705,7 +726,8 @@ public final class SwiftDriverJobTaskAction: TaskAction, BuildValueValidatingTas
                 cacheKey: cacheKey,
                 enableDiagnosticRemarks: enableDiagnosticRemarks,
                 enableStrictCASErrors: enableStrictCASErrors,
-                activityReporter: dynamicExecutionDelegate)
+                activityReporter: dynamicExecutionDelegate
+            )
         }
     }
 }
diff --git a/Sources/SWBTaskExecution/TaskActions/SwiftDriverTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/SwiftDriverTaskAction.swift
index a8b21ba1..7262eae0 100644
--- a/Sources/SWBTaskExecution/TaskActions/SwiftDriverTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/SwiftDriverTaskAction.swift
@@ -61,17 +61,19 @@ final public class SwiftDriverTaskAction: TaskAction, BuildValueValidatingTaskAc
             }
 
             let commandLine = task.commandLineAsStrings.split(separator: "--", maxSplits: 1, omittingEmptySubsequences: false)[1]
-            let success = dependencyGraph.planBuild(key: driverPayload.uniqueID,
-                                                    outputDelegate: outputDelegate,
-                                                    compilerLocation: driverPayload.compilerLocation,
-                                                    target: target,
-                                                    args: Array(commandLine),
-                                                    workingDirectory: task.workingDirectory,
-                                                    tempDirPath: driverPayload.tempDirPath,
-                                                    explicitModulesTempDirPath: driverPayload.explicitModulesTempDirPath,
-                                                    environment: environment,
-                                                    eagerCompilationEnabled: driverPayload.eagerCompilationEnabled,
-                                                    casOptions: driverPayload.casOptions)
+            let success = dependencyGraph.planBuild(
+                key: driverPayload.uniqueID,
+                outputDelegate: outputDelegate,
+                compilerLocation: driverPayload.compilerLocation,
+                target: target,
+                args: Array(commandLine),
+                workingDirectory: task.workingDirectory,
+                tempDirPath: driverPayload.tempDirPath,
+                explicitModulesTempDirPath: driverPayload.explicitModulesTempDirPath,
+                environment: environment,
+                eagerCompilationEnabled: driverPayload.eagerCompilationEnabled,
+                casOptions: driverPayload.casOptions
+            )
 
             guard success else { return .failed }
         }
@@ -97,7 +99,7 @@ final public class SwiftDriverTaskAction: TaskAction, BuildValueValidatingTaskAc
             }
 
             if driverPayload.explicitModulesEnabled,
-               let dependencyValidationPayload = payload.dependencyValidationPayload
+                let dependencyValidationPayload = payload.dependencyValidationPayload
             {
                 let payload: DependencyValidationInfo.Payload
                 if let imports = try await dependencyGraph.mainModuleImportModuleDependencies(for: driverPayload.uniqueID) {
@@ -115,8 +117,7 @@ final public class SwiftDriverTaskAction: TaskAction, BuildValueValidatingTaskAc
                         JSONEncoder(outputFormatting: .sortedKeys).encode(validationInfo)
                     )
                 )
-            }
-            else {
+            } else {
                 outputDelegate.incrementTaskCounter(.moduleDependenciesNotValidatedTasks)
             }
 
diff --git a/Sources/SWBTaskExecution/TaskActions/SwiftHeaderToolTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/SwiftHeaderToolTaskAction.swift
index daaaa3bc..0c0c215c 100644
--- a/Sources/SWBTaskExecution/TaskActions/SwiftHeaderToolTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/SwiftHeaderToolTaskAction.swift
@@ -57,7 +57,7 @@ public final class SwiftHeaderToolTaskAction: TaskAction {
                     return args
                 }
 
-                func setSingleOccurrence<T>(_ result: inout T?, _ getValue : @autoclosure () throws -> T) throws -> T {
+                func setSingleOccurrence<T>(_ result: inout T?, _ getValue: @autoclosure () throws -> T) throws -> T {
                     guard result == nil else { throw StubError.error("Failed to parse arguments: expected a single \(arg) argument") }
                     let newResult = try getValue()
                     result = newResult
@@ -135,7 +135,7 @@ public final class SwiftHeaderToolTaskAction: TaskAction {
                 ("armv7", "__ARM_ARCH_7A__", nil),
                 ("x86_64h", "__x86_64h__", "x86_64"),
                 ("x86_64", "__x86_64__", nil),
-                ("i386", "__i386__", nil)
+                ("i386", "__i386__", nil),
             ]
 
             let unknownArchs = Set(options.inputs.keys).subtracting(knownArchs.map { $0.0 })
diff --git a/Sources/SWBTaskExecution/TaskActions/TaskAction.swift b/Sources/SWBTaskExecution/TaskActions/TaskAction.swift
index 6b7fd761..272a95d0 100644
--- a/Sources/SWBTaskExecution/TaskActions/TaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/TaskAction.swift
@@ -34,8 +34,7 @@ extension BuildValueValidatingTaskAction {
 /// A task action encapsulates concrete work to be done for a task during a build.
 ///
 /// Task actions are primarily used to capture state and execution logic for in-process tasks.
-open class TaskAction: PlannedTaskAction, PolymorphicSerializable
-{
+open class TaskAction: PlannedTaskAction, PolymorphicSerializable {
     /// A unique identifier for the tool, used for binding in llbuild.
     open class var toolIdentifier: String {
         fatalError("This method is a subclass responsibility")
@@ -57,16 +56,14 @@ open class TaskAction: PlannedTaskAction, PolymorphicSerializable
         return md5.signature
     }
 
-    public init()
-    {
+    public init() {
         self.serializedRepresentationSignature = computeInitialSignature()
     }
 
     /// Get a signature used to identify the internal state of the command.
     ///
     /// This is checked to determine if the command needs to rebuild versus the last time it was run.
-    open func getSignature(_ task: any ExecutableTask, executionDelegate: any TaskExecutionDelegate) -> ByteString
-    {
+    open func getSignature(_ task: any ExecutableTask, executionDelegate: any TaskExecutionDelegate) -> ByteString {
         let md5 = InsecureHashContext()
         md5.add(bytes: serializedRepresentationSignature!)
         let commandLine = task.type.commandLineForSignature(for: task) ?? task.commandLine.map { $0.asByteString }
@@ -104,8 +101,7 @@ open class TaskAction: PlannedTaskAction, PolymorphicSerializable
     /// - parameter taskDelegate: The delegate for the tool to perform commonly-used operations.
     /// - parameter outputDelegate: The delegate for the tool to emit output during its execution.
     /// - returns: A command result to indicate if the task failed, succeeded, got cancelled or skipped its work.
-    open func performTaskAction(_ task: any ExecutableTask, dynamicExecutionDelegate: any DynamicTaskExecutionDelegate, executionDelegate: any TaskExecutionDelegate, clientDelegate: any TaskExecutionClientDelegate, outputDelegate: any TaskOutputDelegate) async -> CommandResult
-    {
+    open func performTaskAction(_ task: any ExecutableTask, dynamicExecutionDelegate: any DynamicTaskExecutionDelegate, executionDelegate: any TaskExecutionDelegate, clientDelegate: any TaskExecutionClientDelegate, outputDelegate: any TaskOutputDelegate) async -> CommandResult {
         fatalError("This method is a subclass responsibility")
     }
 
@@ -117,17 +113,14 @@ open class TaskAction: PlannedTaskAction, PolymorphicSerializable
 
     // Serialization
 
-
-    open func serialize<T: Serializer>(to serializer: T)
-    {
+    open func serialize<T: Serializer>(to serializer: T) {
         // TaskAction has no content itself to serialize, but it serializes an aggregate count of 0 so that child classes which also have no content don't have to do anything.
         serializer.serializeAggregate(1) {
             serializer.serialize(self.serializedRepresentationSignature)
         }
     }
 
-    public required init(from deserializer: any Deserializer) throws
-    {
+    public required init(from deserializer: any Deserializer) throws {
         try deserializer.beginAggregate(1)
         self.serializedRepresentationSignature = try deserializer.deserialize()
     }
@@ -241,19 +234,15 @@ public protocol DynamicTaskExecutionDelegate: ActivityReporter {
 }
 
 /// Class for collecting and caching messages to emit for a task action.
-class TaskActionMessageCollection
-{
+class TaskActionMessageCollection {
     var messages = [TaskActionMessage]()
 
-    func addMessage(_ message: TaskActionMessage)
-    {
+    func addMessage(_ message: TaskActionMessage) {
         messages.append(message)
     }
 
-    func emitMessages(_ outputDelegate: any TaskOutputDelegate)
-    {
-        for message in messages
-        {
+    func emitMessages(_ outputDelegate: any TaskOutputDelegate) {
+        for message in messages {
             switch message
             {
             case .error(let value):
@@ -270,8 +259,7 @@ class TaskActionMessageCollection
 }
 
 /// Enum describing the kinds of messages that an `TaskActionMessageCollection` can emit.
-enum TaskActionMessage
-{
+enum TaskActionMessage {
     case error(String)
     case warning(String)
     case note(String)
diff --git a/Sources/SWBTaskExecution/TaskActions/ValidateDependenciesTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/ValidateDependenciesTaskAction.swift
index 914904b5..c205b882 100644
--- a/Sources/SWBTaskExecution/TaskActions/ValidateDependenciesTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/ValidateDependenciesTaskAction.swift
@@ -173,7 +173,8 @@ public final class ValidateDependenciesTaskAction: TaskAction {
                     outputPaths: [],
                     dependencies: dependencies
                 )
-            ], errors: []
+            ],
+            errors: []
         )
 
         let outputData = try JSONEncoder(outputFormatting: [.prettyPrinted, .sortedKeys, .withoutEscapingSlashes]).encode(dependencyInfo)
diff --git a/Sources/SWBTaskExecution/TaskActions/ValidateProductTaskAction.swift b/Sources/SWBTaskExecution/TaskActions/ValidateProductTaskAction.swift
index 398f01ee..f1be7302 100644
--- a/Sources/SWBTaskExecution/TaskActions/ValidateProductTaskAction.swift
+++ b/Sources/SWBTaskExecution/TaskActions/ValidateProductTaskAction.swift
@@ -65,52 +65,51 @@ public final class ValidateProductTaskAction: TaskAction {
             let generator = commandLine.makeIterator()
             // Skip the executable.
             let programName = generator.next() ?? "<<missing program name>>"
-            argumentParsing:
-                while let arg = generator.next() {
-                    switch arg {
-// Presently these options are disabled; they are only used for "offline store validation", which was disabled in the original XCWorkQueueCommandBuiltinInvocation_validationUtility and is not yet implemented here.
-// When & if they are reenabled, they should be documented in emitUsage().
-/*
-                    case "-verbose":
-                        verbose = true
-
-                    case "-warnings":
-                        storeIssueTreatment = .treatAsWarnings
-
-                    case "-errors":
-                        storeIssueTreatment = .treatAsErrors
-*/
-                    case "-validate-for-store":
-                        validateForStore = true
-
-                    // The default is yes, so we only need an opt-out for now. This also prevents us from having to pass in `-validate-extension` everywhere, even though that is the default behavior.
-                    case "-no-validate-extension":
-                        validateExtension = false
-
-                    case "-no-validate-embedded-frameworks":
-                        validateEmbeddedFrameworks = false
-
-                    case "-shallow-bundle":
-                        isShallowBundle = true
-
-                    case "-infoplist-subpath":
-                        guard let path = generator.next() else {
-                            error("missing argument for option: \(arg)")
-                            continue
-                        }
-                        infoplistSubpath = path
-
-                    case _ where arg.hasPrefix("-"):
-                        error("unrecognized option: \(arg)")
-
-                    case _ where applicationPath == nil:
-                        // Any other option is considered to be the application path.
-                        applicationPath = Path(arg)
-
-                    default:
-                        // But we can only have one application path.
-                        error("multiple application paths specified")
+            argumentParsing: while let arg = generator.next() {
+                switch arg {
+                // Presently these options are disabled; they are only used for "offline store validation", which was disabled in the original XCWorkQueueCommandBuiltinInvocation_validationUtility and is not yet implemented here.
+                // When & if they are reenabled, they should be documented in emitUsage().
+
+                // case "-verbose":
+                //     verbose = true
+
+                // case "-warnings":
+                //     storeIssueTreatment = .treatAsWarnings
+
+                // case "-errors":
+                //     storeIssueTreatment = .treatAsErrors
+
+                case "-validate-for-store":
+                    validateForStore = true
+
+                // The default is yes, so we only need an opt-out for now. This also prevents us from having to pass in `-validate-extension` everywhere, even though that is the default behavior.
+                case "-no-validate-extension":
+                    validateExtension = false
+
+                case "-no-validate-embedded-frameworks":
+                    validateEmbeddedFrameworks = false
+
+                case "-shallow-bundle":
+                    isShallowBundle = true
+
+                case "-infoplist-subpath":
+                    guard let path = generator.next() else {
+                        error("missing argument for option: \(arg)")
+                        continue
                     }
+                    infoplistSubpath = path
+
+                case _ where arg.hasPrefix("-"):
+                    error("unrecognized option: \(arg)")
+
+                case _ where applicationPath == nil:
+                    // Any other option is considered to be the application path.
+                    applicationPath = Path(arg)
+
+                default:
+                    // But we can only have one application path.
+                    error("multiple application paths specified")
+                }
             }
 
             // Diagnose missing inputs.
@@ -126,8 +125,7 @@ public final class ValidateProductTaskAction: TaskAction {
             let ext = applicationPath.fileExtension.lowercased()
             if ext == "ipa" {
                 validatingArchive = true
-            }
-            else if ext != "app" {
+            } else if ext != "app" {
                 if validateExtension {
                     error("unknown application extension '.\(ext): expected '.app' or '.ipa'")
                 }
@@ -175,8 +173,7 @@ public final class ValidateProductTaskAction: TaskAction {
         let infoPlistItem: PropertyListItem
         do {
             infoPlistItem = try PropertyList.fromPath(applicationPath.join(options.infoplistSubpath), fs: executionDelegate.fs)
-        }
-        catch {
+        } catch {
             outputDelegate.emitError("Failed to read Info.plist of app \(applicationPath.str): \(error.localizedDescription)")
             return .failed
         }
@@ -245,8 +242,7 @@ public final class ValidateProductTaskAction: TaskAction {
             let infoPlistItem: PropertyListItem
             do {
                 infoPlistItem = try PropertyList.fromPath(infoPlistPath, fs: fs)
-            }
-            catch let error {
+            } catch let error {
                 outputDelegate.emitError("Failed to read Info.plist of framework \(frameworkPath.str): \(error)")
                 hasErrors = true
                 continue
diff --git a/Sources/SWBTaskExecution/TaskStore.swift b/Sources/SWBTaskExecution/TaskStore.swift
index dc9ff3a2..65d54e2c 100644
--- a/Sources/SWBTaskExecution/TaskStore.swift
+++ b/Sources/SWBTaskExecution/TaskStore.swift
@@ -50,7 +50,7 @@ package final class TaskStore {
 @available(*, unavailable) extension TaskStore: Sendable {}
 
 package final class FrozenTaskStore: Sendable {
-    fileprivate init(tasks: [TaskIdentifier : Task], stringArena: FrozenStringArena, byteStringArena: FrozenByteStringArena) {
+    fileprivate init(tasks: [TaskIdentifier: Task], stringArena: FrozenStringArena, byteStringArena: FrozenByteStringArena) {
         self.tasks = tasks
         self.stringArena = stringArena
         self.byteStringArena = byteStringArena
@@ -91,7 +91,7 @@ package final class FrozenTaskStore: Sendable {
 }
 
 extension FrozenTaskStore: Serializable {
-    package func serialize<T>(to serializer: T) where T : Serializer {
+    package func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serialize(Array(tasks.values))
     }
 
diff --git a/Sources/SWBTestSupport/AssertMatch.swift b/Sources/SWBTestSupport/AssertMatch.swift
index f7118634..8467c3d9 100644
--- a/Sources/SWBTestSupport/AssertMatch.swift
+++ b/Sources/SWBTestSupport/AssertMatch.swift
@@ -119,9 +119,9 @@ extension StringPattern: ExpressibleByStringInterpolation {
     }
 }
 
-package func ~=(pattern: StringPattern, value: String) -> Bool {
+package func ~= (pattern: StringPattern, value: String) -> Bool {
     switch pattern {
-        // These cases never matches individual items, they are just used for matching string lists.
+    // These cases never matches individual items, they are just used for matching string lists.
     case .start, .end, .anySequence:
         return false
 
@@ -155,7 +155,7 @@ package func ~=(pattern: StringPattern, value: String) -> Bool {
     }
 }
 
-package func ~=(patterns: [StringPattern], input: [String]) -> Bool {
+package func ~= (patterns: [StringPattern], input: [String]) -> Bool {
     let startIndex = input.startIndex
     let endIndex = input.endIndex
 
@@ -224,11 +224,17 @@ package func XCTAssertMatch(_ value: @autoclosure @escaping () -> String?, _ pat
     XCTAssertMatchImpl(pattern ~= value, { value }, pattern, message, sourceLocation: sourceLocation)
 }
 package func XCTAssertNoMatch(_ value: @autoclosure @escaping () -> String?, _ pattern: StringPattern, _ message: String? = nil, sourceLocation: SourceLocation = #_sourceLocation) {
-    XCTAssertMatchImpl({
-        // `nil` always matches, so in this case we return true to ensure the underlying XCTAssert succeeds
-        guard let value = value() else { return true }
-        return !(pattern ~= value)
-    }(), value, pattern, message, sourceLocation: sourceLocation)
+    XCTAssertMatchImpl(
+        {
+            // `nil` always matches, so in this case we return true to ensure the underlying XCTAssert succeeds
+            guard let value = value() else { return true }
+            return !(pattern ~= value)
+        }(),
+        value,
+        pattern,
+        message,
+        sourceLocation: sourceLocation
+    )
 }
 
 package func XCTAssertMatch(_ value: @autoclosure @escaping () -> [String], _ pattern: [StringPattern], _ message: String? = nil, sourceLocation: SourceLocation = #_sourceLocation) {
diff --git a/Sources/SWBTestSupport/BuildDescriptionBasedTests.swift b/Sources/SWBTestSupport/BuildDescriptionBasedTests.swift
index f4544400..8cb60b40 100644
--- a/Sources/SWBTestSupport/BuildDescriptionBasedTests.swift
+++ b/Sources/SWBTestSupport/BuildDescriptionBasedTests.swift
@@ -34,7 +34,7 @@ extension CoreBasedTests {
     package func buildGraph(for workspaceContext: WorkspaceContext, buildRequestContext: BuildRequestContext, configuration: String = "Debug", activeRunDestination: RunDestinationInfo?, overrides: [String: String] = [:], useImplicitDependencies: Bool = false, dependencyScope: DependencyScope = .workspace, fs: any FSProxy = PseudoFS(), includingTargets predicate: (Target) -> Bool) async -> (TargetBuildGraph, BuildRequest) {
         // Create a fake build request to build all targets.
         let parameters = BuildParameters(configuration: configuration, activeRunDestination: activeRunDestination, overrides: overrides)
-        let buildTargets = workspaceContext.workspace.projects.flatMap{ project in
+        let buildTargets = workspaceContext.workspace.projects.flatMap { project in
             project.targets.compactMap {
                 return predicate($0) ? BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) : nil
             }
@@ -52,7 +52,7 @@ extension CoreBasedTests {
         workspaceContext.updateUserPreferences(.defaultForTesting)
 
         // Configure fake user and system info.
-        workspaceContext.updateUserInfo(UserInfo(user: "exampleUser", group: "exampleGroup", uid: 1234, gid:12345, home: Path.root.join("Users/exampleUser"), environment: [:]))
+        workspaceContext.updateUserInfo(UserInfo(user: "exampleUser", group: "exampleGroup", uid: 1234, gid: 12345, home: Path.root.join("Users/exampleUser"), environment: [:]))
         workspaceContext.updateSystemInfo(SystemInfo(operatingSystemVersion: Version(99, 98, 97), productBuildVersion: "99A98", nativeArchitecture: "x86_64"))
 
         let buildRequestContext = BuildRequestContext(workspaceContext: workspaceContext)
diff --git a/Sources/SWBTestSupport/BuildOperationTester.swift b/Sources/SWBTestSupport/BuildOperationTester.swift
index 735bdf07..7ac6444e 100644
--- a/Sources/SWBTestSupport/BuildOperationTester.swift
+++ b/Sources/SWBTestSupport/BuildOperationTester.swift
@@ -59,7 +59,8 @@ extension BuildRequest {
             buildCommand: buildCommand,
             schemeCommand: schemeCommand,
             containerPath: containerPath,
-            jsonRepresentation: jsonRepresentation)
+            jsonRepresentation: jsonRepresentation
+        )
     }
 }
 
@@ -708,20 +709,15 @@ package final class BuildOperationTester {
                 for line in message.split(separator: "\n") {
                     if isInRawTrace {
                         rawTrace.append(String(line))
-                    }
-                    else if line.hasPrefix("Cycle in dependencies between targets") {
+                    } else if line.hasPrefix("Cycle in dependencies between targets") {
                         header = String(line)
-                    }
-                    else if line.hasPrefix("Cycle path") {
+                    } else if line.hasPrefix("Cycle path") {
                         path = String(line)
-                    }
-                    else if line == "Target build order preserved because “Build Order” is set to “Manual Order” in the scheme settings" {
+                    } else if line == "Target build order preserved because “Build Order” is set to “Manual Order” in the scheme settings" {
                         usingManualOrder = true
-                    }
-                    else if line.count > 2, line.hasPrefix("→ ") || line.hasPrefix("○ ") {
+                    } else if line.count > 2, line.hasPrefix("→ ") || line.hasPrefix("○ ") {
                         lines.append(String(line))
-                    }
-                    else if line.hasPrefix("Raw dependency cycle trace") {
+                    } else if line.hasPrefix("Raw dependency cycle trace") {
                         isInRawTrace = true
                     }
                 }
@@ -814,22 +810,26 @@ package final class BuildOperationTester {
 
         /// Check the output of a given task.
         package func checkTaskOutput(_ task: Task, sourceLocation: SourceLocation = #_sourceLocation, body: (ByteString) throws -> Void) rethrows {
-            try body(events.compactMap{ (event: BuildOperationTester.BuildEvent) -> ByteString? in
-                if case .taskHadEvent(task, event: .hadOutput(let output)) = event {
-                    return output
-                }
-                return nil
-            }.reduce(.init(), +))
+            try body(
+                events.compactMap { (event: BuildOperationTester.BuildEvent) -> ByteString? in
+                    if case .taskHadEvent(task, event: .hadOutput(let output)) = event {
+                        return output
+                    }
+                    return nil
+                }.reduce(.init(), +)
+            )
         }
 
         /// Check the output of a given task.
         @_disfavoredOverload package func checkTaskOutput(_ task: Task, sourceLocation: SourceLocation = #_sourceLocation, body: (ByteString) async throws -> Void) async rethrows {
-            try await body(events.compactMap{ (event: BuildOperationTester.BuildEvent) -> ByteString? in
-                if case .taskHadEvent(task, event: .hadOutput(let output)) = event {
-                    return output
-                }
-                return nil
-            }.reduce(.init(), +))
+            try await body(
+                events.compactMap { (event: BuildOperationTester.BuildEvent) -> ByteString? in
+                    if case .taskHadEvent(task, event: .hadOutput(let output)) = event {
+                        return output
+                    }
+                    return nil
+                }.reduce(.init(), +)
+            )
         }
 
         package func checkTaskResult(_ task: Task, expected result: TaskResult, sourceLocation: SourceLocation = #_sourceLocation) {
@@ -943,10 +943,12 @@ package final class BuildOperationTester {
             }
 
             let matchings = matchingTasksWithIdentifier(conditions)
-            guard try matchings.first(where: { identifier, matchingTask in
-                let edge = try dependencyEdge(from: task, to: matchingTask, using: taskDependencies, resolveDynamicTaskRequests: resolveDynamicTaskRequests)
-                return edge != .none
-            }) != nil else {
+            guard
+                try matchings.first(where: { identifier, matchingTask in
+                    let edge = try dependencyEdge(from: task, to: matchingTask, using: taskDependencies, resolveDynamicTaskRequests: resolveDynamicTaskRequests)
+                    return edge != .none
+                }) != nil
+            else {
                 Issue.record("Unable to find a dependency edge from \(task) to any of matching tasks \(matchings.map(\.task)).", sourceLocation: sourceLocation)
                 return
             }
@@ -1179,7 +1181,8 @@ package final class BuildOperationTester {
                 uid: 1234,
                 gid: 12345,
                 home: Path("/Users/exampleUser"),
-                environment: ["PATH": defaultPathEntries.joined(separator: String(Path.pathEnvironmentSeparator))].addingContents(of: ProcessInfo.processInfo.cleanEnvironment.filter(keys: ["__XCODE_BUILT_PRODUCTS_DIR_PATHS", "XCODE_DEVELOPER_DIR_PATH", "DYLD_FRAMEWORK_PATH", "DYLD_LIBRARY_PATH", "TEMP", "VCToolsInstallDir"])))
+                environment: ["PATH": defaultPathEntries.joined(separator: String(Path.pathEnvironmentSeparator))].addingContents(of: ProcessInfo.processInfo.cleanEnvironment.filter(keys: ["__XCODE_BUILT_PRODUCTS_DIR_PATHS", "XCODE_DEVELOPER_DIR_PATH", "DYLD_FRAMEWORK_PATH", "DYLD_LIBRARY_PATH", "TEMP", "VCToolsInstallDir"]))
+            )
         }
     }
 
@@ -1414,12 +1417,12 @@ package final class BuildOperationTester {
     }
 
     /// Construct the tasks for the given build parameters, and test the result.
-    @discardableResult package func checkBuild<T>(_ name: String? = nil, parameters: BuildParameters? = nil, runDestination: SWBProtocol.RunDestinationInfo?, buildRequest inputBuildRequest: BuildRequest? = nil, buildCommand: BuildCommand? = nil, schemeCommand: SchemeCommand? = .launch, persistent: Bool = false, serial: Bool = false, buildOutputMap: [String:String]? = nil, signableTargets: Set<String> = [], signableTargetInputs: [String: ProvisioningTaskInputs] = [:], clientDelegate: (any ClientDelegate)? = nil, sourceLocation: SourceLocation = #_sourceLocation, body: (BuildResults) async throws -> T) async throws -> T {
+    @discardableResult package func checkBuild<T>(_ name: String? = nil, parameters: BuildParameters? = nil, runDestination: SWBProtocol.RunDestinationInfo?, buildRequest inputBuildRequest: BuildRequest? = nil, buildCommand: BuildCommand? = nil, schemeCommand: SchemeCommand? = .launch, persistent: Bool = false, serial: Bool = false, buildOutputMap: [String: String]? = nil, signableTargets: Set<String> = [], signableTargetInputs: [String: ProvisioningTaskInputs] = [:], clientDelegate: (any ClientDelegate)? = nil, sourceLocation: SourceLocation = #_sourceLocation, body: (BuildResults) async throws -> T) async throws -> T {
         try await checkBuild(name, parameters: parameters, runDestination: runDestination, buildRequest: inputBuildRequest, buildCommand: buildCommand, schemeCommand: schemeCommand, persistent: persistent, serial: serial, buildOutputMap: buildOutputMap, signableTargets: signableTargets, signableTargetInputs: signableTargetInputs, clientDelegate: clientDelegate, sourceLocation: sourceLocation, body: body, performBuild: { try await $0.buildWithTimeout() })
     }
 
     /// Construct the tasks for the given build parameters, and test the result.
-    @discardableResult package func checkBuild<T>(_ name: String? = nil, parameters: BuildParameters? = nil, runDestination: RunDestinationInfo?, buildRequest inputBuildRequest: BuildRequest? = nil, operationBuildRequest: BuildRequest? = nil, buildCommand: BuildCommand? = nil, schemeCommand: SchemeCommand? = .launch, persistent: Bool = false, serial: Bool = false, buildOutputMap: [String:String]? = nil, signableTargets: Set<String> = [], signableTargetInputs: [String: ProvisioningTaskInputs] = [:], clientDelegate: (any ClientDelegate)? = nil, sourceLocation: SourceLocation = #_sourceLocation, body: (BuildResults) async throws -> T, performBuild: @escaping (any BuildSystemOperation) async throws -> Void) async throws -> T {
+    @discardableResult package func checkBuild<T>(_ name: String? = nil, parameters: BuildParameters? = nil, runDestination: RunDestinationInfo?, buildRequest inputBuildRequest: BuildRequest? = nil, operationBuildRequest: BuildRequest? = nil, buildCommand: BuildCommand? = nil, schemeCommand: SchemeCommand? = .launch, persistent: Bool = false, serial: Bool = false, buildOutputMap: [String: String]? = nil, signableTargets: Set<String> = [], signableTargetInputs: [String: ProvisioningTaskInputs] = [:], clientDelegate: (any ClientDelegate)? = nil, sourceLocation: SourceLocation = #_sourceLocation, body: (BuildResults) async throws -> T, performBuild: @escaping (any BuildSystemOperation) async throws -> Void) async throws -> T {
         try await checkBuildDescription(parameters, runDestination: runDestination, buildRequest: inputBuildRequest, buildCommand: buildCommand, schemeCommand: schemeCommand, persistent: persistent, serial: serial, signableTargets: signableTargets, signableTargetInputs: signableTargetInputs, clientDelegate: clientDelegate) { results throws in
             // Check that there are no duplicate task identifiers - it is a fatal error if there are, unless `continueBuildingAfterErrors` is set.
             var tasksByTaskIdentifier: [TaskIdentifier: Task] = [:]
@@ -1476,18 +1479,18 @@ package final class BuildOperationTester {
             // Check the results.
             let results = try BuildResults(core: core, workspace: workspace, buildDescriptionResults: results, tasksByTaskIdentifier: delegate.tasksByTaskIdentifier.merging(delegate.dynamicTasksByTaskIdentifier, uniquingKeysWith: { a, b in a }), fs: fs, events: events, dynamicTaskDependencies: dynamicDependencies, buildDatabasePath: persistent ? results.buildDescription.buildDatabasePath : nil)
 
-            /*@MainActor func addAttachments() {
-                // TODO: This `runActivity` call should be wider in scope, but this would significantly complicate the code flow due to threading requirements without having async/await.
-                XCTContext.runActivity(named: "Execute Build Operation" + (name.map({ " \"\($0)\"" }) ?? "")) { activity in
-                    // TODO: <rdar://59432231> Longer term, we should find a way to share code with CoreQualificationTester, which has a number of APIs for emitting build operation debug info.
-                    activity.attach(name: "Build Transcript", string: results.buildTranscript)
-                    if localFS.exists(results.buildDescription.packagePath) {
-                        activity.attach(name: "Build Description", from: results.buildDescription.packagePath)
-                    }
-                }
-            }
+            // @MainActor func addAttachments() {
+            //     // TODO: This `runActivity` call should be wider in scope, but this would significantly complicate the code flow due to threading requirements without having async/await.
+            //     XCTContext.runActivity(named: "Execute Build Operation" + (name.map({ " \"\($0)\"" }) ?? "")) { activity in
+            //         // TODO: <rdar://59432231> Longer term, we should find a way to share code with CoreQualificationTester, which has a number of APIs for emitting build operation debug info.
+            //         activity.attach(name: "Build Transcript", string: results.buildTranscript)
+            //         if localFS.exists(results.buildDescription.packagePath) {
+            //             activity.attach(name: "Build Description", from: results.buildDescription.packagePath)
+            //         }
+            //     }
+            // }
 
-            await addAttachments()*/
+            // await addAttachments()
 
             defer {
                 let validationResults = results.validate(sourceLocation: sourceLocation)
@@ -1671,13 +1674,13 @@ package final class BuildOperationTester {
 }
 
 @available(*, unavailable)
-extension BuildOperationTester: Sendable { }
+extension BuildOperationTester: Sendable {}
 
 @available(*, unavailable)
-extension BuildOperationTester.BuildResults: Sendable { }
+extension BuildOperationTester.BuildResults: Sendable {}
 
 @available(*, unavailable)
-extension BuildOperationTester.BuildDescriptionResults: Sendable { }
+extension BuildOperationTester.BuildDescriptionResults: Sendable {}
 
 package final class MockTestClientDelegate: ClientDelegate, Sendable {
     package init() {}
@@ -1696,7 +1699,7 @@ private extension Task {
 }
 
 private final class BuildOperationTesterDelegate: BuildOperationDelegate {
-    var aggregatedCounters: [BuildOperationMetrics.Counter : Int] = [:]
+    var aggregatedCounters: [BuildOperationMetrics.Counter: Int] = [:]
     var aggregatedTaskCounters: [String: [BuildOperationMetrics.TaskCounter: Int]] = [:]
 
     typealias DiagnosticKind = BuildOperationTester.DiagnosticKind
@@ -1760,15 +1763,20 @@ private final class BuildOperationTesterDelegate: BuildOperationDelegate {
         let diagnosticContext: DiagnosticContextData = .init(target: nil)
 
         func diagnosticsEngine(for target: ConfiguredTarget?) -> DiagnosticProducingDelegateProtocolPrivate<DiagnosticsEngine> {
-            .init(_diagnosticsEngines.withLock({ diagnosticsEngines in
-                diagnosticsEngines.getOrInsert(target, {
-                    let engine = DiagnosticsEngine()
-                    engine.addHandler { [weak self] diag in
-                        self?.log(target, diag)
-                    }
-                    return engine
+            .init(
+                _diagnosticsEngines.withLock({ diagnosticsEngines in
+                    diagnosticsEngines.getOrInsert(
+                        target,
+                        {
+                            let engine = DiagnosticsEngine()
+                            engine.addHandler { [weak self] diag in
+                                self?.log(target, diag)
+                            }
+                            return engine
+                        }
+                    )
                 })
-            }))
+            )
         }
 
         private func log(_ target: ConfiguredTarget?, _ diagnostic: Diagnostic) {
@@ -1791,9 +1799,8 @@ private final class BuildOperationTesterDelegate: BuildOperationDelegate {
             self.taskCounters[counter, default: 0] += amount
         }
 
-        var counters: [BuildOperationMetrics.Counter : Int] = [.clangCacheHits: 0, .clangCacheMisses: 0, .swiftCacheHits: 0, .swiftCacheMisses: 0]
-        var taskCounters: [BuildOperationMetrics.TaskCounter : Int] = [:]
-
+        var counters: [BuildOperationMetrics.Counter: Int] = [.clangCacheHits: 0, .clangCacheMisses: 0, .swiftCacheHits: 0, .swiftCacheMisses: 0]
+        var taskCounters: [BuildOperationMetrics.TaskCounter: Int] = [:]
 
         let startTime = Date()
         private let _diagnosticsEngine = DiagnosticsEngine()
@@ -1930,7 +1937,7 @@ private final class BuildOperationTesterDelegate: BuildOperationDelegate {
 
     // MARK: BuildOperationDelegate Implementation
 
-    func reportPathMap(_ operation: BuildOperation, copiedPathMap: [String : String], generatedFilesPathMap: [String : String]) {
+    func reportPathMap(_ operation: BuildOperation, copiedPathMap: [String: String], generatedFilesPathMap: [String: String]) {
         queue.async {
             self.events.append(.buildReportedPathMap(copiedPathMap: copiedPathMap, generatedFilesPathMap: generatedFilesPathMap))
         }
@@ -2069,7 +2076,7 @@ private final class BuildOperationTesterDelegate: BuildOperationDelegate {
         (delegate as? TesterTaskOutputDelegate)?.handleTaskCompletion()
         self.aggregatedCounters.merge(delegate.counters) { (a, b) in a + b }
         if !delegate.taskCounters.isEmpty {
-            self.aggregatedTaskCounters[task.ruleInfo[0], default: [:]].merge(delegate.taskCounters) { (a, b) in a+b }
+            self.aggregatedTaskCounters[task.ruleInfo[0], default: [:]].merge(delegate.taskCounters) { (a, b) in a + b }
         }
         queue.async {
             self.tasksByTaskIdentifier[taskIdentifier] = task
diff --git a/Sources/SWBTestSupport/CoreBasedTests.swift b/Sources/SWBTestSupport/CoreBasedTests.swift
index 67255a67..74e31ead 100644
--- a/Sources/SWBTestSupport/CoreBasedTests.swift
+++ b/Sources/SWBTestSupport/CoreBasedTests.swift
@@ -40,9 +40,11 @@ extension CoreBasedTests {
         let core: Result<Core, any Error>
         do {
             let path = try await simulatedInferiorProductsPath()
-            core = try await .success(testingCoreRegistry.value(forKey: path) {
-                try await Self.makeCore(simulatedInferiorProductsPath: path)
-            })
+            core = try await .success(
+                testingCoreRegistry.value(forKey: path) {
+                    try await Self.makeCore(simulatedInferiorProductsPath: path)
+                }
+            )
         } catch {
             core = .failure(error)
         }
@@ -242,9 +244,12 @@ extension CoreBasedTests {
         get async throws {
             let (core, defaultToolchain) = try await coreAndToolchain()
             let fallbacklibtool = Path("/usr/bin/libtool")
-            return try #require(defaultToolchain.executableSearchPaths.findExecutable(operatingSystem: core.hostOperatingSystem, basename: "libtool")
-                                ?? defaultToolchain.executableSearchPaths.findExecutable(operatingSystem: core.hostOperatingSystem, basename: "llvm-ar")
-                                ?? (localFS.exists(fallbacklibtool) ? fallbacklibtool : nil), "couldn't find libtool in default toolchain")
+            return try #require(
+                defaultToolchain.executableSearchPaths.findExecutable(operatingSystem: core.hostOperatingSystem, basename: "libtool")
+                    ?? defaultToolchain.executableSearchPaths.findExecutable(operatingSystem: core.hostOperatingSystem, basename: "llvm-ar")
+                    ?? (localFS.exists(fallbacklibtool) ? fallbacklibtool : nil),
+                "couldn't find libtool in default toolchain"
+            )
         }
     }
 
@@ -260,13 +265,13 @@ extension CoreBasedTests {
     package var supportsSDKImports: Bool {
         get async throws {
             #if os(macOS)
-            let (core, defaultToolchain) = try await coreAndToolchain()
-            let toolPath = try #require(defaultToolchain.executableSearchPaths.findExecutable(operatingSystem: core.hostOperatingSystem, basename: "ld"), "couldn't find ld in default toolchain")
-            let mockProducer = try await MockCommandProducer(core: getCore(), productTypeIdentifier: "com.apple.product-type.framework", platform: nil, useStandardExecutableSearchPaths: true, toolchain: nil, fs: PseudoFS())
-            let toolsInfo = await SWBCore.discoveredLinkerToolsInfo(mockProducer, AlwaysDeferredCoreClientDelegate(), at: toolPath)
-            return (try? toolsInfo?.toolVersion >= .init("1164")) == true
+                let (core, defaultToolchain) = try await coreAndToolchain()
+                let toolPath = try #require(defaultToolchain.executableSearchPaths.findExecutable(operatingSystem: core.hostOperatingSystem, basename: "ld"), "couldn't find ld in default toolchain")
+                let mockProducer = try await MockCommandProducer(core: getCore(), productTypeIdentifier: "com.apple.product-type.framework", platform: nil, useStandardExecutableSearchPaths: true, toolchain: nil, fs: PseudoFS())
+                let toolsInfo = await SWBCore.discoveredLinkerToolsInfo(mockProducer, AlwaysDeferredCoreClientDelegate(), at: toolPath)
+                return (try? toolsInfo?.toolVersion >= .init("1164")) == true
             #else
-            return false
+                return false
             #endif
         }
     }
@@ -316,7 +321,7 @@ extension CoreBasedTests {
     }
     package func linkPath(_ targetArchitecture: String) async throws -> Path? {
         let (core, defaultToolchain) = try await self.coreAndToolchain()
-        let prefixMapping =  ["aarch64" : "arm64", "arm64ec" : "arm64", "armv7" : "arm", "x86_64": "x64", "i686": "x86"]
+        let prefixMapping = ["aarch64": "arm64", "arm64ec": "arm64", "armv7": "arm", "x86_64": "x64", "i686": "x86"]
 
         guard let prefix = prefixMapping[targetArchitecture] else {
             return nil
@@ -371,7 +376,7 @@ private final class AlwaysDeferredCoreClientDelegate: CoreClientDelegate, CoreCl
         _diagnosticsEngine.hasErrors
     }
 
-    func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+    func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
         .deferred
     }
 }
diff --git a/Sources/SWBTestSupport/CoreTestSupport.swift b/Sources/SWBTestSupport/CoreTestSupport.swift
index 28576f3a..5ade34fc 100644
--- a/Sources/SWBTestSupport/CoreTestSupport.swift
+++ b/Sources/SWBTestSupport/CoreTestSupport.swift
@@ -18,13 +18,13 @@ import SWBTaskExecution
 import SWBServiceCore
 
 #if USE_STATIC_PLUGIN_INITIALIZATION
-private import SWBAndroidPlatform
-private import SWBApplePlatform
-private import SWBGenericUnixPlatform
-private import SWBQNXPlatform
-private import SWBUniversalPlatform
-private import SWBWebAssemblyPlatform
-private import SWBWindowsPlatform
+    private import SWBAndroidPlatform
+    private import SWBApplePlatform
+    private import SWBGenericUnixPlatform
+    private import SWBQNXPlatform
+    private import SWBUniversalPlatform
+    private import SWBWebAssemblyPlatform
+    private import SWBWindowsPlatform
 #endif
 
 /// Testing endpoints
@@ -47,7 +47,7 @@ extension Core {
     /// Get an initialized Core suitable for testing.
     ///
     /// This function requires there to be no errors during loading the core.
-    package static func createInitializedTestingCore(skipLoadingPluginsNamed: Set<String>, registerExtraPlugins: @PluginExtensionSystemActor (MutablePluginManager) -> Void, simulatedInferiorProductsPath: Path? = nil, environment: [String:String] = [:], delegate: TestingCoreDelegate? = nil, configurationDelegate: TestingCoreConfigurationDelegate? = nil) async throws -> Core {
+    package static func createInitializedTestingCore(skipLoadingPluginsNamed: Set<String>, registerExtraPlugins: @PluginExtensionSystemActor (MutablePluginManager) -> Void, simulatedInferiorProductsPath: Path? = nil, environment: [String: String] = [:], delegate: TestingCoreDelegate? = nil, configurationDelegate: TestingCoreConfigurationDelegate? = nil) async throws -> Core {
         // When this code is being loaded directly via unit tests, find the running Xcode path.
         //
         // This is a "well known" launch parameter set in Xcode's schemes.
@@ -145,17 +145,17 @@ extension Core {
             // This MUST be a compile-time check because the module dependencies on the plugins are conditional.
             // Minimize the amount of code that is conditionally compiled to avoid breaking the build during refactoring.
             #if USE_STATIC_PLUGIN_INITIALIZATION
-            staticPluginInitializers = [
-                "Android": SWBAndroidPlatform.initializePlugin,
-                "Apple": SWBApplePlatform.initializePlugin,
-                "GenericUnix": SWBGenericUnixPlatform.initializePlugin,
-                "QNX": SWBQNXPlatform.initializePlugin,
-                "Universal": SWBUniversalPlatform.initializePlugin,
-                "WebAssembly": SWBWebAssemblyPlatform.initializePlugin,
-                "Windows": SWBWindowsPlatform.initializePlugin,
-            ]
+                staticPluginInitializers = [
+                    "Android": SWBAndroidPlatform.initializePlugin,
+                    "Apple": SWBApplePlatform.initializePlugin,
+                    "GenericUnix": SWBGenericUnixPlatform.initializePlugin,
+                    "QNX": SWBQNXPlatform.initializePlugin,
+                    "Universal": SWBUniversalPlatform.initializePlugin,
+                    "WebAssembly": SWBWebAssemblyPlatform.initializePlugin,
+                    "Windows": SWBWindowsPlatform.initializePlugin,
+                ]
             #else
-            staticPluginInitializers = [:]
+                staticPluginInitializers = [:]
             #endif
 
             if useStaticPluginInitialization {
diff --git a/Sources/SWBTestSupport/DeviceFamilyBuildOperationTester.swift b/Sources/SWBTestSupport/DeviceFamilyBuildOperationTester.swift
index f06fe03c..041fc595 100644
--- a/Sources/SWBTestSupport/DeviceFamilyBuildOperationTester.swift
+++ b/Sources/SWBTestSupport/DeviceFamilyBuildOperationTester.swift
@@ -44,7 +44,7 @@ extension CoreBasedTests {
                     path: "",
                     children: [
                         TestFile("Assets.xcassets"),
-                        TestFile("Info.plist")
+                        TestFile("Info.plist"),
                     ]
                 ),
                 buildConfigurations: [
@@ -54,7 +54,7 @@ extension CoreBasedTests {
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "CODE_SIGN_IDENTITY": "",
                             "SDKROOT": "\(destination.sdk)",
-                            "VERSIONING_SYSTEM": "apple-generic"
+                            "VERSIONING_SYSTEM": "apple-generic",
                         ]
                         .merging(sdkVariantSettings, uniquingKeysWith: { (_, new) in new })
                         .merging(deviceFamilySettings, uniquingKeysWith: { (_, new) in new })
@@ -68,7 +68,7 @@ extension CoreBasedTests {
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
-                                    "INFOPLIST_FILE": "$(SRCROOT)/Info.plist",
+                                    "INFOPLIST_FILE": "$(SRCROOT)/Info.plist"
                                 ]
                             )
                         ],
@@ -82,10 +82,13 @@ extension CoreBasedTests {
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
             let SRCROOT = tmpDirPath
 
-            try await tester.fs.writePlist(SRCROOT.join("Info.plist"), .plDict([
-                "CFBundleDevelopmentRegion": .plString("en"),
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)")
-            ]))
+            try await tester.fs.writePlist(
+                SRCROOT.join("Info.plist"),
+                .plDict([
+                    "CFBundleDevelopmentRegion": .plString("en"),
+                    "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                ])
+            )
 
             try await tester.fs.writeAssetCatalog(SRCROOT.join("Assets.xcassets"), .root, .appIcon("AppIcon"))
 
diff --git a/Sources/SWBTestSupport/DiagnosticsEngine.swift b/Sources/SWBTestSupport/DiagnosticsEngine.swift
index af0d93c6..8e72f874 100644
--- a/Sources/SWBTestSupport/DiagnosticsEngine.swift
+++ b/Sources/SWBTestSupport/DiagnosticsEngine.swift
@@ -70,7 +70,7 @@ final package class DiagnosticsEngineResult {
 }
 
 @available(*, unavailable)
-extension DiagnosticsEngineResult: Sendable { }
+extension DiagnosticsEngineResult: Sendable {}
 
 package enum StringCheck: ExpressibleByStringLiteral, Sendable {
     case equal(String)
diff --git a/Sources/SWBTestSupport/FSUtilities.swift b/Sources/SWBTestSupport/FSUtilities.swift
index 75c193c9..e5fd1c3b 100644
--- a/Sources/SWBTestSupport/FSUtilities.swift
+++ b/Sources/SWBTestSupport/FSUtilities.swift
@@ -11,15 +11,15 @@
 //===----------------------------------------------------------------------===//
 
 #if canImport(Darwin)
-import CoreGraphics
-import ImageIO
-import UniformTypeIdentifiers
+    import CoreGraphics
+    import ImageIO
+    import UniformTypeIdentifiers
 #endif
 
 package import Foundation
 
 #if canImport(FoundationXML)
-import FoundationXML
+    import FoundationXML
 #endif
 
 package import SWBUtil
@@ -49,44 +49,43 @@ package extension FSProxy {
         assert(path.fileExtension == "xcdatamodel")
 
         #if os(macOS) || targetEnvironment(macCatalyst) || !canImport(Darwin)
-        let model = XMLElement(name: "model")
-        model.setAttributesWith([
-            "type": "com.apple.IDECoreDataModeler.DataModel",
-            "documentVersion": "1.0",
-            "minimumToolsVersion": "Automatic",
-            "sourceLanguage": {
-                switch language {
-                case .objectiveC:
-                    return "Objective-C"
-                case .swift:
-                    return "Swift"
+            let model = XMLElement(name: "model")
+            model.setAttributesWith([
+                "type": "com.apple.IDECoreDataModeler.DataModel",
+                "documentVersion": "1.0",
+                "minimumToolsVersion": "Automatic",
+                "sourceLanguage": {
+                    switch language {
+                    case .objectiveC:
+                        return "Objective-C"
+                    case .swift:
+                        return "Swift"
+                    }
+                }(),
+                "userDefinedModelVersionIdentifier": "",
+            ])
+
+            for entity in entities {
+                switch entity {
+                case let .entity(name):
+                    let entityElement = XMLElement(name: "entity")
+                    entityElement.setAttributesWith([
+                        "name": name,
+                        "representedClassName": name,
+                        "syncable": "YES",
+                        "codeGenerationType": "class",
+                    ])
+                    model.addChild(entityElement)
                 }
-            }(),
-            "userDefinedModelVersionIdentifier": ""
-        ])
-
-        for entity in entities {
-            switch entity {
-            case let .entity(name):
-                let entityElement = XMLElement(name: "entity")
-                entityElement.setAttributesWith([
-                    "name": name,
-                    "representedClassName": name,
-                    "syncable": "YES",
-                    "codeGenerationType": "class",
-                ])
-                model.addChild(entityElement)
             }
-        }
 
-        try createDirectory(path, recursive: true)
-        try write(path.join("contents"), contents: ByteString(XMLDocument(rootElement: model).xmlData))
+            try createDirectory(path, recursive: true)
+            try write(path.join("contents"), contents: ByteString(XMLDocument(rootElement: model).xmlData))
         #else
-        throw StubError.error("Not supported on this platform")
+            throw StubError.error("Not supported on this platform")
         #endif
     }
 
-
     func writeCoreDataModelD(_ path: Path, language: CoreDataCodegenLanguage, _ entities: CoreDataEntity...) throws {
         /// Directory hierarchy is `Model.xcdatamodeld/Model.xcdatamodel/contents`
         assert(path.fileExtension == "xcdatamodeld")
@@ -96,18 +95,22 @@ package extension FSProxy {
     func writeDAE(_ path: Path) throws {
         assert(path.fileExtension == "dae" || path.fileExtension == "DAE")
 
-        try write(path, contents: ByteString(
-            """
-            <?xml version="1.0" encoding="UTF-8"?>
-            <COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1">
-                <library_visual_scenes>
-                    <visual_scene id="scene1"/>
-                </library_visual_scenes>
-                <scene>
-                    <instance_visual_scene url="#scene1"/>
-                </scene>
-            </COLLADA>
-            """))
+        try write(
+            path,
+            contents: ByteString(
+                """
+                <?xml version="1.0" encoding="UTF-8"?>
+                <COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1">
+                    <library_visual_scenes>
+                        <visual_scene id="scene1"/>
+                    </library_visual_scenes>
+                    <scene>
+                        <instance_visual_scene url="#scene1"/>
+                    </scene>
+                </COLLADA>
+                """
+            )
+        )
     }
 
     func writeIntentDefinition(_ path: Path) async throws {
@@ -130,10 +133,10 @@ package extension FSProxy {
                             "INIntentParameterCombinationSupportsBackgroundExecution": .plBool(true),
                             "INIntentParameterCombinationTitle": .plString("Test"),
                             "INIntentParameterCombinationTitleID": .plString("cKhBdn"),
-                            "INIntentParameterCombinationUpdatesLinked": .plBool(true)
+                            "INIntentParameterCombinationUpdatesLinked": .plBool(true),
                         ])
                     ]),
-                    "INIntentName" : .plString("Intent"),
+                    "INIntentName": .plString("Intent"),
                     "INIntentParameterCombinations": .plDict([
                         "": .plDict([
                             "INIntentParameterCombinationIsPrimary": .plBool(true),
@@ -146,20 +149,20 @@ package extension FSProxy {
                         "INIntentResponseCodes": .plArray([
                             .plDict([
                                 "INIntentResponseCodeName": .plString("success"),
-                                "INIntentResponseCodeSuccess": .plBool(true)
+                                "INIntentResponseCodeSuccess": .plBool(true),
                             ]),
                             .plDict([
                                 "INIntentResponseCodeName": .plString("failure")
-                            ])
+                            ]),
                         ])
                     ]),
                     "INIntentTitle": .plString("Intent"),
                     "INIntentTitleID": .plString("m2tDjz"),
                     "INIntentType": .plString("Custom"),
-                    "INIntentVerb": .plString("Do")
+                    "INIntentVerb": .plString("Do"),
                 ])
             ]),
-            "INTypes": .plArray([])
+            "INTypes": .plArray([]),
         ])
 
         try await writePlist(path, plist)
@@ -174,7 +177,7 @@ package extension FSProxy {
 
         let infoDict: PropertyListItem = .plDict([
             "version": .plInt(1),
-            "author": .plString("xcode")
+            "author": .plString("xcode"),
         ])
 
         for component in components {
@@ -182,42 +185,55 @@ package extension FSProxy {
             case .root:
                 try await writeJSON(path.join("Contents.json"), ["info": infoDict])
             case .appIcon(let iconName):
-                try await writeJSON(path.join("\(iconName).appiconset/Contents.json"), [
-                    "info": infoDict,
-                    "images": .plArray([])
-                ])
+                try await writeJSON(
+                    path.join("\(iconName).appiconset/Contents.json"),
+                    [
+                        "info": infoDict,
+                        "images": .plArray([]),
+                    ]
+                )
             case .imageSet(let imageSetName, let images):
-                try await writeJSON(path.join("\(imageSetName).imageset/Contents.json"), [
-                    "info": infoDict,
-                    "images": .plArray(images.map { image in
-                        return .plDict([
-                            "filename": .plString(image.filename),
-                            "idiom": .plString(image.idiom.rawValue),
-                            "scale": .plString("\(image.scale)x")
-                        ])
-                    }),
-                ])
+                try await writeJSON(
+                    path.join("\(imageSetName).imageset/Contents.json"),
+                    [
+                        "info": infoDict,
+                        "images": .plArray(
+                            images.map { image in
+                                return .plDict([
+                                    "filename": .plString(image.filename),
+                                    "idiom": .plString(image.idiom.rawValue),
+                                    "scale": .plString("\(image.scale)x"),
+                                ])
+                            }
+                        ),
+                    ]
+                )
             case .colorSet(let colorSetName, let colors):
-                try await writeJSON(path.join("\(colorSetName).colorset/Contents.json"), [
-                    "info": infoDict,
-                    "colors": .plArray(colors.map { color in
-                        switch color {
-                        case .sRGB(let red, let green, let blue, let alpha, let idiom):
-                            return .plDict([
-                                "idiom": .plString(idiom.rawValue),
-                                "color": .plDict([
-                                    "color-space": .plString("srgb"),
-                                    "components": .plDict([
-                                        "red": .plDouble(red),
-                                        "green": .plDouble(green),
-                                        "blue": .plDouble(blue),
-                                        "alpha": .plDouble(alpha)
+                try await writeJSON(
+                    path.join("\(colorSetName).colorset/Contents.json"),
+                    [
+                        "info": infoDict,
+                        "colors": .plArray(
+                            colors.map { color in
+                                switch color {
+                                case .sRGB(let red, let green, let blue, let alpha, let idiom):
+                                    return .plDict([
+                                        "idiom": .plString(idiom.rawValue),
+                                        "color": .plDict([
+                                            "color-space": .plString("srgb"),
+                                            "components": .plDict([
+                                                "red": .plDouble(red),
+                                                "green": .plDouble(green),
+                                                "blue": .plDouble(blue),
+                                                "alpha": .plDouble(alpha),
+                                            ]),
+                                        ]),
                                     ])
-                                ])
-                            ])
-                        }
-                    })
-                ])
+                                }
+                            }
+                        ),
+                    ]
+                )
             }
         }
     }
@@ -228,57 +244,57 @@ package extension FSProxy {
             switch storyboardRuntime {
             case .iOS:
                 contents <<< """
-                <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-                <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13142" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-                <dependencies>
-                <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
-                </dependencies>
-                <scenes/>
-                </document>
-                """
+                    <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+                    <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13142" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+                    <dependencies>
+                    <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
+                    </dependencies>
+                    <scenes/>
+                    </document>
+                    """
             case .watchKit:
                 assert(path.basename == "Interface.storyboard")
                 contents <<< """
-                <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-                <document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="AgC-eL-Hgc">
-                <dependencies>
-                <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
-                <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="11055"/>
-                </dependencies>
-                <scenes>
-                <!--Interface Controller-->
-                <scene sceneID="aou-V4-d1y">
-                <objects>
-                <controller id="AgC-eL-Hgc" customClass="InterfaceController" customModuleProvider="target"/>
-                </objects>
-                <point key="canvasLocation" x="220" y="345"/>
-                </scene>
-                <!--Static Notification Interface Controller-->
-                <scene sceneID="AEw-b0-oYE">
-                <objects>
-                <notificationController id="YCC-NB-fut">
-                <items>
-                <label alignment="left" text="Alert Label" id="IdU-wH-bcW"/>
-                </items>
-                <notificationCategory key="notificationCategory" identifier="myCategory" id="JfB-70-Muf"/>
-                <connections>
-                <outlet property="notificationAlertLabel" destination="IdU-wH-bcW" id="JKC-fr-R95"/>
-                <segue destination="4sK-HA-Art" kind="relationship" relationship="dynamicNotificationInterface" id="kXh-Jw-8B1"/>
-                </connections>
-                </notificationController>
-                </objects>
-                <point key="canvasLocation" x="220" y="643"/>
-                </scene>
-                <!--Notification Controller-->
-                <scene sceneID="ZPc-GJ-vnh">
-                <objects>
-                <controller id="4sK-HA-Art" customClass="NotificationController" customModuleProvider="target"/>
-                </objects>
-                <point key="canvasLocation" x="468" y="643"/>
-                </scene>
-                </scenes>
-                </document>
-                """
+                    <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+                    <document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="AgC-eL-Hgc">
+                    <dependencies>
+                    <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
+                    <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="11055"/>
+                    </dependencies>
+                    <scenes>
+                    <!--Interface Controller-->
+                    <scene sceneID="aou-V4-d1y">
+                    <objects>
+                    <controller id="AgC-eL-Hgc" customClass="InterfaceController" customModuleProvider="target"/>
+                    </objects>
+                    <point key="canvasLocation" x="220" y="345"/>
+                    </scene>
+                    <!--Static Notification Interface Controller-->
+                    <scene sceneID="AEw-b0-oYE">
+                    <objects>
+                    <notificationController id="YCC-NB-fut">
+                    <items>
+                    <label alignment="left" text="Alert Label" id="IdU-wH-bcW"/>
+                    </items>
+                    <notificationCategory key="notificationCategory" identifier="myCategory" id="JfB-70-Muf"/>
+                    <connections>
+                    <outlet property="notificationAlertLabel" destination="IdU-wH-bcW" id="JKC-fr-R95"/>
+                    <segue destination="4sK-HA-Art" kind="relationship" relationship="dynamicNotificationInterface" id="kXh-Jw-8B1"/>
+                    </connections>
+                    </notificationController>
+                    </objects>
+                    <point key="canvasLocation" x="220" y="643"/>
+                    </scene>
+                    <!--Notification Controller-->
+                    <scene sceneID="ZPc-GJ-vnh">
+                    <objects>
+                    <controller id="4sK-HA-Art" customClass="NotificationController" customModuleProvider="target"/>
+                    </objects>
+                    <point key="canvasLocation" x="468" y="643"/>
+                    </scene>
+                    </scenes>
+                    </document>
+                    """
             }
         }
     }
@@ -313,13 +329,14 @@ package extension FSProxy {
 
         try await writePlist(resources.join("Info.plist"), [:])
         try await writeFileContents(binary.join(path.basenameWithoutSuffix)) { stream in
-            try await stream <<< withTemporaryDirectory { dir in
-                if `static` {
-                    return try await localFS.read(InstalledXcode.currentlySelected().compileStaticLibrary(path: dir, platform: platform, infoLookup: infoLookup, archs: archs, alwaysLipo: alwaysLipo))
-                } else {
-                    return try await localFS.read(InstalledXcode.currentlySelected().compileDynamicLibrary(path: dir, platform: platform, infoLookup: infoLookup, archs: archs, alwaysLipo: alwaysLipo))
+            try await stream
+                <<< withTemporaryDirectory { dir in
+                    if `static` {
+                        return try await localFS.read(InstalledXcode.currentlySelected().compileStaticLibrary(path: dir, platform: platform, infoLookup: infoLookup, archs: archs, alwaysLipo: alwaysLipo))
+                    } else {
+                        return try await localFS.read(InstalledXcode.currentlySelected().compileDynamicLibrary(path: dir, platform: platform, infoLookup: infoLookup, archs: archs, alwaysLipo: alwaysLipo))
+                    }
                 }
-            }
         }
         try await body(contents, binary, headers, resources)
 
@@ -352,9 +369,10 @@ package extension FSProxy {
         try await writeFileContents(contents.join("_CodeSignature/CodeSignature")) { $0 <<< "signature" }
         try await writePlist(contents.join("Info.plist"), [:])
         try await writeFileContents(binary.join(path.basenameWithoutSuffix)) { stream in
-            try await stream <<< withTemporaryDirectory { dir in
-                try await localFS.read(InstalledXcode.currentlySelected().compileExecutable(path: dir, platform: platform, infoLookup: infoLookup, archs: archs, alwaysLipo: alwaysLipo))
-            }
+            try await stream
+                <<< withTemporaryDirectory { dir in
+                    try await localFS.read(InstalledXcode.currentlySelected().compileExecutable(path: dir, platform: platform, infoLookup: infoLookup, archs: archs, alwaysLipo: alwaysLipo))
+                }
         }
         try await writeFileContents(contents.join("PkgInfo")) { $0 <<< "APPL????" }
         try await writePlist(contents.join("version.plist"), [:])
@@ -363,30 +381,30 @@ package extension FSProxy {
 
     func writeImage(_ path: Path, width: Int, height: Int) throws {
         #if canImport(Darwin)
-        let bitsPerComponent = 8
-        let bitsPerPixel = 32
-        let bytes = [UInt8](repeating: 0 /* black */, count: width * height * (bitsPerPixel / bitsPerComponent))
-        try bytes.withUnsafeBufferPointer { pointer in
-            guard let data = CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, pointer.baseAddress, pointer.count, kCFAllocatorNull) else {
-                throw CGImageError.initializationFailed
-            }
-            guard let space = CGColorSpace(name: CGColorSpace.sRGB) else {
-                throw CGImageError.initializationFailed
-            }
-            guard let provider = CGDataProvider(data: data) else {
-                throw CGImageError.initializationFailed
-            }
-            guard let image = CGImage(width: width, height: height, bitsPerComponent: bitsPerComponent, bitsPerPixel: bitsPerPixel, bytesPerRow: bytes.count / height, space: space, bitmapInfo: CGBitmapInfo(rawValue: CGImageAlphaInfo.first.rawValue).union(.byteOrder32Big), provider: provider, decode: nil, shouldInterpolate: false, intent: CGColorRenderingIntent.defaultIntent) else {
-                throw CGImageError.initializationFailed
-            }
-            guard let destination = CGImageDestinationCreateWithURL(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, path.str as CFString, CFURLPathStyle.cfurlposixPathStyle, false), UTType.png.identifier as CFString, 1, nil) else {
-                throw CGImageError.initializationFailed
+            let bitsPerComponent = 8
+            let bitsPerPixel = 32
+            let bytes = [UInt8](repeating: 0 /* black */, count: width * height * (bitsPerPixel / bitsPerComponent))
+            try bytes.withUnsafeBufferPointer { pointer in
+                guard let data = CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, pointer.baseAddress, pointer.count, kCFAllocatorNull) else {
+                    throw CGImageError.initializationFailed
+                }
+                guard let space = CGColorSpace(name: CGColorSpace.sRGB) else {
+                    throw CGImageError.initializationFailed
+                }
+                guard let provider = CGDataProvider(data: data) else {
+                    throw CGImageError.initializationFailed
+                }
+                guard let image = CGImage(width: width, height: height, bitsPerComponent: bitsPerComponent, bitsPerPixel: bitsPerPixel, bytesPerRow: bytes.count / height, space: space, bitmapInfo: CGBitmapInfo(rawValue: CGImageAlphaInfo.first.rawValue).union(.byteOrder32Big), provider: provider, decode: nil, shouldInterpolate: false, intent: CGColorRenderingIntent.defaultIntent) else {
+                    throw CGImageError.initializationFailed
+                }
+                guard let destination = CGImageDestinationCreateWithURL(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, path.str as CFString, CFURLPathStyle.cfurlposixPathStyle, false), UTType.png.identifier as CFString, 1, nil) else {
+                    throw CGImageError.initializationFailed
+                }
+                CGImageDestinationAddImage(destination, image, nil)
+                CGImageDestinationFinalize(destination)
             }
-            CGImageDestinationAddImage(destination, image, nil)
-            CGImageDestinationFinalize(destination)
-        }
         #else
-        throw StubError.error("Not supported on this platform")
+            throw StubError.error("Not supported on this platform")
         #endif
     }
 
diff --git a/Sources/SWBTestSupport/IndexingInfoResults.swift b/Sources/SWBTestSupport/IndexingInfoResults.swift
index 8ce7bb7d..c1c02479 100644
--- a/Sources/SWBTestSupport/IndexingInfoResults.swift
+++ b/Sources/SWBTestSupport/IndexingInfoResults.swift
@@ -81,7 +81,7 @@ package final class IndexingInfoResults {
 }
 
 @available(*, unavailable)
-extension IndexingInfoResults: Sendable { }
+extension IndexingInfoResults: Sendable {}
 
 package final class IndexingInfo: Hashable, CustomStringConvertible {
     private enum KnownKeys: String, CaseIterable {
@@ -182,7 +182,7 @@ package final class IndexingInfo: Hashable, CustomStringConvertible {
 }
 
 @available(*, unavailable)
-extension IndexingInfo: Sendable { }
+extension IndexingInfo: Sendable {}
 
 extension IndexingInfo {
     package func checkSourceFilePath(_ path: Path, sourceLocation: SourceLocation = #_sourceLocation) {
@@ -220,7 +220,6 @@ extension IndexingInfo {
     }
 }
 
-
 extension IndexingInfo {
     package var clang: any CommandLineCheckable {
         return consumeCheckableCommandLineKey(.clangASTCommandArguments)
diff --git a/Sources/SWBTestSupport/KnownIssueTestSupport.swift b/Sources/SWBTestSupport/KnownIssueTestSupport.swift
index 6d93b10d..8addfca1 100644
--- a/Sources/SWBTestSupport/KnownIssueTestSupport.swift
+++ b/Sources/SWBTestSupport/KnownIssueTestSupport.swift
@@ -11,49 +11,49 @@
 //===----------------------------------------------------------------------===//
 
 #if compiler(<6.1)
-public import Testing
+    public import Testing
 
-extension Trait where Self == Testing.ConditionTrait {
-    public static func flaky(_ comment: Comment, sourceLocation: SourceLocation = #_sourceLocation) -> Self {
-        disabled("Custom execution traits are not supported in this build")
-    }
+    extension Trait where Self == Testing.ConditionTrait {
+        public static func flaky(_ comment: Comment, sourceLocation: SourceLocation = #_sourceLocation) -> Self {
+            disabled("Custom execution traits are not supported in this build")
+        }
 
-    public static func knownIssue(_ comment: Comment, sourceLocation: SourceLocation = #_sourceLocation) -> Self {
-        disabled("Custom execution traits are not supported in this build")
+        public static func knownIssue(_ comment: Comment, sourceLocation: SourceLocation = #_sourceLocation) -> Self {
+            disabled("Custom execution traits are not supported in this build")
+        }
     }
-}
 #else
-package import Testing
+    package import Testing
 
-package struct KnownIssueTestTrait: TestTrait & SuiteTrait & TestScoping {
-    let comment: Comment
-    let isIntermittent: Bool
-    let sourceLocation: SourceLocation
+    package struct KnownIssueTestTrait: TestTrait & SuiteTrait & TestScoping {
+        let comment: Comment
+        let isIntermittent: Bool
+        let sourceLocation: SourceLocation
 
-    package var isRecursive: Bool {
-        true
-    }
+        package var isRecursive: Bool {
+            true
+        }
 
-    package func provideScope(for test: Testing.Test, testCase: Testing.Test.Case?, performing function: @Sendable () async throws -> Void) async throws {
-        if testCase == nil || test.isSuite {
-            try await function()
-        } else {
-            await withKnownIssue(comment, isIntermittent: isIntermittent, sourceLocation: sourceLocation) {
+        package func provideScope(for test: Testing.Test, testCase: Testing.Test.Case?, performing function: @Sendable () async throws -> Void) async throws {
+            if testCase == nil || test.isSuite {
                 try await function()
+            } else {
+                await withKnownIssue(comment, isIntermittent: isIntermittent, sourceLocation: sourceLocation) {
+                    try await function()
+                }
             }
         }
     }
-}
 
-extension Trait where Self == KnownIssueTestTrait {
-    /// Causes a test to be marked as a (nondeterministic) expected failure if it throws any error or records any issue.
-    package static func flaky(_ comment: Comment, sourceLocation: SourceLocation = #_sourceLocation) -> Self {
-        Self(comment: comment, isIntermittent: true, sourceLocation: sourceLocation)
-    }
+    extension Trait where Self == KnownIssueTestTrait {
+        /// Causes a test to be marked as a (nondeterministic) expected failure if it throws any error or records any issue.
+        package static func flaky(_ comment: Comment, sourceLocation: SourceLocation = #_sourceLocation) -> Self {
+            Self(comment: comment, isIntermittent: true, sourceLocation: sourceLocation)
+        }
 
-    /// Causes a test to be marked as a (deterministic) expected failure by requiring it to throw an error or record an issue.
-    package static func knownIssue(_ comment: Comment, sourceLocation: SourceLocation = #_sourceLocation) -> Self {
-        Self(comment: comment, isIntermittent: false, sourceLocation: sourceLocation)
+        /// Causes a test to be marked as a (deterministic) expected failure by requiring it to throw an error or record an issue.
+        package static func knownIssue(_ comment: Comment, sourceLocation: SourceLocation = #_sourceLocation) -> Self {
+            Self(comment: comment, isIntermittent: false, sourceLocation: sourceLocation)
+        }
     }
-}
 #endif
diff --git a/Sources/SWBTestSupport/LibraryGeneration.swift b/Sources/SWBTestSupport/LibraryGeneration.swift
index 1a238077..3a693a8f 100644
--- a/Sources/SWBTestSupport/LibraryGeneration.swift
+++ b/Sources/SWBTestSupport/LibraryGeneration.swift
@@ -64,7 +64,7 @@ extension InstalledXcode {
         let linkerArgs = linkerOptions.map({ $0.args }).reduce([], +)
         if buildLibraryForDistribution {
             distributionArgs = ["-enable-library-evolution"]
-            _ = try await xcrun(["-sdk", platform.sdkName, "swiftc", "-target", target] + targetVariantArgs + distributionArgs as [String] + ["-emit-module-interface", "-emit-module-interface-path", swiftModuleDir.join("\(name).swiftinterface").str, "-c",  sourcePath.str], workingDirectory: workingDirectory)
+            _ = try await xcrun(["-sdk", platform.sdkName, "swiftc", "-target", target] + targetVariantArgs + distributionArgs as [String] + ["-emit-module-interface", "-emit-module-interface-path", swiftModuleDir.join("\(name).swiftinterface").str, "-c", sourcePath.str], workingDirectory: workingDirectory)
         } else {
             distributionArgs = []
         }
@@ -147,8 +147,7 @@ extension InstalledXcode {
                 let macho = try await compileSwiftFile(name: name, platform: platform, infoLookup: infoLookup, platformVariant: platformVariant, arch: arch, sourcePath: sourcePath, buildDir: buildDir, swiftModuleDir: swiftModuleDir, buildLibraryForDistribution: buildLibraryForDistribution, static: `static`, linkerOptions: linkerOptions, workingDirectory: basePath, fs: fs, object: object, needSigned: needSigned)
                 machos.append(macho)
             }
-        }
-        else {
+        } else {
             let sourcePath = srcDir.join("source.c")
             let sourceContents = sourceContents ?? "int favorite() { return 0; }\n"
             try fs.write(sourcePath, contents: ByteString(encodingAsUTF8: sourceContents))
@@ -232,10 +231,12 @@ extension InstalledXcode {
         }
 
         let machoPath = basePath.join(baseName)
-        _ = try await xcrun(["-sdk", platform.sdkName, "lipo"]
-                        .appending(contentsOf: hideARM64 ? ["-hideARM64"] : [])
-                        .appending(contentsOf: ["-create"] + machos)
-                        .appending(contentsOf: ["-output", machoPath.str]))
+        _ = try await xcrun(
+            ["-sdk", platform.sdkName, "lipo"]
+                .appending(contentsOf: hideARM64 ? ["-hideARM64"] : [])
+                .appending(contentsOf: ["-create"] + machos)
+                .appending(contentsOf: ["-output", machoPath.str])
+        )
 
         return machoPath
     }
@@ -263,8 +264,7 @@ extension InstalledXcode {
                 let macho = try await compileSwiftFile(name: baseName, platform: platform, infoLookup: infoLookup, platformVariant: platformVariant, arch: arch, sourcePath: sourcePath, buildDir: buildDir, swiftModuleDir: swiftModuleDir, buildLibraryForDistribution: buildLibraryForDistribution, static: false, linkerOptions: linkerOptions, workingDirectory: basePath, fs: fs, object: false, needSigned: false)
                 machos.append(macho.str)
             }
-        }
-        else {
+        } else {
             let sourcePath = srcDir.join("source.c")
             let sourceContents = sourceContents ?? "int favorite() { return 0; }\n"
             try fs.write(sourcePath, contents: ByteString(encodingAsUTF8: sourceContents))
@@ -321,8 +321,7 @@ extension InstalledXcode {
 
         if useSwift {
             fatalError("generated Swift static libraries is not currently supported")
-        }
-        else {
+        } else {
             // Write out a basic header.
             let headersDir = buildDir.join("include")
             try fs.createDirectory(headersDir, recursive: true)
diff --git a/Sources/SWBTestSupport/MachO.swift b/Sources/SWBTestSupport/MachO.swift
index fd002541..fa765ec4 100644
--- a/Sources/SWBTestSupport/MachO.swift
+++ b/Sources/SWBTestSupport/MachO.swift
@@ -15,9 +15,9 @@ package import SWBUtil
 extension MachO.Slice {
     package func targetTripleStrings(infoLookup: any PlatformInfoLookup) throws -> [String] {
         #if canImport(Darwin)
-        return try buildVersions().map { $0.targetTripleString(arch: self.arch, infoLookup: infoLookup) }
+            return try buildVersions().map { $0.targetTripleString(arch: self.arch, infoLookup: infoLookup) }
         #else
-        throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
+            throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
         #endif
     }
 }
@@ -57,7 +57,7 @@ extension BuildVersion.Platform {
             return "driverkit"
         default:
             guard let llvmTargetTripleSys = infoLookup.lookupPlatformInfo(platform: self)?.llvmTargetTripleSys else {
-                  fatalError("external Mach-O based platform \(self) must provide a llvmTargetTripleSys value")
+                fatalError("external Mach-O based platform \(self) must provide a llvmTargetTripleSys value")
             }
             return llvmTargetTripleSys
         }
diff --git a/Sources/SWBTestSupport/Misc.swift b/Sources/SWBTestSupport/Misc.swift
index 9e77ad92..fdf058dd 100644
--- a/Sources/SWBTestSupport/Misc.swift
+++ b/Sources/SWBTestSupport/Misc.swift
@@ -20,7 +20,7 @@ package import SWBProtocol
 package import Testing
 
 #if os(Windows)
-import WinSDK
+    import WinSDK
 #endif
 
 package extension Sequence where Element: Equatable {
@@ -182,16 +182,16 @@ package func XCTAssertEqualPropertyListItems(_ expression1: @autoclosure () thro
 extension ProcessInfo {
     package var isRunningInVirtualMachine: Bool {
         #if canImport(Darwin)
-        let machdep_cpu_features = "machdep.cpu.features"
-        var len: Int = 0
-        if sysctlbyname(machdep_cpu_features, nil, &len, nil, 0) == 0 {
-            var p = [CChar](repeating: 0, count: len)
-            if sysctlbyname(machdep_cpu_features, &p, &len, nil, 0) == 0 {
-                if let features = p.withUnsafeBufferPointer({ $0.baseAddress.map({ String(cString: $0) }) })?.split(separator: " ") {
-                    return features.contains("VMM")
+            let machdep_cpu_features = "machdep.cpu.features"
+            var len: Int = 0
+            if sysctlbyname(machdep_cpu_features, nil, &len, nil, 0) == 0 {
+                var p = [CChar](repeating: 0, count: len)
+                if sysctlbyname(machdep_cpu_features, &p, &len, nil, 0) == 0 {
+                    if let features = p.withUnsafeBufferPointer({ $0.baseAddress.map({ String(cString: $0) }) })?.split(separator: " ") {
+                        return features.contains("VMM")
+                    }
                 }
             }
-        }
         #endif
         return false
     }
@@ -199,19 +199,19 @@ extension ProcessInfo {
     // Get memory usage of current process in bytes
     package var memoryUsage: UInt64 {
         #if canImport(Darwin)
-        var info = task_vm_info_data_t()
-        var count = mach_msg_type_number_t(MemoryLayout<task_vm_info>.size) / 4
-        let result: kern_return_t = withUnsafeMutablePointer(to: &info) {
-            $0.withMemoryRebound(to: integer_t.self, capacity: 1) {
-                task_info(mach_task_self_, task_flavor_t(TASK_VM_INFO), $0, &count)
+            var info = task_vm_info_data_t()
+            var count = mach_msg_type_number_t(MemoryLayout<task_vm_info>.size) / 4
+            let result: kern_return_t = withUnsafeMutablePointer(to: &info) {
+                $0.withMemoryRebound(to: integer_t.self, capacity: 1) {
+                    task_info(mach_task_self_, task_flavor_t(TASK_VM_INFO), $0, &count)
+                }
             }
-        }
-        if result == KERN_SUCCESS {
-            return info.phys_footprint // memory in bytes
-        }
-        return 0
+            if result == KERN_SUCCESS {
+                return info.phys_footprint  // memory in bytes
+            }
+            return 0
         #else
-        return 0 // for non-macOS platforms
+            return 0  // for non-macOS platforms
         #endif
     }
 }
@@ -257,7 +257,7 @@ extension ArenaInfo {
 
     package static func indexBuildArena(derivedDataRoot path: Path) -> ArenaInfo {
         let buildRoot = path.join("Build")
-        let indexBuildRoot =  path.join("Index.noindex/Build")
+        let indexBuildRoot = path.join("Index.noindex/Build")
         return ArenaInfo(
             derivedDataPath: path,
             buildProductsPath: indexBuildRoot.join("Products"),
diff --git a/Sources/SWBTestSupport/PerfTestSupport.swift b/Sources/SWBTestSupport/PerfTestSupport.swift
index f05532ad..b2a875ce 100644
--- a/Sources/SWBTestSupport/PerfTestSupport.swift
+++ b/Sources/SWBTestSupport/PerfTestSupport.swift
@@ -26,12 +26,14 @@ extension PerfTests {
             var timings: [Duration] = []
             for _ in 0..<iterationCount {
                 for _ in 0..<subiterations {
-                    try await timings.append(SuspendingClock.suspending.measure {
-                        try await body()
-                    })
+                    try await timings.append(
+                        SuspendingClock.suspending.measure {
+                            try await body()
+                        }
+                    )
                 }
             }
-            return timings.reduce(Duration.seconds(0), { $0 + ($1 / Double(timings.count)) }) // average
+            return timings.reduce(Duration.seconds(0), { $0 + ($1 / Double(timings.count)) })  // average
         }
         _ = time
     }
@@ -41,9 +43,9 @@ extension Trait where Self == Testing.ConditionTrait {
     package static var performance: Self {
         enabled("Skipping performance test") {
             #if DEBUG
-            return getEnvironmentVariable("SWB_PERF_TESTS_ENABLE")?.boolValue ?? false
+                return getEnvironmentVariable("SWB_PERF_TESTS_ENABLE")?.boolValue ?? false
             #else
-            return true
+                return true
             #endif
         }
     }
diff --git a/Sources/SWBTestSupport/PlatformFilter.swift b/Sources/SWBTestSupport/PlatformFilter.swift
index b38bbc64..7435a399 100644
--- a/Sources/SWBTestSupport/PlatformFilter.swift
+++ b/Sources/SWBTestSupport/PlatformFilter.swift
@@ -32,18 +32,21 @@ extension CoreBasedTests {
         }
 
         //try await XCTContext.runActivity(named: "Destination \(runDestination.platformFilterString) with filters \(platformFilters)") { _ in
-            let swiftCompilerPath = try await self.swiftCompilerPath
-            let testProject = TestProject(
-                "aProject",
-                groupTree: TestGroup(
-                    "SomeFiles",
-                    children: [
-                        TestFile("AppSource.m"),
-                        TestFile("AppFilteredSource.m"),
-                        TestFile("FwkSource.m"),
-                    ]),
-                buildConfigurations: [
-                    TestBuildConfiguration( "Debug", buildSettings: [
+        let swiftCompilerPath = try await self.swiftCompilerPath
+        let testProject = TestProject(
+            "aProject",
+            groupTree: TestGroup(
+                "SomeFiles",
+                children: [
+                    TestFile("AppSource.m"),
+                    TestFile("AppFilteredSource.m"),
+                    TestFile("FwkSource.m"),
+                ]
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
                         "CODE_SIGNING_ALLOWED": "NO",
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
@@ -51,52 +54,59 @@ extension CoreBasedTests {
                         "SDK_VARIANT": runDestination.sdkVariant ?? "",
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": "5.0",
+                    ]
+                )
+            ],
+            targets: [
+                TestStandardTarget(
+                    "AppTarget",
+                    type: targetType,
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            "AppSource.m",
+                            TestBuildFile("AppFilteredSource.m", platformFilters: platformFilters),
+                        ]),
+                        TestFrameworksBuildPhase([
+                            TestBuildFile(.target("FwkTarget"), platformFilters: platformFilters),
+                            TestBuildFile(.target("PackageProduct::PkgTarget"), platformFilters: platformFilters),
                         ]),
-                ],
-                targets: [
-                    TestStandardTarget(
-                        "AppTarget",
-                        type: targetType,
-                        buildPhases: [
-                            TestSourcesBuildPhase([
-                                "AppSource.m",
-                                TestBuildFile("AppFilteredSource.m", platformFilters: platformFilters),
-                            ]),
-                            TestFrameworksBuildPhase([
-                                TestBuildFile(.target("FwkTarget"), platformFilters: platformFilters),
-                                TestBuildFile(.target("PackageProduct::PkgTarget"), platformFilters: platformFilters)
-                            ]),
-                        ],
-                        dependencies: [
-                            TestTargetDependency("FwkTarget", platformFilters: platformFilters),
-                            TestTargetDependency("PackageProduct::PkgTarget", platformFilters: platformFilters)
-                        ]
-                    ),
-                    TestStandardTarget(
-                        "FwkTarget",
-                        type: .framework,
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
+                    ],
+                    dependencies: [
+                        TestTargetDependency("FwkTarget", platformFilters: platformFilters),
+                        TestTargetDependency("PackageProduct::PkgTarget", platformFilters: platformFilters),
+                    ]
+                ),
+                TestStandardTarget(
+                    "FwkTarget",
+                    type: .framework,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
                                 "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)"
-                                ]),
-                        ],
-                        buildPhases: [
-                            TestSourcesBuildPhase([
-                                "FwkSource.m",
-                                ]),
-                        ]
-                    ),
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            "FwkSource.m"
+                        ])
+                    ]
+                ),
+            ]
+        )
+        let testPackage = TestPackageProject(
+            "Package",
+            groupTree: TestGroup(
+                "SomeFiles",
+                children: [
+                    TestFile("PkgSource.swift")
                 ]
-            )
-            let testPackage = TestPackageProject(
-                "Package",
-                groupTree: TestGroup(
-                    "SomeFiles",
-                    children: [
-                        TestFile("PkgSource.swift"),
-                    ]),
-                buildConfigurations: [
-                    TestBuildConfiguration( "Debug", buildSettings: [
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
                         "CODE_SIGNING_ALLOWED": "NO",
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
@@ -104,73 +114,75 @@ extension CoreBasedTests {
                         "SDK_VARIANT": runDestination.sdkVariant ?? "",
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": "5.0",
-                        ]),
-                ],
-                targets: [
-                    TestPackageProductTarget(
-                        "PackageProduct::PkgTarget",
-                        frameworksBuildPhase: TestFrameworksBuildPhase([
-                            TestBuildFile(.target("PkgTarget"))
-                        ]),
-                        dependencies: ["PkgTarget"]
-                    ),
-                    TestStandardTarget(
-                        "PkgTarget", type: .objectFile,
-                        buildPhases: [
-                            TestSourcesBuildPhase(["PkgSource.swift"])
-                        ]
-                    ),
-                ]
-            )
-            let testWorkspace = TestWorkspace("Test", projects: [testProject, testPackage])
-
-            let filtersString = platformFilters.sorted().map { $0.platform + ($0.environment.nilIfEmpty.map { "-\($0)"} ?? "") }.joined(separator: ", ") // Just for test logging.
+                    ]
+                )
+            ],
+            targets: [
+                TestPackageProductTarget(
+                    "PackageProduct::PkgTarget",
+                    frameworksBuildPhase: TestFrameworksBuildPhase([
+                        TestBuildFile(.target("PkgTarget"))
+                    ]),
+                    dependencies: ["PkgTarget"]
+                ),
+                TestStandardTarget(
+                    "PkgTarget",
+                    type: .objectFile,
+                    buildPhases: [
+                        TestSourcesBuildPhase(["PkgSource.swift"])
+                    ]
+                ),
+            ]
+        )
+        let testWorkspace = TestWorkspace("Test", projects: [testProject, testPackage])
+
+        let filtersString = platformFilters.sorted().map { $0.platform + ($0.environment.nilIfEmpty.map { "-\($0)" } ?? "") }.joined(separator: ", ")  // Just for test logging.
+
+        try await TaskConstructionTester(core, testWorkspace).checkBuild(BuildParameters(configuration: "Debug"), runDestination: runDestination, userPreferences: UserPreferences.defaultForTesting.with(enableDebugActivityLogs: true)) { results in
+            results.consumeTasksMatchingRuleTypes(["CreateBuildDirectory", "CreateUniversalBinary", "Gate", "GenerateDSYMFile", "Ld", "MkDir", "ProcessInfoPlistFile", "RegisterExecutionPolicyException", "RegisterWithLaunchServices", "SymLink", "Touch", "WriteAuxiliaryFile", "Validate"])
+
+            // We should always build this
+            results.checkTasks(.matchRuleType("CompileC"), .matchRuleItemBasename("AppSource.m")) { tasks in
+                #expect(tasks.count != 0)
+            }
 
-            try await TaskConstructionTester(core, testWorkspace).checkBuild(BuildParameters(configuration: "Debug"), runDestination: runDestination, userPreferences: UserPreferences.defaultForTesting.with(enableDebugActivityLogs: true)) { results in
-                results.consumeTasksMatchingRuleTypes(["CreateBuildDirectory", "CreateUniversalBinary", "Gate", "GenerateDSYMFile", "Ld", "MkDir", "ProcessInfoPlistFile", "RegisterExecutionPolicyException", "RegisterWithLaunchServices", "SymLink", "Touch", "WriteAuxiliaryFile", "Validate"])
+            // This build file should potentially be filtered out
+            if expectFiltered {
+                results.checkNoTask(.matchRuleType("CompileC"), .matchRuleItemBasename("AppFilteredSource.m"))
+                results.checkNoTask(.matchRuleType("CompileSwiftSources"))
 
-                // We should always build this
-                results.checkTasks(.matchRuleType("CompileC"), .matchRuleItemBasename("AppSource.m")) { tasks in
-                    #expect(tasks.count != 0)
+                results.checkNote("Skipping '/tmp/Test/aProject/AppFilteredSource.m' because its platform filter (\(filtersString)) does not match the platform filter of the current context (\(runDestination.platformFilterString)). (in target 'AppTarget' from project 'aProject')")
+            } else {
+                results.checkTasks(.matchRuleType("CompileC"), .matchRuleItemBasename("AppFilteredSource.m")) { tasks in
+                    #expect(tasks.count != 0, "Expected at least one task for conditionalized Objective-C source file, but the source file was incorrectly filtered out")
                 }
-
-                // This build file should potentially be filtered out
-                if expectFiltered {
-                    results.checkNoTask(.matchRuleType("CompileC"), .matchRuleItemBasename("AppFilteredSource.m"))
-                    results.checkNoTask(.matchRuleType("CompileSwiftSources"))
-
-                    results.checkNote("Skipping '/tmp/Test/aProject/AppFilteredSource.m' because its platform filter (\(filtersString)) does not match the platform filter of the current context (\(runDestination.platformFilterString)). (in target 'AppTarget' from project 'aProject')")
-                } else {
-                    results.checkTasks(.matchRuleType("CompileC"), .matchRuleItemBasename("AppFilteredSource.m")) { tasks in
-                        #expect(tasks.count != 0, "Expected at least one task for conditionalized Objective-C source file, but the source file was incorrectly filtered out")
-                    }
-                    results.checkTasks(.matchRuleType("SwiftDriver Compilation")) { tasks in
-                        #expect(tasks.count != 0, "Expected at least one task for conditionalized Swift source file, but the source file was incorrectly filtered out")
-                    }
+                results.checkTasks(.matchRuleType("SwiftDriver Compilation")) { tasks in
+                    #expect(tasks.count != 0, "Expected at least one task for conditionalized Swift source file, but the source file was incorrectly filtered out")
                 }
+            }
 
-                // This target dependency should potentially be filtered out
-                if expectFiltered {
-                    results.checkNoTask(.matchTargetName("FwkTarget"))
-                    results.checkNoTask(.matchTargetName("PkgTarget"))
-
-                    results.checkNote("Skipping '/tmp/Test/aProject/build/Debug\(runDestination.builtProductsDirSuffix)/FwkTarget.framework' because its platform filter (\(filtersString)) does not match the platform filter of the current context (\(runDestination.platformFilterString)). (in target 'AppTarget' from project 'aProject')")
-
-                    results.checkNote("Skipping '/tmp/Test/Package/build/Debug\(runDestination.builtProductsDirSuffix)/PackageProduct::PkgTarget' because its platform filter (\(filtersString)) does not match the platform filter of the current context (\(runDestination.platformFilterString)). (in target 'AppTarget' from project 'aProject')")
-                } else {
-                    results.checkTasks(.matchTargetName("FwkTarget")) { tasks in
-                        #expect(tasks.count != 0, "Expected at least one task for dependent framework target, but the dependent target was incorrectly filtered out")
-                    }
-                    results.checkTasks(.matchTargetName("PkgTarget")) { tasks in
-                        #expect(tasks.count != 0, "Expected at least one task for dependent package target, but the dependent target was incorrectly filtered out")
-                    }
-                }
+            // This target dependency should potentially be filtered out
+            if expectFiltered {
+                results.checkNoTask(.matchTargetName("FwkTarget"))
+                results.checkNoTask(.matchTargetName("PkgTarget"))
 
-                results.checkNoTask(sourceLocation: sourceLocation)
+                results.checkNote("Skipping '/tmp/Test/aProject/build/Debug\(runDestination.builtProductsDirSuffix)/FwkTarget.framework' because its platform filter (\(filtersString)) does not match the platform filter of the current context (\(runDestination.platformFilterString)). (in target 'AppTarget' from project 'aProject')")
 
-                // There shouldn't be any other diagnostics.
-                results.checkNoDiagnostics()
+                results.checkNote("Skipping '/tmp/Test/Package/build/Debug\(runDestination.builtProductsDirSuffix)/PackageProduct::PkgTarget' because its platform filter (\(filtersString)) does not match the platform filter of the current context (\(runDestination.platformFilterString)). (in target 'AppTarget' from project 'aProject')")
+            } else {
+                results.checkTasks(.matchTargetName("FwkTarget")) { tasks in
+                    #expect(tasks.count != 0, "Expected at least one task for dependent framework target, but the dependent target was incorrectly filtered out")
+                }
+                results.checkTasks(.matchTargetName("PkgTarget")) { tasks in
+                    #expect(tasks.count != 0, "Expected at least one task for dependent package target, but the dependent target was incorrectly filtered out")
+                }
             }
+
+            results.checkNoTask(sourceLocation: sourceLocation)
+
+            // There shouldn't be any other diagnostics.
+            results.checkNoDiagnostics()
+        }
         //}
     }
 }
diff --git a/Sources/SWBTestSupport/Projects/AppClips.swift b/Sources/SWBTestSupport/Projects/AppClips.swift
index 46c235b3..1de535bb 100644
--- a/Sources/SWBTestSupport/Projects/AppClips.swift
+++ b/Sources/SWBTestSupport/Projects/AppClips.swift
@@ -29,26 +29,31 @@ extension TestProject {
             "aProject",
             sourceRoot: sourceRoot,
             groupTree: TestGroup(
-                "Sources", children: [
+                "Sources",
+                children: [
                     TestFile("Source.c"),
                     TestFile("Assets.xcassets"),
                     TestFile("Bar.app", sourceTree: .buildSetting("BUILT_PRODUCTS_DIR")),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ASSETCATALOG_EXEC": "$(DEVELOPER_DIR)/usr/bin/actool",
-                    "ALWAYS_SEARCH_USER_PATHS": "NO",
-                    "ASSETCATALOG_COMPILER_APPICON_NAME": "Foo",
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "COPY_PHASE_STRIP": "NO",
-                    "CURRENT_PROJECT_VERSION": "1",
-                    "ENABLE_ON_DEMAND_RESOURCES": "NO",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "INFOPLIST_FILE": "Info.plist",
-                    "MARKETING_VERSION": "1.0",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SDKROOT": "iphoneos",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ASSETCATALOG_EXEC": "$(DEVELOPER_DIR)/usr/bin/actool",
+                        "ALWAYS_SEARCH_USER_PATHS": "NO",
+                        "ASSETCATALOG_COMPILER_APPICON_NAME": "Foo",
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "COPY_PHASE_STRIP": "NO",
+                        "CURRENT_PROJECT_VERSION": "1",
+                        "ENABLE_ON_DEMAND_RESOURCES": "NO",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "INFOPLIST_FILE": "Info.plist",
+                        "MARKETING_VERSION": "1.0",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SDKROOT": "iphoneos",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -63,23 +68,29 @@ extension TestProject {
                         TestCopyFilesBuildPhase([TestBuildFile(.target("BarClip"), platformFilters: appClipPlatformFilters)], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(CONTENTS_FOLDER_PATH)/AppClips", onlyForDeployment: false),
                     ],
                     dependencies: [TestTargetDependency("BarClip", platformFilters: appClipPlatformFilters)],
-                    provisioningSourceData: [.init(configurationName: "Debug", provisioningStyle: .automatic, bundleIdentifierFromInfoPlist: "com.foo.app")]),
+                    provisioningSourceData: [.init(configurationName: "Debug", provisioningStyle: .automatic, bundleIdentifierFromInfoPlist: "com.foo.app")]
+                ),
                 TestStandardTarget(
                     "BarClip",
                     type: .appClip,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "CODE_SIGN_ENTITLEMENTS": "ClipEntitlements.entitlements",
-                            "PRODUCT_BUNDLE_IDENTIFIER": "com.foo.app.clip",
-                            "SUPPORTS_MACCATALYST": appClipSupportsMacCatalyst ? "YES" : "NO",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "CODE_SIGN_ENTITLEMENTS": "ClipEntitlements.entitlements",
+                                "PRODUCT_BUNDLE_IDENTIFIER": "com.foo.app.clip",
+                                "SUPPORTS_MACCATALYST": appClipSupportsMacCatalyst ? "YES" : "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["Source.c"]),
                         TestResourcesBuildPhase(["Assets.xcassets"]),
                     ],
-                    provisioningSourceData: [.init(configurationName: "Debug", provisioningStyle: .automatic, bundleIdentifierFromInfoPlist: "com.foo.app.clip")]),
-            ])
+                    provisioningSourceData: [.init(configurationName: "Debug", provisioningStyle: .automatic, bundleIdentifierFromInfoPlist: "com.foo.app.clip")]
+                ),
+            ]
+        )
 
         if let fs {
             let SRCROOT = sourceRoot.str
@@ -88,12 +99,15 @@ extension TestProject {
             try fs.write(Path(SRCROOT).join("Source.c"), contents: "int main() { return 0; }")
             try await fs.writePlist(Path(SRCROOT).join("Entitlements.entitlements"), .plDict([:]))
             try await fs.writePlist(Path(SRCROOT).join("ClipEntitlements.entitlements"), .plDict(["com.apple.developer.parent-application-identifiers": .plArray([.plString("com.foo.app")])]))
-            try await fs.writePlist(Path(SRCROOT).join("Info.plist"), .plDict([
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
-                "CFBundleName": .plString("$(PRODUCT_NAME)"),
-                "CFBundleVersion": .plString("$(CURRENT_PROJECT_VERSION)"),
-                "LSApplicationCategory": .plString("Business"),
-            ]))
+            try await fs.writePlist(
+                Path(SRCROOT).join("Info.plist"),
+                .plDict([
+                    "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                    "CFBundleName": .plString("$(PRODUCT_NAME)"),
+                    "CFBundleVersion": .plString("$(CURRENT_PROJECT_VERSION)"),
+                    "LSApplicationCategory": .plString("Business"),
+                ])
+            )
             try await fs.writeAssetCatalog(Path(SRCROOT).join("Assets.xcassets"), .root, .appIcon("Foo"))
         }
 
diff --git a/Sources/SWBTestSupport/RandomTestWorkspaces.swift b/Sources/SWBTestSupport/RandomTestWorkspaces.swift
index e2673961..b5f3f536 100644
--- a/Sources/SWBTestSupport/RandomTestWorkspaces.swift
+++ b/Sources/SWBTestSupport/RandomTestWorkspaces.swift
@@ -44,7 +44,7 @@ private struct RandomNumberGenerator: Swift.RandomNumberGenerator {
         // Pick a uniform N less than the sum.
         let sum = weights.reduce(0, +)
         var n = uniform(lessThan: sum)
-        for (i,value) in weights.enumerated() {
+        for (i, value) in weights.enumerated() {
             if n < value {
                 return i
             }
@@ -56,7 +56,7 @@ private struct RandomNumberGenerator: Swift.RandomNumberGenerator {
     /// Split an input into N random pieces.
     mutating func split<T>(into n: Int, piecesOf input: [T]) -> [[T]] {
         // FIXME: This is not efficient.
-        var results = (0 ..< n).map{ _ in [T]() }
+        var results = (0..<n).map { _ in [T]() }
         for item in input {
             results[uniform(lessThan: n)].append(item)
         }
@@ -83,35 +83,45 @@ package final class RandomWorkspaceBuilder {
     /// Generate a random workspace with the current parameters.
     package func generate() -> TestWorkspace {
         // Create all of the input files.
-        let files = (0 ..< numFiles).map{ i -> TestFile in
+        let files = (0..<numFiles).map { i -> TestFile in
             // FIXME: Pick a random file extension.
             let ext = "c"
             return TestFile("File-\(i).\(ext)")
         }
 
         // Create the targets, with files randomly divided.
-        let targets = rng.split(into: numTargets, piecesOf: files).enumerated().map{ (entry) -> TestStandardTarget in
+        let targets = rng.split(into: numTargets, piecesOf: files).enumerated().map { (entry) -> TestStandardTarget in
             let (i, files) = entry
             // FIXME: Pick type randomly.
-            return TestStandardTarget("Target-\(i)", type: .staticLibrary, buildPhases: [
+            return TestStandardTarget(
+                "Target-\(i)",
+                type: .staticLibrary,
+                buildPhases: [
                     // FIXME: Pick phases randomly.
-                    TestSourcesBuildPhase(files.map{ TestBuildFile($0.name) })
-                ])
+                    TestSourcesBuildPhase(files.map { TestBuildFile($0.name) })
+                ]
+            )
         }
 
         // FIXME: Create the random projects.
         assert(numProjects == 1, "FIXME: Unsupported")
-        let project = TestProject("Project-0",
+        let project = TestProject(
+            "Project-0",
             groupTree: TestGroup("Sources", children: files),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)"]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
-            targets: targets)
+            targets: targets
+        )
 
         return TestWorkspace("Random", sourceRoot: project.sourceRoot, projects: [project])
     }
 }
 
 @available(*, unavailable)
-extension RandomWorkspaceBuilder: Sendable { }
+extension RandomWorkspaceBuilder: Sendable {}
diff --git a/Sources/SWBTestSupport/RunDestinationTestSupport.swift b/Sources/SWBTestSupport/RunDestinationTestSupport.swift
index fa29f90c..8ae3aa68 100644
--- a/Sources/SWBTestSupport/RunDestinationTestSupport.swift
+++ b/Sources/SWBTestSupport/RunDestinationTestSupport.swift
@@ -119,16 +119,16 @@ extension _RunDestinationInfo {
     /// A run destination targeting macOS, using the public SDK.
     package static var macOS: Self {
         #if os(macOS)
-        switch Architecture.host.stringValue {
-        case "arm64":
-            return macOSAppleSilicon
-        case "x86_64":
-            return macOSIntel
-        default:
-            preconditionFailure("Unknown architecture \(Architecture.host.stringValue ?? "<nil>")")
-        }
+            switch Architecture.host.stringValue {
+            case "arm64":
+                return macOSAppleSilicon
+            case "x86_64":
+                return macOSIntel
+            default:
+                preconditionFailure("Unknown architecture \(Architecture.host.stringValue ?? "<nil>")")
+            }
         #else
-        return macOSIntel
+            return macOSIntel
         #endif
     }
 
@@ -150,17 +150,17 @@ extension _RunDestinationInfo {
     /// A run destination targeting macOS (Mac Catalyst), using the public SDK.
     package static var macCatalyst: Self {
         #if os(macOS)
-        switch Architecture.host.stringValue {
-        case "arm64":
-            // FIXME: <rdar://78361860> Use results.runDestinationTargetArchitecture in our tests where appropriate so that this works
-            fallthrough // return macCatalystAppleSilicon
-        case "x86_64":
-            return macCatalystIntel
-        default:
-            preconditionFailure("Unknown architecture \(Architecture.host.stringValue ?? "<nil>")")
-        }
+            switch Architecture.host.stringValue {
+            case "arm64":
+                // FIXME: <rdar://78361860> Use results.runDestinationTargetArchitecture in our tests where appropriate so that this works
+                fallthrough  // return macCatalystAppleSilicon
+            case "x86_64":
+                return macCatalystIntel
+            default:
+                preconditionFailure("Unknown architecture \(Architecture.host.stringValue ?? "<nil>")")
+            }
         #else
-        return macCatalystIntel
+            return macCatalystIntel
         #endif
     }
 
@@ -222,17 +222,17 @@ extension _RunDestinationInfo {
     /// A run destination targeting DriverKit, using the public SDK.
     package static var driverKit: Self {
         #if os(macOS)
-        switch Architecture.host.stringValue {
-        case "arm64":
-            // FIXME: <rdar://78361860> Use results.runDestinationTargetArchitecture in our tests where appropriate so that this works
-            fallthrough // return driverKitAppleSilicon
-        case "x86_64":
-            return driverKitIntel
-        default:
-            preconditionFailure("Unknown architecture \(Architecture.host.stringValue ?? "<nil>")")
-        }
+            switch Architecture.host.stringValue {
+            case "arm64":
+                // FIXME: <rdar://78361860> Use results.runDestinationTargetArchitecture in our tests where appropriate so that this works
+                fallthrough  // return driverKitAppleSilicon
+            case "x86_64":
+                return driverKitIntel
+            default:
+                preconditionFailure("Unknown architecture \(Architecture.host.stringValue ?? "<nil>")")
+            }
         #else
-        return driverKitIntel
+            return driverKitIntel
         #endif
     }
 
@@ -248,7 +248,7 @@ extension _RunDestinationInfo {
 
     /// A run destination targeting Windows generic device, using the public SDK.
     package static var windows: Self {
-        guard let arch = Architecture.hostStringValue  else {
+        guard let arch = Architecture.hostStringValue else {
             preconditionFailure("Unknown architecture \(Architecture.host.stringValue ?? "<nil>")")
         }
         return .init(platform: "windows", sdk: "windows", sdkVariant: "windows", targetArchitecture: arch, supportedArchitectures: ["x86_64, aarch64"], disableOnlyActiveArch: false)
@@ -256,7 +256,7 @@ extension _RunDestinationInfo {
 
     /// A run destination targeting Linux generic device, using the public SDK.
     package static var linux: Self {
-        guard let arch = Architecture.hostStringValue  else {
+        guard let arch = Architecture.hostStringValue else {
             preconditionFailure("Unknown architecture \(Architecture.host.stringValue ?? "<nil>")")
         }
         return .init(platform: "linux", sdk: "linux", sdkVariant: "linux", targetArchitecture: arch, supportedArchitectures: ["x86_64", "aarch64"], disableOnlyActiveArch: false)
@@ -264,7 +264,7 @@ extension _RunDestinationInfo {
 
     /// A run destination targeting FreeBSD generic device, using the public SDK.
     package static var freebsd: Self {
-        guard let arch = Architecture.hostStringValue  else {
+        guard let arch = Architecture.hostStringValue else {
             preconditionFailure("Unknown architecture \(Architecture.host.stringValue ?? "<nil>")")
         }
         return .init(platform: "freebsd", sdk: "freebsd", sdkVariant: "freebsd", targetArchitecture: arch, supportedArchitectures: ["x86_64", "aarch64"], disableOnlyActiveArch: false)
@@ -272,7 +272,7 @@ extension _RunDestinationInfo {
 
     /// A run destination targeting OpenBSD generic device, using the public SDK.
     package static var openbsd: Self {
-        guard let arch = Architecture.hostStringValue  else {
+        guard let arch = Architecture.hostStringValue else {
             preconditionFailure("Unknown architecture \(Architecture.host.stringValue ?? "<nil>")")
         }
         return .init(platform: "openbsd", sdk: "openbsd", sdkVariant: "openbsd", targetArchitecture: arch, supportedArchitectures: ["x86_64", "aarch64"], disableOnlyActiveArch: false)
@@ -361,7 +361,7 @@ extension _RunDestinationInfo {
         case "linux":
             return "linux-gnu"
         default:
-            return platform // watchOS, DriverKit
+            return platform  // watchOS, DriverKit
         }
     }
 
diff --git a/Sources/SWBTestSupport/SettingsBasedTests.swift b/Sources/SWBTestSupport/SettingsBasedTests.swift
index 94ec8e2a..c0df1d92 100644
--- a/Sources/SWBTestSupport/SettingsBasedTests.swift
+++ b/Sources/SWBTestSupport/SettingsBasedTests.swift
@@ -32,7 +32,7 @@ extension CoreBasedTests {
         let context = try await WorkspaceContext(core: core.or(await getCore()), workspace: workspace, fs: fs, processExecutionCache: .sharedForTesting)
 
         // Configure fake user and system info.
-        context.updateUserInfo(UserInfo(user: "exampleUser", group: "exampleGroup", uid: 1234, gid:12345, home: Path.root.join("Users").join("exampleUser"), environment: environment))
+        context.updateUserInfo(UserInfo(user: "exampleUser", group: "exampleGroup", uid: 1234, gid: 12345, home: Path.root.join("Users").join("exampleUser"), environment: environment))
         context.updateSystemInfo(systemInfo ?? SystemInfo(operatingSystemVersion: Version(99, 98, 97), productBuildVersion: "99A98", nativeArchitecture: "x86_64"))
 
         return context
diff --git a/Sources/SWBTestSupport/SettingsRunDestinationTestSupport.swift b/Sources/SWBTestSupport/SettingsRunDestinationTestSupport.swift
index dbb90dc7..537f7acc 100644
--- a/Sources/SWBTestSupport/SettingsRunDestinationTestSupport.swift
+++ b/Sources/SWBTestSupport/SettingsRunDestinationTestSupport.swift
@@ -20,7 +20,7 @@ package import SWBMacro
 extension CoreBasedTests {
     package func testActiveRunDestination(_ targetType: TestStandardTarget.TargetType = .application, extraBuildSettings: [String: String] = [:], runDestination: RunDestinationInfo?, activeArchitecture: String? = nil, hostArchitecture: String? = nil, _ check: (WorkspaceContext, Settings, MacroEvaluationScope) throws -> Void, sourceLocation: SourceLocation = #_sourceLocation) async throws {
         var buildSettings = [
-            "ONLY_ACTIVE_ARCH": "YES",
+            "ONLY_ACTIVE_ARCH": "YES"
         ]
         buildSettings.addContents(of: extraBuildSettings)
 
@@ -37,8 +37,15 @@ extension CoreBasedTests {
                             buildConfigurations: [
                                 TestBuildConfiguration(
                                     "Debug",
-                                    buildSettings: buildSettings)],
-                            buildPhases: [TestSourcesBuildPhase(["file.c"])])])]).load(getCore(sourceLocation: sourceLocation))
+                                    buildSettings: buildSettings
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["file.c"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore(sourceLocation: sourceLocation))
 
         let context = try await contextForTestData(testWorkspace, systemInfo: hostArchitecture.map { hostArchitecture in SystemInfo(operatingSystemVersion: Version(99, 98, 97), productBuildVersion: "99A98", nativeArchitecture: hostArchitecture) } ?? nil)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
diff --git a/Sources/SWBTestSupport/SkippedTestSupport.swift b/Sources/SWBTestSupport/SkippedTestSupport.swift
index 48eb9fbf..42ef05b1 100644
--- a/Sources/SWBTestSupport/SkippedTestSupport.swift
+++ b/Sources/SWBTestSupport/SkippedTestSupport.swift
@@ -120,13 +120,16 @@ package final class ConditionTraitContext: CoreBasedTests, Sendable {
 extension Trait where Self == Testing.ConditionTrait {
     /// Skips a test case that requires one or more SDKs if they are not all available.
     package static func requireSDKs(_ knownSDKs: KnownSDK..., comment: Comment? = nil) -> Self {
-        enabled(comment != nil ? "required SDKs are not installed: \(comment?.description ?? "")" : "required SDKs are not installed.", {
-            let sdkRegistry = try await ConditionTraitContext.shared.getCore().sdkRegistry
-            let missingSDKs = await knownSDKs.asyncFilter { knownSDK in
-                sdkRegistry.lookup(knownSDK.sdkName) == nil && sdkRegistry.allSDKs.count(where: { $0.aliases.contains(knownSDK.sdkName) }) == 0
-            }.sorted()
-            return missingSDKs.isEmpty
-        })
+        enabled(
+            comment != nil ? "required SDKs are not installed: \(comment?.description ?? "")" : "required SDKs are not installed.",
+            {
+                let sdkRegistry = try await ConditionTraitContext.shared.getCore().sdkRegistry
+                let missingSDKs = await knownSDKs.asyncFilter { knownSDK in
+                    sdkRegistry.lookup(knownSDK.sdkName) == nil && sdkRegistry.allSDKs.count(where: { $0.aliases.contains(knownSDK.sdkName) }) == 0
+                }.sorted()
+                return missingSDKs.isEmpty
+            }
+        )
     }
 
     /// Constructs a condition trait that causes a test to be disabled if not running on the specified host OS.
@@ -147,9 +150,12 @@ extension Trait where Self == Testing.ConditionTrait {
 
     /// Constructs a condition trait that causes a test to be disabled if the developer directory is pointing at an Xcode developer directory.
     package static var skipXcodeToolchain: Self {
-        disabled("This test is incompatible with Xcode toolchains.", {
-            try await ConditionTraitContext.shared.getCore().developerPath.path.str.contains(".app/Contents/Developer")
-        })
+        disabled(
+            "This test is incompatible with Xcode toolchains.",
+            {
+                try await ConditionTraitContext.shared.getCore().developerPath.path.str.contains(".app/Contents/Developer")
+            }
+        )
     }
 
     /// Constructs a condition trait that causes a test to be disabled if the Foundation process spawning implementation is not thread-safe.
@@ -165,9 +171,9 @@ extension Trait where Self == Testing.ConditionTrait {
 
     package static var skipSwiftPackage: Self {
         #if SWIFT_PACKAGE
-        return disabled("Test is not supported when building Swift Build as a package")
+            return disabled("Test is not supported when building Swift Build as a package")
         #else
-        return enabled(if: true)
+            return enabled(if: true)
         #endif
     }
 
@@ -211,7 +217,7 @@ extension Trait where Self == Testing.ConditionTrait {
             func installCommand(packageManagerPath: Path, packageNames: String) -> String {
                 switch packageManagerPath.basenameWithoutSuffix {
                 case "pkg_info":
-                    return "pkg_add \(packageNames)" // OpenBSD
+                    return "pkg_add \(packageNames)"  // OpenBSD
                 default:
                     return "\(packageManagerPath.basenameWithoutSuffix) install \(packageNames)"
                 }
@@ -273,10 +279,13 @@ extension Trait where Self == Testing.ConditionTrait {
 extension Trait where Self == Testing.ConditionTrait {
     /// Constructs a condition trait that causes a test to be disabled if running against the exact given version of Xcode.
     package static func skipXcodeBuildVersion(_ version: String, sourceLocation: SourceLocation = #_sourceLocation) -> Self {
-        skipXcodeBuildVersions(in: try {
-            let v: ProductBuildVersion = try ProductBuildVersion(version)
-            return v...v
-        }(), sourceLocation: sourceLocation)
+        skipXcodeBuildVersions(
+            in: try {
+                let v: ProductBuildVersion = try ProductBuildVersion(version)
+                return v...v
+            }(),
+            sourceLocation: sourceLocation
+        )
     }
 
     /// Constructs a condition trait that causes a test to be disabled if running against the exact given version of Xcode.
@@ -286,9 +295,13 @@ extension Trait where Self == Testing.ConditionTrait {
 
     /// Constructs a condition trait that causes a test to be disabled if running against a version of Xcode within the given range.
     package static func skipXcodeBuildVersions<R: RangeExpression>(in range: @Sendable @autoclosure @escaping () throws -> R, sourceLocation: SourceLocation = #_sourceLocation) -> Self where R.Bound == ProductBuildVersion {
-        disabled("Xcode version is not suitable", sourceLocation: sourceLocation, {
-            return try await range().contains(InstalledXcode.currentlySelected().productBuildVersion())
-        })
+        disabled(
+            "Xcode version is not suitable",
+            sourceLocation: sourceLocation,
+            {
+                return try await range().contains(InstalledXcode.currentlySelected().productBuildVersion())
+            }
+        )
     }
 
     /// Constructs a condition trait that causes a test to be disabled if not running against at least the given version of Xcode.
@@ -297,12 +310,16 @@ extension Trait where Self == Testing.ConditionTrait {
     }
 
     package static func requireXcode16(sourceLocation: SourceLocation = #_sourceLocation) -> Self {
-        enabled("Xcode version is not suitable", sourceLocation: sourceLocation, {
-            guard let installedVersion =  try? await InstalledXcode.currentlySelected().productBuildVersion() else {
-                return true
+        enabled(
+            "Xcode version is not suitable",
+            sourceLocation: sourceLocation,
+            {
+                guard let installedVersion = try? await InstalledXcode.currentlySelected().productBuildVersion() else {
+                    return true
+                }
+                return installedVersion > (try ProductBuildVersion("16A242d"))
             }
-            return installedVersion > (try ProductBuildVersion("16A242d"))
-        })
+        )
     }
 
     package static func requireXcode26(sourceLocation: SourceLocation = #_sourceLocation) -> Self {
@@ -316,12 +333,16 @@ extension Trait where Self == Testing.ConditionTrait {
 
     /// Constructs a condition trait that causes a test to be disabled if not running against a version of Xcode within the given range.
     package static func requireXcodeBuildVersions<R: RangeExpression>(in range: @Sendable @autoclosure @escaping () throws -> R, sourceLocation: SourceLocation = #_sourceLocation) -> Self where R.Bound == ProductBuildVersion {
-        enabled("Xcode version is not suitable", sourceLocation: sourceLocation, {
-            guard let installedVersion =  try? await InstalledXcode.currentlySelected().productBuildVersion() else {
-                return true
+        enabled(
+            "Xcode version is not suitable",
+            sourceLocation: sourceLocation,
+            {
+                guard let installedVersion = try? await InstalledXcode.currentlySelected().productBuildVersion() else {
+                    return true
+                }
+                return try range().contains(installedVersion)
             }
-            return try range().contains(installedVersion)
-        })
+        )
     }
 
     /// Constructs a condition trait that causes a test to be disabled if not running against a version of Xcode including at least the given version of a particular SDK.
@@ -331,10 +352,14 @@ extension Trait where Self == Testing.ConditionTrait {
 
     /// Constructs a condition trait that causes a test to be disabled if not running against a version of Xcode including at least the given version of a particular SDK.
     package static func requireMinimumSDKBuildVersion(sdkName: String, requiredVersion: @Sendable @autoclosure @escaping () throws -> ProductBuildVersion, sourceLocation: SourceLocation = #_sourceLocation) -> Self {
-        disabled("SDK build version is too old", sourceLocation: sourceLocation, {
-            let sdkVersion = try await InstalledXcode.currentlySelected().productBuildVersion(sdkCanonicalName: sdkName)
-            return try sdkVersion < requiredVersion()
-        })
+        disabled(
+            "SDK build version is too old",
+            sourceLocation: sourceLocation,
+            {
+                let sdkVersion = try await InstalledXcode.currentlySelected().productBuildVersion(sdkCanonicalName: sdkName)
+                return try sdkVersion < requiredVersion()
+            }
+        )
     }
 
     /// Constructs a condition trait that causes a test to be disabled if not running against a version of Xcode including the SDK which is equal to or newer than at least one of the given versions within the same release.
@@ -344,20 +369,24 @@ extension Trait where Self == Testing.ConditionTrait {
 
     /// Constructs a condition trait that causes a test to be disabled if not running against a version of Xcode including the SDK which is equal to or newer than at least one of the given versions within the same release.
     package static func requireMinimumSDKBuildVersion(sdkName: String, requiredVersions: @Sendable @autoclosure @escaping () throws -> [ProductBuildVersion], sourceLocation: SourceLocation = #_sourceLocation) -> Self {
-        disabled("SDK build version is too old", sourceLocation: sourceLocation, {
-            let sdkVersion = try await InstalledXcode.currentlySelected().productBuildVersion(sdkCanonicalName: sdkName)
-
-            // For each required version, check to see if it is from the same release as the SDK version.  If it is, then we will check against it.
-            for requiredVersion in try requiredVersions() {
-                if sdkVersion.major == requiredVersion.major, sdkVersion.train == requiredVersion.train {
-                    return sdkVersion < requiredVersion
+        disabled(
+            "SDK build version is too old",
+            sourceLocation: sourceLocation,
+            {
+                let sdkVersion = try await InstalledXcode.currentlySelected().productBuildVersion(sdkCanonicalName: sdkName)
+
+                // For each required version, check to see if it is from the same release as the SDK version.  If it is, then we will check against it.
+                for requiredVersion in try requiredVersions() {
+                    if sdkVersion.major == requiredVersion.major, sdkVersion.train == requiredVersion.train {
+                        return sdkVersion < requiredVersion
+                    }
                 }
-            }
 
-            // If the SDK version is not from the same release as any of required versions, then we assume we don't need to skip.  This is to handle the common case where we've moved on to newer releases and don't want to be forced to clean up these skips as soon as we do so.  It assumes we won't start running the test against older releases of the SDK.
-            // We could do something more sophisticated here to handle versions outside of the specific releases we were passed, but this meets our needs for now.
-            return false
-        })
+                // If the SDK version is not from the same release as any of required versions, then we assume we don't need to skip.  This is to handle the common case where we've moved on to newer releases and don't want to be forced to clean up these skips as soon as we do so.  It assumes we won't start running the test against older releases of the SDK.
+                // We could do something more sophisticated here to handle versions outside of the specific releases we were passed, but this meets our needs for now.
+                return false
+            }
+        )
     }
 }
 
@@ -482,7 +511,7 @@ fileprivate enum XcodeVersionInfoProvider {
         case let .installedXcode(xcode):
             return try xcode.productBuildVersion()
         case .noXcode:
-            return try ProductBuildVersion("99T999") // same fallback version that Core uses
+            return try ProductBuildVersion("99T999")  // same fallback version that Core uses
         }
     }
 
diff --git a/Sources/SWBTestSupport/SpecTestSupport.swift b/Sources/SWBTestSupport/SpecTestSupport.swift
index ed389f39..857f1708 100644
--- a/Sources/SWBTestSupport/SpecTestSupport.swift
+++ b/Sources/SWBTestSupport/SpecTestSupport.swift
@@ -24,7 +24,7 @@ package class CapturingTaskParserDelegate: TaskOutputParserDelegate {
     package func skippedSubtask(signature: ByteString) {}
     package func startSubtask(buildOperationIdentifier: BuildSystemOperationIdentifier, taskName: String, id: ByteString, signature: ByteString, ruleInfo: String, executionDescription: String, commandLine: [ByteString], additionalOutput: [String], interestingPath: Path?, workingDirectory: Path?, serializedDiagnosticsPaths: [Path]) -> any TaskOutputParserDelegate { fatalError() }
     package func emitOutput(_ data: ByteString) { output <<< data }
-    package func taskCompleted(exitStatus: Processes.ExitStatus) { }
+    package func taskCompleted(exitStatus: Processes.ExitStatus) {}
     package func close() {}
 }
 
diff --git a/Sources/SWBTestSupport/TargetBuildGraphTestSupport.swift b/Sources/SWBTestSupport/TargetBuildGraphTestSupport.swift
index de2bad24..b3f42e1b 100644
--- a/Sources/SWBTestSupport/TargetBuildGraphTestSupport.swift
+++ b/Sources/SWBTestSupport/TargetBuildGraphTestSupport.swift
@@ -38,7 +38,7 @@ package final class EmptyTargetDependencyResolverDelegate: TargetDependencyResol
         diagnosticsEngine(for: nil).emit(diagnostic)
     }
 
-    package func updateProgress(statusMessage: String, showInLog: Bool) { }
+    package func updateProgress(statusMessage: String, showInLog: Bool) {}
 }
 
 extension EmptyTargetDependencyResolverDelegate {
@@ -55,7 +55,6 @@ extension EmptyTargetDependencyResolverDelegate {
     }
 }
 
-
 extension TargetBuildGraph {
     /// Convenience initializer which uses an empty delegate implementation for testing.
     package init(workspaceContext: WorkspaceContext, buildRequest: BuildRequest, buildRequestContext: BuildRequestContext) async {
diff --git a/Sources/SWBTestSupport/TaskConstructionTester.swift b/Sources/SWBTestSupport/TaskConstructionTester.swift
index 48816c10..3f702d79 100644
--- a/Sources/SWBTestSupport/TaskConstructionTester.swift
+++ b/Sources/SWBTestSupport/TaskConstructionTester.swift
@@ -77,7 +77,7 @@ package final class TaskConstructionTester {
         package var checkedNotes: Bool = false
         package var checkedRemarks: Bool = false
 
-        init(_ core: Core, _ workspace: Workspace, _ existingFiles: [Path], _ buildRequest: BuildRequest, _ buildPlanRequest: BuildPlanRequest,_ buildPlan: BuildPlan, _ delegate: TestTaskPlanningDelegate) {
+        init(_ core: Core, _ workspace: Workspace, _ existingFiles: [Path], _ buildRequest: BuildRequest, _ buildPlanRequest: BuildPlanRequest, _ buildPlan: BuildPlan, _ delegate: TestTaskPlanningDelegate) {
             self.core = core
             self.workspace = workspace
             self.existingFiles = Set(existingFiles)
@@ -164,7 +164,7 @@ package final class TaskConstructionTester {
         ///
         /// It is a test error if multiple such targets exist.
         package func checkTarget(_ name: String, platformDiscriminator: String? = nil, sdkroot: String? = nil, sourceLocation: SourceLocation = #_sourceLocation, body: (ConfiguredTarget) throws -> Void) rethrows {
-                    let matchedTargets = plannedTargets.filter { $0.target.name == name && (platformDiscriminator == nil || $0.platformDiscriminator == platformDiscriminator) && (sdkroot == nil || $0.parameters.overrides["SDKROOT"] == sdkroot) }
+            let matchedTargets = plannedTargets.filter { $0.target.name == name && (platformDiscriminator == nil || $0.platformDiscriminator == platformDiscriminator) && (sdkroot == nil || $0.parameters.overrides["SDKROOT"] == sdkroot) }
             if matchedTargets.isEmpty {
                 Issue.record("unable to find target with name '\(name)'\(platformDiscriminator.map{", platform '\($0)'"} ?? "")", sourceLocation: sourceLocation)
             } else if matchedTargets.count > 1 {
@@ -356,9 +356,7 @@ package final class TaskConstructionTester {
             do {
                 if let distance = try taskGraph.predecessorDistance(from: task, to: antecedent) {
                     let path = try taskGraph.shortestPath(from: task, to: antecedent) ?? []
-                    Issue.record(Comment(rawValue: "task '\(task.testIssueDescription)' has an edge forcing it to follow '\(antecedent.testIssueDescription)' " +
-                                 "by \(distance) tasks, but it was not expected to have one:\n\n" +
-                                 "\(taskGraphPathDebugInfo(path))"), sourceLocation: sourceLocation)
+                    Issue.record(Comment(rawValue: "task '\(task.testIssueDescription)' has an edge forcing it to follow '\(antecedent.testIssueDescription)' " + "by \(distance) tasks, but it was not expected to have one:\n\n" + "\(taskGraphPathDebugInfo(path))"), sourceLocation: sourceLocation)
                 }
             } catch {
                 Issue.record(error, sourceLocation: sourceLocation)
@@ -478,7 +476,7 @@ package final class TaskConstructionTester {
                     Issue.record("missing creator task for mutated node '\(mutatedNodeRef.instance.path.str)'", sourceLocation: sourceLocation)
                     continue
                 }
-                let creators = Set<Ref<any PlannedTask>>(Array<any PlannedTask>(producers).map{ Ref($0) }).subtracting(taskGraph.mutatingTasks)
+                let creators = Set<Ref<any PlannedTask>>(Array<any PlannedTask>(producers).map { Ref($0) }).subtracting(taskGraph.mutatingTasks)
                 guard !creators.isEmpty else {
                     Issue.record("missing creator task for mutated node '\(mutatedNodeRef.instance.path.str)' mutated by task '\(producers.first!.ruleInfo.quotedDescription)'", sourceLocation: sourceLocation)
                     continue
@@ -492,17 +490,21 @@ package final class TaskConstructionTester {
                 /// - parameter ignoring: The node to ignore. This means that the node will be disregarded when traversing the graph. This is useful when there are known to be multiple nodes connecting two tasks, as is the case in mutating tasks, which have the node being mutated as both an input and an output, but also a virtual node connecting the task to its predecessor. The concrete node is ignored and only the virtual nodes are used to traverse the graph.
                 /// - returns: The distance between the two nodes, or `nil` if `predecessor` does not precede `origin` in the graph.
                 func predecessorDistance(from origin: any PlannedTask, to predecessor: any PlannedTask, ignoring: any PlannedNode) -> Int? {
-                    return minimumDistance(from: Ref(origin), to: Ref(predecessor), successors: { taskRef in
+                    return minimumDistance(
+                        from: Ref(origin),
+                        to: Ref(predecessor),
+                        successors: { taskRef in
                             let inputNodes = taskGraph.taskInputs[taskRef] ?? []
-                        let inputs = inputNodes.flatMap { input -> [Ref<any PlannedTask>] in
+                            let inputs = inputNodes.flatMap { input -> [Ref<any PlannedTask>] in
                                 if input.uniqueNode === ignoring {
                                     return []
                                 }
 
-                                return taskGraph.producers[Ref(input.uniqueNode)]?.map{ Ref($0) } ?? []
+                                return taskGraph.producers[Ref(input.uniqueNode)]?.map { Ref($0) } ?? []
                             }
                             return inputs
-                        })
+                        }
+                    )
                 }
 
                 // Get the mutating tasks for this node and order them topologically, ignoring the node being mutated.
@@ -564,7 +566,7 @@ package final class TaskConstructionTester {
 
                 // Go through all the input nodes and work back through their producer tasks.  This iterates through all the nodes in a nondeterministic order, which is fine because we just want coverage.
                 for input in taskGraph.taskInputs[Ref(producer)] ?? [] {
-                	let inputRef = Ref(input.uniqueNode)
+                    let inputRef = Ref(input.uniqueNode)
                     for inputProducer in taskGraph.producers[inputRef] ?? [] {
                         lookForCycle(from: inputRef, through: inputProducer, nodeList: newNodeList, path: newPath)
                         // If we detected a cycle then bail out.
@@ -631,7 +633,7 @@ package final class TaskConstructionTester {
                         return []
 
                     } else {
-                        return producers[Ref(input.uniqueNode)]?.map{ Ref($0) } ?? []
+                        return producers[Ref(input.uniqueNode)]?.map { Ref($0) } ?? []
                     }
                 }
             }
@@ -703,7 +705,7 @@ package final class TaskConstructionTester {
                 }
 
                 // Compute information about mutated tasks and nodes in the graph.
-                let mutatedNodes = Set<Ref<any PlannedNode>>(task.inputs.map{ Ref(uniqueNode(for: $0)) }).intersection(Set<Ref<any PlannedNode>>(task.outputs.map{ Ref(uniqueNode(for: $0)) }))
+                let mutatedNodes = Set<Ref<any PlannedNode>>(task.inputs.map { Ref(uniqueNode(for: $0)) }).intersection(Set<Ref<any PlannedNode>>(task.outputs.map { Ref(uniqueNode(for: $0)) }))
                 if !mutatedNodes.isEmpty {
                     for mutatedNode in mutatedNodes {
                         let mutatingTasks = mutatedNodesToTasks.getOrInsert(mutatedNode, { [any PlannedTask]() })
@@ -768,21 +770,22 @@ package final class TaskConstructionTester {
         let parameters = parameters ?? BuildParameters(configuration: "Debug")
 
         // If the build parameters don't specify a run destination, but we were passed one, then use the one we were passed. (checkBuild() defaults this to .macOS.)
-        let activeRunDestination: RunDestinationInfo? = switch (parameters.activeRunDestination, runDestination) {
-        case let (.some(lhs), (.some(rhs))):
-            preconditionFailure("Specified run destinations from both explicit build parameters and default destination: \(lhs), \(rhs)")
-        case let (.some(destination), nil):
-            destination
-        case let (nil, .some(destination)):
-            destination
-        case (nil, nil):
-            nil
-        }
+        let activeRunDestination: RunDestinationInfo? =
+            switch (parameters.activeRunDestination, runDestination) {
+            case let (.some(lhs), (.some(rhs))):
+                preconditionFailure("Specified run destinations from both explicit build parameters and default destination: \(lhs), \(rhs)")
+            case let (.some(destination), nil):
+                destination
+            case let (nil, .some(destination)):
+                destination
+            case (nil, nil):
+                nil
+            }
 
         // Define a default set of overrides.
         var overrides = [
             // Always use separate headermaps by forcing ALWAYS_SEARCH_USER_PATHS off, unless the build parameters passed to checkBuild() explicitly enables it. (Since traditional headermaps are currently not supported by Swift Build, doing so is not presently useful.)  Doing this also suppresses the warning of traditional headermaps being unsupported.
-            "ALWAYS_SEARCH_USER_PATHS": "NO",
+            "ALWAYS_SEARCH_USER_PATHS": "NO"
         ]
 
         if useDefaultToolChainOverride {
@@ -808,8 +811,7 @@ package final class TaskConstructionTester {
             // If we were passed a build request, then reconstruct it using the parameters.
             let buildTargets = buildRequest.buildTargets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0.target) })
             return buildRequest.with(parameters: parameters, buildTargets: buildTargets)
-        }
-        else {
+        } else {
             // If we weren't passed a build request, then create one with some default characteristics we use in most task construction tests.
             let project = workspace.projects[0]
             let target: Target
@@ -838,7 +840,7 @@ package final class TaskConstructionTester {
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, fs: fs, processExecutionCache: .sharedForTesting)
 
         // Configure fake user and system info.
-        workspaceContext.updateUserInfo(UserInfo(user: "exampleUser", group: "exampleGroup", uid: 1234, gid:12345, home: Path("/Users/whoever"), environment: processEnvironment))
+        workspaceContext.updateUserInfo(UserInfo(user: "exampleUser", group: "exampleGroup", uid: 1234, gid: 12345, home: Path("/Users/whoever"), environment: processEnvironment))
         workspaceContext.updateSystemInfo(systemInfo ?? SystemInfo(operatingSystemVersion: Version(99, 98, 97), productBuildVersion: "99A98", nativeArchitecture: "x86_64"))
         workspaceContext.updateUserPreferences(userPreferences ?? UserPreferences.defaultForTesting)
 
@@ -847,8 +849,7 @@ package final class TaskConstructionTester {
         if let inputBuildRequest, inputBuildRequest.parameters.action == .indexBuild {
             // Indexing tests pass exactly the build request they want to use, so we don't mess with it.
             buildRequest = inputBuildRequest
-        }
-        else {
+        } else {
             buildRequest = effectiveBuildRequest(inputBuildRequest, targetName: targetName, parameters: parameters)
         }
 
@@ -868,15 +869,15 @@ package final class TaskConstructionTester {
         }
         let results = PlanningResults(core, workspace, sourceFiles, buildRequest, buildPlanRequest, buildPlan, delegate)
 
-        /*@MainActor func addAttachments() {
-            // TODO: This `runActivity` call should be wider in scope, but this would significantly complicate the code flow due to threading requirements without having async/await.
-            XCTContext.runActivity(named: "Plan Build") { activity in
-                // TODO: <rdar://59432231> Longer term, we should find a way to share code with CoreQualificationTester, which has a number of APIs for emitting build operation debug info.
-                activity.attach(name: "Task Graph", string: results.dumpGraph())
-            }
-        }
+        // @MainActor func addAttachments() {
+        //     // TODO: This `runActivity` call should be wider in scope, but this would significantly complicate the code flow due to threading requirements without having async/await.
+        //     XCTContext.runActivity(named: "Plan Build") { activity in
+        //         // TODO: <rdar://59432231> Longer term, we should find a way to share code with CoreQualificationTester, which has a number of APIs for emitting build operation debug info.
+        //         activity.attach(name: "Task Graph", string: results.dumpGraph())
+        //     }
+        // }
 
-        await addAttachments()*/
+        // await addAttachments()
 
         // Check the results.
         try await body(results)
@@ -911,7 +912,8 @@ package final class TaskConstructionTester {
                 appIdentifierPrefix: overrides.appIdentifierPrefix ?? inputs.appIdentifierPrefix,
                 teamIdentifierPrefix: overrides.teamIdentifierPrefix ?? inputs.teamIdentifierPrefix,
                 isEnterpriseTeam: overrides.isEnterpriseTeam ?? inputs.isEnterpriseTeam,
-                keychainPath: overrides.keychainPath ?? inputs.keychainPath)
+                keychainPath: overrides.keychainPath ?? inputs.keychainPath
+            )
         }
 
         // Otherwise evaluated $(CODE_SIGN_IDENTITY) to use a default set of inputs.
@@ -933,14 +935,14 @@ package final class TaskConstructionTester {
             simulatedEntitlements = [:]
         case "macosx":
             signedEntitlements = [
-                "com.apple.security.get-task-allow": 1,
+                "com.apple.security.get-task-allow": 1
             ]
             simulatedEntitlements = [:]
         default:
             if settings.platform?.isSimulator == true {
                 // For a simulator platform, the signed entitlements get passed to codesign for the simulator bundle (they're macOS entitlements), while the simulated entitlements get passed to the linker (they're the entitlements for the platform itself, i.e. that would be passed to codesign when building for a device).
                 signedEntitlements = [
-                    "com.apple.security.get-task-allow": 1,
+                    "com.apple.security.get-task-allow": 1
                 ]
                 simulatedEntitlements = [
                     "application-identifier": .plString(appIdentifier),
@@ -950,8 +952,7 @@ package final class TaskConstructionTester {
                         appIdentifier
                     ],
                 ]
-            }
-            else {
+            } else {
                 signedEntitlements = [
                     "application-identifier": .plString(appIdentifier),
                     "com.apple.developer.team-identifier": .plString(teamIdentifierPrefix),
@@ -967,7 +968,7 @@ package final class TaskConstructionTester {
         // Create the provisioning task inputs.
         let isMacOS = settings.platform?.familyName == "macOS"
         switch codeSignIdentity {
-            // FIXME: <rdar://problem/29092604> Remove workaround for projects in ExternalTests data which are still using the deprecated value "Don't Code Sign" for CODE_SIGN_IDENTITY.
+        // FIXME: <rdar://problem/29092604> Remove workaround for projects in ExternalTests data which are still using the deprecated value "Don't Code Sign" for CODE_SIGN_IDENTITY.
         case "", "Don't Code Sign":
             // Don't sign
             return ProvisioningTaskInputs()
@@ -975,20 +976,23 @@ package final class TaskConstructionTester {
             // Ad-hoc signing - we support all platforms here.
             return mergeProvisioningTaskInputs(
                 inputs: ProvisioningTaskInputs(identityHash: "-", identityName: "-", signedEntitlements: .plDict(signedEntitlements), simulatedEntitlements: .plDict(simulatedEntitlements)),
-                overrides: provisioningOverrides)
+                overrides: provisioningOverrides
+            )
         case "Mac Developer",
-             "Apple Development" where isMacOS:
+            "Apple Development" where isMacOS:
             // Mac developer signing - we never have simulated entitlements here.
             return mergeProvisioningTaskInputs(
                 inputs: ProvisioningTaskInputs(identityHash: "3ACDE4E702E4", identityName: codeSignIdentity, signedEntitlements: .plDict(signedEntitlements)),
-                overrides: provisioningOverrides)
+                overrides: provisioningOverrides
+            )
         case "iOS Developer", "iPhone Developer",
-             "Apple Development" where !isMacOS:
+            "Apple Development" where !isMacOS:
             // iOS developer signing
             let profileUUID = "8db0e92c-592c-4f06-bfed-9d945841b78d"
             return mergeProvisioningTaskInputs(
                 inputs: ProvisioningTaskInputs(identityHash: "105DE4E702E4", identityName: codeSignIdentity, profileName: "iOS Team Provisioning Profile: *", profileUUID: profileUUID, profilePath: workspaceContext.userInfo!.home.join("Library/MobileDevice/Provisioning Profiles/\(profileUUID).mobileprovision"), signedEntitlements: .plDict(signedEntitlements), simulatedEntitlements: .plDict(simulatedEntitlements), appIdentifierPrefix: "\(appIdentifierPrefix).", teamIdentifierPrefix: "\(teamIdentifierPrefix).", isEnterpriseTeam: false),
-                overrides: provisioningOverrides)
+                overrides: provisioningOverrides
+            )
         default:
             // We have no default inputs for this identity.
             fatalError("unsupported CODE_SIGN_IDENTITY '\(codeSignIdentity)' - no default provisioning task inputs available for this identity")
@@ -997,10 +1001,10 @@ package final class TaskConstructionTester {
 }
 
 @available(*, unavailable)
-extension TaskConstructionTester: Sendable { }
+extension TaskConstructionTester: Sendable {}
 
 @available(*, unavailable)
-extension TaskConstructionTester.PlanningResults: Sendable { }
+extension TaskConstructionTester.PlanningResults: Sendable {}
 
 extension TaskConstructionTester {
     /// Construct the tasks for an index build operation, and test the result.
@@ -1024,7 +1028,6 @@ extension TaskConstructionTester {
     }
 }
 
-
 package final class TestHeadermapContents {
     package let rawBytes: [UInt8]
     package private(set) var contents = [String: String]()
@@ -1061,7 +1064,7 @@ package final class TestHeadermapContents {
 }
 
 @available(*, unavailable)
-extension TestHeadermapContents: Sendable { }
+extension TestHeadermapContents: Sendable {}
 
 /// Helper protocol to share command-line checking functions
 /// between PlannedTaskBuilder and MockTestTask.
@@ -1330,8 +1333,7 @@ extension EnvironmentBindings {
                 } else {
                     Issue.record("environment value '\(key)' should be defined but is nil", sourceLocation: sourceLocation)
                 }
-            }
-            else {
+            } else {
                 #expect(valueOpt == nil, "environment value '\(key)' should be nil but is '\(valueOpt!)'", sourceLocation: sourceLocation)
             }
         }
diff --git a/Sources/SWBTestSupport/TaskExecutionTestSupport.swift b/Sources/SWBTestSupport/TaskExecutionTestSupport.swift
index 555f47db..fb00c4e3 100644
--- a/Sources/SWBTestSupport/TaskExecutionTestSupport.swift
+++ b/Sources/SWBTestSupport/TaskExecutionTestSupport.swift
@@ -27,7 +27,7 @@ package final class MockTestBuildDescriptionConstructionDelegate: BuildDescripti
         .init(diagnosticsEngines.withLock { $0.getOrInsert(target, { DiagnosticsEngine() }) })
     }
 
-    package var diagnostics: [ConfiguredTarget? : [Diagnostic]] {
+    package var diagnostics: [ConfiguredTarget?: [Diagnostic]] {
         diagnosticsEngines.withLock { $0.mapValues { $0.diagnostics } }
     }
 
@@ -46,10 +46,10 @@ package final class MockTestBuildDescriptionConstructionDelegate: BuildDescripti
     package func updateProgress(statusMessage: String, showInLog: Bool) {}
 
     package func beginActivity(ruleInfo: String, executionDescription: String, signature: ByteString, target: ConfiguredTarget?, parentActivity: ActivityID?) -> ActivityID { .init(rawValue: -1) }
-    package func endActivity(id: ActivityID, signature: ByteString, status: BuildOperationTaskEnded.Status) { }
-    package func emit(data: [UInt8], for activity: ActivityID, signature: ByteString) { }
+    package func endActivity(id: ActivityID, signature: ByteString, status: BuildOperationTaskEnded.Status) {}
+    package func emit(data: [UInt8], for activity: ActivityID, signature: ByteString) {}
     package func emit(diagnostic: Diagnostic, for activity: ActivityID, signature: ByteString) {
-        diagnosticsEngine(for: nil).emit(diagnostic) // FIXME: Technically this should be a "global task" diagnostic
+        diagnosticsEngine(for: nil).emit(diagnostic)  // FIXME: Technically this should be a "global task" diagnostic
     }
 
     package func emit(_ diagnostic: Diagnostic) {
@@ -94,7 +94,7 @@ package struct TestManifest: Sendable {
 
 extension BuildDescription {
     /// Convenience testing method which omits the `capturedBuildInfo:` parameter.
-    static package func construct(workspace: Workspace, tasks: [any PlannedTask], path: Path, signature: BuildDescriptionSignature, buildCommand: BuildCommand, diagnostics: [ConfiguredTarget?: [Diagnostic]] = [:], indexingInfo: [(forTarget: ConfiguredTarget?, path: Path, indexingInfo: any SourceFileIndexingInfo)] = [], fs: any FSProxy = localFS, bypassActualTasks: Bool = false, moduleSessionFilePath: Path? = nil, invalidationPaths: [Path] = [], recursiveSearchPathResults: [RecursiveSearchPathResolver.CachedResult] = [], copiedPathMap: [String: String] = [:], rootPathsPerTarget: [ConfiguredTarget:[Path]] = [:], moduleCachePathsPerTarget: [ConfiguredTarget: [Path]] = [:], artifactInfoPerTarget: [ConfiguredTarget: ArtifactInfo] = [:], casValidationInfos: [BuildDescription.CASValidationInfo] = [], staleFileRemovalIdentifierPerTarget: [ConfiguredTarget: String] = [:], settingsPerTarget: [ConfiguredTarget: Settings] = [:], delegate: any BuildDescriptionConstructionDelegate, targetDependencies: [TargetDependencyRelationship] = [], definingTargetsByModuleName: [String: OrderedSet<ConfiguredTarget>] = [:]) async throws -> BuildDescription? {
+    static package func construct(workspace: Workspace, tasks: [any PlannedTask], path: Path, signature: BuildDescriptionSignature, buildCommand: BuildCommand, diagnostics: [ConfiguredTarget?: [Diagnostic]] = [:], indexingInfo: [(forTarget: ConfiguredTarget?, path: Path, indexingInfo: any SourceFileIndexingInfo)] = [], fs: any FSProxy = localFS, bypassActualTasks: Bool = false, moduleSessionFilePath: Path? = nil, invalidationPaths: [Path] = [], recursiveSearchPathResults: [RecursiveSearchPathResolver.CachedResult] = [], copiedPathMap: [String: String] = [:], rootPathsPerTarget: [ConfiguredTarget: [Path]] = [:], moduleCachePathsPerTarget: [ConfiguredTarget: [Path]] = [:], artifactInfoPerTarget: [ConfiguredTarget: ArtifactInfo] = [:], casValidationInfos: [BuildDescription.CASValidationInfo] = [], staleFileRemovalIdentifierPerTarget: [ConfiguredTarget: String] = [:], settingsPerTarget: [ConfiguredTarget: Settings] = [:], delegate: any BuildDescriptionConstructionDelegate, targetDependencies: [TargetDependencyRelationship] = [], definingTargetsByModuleName: [String: OrderedSet<ConfiguredTarget>] = [:]) async throws -> BuildDescription? {
         return try await construct(workspace: workspace, tasks: tasks, path: path, signature: signature, buildCommand: buildCommand, diagnostics: diagnostics, indexingInfo: indexingInfo, fs: fs, bypassActualTasks: bypassActualTasks, moduleSessionFilePath: moduleSessionFilePath, invalidationPaths: invalidationPaths, recursiveSearchPathResults: recursiveSearchPathResults, copiedPathMap: copiedPathMap, rootPathsPerTarget: rootPathsPerTarget, moduleCachePathsPerTarget: moduleCachePathsPerTarget, artifactInfoPerTarget: artifactInfoPerTarget, casValidationInfos: casValidationInfos, staleFileRemovalIdentifierPerTarget: staleFileRemovalIdentifierPerTarget, settingsPerTarget: settingsPerTarget, delegate: delegate, targetDependencies: targetDependencies, definingTargetsByModuleName: definingTargetsByModuleName, userPreferences: .defaultForTesting)
     }
 }
diff --git a/Sources/SWBTestSupport/TaskPlanningTestSupport.swift b/Sources/SWBTestSupport/TaskPlanningTestSupport.swift
index dc2c6988..b500aff2 100644
--- a/Sources/SWBTestSupport/TaskPlanningTestSupport.swift
+++ b/Sources/SWBTestSupport/TaskPlanningTestSupport.swift
@@ -197,7 +197,7 @@ open class MockTestTaskPlanningClientDelegate: TaskPlanningClientDelegate, @unch
         switch commandLine.first.map(Path.init)?.basenameWithoutSuffix {
         case "actool" where args == ["--version", "--output-format", "xml1"]:
             return .deferred
-        case "cat": // docc
+        case "cat":  // docc
             return .deferred
         case "clang" where args.first == "-v":
             return .deferred
@@ -247,9 +247,11 @@ package class TestTaskPlanningDelegate: TaskPlanningDelegate, @unchecked Sendabl
     package let diagnosticContext: DiagnosticContextData
 
     package func diagnosticsEngine(for target: ConfiguredTarget?) -> DiagnosticProducingDelegateProtocolPrivate<DiagnosticsEngine> {
-        .init(_diagnosticsEngines.withLock { diagnosticsEngines in
-            diagnosticsEngines.getOrInsert(target, { DiagnosticsEngine() })
-        })
+        .init(
+            _diagnosticsEngines.withLock { diagnosticsEngines in
+                diagnosticsEngines.getOrInsert(target, { DiagnosticsEngine() })
+            }
+        )
     }
 
     var diagnostics: [ConfiguredTarget?: [Diagnostic]] {
@@ -277,7 +279,7 @@ package class TestTaskPlanningDelegate: TaskPlanningDelegate, @unchecked Sendabl
     }
 
     package var cancelled: Bool { return false }
-    package func updateProgress(statusMessage: String, showInLog: Bool) { }
+    package func updateProgress(statusMessage: String, showInLog: Bool) {}
 
     package func createVirtualNode(_ name: String) -> PlannedVirtualNode {
         return MakePlannedVirtualNode(name)
@@ -504,26 +506,26 @@ package final class CancellingTaskPlanningDelegate: TestTaskPlanningDelegate, @u
     }
 
     package override var cancelled: Bool {
-        return (queue.blocking_sync{ numNodesSeen }) > afterNodes || (queue.blocking_sync{ numTasksSeen }) > afterTasks
+        return (queue.blocking_sync { numNodesSeen }) > afterNodes || (queue.blocking_sync { numTasksSeen }) > afterTasks
     }
 
     package override func createVirtualNode(_ name: String) -> PlannedVirtualNode {
-        queue.blocking_sync{ numNodesSeen += 1 }
+        queue.blocking_sync { numNodesSeen += 1 }
         return super.createVirtualNode(name)
     }
 
     package override func createDirectoryTreeNode(absolutePath path: Path, excluding: [String]) -> PlannedDirectoryTreeNode {
-        queue.blocking_sync{ numNodesSeen += 1 }
+        queue.blocking_sync { numNodesSeen += 1 }
         return super.createDirectoryTreeNode(absolutePath: path, excluding: excluding)
     }
 
     package override func createNode(absolutePath path: Path) -> PlannedPathNode {
-        queue.blocking_sync{ numNodesSeen += 1 }
+        queue.blocking_sync { numNodesSeen += 1 }
         return super.createNode(absolutePath: path)
     }
 
     package override func createTask(_ builder: inout PlannedTaskBuilder) -> any PlannedTask {
-        queue.blocking_sync{ numTasksSeen += 1 }
+        queue.blocking_sync { numTasksSeen += 1 }
         return super.createTask(&builder)
     }
 }
diff --git a/Sources/SWBTestSupport/TasksCheckingResult.swift b/Sources/SWBTestSupport/TasksCheckingResult.swift
index d53387ae..2e2a6835 100644
--- a/Sources/SWBTestSupport/TasksCheckingResult.swift
+++ b/Sources/SWBTestSupport/TasksCheckingResult.swift
@@ -123,7 +123,7 @@ extension TasksCheckingResult {
             // Run the matcher.
             return try body(task)
         } else {
-            return try #require(nil) // findOneMatchingTask has already emitted a failure message with a nice error
+            return try #require(nil)  // findOneMatchingTask has already emitted a failure message with a nice error
         }
     }
 
@@ -220,12 +220,10 @@ extension CommandLineCheckable {
                 // Report that we couldn't find this string.
                 if let lastStringFound = lastStringFound {
                     return "couldn't find string '\(string)' after string '\(lastStringFound)' in command line: \(commandLineString)"
-                }
-                else {
+                } else {
                     return "couldn't find string '\(string)' in command line: \(commandLineString)"
                 }
-            }
-            else {
+            } else {
                 // If we found a match, then remember the last string found and advance the startSearchIdx to search for the next string.
                 lastStringFound = string
                 startSearchIdx = curIdx
@@ -271,15 +269,17 @@ extension CommandLineCheckable {
     }
 
     package func checkCommandLineMatches(_ patterns: [StringPattern], sourceLocation: SourceLocation = #_sourceLocation) {
-        let directlyComparable = _commandLineAsStrings.count == patterns.count && !patterns.contains(where: {
-            switch $0 {
+        let directlyComparable =
+            _commandLineAsStrings.count == patterns.count
+            && !patterns.contains(where: {
+                switch $0 {
                 // These cases never matches individual items, they are just used for matching string lists.
-            case .start, .end, .anySequence:
-                return true
-            case .any, .contains, .equal, .regex, .prefix, .suffix, .and, .or, .not, .pathEqual:
-                return false
-            }
-        })
+                case .start, .end, .anySequence:
+                    return true
+                case .any, .contains, .equal, .regex, .prefix, .suffix, .and, .or, .not, .pathEqual:
+                    return false
+                }
+            })
         let matchMessage: String?
         if directlyComparable {
             var messageComponents = _commandLineAsStrings.enumerated().compactMap { index, value in
diff --git a/Sources/SWBTestSupport/TestWorkspaces.swift b/Sources/SWBTestSupport/TestWorkspaces.swift
index da442f11..b09aa49c 100644
--- a/Sources/SWBTestSupport/TestWorkspaces.swift
+++ b/Sources/SWBTestSupport/TestWorkspaces.swift
@@ -74,8 +74,7 @@ private protocol TestInternalObjectItem: TestInternalItem {
     func toObject(_ resolver: any Resolver) throws -> PropertyListItem
 }
 
-
-package protocol TestStructureItem { }
+package protocol TestStructureItem {}
 private protocol TestInternalStructureItem: TestInternalItem, TestStructureItem, Sendable {
     func toProtocol(_ resolver: any Resolver) throws -> SWBProtocol.GroupTreeReference
 }
@@ -115,7 +114,7 @@ extension TestTarget {
 package enum TestSourceTree: Equatable, Sendable {
     case absolute
     case groupRelative
-    case buildSetting(String) // FIXME: This should be a MacroExpressionSource.
+    case buildSetting(String)  // FIXME: This should be a MacroExpressionSource.
 }
 
 extension TestSourceTree {
@@ -366,7 +365,7 @@ package final class TestGroup: TestInternalItem, TestInternalStructureItem, Cust
 
     fileprivate func toProtocol(_ resolver: any Resolver, isRoot: Bool) throws -> SWBProtocol.FileGroup {
         let sourceTree = self.sourceTree ?? (isRoot ? .buildSetting("PROJECT_DIR") : .groupRelative)
-        return try SWBProtocol.FileGroup(guid: guid, sourceTree: sourceTree.toProtocol(), path: .string(path ?? (sourceTree == .buildSetting("PROJECT_DIR") ? "" : name)), name: name, children: children.map{ try $0.toProtocol(resolver) })
+        return try SWBProtocol.FileGroup(guid: guid, sourceTree: sourceTree.toProtocol(), path: .string(path ?? (sourceTree == .buildSetting("PROJECT_DIR") ? "" : name)), name: name, children: children.map { try $0.toProtocol(resolver) })
     }
 
     package var description: String {
@@ -386,7 +385,7 @@ package final class TestVariantGroup: TestInternalItem, TestInternalStructureIte
     }
 
     fileprivate func toProtocol(_ resolver: any Resolver) throws -> SWBProtocol.GroupTreeReference {
-        return try SWBProtocol.VariantGroup(guid: guid, sourceTree: .groupRelative, path: .string(""), name: name, children: children.map{ try $0.toProtocol(resolver) })
+        return try SWBProtocol.VariantGroup(guid: guid, sourceTree: .groupRelative, path: .string(""), name: name, children: children.map { try $0.toProtocol(resolver) })
     }
 
     package var description: String {
@@ -411,7 +410,7 @@ package final class TestVersionGroup: TestInternalItem, TestInternalStructureIte
 
     fileprivate func toProtocol(_ resolver: any Resolver) throws -> SWBProtocol.GroupTreeReference {
         let sourceTree = self.sourceTree ?? .groupRelative
-        return try SWBProtocol.VersionGroup(guid: guid, sourceTree: .groupRelative, path: .string(path ?? (sourceTree == .buildSetting("PROJECT_DIR") ? "" : name)), children: children.map{ try $0.toProtocol(resolver) })
+        return try SWBProtocol.VersionGroup(guid: guid, sourceTree: .groupRelative, path: .string(path ?? (sourceTree == .buildSetting("PROJECT_DIR") ? "" : name)), children: children.map { try $0.toProtocol(resolver) })
     }
 
     package var description: String {
@@ -523,7 +522,7 @@ package final class TestBuildFile: TestInternalItem, Sendable {
         case let .namedReference(name, fileTypeIdentifier):
             buildableItemGUID = .namedReference(name: name, fileTypeIdentifier: fileTypeIdentifier)
         }
-        return SWBProtocol.BuildFile(guid: guid, buildableItemGUID: buildableItemGUID, additionalArgs: additionalArgs.map{ .stringList($0) }, decompress: decompress, headerVisibility: headerVisibility?.toProtocol(), migCodegenFiles: migCodegenFiles?.toProtocol(), intentsCodegenVisibility: intentsCodegenVisibility, resourceRule: resourceRule.toProtocol(), codeSignOnCopy: codeSignOnCopy ?? false, removeHeadersOnCopy: removeHeadersOnCopy ?? false, shouldLinkWeakly: shouldLinkWeakly ?? false, assetTags: assetTags, platformFilters: platformFilters, shouldWarnIfNoRuleToProcess: shouldWarnIfNoRuleToProcess)
+        return SWBProtocol.BuildFile(guid: guid, buildableItemGUID: buildableItemGUID, additionalArgs: additionalArgs.map { .stringList($0) }, decompress: decompress, headerVisibility: headerVisibility?.toProtocol(), migCodegenFiles: migCodegenFiles?.toProtocol(), intentsCodegenVisibility: intentsCodegenVisibility, resourceRule: resourceRule.toProtocol(), codeSignOnCopy: codeSignOnCopy ?? false, removeHeadersOnCopy: removeHeadersOnCopy ?? false, shouldLinkWeakly: shouldLinkWeakly ?? false, assetTags: assetTags, platformFilters: platformFilters, shouldWarnIfNoRuleToProcess: shouldWarnIfNoRuleToProcess)
     }
 }
 
@@ -571,7 +570,7 @@ extension TestBuildFile: ExpressibleByStringLiteral {
     }
 }
 
-package protocol TestBuildPhase { }
+package protocol TestBuildPhase {}
 fileprivate protocol TestInternalBuildPhase: TestInternalItem, TestBuildPhase, Sendable {
     func toProtocol(_ resolver: any Resolver) throws -> SWBProtocol.BuildPhase
 }
@@ -622,7 +621,8 @@ package final class TestCopyFilesBuildPhase: TestInternalBuildPhase {
             buildFiles: buildFiles.map { try $0.toProtocol(resolver) },
             destinationSubfolder: .string(destinationSubfolder),
             destinationSubpath: .string(destinationSubpath),
-            runOnlyForDeploymentPostprocessing: onlyForDeployment)
+            runOnlyForDeploymentPostprocessing: onlyForDeployment
+        )
     }
 }
 
@@ -636,7 +636,7 @@ package final class TestAppleScriptBuildPhase: TestInternalBuildPhase {
     }
 
     fileprivate func toProtocol(_ resolver: any Resolver) throws -> SWBProtocol.BuildPhase {
-        return try SWBProtocol.AppleScriptBuildPhase(guid: guid, buildFiles: buildFiles.map{ try $0.toProtocol(resolver) })
+        return try SWBProtocol.AppleScriptBuildPhase(guid: guid, buildFiles: buildFiles.map { try $0.toProtocol(resolver) })
     }
 }
 
@@ -650,7 +650,7 @@ package final class TestFrameworksBuildPhase: TestInternalBuildPhase {
     }
 
     fileprivate func toProtocol(_ resolver: any Resolver) throws -> SWBProtocol.BuildPhase {
-        return try SWBProtocol.FrameworksBuildPhase(guid: guid, buildFiles: buildFiles.map{ try $0.toProtocol(resolver) })
+        return try SWBProtocol.FrameworksBuildPhase(guid: guid, buildFiles: buildFiles.map { try $0.toProtocol(resolver) })
     }
 }
 
@@ -664,7 +664,7 @@ package final class TestHeadersBuildPhase: TestInternalBuildPhase {
     }
 
     fileprivate func toProtocol(_ resolver: any Resolver) throws -> SWBProtocol.BuildPhase {
-        return try SWBProtocol.HeadersBuildPhase(guid: guid, buildFiles: buildFiles.map{ try $0.toProtocol(resolver) })
+        return try SWBProtocol.HeadersBuildPhase(guid: guid, buildFiles: buildFiles.map { try $0.toProtocol(resolver) })
     }
 }
 package final class TestShellScriptBuildPhase: TestInternalBuildPhase {
@@ -709,10 +709,10 @@ package final class TestShellScriptBuildPhase: TestInternalBuildPhase {
     }
 
     fileprivate func toProtocol(_ resolver: any Resolver) -> SWBProtocol.BuildPhase {
-        let inputs = self.inputs.map{ MacroExpressionSource.string($0) }
-        let outputs = self.outputs.map{ MacroExpressionSource.string($0) }
-        let inputFileLists = self.inputFileLists.map{ MacroExpressionSource.string($0) }
-        let outputFileLists = self.outputFileLists.map{ MacroExpressionSource.string($0) }
+        let inputs = self.inputs.map { MacroExpressionSource.string($0) }
+        let outputs = self.outputs.map { MacroExpressionSource.string($0) }
+        let inputFileLists = self.inputFileLists.map { MacroExpressionSource.string($0) }
+        let outputFileLists = self.outputFileLists.map { MacroExpressionSource.string($0) }
         return SWBProtocol.ShellScriptBuildPhase(
             guid: guid,
             name: name,
@@ -744,7 +744,7 @@ package final class TestResourcesBuildPhase: TestInternalBuildPhase {
     }
 
     fileprivate func toProtocol(_ resolver: any Resolver) throws -> SWBProtocol.BuildPhase {
-        return try SWBProtocol.ResourcesBuildPhase(guid: guid, buildFiles: buildFiles.map{ try $0.toProtocol(resolver) })
+        return try SWBProtocol.ResourcesBuildPhase(guid: guid, buildFiles: buildFiles.map { try $0.toProtocol(resolver) })
     }
 }
 
@@ -758,7 +758,7 @@ package final class TestRezBuildPhase: TestInternalBuildPhase {
     }
 
     fileprivate func toProtocol(_ resolver: any Resolver) throws -> SWBProtocol.BuildPhase {
-        return try SWBProtocol.RezBuildPhase(guid: guid, buildFiles: buildFiles.map{ try $0.toProtocol(resolver) })
+        return try SWBProtocol.RezBuildPhase(guid: guid, buildFiles: buildFiles.map { try $0.toProtocol(resolver) })
     }
 }
 
@@ -772,7 +772,7 @@ package final class TestSourcesBuildPhase: TestInternalBuildPhase {
     }
 
     fileprivate func toProtocol(_ resolver: any Resolver) throws -> SWBProtocol.BuildPhase {
-        return try SWBProtocol.SourcesBuildPhase(guid: guid, buildFiles: buildFiles.map{ try $0.toProtocol(resolver) })
+        return try SWBProtocol.SourcesBuildPhase(guid: guid, buildFiles: buildFiles.map { try $0.toProtocol(resolver) })
     }
 }
 
@@ -811,15 +811,15 @@ package final class TestBuildRule: TestInternalItem, Sendable {
         self.name = name
         self.inputSpecifier = inputSpecifier
 
-        let outputs = outputs.enumerated().map{ (entry) -> SWBProtocol.BuildRule.ShellScriptOutputInfo in
-                let (i, output) = entry
-                if i < outputFilesCompilerFlags.count {
-                    return .init(path: .string(output), additionalCompilerFlags: .stringList(outputFilesCompilerFlags[i]))
-                } else {
-                    return .init(path: .string(output), additionalCompilerFlags: nil)
-                }
+        let outputs = outputs.enumerated().map { (entry) -> SWBProtocol.BuildRule.ShellScriptOutputInfo in
+            let (i, output) = entry
+            if i < outputFilesCompilerFlags.count {
+                return .init(path: .string(output), additionalCompilerFlags: .stringList(outputFilesCompilerFlags[i]))
+            } else {
+                return .init(path: .string(output), additionalCompilerFlags: nil)
             }
-        self.actionSpecifier = .shellScript(contents: script, inputs: inputs.map{ .string($0) }, inputFileLists: inputFileLists.map { .string($0) }, outputs: outputs, outputFileLists: outputFileLists.map { .string($0) }, dependencyInfo: dependencyInfo, runOncePerArchitecture: runOncePerArchitecture ?? true)
+        }
+        self.actionSpecifier = .shellScript(contents: script, inputs: inputs.map { .string($0) }, inputFileLists: inputFileLists.map { .string($0) }, outputs: outputs, outputFileLists: outputFileLists.map { .string($0) }, dependencyInfo: dependencyInfo, runOncePerArchitecture: runOncePerArchitecture ?? true)
     }
 
     fileprivate func toProtocol(_ resolver: any Resolver) -> SWBProtocol.BuildRule {
@@ -837,7 +837,7 @@ package final class TestCustomTask: Sendable {
     package let enableSandboxing: Bool
     package let preparesForIndexing: Bool
 
-    package init(commandLine: [String], environment: [String : String], workingDirectory: String, executionDescription: String, inputs: [String], outputs: [String], enableSandboxing: Bool, preparesForIndexing: Bool) {
+    package init(commandLine: [String], environment: [String: String], workingDirectory: String, executionDescription: String, inputs: [String], outputs: [String], enableSandboxing: Bool, preparesForIndexing: Bool) {
         self.commandLine = commandLine
         self.environment = environment
         self.workingDirectory = workingDirectory
@@ -904,7 +904,7 @@ extension TestInternalTarget {
         return .plDict([
             "signature": .plString(signature),
             "type": .plString("target"),
-            "contents": .plDict(["data": .plArray(serializer.byteString.bytes.map { .plInt(Int($0)) })])
+            "contents": .plDict(["data": .plArray(serializer.byteString.bytes.map { .plInt(Int($0)) })]),
         ])
     }
 }
@@ -1022,18 +1022,18 @@ package final class TestStandardTarget: TestInternalTarget, Sendable {
         func computeProductReferenceName(_ name: String) -> String {
             switch self {
             case .application,
-                 .watchKit1App,
-                 .watchKitApp,
-                 .watchKitAppContainer,
-                 .messagesApp,
-                 .appClip:
+                .watchKit1App,
+                .watchKitApp,
+                .watchKitAppContainer,
+                .messagesApp,
+                .appClip:
                 return "\(name).app"
             case .commandLineTool,
-                 .hostBuildTool,
-                 .swiftpmTestRunner:
+                .hostBuildTool,
+                .swiftpmTestRunner:
                 return "\(name)"
             case .framework,
-                 .staticFramework:
+                .staticFramework:
                 return "\(name).framework"
             case .staticLibrary:
                 return "lib\(name).a"
@@ -1052,11 +1052,11 @@ package final class TestStandardTarget: TestInternalTarget, Sendable {
             case .xpcService:
                 return "\(name).xpc"
             case .applicationExtension,
-                 .extensionKitExtension,
-                 .xcodeExtension,
-                 .watchKitExtension,
-                 .messagesExtension,
-                 .messagesStickerPackExtension:
+                .extensionKitExtension,
+                .xcodeExtension,
+                .watchKitExtension,
+                .messagesExtension,
+                .messagesStickerPackExtension:
                 return "\(name).appex"
             case .unitTest, .uiTest, .multiDeviceUITest:
                 return "\(name).xctest"
@@ -1100,24 +1100,26 @@ package final class TestStandardTarget: TestInternalTarget, Sendable {
         self.buildRules = buildRules
         self.customTasks = customTasks
         self.dependencies = dependencies
-        self.explicitProductReferenceName = productReferenceName ?? {
-            // Try to correctly determine the product reference if not specified explicitly
-            let productNames = Set((buildConfigurations ?? []).compactMap { $0.buildSettings["PRODUCT_NAME"] })
-            if productNames.count > 1 {
-                preconditionFailure("productReferenceName must be explicitly set for this target because it cannot be determined automatically in this context")
-            }
+        self.explicitProductReferenceName =
+            productReferenceName
+            ?? {
+                // Try to correctly determine the product reference if not specified explicitly
+                let productNames = Set((buildConfigurations ?? []).compactMap { $0.buildSettings["PRODUCT_NAME"] })
+                if productNames.count > 1 {
+                    preconditionFailure("productReferenceName must be explicitly set for this target because it cannot be determined automatically in this context")
+                }
 
-            // Just return nil; we'll end up using the target name
-            if productNames.first == "$(TARGET_NAME)" {
-                return nil
-            }
+                // Just return nil; we'll end up using the target name
+                if productNames.first == "$(TARGET_NAME)" {
+                    return nil
+                }
 
-            if productNames.first?.contains("$") == true {
-                preconditionFailure("productReferenceName must be explicitly set for this target because it cannot be determined automatically in this context (build setting references are not evaluated here)")
-            }
+                if productNames.first?.contains("$") == true {
+                    preconditionFailure("productReferenceName must be explicitly set for this target because it cannot be determined automatically in this context (build setting references are not evaluated here)")
+                }
 
-            return productNames.first.map { type.computeProductReferenceName($0) }
-        }()
+                return productNames.first.map { type.computeProductReferenceName($0) }
+            }()
         self.predominantSourceCodeLanguage = predominantSourceCodeLanguage
         self.provisioningSourceData = provisioningSourceData
         self.dynamicTargetVariantName = dynamicTargetVariantName
@@ -1135,7 +1137,7 @@ package final class TestStandardTarget: TestInternalTarget, Sendable {
     fileprivate func toProtocol(_ resolver: any Resolver) throws -> SWBProtocol.Target {
         let ref = SWBProtocol.ProductReference(guid: productReferenceGUID, name: productReferenceName)
         let performanceTestsBaselinePath = try (type == .unitTest) ? resolver.findProject(for: self).getPath(resolver).join("xcshareddata/xcbaselines").join("\(guid).xcbaseline") : nil
-        return try SWBProtocol.StandardTarget(guid: guid, name: name, buildConfigurations: buildConfigurations.map{ try $0.toProtocol(resolver) }, customTasks: customTasks.map { $0.toProtocol(resolver) }, dependencies: dependencies.map{ $0.toProtocol(resolver) }, buildPhases: buildPhases.map{ try $0.toProtocol(resolver) }, buildRules: buildRules.map{ $0.toProtocol(resolver) }, productTypeIdentifier: type.productTypeIdentifier, productReference: ref, performanceTestsBaselinesPath: performanceTestsBaselinePath?.str, predominantSourceCodeLanguage: predominantSourceCodeLanguage.description, provisioningSourceData: provisioningSourceData, dynamicTargetVariantGuid: dynamicTargetVariantName?.nilIfEmpty.map(resolver.findTarget)??.guid, approvedByUser: approvedByUser)
+        return try SWBProtocol.StandardTarget(guid: guid, name: name, buildConfigurations: buildConfigurations.map { try $0.toProtocol(resolver) }, customTasks: customTasks.map { $0.toProtocol(resolver) }, dependencies: dependencies.map { $0.toProtocol(resolver) }, buildPhases: buildPhases.map { try $0.toProtocol(resolver) }, buildRules: buildRules.map { $0.toProtocol(resolver) }, productTypeIdentifier: type.productTypeIdentifier, productReference: ref, performanceTestsBaselinesPath: performanceTestsBaselinePath?.str, predominantSourceCodeLanguage: predominantSourceCodeLanguage.description, provisioningSourceData: provisioningSourceData, dynamicTargetVariantGuid: dynamicTargetVariantName?.nilIfEmpty.map(resolver.findTarget)??.guid, approvedByUser: approvedByUser)
     }
 }
 
@@ -1167,7 +1169,7 @@ package final class TestAggregateTarget: TestInternalTarget {
 
     fileprivate func toProtocol(_ resolver: any Resolver) throws -> SWBProtocol.Target {
         let deps = dependencies.map { SWBProtocol.TargetDependency(guid: resolver.findTarget($0)?.guid ?? $0, name: $0) }
-        return try SWBProtocol.AggregateTarget(guid: guid, name: name, buildConfigurations: buildConfigurations.map{ try $0.toProtocol(resolver) }, customTasks: customTasks.map { $0.toProtocol(resolver) }, dependencies: deps, buildPhases: buildPhases.map{ try $0.toProtocol(resolver) })
+        return try SWBProtocol.AggregateTarget(guid: guid, name: name, buildConfigurations: buildConfigurations.map { try $0.toProtocol(resolver) }, customTasks: customTasks.map { $0.toProtocol(resolver) }, dependencies: deps, buildPhases: buildPhases.map { try $0.toProtocol(resolver) })
     }
 }
 
@@ -1206,7 +1208,7 @@ package final class TestExternalTarget: TestInternalTarget {
     }
 
     fileprivate func toProtocol(_ resolver: any Resolver) throws -> SWBProtocol.Target {
-        return try SWBProtocol.ExternalTarget(guid: actualGUID, name: name, buildConfigurations: buildConfigurations.map{ try $0.toProtocol(resolver) }, customTasks: customTasks.map { $0.toProtocol(resolver) }, dependencies: dependencies.map { TargetDependency(guid: resolver.findTarget($0)?.guid ?? $0, name: $0) }, toolPath: .string(toolPath), arguments: .string(arguments), workingDirectory: .string(workingDirectory), passBuildSettingsInEnvironment: passBuildSettingsInEnvironment ?? true)
+        return try SWBProtocol.ExternalTarget(guid: actualGUID, name: name, buildConfigurations: buildConfigurations.map { try $0.toProtocol(resolver) }, customTasks: customTasks.map { $0.toProtocol(resolver) }, dependencies: dependencies.map { TargetDependency(guid: resolver.findTarget($0)?.guid ?? $0, name: $0) }, toolPath: .string(toolPath), arguments: .string(arguments), workingDirectory: .string(workingDirectory), passBuildSettingsInEnvironment: passBuildSettingsInEnvironment ?? true)
     }
 }
 
@@ -1240,7 +1242,7 @@ package final class TestPackageProductTarget: TestInternalTarget {
 
     fileprivate func toProtocol(_ resolver: any Resolver) throws -> SWBProtocol.Target {
         let deps = dependencies.map { SWBProtocol.TargetDependency(guid: resolver.findTarget($0)?.guid ?? $0, name: $0) }
-        return try SWBProtocol.PackageProductTarget(guid: guid, name: name, buildConfigurations: buildConfigurations.map{ try $0.toProtocol(resolver) }, customTasks: customTasks.map { $0.toProtocol(resolver) }, dependencies: deps, frameworksBuildPhase: frameworksBuildPhase.toProtocol(resolver) as! SWBProtocol.FrameworksBuildPhase, dynamicTargetVariantGuid: dynamicTargetVariantName?.nilIfEmpty.map(resolver.findTarget)??.guid, approvedByUser: approvedByUser)
+        return try SWBProtocol.PackageProductTarget(guid: guid, name: name, buildConfigurations: buildConfigurations.map { try $0.toProtocol(resolver) }, customTasks: customTasks.map { $0.toProtocol(resolver) }, dependencies: deps, frameworksBuildPhase: frameworksBuildPhase.toProtocol(resolver) as! SWBProtocol.FrameworksBuildPhase, dynamicTargetVariantGuid: dynamicTargetVariantName?.nilIfEmpty.map(resolver.findTarget)??.guid, approvedByUser: approvedByUser)
 
     }
 }
@@ -1261,8 +1263,8 @@ package final class TestBuildConfiguration: TestInternalItem, Sendable {
     }
 
     fileprivate func toProtocol(_ resolver: any Resolver) throws -> SWBProtocol.BuildConfiguration {
-        let baseConfigGUID = try self.baseConfig.map{ try resolver.findFile($0) }
-        return SWBProtocol.BuildConfiguration(name: name, buildSettings: buildSettings.map{ .init(key: $0.0, value: .string($0.1)) }, baseConfigurationFileReferenceGUID: baseConfigGUID, impartedBuildProperties: impartedBuildProperties.toProtocol(resolver))
+        let baseConfigGUID = try self.baseConfig.map { try resolver.findFile($0) }
+        return SWBProtocol.BuildConfiguration(name: name, buildSettings: buildSettings.map { .init(key: $0.0, value: .string($0.1)) }, baseConfigurationFileReferenceGUID: baseConfigGUID, impartedBuildProperties: impartedBuildProperties.toProtocol(resolver))
     }
 }
 
@@ -1276,7 +1278,7 @@ package final class TestImpartedBuildProperties: TestInternalItem, Sendable {
     }
 
     fileprivate func toProtocol(_ resolver: any Resolver) -> SWBProtocol.ImpartedBuildProperties {
-        return SWBProtocol.ImpartedBuildProperties(buildSettings: buildSettings.map{ .init(key: $0.0, value: .string($0.1)) })
+        return SWBProtocol.ImpartedBuildProperties(buildSettings: buildSettings.map { .init(key: $0.0, value: .string($0.1)) })
     }
 }
 
@@ -1328,13 +1330,13 @@ package class TestProject: TestInternalObjectItem, @unchecked Sendable {
         return .plDict([
             "signature": .plString(signature),
             "type": .plString("project"),
-            "contents": .plDict(["data": .plArray(serializer.byteString.bytes.map { .plInt(Int($0)) })])
+            "contents": .plDict(["data": .plArray(serializer.byteString.bytes.map { .plInt(Int($0)) })]),
         ])
     }
 
     fileprivate func toProtocol(_ resolver: any Resolver) throws -> SWBProtocol.Project {
         let path = getPath(resolver)
-        return try SWBProtocol.Project(guid: guid, isPackage: isPackage, xcodeprojPath: path, sourceRoot: sourceRoot ?? path.dirname, targetSignatures: _targets.map{ $0.signature }, groupTree: groupTree.toProtocol(resolver, isRoot: true), buildConfigurations: buildConfigurations.map{ try $0.toProtocol(resolver) }, defaultConfigurationName: defaultConfigurationName, developmentRegion: developmentRegion, classPrefix: classPrefix, appPreferencesBuildSettings: appPreferencesBuildSettings.map{ .init(key: $0.0, value: .string($0.1)) })
+        return try SWBProtocol.Project(guid: guid, isPackage: isPackage, xcodeprojPath: path, sourceRoot: sourceRoot ?? path.dirname, targetSignatures: _targets.map { $0.signature }, groupTree: groupTree.toProtocol(resolver, isRoot: true), buildConfigurations: buildConfigurations.map { try $0.toProtocol(resolver) }, defaultConfigurationName: defaultConfigurationName, developmentRegion: developmentRegion, classPrefix: classPrefix, appPreferencesBuildSettings: appPreferencesBuildSettings.map { .init(key: $0.0, value: .string($0.1)) })
     }
 }
 
@@ -1376,12 +1378,12 @@ package final class TestWorkspace: Resolver, TestInternalItem, Sendable {
     }
 
     /// Load the test workspace into a helper which can provide various derived objects.
-    package func loadHelper(_ core: Core) throws-> WorkspaceTestHelper {
+    package func loadHelper(_ core: Core) throws -> WorkspaceTestHelper {
         return WorkspaceTestHelper(try load(core), core: core)
     }
 
     package func toObjects() throws -> [PropertyListItem] {
-        return try [toObject(self)] + projects.map{ try $0.toObject(self) } + projects.flatMap{ try $0._targets.map{ try $0.toObject(self) } }
+        return try [toObject(self)] + projects.map { try $0.toObject(self) } + projects.flatMap { try $0._targets.map { try $0.toObject(self) } }
     }
 
     fileprivate func toObject(_ resolver: any Resolver) -> PropertyListItem {
@@ -1390,12 +1392,12 @@ package final class TestWorkspace: Resolver, TestInternalItem, Sendable {
         return .plDict([
             "signature": .plString(signature),
             "type": .plString("workspace"),
-            "contents": .plDict(["data": .plArray(serializer.byteString.bytes.map { .plInt(Int($0)) })])
+            "contents": .plDict(["data": .plArray(serializer.byteString.bytes.map { .plInt(Int($0)) })]),
         ])
     }
 
     fileprivate func toProtocol(_ resolver: any Resolver) -> SWBProtocol.Workspace {
-        return SWBProtocol.Workspace(guid: guid, name: name, path: sourceRoot.join("\(name).xcworkspace"), projectSignatures: projects.map{ $0.signature })
+        return SWBProtocol.Workspace(guid: guid, name: name, path: sourceRoot.join("\(name).xcworkspace"), projectSignatures: projects.map { $0.signature })
     }
 
     var workspaceName: String {
@@ -1562,7 +1564,7 @@ package final class WorkspaceTestHelper: Sendable {
         self.core = core
         self.workspace = workspace
         self.workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
-        self.workspaceContext.updateUserInfo(UserInfo(user: "exampleUser", group: "exampleGroup", uid: 1234, gid:12345, home: Path("/Users/exampleUser"), environment: [:]))
+        self.workspaceContext.updateUserInfo(UserInfo(user: "exampleUser", group: "exampleGroup", uid: 1234, gid: 12345, home: Path("/Users/exampleUser"), environment: [:]))
         self.workspaceContext.updateSystemInfo(SystemInfo(operatingSystemVersion: Version(99, 98, 97), productBuildVersion: "99A98", nativeArchitecture: "x86_64"))
     }
 
@@ -1597,7 +1599,8 @@ extension UserPreferences {
         enableBuildSystemCaching: true,
         activityTextShorteningLevel: .default,
         usePerConfigurationBuildLocations: nil,
-        allowsExternalToolExecution: false)
+        allowsExternalToolExecution: false
+    )
 
     package func with(
         enableDebugActivityLogs: Bool? = nil,
diff --git a/Sources/SWBTestSupport/UserDefaultTestTrait.swift b/Sources/SWBTestSupport/UserDefaultTestTrait.swift
index 31739a7f..6e27a928 100644
--- a/Sources/SWBTestSupport/UserDefaultTestTrait.swift
+++ b/Sources/SWBTestSupport/UserDefaultTestTrait.swift
@@ -11,41 +11,41 @@
 //===----------------------------------------------------------------------===//
 
 #if compiler(<6.1)
-public import Testing
+    public import Testing
 
-extension Trait where Self == Testing.ConditionTrait {
-    public static func userDefaults(_ userDefaults: [String: String], clean: Bool = false, sourceLocation: SourceLocation = #_sourceLocation) -> Self {
-        disabled("Custom execution traits are not supported in this build")
+    extension Trait where Self == Testing.ConditionTrait {
+        public static func userDefaults(_ userDefaults: [String: String], clean: Bool = false, sourceLocation: SourceLocation = #_sourceLocation) -> Self {
+            disabled("Custom execution traits are not supported in this build")
+        }
     }
-}
 #else
-package import Testing
-@_spi(Testing) import SWBUtil
-import Foundation
+    package import Testing
+    @_spi(Testing) import SWBUtil
+    import Foundation
 
-package struct UserDefaultsTestTrait: TestTrait & SuiteTrait & TestScoping {
-    let userDefaults: [String: String]
-    let clean: Bool
+    package struct UserDefaultsTestTrait: TestTrait & SuiteTrait & TestScoping {
+        let userDefaults: [String: String]
+        let clean: Bool
 
-    package var isRecursive: Bool {
-        true
-    }
+        package var isRecursive: Bool {
+            true
+        }
 
-    package func provideScope(for test: Testing.Test, testCase: Testing.Test.Case?, performing function: @Sendable () async throws -> Void) async throws {
-        if testCase == nil || test.isSuite {
-            try await function()
-        } else {
-            try await UserDefaults.withEnvironment(userDefaults, clean: clean) {
+        package func provideScope(for test: Testing.Test, testCase: Testing.Test.Case?, performing function: @Sendable () async throws -> Void) async throws {
+            if testCase == nil || test.isSuite {
                 try await function()
+            } else {
+                try await UserDefaults.withEnvironment(userDefaults, clean: clean) {
+                    try await function()
+                }
             }
         }
     }
-}
 
-extension Trait where Self == UserDefaultsTestTrait {
-    /// Causes a test to be executed while the specified user defaults are applied.
-    package static func userDefaults(_ userDefaults: [String: String], clean: Bool = false, sourceLocation: SourceLocation = #_sourceLocation) -> Self {
-        Self(userDefaults: userDefaults, clean: clean)
+    extension Trait where Self == UserDefaultsTestTrait {
+        /// Causes a test to be executed while the specified user defaults are applied.
+        package static func userDefaults(_ userDefaults: [String: String], clean: Bool = false, sourceLocation: SourceLocation = #_sourceLocation) -> Self {
+            Self(userDefaults: userDefaults, clean: clean)
+        }
     }
-}
 #endif
diff --git a/Sources/SWBUniversalPlatform/BareMetal.swift b/Sources/SWBUniversalPlatform/BareMetal.swift
index 7a30cfea..b572e7d3 100644
--- a/Sources/SWBUniversalPlatform/BareMetal.swift
+++ b/Sources/SWBUniversalPlatform/BareMetal.swift
@@ -18,15 +18,18 @@ import Foundation
 struct BareMetalPlatformExtension: PlatformInfoExtension {
     func additionalPlatforms(context: any PlatformInfoExtensionAdditionalPlatformsContext) throws -> [(path: Path, data: [String: PropertyListItem])] {
         [
-            (.root, [
-                "Type": .plString("Platform"),
-                "Name": .plString("none"),
-                "Identifier": .plString("none"),
-                "Description": .plString("Bare Metal"),
-                "FamilyName": .plString("None"),
-                "FamilyIdentifier": .plString("none"),
-                "IsDeploymentPlatform": .plString("YES"),
-            ])
+            (
+                .root,
+                [
+                    "Type": .plString("Platform"),
+                    "Name": .plString("none"),
+                    "Identifier": .plString("none"),
+                    "Description": .plString("Bare Metal"),
+                    "FamilyName": .plString("None"),
+                    "FamilyIdentifier": .plString("none"),
+                    "IsDeploymentPlatform": .plString("YES"),
+                ]
+            )
         ]
     }
 }
@@ -38,24 +41,31 @@ struct BareMetalPlatformExtension: PlatformInfoExtension {
         }
 
         let defaultProperties: [String: PropertyListItem] = [
-            "SDK_STAT_CACHE_ENABLE": "NO",
+            "SDK_STAT_CACHE_ENABLE": "NO"
         ]
 
-        return [(.root, platform, [
-            "Type": .plString("SDK"),
-            "Version": .plString("0.0.0"),
-            "CanonicalName": .plString("none"),
-            "IsBaseSDK": .plBool(true),
-            "DefaultProperties": .plDict([
-                "PLATFORM_NAME": .plString("none"),
-            ].merging(defaultProperties, uniquingKeysWith: { _, new in new })),
-            "CustomProperties": .plDict([:]),
-            "SupportedTargets": .plDict([
-                "none": .plDict([
-                    "Archs": .plArray([]),
-                    "LLVMTargetTripleSys": .plString("none"),
-                ])
-            ]),
-        ])]
+        return [
+            (
+                .root, platform,
+                [
+                    "Type": .plString("SDK"),
+                    "Version": .plString("0.0.0"),
+                    "CanonicalName": .plString("none"),
+                    "IsBaseSDK": .plBool(true),
+                    "DefaultProperties": .plDict(
+                        [
+                            "PLATFORM_NAME": .plString("none")
+                        ].merging(defaultProperties, uniquingKeysWith: { _, new in new })
+                    ),
+                    "CustomProperties": .plDict([:]),
+                    "SupportedTargets": .plDict([
+                        "none": .plDict([
+                            "Archs": .plArray([]),
+                            "LLVMTargetTripleSys": .plString("none"),
+                        ])
+                    ]),
+                ]
+            )
+        ]
     }
 }
diff --git a/Sources/SWBUniversalPlatform/CppTool.swift b/Sources/SWBUniversalPlatform/CppTool.swift
index 08fc3de7..ba01a8bd 100644
--- a/Sources/SWBUniversalPlatform/CppTool.swift
+++ b/Sources/SWBUniversalPlatform/CppTool.swift
@@ -12,6 +12,6 @@
 
 import SWBCore
 
-final class CppToolSpec : GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
+final class CppToolSpec: GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
     static let identifier = "com.apple.compilers.cpp"
 }
diff --git a/Sources/SWBUniversalPlatform/LexCompiler.swift b/Sources/SWBUniversalPlatform/LexCompiler.swift
index 36f441e7..4df408f5 100644
--- a/Sources/SWBUniversalPlatform/LexCompiler.swift
+++ b/Sources/SWBUniversalPlatform/LexCompiler.swift
@@ -14,7 +14,7 @@ import SWBUtil
 import SWBCore
 import SWBMacro
 
-final class LexCompilerSpec : CompilerSpec, SpecIdentifierType, @unchecked Sendable {
+final class LexCompilerSpec: CompilerSpec, SpecIdentifierType, @unchecked Sendable {
     static let identifier = "com.apple.compilers.lex"
 
     static let extensionMappings = [
@@ -22,7 +22,8 @@ final class LexCompilerSpec : CompilerSpec, SpecIdentifierType, @unchecked Senda
         ".lmm": ".mm", ".LMM": ".MM",
         ".lp": ".cp", ".LP": ".CP",
         ".lpp": ".cpp", ".LPP": ".CPP",
-        ".lxx": ".cxx", ".LXX": ".CXX"]
+        ".lxx": ".cxx", ".LXX": ".CXX",
+    ]
 
     override var toolBasenameAliases: [String] {
         return ["flex"]
@@ -36,7 +37,7 @@ final class LexCompilerSpec : CompilerSpec, SpecIdentifierType, @unchecked Senda
         // Compute the input and output path.
         let input = cbc.input
         let inputBasename = input.absolutePath.basename
-        let (inputPrefix,inputExt) = Path(inputBasename).splitext()
+        let (inputPrefix, inputExt) = Path(inputBasename).splitext()
         let outputExt = LexCompilerSpec.extensionMappings[inputExt] ?? ".c"
         let outputPath = cbc.scope.evaluate(BuiltinMacros.DERIVED_FILE_DIR).join(inputPrefix + ".yy" + outputExt)
         let lexFlags = cbc.scope.evaluate(BuiltinMacros.LEXFLAGS)
diff --git a/Sources/SWBUniversalPlatform/Plugin.swift b/Sources/SWBUniversalPlatform/Plugin.swift
index 91b2392e..5086da63 100644
--- a/Sources/SWBUniversalPlatform/Plugin.swift
+++ b/Sources/SWBUniversalPlatform/Plugin.swift
@@ -39,7 +39,7 @@ struct UniversalPlatformSpecsExtension: SpecificationsExtension {
 
     func specificationImplementations() -> [any SpecImplementationType.Type] {
         [
-            DiffToolSpec.self,
+            DiffToolSpec.self
         ]
     }
 
@@ -83,7 +83,7 @@ struct UniversalPlatformTaskProducerExtension: TaskProducerExtension {
 }
 
 struct UniversalPlatformTaskActionExtension: TaskActionExtension {
-    var taskActionImplementations: [SWBUtil.SerializableTypeCode : any SWBUtil.PolymorphicSerializable.Type] {
+    var taskActionImplementations: [SWBUtil.SerializableTypeCode: any SWBUtil.PolymorphicSerializable.Type] {
         [44: TestEntryPointGenerationTaskAction.self]
     }
 }
diff --git a/Sources/SWBUniversalPlatform/TestEntryPointGenerationTaskAction.swift b/Sources/SWBUniversalPlatform/TestEntryPointGenerationTaskAction.swift
index bad72bbd..e64c52c7 100644
--- a/Sources/SWBUniversalPlatform/TestEntryPointGenerationTaskAction.swift
+++ b/Sources/SWBUniversalPlatform/TestEntryPointGenerationTaskAction.swift
@@ -50,70 +50,75 @@ class TestEntryPointGenerationTaskAction: TaskAction {
                 }
             }
 
-            try executionDelegate.fs.write(options.output, contents: ByteString(encodingAsUTF8: """
-            #if canImport(Testing)
-            import Testing
-            #endif
-
-            \(testObservationFragment)
-
-            public import XCTest
-            \(discoveredTestsFragment(tests: tests, options: options))
-
-            @main
-            @available(macOS 10.15, iOS 11, watchOS 4, tvOS 11, visionOS 1, *)
-            @available(*, deprecated, message: "Not actually deprecated. Marked as deprecated to allow inclusion of deprecated tests (which test deprecated functionality) without warnings")
-            struct Runner {
-                private static func testingLibrary() -> String {
-                    var iterator = CommandLine.arguments.makeIterator()
-                    while let argument = iterator.next() {
-                        if argument == "--testing-library", let libraryName = iterator.next() {
-                            return libraryName.lowercased()
-                        }
-                    }
-
-                    // Fallback if not specified: run XCTest (legacy behavior)
-                    return "xctest"
-                }
-
-                private static func testOutputPath() -> String? {
-                    var iterator = CommandLine.arguments.makeIterator()
-                    while let argument = iterator.next() {
-                        if argument == "--testing-output-path", let outputPath = iterator.next() {
-                            return outputPath
-                        }
-                    }
-                    return nil
-                }
+            try executionDelegate.fs.write(
+                options.output,
+                contents: ByteString(
+                    encodingAsUTF8: """
+                        #if canImport(Testing)
+                        import Testing
+                        #endif
+
+                        \(testObservationFragment)
+
+                        public import XCTest
+                        \(discoveredTestsFragment(tests: tests, options: options))
+
+                        @main
+                        @available(macOS 10.15, iOS 11, watchOS 4, tvOS 11, visionOS 1, *)
+                        @available(*, deprecated, message: "Not actually deprecated. Marked as deprecated to allow inclusion of deprecated tests (which test deprecated functionality) without warnings")
+                        struct Runner {
+                            private static func testingLibrary() -> String {
+                                var iterator = CommandLine.arguments.makeIterator()
+                                while let argument = iterator.next() {
+                                    if argument == "--testing-library", let libraryName = iterator.next() {
+                                        return libraryName.lowercased()
+                                    }
+                                }
+
+                                // Fallback if not specified: run XCTest (legacy behavior)
+                                return "xctest"
+                            }
 
-                #if os(Linux)
-                @_silgen_name("$ss13_runAsyncMainyyyyYaKcF")
-                private static func _runAsyncMain(_ asyncFun: @Sendable @escaping () async throws -> ())
+                            private static func testOutputPath() -> String? {
+                                var iterator = CommandLine.arguments.makeIterator()
+                                while let argument = iterator.next() {
+                                    if argument == "--testing-output-path", let outputPath = iterator.next() {
+                                        return outputPath
+                                    }
+                                }
+                                return nil
+                            }
 
-                static func main() {
-                    let testingLibrary = Self.testingLibrary()
-                    #if canImport(Testing)
-                    if testingLibrary == "swift-testing" {
-                        _runAsyncMain {
-                            await Testing.__swiftPMEntryPoint() as Never
+                            #if os(Linux)
+                            @_silgen_name("$ss13_runAsyncMainyyyyYaKcF")
+                            private static func _runAsyncMain(_ asyncFun: @Sendable @escaping () async throws -> ())
+
+                            static func main() {
+                                let testingLibrary = Self.testingLibrary()
+                                #if canImport(Testing)
+                                if testingLibrary == "swift-testing" {
+                                    _runAsyncMain {
+                                        await Testing.__swiftPMEntryPoint() as Never
+                                    }
+                                }
+                                #endif
+                                \(xctestFragment(enableExperimentalTestOutput: options.enableExperimentalTestOutput, disable: !options.discoverTests))
+                            }
+                            #else
+                            static func main() async {
+                                let testingLibrary = Self.testingLibrary()
+                                #if canImport(Testing)
+                                if testingLibrary == "swift-testing" {
+                                    await Testing.__swiftPMEntryPoint() as Never
+                                }
+                                #endif
+                                \(xctestFragment(enableExperimentalTestOutput: options.enableExperimentalTestOutput, disable: !options.discoverTests))
+                            }
+                            #endif
                         }
-                    }
-                    #endif
-                    \(xctestFragment(enableExperimentalTestOutput: options.enableExperimentalTestOutput, disable: !options.discoverTests))
-                }
-                #else
-                static func main() async {
-                    let testingLibrary = Self.testingLibrary()
-                    #if canImport(Testing)
-                    if testingLibrary == "swift-testing" {
-                        await Testing.__swiftPMEntryPoint() as Never
-                    }
-                    #endif
-                    \(xctestFragment(enableExperimentalTestOutput: options.enableExperimentalTestOutput, disable: !options.discoverTests))
-                }
-                #endif
-            }
-            """))
+                        """
+                )
+            )
 
             return .succeeded
         } catch {
@@ -142,11 +147,11 @@ class TestEntryPointGenerationTaskAction: TaskAction {
             fragment += "@testable import \(moduleName)\n"
         }
         fragment += """
-        @available(*, deprecated, message: "Not actually deprecated. Marked as deprecated to allow inclusion of deprecated tests (which test deprecated functionality) without warnings")
-        public func __allDiscoveredTests() -> [XCTestCaseEntry] {
-            return [
+            @available(*, deprecated, message: "Not actually deprecated. Marked as deprecated to allow inclusion of deprecated tests (which test deprecated functionality) without warnings")
+            public func __allDiscoveredTests() -> [XCTestCaseEntry] {
+                return [
 
-        """
+            """
         for testClass in tests {
 
             let testTuples = testClass.testMethods.map { method in
@@ -160,9 +165,9 @@ class TestEntryPointGenerationTaskAction: TaskAction {
             fragment += "        testCase([\(testTuples.joined(separator: ",\n"))]),\n"
         }
         fragment += """
-            ]
-        }
-        """
+                ]
+            }
+            """
         return fragment
     }
 
@@ -171,17 +176,17 @@ class TestEntryPointGenerationTaskAction: TaskAction {
             return ""
         }
         return """
-        if testingLibrary == "xctest" {
-            #if !os(Windows) && \(enableExperimentalTestOutput)
-            _ = Self.testOutputPath().map { __SwiftPMXCTestObserver(testOutputPath: testOutputPath) }
-            #endif
-            #if os(WASI)
-            await XCTMain(__allDiscoveredTests()) as Never
-            #else
-            XCTMain(__allDiscoveredTests()) as Never
-            #endif
-        }
-        """
+            if testingLibrary == "xctest" {
+                #if !os(Windows) && \(enableExperimentalTestOutput)
+                _ = Self.testOutputPath().map { __SwiftPMXCTestObserver(testOutputPath: testOutputPath) }
+                #endif
+                #if os(WASI)
+                await XCTMain(__allDiscoveredTests()) as Never
+                #else
+                XCTMain(__allDiscoveredTests()) as Never
+                #endif
+            }
+            """
     }
 
     private var testObservationFragment: String =
diff --git a/Sources/SWBUniversalPlatform/TestEntryPointGenerationTool.swift b/Sources/SWBUniversalPlatform/TestEntryPointGenerationTool.swift
index ae18b283..decf6034 100644
--- a/Sources/SWBUniversalPlatform/TestEntryPointGenerationTool.swift
+++ b/Sources/SWBUniversalPlatform/TestEntryPointGenerationTool.swift
@@ -25,7 +25,7 @@ final class TestEntryPointGenerationToolSpec: GenericCommandLineToolSpec, SpecId
             let format = cbc.scope.evaluate(BuiltinMacros.LINKER_FILE_LIST_FORMAT)
             args.append(contentsOf: ["--linker-file-list-format", .literal(.init(encodingAsUTF8: format.rawValue))])
 
-            for toolchainLibrarySearchPath in cbc.producer.toolchains.map({ StackedSearchPath(paths: $0.librarySearchPaths.paths + $0.fallbackLibrarySearchPaths.paths, fs: $0.librarySearchPaths.fs) } ) {
+            for toolchainLibrarySearchPath in cbc.producer.toolchains.map({ StackedSearchPath(paths: $0.librarySearchPaths.paths + $0.fallbackLibrarySearchPaths.paths, fs: $0.librarySearchPaths.fs) }) {
                 if let path = toolchainLibrarySearchPath.findLibrary(operatingSystem: cbc.producer.hostOperatingSystem, basename: "IndexStore") {
                     args.append(contentsOf: ["--index-store-library-path", .path(path)])
                     break
diff --git a/Sources/SWBUniversalPlatform/YaccCompiler.swift b/Sources/SWBUniversalPlatform/YaccCompiler.swift
index 004a744d..4fef98ab 100644
--- a/Sources/SWBUniversalPlatform/YaccCompiler.swift
+++ b/Sources/SWBUniversalPlatform/YaccCompiler.swift
@@ -14,7 +14,7 @@ import SWBUtil
 import SWBCore
 import SWBMacro
 
-final class YaccCompilerSpec : CompilerSpec, SpecIdentifierType, @unchecked Sendable {
+final class YaccCompilerSpec: CompilerSpec, SpecIdentifierType, @unchecked Sendable {
     static let identifier = "com.apple.compilers.yacc"
 
     static let extensionMappings = [
@@ -22,7 +22,8 @@ final class YaccCompilerSpec : CompilerSpec, SpecIdentifierType, @unchecked Send
         ".ymm": ".mm", ".YMM": ".MM",
         ".yp": ".cp", ".YP": ".CP",
         ".ypp": ".cpp", ".YPP": ".CPP",
-        ".yxx": ".cxx", ".YXX": ".CXX"]
+        ".yxx": ".cxx", ".YXX": ".CXX",
+    ]
 
     override var toolBasenameAliases: [String] {
         return ["bison"]
@@ -36,7 +37,7 @@ final class YaccCompilerSpec : CompilerSpec, SpecIdentifierType, @unchecked Send
         // Compute the input and output path.
         let input = cbc.input
         let inputBasename = input.absolutePath.basename
-        let (inputPrefix,inputExt) = Path(inputBasename).splitext()
+        let (inputPrefix, inputExt) = Path(inputBasename).splitext()
 
         let outputPrefix: String
         if cbc.scope.evaluate(BuiltinMacros.YACC_GENERATED_FILE_STEM) == "InputFileStem" {
diff --git a/Sources/SWBUtil/Architecture.swift b/Sources/SWBUtil/Architecture.swift
index d7518ec8..99e4ac6b 100644
--- a/Sources/SWBUtil/Architecture.swift
+++ b/Sources/SWBUtil/Architecture.swift
@@ -14,11 +14,11 @@ import Foundation
 import SWBLibc
 
 #if canImport(Darwin)
-import Darwin
-import MachO
-#if canImport(MachO.dyld.utils)
-import MachO.dyld.utils
-#endif
+    import Darwin
+    import MachO
+    #if canImport(MachO.dyld.utils)
+        import MachO.dyld.utils
+    #endif
 #endif
 
 public struct Architecture: Sendable {
@@ -31,13 +31,13 @@ public struct Architecture: Sendable {
     /// Returns the native architecture of the host machine, not including subtypes like arm64e and x86_64h.
     public static let host: Architecture = {
         #if canImport(Darwin) && canImport(MachO.dyld.utils)
-        if let value = macho_arch_name_for_mach_header(nil) {
-            var cputype: cpu_type_t = 0
-            var cpusubtype: cpu_subtype_t = 0
-            if macho_cpu_type_for_arch_name(value, &cputype, &cpusubtype) {
-                return Self(cputype: cputype)
+            if let value = macho_arch_name_for_mach_header(nil) {
+                var cputype: cpu_type_t = 0
+                var cpusubtype: cpu_subtype_t = 0
+                if macho_cpu_type_for_arch_name(value, &cputype, &cpusubtype) {
+                    return Self(cputype: cputype)
+                }
             }
-        }
         #endif
         return Self()
     }()
@@ -45,83 +45,84 @@ public struct Architecture: Sendable {
     /// Returns the 32-bit counterpart of the architecture, which may be the same value.
     public var as32bit: Architecture {
         #if canImport(Darwin)
-        return Self(cputype: cputype & ~CPU_ARCH_ABI64)
+            return Self(cputype: cputype & ~CPU_ARCH_ABI64)
         #else
-        return Self()
+            return Self()
         #endif
     }
 
     /// Returns the 64-bit counterpart of the architecture, which may be the same value.
     public var as64bit: Architecture {
         #if canImport(Darwin)
-        return Self(cputype: cputype | CPU_ARCH_ABI64)
+            return Self(cputype: cputype | CPU_ARCH_ABI64)
         #else
-        return Self()
+            return Self()
         #endif
     }
 
     /// Returns the string representation of the architecture, or `nil` if it cannot be determined.
     public var stringValue: String? {
         #if canImport(Darwin)
-        // This only needs to consider the known 4 values as it's only for computing the host architecture build settings.
-        switch cputype {
-        case CPU_TYPE_ARM:
-            return "arm"
-        case CPU_TYPE_ARM64:
-            return "arm64"
-        case CPU_TYPE_I386:
-            return "i386"
-        case CPU_TYPE_X86_64:
-            return "x86_64"
-        default:
-            break
-        }
+            // This only needs to consider the known 4 values as it's only for computing the host architecture build settings.
+            switch cputype {
+            case CPU_TYPE_ARM:
+                return "arm"
+            case CPU_TYPE_ARM64:
+                return "arm64"
+            case CPU_TYPE_I386:
+                return "i386"
+            case CPU_TYPE_X86_64:
+                return "x86_64"
+            default:
+                break
+            }
         #endif
         return nil
     }
 
     public static var hostStringValue: String? {
-        return host.stringValue ?? { () -> String? in
-            #if os(Windows)
-            var sysInfo = SYSTEM_INFO()
-            GetSystemInfo(&sysInfo)
-            switch Int32(sysInfo.wProcessorArchitecture) {
-            case PROCESSOR_ARCHITECTURE_AMD64:
-                return "x86_64"
-            case PROCESSOR_ARCHITECTURE_ARM64:
-                return "aarch64"
-            default:
-                return nil
-            }
-            #else
-            var buf = utsname()
-            if uname(&buf) == 0 {
-                return withUnsafeBytes(of: &buf.machine) { buf in
-                    let data = Data(buf)
-                    let value = String(decoding: data[0...(data.lastIndex(where: { $0 != 0 }) ?? 0)], as: UTF8.self)
-                    #if os(FreeBSD)
-                    switch value {
-                    case "amd64":
+        return host.stringValue
+            ?? { () -> String? in
+                #if os(Windows)
+                    var sysInfo = SYSTEM_INFO()
+                    GetSystemInfo(&sysInfo)
+                    switch Int32(sysInfo.wProcessorArchitecture) {
+                    case PROCESSOR_ARCHITECTURE_AMD64:
                         return "x86_64"
-                    case "arm64":
+                    case PROCESSOR_ARCHITECTURE_ARM64:
                         return "aarch64"
                     default:
-                        break
+                        return nil
                     }
-                    #endif
-                    return value
-                }
-            }
-            return nil
-            #endif
-        }()
+                #else
+                    var buf = utsname()
+                    if uname(&buf) == 0 {
+                        return withUnsafeBytes(of: &buf.machine) { buf in
+                            let data = Data(buf)
+                            let value = String(decoding: data[0...(data.lastIndex(where: { $0 != 0 }) ?? 0)], as: UTF8.self)
+                            #if os(FreeBSD)
+                                switch value {
+                                case "amd64":
+                                    return "x86_64"
+                                case "arm64":
+                                    return "aarch64"
+                                default:
+                                    break
+                                }
+                            #endif
+                            return value
+                        }
+                    }
+                    return nil
+                #endif
+            }()
     }
 
     static func stringValue(cputype: cpu_type_t, cpusubtype: cpu_subtype_t) -> String? {
         #if canImport(Darwin) && canImport(MachO.dyld.utils)
-        return macho_arch_name_for_cpu_type(cputype, cpusubtype).map(String.init(cString:))
+            return macho_arch_name_for_cpu_type(cputype, cpusubtype).map(String.init(cString:))
         #else
-        return nil
+            return nil
         #endif
     }
 }
diff --git a/Sources/SWBUtil/ArgumentSplitting.swift b/Sources/SWBUtil/ArgumentSplitting.swift
index b0580849..fcb5667b 100644
--- a/Sources/SWBUtil/ArgumentSplitting.swift
+++ b/Sources/SWBUtil/ArgumentSplitting.swift
@@ -130,7 +130,7 @@ public final class UNIXShellCommandCodec: CommandSequenceEncodable, Sendable {
                             if $0 == "\n" {
                                 return "'\n'"
                             } else if isSpecialShellCharacter(ch: $0) {
-                               return "\\\($0)"
+                                return "\\\($0)"
                             } else {
                                 return "\($0)"
                             }
@@ -289,7 +289,7 @@ public final class WindowsProcessArgumentsCodec: CommandSequenceEncodable, Senda
     public func encode(_ sequence: [String]) -> String {
         return sequence.lazy
             .map { arg in
-                if !arg.contains(where: {" \t\n\"".contains($0)}) {
+                if !arg.contains(where: { " \t\n\"".contains($0) }) {
                     return arg
                 }
 
diff --git a/Sources/SWBUtil/Array.swift b/Sources/SWBUtil/Array.swift
index 5f01ef96..c7e105b9 100644
--- a/Sources/SWBUtil/Array.swift
+++ b/Sources/SWBUtil/Array.swift
@@ -10,16 +10,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-public extension Array
-{
+public extension Array {
     // Typechecking of operator+ can be extraordinarily slow, even for small expressions; use this instead when needed.
     func appending(contentsOf other: [Element]) -> [Element] {
         return self + other
     }
 }
 
-public extension Array where Element: Equatable
-{
+public extension Array where Element: Equatable {
     /// Returns the element immediately following the first contiguous subsequence of elements equal to `elements`.
     func elementAfterElements(_ elements: [Element]) -> Element? {
         if let range = self.firstRange(of: elements), range.upperBound != endIndex {
@@ -110,7 +108,7 @@ public extension Array where Element: FloatingPoint {
             return Element(0)
         }
         let average = self.average()
-        let v = self.reduce(0) { (acc: Element, next: Element) in acc + (next-average)*(next-average) }
+        let v = self.reduce(0) { (acc: Element, next: Element) in acc + (next - average) * (next - average) }
         return (v / (Element(self.count) - 1)).squareRoot()
     }
 
@@ -135,7 +133,7 @@ extension Sequence {
         return elements
     }
 
-    public func asyncFlatMap<SegmentOfResult, E>(_ transform: (Self.Element) async throws(E) -> SegmentOfResult) async throws(E) -> [SegmentOfResult.Element] where SegmentOfResult : Sequence {
+    public func asyncFlatMap<SegmentOfResult, E>(_ transform: (Self.Element) async throws(E) -> SegmentOfResult) async throws(E) -> [SegmentOfResult.Element] where SegmentOfResult: Sequence {
         var elements: [SegmentOfResult.Element] = []
         for element in self {
             try await elements.append(contentsOf: transform(element))
@@ -210,13 +208,13 @@ public func nWayMerge<T: Equatable & Sendable>(_ arrays: [[T]]) -> [NWayMergeEle
     var merged = arrays[0].map { NWayMergeElement(element: $0, elementOf: Set([0])) }
     for (idx, array) in arrays.enumerated().dropFirst() {
         merged = merged.map { NWayMergeElement(element: $0.element, elementOf: $0.elementOf.union([idx])) }
-        let next =  array.map { NWayMergeElement(element: $0, elementOf: Set([idx])) }
+        let next = array.map { NWayMergeElement(element: $0, elementOf: Set([idx])) }
         let diff = next.difference(from: merged, by: { first, second in first.element == second.element })
         for change in diff {
             switch change {
             case .insert(offset: let offset, element: let element, associatedWith: _):
                 let adjustment = diff.removals.filter { $0.offset <= offset }.count
-                merged.insert(element, at: offset+adjustment)
+                merged.insert(element, at: offset + adjustment)
             case .remove(offset: let offset, element: _, associatedWith: _):
                 merged[offset].elementOf.remove(idx)
             }
diff --git a/Sources/SWBUtil/AsyncCache.swift b/Sources/SWBUtil/AsyncCache.swift
index 6ce4c41c..8475e0a2 100644
--- a/Sources/SWBUtil/AsyncCache.swift
+++ b/Sources/SWBUtil/AsyncCache.swift
@@ -24,7 +24,7 @@ public actor AsyncCache<Key: Hashable & Sendable, Value: Sendable> {
     private var cache: [Key: KeyState] = [:]
 
     /// Creates a new cache.
-    public init() { }
+    public init() {}
 
     /// Retrieves the value for the specified key, invoking the `body` closure to cache the value if it is not already present.
     ///
diff --git a/Sources/SWBUtil/AsyncFlatteningSequence.swift b/Sources/SWBUtil/AsyncFlatteningSequence.swift
index 019eb7d6..023f7aeb 100644
--- a/Sources/SWBUtil/AsyncFlatteningSequence.swift
+++ b/Sources/SWBUtil/AsyncFlatteningSequence.swift
@@ -89,7 +89,7 @@ extension AsyncSequence where Self.Element: RandomAccessCollection, Element.Elem
     }
 }
 
-extension AsyncFlatteningSequence: Sendable where Base: Sendable { }
+extension AsyncFlatteningSequence: Sendable where Base: Sendable {}
 
 @available(*, unavailable)
-extension AsyncFlatteningSequence.AsyncIterator: Sendable { }
+extension AsyncFlatteningSequence.AsyncIterator: Sendable {}
diff --git a/Sources/SWBUtil/AsyncLock.swift b/Sources/SWBUtil/AsyncLock.swift
index 5a7c3d34..81ab087c 100644
--- a/Sources/SWBUtil/AsyncLock.swift
+++ b/Sources/SWBUtil/AsyncLock.swift
@@ -30,7 +30,7 @@ public actor ActorLock {
             if let next = queue.popFirst() {
                 next.resume(returning: ())
             } else {
-                queue = [] // reallocate buffer if it's empty
+                queue = []  // reallocate buffer if it's empty
             }
         }
         return try await body()
diff --git a/Sources/SWBUtil/AsyncOperationQueue.swift b/Sources/SWBUtil/AsyncOperationQueue.swift
index 1ef3b936..ea550631 100644
--- a/Sources/SWBUtil/AsyncOperationQueue.swift
+++ b/Sources/SWBUtil/AsyncOperationQueue.swift
@@ -102,31 +102,31 @@ public final class AsyncOperationQueue: @unchecked Sendable {
                     }
 
                     switch waitingTasks[index] {
-                        case .cancelled:
-                            // If the task was cancelled in between creating the task cancellation handler and acquiring the lock,
-                            // we should resume the continuation with a `CancellationError`.
+                    case .cancelled:
+                        // If the task was cancelled in between creating the task cancellation handler and acquiring the lock,
+                        // we should resume the continuation with a `CancellationError`.
+                        waitingTasks.remove(at: index)
+                        return .cancel(continuation)
+                    case .creating, .running, .waiting:
+                        // A task may have completed since we initially checked if we should wait. Check again in this locked
+                        // section and if we can start it, remove it from the waiting tasks and start it immediately.
+                        if waitingTasks.count >= concurrentTasks {
+                            waitingTasks[index] = .waiting(taskId, continuation)
+                            return nil
+                        } else {
                             waitingTasks.remove(at: index)
-                            return .cancel(continuation)
-                        case .creating, .running, .waiting:
-                            // A task may have completed since we initially checked if we should wait. Check again in this locked
-                            // section and if we can start it, remove it from the waiting tasks and start it immediately.
-                            if waitingTasks.count >= concurrentTasks {
-                                waitingTasks[index] = .waiting(taskId, continuation)
-                                return nil
-                            } else {
-                                waitingTasks.remove(at: index)
-                                return .start(continuation)
-                            }
+                            return .start(continuation)
+                        }
                     }
                 }
 
                 switch action {
-                    case .some(.cancel(let continuation)):
-                        continuation.resume(throwing: _Concurrency.CancellationError())
-                    case .some(.start(let continuation)):
-                        continuation.resume()
-                    case .none:
-                        return
+                case .some(.cancel(let continuation)):
+                    continuation.resume(throwing: _Concurrency.CancellationError())
+                case .some(.start(let continuation)):
+                    continuation.resume()
+                case .none:
+                    return
                 }
             }
         } onCancel: {
@@ -136,20 +136,20 @@ public final class AsyncOperationQueue: @unchecked Sendable {
                 }
 
                 switch self.waitingTasks[taskIndex] {
-                    case .waiting(_, let continuation):
-                        self.waitingTasks.remove(at: taskIndex)
-
-                        // If the parent task is cancelled then we need to manually handle resuming the
-                        // continuation for the waiting task with a `CancellationError`. Return the continuation
-                        // here so it can be resumed once the `waitingTasksLock` is released.
-                        return continuation
-                    case .creating, .running:
-                        // If the task was still being created, mark it as cancelled in `waitingTasks` so that
-                        // the handler for `withCheckedThrowingContinuation` can immediately cancel it.
-                        self.waitingTasks[taskIndex] = .cancelled(taskId)
-                        return nil
-                    case .cancelled:
-                        preconditionFailure("Attempting to cancel a task that was already cancelled")
+                case .waiting(_, let continuation):
+                    self.waitingTasks.remove(at: taskIndex)
+
+                    // If the parent task is cancelled then we need to manually handle resuming the
+                    // continuation for the waiting task with a `CancellationError`. Return the continuation
+                    // here so it can be resumed once the `waitingTasksLock` is released.
+                    return continuation
+                case .creating, .running:
+                    // If the task was still being created, mark it as cancelled in `waitingTasks` so that
+                    // the handler for `withCheckedThrowingContinuation` can immediately cancel it.
+                    self.waitingTasks[taskIndex] = .cancelled(taskId)
+                    return nil
+                case .cancelled:
+                    preconditionFailure("Attempting to cancel a task that was already cancelled")
                 }
             }
 
diff --git a/Sources/SWBUtil/AsyncSingleValueCache.swift b/Sources/SWBUtil/AsyncSingleValueCache.swift
index 4310faaf..bc3faa18 100644
--- a/Sources/SWBUtil/AsyncSingleValueCache.swift
+++ b/Sources/SWBUtil/AsyncSingleValueCache.swift
@@ -13,7 +13,7 @@
 public struct AsyncSingleValueCache<Value: Sendable, E: Error>: ~Copyable, Sendable {
     private let value = AsyncLockedValue<Value?>(nil)
 
-    public init() { }
+    public init() {}
 
     public func value(body: sending () async throws(E) -> sending Value) async throws(E) -> sending Value {
         try await value.withLock { value throws(E) in
diff --git a/Sources/SWBUtil/ByteCount.swift b/Sources/SWBUtil/ByteCount.swift
index feadcdd1..dbaad72b 100644
--- a/Sources/SWBUtil/ByteCount.swift
+++ b/Sources/SWBUtil/ByteCount.swift
@@ -38,7 +38,7 @@ extension ByteCount: Serializable {
         self.count = try .init(from: deserializer)
     }
 
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         self.count.serialize(to: serializer)
     }
 }
diff --git a/Sources/SWBUtil/ByteString.swift b/Sources/SWBUtil/ByteString.swift
index f13375c5..ad6c8be4 100644
--- a/Sources/SWBUtil/ByteString.swift
+++ b/Sources/SWBUtil/ByteString.swift
@@ -91,11 +91,11 @@ public struct ByteString: ExpressibleByArrayLiteral, Sendable {
         _bytes.hasSuffix(suffix._bytes)
     }
 
-    public static func +=(lhs: inout ByteString, rhs: ByteString) {
+    public static func += (lhs: inout ByteString, rhs: ByteString) {
         lhs = lhs + rhs
     }
 
-    public static func +(lhs: ByteString, rhs: ByteString) -> ByteString {
+    public static func + (lhs: ByteString, rhs: ByteString) -> ByteString {
         return ByteString(lhs._bytes + rhs.bytes)
     }
 }
@@ -109,10 +109,10 @@ extension ByteString: CustomStringConvertible {
 }
 
 /// Hashable conformance for a ByteString.
-extension ByteString: Hashable { }
+extension ByteString: Hashable {}
 
 /// Comparison with strings (as UTF8).
-public func ==(lhs: ByteString, rhs: String) -> Bool {
+public func == (lhs: ByteString, rhs: String) -> Bool {
     // FIXME: Is Swift's String.UTF8View.count O(1)?
     let utf8 = rhs.utf8
     if lhs.bytes.count != utf8.count {
diff --git a/Sources/SWBUtil/Cache.swift b/Sources/SWBUtil/Cache.swift
index eaa9e4e0..484ebb5c 100644
--- a/Sources/SWBUtil/Cache.swift
+++ b/Sources/SWBUtil/Cache.swift
@@ -58,7 +58,7 @@ public final class Cache<Key: Hashable, Value>: NSObject, KeyValueStorage, NSCac
     private let cache: UnsafeNSCacheSendableWrapper<Key, Value>
     private let willEvictCallback: (@Sendable (Value) -> Void)?
 
-    public init(willEvictCallback: (@Sendable (Value)->Void)? = nil, totalCostLimit: Int? = nil) {
+    public init(willEvictCallback: (@Sendable (Value) -> Void)? = nil, totalCostLimit: Int? = nil) {
         self.cache = .init(value: NSCache())
         self.willEvictCallback = willEvictCallback
         super.init()
@@ -88,19 +88,19 @@ public final class Cache<Key: Hashable, Value>: NSObject, KeyValueStorage, NSCac
         }
         set {
             #if os(Linux)
-            if let newValue = newValue {
-                cache.value.setObject(ValueWrapper(newValue), forKey: KeyWrapper(key))
-            } else {
-                cache.value.removeObject(forKey: KeyWrapper(key))
-            }
+                if let newValue = newValue {
+                    cache.value.setObject(ValueWrapper(newValue), forKey: KeyWrapper(key))
+                } else {
+                    cache.value.removeObject(forKey: KeyWrapper(key))
+                }
             #else
-            if let newValue, let cacheableValue = newValue as? (any CacheableValue) {
-                cache.value.setObject(ValueWrapper(newValue), forKey: KeyWrapper(key), cost: cacheableValue.cost)
-            } else if let newValue = newValue {
-                cache.value.setObject(ValueWrapper(newValue), forKey: KeyWrapper(key))
-            } else {
-                cache.value.removeObject(forKey: KeyWrapper(key))
-            }
+                if let newValue, let cacheableValue = newValue as? (any CacheableValue) {
+                    cache.value.setObject(ValueWrapper(newValue), forKey: KeyWrapper(key), cost: cacheableValue.cost)
+                } else if let newValue = newValue {
+                    cache.value.setObject(ValueWrapper(newValue), forKey: KeyWrapper(key))
+                } else {
+                    cache.value.removeObject(forKey: KeyWrapper(key))
+                }
             #endif
         }
     }
@@ -121,14 +121,14 @@ public final class Cache<Key: Hashable, Value>: NSObject, KeyValueStorage, NSCac
 
         let value = try body()
         #if os(Linux)
-        cache.value.setObject(ValueWrapper(value), forKey: wrappedKey)
+            cache.value.setObject(ValueWrapper(value), forKey: wrappedKey)
         #else
-        if let cacheableValue = value as? (any CacheableValue) {
-            cache.value.setObject(ValueWrapper(value), forKey: wrappedKey, cost: cacheableValue.cost)
+            if let cacheableValue = value as? (any CacheableValue) {
+                cache.value.setObject(ValueWrapper(value), forKey: wrappedKey, cost: cacheableValue.cost)
 
-        } else {
-            cache.value.setObject(ValueWrapper(value), forKey: wrappedKey)
-        }
+            } else {
+                cache.value.setObject(ValueWrapper(value), forKey: wrappedKey)
+            }
         #endif
         return value
     }
@@ -140,6 +140,6 @@ public final class Cache<Key: Hashable, Value>: NSObject, KeyValueStorage, NSCac
     }
 }
 
-extension Cache: Sendable where Key: Sendable, Value: Sendable { }
-extension KeyWrapper: Sendable where T: Sendable { }
-extension ValueWrapper: Sendable where T: Sendable { }
+extension Cache: Sendable where Key: Sendable, Value: Sendable {}
+extension KeyWrapper: Sendable where T: Sendable {}
+extension ValueWrapper: Sendable where T: Sendable {}
diff --git a/Sources/SWBUtil/CountedSet.swift b/Sources/SWBUtil/CountedSet.swift
index a1f7287a..77eb4fb1 100644
--- a/Sources/SWBUtil/CountedSet.swift
+++ b/Sources/SWBUtil/CountedSet.swift
@@ -13,7 +13,7 @@
 /// A collection of unique `Element` instances with no defined ordering, but with a per-element count of the number of times that element is present in the counted set.
 // FIXME: We should make CountedSet a CollectionType.
 // FIXME: We should also make CountedSet a SequenceType.
-public struct CountedSet<T: Hashable> : CustomStringConvertible {
+public struct CountedSet<T: Hashable>: CustomStringConvertible {
 
     /// Private mapping from elements to counts.
     private var _elmsToCounts = Dictionary<T, Int>()
@@ -22,7 +22,7 @@ public struct CountedSet<T: Hashable> : CustomStringConvertible {
     private var _totalCount = 0
 
     /// Initializes a new CountedSet with the given elements.
-    public init(_ elements: T ...) {
+    public init(_ elements: T...) {
         for elm in elements {
             insert(elm)
         }
@@ -32,8 +32,7 @@ public struct CountedSet<T: Hashable> : CustomStringConvertible {
     public mutating func insert(_ element: T) {
         if let count = _elmsToCounts[element] {
             _elmsToCounts[element] = count + 1
-        }
-        else {
+        } else {
             _elmsToCounts[element] = 1
         }
         _totalCount += 1
diff --git a/Sources/SWBUtil/Debugger.swift b/Sources/SWBUtil/Debugger.swift
index 7bec1c4b..374499e4 100644
--- a/Sources/SWBUtil/Debugger.swift
+++ b/Sources/SWBUtil/Debugger.swift
@@ -16,31 +16,31 @@ import SWBLibc
 public enum Debugger: Sendable {
     public static func pause() {
         #if os(Windows)
-        DebugActiveProcess(GetCurrentProcessId())
+            DebugActiveProcess(GetCurrentProcessId())
         #else
-        raise(SIGSTOP)
+            raise(SIGSTOP)
         #endif
     }
 
     public static func resume() {
         #if os(Windows)
-        DebugActiveProcessStop(GetCurrentProcessId())
+            DebugActiveProcessStop(GetCurrentProcessId())
         #else
-        raise(SIGCONT)
+            raise(SIGCONT)
         #endif
     }
 
     public static func isAttached() throws -> Bool {
         #if canImport(Darwin)
-        var info = kinfo_proc()
-        var mib: [Int32] = [CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid()]
-        var size = MemoryLayout<kinfo_proc>.stride
-        if sysctl(&mib, u_int(mib.count), &info, &size, nil, 0) != 0 {
-            throw POSIXError(errno, context: "sysctl")
-        }
-        return (info.kp_proc.p_flag & P_TRACED) != 0
+            var info = kinfo_proc()
+            var mib: [Int32] = [CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid()]
+            var size = MemoryLayout<kinfo_proc>.stride
+            if sysctl(&mib, u_int(mib.count), &info, &size, nil, 0) != 0 {
+                throw POSIXError(errno, context: "sysctl")
+            }
+            return (info.kp_proc.p_flag & P_TRACED) != 0
         #else
-        throw StubError.error("Debugger detection is not supported on this platform")
+            throw StubError.error("Debugger detection is not supported on this platform")
         #endif
     }
 
@@ -61,44 +61,44 @@ public enum Debugger: Sendable {
 
     public static func waitForXcodeAutoAttachIfEnabled() async throws {
         #if canImport(Darwin)
-        if isXcodeAutoAttachEnabled {
-            try await waitForAttachment() {
-                // Exit if parent process died while waiting for debugger
-                if kill(getppid(), 0) != 0 { // ignore-unacceptable-language; POSIX API
-                    throw StubError.error("Parent process exited while waiting for debugger")
+            if isXcodeAutoAttachEnabled {
+                try await waitForAttachment() {
+                    // Exit if parent process died while waiting for debugger
+                    if kill(getppid(), 0) != 0 {  // ignore-unacceptable-language; POSIX API
+                        throw StubError.error("Parent process exited while waiting for debugger")
+                    }
+                    return true
                 }
-                return true
             }
-        }
         #else
-        throw StubError.error("Debugger detection is not supported on this platform")
+            throw StubError.error("Debugger detection is not supported on this platform")
         #endif
     }
 
     public static func requestXcodeAutoAttachIfEnabled(_ remoteToolPID: Int32) throws {
         #if canImport(Darwin)
-        if isXcodeAutoAttachEnabled, let sendPipeName = ProcessInfo.processInfo.environment["IB_AUTO_ATTACH_PIPE_NAME"] {
-            let returnPipeName = "/tmp/Xcode.IBCTTAutoAttachPipe.Return.\(getpid()).\(remoteToolPID)"
-            unlink(returnPipeName)
-            let success = mkfifo(returnPipeName, S_IRWXU | S_IRWXG | S_IRWXO) == 0
-
-            if let writeHandle = FileHandle(forWritingAtPath: sendPipeName) {
-                let payload = "\(getpid()).\(remoteToolPID).IBCocoaFramework;"
-                try writeHandle.write(contentsOf: Data(payload.utf8))
-                try writeHandle.close()
-            }
+            if isXcodeAutoAttachEnabled, let sendPipeName = ProcessInfo.processInfo.environment["IB_AUTO_ATTACH_PIPE_NAME"] {
+                let returnPipeName = "/tmp/Xcode.IBCTTAutoAttachPipe.Return.\(getpid()).\(remoteToolPID)"
+                unlink(returnPipeName)
+                let success = mkfifo(returnPipeName, S_IRWXU | S_IRWXG | S_IRWXO) == 0
 
-            if success {
-                if let readHandle = FileHandle(forReadingAtPath: returnPipeName) {
-                    _ = try readHandle.readToEnd()
-                    try readHandle.close()
+                if let writeHandle = FileHandle(forWritingAtPath: sendPipeName) {
+                    let payload = "\(getpid()).\(remoteToolPID).IBCocoaFramework;"
+                    try writeHandle.write(contentsOf: Data(payload.utf8))
+                    try writeHandle.close()
                 }
 
-                unlink(returnPipeName)
+                if success {
+                    if let readHandle = FileHandle(forReadingAtPath: returnPipeName) {
+                        _ = try readHandle.readToEnd()
+                        try readHandle.close()
+                    }
+
+                    unlink(returnPipeName)
+                }
             }
-        }
         #else
-        throw StubError.error("Debugger detection is not supported on this platform")
+            throw StubError.error("Debugger detection is not supported on this platform")
         #endif
     }
 }
diff --git a/Sources/SWBUtil/DependencyInfo.swift b/Sources/SWBUtil/DependencyInfo.swift
index a39141fe..23b28c41 100644
--- a/Sources/SWBUtil/DependencyInfo.swift
+++ b/Sources/SWBUtil/DependencyInfo.swift
@@ -208,7 +208,7 @@ extension DependencyInfo {
             { Opcode.version.bytes(for: [try self.version.validatingEncodability()]) },
             { Opcode.input.bytes(for: try self.inputs.validatingEncodability()) },
             { Opcode.missing.bytes(for: try self.missing.validatingEncodability()) },
-            { Opcode.output.bytes(for: try self.outputs.validatingEncodability()) }
+            { Opcode.output.bytes(for: try self.outputs.validatingEncodability()) },
         ]
         return try operations.map({ try $0() }).reduce(into: [], { result, element in result += element })
     }
diff --git a/Sources/SWBUtil/DiagnosticsEngine.swift b/Sources/SWBUtil/DiagnosticsEngine.swift
index db52c9cc..6942418d 100644
--- a/Sources/SWBUtil/DiagnosticsEngine.swift
+++ b/Sources/SWBUtil/DiagnosticsEngine.swift
@@ -33,7 +33,7 @@ public enum Component: Serializable, Equatable, Hashable, Sendable, Codable {
         case "targetIntegrity":
             self = .targetIntegrity
 
-            // Compatibility cases
+        // Compatibility cases
         case "swiftCompiler":
             self = .clangCompiler(categoryName: "Swift Compiler Error")
         case "parseIssue":
@@ -61,7 +61,7 @@ public enum Component: Serializable, Equatable, Hashable, Sendable, Codable {
         }
     }
 
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serialize(name)
     }
 
@@ -103,7 +103,7 @@ public struct Diagnostic: Equatable, Hashable, Serializable, Sendable, Codable {
         /// - parameter identifier: An opaque string identifying the object.
         case object(identifier: String)
 
-        public func serialize<T>(to serializer: T) where T : Serializer {
+        public func serialize<T>(to serializer: T) where T: Serializer {
             serializer.serializeAggregate(2) {
                 switch self {
                 case let .textual(line, column):
@@ -224,7 +224,7 @@ public struct Diagnostic: Equatable, Hashable, Serializable, Sendable, Codable {
                 switch self {
                 case .unknown:
                     serializer.serialize(LocationType.unknown)
-                    serializer.serialize("") // This is needed so that the number of items in the aggregate is constant no matter the case.
+                    serializer.serialize("")  // This is needed so that the number of items in the aggregate is constant no matter the case.
                 case let .path(path, fileLocation):
                     serializer.serialize(LocationType.path)
                     serializer.beginAggregate(2)
@@ -250,19 +250,23 @@ public struct Diagnostic: Equatable, Hashable, Serializable, Sendable, Codable {
             try deserializer.beginAggregate(2)
             switch try deserializer.deserialize() as LocationType {
             case .unknown:
-                _ = try deserializer.deserialize() as String // This is just a mock for the aggregate and we can ignore the value.
+                _ = try deserializer.deserialize() as String  // This is just a mock for the aggregate and we can ignore the value.
                 self = .unknown
             case .path:
                 try deserializer.beginAggregate(2)
-                self = .path(try deserializer.deserialize(),
-                             fileLocation: try deserializer.deserialize())
+                self = .path(
+                    try deserializer.deserialize(),
+                    fileLocation: try deserializer.deserialize()
+                )
             case .buildSettings:
                 try deserializer.beginAggregate(1)
                 self = .buildSettings(names: try deserializer.deserialize())
             case .buildFiles:
                 try deserializer.beginAggregate(2)
-                self = .buildFiles(try deserializer.deserialize(),
-                                   targetGUID: try deserializer.deserialize())
+                self = .buildFiles(
+                    try deserializer.deserialize(),
+                    targetGUID: try deserializer.deserialize()
+                )
             }
         }
     }
@@ -323,7 +327,7 @@ public struct Diagnostic: Equatable, Hashable, Serializable, Sendable, Codable {
         public let endLine: Int
         public let endColumn: Int
 
-        public func serialize<T>(to serializer: T) where T : Serializer {
+        public func serialize<T>(to serializer: T) where T: Serializer {
             serializer.serializeAggregate(5) {
                 serializer.serialize(path)
                 serializer.serialize(startLine)
@@ -539,7 +543,7 @@ public struct Diagnostic: Equatable, Hashable, Serializable, Sendable, Codable {
         self.childDiagnostics = try deserializer.deserialize()
     }
 
-    public static func ==(lhs: Diagnostic, rhs: Diagnostic) -> Bool {
+    public static func == (lhs: Diagnostic, rhs: Diagnostic) -> Bool {
         // Not the best for performance, but this is only used in unit tests, and making DiagnosticID and DiagnosticData conform to Equatable is nontrivial.
         lhs.formatLocalizedDescription(.debug) == rhs.formatLocalizedDescription(.debug)
     }
diff --git a/Sources/SWBUtil/Dictionary.swift b/Sources/SWBUtil/Dictionary.swift
index 9cdc1e77..e9548a82 100644
--- a/Sources/SWBUtil/Dictionary.swift
+++ b/Sources/SWBUtil/Dictionary.swift
@@ -10,8 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-public extension Dictionary
-{
+public extension Dictionary {
     /// Check if the dictionary contains an entry for `element`.
     func contains(_ element: Key) -> Bool {
         return index(forKey: element) != nil
@@ -77,7 +76,7 @@ public extension Dictionary {
     }
 
     /// Returns the elements of the dictionary, sorted using the given key path as the comparison between elements.
-    @inlinable func sorted<KeyValue: Comparable>( _ areInIncreasingOrder: (KeyValue, KeyValue) throws -> Bool, byKey predicate: (Key) -> KeyValue) rethrows -> [(key: Key, value: Value)] {
+    @inlinable func sorted<KeyValue: Comparable>(_ areInIncreasingOrder: (KeyValue, KeyValue) throws -> Bool, byKey predicate: (Key) -> KeyValue) rethrows -> [(key: Key, value: Value)] {
         return try sorted(byKey: { try areInIncreasingOrder(predicate($0), predicate($1)) })
     }
 
diff --git a/Sources/SWBUtil/ElapsedTimer.swift b/Sources/SWBUtil/ElapsedTimer.swift
index 03680c0c..6cd8f80d 100644
--- a/Sources/SWBUtil/ElapsedTimer.swift
+++ b/Sources/SWBUtil/ElapsedTimer.swift
@@ -69,11 +69,11 @@ public struct ElapsedTimerInterval: Hashable, Sendable {
     }
 
     public var nanoseconds: UInt64 {
-        UInt64(duration.nanoseconds) // always positive
+        UInt64(duration.nanoseconds)  // always positive
     }
 
     public var microseconds: UInt64 {
-        UInt64(duration.microseconds) // always positive
+        UInt64(duration.microseconds)  // always positive
     }
 
     public var seconds: TimeInterval {
diff --git a/Sources/SWBUtil/EmptyState.swift b/Sources/SWBUtil/EmptyState.swift
index 04bfd27b..26f74b7e 100644
--- a/Sources/SWBUtil/EmptyState.swift
+++ b/Sources/SWBUtil/EmptyState.swift
@@ -25,8 +25,8 @@ extension EmptyState {
 }
 
 // Add more types here as needed
-extension Array: EmptyState { }
-extension Path: EmptyState { }
-extension String: EmptyState { }
-extension Substring: EmptyState { }
-extension Set: EmptyState { }
+extension Array: EmptyState {}
+extension Path: EmptyState {}
+extension String: EmptyState {}
+extension Substring: EmptyState {}
+extension Set: EmptyState {}
diff --git a/Sources/SWBUtil/Environment.swift b/Sources/SWBUtil/Environment.swift
index f9fd7087..702adb84 100644
--- a/Sources/SWBUtil/Environment.swift
+++ b/Sources/SWBUtil/Environment.swift
@@ -114,7 +114,8 @@ extension Environment: Collection {
 
 extension Environment: CustomStringConvertible {
     public var description: String {
-        let body = self
+        let body =
+            self
             .sorted { $0.key < $1.key }
             .map { "\"\($0.rawValue)=\($1)\"" }
             .joined(separator: ", ")
diff --git a/Sources/SWBUtil/EnvironmentKey.swift b/Sources/SWBUtil/EnvironmentKey.swift
index 5d27598f..39f490a3 100644
--- a/Sources/SWBUtil/EnvironmentKey.swift
+++ b/Sources/SWBUtil/EnvironmentKey.swift
@@ -51,9 +51,9 @@ extension EnvironmentKey: Encodable {
 extension EnvironmentKey: Equatable {
     public static func == (_ lhs: Self, _ rhs: Self) -> Bool {
         #if os(Windows)
-        lhs.rawValue.lowercased() == rhs.rawValue.lowercased()
+            lhs.rawValue.lowercased() == rhs.rawValue.lowercased()
         #else
-        lhs.rawValue == rhs.rawValue
+            lhs.rawValue == rhs.rawValue
         #endif
     }
 }
@@ -73,9 +73,9 @@ extension EnvironmentKey: Decodable {
 extension EnvironmentKey: Hashable {
     public func hash(into hasher: inout Hasher) {
         #if os(Windows)
-        self.rawValue.lowercased().hash(into: &hasher)
+            self.rawValue.lowercased().hash(into: &hasher)
         #else
-        self.rawValue.hash(into: &hasher)
+            self.rawValue.hash(into: &hasher)
         #endif
     }
 }
diff --git a/Sources/SWBUtil/Error.swift b/Sources/SWBUtil/Error.swift
index 9225b0f5..05e1adb6 100644
--- a/Sources/SWBUtil/Error.swift
+++ b/Sources/SWBUtil/Error.swift
@@ -43,52 +43,51 @@ public enum StubError: Error, LocalizedError, CustomStringConvertible, Serializa
 }
 
 #if canImport(Darwin)
-public struct MacError: Error, CustomStringConvertible, LocalizedError {
-    public let code: OSStatus
-    private let error: NSError
+    public struct MacError: Error, CustomStringConvertible, LocalizedError {
+        public let code: OSStatus
+        private let error: NSError
 
-    public init(_ code: OSStatus) {
-        self.code = code
-        self.error = NSError(domain: NSOSStatusErrorDomain, code: Int(code), userInfo: nil)
-    }
-
-    public var description: String {
-        // <rdar://42459842> No supported API is available for retrieving this information in a nicer way
-        let prefix = "Error Domain=NSOSStatusErrorDomain Code=\(code) \""
-        let suffix = "\""
-        var rawDescription = error.description
-        guard rawDescription.hasPrefix(prefix) else {
-            return rawDescription
+        public init(_ code: OSStatus) {
+            self.code = code
+            self.error = NSError(domain: NSOSStatusErrorDomain, code: Int(code), userInfo: nil)
         }
-        rawDescription = rawDescription.withoutPrefix(prefix)
-        if rawDescription.hasSuffix(suffix) {
-            rawDescription = rawDescription.withoutSuffix(suffix)
-        }
-        let (first, second) = rawDescription.split(":")
 
-        let constant: String
-        let message: String
-        if !second.isEmpty {
-            constant = first
-            message = String(second.dropFirst())
-        } else {
-            constant = ""
-            message = first
-        }
+        public var description: String {
+            // <rdar://42459842> No supported API is available for retrieving this information in a nicer way
+            let prefix = "Error Domain=NSOSStatusErrorDomain Code=\(code) \""
+            let suffix = "\""
+            var rawDescription = error.description
+            guard rawDescription.hasPrefix(prefix) else {
+                return rawDescription
+            }
+            rawDescription = rawDescription.withoutPrefix(prefix)
+            if rawDescription.hasSuffix(suffix) {
+                rawDescription = rawDescription.withoutSuffix(suffix)
+            }
+            let (first, second) = rawDescription.split(":")
 
-        if !constant.isEmpty {
-            return "\(message) (\(constant), \(code))"
-        } else {
-            if message == "(null)" || message.isEmpty {
-                // Provide a friendlier message in these odd cases.
-                return "The operation couldn’t be completed. (\(code))"
+            let constant: String
+            let message: String
+            if !second.isEmpty {
+                constant = first
+                message = String(second.dropFirst())
+            } else {
+                constant = ""
+                message = first
             }
-            else {
-                return "\(message) (\(code))"
+
+            if !constant.isEmpty {
+                return "\(message) (\(constant), \(code))"
+            } else {
+                if message == "(null)" || message.isEmpty {
+                    // Provide a friendlier message in these odd cases.
+                    return "The operation couldn’t be completed. (\(code))"
+                } else {
+                    return "\(message) (\(code))"
+                }
             }
         }
-    }
 
-    public var errorDescription: String? { return description }
-}
+        public var errorDescription: String? { return description }
+    }
 #endif
diff --git a/Sources/SWBUtil/FSProxy.swift b/Sources/SWBUtil/FSProxy.swift
index 7f907cc2..8431ac7b 100644
--- a/Sources/SWBUtil/FSProxy.swift
+++ b/Sources/SWBUtil/FSProxy.swift
@@ -13,9 +13,9 @@
 import SWBLibc
 
 #if canImport(System)
-public import System
+    public import System
 #else
-public import SystemPackage
+    public import SystemPackage
 #endif
 
 public import struct Foundation.CocoaError
@@ -34,14 +34,13 @@ public import struct Foundation.FileAttributeKey
 public import struct Foundation.TimeInterval
 public import class Foundation.NSDictionary
 #if canImport(Darwin)
-import struct ObjectiveC.ObjCBool
+    import struct ObjectiveC.ObjCBool
 #endif
 
 #if os(Windows)
-public import struct WinSDK.HANDLE
+    public import struct WinSDK.HANDLE
 #endif
 
-
 /// File system information for a particular file.
 ///
 /// This is a simple wrapper for stat() information.
@@ -112,7 +111,7 @@ public struct FileInfo: Equatable, Sendable {
         return _readFileAttributePrimitive(fileAttrs[.systemNumber], as: Int32.self) ?? 0
     }
 
-    public static func ==(lhs: FileInfo, rhs: FileInfo) -> Bool {
+    public static func == (lhs: FileInfo, rhs: FileInfo) -> Bool {
         return NSDictionary(dictionary: lhs.fileAttrs).isEqual(NSDictionary(dictionary: rhs.fileAttrs))
     }
 }
@@ -357,10 +356,10 @@ class LocalFS: FSProxy, @unchecked Sendable {
 
     public func moveInSameVolume(_ path: Path, to: Path) throws {
         #if canImport(Darwin)
-        _ = try fileManager.replaceItemAt(URL(fileURLWithPath: to.str), withItemAt: URL(fileURLWithPath: path.str), options: FileManager.ItemReplacementOptions.usingNewMetadataOnly)
+            _ = try fileManager.replaceItemAt(URL(fileURLWithPath: to.str), withItemAt: URL(fileURLWithPath: path.str), options: FileManager.ItemReplacementOptions.usingNewMetadataOnly)
         #else
-        // `replaceItemAt` doesn't work on swift-corelibs-foundation
-        try move(path, to: to)
+            // `replaceItemAt` doesn't work on swift-corelibs-foundation
+            try move(path, to: to)
         #endif
     }
 
@@ -373,17 +372,17 @@ class LocalFS: FSProxy, @unchecked Sendable {
     ///
     /// If the given path is a symlink to a directory, then this will return true if the destination of the symlink is a directory.
     func isDirectory(_ path: Path) -> Bool {
-#if canImport(Darwin)
-        var isDirectory: ObjCBool = false
-        if fileManager.fileExists(atPath: path.str, isDirectory: &isDirectory) {
-            return isDirectory.boolValue
-        }
-#else
-        var isDirectory = false
-        if fileManager.fileExists(atPath: path.str, isDirectory: &isDirectory) {
-            return isDirectory
-        }
-#endif
+        #if canImport(Darwin)
+            var isDirectory: ObjCBool = false
+            if fileManager.fileExists(atPath: path.str, isDirectory: &isDirectory) {
+                return isDirectory.boolValue
+            }
+        #else
+            var isDirectory = false
+            if fileManager.fileExists(atPath: path.str, isDirectory: &isDirectory) {
+                return isDirectory
+            }
+        #endif
         return false
     }
 
@@ -419,19 +418,16 @@ class LocalFS: FSProxy, @unchecked Sendable {
                 if isDirectory(path) {
                     // If the item at the path is a directory, then we're good.  This includes if it's a symlink which points to a directory.
                     return
-                }
-                else if isSymlink(path, &destinationExists) {
+                } else if isSymlink(path, &destinationExists) {
                     // If the item at the path is a symlink, then we check whether it's a broken symlink or points to something that is not a directory.
                     if destinationExists {
                         // The destination does exist, so it's not a directory.
                         throw StubError.error("File is a symbolic link which references a path which is not a directory: \(path.str)")
-                    }
-                    else {
+                    } else {
                         // The destination does not exist - throw an exception because we have a broken symlink.
                         throw StubError.error("File is a broken symbolic link: \(path.str)")
                     }
-                }
-                else {
+                } else {
                     /// The path exists but is not a directory
                     throw StubError.error("File exists but is not a directory: \(path.str)")
                 }
@@ -458,26 +454,26 @@ class LocalFS: FSProxy, @unchecked Sendable {
 
     func createTemporaryDirectory(parent: Path) throws -> Path {
         #if os(Windows)
-        return parent.join("swbuild.tmp." + UUID().description)
+            return parent.join("swbuild.tmp." + UUID().description)
         #else
-        // FIXME: This is an inappropriate location for general purpose infrastructure.
-        let template = [UInt8](parent.join("swbuild.tmp.XXXXXXXX").str.utf8)
-
-        // Create the temp path.
-        let name = UnsafeMutablePointer<CChar>.allocate(capacity: template.count + 1)
-        template.withUnsafeBufferPointer { buf in
-            memcpy(name, buf.baseAddress!, buf.count)
-            name[buf.count] = 0
-        }
+            // FIXME: This is an inappropriate location for general purpose infrastructure.
+            let template = [UInt8](parent.join("swbuild.tmp.XXXXXXXX").str.utf8)
+
+            // Create the temp path.
+            let name = UnsafeMutablePointer<CChar>.allocate(capacity: template.count + 1)
+            template.withUnsafeBufferPointer { buf in
+                memcpy(name, buf.baseAddress!, buf.count)
+                name[buf.count] = 0
+            }
 
-        defer { name.deallocate() }
+            defer { name.deallocate() }
 
-        // Create the temporary directory.
-        guard mkdtemp(name) != nil else {
-            throw POSIXError(errno, context: "mkdtemp", String(cString: name))
-        }
+            // Create the temporary directory.
+            guard mkdtemp(name) != nil else {
+                throw POSIXError(errno, context: "mkdtemp", String(cString: name))
+            }
 
-        return Path(String(cString: name))
+            return Path(String(cString: name))
         #endif
     }
 
@@ -645,108 +641,108 @@ class LocalFS: FSProxy, @unchecked Sendable {
 
     func listExtendedAttributes(_ path: Path) throws -> [String] {
         #if os(Windows)
-        // Implement ADS on Windows? See also https://github.com/swiftlang/swift-foundation/issues/1166
-        return []
+            // Implement ADS on Windows? See also https://github.com/swiftlang/swift-foundation/issues/1166
+            return []
         #elseif os(FreeBSD)
-        // FreeBSD blocked on https://github.com/swiftlang/swift/pull/77836
-        return []
+            // FreeBSD blocked on https://github.com/swiftlang/swift/pull/77836
+            return []
         #elseif os(OpenBSD)
-        // OpenBSD no longer supports extended attributes
-        return []
-        #else
-        #if canImport(Darwin)
-        var size = listxattr(path.str, nil, 0, 0)
-        #else
-        var size = listxattr(path.str, nil, 0)
-        #endif
-        if size == -1 {
-            throw POSIXError(errno, context: "listxattr", path.str)
-        }
-        guard size > 0 else { return [] }
-        let keyList = UnsafeMutableBufferPointer<CChar>.allocate(capacity: size)
-        defer { keyList.deallocate() }
-        #if canImport(Darwin)
-        size = listxattr(path.str, keyList.baseAddress!, size, 0)
+            // OpenBSD no longer supports extended attributes
+            return []
         #else
-        size = listxattr(path.str, keyList.baseAddress!, size)
-        #endif
-        if size == -1 {
-            throw POSIXError(errno, context: "listxattr", path.str)
-        }
-        guard size > 0 else { return [] }
-
-        var extendedAttrs: [String] = []
-        var current = keyList.baseAddress!
-        let end = keyList.baseAddress!.advanced(by: keyList.count)
-        while current < end {
-            let currentKey = String(cString: current)
-            defer { current = current.advanced(by: currentKey.utf8.count) + 1 /* pass null byte */ }
-            extendedAttrs.append(currentKey)
-        }
-        return extendedAttrs
+            #if canImport(Darwin)
+                var size = listxattr(path.str, nil, 0, 0)
+            #else
+                var size = listxattr(path.str, nil, 0)
+            #endif
+            if size == -1 {
+                throw POSIXError(errno, context: "listxattr", path.str)
+            }
+            guard size > 0 else { return [] }
+            let keyList = UnsafeMutableBufferPointer<CChar>.allocate(capacity: size)
+            defer { keyList.deallocate() }
+            #if canImport(Darwin)
+                size = listxattr(path.str, keyList.baseAddress!, size, 0)
+            #else
+                size = listxattr(path.str, keyList.baseAddress!, size)
+            #endif
+            if size == -1 {
+                throw POSIXError(errno, context: "listxattr", path.str)
+            }
+            guard size > 0 else { return [] }
+
+            var extendedAttrs: [String] = []
+            var current = keyList.baseAddress!
+            let end = keyList.baseAddress!.advanced(by: keyList.count)
+            while current < end {
+                let currentKey = String(cString: current)
+                defer { current = current.advanced(by: currentKey.utf8.count) + 1 /* pass null byte */ }
+                extendedAttrs.append(currentKey)
+            }
+            return extendedAttrs
         #endif
     }
 
     func setExtendedAttribute(_ path: Path, key: String, value: ByteString) throws {
         #if os(Windows)
-        // Implement ADS on Windows? See also https://github.com/swiftlang/swift-foundation/issues/1166
+            // Implement ADS on Windows? See also https://github.com/swiftlang/swift-foundation/issues/1166
         #elseif os(FreeBSD)
-        // FreeBSD blocked on https://github.com/swiftlang/swift/pull/77836
+            // FreeBSD blocked on https://github.com/swiftlang/swift/pull/77836
         #elseif os(OpenBSD)
-        // OpenBSD no longer supports extended attributes
+            // OpenBSD no longer supports extended attributes
         #else
-        try value.bytes.withUnsafeBufferPointer { buf throws -> Void in
-            #if canImport(Darwin)
-            let result = setxattr(path.str, key, buf.baseAddress, buf.count, 0, XATTR_NOFOLLOW)
-            #else
-            let result = lsetxattr(path.str, key, buf.baseAddress, buf.count, 0)
-            #endif
-            guard result == 0 else {
-                throw POSIXError(errno, context: "setxattr", path.str, key, value.unsafeStringValue)
+            try value.bytes.withUnsafeBufferPointer { buf throws -> Void in
+                #if canImport(Darwin)
+                    let result = setxattr(path.str, key, buf.baseAddress, buf.count, 0, XATTR_NOFOLLOW)
+                #else
+                    let result = lsetxattr(path.str, key, buf.baseAddress, buf.count, 0)
+                #endif
+                guard result == 0 else {
+                    throw POSIXError(errno, context: "setxattr", path.str, key, value.unsafeStringValue)
+                }
             }
-        }
         #endif
     }
 
     func getExtendedAttribute(_ path: Path, key: String) throws -> ByteString? {
         #if os(Windows)
-        // Implement ADS on Windows? See also https://github.com/swiftlang/swift-foundation/issues/1166
-        return nil
+            // Implement ADS on Windows? See also https://github.com/swiftlang/swift-foundation/issues/1166
+            return nil
         #elseif os(FreeBSD)
-        // FreeBSD blocked on https://github.com/swiftlang/swift/pull/77836
-        return nil
+            // FreeBSD blocked on https://github.com/swiftlang/swift/pull/77836
+            return nil
         #elseif os(OpenBSD)
-        // OpenBSD no longer supports extended attributes
-        return nil
+            // OpenBSD no longer supports extended attributes
+            return nil
         #else
-        var bufferSize = 4096
-        repeat {
-            var data = [UInt8].init(repeating: 0, count: bufferSize)
-            let count: ssize_t = data.withUnsafeMutableBytes {
-                #if canImport(Darwin)
-                return getxattr(path.str, key, $0.baseAddress, $0.count, 0, XATTR_NOFOLLOW)
-                #else
-                return lgetxattr(path.str, key, $0.baseAddress, $0.count)
-                #endif
-            }
-            if count < 0 {
-                switch errno {
-                #if os(Linux) || os(Android)
-                case ENODATA:
-                    return nil
-                #else
-                case ENOATTR:
-                    return nil
-                #endif
-                case ERANGE:
-                    bufferSize *= 2
-                    continue
-                default:
-                    throw POSIXError(errno, context: "getxattr", path.str, key)
+            var bufferSize = 4096
+            repeat {
+                var data = [UInt8].init(repeating: 0, count: bufferSize)
+                let count: ssize_t = data.withUnsafeMutableBytes {
+                    #if canImport(Darwin)
+                        return getxattr(path.str, key, $0.baseAddress, $0.count, 0, XATTR_NOFOLLOW)
+                    #else
+                        return lgetxattr(path.str, key, $0.baseAddress, $0.count)
+                    #endif
                 }
-            }
-            return ByteString(data[0..<count])
-        } while true
+                if count < 0 {
+                    switch errno {
+                    #if os(Linux) || os(Android)
+                        case ENODATA:
+                            return nil
+                    #else
+                        case ENOATTR:
+                            return nil
+                    #endif
+                    case ERANGE:
+                        bufferSize *= 2
+                        continue
+                    default:
+                        throw POSIXError(errno, context: "getxattr", path.str, key)
+                    }
+                }
+                return ByteString(data[0..<count])
+            } while true
         #endif
     }
 
@@ -770,14 +766,14 @@ class LocalFS: FSProxy, @unchecked Sendable {
 
     func isOnPotentiallyRemoteFileSystem(_ path: Path) -> Bool {
         #if os(macOS)
-        var fs = statfs()
-        guard statfs(path.str, &fs) == 0 else {
-            // Conservatively assume path may be remote.
-            return true
-        }
-        return (fs.f_flags & UInt32(bitPattern: MNT_LOCAL)) == 0
+            var fs = statfs()
+            guard statfs(path.str, &fs) == 0 else {
+                // Conservatively assume path may be remote.
+                return true
+            }
+            return (fs.f_flags & UInt32(bitPattern: MNT_LOCAL)) == 0
         #else
-        return false
+            return false
         #endif
     }
 
@@ -794,7 +790,6 @@ class LocalFS: FSProxy, @unchecked Sendable {
     }
 }
 
-
 /// Concrete FSProxy implementation which simulates an empty disk.
 ///
 /// This class is thread-safe and supports
@@ -820,8 +815,7 @@ public class PseudoFS: FSProxy, @unchecked Sendable {
             for item in try listdir(path) {
                 try _copy(path.join(item), to: to.join(item))
             }
-        }
-        else {
+        } else {
             try _copy(path, to: to)
         }
     }
@@ -917,7 +911,7 @@ public class PseudoFS: FSProxy, @unchecked Sendable {
         var device: dev_t
 
         // The extended attributes of the node.
-        var xattrs = [String:ByteString]()
+        var xattrs = [String: ByteString]()
 
         init(_ contents: NodeContents, permissions: Int, timestamp: Int, inode: ino_t, device: dev_t = 1) {
             self.contents = contents
@@ -1066,7 +1060,6 @@ public class PseudoFS: FSProxy, @unchecked Sendable {
             throw POSIXError(ENOTDIR)
         }
 
-
         // Check if the node already exists.
         if let node = directory.contents[path.basename] {
             // Verify it is a directory.
@@ -1191,8 +1184,7 @@ public class PseudoFS: FSProxy, @unchecked Sendable {
         if let node = directory.contents[path.basename] {
             guard case let .file(fileContents) = node.contents else { throw POSIXError(EISDIR) }
             existingContents = append ? fileContents : ByteString()
-        }
-        else {
+        } else {
             existingContents = ByteString()
         }
 
@@ -1237,7 +1229,8 @@ public class PseudoFS: FSProxy, @unchecked Sendable {
 
             // Get the parent node's content if its a directory.
             guard let parent = getNode(path.dirname),
-                  case .directory(let contents) = parent.contents else {
+                case .directory(let contents) = parent.contents
+            else {
                 return
             }
             // Set it to nil to release the contents.
@@ -1264,12 +1257,13 @@ public class PseudoFS: FSProxy, @unchecked Sendable {
             }
 
             let info: [FileAttributeKey: any Sendable] = [
-                .modificationDate : Date(timeIntervalSince1970: TimeInterval(node.timestamp)),
+                .modificationDate: Date(timeIntervalSince1970: TimeInterval(node.timestamp)),
                 .type: type,
                 .size: size,
                 .posixPermissions: node.permissions,
                 .systemNumber: node.device,
-                .systemFileNumber: node.inode]
+                .systemFileNumber: node.inode,
+            ]
             return createFileInfo(info)
         }
     }
@@ -1387,37 +1381,37 @@ public func createFS(simulated: Bool, ignoreFileSystemDeviceInodeChanges: Bool)
 }
 
 #if os(Windows)
-extension HANDLE {
-    /// Runs a closure and then closes the HANDLE, even if an error occurs.
-    ///
-    /// - Parameter body: The closure to run.
-    ///   If the closure throws an error,
-    ///   this method closes the file descriptor before it rethrows that error.
-    ///
-    /// - Returns: The value returned by the closure.
-    ///
-    /// If `body` throws an error
-    /// or an error occurs while closing the file descriptor,
-    /// this method rethrows that error.
-    public func closeAfter<R>(_ body: () throws -> R) throws -> R {
-        // No underscore helper, since the closure's throw isn't necessarily typed.
-        let result: R
-        do {
-            result = try body()
-        } catch {
-            _ = try? self.close() // Squash close error and throw closure's
-            throw error
+    extension HANDLE {
+        /// Runs a closure and then closes the HANDLE, even if an error occurs.
+        ///
+        /// - Parameter body: The closure to run.
+        ///   If the closure throws an error,
+        ///   this method closes the file descriptor before it rethrows that error.
+        ///
+        /// - Returns: The value returned by the closure.
+        ///
+        /// If `body` throws an error
+        /// or an error occurs while closing the file descriptor,
+        /// this method rethrows that error.
+        public func closeAfter<R>(_ body: () throws -> R) throws -> R {
+            // No underscore helper, since the closure's throw isn't necessarily typed.
+            let result: R
+            do {
+                result = try body()
+            } catch {
+                _ = try? self.close()  // Squash close error and throw closure's
+                throw error
+            }
+            try self.close()
+            return result
         }
-        try self.close()
-        return result
-    }
 
-    fileprivate func close() throws {
-        if !CloseHandle(self) {
-            throw Win32Error(GetLastError())
+        fileprivate func close() throws {
+            if !CloseHandle(self) {
+                throw Win32Error(GetLastError())
+            }
         }
     }
-}
 #endif
 
 extension FileDescriptor {
@@ -1438,7 +1432,7 @@ extension FileDescriptor {
         do {
             result = try await body()
         } catch {
-            _ = try? self.close() // Squash close error and throw closure's
+            _ = try? self.close()  // Squash close error and throw closure's
             throw error
         }
         try self.close()
diff --git a/Sources/SWBUtil/GraphAlgorithms.swift b/Sources/SWBUtil/GraphAlgorithms.swift
index e93c7f88..57d1cc2d 100644
--- a/Sources/SWBUtil/GraphAlgorithms.swift
+++ b/Sources/SWBUtil/GraphAlgorithms.swift
@@ -16,7 +16,9 @@
 ///
 /// - Returns: The distance (in number of edges) of the shortest path from the source to the destination, or nil if there is no such path.
 public func minimumDistance<T: Hashable>(
-    from source: T, to destination: T, successors: (T) throws -> [T]
+    from source: T,
+    to destination: T,
+    successors: (T) throws -> [T]
 ) rethrows -> Int? {
     var queue = Queue([(distance: 0, source)])
     var visited = Set([source])
@@ -48,7 +50,9 @@ public func minimumDistance<T: Hashable>(
 ///
 /// - Returns: The shortest path (starting with the source and ending with the destination), or nil if there is no such path.
 public func shortestPath<T: Hashable>(
-    from source: T, to destination: T, successors: (T) throws -> [T]
+    from source: T,
+    to destination: T,
+    successors: (T) throws -> [T]
 ) rethrows -> [T]? {
     var queue = Queue([[source]])
     var visited = Set([source])
@@ -80,8 +84,9 @@ public func shortestPath<T: Hashable>(
 ///         not automatically include `nodes` unless present in the relation defined by
 ///         `successors`.
 public func transitiveClosure<T>(
-    _ nodes: [T], successors: (T) throws -> [T]
-    ) rethrows -> (result: OrderedSet<T>, dupes: OrderedSet<T>) {
+    _ nodes: [T],
+    successors: (T) throws -> [T]
+) rethrows -> (result: OrderedSet<T>, dupes: OrderedSet<T>) {
     var dupes = OrderedSet<T>()
     var result = OrderedSet<T>()
 
diff --git a/Sources/SWBUtil/HashContext.swift b/Sources/SWBUtil/HashContext.swift
index 916adc37..a7b9a922 100644
--- a/Sources/SWBUtil/HashContext.swift
+++ b/Sources/SWBUtil/HashContext.swift
@@ -11,9 +11,9 @@
 //===----------------------------------------------------------------------===//
 
 #if os(Windows)
-import WinSDK
+    import WinSDK
 #elseif canImport(CryptoKit)
-private import CryptoKit
+    private import CryptoKit
 #endif
 
 public import Foundation
@@ -45,104 +45,104 @@ extension HashContext {
 }
 
 #if os(Windows)
-fileprivate final class BCryptHashContext: HashContext {
-    private let digestLength: Int
-    private var hAlgorithm: BCRYPT_ALG_HANDLE?
-    private var hash: BCRYPT_HASH_HANDLE?
-
-    @usableFromInline
-    internal var result: ByteString?
-
-    public init(algorithm: String, digestLength: Int) {
-        self.digestLength = digestLength
-        algorithm.withCString(encodedAs: UTF16.self) { wName in
-            precondition(BCryptOpenAlgorithmProvider(&hAlgorithm, wName, nil, 0) == 0)
+    fileprivate final class BCryptHashContext: HashContext {
+        private let digestLength: Int
+        private var hAlgorithm: BCRYPT_ALG_HANDLE?
+        private var hash: BCRYPT_HASH_HANDLE?
+
+        @usableFromInline
+        internal var result: ByteString?
+
+        public init(algorithm: String, digestLength: Int) {
+            self.digestLength = digestLength
+            algorithm.withCString(encodedAs: UTF16.self) { wName in
+                precondition(BCryptOpenAlgorithmProvider(&hAlgorithm, wName, nil, 0) == 0)
+            }
+            precondition(BCryptCreateHash(hAlgorithm, &hash, nil, 0, nil, 0, 0) == 0)
         }
-        precondition(BCryptCreateHash(hAlgorithm, &hash, nil, 0, nil, 0, 0) == 0)
-    }
-
-    deinit {
-        precondition(BCryptDestroyHash(hash) == 0)
-        precondition(BCryptCloseAlgorithmProvider(hAlgorithm, 0) == 0)
-    }
 
-    public func add<D: DataProtocol>(bytes: D) {
-        precondition(result == nil, "tried to add additional context to a finalized HashContext")
-        var byteArray = Array(bytes)
-        byteArray.withUnsafeMutableBufferPointer { buffer in
-            precondition(BCryptHashData(hash, buffer.baseAddress, numericCast(buffer.count), 0) == 0)
+        deinit {
+            precondition(BCryptDestroyHash(hash) == 0)
+            precondition(BCryptCloseAlgorithmProvider(hAlgorithm, 0) == 0)
         }
-    }
 
-    public var signature: ByteString {
-        guard let result = self.result else {
-            let digest = withUnsafeTemporaryAllocation(of: UInt8.self, capacity: digestLength) {
-                precondition(BCryptFinishHash(hash, $0.baseAddress, numericCast($0.count), 0) == 0)
-                return Array($0)
+        public func add<D: DataProtocol>(bytes: D) {
+            precondition(result == nil, "tried to add additional context to a finalized HashContext")
+            var byteArray = Array(bytes)
+            byteArray.withUnsafeMutableBufferPointer { buffer in
+                precondition(BCryptHashData(hash, buffer.baseAddress, numericCast(buffer.count), 0) == 0)
             }
-            let byteCount = digestLength
+        }
+
+        public var signature: ByteString {
+            guard let result = self.result else {
+                let digest = withUnsafeTemporaryAllocation(of: UInt8.self, capacity: digestLength) {
+                    precondition(BCryptFinishHash(hash, $0.baseAddress, numericCast($0.count), 0) == 0)
+                    return Array($0)
+                }
+                let byteCount = digestLength
 
-            var result = [UInt8](repeating: 0, count: Int(byteCount) * 2)
+                var result = [UInt8](repeating: 0, count: Int(byteCount) * 2)
 
-            digest.withUnsafeBytes { ptr in
-                for i in 0..<byteCount {
-                    let value = ptr[i]
-                    result[i*2 + 0] = hexchar(value >> 4)
-                    result[i*2 + 1] = hexchar(value & 0x0F)
+                digest.withUnsafeBytes { ptr in
+                    for i in 0..<byteCount {
+                        let value = ptr[i]
+                        result[i * 2 + 0] = hexchar(value >> 4)
+                        result[i * 2 + 1] = hexchar(value & 0x0F)
+                    }
                 }
-            }
 
-            let tmp = ByteString(result)
-            self.result = tmp
-            return tmp
+                let tmp = ByteString(result)
+                self.result = tmp
+                return tmp
+            }
+            return result
         }
-        return result
     }
-}
 
-@available(*, unavailable)
-extension BCryptHashContext: Sendable { }
+    @available(*, unavailable)
+    extension BCryptHashContext: Sendable {}
 #elseif canImport(CryptoKit)
-fileprivate final class SwiftCryptoHashContext<HF: HashFunction>: HashContext {
-    @usableFromInline
-    internal var hash = HF()
+    fileprivate final class SwiftCryptoHashContext<HF: HashFunction>: HashContext {
+        @usableFromInline
+        internal var hash = HF()
 
-    @usableFromInline
-    internal var result: ByteString?
+        @usableFromInline
+        internal var result: ByteString?
 
-    public init() {
-    }
+        public init() {
+        }
 
-    public func add<D: DataProtocol>(bytes: D) {
-        precondition(result == nil, "tried to add additional context to a finalized HashContext")
-        hash.update(data: bytes)
-    }
+        public func add<D: DataProtocol>(bytes: D) {
+            precondition(result == nil, "tried to add additional context to a finalized HashContext")
+            hash.update(data: bytes)
+        }
 
-    public var signature: ByteString {
-        guard let result = self.result else {
-            let digest = hash.finalize()
-            let byteCount = type(of: digest).byteCount
+        public var signature: ByteString {
+            guard let result = self.result else {
+                let digest = hash.finalize()
+                let byteCount = type(of: digest).byteCount
 
-            var result = [UInt8](repeating: 0, count: Int(byteCount) * 2)
+                var result = [UInt8](repeating: 0, count: Int(byteCount) * 2)
 
-            digest.withUnsafeBytes { ptr in
-                for i in 0..<byteCount {
-                    let value = ptr[i]
-                    result[i*2 + 0] = hexchar(value >> 4)
-                    result[i*2 + 1] = hexchar(value & 0x0F)
+                digest.withUnsafeBytes { ptr in
+                    for i in 0..<byteCount {
+                        let value = ptr[i]
+                        result[i * 2 + 0] = hexchar(value >> 4)
+                        result[i * 2 + 1] = hexchar(value & 0x0F)
+                    }
                 }
-            }
 
-            let tmp = ByteString(result)
-            self.result = tmp
-            return tmp
+                let tmp = ByteString(result)
+                self.result = tmp
+                return tmp
+            }
+            return result
         }
-        return result
     }
-}
 
-@available(*, unavailable)
-extension SwiftCryptoHashContext: Sendable { }
+    @available(*, unavailable)
+    extension SwiftCryptoHashContext: Sendable {}
 #endif
 
 fileprivate final class VendoredSHA256HashContext: HashContext {
@@ -154,7 +154,7 @@ fileprivate final class VendoredSHA256HashContext: HashContext {
 
     /// The initial hash value.
     private static let initalHashValue: [UInt32] = [
-        0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19
+        0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19,
     ]
 
     /// The constants in the algorithm (K).
@@ -166,7 +166,7 @@ fileprivate final class VendoredSHA256HashContext: HashContext {
         0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
         0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
         0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
-        0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
+        0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2,
     ]
 
     private var bytes: OutputByteStream
@@ -175,19 +175,19 @@ fileprivate final class VendoredSHA256HashContext: HashContext {
         self.bytes = .init()
     }
 
-    func add<D>(bytes: D) where D : DataProtocol {
+    func add<D>(bytes: D) where D: DataProtocol {
         self.bytes.write(bytes)
     }
 
     var signature: ByteString {
-        let digest =  self.hash(self.bytes.bytes)
+        let digest = self.hash(self.bytes.bytes)
         var result = [UInt8](repeating: 0, count: Int(digest.count) * 2)
 
         digest.bytes.withUnsafeBufferPointer { ptr in
             for i in 0..<ptr.count {
                 let value = ptr[i]
-                result[i*2 + 0] = hexchar(value >> 4)
-                result[i*2 + 1] = hexchar(value & 0x0F)
+                result[i * 2 + 0] = hexchar(value >> 4)
+                result[i * 2 + 1] = hexchar(value & 0x0F)
             }
         }
 
@@ -234,14 +234,14 @@ fileprivate final class VendoredSHA256HashContext: HashContext {
             case 0...15:
                 let index = block.startIndex.advanced(by: t * 4)
                 // Put 4 bytes in each message.
-                W[t]  = UInt32(block[index + 0]) << 24
+                W[t] = UInt32(block[index + 0]) << 24
                 W[t] |= UInt32(block[index + 1]) << 16
                 W[t] |= UInt32(block[index + 2]) << 8
                 W[t] |= UInt32(block[index + 3])
             default:
-                let σ1 = W[t-2].rotateRight(by: 17) ^ W[t-2].rotateRight(by: 19) ^ (W[t-2] >> 10)
-                let σ0 = W[t-15].rotateRight(by: 7) ^ W[t-15].rotateRight(by: 18) ^ (W[t-15] >> 3)
-                W[t] = σ1 &+ W[t-7] &+ σ0 &+ W[t-16]
+                let σ1 = W[t - 2].rotateRight(by: 17) ^ W[t - 2].rotateRight(by: 19) ^ (W[t - 2] >> 10)
+                let σ0 = W[t - 15].rotateRight(by: 7) ^ W[t - 15].rotateRight(by: 18) ^ (W[t - 15] >> 3)
+                W[t] = σ1 &+ W[t - 7] &+ σ0 &+ W[t - 16]
             }
         }
 
@@ -367,29 +367,29 @@ public class DelegatedHashContext: HashContext {
 public final class InsecureHashContext: DelegatedHashContext {
     public init() {
         #if os(Windows)
-        super.init(impl: BCryptHashContext(algorithm: "MD5", digestLength: 16))
+            super.init(impl: BCryptHashContext(algorithm: "MD5", digestLength: 16))
         #elseif canImport(CryptoKit)
-        super.init(impl: SwiftCryptoHashContext<Insecure.MD5>())
+            super.init(impl: SwiftCryptoHashContext<Insecure.MD5>())
         #else
-        super.init(impl: VendoredSHA256HashContext())
+            super.init(impl: VendoredSHA256HashContext())
         #endif
     }
 }
 
 @available(*, unavailable)
-extension InsecureHashContext: Sendable { }
+extension InsecureHashContext: Sendable {}
 
 public final class SHA256Context: DelegatedHashContext {
     public init() {
         #if os(Windows)
-        super.init(impl: BCryptHashContext(algorithm: "SHA256", digestLength: 32))
+            super.init(impl: BCryptHashContext(algorithm: "SHA256", digestLength: 32))
         #elseif canImport(CryptoKit)
-        super.init(impl: SwiftCryptoHashContext<SHA256>())
+            super.init(impl: SwiftCryptoHashContext<SHA256>())
         #else
-        super.init(impl: VendoredSHA256HashContext())
+            super.init(impl: VendoredSHA256HashContext())
         #endif
     }
 }
 
 @available(*, unavailable)
-extension SHA256Context: Sendable { }
+extension SHA256Context: Sendable {}
diff --git a/Sources/SWBUtil/Headermap.swift b/Sources/SWBUtil/Headermap.swift
index 87c09c70..0ed5c819 100644
--- a/Sources/SWBUtil/Headermap.swift
+++ b/Sources/SWBUtil/Headermap.swift
@@ -147,7 +147,7 @@ public struct Headermap: Sendable {
 
         self.numEntries = Int(header.numEntries)
         let numBuckets = Int(header.numBuckets)
-        self.buckets = bytes.withUnsafeBufferPointer{
+        self.buckets = bytes.withUnsafeBufferPointer {
             let bucketsStart = $0.baseAddress! + MemoryLayout<Header>.size
             return bucketsStart.withMemoryRebound(to: Bucket.self, capacity: numBuckets) {
                 return [Bucket](UnsafeBufferPointer(start: $0, count: numBuckets))
@@ -170,7 +170,7 @@ public struct Headermap: Sendable {
         // Validate each of the buckets.
         let stringTableSize = Int32(stringTable.count)
         for bucket in self.buckets {
-            guard bucket.keyIndex  < stringTableSize && bucket.prefixIndex  < stringTableSize && bucket.suffixIndex  < stringTableSize else {
+            guard bucket.keyIndex < stringTableSize && bucket.prefixIndex < stringTableSize && bucket.suffixIndex < stringTableSize else {
                 throw Error.invalidHeadermap("invalid header (invalid bucket index)")
             }
         }
@@ -190,7 +190,7 @@ public struct Headermap: Sendable {
         // Insert the new entry bucket.
         let key = [UInt8](key.str.utf8)
         let keyIndex = getStringIndex(key)
-        let (dirname,basename) = value.split()
+        let (dirname, basename) = value.split()
         let prefixIndex: Int32, suffixIndex: Int32
         if dirname.isEmpty {
             prefixIndex = 0
@@ -199,7 +199,7 @@ public struct Headermap: Sendable {
             prefixIndex = getStringIndex([UInt8](dirname.str.utf8) + [Path.pathSeparatorUTF8])
             suffixIndex = getStringIndex([UInt8](basename.utf8))
         }
-        insertItem(key[0 ..< key.endIndex], keyIndex: keyIndex, prefixIndex: prefixIndex, suffixIndex: suffixIndex, replace: replace)
+        insertItem(key[0..<key.endIndex], keyIndex: keyIndex, prefixIndex: prefixIndex, suffixIndex: suffixIndex, replace: replace)
     }
 
     /// Return the serialized little-endian headermap representation.
@@ -241,9 +241,9 @@ public struct Headermap: Sendable {
         precondition(index < stringTable.count)
 
         // Find the end index.
-        for i in index ..< stringTable.count {
+        for i in index..<stringTable.count {
             if stringTable[i] == 0 {
-                return stringTable[index ..< i]
+                return stringTable[index..<i]
             }
         }
 
@@ -284,7 +284,7 @@ public struct Headermap: Sendable {
     private mutating func insertItem(_ key: ArraySlice<UInt8>, keyIndex: Int32, prefixIndex: Int32, suffixIndex: Int32, replace: Bool = true) {
         assert(buckets.count.isPowerOfTwo())
         let hash = Headermap.hashBytes(key)
-        for i in 0 ..< buckets.count {
+        for i in 0..<buckets.count {
             let index = (hash + i) & (buckets.count - 1)
 
             // If we found a free bucket or one with the same key, insert.
@@ -313,7 +313,7 @@ public struct Headermap: Sendable {
         }
 
         // Otherwise, compare without case sensitivity.
-        for offset in 0 ..< stringTable.count {
+        for offset in 0..<stringTable.count {
             let lhsChar = tolower(Int32(stringTable[Int(lhs) + offset]))
             let rhsChar = tolower(Int32(stringTable[Int(rhs) + offset]))
             if lhsChar != rhsChar {
diff --git a/Sources/SWBUtil/HeavyCache.swift b/Sources/SWBUtil/HeavyCache.swift
index e829ee6e..320166aa 100644
--- a/Sources/SWBUtil/HeavyCache.swift
+++ b/Sources/SWBUtil/HeavyCache.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #if canImport(os)
-import os
+    import os
 #endif
 
 import Synchronization
@@ -76,7 +76,7 @@ public final class HeavyCache<Key: Hashable & Sendable, Value: Sendable>: _Heavy
 
     fileprivate final class Entry: Sendable {
         /// Empty helper type to prove exclusive access to `accessTime` without storing a mutex for each instance.
-        struct Witness: ~Copyable { }
+        struct Witness: ~Copyable {}
 
         /// The actual value.
         let value: Value
@@ -224,8 +224,7 @@ public final class HeavyCache<Key: Hashable & Sendable, Value: Sendable>: _Heavy
         // Prune one item at a time. This is not efficient for pruning large numbers of items, but that is not the intended use case currently.
         //
         // We take some care to make sure we drop keys already evicted by the underlying cache before anything else.
-    whileLoop:
-        while _keys.count > max {
+        whileLoop: while _keys.count > max {
             // Prune the oldest entry.
             var oldest: (key: Key, entry: Entry)? = nil
             for key in _keys {
diff --git a/Sources/SWBUtil/IO.swift b/Sources/SWBUtil/IO.swift
index 07420339..f79d03aa 100644
--- a/Sources/SWBUtil/IO.swift
+++ b/Sources/SWBUtil/IO.swift
@@ -13,9 +13,9 @@
 import Foundation
 
 #if canImport(System)
-public import System
+    public import System
 #else
-public import SystemPackage
+    public import SystemPackage
 #endif
 
 public struct IOPipe: Sendable {
@@ -32,9 +32,9 @@ public struct IOPipe: Sendable {
 extension FileDescriptor {
     public func setBinaryMode() throws {
         #if os(Windows)
-        if _setmode(rawValue, _O_BINARY) == -1 {
-            throw Errno(rawValue: errno)
-        }
+            if _setmode(rawValue, _O_BINARY) == -1 {
+                throw Errno(rawValue: errno)
+            }
         #endif
     }
 }
diff --git a/Sources/SWBUtil/IndexStore.swift b/Sources/SWBUtil/IndexStore.swift
index 8b4515fc..b4938653 100644
--- a/Sources/SWBUtil/IndexStore.swift
+++ b/Sources/SWBUtil/IndexStore.swift
@@ -89,7 +89,7 @@ private final class IndexStoreImpl {
 
         for objectFile in objectFiles {
             // Get the records of this object file.
-            guard let unitReader = try? self.api.call ({ self.api.fn.unit_reader_create(store, unitName(object: objectFile), &$0) }) else {
+            guard let unitReader = try? self.api.call({ self.api.fn.unit_reader_create(store, unitName(object: objectFile), &$0) }) else {
                 continue
             }
             let records = try getRecords(unitReader: unitReader)
@@ -113,7 +113,7 @@ private final class IndexStoreImpl {
 
             if let parentClassName = inheritance[moduleName]?[className] {
                 let parentMethods = flatten(moduleName: moduleName, className: parentClassName)
-                allMethods.merge(parentMethods, uniquingKeysWith:  { (lhs, _) in lhs })
+                allMethods.merge(parentMethods, uniquingKeysWith: { (lhs, _) in lhs })
             }
 
             for method in testMethods[moduleName]?[className] ?? [] {
@@ -136,11 +136,10 @@ private final class IndexStoreImpl {
         return testCaseClasses
     }
 
-
     @available(*, deprecated, message: "use listTests(in:) instead")
     public func listTests(inObjectFile object: Path) throws -> [TestCaseClass] {
         // Get the records of this object file.
-        let unitReader = try api.call{ self.api.fn.unit_reader_create(store, unitName(object: object), &$0) }
+        let unitReader = try api.call { self.api.fn.unit_reader_create(store, unitName(object: object), &$0) }
         let records = try getRecords(unitReader: unitReader)
 
         // Get the test classes.
@@ -178,15 +177,15 @@ private final class IndexStoreImpl {
         return testCaseClasses
     }
 
-    private func getTestsInfo(record: String) throws -> (inheritance: [String: String], testMethods: [String: [(name: String, async: Bool)]] ) {
-        let recordReader = try api.call{ self.api.fn.record_reader_create(store, record, &$0) }
+    private func getTestsInfo(record: String) throws -> (inheritance: [String: String], testMethods: [String: [(name: String, async: Bool)]]) {
+        let recordReader = try api.call { self.api.fn.record_reader_create(store, record, &$0) }
 
         // scan for inheritance
 
         let inheritanceStoreRef = StoreRef([String: String](), api: self.api)
         let inheritancePointer = unsafeBitCast(Unmanaged.passUnretained(inheritanceStoreRef), to: UnsafeMutableRawPointer.self)
 
-        _ = self.api.fn.record_reader_occurrences_apply_f(recordReader, inheritancePointer) { inheritancePointer , occ -> Bool in
+        _ = self.api.fn.record_reader_occurrences_apply_f(recordReader, inheritancePointer) { inheritancePointer, occ -> Bool in
             let inheritanceStoreRef = Unmanaged<StoreRef<[String: String?]>>.fromOpaque(inheritancePointer!).takeUnretainedValue()
             let fn = inheritanceStoreRef.api.fn
 
@@ -197,7 +196,7 @@ private final class IndexStoreImpl {
             if symbolProperties & UInt64(INDEXSTORE_SYMBOL_PROPERTY_UNITTEST.rawValue) == 0 {
                 return true
             }
-            if fn.symbol_get_kind(sym) != INDEXSTORE_SYMBOL_KIND_CLASS{
+            if fn.symbol_get_kind(sym) != INDEXSTORE_SYMBOL_KIND_CLASS {
                 return true
             }
 
@@ -232,7 +231,7 @@ private final class IndexStoreImpl {
         let testMethodsStoreRef = StoreRef([String: [(name: String, async: Bool)]](), api: api)
         let testMethodsPointer = unsafeBitCast(Unmanaged.passUnretained(testMethodsStoreRef), to: UnsafeMutableRawPointer.self)
 
-        _ = self.api.fn.record_reader_occurrences_apply_f(recordReader, testMethodsPointer) { testMethodsPointer , occ -> Bool in
+        _ = self.api.fn.record_reader_occurrences_apply_f(recordReader, testMethodsPointer) { testMethodsPointer, occ -> Bool in
             let testMethodsStoreRef = Unmanaged<StoreRef<[String: [(name: String, async: Bool)]]>>.fromOpaque(testMethodsPointer!).takeUnretainedValue()
             let fn = testMethodsStoreRef.api.fn
 
@@ -285,7 +284,7 @@ private final class IndexStoreImpl {
         let builder = StoreRef([String](), api: api)
 
         let ctx = unsafeBitCast(Unmanaged.passUnretained(builder), to: UnsafeMutableRawPointer.self)
-        _ = self.api.fn.unit_reader_dependencies_apply_f(unitReader, ctx) { ctx , unit -> Bool in
+        _ = self.api.fn.unit_reader_dependencies_apply_f(unitReader, ctx) { ctx, unit -> Bool in
             let store = Unmanaged<StoreRef<[String]>>.fromOpaque(ctx!).takeUnretainedValue()
             let fn = store.api.fn
             if fn.unit_dependency_get_kind(unit) == INDEXSTORE_UNIT_DEPENDENCY_RECORD {
@@ -356,22 +355,22 @@ private final class IndexStoreAPIImpl {
 
         var api = swiftbuild_indexstore_functions_t()
         api.store_create = Library.lookup(dylib, "indexstore_store_create")
-        api.store_get_unit_name_from_output_path = Library.lookup(dylib,  "indexstore_store_get_unit_name_from_output_path")
-        api.unit_reader_create = Library.lookup(dylib,  "indexstore_unit_reader_create")
-        api.error_get_description = Library.lookup(dylib,  "indexstore_error_get_description")
-        api.unit_reader_dependencies_apply_f = Library.lookup(dylib,  "indexstore_unit_reader_dependencies_apply_f")
-        api.unit_reader_get_module_name = Library.lookup(dylib,  "indexstore_unit_reader_get_module_name")
-        api.unit_dependency_get_kind = Library.lookup(dylib,  "indexstore_unit_dependency_get_kind")
-        api.unit_dependency_get_name = Library.lookup(dylib,  "indexstore_unit_dependency_get_name")
-        api.record_reader_create = Library.lookup(dylib,  "indexstore_record_reader_create")
-        api.symbol_get_name = Library.lookup(dylib,  "indexstore_symbol_get_name")
-        api.symbol_get_properties = Library.lookup(dylib,  "indexstore_symbol_get_properties")
-        api.symbol_get_kind = Library.lookup(dylib,  "indexstore_symbol_get_kind")
-        api.record_reader_occurrences_apply_f = Library.lookup(dylib,  "indexstore_record_reader_occurrences_apply_f")
-        api.occurrence_get_symbol = Library.lookup(dylib,  "indexstore_occurrence_get_symbol")
-        api.occurrence_relations_apply_f = Library.lookup(dylib,  "indexstore_occurrence_relations_apply_f")
-        api.symbol_relation_get_symbol = Library.lookup(dylib,  "indexstore_symbol_relation_get_symbol")
-        api.symbol_relation_get_roles = Library.lookup(dylib,  "indexstore_symbol_relation_get_roles")
+        api.store_get_unit_name_from_output_path = Library.lookup(dylib, "indexstore_store_get_unit_name_from_output_path")
+        api.unit_reader_create = Library.lookup(dylib, "indexstore_unit_reader_create")
+        api.error_get_description = Library.lookup(dylib, "indexstore_error_get_description")
+        api.unit_reader_dependencies_apply_f = Library.lookup(dylib, "indexstore_unit_reader_dependencies_apply_f")
+        api.unit_reader_get_module_name = Library.lookup(dylib, "indexstore_unit_reader_get_module_name")
+        api.unit_dependency_get_kind = Library.lookup(dylib, "indexstore_unit_dependency_get_kind")
+        api.unit_dependency_get_name = Library.lookup(dylib, "indexstore_unit_dependency_get_name")
+        api.record_reader_create = Library.lookup(dylib, "indexstore_record_reader_create")
+        api.symbol_get_name = Library.lookup(dylib, "indexstore_symbol_get_name")
+        api.symbol_get_properties = Library.lookup(dylib, "indexstore_symbol_get_properties")
+        api.symbol_get_kind = Library.lookup(dylib, "indexstore_symbol_get_kind")
+        api.record_reader_occurrences_apply_f = Library.lookup(dylib, "indexstore_record_reader_occurrences_apply_f")
+        api.occurrence_get_symbol = Library.lookup(dylib, "indexstore_occurrence_get_symbol")
+        api.occurrence_relations_apply_f = Library.lookup(dylib, "indexstore_occurrence_relations_apply_f")
+        api.symbol_relation_get_symbol = Library.lookup(dylib, "indexstore_symbol_relation_get_symbol")
+        api.symbol_relation_get_roles = Library.lookup(dylib, "indexstore_symbol_relation_get_roles")
 
         self.fn = api
     }
diff --git a/Sources/SWBUtil/InterningArena.swift b/Sources/SWBUtil/InterningArena.swift
index 11ca1435..7a7b1077 100644
--- a/Sources/SWBUtil/InterningArena.swift
+++ b/Sources/SWBUtil/InterningArena.swift
@@ -54,7 +54,7 @@ public final class InterningArena<T: Hashable & Sendable> {
 }
 
 @available(*, unavailable)
-extension InterningArena: Sendable { }
+extension InterningArena: Sendable {}
 
 public final class FrozenInterningArena<T: Hashable & Sendable>: Sendable {
     private let items: [T]
diff --git a/Sources/SWBUtil/JSONEncoder.swift b/Sources/SWBUtil/JSONEncoder.swift
index ba58273d..f763d699 100644
--- a/Sources/SWBUtil/JSONEncoder.swift
+++ b/Sources/SWBUtil/JSONEncoder.swift
@@ -27,7 +27,7 @@ extension JSONEncoder {
 }
 
 extension JSONDecoder {
-    public func decode<T>(_ type: T.Type, from path: Path, fs: any FSProxy) throws -> T where T : Decodable {
+    public func decode<T>(_ type: T.Type, from path: Path, fs: any FSProxy) throws -> T where T: Decodable {
         let data = try fs.read(path)
         do {
             return try decode(type, from: Data(data))
diff --git a/Sources/SWBUtil/LazyCache.swift b/Sources/SWBUtil/LazyCache.swift
index b9a64799..ff0c9c22 100644
--- a/Sources/SWBUtil/LazyCache.swift
+++ b/Sources/SWBUtil/LazyCache.swift
@@ -15,36 +15,36 @@ import Synchronization
 
 // Workaround compiler crash: rdar://138854389 (Compiler crashes when compiling code using a Mutex with an Optional)
 #if os(Windows)
-private struct Storage<T> {
-    let _value: Any?
+    private struct Storage<T> {
+        let _value: Any?
 
-    init(value: T? = nil) { _value = value }
+        init(value: T? = nil) { _value = value }
 
-    var value: T? {
-        _value as! T?
-    }
+        var value: T? {
+            _value as! T?
+        }
 
-    static var none: Storage {
-        .init()
-    }
+        static var none: Storage {
+            .init()
+        }
 
-    static func some(_ value: T) -> Storage {
-        .init(value: value)
+        static func some(_ value: T) -> Storage {
+            .init(value: value)
+        }
     }
-}
-private typealias LazyStorage = Storage
+    private typealias LazyStorage = Storage
 #else
-private typealias LazyStorage = Optional
-fileprivate extension Optional {
-    var value: Wrapped? {
-        switch self {
-        case let .some(wrapped):
-            return wrapped
-        case .none:
-            return nil
+    private typealias LazyStorage = Optional
+    fileprivate extension Optional {
+        var value: Wrapped? {
+            switch self {
+            case let .some(wrapped):
+                return wrapped
+            case .none:
+                return nil
+            }
         }
     }
-}
 #endif
 
 /// Wrapper for thread-safe lazily computed values.
diff --git a/Sources/SWBUtil/Library.swift b/Sources/SWBUtil/Library.swift
index 3412bbb1..0afd2cc0 100644
--- a/Sources/SWBUtil/Library.swift
+++ b/Sources/SWBUtil/Library.swift
@@ -14,9 +14,9 @@ import SWBCLibc
 public import SWBLibc
 
 #if canImport(System)
-import System
+    import System
 #else
-import SystemPackage
+    import SystemPackage
 #endif
 
 public enum Library: Sendable {
@@ -33,54 +33,54 @@ public enum Library: Sendable {
     @_alwaysEmitIntoClient
     public static func open(_ path: Path) throws -> LibraryHandle {
         #if os(Windows)
-        guard let handle = try path.withPlatformString({ p in try p.withCanonicalPathRepresentation({ LoadLibraryW($0) }) }) else {
-            throw LibraryOpenError(message: Win32Error(GetLastError()).description)
-        }
-        return LibraryHandle(rawValue: handle)
-        #else
-        #if canImport(Darwin)
-        let flags = RTLD_LAZY | RTLD_FIRST
+            guard let handle = try path.withPlatformString({ p in try p.withCanonicalPathRepresentation({ LoadLibraryW($0) }) }) else {
+                throw LibraryOpenError(message: Win32Error(GetLastError()).description)
+            }
+            return LibraryHandle(rawValue: handle)
         #else
-        let flags = RTLD_LAZY
-        #endif
-        guard let handle = path.withPlatformString({ (p: UnsafePointer<CChar>) in dlopen(p, flags) }) else {
-            #if os(Android)
-            throw LibraryOpenError(message: String(cString: dlerror()!))
+            #if canImport(Darwin)
+                let flags = RTLD_LAZY | RTLD_FIRST
             #else
-            throw LibraryOpenError(message: String(cString: dlerror()))
+                let flags = RTLD_LAZY
             #endif
-        }
-        return LibraryHandle(rawValue: handle)
+            guard let handle = path.withPlatformString({ (p: UnsafePointer<CChar>) in dlopen(p, flags) }) else {
+                #if os(Android)
+                    throw LibraryOpenError(message: String(cString: dlerror()!))
+                #else
+                    throw LibraryOpenError(message: String(cString: dlerror()))
+                #endif
+            }
+            return LibraryHandle(rawValue: handle)
         #endif
     }
 
     public static func lookup<T>(_ handle: LibraryHandle, _ symbol: String) -> T? {
         #if os(Windows)
-        guard let ptr = GetProcAddress(handle.rawValue, symbol) else { return nil }
+            guard let ptr = GetProcAddress(handle.rawValue, symbol) else { return nil }
         #else
-        guard let ptr = dlsym(handle.rawValue, symbol) else { return nil }
+            guard let ptr = dlsym(handle.rawValue, symbol) else { return nil }
         #endif
         return unsafeBitCast(ptr, to: T.self)
     }
 
     public static func locate<T>(_ pointer: T.Type) throws -> Path {
         #if os(Windows)
-        var handle: HMODULE?
-        guard GetModuleHandleExW(DWORD(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT), unsafeBitCast(pointer, to: LPCWSTR?.self), &handle) else {
-            throw SymbolLookupError(underlyingError: Win32Error(GetLastError()))
-        }
-        return try Path(SWB_GetModuleFileNameW(handle))
+            var handle: HMODULE?
+            guard GetModuleHandleExW(DWORD(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT), unsafeBitCast(pointer, to: LPCWSTR?.self), &handle) else {
+                throw SymbolLookupError(underlyingError: Win32Error(GetLastError()))
+            }
+            return try Path(SWB_GetModuleFileNameW(handle))
         #else
-        var info = Dl_info()
-        #if os(Android)
-        dladdr(unsafeBitCast(pointer, to: UnsafeMutableRawPointer.self), &info)
-        #else
-        dladdr(unsafeBitCast(pointer, to: UnsafeMutableRawPointer?.self), &info)
-        #endif
-        guard let dli_fname = info.dli_fname else {
-            throw SymbolLookupError(underlyingError: nil)
-        }
-        return Path(platformString: UnsafeMutablePointer(mutating: dli_fname))
+            var info = Dl_info()
+            #if os(Android)
+                dladdr(unsafeBitCast(pointer, to: UnsafeMutableRawPointer.self), &info)
+            #else
+                dladdr(unsafeBitCast(pointer, to: UnsafeMutableRawPointer?.self), &info)
+            #endif
+            guard let dli_fname = info.dli_fname else {
+                throw SymbolLookupError(underlyingError: nil)
+            }
+            return Path(platformString: UnsafeMutablePointer(mutating: dli_fname))
         #endif
     }
 }
@@ -118,9 +118,9 @@ public struct SymbolLookupError: Error, CustomStringConvertible, Sendable {
 // Library handles just store an opaque reference to the dlopen/LoadLibrary-returned pointer, and so are Sendable in practice based on how they are used.
 public struct LibraryHandle: @unchecked Sendable {
     #if os(Windows)
-    @usableFromInline typealias PlatformHandle = HMODULE
+        @usableFromInline typealias PlatformHandle = HMODULE
     #else
-    @usableFromInline typealias PlatformHandle = UnsafeMutableRawPointer
+        @usableFromInline typealias PlatformHandle = UnsafeMutableRawPointer
     #endif
 
     fileprivate let rawValue: PlatformHandle
diff --git a/Sources/SWBUtil/LineReader.swift b/Sources/SWBUtil/LineReader.swift
index e35d2652..4f808df3 100644
--- a/Sources/SWBUtil/LineReader.swift
+++ b/Sources/SWBUtil/LineReader.swift
@@ -13,9 +13,9 @@
 public import Foundation
 
 #if canImport(System)
-import System
+    import System
 #else
-import SystemPackage
+    import SystemPackage
 #endif
 
 public final class LineReader {
@@ -69,4 +69,4 @@ public final class LineReader {
 }
 
 @available(*, unavailable)
-extension LineReader: Sendable { }
+extension LineReader: Sendable {}
diff --git a/Sources/SWBUtil/Lock.swift b/Sources/SWBUtil/Lock.swift
index b45625c6..5f06ccf7 100644
--- a/Sources/SWBUtil/Lock.swift
+++ b/Sources/SWBUtil/Lock.swift
@@ -11,79 +11,79 @@
 //===----------------------------------------------------------------------===//
 
 #if canImport(os)
-public import os
+    public import os
 #elseif os(Windows)
-public import WinSDK
+    public import WinSDK
 #else
-public import SWBLibc
+    public import SWBLibc
 #endif
 
 // FIXME: Replace the contents of this file with the Swift standard library's Mutex type once it's available everywhere we deploy.
 
 /// A more efficient lock than a DispatchQueue (esp. under contention).
 #if canImport(os)
-public typealias Lock = OSAllocatedUnfairLock
+    public typealias Lock = OSAllocatedUnfairLock
 #else
-public final class Lock: @unchecked Sendable {
-    #if os(Windows)
-    @usableFromInline
-    let mutex: UnsafeMutablePointer<SRWLOCK> = UnsafeMutablePointer.allocate(capacity: 1)
-    #elseif os(FreeBSD) || os(OpenBSD)
-    @usableFromInline
-    let mutex: UnsafeMutablePointer<pthread_mutex_t?> = UnsafeMutablePointer.allocate(capacity: 1)
-    #else
-    @usableFromInline
-    let mutex: UnsafeMutablePointer<pthread_mutex_t> = UnsafeMutablePointer.allocate(capacity: 1)
-    #endif
-
-    public init() {
+    public final class Lock: @unchecked Sendable {
         #if os(Windows)
-        InitializeSRWLock(self.mutex)
+            @usableFromInline
+            let mutex: UnsafeMutablePointer<SRWLOCK> = UnsafeMutablePointer.allocate(capacity: 1)
+        #elseif os(FreeBSD) || os(OpenBSD)
+            @usableFromInline
+            let mutex: UnsafeMutablePointer<pthread_mutex_t?> = UnsafeMutablePointer.allocate(capacity: 1)
         #else
-        let err = pthread_mutex_init(self.mutex, nil)
-        precondition(err == 0)
+            @usableFromInline
+            let mutex: UnsafeMutablePointer<pthread_mutex_t> = UnsafeMutablePointer.allocate(capacity: 1)
         #endif
-    }
 
-    deinit {
-        #if os(Windows)
-        // SRWLOCK does not need to be freed
-        #else
-        let err = pthread_mutex_destroy(self.mutex)
-        precondition(err == 0)
-        #endif
-        mutex.deallocate()
-    }
+        public init() {
+            #if os(Windows)
+                InitializeSRWLock(self.mutex)
+            #else
+                let err = pthread_mutex_init(self.mutex, nil)
+                precondition(err == 0)
+            #endif
+        }
 
-    @usableFromInline
-    func lock() {
-        #if os(Windows)
-        AcquireSRWLockExclusive(self.mutex)
-        #else
-        let err = pthread_mutex_lock(self.mutex)
-        precondition(err == 0)
-        #endif
-    }
+        deinit {
+            #if os(Windows)
+                // SRWLOCK does not need to be freed
+            #else
+                let err = pthread_mutex_destroy(self.mutex)
+                precondition(err == 0)
+            #endif
+            mutex.deallocate()
+        }
 
-    @usableFromInline
-    func unlock() {
-        #if os(Windows)
-        ReleaseSRWLockExclusive(self.mutex)
-        #else
-        let err = pthread_mutex_unlock(self.mutex)
-        precondition(err == 0)
-        #endif
-    }
+        @usableFromInline
+        func lock() {
+            #if os(Windows)
+                AcquireSRWLockExclusive(self.mutex)
+            #else
+                let err = pthread_mutex_lock(self.mutex)
+                precondition(err == 0)
+            #endif
+        }
 
-    @inlinable
-    public func withLock<T>(_ body: () throws -> T) rethrows -> T {
-        self.lock()
-        defer {
-            self.unlock()
+        @usableFromInline
+        func unlock() {
+            #if os(Windows)
+                ReleaseSRWLockExclusive(self.mutex)
+            #else
+                let err = pthread_mutex_unlock(self.mutex)
+                precondition(err == 0)
+            #endif
+        }
+
+        @inlinable
+        public func withLock<T>(_ body: () throws -> T) rethrows -> T {
+            self.lock()
+            defer {
+                self.unlock()
+            }
+            return try body()
         }
-        return try body()
     }
-}
 #endif
 
 /// Small wrapper to provide only locked access to its value.
@@ -122,15 +122,15 @@ extension LockedValue where Value: Sendable {
 }
 
 #if canImport(Darwin)
-@available(macOS, deprecated: 15.0, renamed: "Synchronization.Mutex")
-@available(iOS, deprecated: 18.0, renamed: "Synchronization.Mutex")
-@available(tvOS, deprecated: 18.0, renamed: "Synchronization.Mutex")
-@available(watchOS, deprecated: 11.0, renamed: "Synchronization.Mutex")
-@available(visionOS, deprecated: 2.0, renamed: "Synchronization.Mutex")
-public typealias SWBMutex = LockedValue
+    @available(macOS, deprecated: 15.0, renamed: "Synchronization.Mutex")
+    @available(iOS, deprecated: 18.0, renamed: "Synchronization.Mutex")
+    @available(tvOS, deprecated: 18.0, renamed: "Synchronization.Mutex")
+    @available(watchOS, deprecated: 11.0, renamed: "Synchronization.Mutex")
+    @available(visionOS, deprecated: 2.0, renamed: "Synchronization.Mutex")
+    public typealias SWBMutex = LockedValue
 #else
-public import Synchronization
-public typealias SWBMutex = Mutex
+    public import Synchronization
+    public typealias SWBMutex = Mutex
 #endif
 
 extension SWBMutex where Value: ~Copyable, Value == Void {
diff --git a/Sources/SWBUtil/MachO.swift b/Sources/SWBUtil/MachO.swift
index 275394f8..51651468 100644
--- a/Sources/SWBUtil/MachO.swift
+++ b/Sources/SWBUtil/MachO.swift
@@ -13,18 +13,18 @@
 import SWBLibc
 
 #if canImport(Darwin)
-import Darwin
-public import MachO
+    import Darwin
+    public import MachO
 #endif
 
 #if canImport(Darwin.ar)
-import Darwin.ar
+    import Darwin.ar
 #endif
 
 #if canImport(System)
-import System
+    import System
 #else
-import SystemPackage
+    import SystemPackage
 #endif
 
 public import struct Foundation.CharacterSet
@@ -360,7 +360,7 @@ public final class BinaryReader: BinaryReaderView {
 }
 
 @available(*, unavailable)
-extension BinaryReader: Sendable { }
+extension BinaryReader: Sendable {}
 
 extension ByteString: BinaryData {
 
@@ -371,11 +371,14 @@ extension ByteString: BinaryData {
         }
 
         var value = T()
-        try withUnsafeMutableBytes(of: &value, { (to: UnsafeMutableRawBufferPointer) throws -> Void in
-            self.bytes.withUnsafeBytes { from in
-                let _ = memcpy(to.baseAddress!, from.baseAddress! + offset, MemoryLayout<T>.size)
+        try withUnsafeMutableBytes(
+            of: &value,
+            { (to: UnsafeMutableRawBufferPointer) throws -> Void in
+                self.bytes.withUnsafeBytes { from in
+                    let _ = memcpy(to.baseAddress!, from.baseAddress! + offset, MemoryLayout<T>.size)
+                }
             }
-        })
+        )
         return value
     }
 
@@ -410,22 +413,21 @@ extension FileHandle: BinaryData {
 
     public var size: Int {
         #if os(Windows)
-        var info = LARGE_INTEGER()
-        guard GetFileSizeEx(_handle, &info) else {
-            return Int.max
-        }
-        return Int(info.QuadPart)
+            var info = LARGE_INTEGER()
+            guard GetFileSizeEx(_handle, &info) else {
+                return Int.max
+            }
+            return Int(info.QuadPart)
         #else
-        var info = stat()
-        guard fstat(self.fileDescriptor, &info) != -1 else {
-            return Int.max
-        }
-        return Int(info.st_size)
+            var info = stat()
+            guard fstat(self.fileDescriptor, &info) != -1 else {
+                return Int.max
+            }
+            return Int(info.st_size)
         #endif
     }
 }
 
-
 /// Expresses an error when reading a binary file.
 public enum BinaryReaderError: Error, CustomStringConvertible {
     /// Expresses an error which indicates the file does not appear to be a Mach-O or static archive at all, based on its magic.
@@ -461,33 +463,32 @@ public enum BinaryReaderError: Error, CustomStringConvertible {
 }
 
 #if !canImport(Darwin)
-fileprivate let FAT_MAGIC: UInt32 = 0xcafebabe
-fileprivate let FAT_CIGAM: UInt32 = 0xbebafeca
-fileprivate let FAT_MAGIC_64: UInt32 = 0xcafebabf
-fileprivate let FAT_CIGAM_64: UInt32 = 0xbfbafeca
-fileprivate let MH_MAGIC: UInt32 = 0xfeedface
-fileprivate let MH_CIGAM: UInt32 = 0xcefaedfe
-fileprivate let MH_MAGIC_64: UInt32 = 0xfeedfacf
-fileprivate let MH_CIGAM_64: UInt32 = 0xcffaedfe
-fileprivate let MH_OBJECT: UInt32 = 0x1
-fileprivate let MH_EXECUTE: UInt32 = 0x2
-fileprivate let MH_DYLIB: UInt32 = 0x6
-fileprivate let MH_BUNDLE: UInt32 = 0x8
-fileprivate let SYMDEF = "__.SYMDEF"
-fileprivate let SYMDEF_SORTED = "__.SYMDEF SORTED"
-fileprivate let SYMDEF_64 = "__.SYMDEF_64"
-fileprivate let SYMDEF_64_SORTED = "__.SYMDEF_64 SORTED"
-public typealias cpu_type_t = Int32
-public typealias cpu_subtype_t = Int32
-public typealias vm_prot_t = Int32
-public let CPU_TYPE_ANY: Int32 = -1
+    fileprivate let FAT_MAGIC: UInt32 = 0xcafebabe
+    fileprivate let FAT_CIGAM: UInt32 = 0xbebafeca
+    fileprivate let FAT_MAGIC_64: UInt32 = 0xcafebabf
+    fileprivate let FAT_CIGAM_64: UInt32 = 0xbfbafeca
+    fileprivate let MH_MAGIC: UInt32 = 0xfeedface
+    fileprivate let MH_CIGAM: UInt32 = 0xcefaedfe
+    fileprivate let MH_MAGIC_64: UInt32 = 0xfeedfacf
+    fileprivate let MH_CIGAM_64: UInt32 = 0xcffaedfe
+    fileprivate let MH_OBJECT: UInt32 = 0x1
+    fileprivate let MH_EXECUTE: UInt32 = 0x2
+    fileprivate let MH_DYLIB: UInt32 = 0x6
+    fileprivate let MH_BUNDLE: UInt32 = 0x8
+    fileprivate let SYMDEF = "__.SYMDEF"
+    fileprivate let SYMDEF_SORTED = "__.SYMDEF SORTED"
+    fileprivate let SYMDEF_64 = "__.SYMDEF_64"
+    fileprivate let SYMDEF_64_SORTED = "__.SYMDEF_64 SORTED"
+    public typealias cpu_type_t = Int32
+    public typealias cpu_subtype_t = Int32
+    public typealias vm_prot_t = Int32
+    public let CPU_TYPE_ANY: Int32 = -1
 #endif
 
 // MARK: - Mach-O String Parsing
 
 fileprivate let machOStringEncoding = String.Encoding.utf8
 
-
 /// Some MachO strings are encoded in fixed size char arrays, e.g. `struct S { char[16] str; }`. These may contain a null terminator or use the full length of the array.
 fileprivate func parseMachOFixedSizeString(_ bytes: (Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8)) throws -> String {
     var mutableBytes = bytes
@@ -514,43 +515,43 @@ fileprivate func parseMachONullTerminatedString(_ ptr: UnsafeRawBufferPointer) t
 
 // MARK: - Mach-O wrappers
 
-extension UInt8: BinaryDataType{}
-extension UInt32: BinaryDataType{}
+extension UInt8: BinaryDataType {}
+extension UInt32: BinaryDataType {}
 
 #if canImport(Darwin)
 
-extension fat_header: BinaryDataType{}
-extension mach_header: BinaryDataType{}
-extension mach_header_64: BinaryDataType{}
-extension fat_arch: BinaryDataType{}
-extension fat_arch_64: BinaryDataType{}
-extension load_command: BinaryDataType{}
-extension dylib_command: BinaryDataType{}
-extension uuid_command: BinaryDataType{}
-extension segment_command: BinaryDataType{}
-extension segment_command_64: BinaryDataType{}
-extension section: BinaryDataType{}
-extension section_64: BinaryDataType{}
-extension build_version_command: BinaryDataType{}
-extension version_min_command: BinaryDataType{}
-extension rpath_command: BinaryDataType{}
-
-#if DONT_HAVE_LC_ATOM_INFO || SWIFT_PACKAGE
-fileprivate let LC_ATOM_INFO = (0x36)
-#endif
+    extension fat_header: BinaryDataType {}
+    extension mach_header: BinaryDataType {}
+    extension mach_header_64: BinaryDataType {}
+    extension fat_arch: BinaryDataType {}
+    extension fat_arch_64: BinaryDataType {}
+    extension load_command: BinaryDataType {}
+    extension dylib_command: BinaryDataType {}
+    extension uuid_command: BinaryDataType {}
+    extension segment_command: BinaryDataType {}
+    extension segment_command_64: BinaryDataType {}
+    extension section: BinaryDataType {}
+    extension section_64: BinaryDataType {}
+    extension build_version_command: BinaryDataType {}
+    extension version_min_command: BinaryDataType {}
+    extension rpath_command: BinaryDataType {}
+
+    #if DONT_HAVE_LC_ATOM_INFO || SWIFT_PACKAGE
+        fileprivate let LC_ATOM_INFO = (0x36)
+    #endif
 
 #endif
 
 #if canImport(Darwin.ar)
 
-extension ar_hdr: BinaryDataType{}
+    extension ar_hdr: BinaryDataType {}
 
 #endif
 
 // MARK: - Mach-O byte swapping helpers
 
 fileprivate protocol ByteSwappable {
-    var byteSwapped: Self {get}
+    var byteSwapped: Self { get }
 }
 
 extension Int16: ByteSwappable {}
@@ -591,35 +592,35 @@ public protocol MachOFatHeader {
 
 #if canImport(Darwin)
 
-extension fat_arch: MachOFatHeader {
-    public func offset(byteSwappedIfNeeded swap: Bool) -> UInt64 {
-        return UInt64(offset.byteSwappedIfNeeded(swap))
-    }
+    extension fat_arch: MachOFatHeader {
+        public func offset(byteSwappedIfNeeded swap: Bool) -> UInt64 {
+            return UInt64(offset.byteSwappedIfNeeded(swap))
+        }
 
-    public func size(byteSwappedIfNeeded swap: Bool) -> UInt64 {
-        return UInt64(size.byteSwappedIfNeeded(swap))
-    }
+        public func size(byteSwappedIfNeeded swap: Bool) -> UInt64 {
+            return UInt64(size.byteSwappedIfNeeded(swap))
+        }
 
-    /// Returns the size, in bytes, of the `fat_arch` struct.
-    public var structSize: Int {
-        return MemoryLayout<fat_arch>.size
+        /// Returns the size, in bytes, of the `fat_arch` struct.
+        public var structSize: Int {
+            return MemoryLayout<fat_arch>.size
+        }
     }
-}
 
-extension fat_arch_64: MachOFatHeader {
-    public func offset(byteSwappedIfNeeded swap: Bool) -> UInt64 {
-        return offset.byteSwappedIfNeeded(swap)
-    }
+    extension fat_arch_64: MachOFatHeader {
+        public func offset(byteSwappedIfNeeded swap: Bool) -> UInt64 {
+            return offset.byteSwappedIfNeeded(swap)
+        }
 
-    public func size(byteSwappedIfNeeded swap: Bool) -> UInt64 {
-        return size.byteSwappedIfNeeded(swap)
-    }
+        public func size(byteSwappedIfNeeded swap: Bool) -> UInt64 {
+            return size.byteSwappedIfNeeded(swap)
+        }
 
-    /// Returns the size, in bytes, of the `fat_arch_64` struct.
-    public var structSize: Int {
-        return MemoryLayout<fat_arch_64>.size
+        /// Returns the size, in bytes, of the `fat_arch_64` struct.
+        public var structSize: Int {
+            return MemoryLayout<fat_arch_64>.size
+        }
     }
-}
 
 #endif
 
@@ -627,7 +628,7 @@ extension fat_arch_64: MachOFatHeader {
 public protocol MachOHeader {
     // These are direct mappings of the mach_header.
     var magic: UInt32 { get }
-    var cputype: cpu_type_t  {get }
+    var cputype: cpu_type_t { get }
     var cpusubtype: cpu_subtype_t { get }
     var filetype: UInt32 { get }
     var ncmds: UInt32 { get }
@@ -641,39 +642,39 @@ public protocol MachOHeader {
 
 #if canImport(Darwin)
 
-extension mach_header: MachOHeader {
-    /// Returns the size, in bytes, of the `mach_header` struct.
-    public var structSize: Int {
-        return MemoryLayout<mach_header>.size
+    extension mach_header: MachOHeader {
+        /// Returns the size, in bytes, of the `mach_header` struct.
+        public var structSize: Int {
+            return MemoryLayout<mach_header>.size
+        }
     }
-}
-extension mach_header_64: MachOHeader {
-    /// Returns the size, in bytes, of the `mach_header_64` struct.
-    public var structSize: Int {
-        return MemoryLayout<mach_header_64>.size
+    extension mach_header_64: MachOHeader {
+        /// Returns the size, in bytes, of the `mach_header_64` struct.
+        public var structSize: Int {
+            return MemoryLayout<mach_header_64>.size
+        }
     }
-}
 
 #endif
 
 // MARK: -
 
 public protocol MachOSegmentLoadCommand {
-    var cmd: UInt32 {get}
-    var cmdsize: UInt32 {get}
-    var segname: (Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8) {get}
-
-    var vmaddr64: UInt64 {get}
-    var vmsize64: UInt64 {get}
-    var fileoff64: UInt64 {get}
-    var filesize64: UInt64 {get}
-
-    var maxprot: vm_prot_t {get}
-    var initprot: vm_prot_t {get}
-    var nsects: UInt32 {get}
-    var flags: UInt32 {get}
+    var cmd: UInt32 { get }
+    var cmdsize: UInt32 { get }
+    var segname: (Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8) { get }
+
+    var vmaddr64: UInt64 { get }
+    var vmsize64: UInt64 { get }
+    var fileoff64: UInt64 { get }
+    var filesize64: UInt64 { get }
+
+    var maxprot: vm_prot_t { get }
+    var initprot: vm_prot_t { get }
+    var nsects: UInt32 { get }
+    var flags: UInt32 { get }
 
-    var structSize: Int {get}
+    var structSize: Int { get }
 }
 
 public extension MachOSegmentLoadCommand {
@@ -684,42 +685,42 @@ public extension MachOSegmentLoadCommand {
 
 #if canImport(Darwin)
 
-extension segment_command: MachOSegmentLoadCommand {
-    public var vmaddr64: UInt64 { return UInt64(self.vmaddr) }
-    public var vmsize64: UInt64 { return UInt64(self.vmsize) }
-    public var fileoff64: UInt64 { return UInt64(self.fileoff) }
-    public var filesize64: UInt64 { return UInt64(self.filesize) }
+    extension segment_command: MachOSegmentLoadCommand {
+        public var vmaddr64: UInt64 { return UInt64(self.vmaddr) }
+        public var vmsize64: UInt64 { return UInt64(self.vmsize) }
+        public var fileoff64: UInt64 { return UInt64(self.fileoff) }
+        public var filesize64: UInt64 { return UInt64(self.filesize) }
 
-    public var structSize: Int {
-        return MemoryLayout<segment_command>.size
+        public var structSize: Int {
+            return MemoryLayout<segment_command>.size
+        }
     }
-}
 
-extension segment_command_64: MachOSegmentLoadCommand {
-    public var vmaddr64: UInt64 { return self.vmaddr }
-    public var vmsize64: UInt64 { return self.vmsize }
-    public var fileoff64: UInt64 { return self.fileoff }
-    public var filesize64: UInt64 { return self.filesize }
+    extension segment_command_64: MachOSegmentLoadCommand {
+        public var vmaddr64: UInt64 { return self.vmaddr }
+        public var vmsize64: UInt64 { return self.vmsize }
+        public var fileoff64: UInt64 { return self.fileoff }
+        public var filesize64: UInt64 { return self.filesize }
 
-    public var structSize: Int {
-        return MemoryLayout<segment_command_64>.size
+        public var structSize: Int {
+            return MemoryLayout<segment_command_64>.size
+        }
     }
-}
 
 #endif
 
 // MARK: - Mach-O section information
 
 public protocol MachOSection {
-    var sectname: (Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8) {get}
-    var segname: (Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8) {get}
-    var addr64: UInt64 {get}
-    var size64: UInt64 {get}
-    var offset: UInt32 {get}
-    var align: UInt32 {get}
-    var reloff: UInt32 {get}
-    var nreloc: UInt32 {get}
-    var flags: UInt32 {get}
+    var sectname: (Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8) { get }
+    var segname: (Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8, Int8) { get }
+    var addr64: UInt64 { get }
+    var size64: UInt64 { get }
+    var offset: UInt32 { get }
+    var align: UInt32 { get }
+    var reloff: UInt32 { get }
+    var nreloc: UInt32 { get }
+    var flags: UInt32 { get }
 }
 
 extension MachOSection {
@@ -734,25 +735,25 @@ extension MachOSection {
 
 #if canImport(Darwin)
 
-extension section: MachOSection {
-    public var addr64: UInt64 {
-        return UInt64(self.addr)
-    }
+    extension section: MachOSection {
+        public var addr64: UInt64 {
+            return UInt64(self.addr)
+        }
 
-    public var size64: UInt64 {
-        return UInt64(self.size)
+        public var size64: UInt64 {
+            return UInt64(self.size)
+        }
     }
-}
 
-extension section_64: MachOSection {
-    public var addr64: UInt64 {
-        return self.addr
-    }
+    extension section_64: MachOSection {
+        public var addr64: UInt64 {
+            return self.addr
+        }
 
-    public var size64: UInt64 {
-        return self.size
+        public var size64: UInt64 {
+            return self.size
+        }
     }
-}
 
 #endif
 
@@ -790,8 +791,7 @@ public final class MachO {
                 let magic2: UInt32 = try reader.peek(offset: MemoryLayout<UInt32>.size)
                 if magic2 == UInt32(bigEndian: StaticArchive.ARMAG2) {
                     self = .archive
-                }
-                else {
+                } else {
                     throw BinaryReaderError.unrecognizedFileType(magicWord1: magic, magicWord2: magic2)
                 }
 
@@ -842,7 +842,7 @@ public final class MachO {
     /// Returns an array of slices representing the Mach-O file contents and the overall linkage being used.
     ///
     /// - seealso: Slice
-    public func slicesIncludingLinkage() throws -> (slices: [Slice], linkage: WrappedFileType)  {
+    public func slicesIncludingLinkage() throws -> (slices: [Slice], linkage: WrappedFileType) {
         // Ensure that this is re-entrant and that no lasting state modification happens within this function.
         reader.push()
         defer { reader.pop() }
@@ -897,14 +897,14 @@ public final class MachO {
                 let magic: UInt32 = try reader.peek()
                 switch magic {
                 #if canImport(Darwin)
-                case MH_MAGIC, MH_CIGAM:
-                    self = try .mach_header(reader.peek())
+                    case MH_MAGIC, MH_CIGAM:
+                        self = try .mach_header(reader.peek())
 
-                case MH_MAGIC_64, MH_CIGAM_64:
-                    self = try .mach_header_64(reader.peek())
+                    case MH_MAGIC_64, MH_CIGAM_64:
+                        self = try .mach_header_64(reader.peek())
                 #else
-                case MH_MAGIC, MH_CIGAM, MH_MAGIC_64, MH_CIGAM_64:
-                    throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
+                    case MH_MAGIC, MH_CIGAM, MH_MAGIC_64, MH_CIGAM_64:
+                        throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
                 #endif
 
                 case UInt32(bigEndian: StaticArchive.ARMAG1):
@@ -921,21 +921,20 @@ public final class MachO {
             }
 
             #if canImport(Darwin)
-            case mach_header(mach_header)
-            case mach_header_64(mach_header_64)
+                case mach_header(mach_header)
+                case mach_header_64(mach_header_64)
             #endif
         }
 
-
         var headers: [(Slice, any MachOHeader)] {
             #if canImport(Darwin)
-            switch self.header {
-            case .mach_header(let x): return [(self, x)]
-            case .mach_header_64(let x): return [(self, x)]
-            }
+                switch self.header {
+                case .mach_header(let x): return [(self, x)]
+                case .mach_header_64(let x): return [(self, x)]
+                }
             #else
-            assertionFailure("not implemented")
-            return []
+                assertionFailure("not implemented")
+                return []
             #endif
         }
 
@@ -943,11 +942,11 @@ public final class MachO {
             precondition(headers.count <= 1, "invalid to call arch when there are multiple headers")
 
             #if canImport(Darwin)
-            if let (_, header) = headers.only {
-                if let name = Architecture.stringValue(cputype: header.cputype, cpusubtype: header.cpusubtype) {
-                    return name
+                if let (_, header) = headers.only {
+                    if let name = Architecture.stringValue(cputype: header.cputype, cpusubtype: header.cpusubtype) {
+                        return name
+                    }
                 }
-            }
             #endif
 
             return "unknown"
@@ -964,49 +963,49 @@ public final class MachO {
         /// Return the names and linkage types of all linked libraries.
         public func linkedLibraries() throws -> [(pathStr: String, linkageType: LinkageType)] {
             #if canImport(Darwin)
-            return try loadCommands().compactMap { lc throws -> (String, LinkageType)? in
-                let cmd: dylib_command
-                let linkageType: LinkageType
+                return try loadCommands().compactMap { lc throws -> (String, LinkageType)? in
+                    let cmd: dylib_command
+                    let linkageType: LinkageType
 
-                switch lc.value {
-                case .loadDylib(let dl):
-                    cmd = dl
-                    linkageType = .normal
+                    switch lc.value {
+                    case .loadDylib(let dl):
+                        cmd = dl
+                        linkageType = .normal
 
-                case .lazyLoadDylib(let dl):
-                    cmd = dl
-                    linkageType = .lazy
+                    case .lazyLoadDylib(let dl):
+                        cmd = dl
+                        linkageType = .lazy
 
-                case .loadWeakDylib(let dl):
-                    cmd = dl
-                    linkageType = .weak
+                    case .loadWeakDylib(let dl):
+                        cmd = dl
+                        linkageType = .weak
 
-                case .upwardDylib(let dl):
-                    cmd = dl
-                    linkageType = .upward
+                    case .upwardDylib(let dl):
+                        cmd = dl
+                        linkageType = .upward
 
-                case .reexportDylib(let dl):
-                    cmd = dl
-                    linkageType = .reexport
+                    case .reexportDylib(let dl):
+                        cmd = dl
+                        linkageType = .reexport
 
-                default:
-                    return nil
-                }
+                    default:
+                        return nil
+                    }
 
-                let cmdSize = Int(cmd.cmdsize.byteSwappedIfNeeded(lc.swap))
-                let nameOffset = Int(cmd.dylib.name.offset.byteSwappedIfNeeded(lc.swap))
-                guard nameOffset <= cmdSize else { throw BinaryReaderError.parseError("Failed to parse dylib name: offset out of bounds") }
+                    let cmdSize = Int(cmd.cmdsize.byteSwappedIfNeeded(lc.swap))
+                    let nameOffset = Int(cmd.dylib.name.offset.byteSwappedIfNeeded(lc.swap))
+                    guard nameOffset <= cmdSize else { throw BinaryReaderError.parseError("Failed to parse dylib name: offset out of bounds") }
 
-                let reader = BinaryReader(data: lc.reader.data, startingAt: lc.reader.offset + nameOffset)
-                let bytes: [UInt8] = try reader.read(count: cmdSize)
+                    let reader = BinaryReader(data: lc.reader.data, startingAt: lc.reader.offset + nameOffset)
+                    let bytes: [UInt8] = try reader.read(count: cmdSize)
 
-                let pathStr = try bytes.withUnsafeBytes { ptr throws -> String in
-                    return try parseMachONullTerminatedString(ptr)
+                    let pathStr = try bytes.withUnsafeBytes { ptr throws -> String in
+                        return try parseMachONullTerminatedString(ptr)
+                    }
+                    return (pathStr, linkageType)
                 }
-                return (pathStr, linkageType)
-            }
             #else
-            throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
+                throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
             #endif
         }
 
@@ -1017,31 +1016,31 @@ public final class MachO {
 
         public func installName() throws -> String? {
             #if canImport(Darwin)
-            let installNames = try loadCommands().compactMap { (lc: LoadCommand) throws -> String? in
-                switch lc.value {
-                case let .idDylib(cmd):
-                    let cmdSize = Int(cmd.cmdsize.byteSwappedIfNeeded(lc.swap))
-                    let nameOffset = Int(cmd.dylib.name.offset.byteSwappedIfNeeded(lc.swap))
-                    guard nameOffset <= cmdSize else { throw BinaryReaderError.parseError("Failed to parse dylib name: offset out of bounds") }
-
-                    let reader = BinaryReader(data: lc.reader.data, startingAt: lc.reader.offset + nameOffset)
-                    let bytes: [UInt8] = try reader.read(count: cmdSize)
-
-                    return try bytes.withUnsafeBytes { ptr throws -> String in
-                        return try parseMachONullTerminatedString(ptr)
+                let installNames = try loadCommands().compactMap { (lc: LoadCommand) throws -> String? in
+                    switch lc.value {
+                    case let .idDylib(cmd):
+                        let cmdSize = Int(cmd.cmdsize.byteSwappedIfNeeded(lc.swap))
+                        let nameOffset = Int(cmd.dylib.name.offset.byteSwappedIfNeeded(lc.swap))
+                        guard nameOffset <= cmdSize else { throw BinaryReaderError.parseError("Failed to parse dylib name: offset out of bounds") }
+
+                        let reader = BinaryReader(data: lc.reader.data, startingAt: lc.reader.offset + nameOffset)
+                        let bytes: [UInt8] = try reader.read(count: cmdSize)
+
+                        return try bytes.withUnsafeBytes { ptr throws -> String in
+                            return try parseMachONullTerminatedString(ptr)
+                        }
+                    default:
+                        return nil
                     }
-                default:
-                    return nil
                 }
-            }
 
-            if installNames.count > 1 {
-                throw BinaryReaderError.parseError("Encountered multiple LC_ID_DYLIB load commands")
-            }
+                if installNames.count > 1 {
+                    throw BinaryReaderError.parseError("Encountered multiple LC_ID_DYLIB load commands")
+                }
 
-            return installNames.only
+                return installNames.only
             #else
-            throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
+                throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
             #endif
         }
 
@@ -1049,412 +1048,412 @@ public final class MachO {
         // A simple fix is to create FileTypes 'object' and other valid, and check when providing slice linkage information.
         public var linkFileType: WrappedFileType {
             switch (header) {
-#if canImport(Darwin)
-            case .mach_header(let header):
-                return .macho(FileType(rawValue: header.filetype))
-            case .mach_header_64(let header):
-                return .macho(FileType(rawValue: header.filetype))
-#endif
+            #if canImport(Darwin)
+                case .mach_header(let header):
+                    return .macho(FileType(rawValue: header.filetype))
+                case .mach_header_64(let header):
+                    return .macho(FileType(rawValue: header.filetype))
+            #endif
             }
         }
 
         public func uuid() throws -> UUID? {
             #if canImport(Darwin)
-            let uuids = try loadCommands().compactMap { (lc: LoadCommand) throws -> UUID? in
-                switch lc.value {
-                case .uuid(let ulc): return UUID(uuid: ulc.uuid)
-                default: return nil
+                let uuids = try loadCommands().compactMap { (lc: LoadCommand) throws -> UUID? in
+                    switch lc.value {
+                    case .uuid(let ulc): return UUID(uuid: ulc.uuid)
+                    default: return nil
+                    }
                 }
-            }
 
-            guard !uuids.isEmpty else { return nil }
-            guard uuids.count == 1 else { throw BinaryReaderError.parseError("Encountered multiple UUID load commands") }
-            return uuids[0]
+                guard !uuids.isEmpty else { return nil }
+                guard uuids.count == 1 else { throw BinaryReaderError.parseError("Encountered multiple UUID load commands") }
+                return uuids[0]
             #else
-            throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
+                throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
             #endif
         }
 
         #if canImport(Darwin)
-        public struct LoadCommand {
-            let reader: BinaryReader
-            let swap: Bool
-            @_spi(Testing) public let base: load_command
-            let value: ConcreteValue
+            public struct LoadCommand {
+                let reader: BinaryReader
+                let swap: Bool
+                @_spi(Testing) public let base: load_command
+                let value: ConcreteValue
 
-            init(slice: Slice, reader: BinaryReader, swap: Bool) throws {
-                self.reader = reader
-                self.swap = swap
+                init(slice: Slice, reader: BinaryReader, swap: Bool) throws {
+                    self.reader = reader
+                    self.swap = swap
 
-                reader.push()
+                    reader.push()
 
-                let base: load_command = try reader.peek()
-                self.base = base
-                self.value = try { () throws -> ConcreteValue in
-                    switch base.cmd {
-                    case UInt32(LC_ID_DYLIB):
-                        return try .idDylib(reader.read())
+                    let base: load_command = try reader.peek()
+                    self.base = base
+                    self.value = try { () throws -> ConcreteValue in
+                        switch base.cmd {
+                        case UInt32(LC_ID_DYLIB):
+                            return try .idDylib(reader.read())
 
-                    case UInt32(LC_LOAD_DYLIB):
-                        return try .loadDylib(reader.read())
+                        case UInt32(LC_LOAD_DYLIB):
+                            return try .loadDylib(reader.read())
 
-                    case UInt32(LC_LAZY_LOAD_DYLIB):
-                        return try .lazyLoadDylib(reader.read())
+                        case UInt32(LC_LAZY_LOAD_DYLIB):
+                            return try .lazyLoadDylib(reader.read())
 
-                    case UInt32(LC_LOAD_WEAK_DYLIB):
-                        return try .loadWeakDylib(reader.read())
+                        case UInt32(LC_LOAD_WEAK_DYLIB):
+                            return try .loadWeakDylib(reader.read())
 
-                    case UInt32(LC_LOAD_UPWARD_DYLIB):
-                        return try .upwardDylib(reader.read())
+                        case UInt32(LC_LOAD_UPWARD_DYLIB):
+                            return try .upwardDylib(reader.read())
 
-                    case UInt32(LC_REEXPORT_DYLIB):
-                        return try .reexportDylib(reader.read())
+                        case UInt32(LC_REEXPORT_DYLIB):
+                            return try .reexportDylib(reader.read())
 
-                    case UInt32(LC_UUID):
-                        return try .uuid(reader.read())
+                        case UInt32(LC_UUID):
+                            return try .uuid(reader.read())
 
-                    case UInt32(LC_SEGMENT):
-                        return try .segment(reader.read())
+                        case UInt32(LC_SEGMENT):
+                            return try .segment(reader.read())
 
-                    case UInt32(LC_SEGMENT_64):
-                        return try .segment_64(reader.read())
+                        case UInt32(LC_SEGMENT_64):
+                            return try .segment_64(reader.read())
 
-                    case UInt32(LC_BUILD_VERSION):
-                        return try .build_version(reader.read())
+                        case UInt32(LC_BUILD_VERSION):
+                            return try .build_version(reader.read())
 
-                    case UInt32(LC_VERSION_MIN_MACOSX),
-                         UInt32(LC_VERSION_MIN_IPHONEOS),
-                         UInt32(LC_VERSION_MIN_TVOS),
-                         UInt32(LC_VERSION_MIN_WATCHOS):
-                        return try .version_min(reader.read())
+                        case UInt32(LC_VERSION_MIN_MACOSX),
+                            UInt32(LC_VERSION_MIN_IPHONEOS),
+                            UInt32(LC_VERSION_MIN_TVOS),
+                            UInt32(LC_VERSION_MIN_WATCHOS):
+                            return try .version_min(reader.read())
 
-                    case UInt32(LC_RPATH):
-                        return try .rpath(reader.read())
+                        case UInt32(LC_RPATH):
+                            return try .rpath(reader.read())
 
-                    case UInt32(LC_ATOM_INFO):
-                        // We are not yet parsing the contents of this command.
-                        return .atom_info(base)
+                        case UInt32(LC_ATOM_INFO):
+                            // We are not yet parsing the contents of this command.
+                            return .atom_info(base)
 
-                    default:
-                        return .other(base)
-                    }
-                }()
+                        default:
+                            return .other(base)
+                        }
+                    }()
 
-                reader.pop()
-            }
+                    reader.pop()
+                }
 
-            enum ConcreteValue {
-                case idDylib(dylib_command)
-                case loadDylib(dylib_command)
-                case lazyLoadDylib(dylib_command)
-                case loadWeakDylib(dylib_command)
-                case upwardDylib(dylib_command)
-                case reexportDylib(dylib_command)
-                case uuid(uuid_command)
-                case segment(segment_command)
-                case segment_64(segment_command_64)
-                case build_version(build_version_command)
-                case version_min(version_min_command)
-                case rpath(rpath_command)
-                case atom_info(load_command)
-
-                case other(load_command)
+                enum ConcreteValue {
+                    case idDylib(dylib_command)
+                    case loadDylib(dylib_command)
+                    case lazyLoadDylib(dylib_command)
+                    case loadWeakDylib(dylib_command)
+                    case upwardDylib(dylib_command)
+                    case reexportDylib(dylib_command)
+                    case uuid(uuid_command)
+                    case segment(segment_command)
+                    case segment_64(segment_command_64)
+                    case build_version(build_version_command)
+                    case version_min(version_min_command)
+                    case rpath(rpath_command)
+                    case atom_info(load_command)
+
+                    case other(load_command)
+                }
             }
-        }
 
-        /// The load commands of the Mach-O file, or in the case of a static
-        /// archive, the combined load commands of all of the contained Mach-O
-        /// object files.
-        public func loadCommands() throws -> [LoadCommand] {
-            return try headers.map { (slice, header) in
-                let swap = shouldSwap(magic: header.magic)
-                let ncmds = Int(header.ncmds.byteSwappedIfNeeded(swap))
-                var offset = header.structSize
-
-                return try (0 ..< ncmds).map { index throws -> LoadCommand in
-                    let loadCommand = try LoadCommand(slice: slice, reader: BinaryReader(data: reader.data, startingAt: reader.offset + offset), swap: swap)
-                    let size = loadCommand.base.cmdsize.byteSwappedIfNeeded(swap)
-                    offset += Int(size)
-                    return loadCommand
-                }
-            }.reduce([], { $0 + $1 })
-        }
+            /// The load commands of the Mach-O file, or in the case of a static
+            /// archive, the combined load commands of all of the contained Mach-O
+            /// object files.
+            public func loadCommands() throws -> [LoadCommand] {
+                return try headers.map { (slice, header) in
+                    let swap = shouldSwap(magic: header.magic)
+                    let ncmds = Int(header.ncmds.byteSwappedIfNeeded(swap))
+                    var offset = header.structSize
+
+                    return try (0..<ncmds).map { index throws -> LoadCommand in
+                        let loadCommand = try LoadCommand(slice: slice, reader: BinaryReader(data: reader.data, startingAt: reader.offset + offset), swap: swap)
+                        let size = loadCommand.base.cmdsize.byteSwappedIfNeeded(swap)
+                        offset += Int(size)
+                        return loadCommand
+                    }
+                }.reduce([], { $0 + $1 })
+            }
         #endif
 
         public func rpaths() throws -> [String] {
             #if canImport(Darwin)
-            return try self.loadCommands().compactMap({ (lc: LoadCommand) -> String? in
-                guard case let .rpath(rpath) = lc.value else {
-                    return nil
-                }
+                return try self.loadCommands().compactMap({ (lc: LoadCommand) -> String? in
+                    guard case let .rpath(rpath) = lc.value else {
+                        return nil
+                    }
 
-                lc.reader.push()
-                defer { lc.reader.pop() }
+                    lc.reader.push()
+                    defer { lc.reader.pop() }
 
-                try lc.reader.seek(by: Int(rpath.path.offset))
-                var data = try lc.reader.read(count: Int(rpath.cmdsize - rpath.path.offset))
+                    try lc.reader.seek(by: Int(rpath.path.offset))
+                    var data = try lc.reader.read(count: Int(rpath.cmdsize - rpath.path.offset))
 
-                // Clean the rpath from 0-padding bytes.
-                while data.last == 0 {
-                    data.removeLast()
-                }
+                    // Clean the rpath from 0-padding bytes.
+                    while data.last == 0 {
+                        data.removeLast()
+                    }
 
-                return String(bytes: data, encoding: .utf8)
-            })
+                    return String(bytes: data, encoding: .utf8)
+                })
             #else
-            throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
+                throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
             #endif
         }
 
         #if canImport(Darwin)
-        public struct Segment {
-            let loadCommand: LoadCommand
-            let value: ConcreteValue
+            public struct Segment {
+                let loadCommand: LoadCommand
+                let value: ConcreteValue
 
-            init(loadCommand: LoadCommand, value: ConcreteValue) {
-                self.loadCommand = loadCommand
-                self.value = value
-            }
+                init(loadCommand: LoadCommand, value: ConcreteValue) {
+                    self.loadCommand = loadCommand
+                    self.value = value
+                }
 
-            enum ConcreteValue {
-                case segment(segment_command)
-                case segment_64(segment_command_64)
+                enum ConcreteValue {
+                    case segment(segment_command)
+                    case segment_64(segment_command_64)
 
-                var segment: any MachOSegmentLoadCommand {
-                    switch self {
-                    case .segment(let s): return s
-                    case .segment_64(let s): return s
+                    var segment: any MachOSegmentLoadCommand {
+                        switch self {
+                        case .segment(let s): return s
+                        case .segment_64(let s): return s
+                        }
                     }
                 }
-            }
 
-            @_spi(Testing) public enum Section: Sendable {
-                case section(section)
-                case section_64(section_64)
+                @_spi(Testing) public enum Section: Sendable {
+                    case section(section)
+                    case section_64(section_64)
 
-                var section: any MachOSection {
-                    switch self {
-                    case .section(let s): return s
-                    case .section_64(let s): return s
+                    var section: any MachOSection {
+                        switch self {
+                        case .section(let s): return s
+                        case .section_64(let s): return s
+                        }
                     }
                 }
-            }
 
-            @_spi(Testing) public func sections() throws -> [Section] {
-                let value = self.value
-                let nsects = Int(value.segment.nsects.byteSwappedIfNeeded(loadCommand.swap))
-                let offset = value.segment.structSize
+                @_spi(Testing) public func sections() throws -> [Section] {
+                    let value = self.value
+                    let nsects = Int(value.segment.nsects.byteSwappedIfNeeded(loadCommand.swap))
+                    let offset = value.segment.structSize
 
-                let reader = BinaryReader(data: loadCommand.reader.data, startingAt: loadCommand.reader.offset + offset)
+                    let reader = BinaryReader(data: loadCommand.reader.data, startingAt: loadCommand.reader.offset + offset)
 
-                func readSection() throws -> Section {
-                    switch value {
-                    case .segment:
-                        return try .section(reader.read())
+                    func readSection() throws -> Section {
+                        switch value {
+                        case .segment:
+                            return try .section(reader.read())
 
-                    case .segment_64:
-                        return try .section_64(reader.read())
+                        case .segment_64:
+                            return try .section_64(reader.read())
+                        }
                     }
-                }
 
-                return try (0 ..< nsects).map { _ in
-                    return try readSection()
+                    return try (0..<nsects).map { _ in
+                        return try readSection()
+                    }
                 }
             }
-        }
 
-        public func segments() throws -> [Segment] {
-            return try self.loadCommands().compactMap { (lc: LoadCommand) -> Segment? in
-                switch lc.value {
-                case .segment(let sc):
-                    return Segment(loadCommand: lc, value: .segment(sc))
+            public func segments() throws -> [Segment] {
+                return try self.loadCommands().compactMap { (lc: LoadCommand) -> Segment? in
+                    switch lc.value {
+                    case .segment(let sc):
+                        return Segment(loadCommand: lc, value: .segment(sc))
 
-                case .segment_64(let sc):
-                    return Segment(loadCommand: lc, value: .segment_64(sc))
+                    case .segment_64(let sc):
+                        return Segment(loadCommand: lc, value: .segment_64(sc))
 
-                default: return nil
+                    default: return nil
+                    }
                 }
             }
-        }
         #endif
 
         public func buildVersions() throws -> [BuildVersion] {
             #if canImport(Darwin)
-            return try loadCommands().compactMap { loadCommand in
-                switch loadCommand.value {
-                case .build_version(let cmd):
-                    guard let platform = BuildVersion.Platform(rawValue: cmd.platform) else {
-                        throw BinaryReaderError.parseError("Unrecognized value '\(cmd.platform)' for LC_BUILD_VERSION platform field")
-                    }
-                    return BuildVersion(platform: platform, minOSVersion: Version(machOVersion: cmd.minos), sdkVersion: Version(machOVersion: cmd.sdk))
-                case .version_min(let cmd):
-                    guard let (_, header) = headers.first else { throw BinaryReaderError.parseError("much call buildVersions with valid headers") }
-
-                    let platform: BuildVersion.Platform
-                    switch Int32(cmd.cmd) {
-                    case LC_VERSION_MIN_MACOSX:
-                        platform = .macOS
-                    case LC_VERSION_MIN_IPHONEOS:
-                        platform = [CPU_TYPE_X86, CPU_TYPE_X86_64].contains(header.cputype) ? .iOSSimulator : .iOS
-                    case LC_VERSION_MIN_TVOS:
-                        platform = [CPU_TYPE_X86, CPU_TYPE_X86_64].contains(header.cputype) ? .tvOSSimulator : .tvOS
-                    case LC_VERSION_MIN_WATCHOS:
-                        platform = [CPU_TYPE_X86, CPU_TYPE_X86_64].contains(header.cputype) ? .watchOSSimulator : .watchOS
+                return try loadCommands().compactMap { loadCommand in
+                    switch loadCommand.value {
+                    case .build_version(let cmd):
+                        guard let platform = BuildVersion.Platform(rawValue: cmd.platform) else {
+                            throw BinaryReaderError.parseError("Unrecognized value '\(cmd.platform)' for LC_BUILD_VERSION platform field")
+                        }
+                        return BuildVersion(platform: platform, minOSVersion: Version(machOVersion: cmd.minos), sdkVersion: Version(machOVersion: cmd.sdk))
+                    case .version_min(let cmd):
+                        guard let (_, header) = headers.first else { throw BinaryReaderError.parseError("much call buildVersions with valid headers") }
+
+                        let platform: BuildVersion.Platform
+                        switch Int32(cmd.cmd) {
+                        case LC_VERSION_MIN_MACOSX:
+                            platform = .macOS
+                        case LC_VERSION_MIN_IPHONEOS:
+                            platform = [CPU_TYPE_X86, CPU_TYPE_X86_64].contains(header.cputype) ? .iOSSimulator : .iOS
+                        case LC_VERSION_MIN_TVOS:
+                            platform = [CPU_TYPE_X86, CPU_TYPE_X86_64].contains(header.cputype) ? .tvOSSimulator : .tvOS
+                        case LC_VERSION_MIN_WATCHOS:
+                            platform = [CPU_TYPE_X86, CPU_TYPE_X86_64].contains(header.cputype) ? .watchOSSimulator : .watchOS
+                        default:
+                            throw BinaryReaderError.parseError("Unrecognized LC_VERSION_MIN_* command (\(cmd.cmd))")
+                        }
+                        return BuildVersion(platform: platform, minOSVersion: Version(machOVersion: cmd.version), sdkVersion: Version(machOVersion: cmd.sdk))
                     default:
-                        throw BinaryReaderError.parseError("Unrecognized LC_VERSION_MIN_* command (\(cmd.cmd))")
+                        return nil
                     }
-                    return BuildVersion(platform: platform, minOSVersion: Version(machOVersion: cmd.version), sdkVersion: Version(machOVersion: cmd.sdk))
-                default:
-                    return nil
                 }
-            }
             #else
-            throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
+                throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
             #endif
         }
 
         public func containsAtomInfo() throws -> Bool {
             #if canImport(Darwin)
-            return try loadCommands().contains(where: { loadCommand in
-                switch loadCommand.value {
-                case .atom_info(_):
-                    return true
-                default:
-                    return false
-                }
-            })
+                return try loadCommands().contains(where: { loadCommand in
+                    switch loadCommand.value {
+                    case .atom_info(_):
+                        return true
+                    default:
+                        return false
+                    }
+                })
             #else
-            throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
+                throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
             #endif
         }
 
         #if canImport(Darwin)
-        private func sectionsMatching(_ segmentSectionNames: [(segmentName: String, sectionName: String)]) throws -> [(Bool, MachO.Slice.Segment.Section)] {
-            let isObject = self.headers.allSatisfy { (slice, header) in return header.filetype == MH_OBJECT }
-            return try self.segments().filter { (segment: Segment) throws -> Bool in
-                // If it's an object file, all the sections are part of a single segment with no name.
-                if isObject {
-                    return try segment.value.segment.segname().isEmpty
-                } else {
-                    return try segmentSectionNames.map{$0.segmentName}.contains(segment.value.segment.segname())
+            private func sectionsMatching(_ segmentSectionNames: [(segmentName: String, sectionName: String)]) throws -> [(Bool, MachO.Slice.Segment.Section)] {
+                let isObject = self.headers.allSatisfy { (slice, header) in return header.filetype == MH_OBJECT }
+                return try self.segments().filter { (segment: Segment) throws -> Bool in
+                    // If it's an object file, all the sections are part of a single segment with no name.
+                    if isObject {
+                        return try segment.value.segment.segname().isEmpty
+                    } else {
+                        return try segmentSectionNames.map { $0.segmentName }.contains(segment.value.segment.segname())
+                    }
+                }
+                .flatMap { (segment: Segment) throws -> [(Bool, Segment.Section)] in
+                    return try segment.sections().filter { (section: Segment.Section) throws -> Bool in
+                        let s = section.section
+                        return try segmentSectionNames.contains { try $0.segmentName == s.segname() && $0.sectionName == s.sectname() }
+                    }.map { (segment.loadCommand.swap, $0) }
                 }
             }
-            .flatMap{ (segment: Segment) throws -> [(Bool, Segment.Section)] in
-                return try segment.sections().filter { (section: Segment.Section) throws -> Bool in
-                    let s = section.section
-                    return try segmentSectionNames.contains { try $0.segmentName == s.segname() && $0.sectionName == s.sectname() }
-                }.map { (segment.loadCommand.swap, $0) }
-            }
-        }
         #endif
 
         public func swiftABIVersion() throws -> SwiftABIVersion? {
             #if canImport(Darwin)
-            // The Swift ABI version is in the ObjC image info section, which might be in either the __DATA, __DATA_CONST, or the __OBJC segment.
-            let segmentSectionNames = [
-                ("__DATA", "__objc_imageinfo"),
-                ("__DATA_CONST", "__objc_imageinfo"),
-                ("__OBJC", "__image_info"),
+                // The Swift ABI version is in the ObjC image info section, which might be in either the __DATA, __DATA_CONST, or the __OBJC segment.
+                let segmentSectionNames = [
+                    ("__DATA", "__objc_imageinfo"),
+                    ("__DATA_CONST", "__objc_imageinfo"),
+                    ("__OBJC", "__image_info"),
                 ]
 
-            let sections = try sectionsMatching(segmentSectionNames)
+                let sections = try sectionsMatching(segmentSectionNames)
 
-            // We expect a single ObjC image info section, otherwise we bail
-            guard !sections.isEmpty else { return nil }
-            guard sections.count == 1 else { throw BinaryReaderError.parseError("Found multiple ObjC image info sections") }
-            let (swap, section) = sections[0]
+                // We expect a single ObjC image info section, otherwise we bail
+                guard !sections.isEmpty else { return nil }
+                guard sections.count == 1 else { throw BinaryReaderError.parseError("Found multiple ObjC image info sections") }
+                let (swap, section) = sections[0]
 
-            reader.push()
-            defer { reader.pop() }
+                reader.push()
+                defer { reader.pop() }
 
-            // Read objc_image_info struct
-            let objcInfo = try reader.seek(by: Int(section.section.offset.byteSwappedIfNeeded(swap)))
-            let flags = (try objcInfo.seek(by: 4).read() as UInt32).byteSwappedIfNeeded(swap)
+                // Read objc_image_info struct
+                let objcInfo = try reader.seek(by: Int(section.section.offset.byteSwappedIfNeeded(swap)))
+                let flags = (try objcInfo.seek(by: 4).read() as UInt32).byteSwappedIfNeeded(swap)
 
-            // FIXME: We should be using a shared definition for this.
-            let swiftVersion = (flags >> 8) & 0xff
-            guard swiftVersion != 0 else { return nil }
+                // FIXME: We should be using a shared definition for this.
+                let swiftVersion = (flags >> 8) & 0xff
+                guard swiftVersion != 0 else { return nil }
 
-            // NOTE: Swift 5.0 uses 7 as the ABI value. This is the first Swift with a stable ABI.
+                // NOTE: Swift 5.0 uses 7 as the ABI value. This is the first Swift with a stable ABI.
 
-            let vers = Int(swiftVersion)
-            return vers < 7 ? .unstable(vers) : .stable(vers)
+                let vers = Int(swiftVersion)
+                return vers < 7 ? .unstable(vers) : .stable(vers)
             #else
-            throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
+                throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
             #endif
         }
 
         public func simulatedEntitlements() throws -> PropertyListItem? {
             #if canImport(Darwin)
-            let sections = try sectionsMatching([("__TEXT", "__entitlements")])
+                let sections = try sectionsMatching([("__TEXT", "__entitlements")])
 
-            // We expect a single section, otherwise we bail
-            guard !sections.isEmpty else { return nil }
-            guard sections.count == 1 else { throw BinaryReaderError.parseError("Found multiple __entitlements sections") }
-            let (swap, section) = sections[0]
+                // We expect a single section, otherwise we bail
+                guard !sections.isEmpty else { return nil }
+                guard sections.count == 1 else { throw BinaryReaderError.parseError("Found multiple __entitlements sections") }
+                let (swap, section) = sections[0]
 
-            reader.push()
-            defer { reader.pop() }
+                reader.push()
+                defer { reader.pop() }
 
-            let sectionReader = try reader.seek(by: Int(section.section.offset.byteSwappedIfNeeded(swap)))
-            return try PropertyList.fromBytes(sectionReader.read(count: Int(section.section.size64)))
+                let sectionReader = try reader.seek(by: Int(section.section.offset.byteSwappedIfNeeded(swap)))
+                return try PropertyList.fromBytes(sectionReader.read(count: Int(section.section.size64)))
             #else
-            throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
+                throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
             #endif
         }
 
         public func simulatedDEREntitlements() throws -> [UInt8]? {
             #if canImport(Darwin)
-            let sections = try sectionsMatching([("__TEXT", "__ents_der")])
+                let sections = try sectionsMatching([("__TEXT", "__ents_der")])
 
-            // We expect a single section, otherwise we bail
-            guard !sections.isEmpty else { return nil }
-            guard sections.count == 1 else { throw BinaryReaderError.parseError("Found multiple __ents_der sections") }
-            let (swap, section) = sections[0]
+                // We expect a single section, otherwise we bail
+                guard !sections.isEmpty else { return nil }
+                guard sections.count == 1 else { throw BinaryReaderError.parseError("Found multiple __ents_der sections") }
+                let (swap, section) = sections[0]
 
-            reader.push()
-            defer { reader.pop() }
+                reader.push()
+                defer { reader.pop() }
 
-            let sectionReader = try reader.seek(by: Int(section.section.offset.byteSwappedIfNeeded(swap)))
-            return try sectionReader.read(count: Int(section.section.size64))
+                let sectionReader = try reader.seek(by: Int(section.section.offset.byteSwappedIfNeeded(swap)))
+                return try sectionReader.read(count: Int(section.section.size64))
             #else
-            throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
+                throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
             #endif
         }
 
         public func remarks() throws -> Data? {
             #if canImport(Darwin)
-            let sections = try sectionsMatching([("__LLVM", "__remarks")])
+                let sections = try sectionsMatching([("__LLVM", "__remarks")])
 
-            // We expect a single section, otherwise we bail
-            guard !sections.isEmpty else { return nil }
-            guard sections.count == 1 else { throw BinaryReaderError.parseError("Found multiple __remarks sections") }
-            let (swap, section) = sections[0]
+                // We expect a single section, otherwise we bail
+                guard !sections.isEmpty else { return nil }
+                guard sections.count == 1 else { throw BinaryReaderError.parseError("Found multiple __remarks sections") }
+                let (swap, section) = sections[0]
 
-            reader.push()
-            defer { reader.pop() }
+                reader.push()
+                defer { reader.pop() }
 
-            let sectionReader = try reader.seek(by: Int(section.section.offset.byteSwappedIfNeeded(swap)))
-            return Data(try sectionReader.read(count: Int(section.section.size64)))
+                let sectionReader = try reader.seek(by: Int(section.section.offset.byteSwappedIfNeeded(swap)))
+                return Data(try sectionReader.read(count: Int(section.section.size64)))
             #else
-            throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
+                throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
             #endif
         }
     }
 }
 
 @available(*, unavailable)
-extension MachO: Sendable { }
+extension MachO: Sendable {}
 
 @available(*, unavailable)
-extension MachO.Slice: Sendable { }
+extension MachO.Slice: Sendable {}
 
 #if canImport(Darwin)
-@available(*, unavailable)
-extension MachO.Slice.LoadCommand: Sendable { }
+    @available(*, unavailable)
+    extension MachO.Slice.LoadCommand: Sendable {}
 
-@available(*, unavailable)
-extension MachO.Slice.Segment: Sendable { }
+    @available(*, unavailable)
+    extension MachO.Slice.Segment: Sendable {}
 #endif
 
 fileprivate extension Version {
@@ -1497,8 +1496,7 @@ fileprivate extension Version {
                 let magic2: UInt32 = try reader.peek(offset: MemoryLayout<UInt32>.size)
                 if magic2 == UInt32(bigEndian: ARMAG2) {
                     self = .thin
-                }
-                else {
+                } else {
                     throw BinaryReaderError.parseError("Unknown header: 0x\(String(magic, radix: 16)) 0x\(String(magic2, radix: 16))")
                 }
 
@@ -1527,49 +1525,50 @@ fileprivate extension Version {
         switch archiveType {
         case .thin:
             #if canImport(Darwin.ar)
-            // The magic bytes '!<arch>\n' has already been established, so skip past that.
-            try self.reader.seek(by: Int(SARMAG))
-
-            var machOs: [MachO] = []
-
-            // Attempt to read all of the archive headers out of the content.
-            while !reader.eof {
-                let archiveHeader: ar_hdr = try reader.read()
+                // The magic bytes '!<arch>\n' has already been established, so skip past that.
+                try self.reader.seek(by: Int(SARMAG))
+
+                var machOs: [MachO] = []
+
+                // Attempt to read all of the archive headers out of the content.
+                while !reader.eof {
+                    let archiveHeader: ar_hdr = try reader.read()
+
+                    // Capture the current reader state so we can properly increment past each archive.
+                    reader.push()
+
+                    let archiveName =
+                        try { () throws -> String? in
+                            if let nameSize = archiveHeader.extendedFormatArchiveNameSize {
+                                return [UInt8](try reader.read(count: nameSize)).withUnsafeBytes({ rawPtr in
+                                    if let cString = rawPtr.baseAddress?.assumingMemoryBound(to: CChar.self) {
+                                        // The length of the filename from the header always seems to include 4 NULL padding bytes...
+                                        return FileManager.default.string(withFileSystemRepresentation: cString, length: rawPtr.count).trimmingCharacters(in: CharacterSet(["\0"]))
+                                    }
+                                    return nil
+                                })
+                            }
+                            return archiveHeader.rawArchiveName
+                        }() ?? ""
 
-                // Capture the current reader state so we can properly increment past each archive.
-                reader.push()
+                    guard let objectSize = archiveHeader.objectSize, objectSize > 0 else {
+                        throw BinaryReaderError.parseError("Encountered zero-length static archive")
+                    }
 
-                let archiveName = try { () throws -> String? in
-                    if let nameSize = archiveHeader.extendedFormatArchiveNameSize {
-                        return [UInt8](try reader.read(count: nameSize)).withUnsafeBytes({ rawPtr in
-                            if let cString = rawPtr.baseAddress?.assumingMemoryBound(to: CChar.self) {
-                                // The length of the filename from the header always seems to include 4 NULL padding bytes...
-                                return FileManager.default.string(withFileSystemRepresentation: cString, length: rawPtr.count).trimmingCharacters(in: CharacterSet(["\0"]))
-                            }
-                            return nil
-                        })
+                    // Make sure to skip the archive member which is the symbol table
+                    if !StaticArchive.symbolTables.contains(archiveName) {
+                        machOs.append(try MachO(reader: BinaryReader(data: reader.data, startingAt: reader.offset, size: objectSize)))
                     }
-                    return archiveHeader.rawArchiveName
-                }() ?? ""
 
-                guard let objectSize = archiveHeader.objectSize, objectSize > 0 else {
-                    throw BinaryReaderError.parseError("Encountered zero-length static archive")
-                }
+                    // Return back to the reader's state to when the header was read.
+                    reader.pop()
 
-                // Make sure to skip the archive member which is the symbol table
-                if !StaticArchive.symbolTables.contains(archiveName) {
-                    machOs.append(try MachO(reader: BinaryReader(data: reader.data, startingAt: reader.offset, size: objectSize)))
+                    try reader.seek(by: objectSize.nextEvenNumber() + (archiveHeader.extendedFormatArchiveNameSize ?? 0))
                 }
 
-                // Return back to the reader's state to when the header was read.
-                reader.pop()
-
-                try reader.seek(by: objectSize.nextEvenNumber() + (archiveHeader.extendedFormatArchiveNameSize ?? 0))
-            }
-
-            return machOs
+                return machOs
             #else
-            throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
+                throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
             #endif
         case let .fat(magic):
             let archs: [any MachOFatHeader] = try .init(reader: reader)
@@ -1585,82 +1584,82 @@ fileprivate extension Version {
 }
 
 @available(*, unavailable)
-extension StaticArchive: Sendable { }
+extension StaticArchive: Sendable {}
 
 #if canImport(Darwin.ar)
-extension ar_hdr {
-    public var rawArchiveName: String? {
-        var tmp = ar_name
-        return withUnsafeBytes(of: &tmp) { rawPtr in
-            if let cString = rawPtr.baseAddress?.assumingMemoryBound(to: CChar.self) {
-                return FileManager.default.string(withFileSystemRepresentation: cString, length: rawPtr.count)
+    extension ar_hdr {
+        public var rawArchiveName: String? {
+            var tmp = ar_name
+            return withUnsafeBytes(of: &tmp) { rawPtr in
+                if let cString = rawPtr.baseAddress?.assumingMemoryBound(to: CChar.self) {
+                    return FileManager.default.string(withFileSystemRepresentation: cString, length: rawPtr.count)
+                }
+                return nil
             }
-            return nil
         }
-    }
 
-    public var extendedFormatArchiveNameSize: Int? {
-        if let rawArchiveName, rawArchiveName.hasPrefix(AR_EFMT1) {
-            return Int(rawArchiveName.withoutPrefix(AR_EFMT1).trimmingCharacters(in: .whitespaces))
+        public var extendedFormatArchiveNameSize: Int? {
+            if let rawArchiveName, rawArchiveName.hasPrefix(AR_EFMT1) {
+                return Int(rawArchiveName.withoutPrefix(AR_EFMT1).trimmingCharacters(in: .whitespaces))
+            }
+            return nil
         }
-        return nil
-    }
 
-    public var objectSize: Int? {
-        var tmp = ar_size
-        return withUnsafeBytes(of: &tmp) { rawPtr in
-            if let s = String(bytes: rawPtr, encoding: .utf8), let size = Int(s.trimmingCharacters(in: .whitespaces)) {
-                return size - (extendedFormatArchiveNameSize ?? 0)
+        public var objectSize: Int? {
+            var tmp = ar_size
+            return withUnsafeBytes(of: &tmp) { rawPtr in
+                if let s = String(bytes: rawPtr, encoding: .utf8), let size = Int(s.trimmingCharacters(in: .whitespaces)) {
+                    return size - (extendedFormatArchiveNameSize ?? 0)
+                }
+                return nil
             }
-            return nil
         }
-    }
 
-    /// The number of bytes the `ar_hdr` occupies.
-    public var structSize: Int {
-        return MemoryLayout<ar_hdr>.size
+        /// The number of bytes the `ar_hdr` occupies.
+        public var structSize: Int {
+            return MemoryLayout<ar_hdr>.size
+        }
     }
-}
 #endif
 
 extension Array where Element == any MachOFatHeader {
     init(reader: BinaryReader) throws {
         #if canImport(Darwin)
-        let fh: fat_header = try reader.read()
-        let swap = shouldSwap(magic: fh.magic)
-        let nfat_arch = fh.nfat_arch.byteSwappedIfNeeded(swap)
+            let fh: fat_header = try reader.read()
+            let swap = shouldSwap(magic: fh.magic)
+            let nfat_arch = fh.nfat_arch.byteSwappedIfNeeded(swap)
 
-        let is64bit = fh.magic == FAT_MAGIC_64 || fh.magic == FAT_CIGAM_64
+            let is64bit = fh.magic == FAT_MAGIC_64 || fh.magic == FAT_CIGAM_64
 
-        var archs: [any MachOFatHeader] = try (0 ..< nfat_arch).map { _ in
-            if is64bit {
-                return try reader.read() as fat_arch_64
-            } else {
-                return try reader.read() as fat_arch
-            }
-        }
-
-        // Special case hidden CPU_TYPE_ARM64. nfat_arch says N, but arm64 is at N+1, to hide it from OS versions which cannot process it correctly. Note that lipo itself is capable of _writing_ multiple hidden arm64 slices, but it will only _read_ a single hidden arm64 slice. We'll only read one, since that seems to have been the intent (and predates arm64e).
-
-        if let firstSliceOffset = archs.map({ $0.offset(byteSwappedIfNeeded: swap) }).min(), reader.offset < firstSliceOffset - UInt64(is64bit ? MemoryLayout<fat_arch_64>.size : MemoryLayout<fat_arch>.size) {
-            let hiddenSliceReader = BinaryReader(data: reader.data, startingAt: reader.offset, size: Int(firstSliceOffset) - reader.offset)
-            if !hiddenSliceReader.eof {
-                let arch: any MachOFatHeader
+            var archs: [any MachOFatHeader] = try (0..<nfat_arch).map { _ in
                 if is64bit {
-                    arch = try hiddenSliceReader.read() as fat_arch_64
+                    return try reader.read() as fat_arch_64
                 } else {
-                    arch = try hiddenSliceReader.read() as fat_arch
+                    return try reader.read() as fat_arch
                 }
+            }
+
+            // Special case hidden CPU_TYPE_ARM64. nfat_arch says N, but arm64 is at N+1, to hide it from OS versions which cannot process it correctly. Note that lipo itself is capable of _writing_ multiple hidden arm64 slices, but it will only _read_ a single hidden arm64 slice. We'll only read one, since that seems to have been the intent (and predates arm64e).
 
-                if arch.cputype.byteSwappedIfNeeded(true) == CPU_TYPE_ARM64 {
-                    archs.append(arch)
+            if let firstSliceOffset = archs.map({ $0.offset(byteSwappedIfNeeded: swap) }).min(), reader.offset < firstSliceOffset - UInt64(is64bit ? MemoryLayout<fat_arch_64>.size : MemoryLayout<fat_arch>.size) {
+                let hiddenSliceReader = BinaryReader(data: reader.data, startingAt: reader.offset, size: Int(firstSliceOffset) - reader.offset)
+                if !hiddenSliceReader.eof {
+                    let arch: any MachOFatHeader
+                    if is64bit {
+                        arch = try hiddenSliceReader.read() as fat_arch_64
+                    } else {
+                        arch = try hiddenSliceReader.read() as fat_arch
+                    }
+
+                    if arch.cputype.byteSwappedIfNeeded(true) == CPU_TYPE_ARM64 {
+                        archs.append(arch)
+                    }
                 }
             }
-        }
 
-        self = archs
+            self = archs
         #else
-        throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
+            throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
         #endif
     }
 }
@@ -1671,20 +1670,20 @@ extension MachO.Slice {
     public var containsSwift5EntrySection: Bool {
         get throws {
             #if canImport(Darwin)
-            for segment in try segments() {
-                for section in try segment.sections() {
-                    let segname = try section.section.segname()
-                    let sectname = try section.section.sectname()
-
-                    guard segname == "__TEXT" else { continue }
-                    if sectname == "__swift5_entry" {
-                        return true
+                for segment in try segments() {
+                    for section in try segment.sections() {
+                        let segname = try section.section.segname()
+                        let sectname = try section.section.sectname()
+
+                        guard segname == "__TEXT" else { continue }
+                        if sectname == "__swift5_entry" {
+                            return true
+                        }
                     }
                 }
-            }
-            return false
+                return false
             #else
-            throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
+                throw BinaryReaderError.parseError("Mach-O parsing not supported on this platform")
             #endif
         }
     }
diff --git a/Sources/SWBUtil/Misc+Async.swift b/Sources/SWBUtil/Misc+Async.swift
index ff01e3cf..f9d5fbc6 100644
--- a/Sources/SWBUtil/Misc+Async.swift
+++ b/Sources/SWBUtil/Misc+Async.swift
@@ -120,6 +120,6 @@ public func withExtendedLifetime<T: ~Copyable, E: Error, Result: ~Copyable>(
     _ x: borrowing T,
     _ body: (borrowing T) async throws(E) -> Result
 ) async throws(E) -> Result {
-    defer { withExtendedLifetime(x) { } }
+    defer { withExtendedLifetime(x) {} }
     return try await body(x)
 }
diff --git a/Sources/SWBUtil/Misc.swift b/Sources/SWBUtil/Misc.swift
index f874b75b..02a99c6a 100644
--- a/Sources/SWBUtil/Misc.swift
+++ b/Sources/SWBUtil/Misc.swift
@@ -20,18 +20,18 @@ import SWBLibc
 
 /// Get the name of the build service executable
 public func buildServiceExecutableName() -> String {
-#if SWBBUILDSERVICE_USE_DEBUG_EXECUTABLE_SUFFIX
-    return "SWBBuildServiceDebug"
-#else
-    return "SWBBuildService"
-#endif
+    #if SWBBUILDSERVICE_USE_DEBUG_EXECUTABLE_SUFFIX
+        return "SWBBuildServiceDebug"
+    #else
+        return "SWBBuildService"
+    #endif
 }
 
 public func log(_ message: String, isError: Bool = false) {
     #if canImport(os)
-    if isError {
-        return OSLog.log(message)
-    }
+        if isError {
+            return OSLog.log(message)
+        }
     #endif
     NSLog(message)
 }
@@ -39,22 +39,22 @@ public func log(_ message: String, isError: Bool = false) {
 /// Get the path to the user cache directory.
 public func userCacheDir() -> Path {
     #if canImport(Darwin)
-    struct Static {
-        static let value = { () -> Path in
-            let len = confstr(_CS_DARWIN_USER_CACHE_DIR, nil, 0)
+        struct Static {
+            static let value = { () -> Path in
+                let len = confstr(_CS_DARWIN_USER_CACHE_DIR, nil, 0)
 
-            let tmp = UnsafeMutableBufferPointer(start: UnsafeMutablePointer<Int8>.allocate(capacity: len), count:len)
-            defer {
-                tmp.deallocate()
-            }
-            guard confstr(_CS_DARWIN_USER_CACHE_DIR, tmp.baseAddress, len) == len else { fatalError("unexpected confstr failure()") }
+                let tmp = UnsafeMutableBufferPointer(start: UnsafeMutablePointer<Int8>.allocate(capacity: len), count: len)
+                defer {
+                    tmp.deallocate()
+                }
+                guard confstr(_CS_DARWIN_USER_CACHE_DIR, tmp.baseAddress, len) == len else { fatalError("unexpected confstr failure()") }
 
-            return Path(String(cString: tmp.baseAddress!))
-        }()
-    }
-    return Static.value
+                return Path(String(cString: tmp.baseAddress!))
+            }()
+        }
+        return Static.value
     #else
-    return .temporaryDirectory
+        return .temporaryDirectory
     #endif
 }
 
@@ -66,26 +66,26 @@ public func parseUmbrellaHeaderName(_ string: String) -> String? {
 }
 
 #if canImport(Darwin)
-public import func Foundation.autoreleasepool
+    public import func Foundation.autoreleasepool
 #endif
 
 public func autoreleasepool<Result>(invoking body: () throws -> Result) rethrows -> Result {
     #if canImport(Darwin)
-    return try Foundation.autoreleasepool(invoking: body)
+        return try Foundation.autoreleasepool(invoking: body)
     #else
-    return try body()
+        return try body()
     #endif
 }
 
 #if !canImport(Darwin)
-public let NSEC_PER_SEC: UInt64 = 1000000000
-public let NSEC_PER_MSEC: UInt64 = 1000000
-public let USEC_PER_SEC: UInt64 = 1000000
-public let NSEC_PER_USEC: UInt64 = 1000
+    public let NSEC_PER_SEC: UInt64 = 1000000000
+    public let NSEC_PER_MSEC: UInt64 = 1000000
+    public let USEC_PER_SEC: UInt64 = 1000000
+    public let NSEC_PER_USEC: UInt64 = 1000
 #endif
 
 extension Date: Serializable {
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serialize(timeIntervalSinceReferenceDate)
     }
 
diff --git a/Sources/SWBUtil/MsgPack.swift b/Sources/SWBUtil/MsgPack.swift
index 4f427f7b..002349d9 100644
--- a/Sources/SWBUtil/MsgPack.swift
+++ b/Sources/SWBUtil/MsgPack.swift
@@ -21,418 +21,414 @@
 //
 //===----------------------------------------------------------------------===//
 
-
 // MARK: MessagePack Encoder
 
-
 /// An encoder for MessagePack.
 ///
 /// This encoder provides a StAX-like interface.
 public final class MsgPackEncoder: Encoder {
-  // FIXME: This should be a Sink.
-  // Currently it is not for performance reasons (StdlibUnittest
-  // code can not be specialized).
-  var bytes: [UInt8] = []
-
-  // IMPORTANT!! This is done as a performance optimization.
-  #if DEBUG
-  internal let enableIntegrityChecks = true
-  #else
-  internal let enableIntegrityChecks = false
-  #endif
-
-  internal var _expectedElementCount: [Int] = [ 0 ]
-  internal var _actualElementCount: [Int] = [ 0 ]
-
-  internal func _appendBigEndian(_ value: Swift.UInt64) {
-    var x = value.byteSwapped
-    for _ in 0..<8 {
-      bytes.append(UInt8(truncatingIfNeeded: x))
-      x >>= 8
-    }
-  }
-
-  internal func _appendBigEndian(_ value: Swift.UInt32) {
-    var x = value.byteSwapped
-    for _ in 0..<4 {
-      bytes.append(UInt8(truncatingIfNeeded: x))
-      x >>= 8
-    }
-  }
-
-  internal func _appendBigEndian(_ value: Swift.UInt16) {
-    var x = value.byteSwapped
-    for _ in 0..<2 {
-      bytes.append(UInt8(truncatingIfNeeded: x))
-      x >>= 8
-    }
-  }
-
-  internal func _appendBigEndian(_ value: Swift.Int64) {
-    _appendBigEndian(Swift.UInt64(bitPattern: value))
-  }
-
-  internal func _addedElement() {
-    if enableIntegrityChecks {
-        _actualElementCount[_actualElementCount.count - 1] += 1
-    }
-  }
-
-  public func append(_ i: Int64) {
-    bytes.reserveCapacity(bytes.count + 9)
-    bytes.append(0xd3)
-    _appendBigEndian(i)
-
-    _addedElement()
-  }
-
-  public func append(_ i: UInt64) {
-    bytes.reserveCapacity(bytes.count + 9)
-    bytes.append(0xcf)
-    _appendBigEndian(i)
-
-    _addedElement()
-  }
-
-  public func append(_ i: UInt8) {
-    bytes.reserveCapacity(bytes.count + 2)
-    bytes.append(0xe0)
-    bytes.append(i)
-
-    _addedElement()
-  }
-
-  public func appendNil() {
-    bytes.append(0xc0)
-    _addedElement()
-  }
-
-  public func append(_ b: Bool) {
-    bytes.append(b ? 0xc3 : 0xc2)
-    _addedElement()
-  }
-
-  public func append(_ f: Float32) {
-    bytes.reserveCapacity(bytes.count + 5)
-    bytes.append(0xca)
-    _appendBigEndian(f.bitPattern)
-    _addedElement()
-  }
-
-  public func append(_ f: Float64) {
-    bytes.reserveCapacity(bytes.count + 9)
-    bytes.append(0xcb)
-    _appendBigEndian(f.bitPattern)
-    _addedElement()
-  }
-
-  public func append(_ s: String) {
-    let count = s.utf8.count
-    switch Int64(count) {
-    case 0...31:
-      // fixstr
-      bytes.append(0b1010_0000 | UInt8(count))
-    case 32...0xff:
-      // str8
-      bytes.append(0xd9)
-      bytes.append(UInt8(count))
-    case 0x100...0xffff:
-      // str16
-      bytes.append(0xda)
-      _appendBigEndian(UInt16(count))
-    case 0x1_0000...0xffff_ffff:
-      // str32
-      bytes.append(0xdb)
-      _appendBigEndian(UInt32(count))
-    default:
-      // FIXME: better error handling.  Trapping is at least secure.
-      fatalError("string is too long")
-    }
-
-    bytes += s.utf8
-
-    _addedElement()
-  }
-
-  public func append(_ dataBytes: [UInt8]) {
-    switch Int64(dataBytes.count) {
-    case 0...0xff:
-      // bin8
-      bytes.append(0xc4)
-      bytes.append(UInt8(dataBytes.count))
-    case 0x100...0xffff:
-      // bin16
-      bytes.append(0xc5)
-      _appendBigEndian(UInt16(dataBytes.count))
-    case 0x1_0000...0xffff_ffff:
-      // bin32
-      bytes.append(0xc6)
-      _appendBigEndian(UInt32(dataBytes.count))
-    default:
-      // FIXME: better error handling.  Trapping is at least secure.
-      fatalError("binary data is too long")
-    }
-    bytes += dataBytes
-
-    _addedElement()
-  }
-
-  public func beginArray(_ count: Int) {
-    switch Int64(count) {
-    case 0...0xf:
-      // fixarray
-      bytes.append(0b1001_0000 | UInt8(count))
-    case 0x10...0xffff:
-      // array16
-      bytes.append(0xdc)
-      _appendBigEndian(UInt16(count))
-    case 0x1_0000...0xffff_ffff:
-      // array32
-      bytes.append(0xdd)
-      _appendBigEndian(UInt32(count))
-    default:
-      // FIXME: better error handling.  Trapping is at least secure.
-      fatalError("array is too long")
-    }
-
-    if enableIntegrityChecks {
-        _expectedElementCount.append(count)
-        _actualElementCount.append(0)
-    }
-  }
-
-  public func endArray() {
-    if enableIntegrityChecks {
-        let expectedCount = _expectedElementCount.removeLast()
-        let actualCount = _actualElementCount.removeLast()
-        if expectedCount != actualCount {
-          fatalError("Actual number of elements in the array (\(actualCount)) does not match the expected number (\(expectedCount))")
+    // FIXME: This should be a Sink.
+    // Currently it is not for performance reasons (StdlibUnittest
+    // code can not be specialized).
+    var bytes: [UInt8] = []
+
+    // IMPORTANT!! This is done as a performance optimization.
+    #if DEBUG
+        internal let enableIntegrityChecks = true
+    #else
+        internal let enableIntegrityChecks = false
+    #endif
+
+    internal var _expectedElementCount: [Int] = [0]
+    internal var _actualElementCount: [Int] = [0]
+
+    internal func _appendBigEndian(_ value: Swift.UInt64) {
+        var x = value.byteSwapped
+        for _ in 0..<8 {
+            bytes.append(UInt8(truncatingIfNeeded: x))
+            x >>= 8
+        }
+    }
+
+    internal func _appendBigEndian(_ value: Swift.UInt32) {
+        var x = value.byteSwapped
+        for _ in 0..<4 {
+            bytes.append(UInt8(truncatingIfNeeded: x))
+            x >>= 8
         }
+    }
+
+    internal func _appendBigEndian(_ value: Swift.UInt16) {
+        var x = value.byteSwapped
+        for _ in 0..<2 {
+            bytes.append(UInt8(truncatingIfNeeded: x))
+            x >>= 8
+        }
+    }
+
+    internal func _appendBigEndian(_ value: Swift.Int64) {
+        _appendBigEndian(Swift.UInt64(bitPattern: value))
+    }
+
+    internal func _addedElement() {
+        if enableIntegrityChecks {
+            _actualElementCount[_actualElementCount.count - 1] += 1
+        }
+    }
+
+    public func append(_ i: Int64) {
+        bytes.reserveCapacity(bytes.count + 9)
+        bytes.append(0xd3)
+        _appendBigEndian(i)
+
+        _addedElement()
+    }
+
+    public func append(_ i: UInt64) {
+        bytes.reserveCapacity(bytes.count + 9)
+        bytes.append(0xcf)
+        _appendBigEndian(i)
 
         _addedElement()
     }
-  }
 
-  public func append<T>(_ array: [T], encode: (T) -> Void) {
-    self.beginArray(array.count)
-    // NOTE: We explicit iterate over the count here as a micro-optimization: <rdar://problem/28665970> Manually iterating over count 10% faster than using iterator for generic array
-    for i in 0 ..< array.count {
-        encode(array[i])
+    public func append(_ i: UInt8) {
+        bytes.reserveCapacity(bytes.count + 2)
+        bytes.append(0xe0)
+        bytes.append(i)
+
+        _addedElement()
+    }
+
+    public func appendNil() {
+        bytes.append(0xc0)
+        _addedElement()
     }
-    self.endArray()
-  }
 
-  fileprivate func beginMap(_ mappingCount: Int) {
-    switch Int64(mappingCount) {
-    case 0...0xf:
-      bytes.append(0b1000_0000 | UInt8(mappingCount))
-    case 0x10...0xffff:
-      bytes.append(0xde)
-      _appendBigEndian(UInt16(mappingCount))
-    case 0x1_0000...0xffff_ffff:
-      bytes.append(0xdf)
-      _appendBigEndian(UInt32(mappingCount))
-    default:
-      // FIXME: better error handling.  Trapping is at least secure.
-      fatalError("map is too long")
+    public func append(_ b: Bool) {
+        bytes.append(b ? 0xc3 : 0xc2)
+        _addedElement()
     }
 
-    if enableIntegrityChecks {
-        _expectedElementCount.append(mappingCount * 2)
-        _actualElementCount.append(0)
+    public func append(_ f: Float32) {
+        bytes.reserveCapacity(bytes.count + 5)
+        bytes.append(0xca)
+        _appendBigEndian(f.bitPattern)
+        _addedElement()
+    }
+
+    public func append(_ f: Float64) {
+        bytes.reserveCapacity(bytes.count + 9)
+        bytes.append(0xcb)
+        _appendBigEndian(f.bitPattern)
+        _addedElement()
     }
-  }
 
-  fileprivate func endMap() {
-    if enableIntegrityChecks {
-        let expectedCount = _expectedElementCount.removeLast()
-        let actualCount = _actualElementCount.removeLast()
-        if expectedCount != actualCount {
-          fatalError("Actual number of elements in the map (\(actualCount)) does not match the expected number (\(expectedCount))")
+    public func append(_ s: String) {
+        let count = s.utf8.count
+        switch Int64(count) {
+        case 0...31:
+            // fixstr
+            bytes.append(0b1010_0000 | UInt8(count))
+        case 32...0xff:
+            // str8
+            bytes.append(0xd9)
+            bytes.append(UInt8(count))
+        case 0x100...0xffff:
+            // str16
+            bytes.append(0xda)
+            _appendBigEndian(UInt16(count))
+        case 0x1_0000...0xffff_ffff:
+            // str32
+            bytes.append(0xdb)
+            _appendBigEndian(UInt32(count))
+        default:
+            // FIXME: better error handling.  Trapping is at least secure.
+            fatalError("string is too long")
         }
 
+        bytes += s.utf8
+
+        _addedElement()
+    }
+
+    public func append(_ dataBytes: [UInt8]) {
+        switch Int64(dataBytes.count) {
+        case 0...0xff:
+            // bin8
+            bytes.append(0xc4)
+            bytes.append(UInt8(dataBytes.count))
+        case 0x100...0xffff:
+            // bin16
+            bytes.append(0xc5)
+            _appendBigEndian(UInt16(dataBytes.count))
+        case 0x1_0000...0xffff_ffff:
+            // bin32
+            bytes.append(0xc6)
+            _appendBigEndian(UInt32(dataBytes.count))
+        default:
+            // FIXME: better error handling.  Trapping is at least secure.
+            fatalError("binary data is too long")
+        }
+        bytes += dataBytes
+
+        _addedElement()
+    }
+
+    public func beginArray(_ count: Int) {
+        switch Int64(count) {
+        case 0...0xf:
+            // fixarray
+            bytes.append(0b1001_0000 | UInt8(count))
+        case 0x10...0xffff:
+            // array16
+            bytes.append(0xdc)
+            _appendBigEndian(UInt16(count))
+        case 0x1_0000...0xffff_ffff:
+            // array32
+            bytes.append(0xdd)
+            _appendBigEndian(UInt32(count))
+        default:
+            // FIXME: better error handling.  Trapping is at least secure.
+            fatalError("array is too long")
+        }
+
+        if enableIntegrityChecks {
+            _expectedElementCount.append(count)
+            _actualElementCount.append(0)
+        }
+    }
+
+    public func endArray() {
+        if enableIntegrityChecks {
+            let expectedCount = _expectedElementCount.removeLast()
+            let actualCount = _actualElementCount.removeLast()
+            if expectedCount != actualCount {
+                fatalError("Actual number of elements in the array (\(actualCount)) does not match the expected number (\(expectedCount))")
+            }
+
+            _addedElement()
+        }
+    }
+
+    public func append<T>(_ array: [T], encode: (T) -> Void) {
+        self.beginArray(array.count)
+        // NOTE: We explicit iterate over the count here as a micro-optimization: <rdar://problem/28665970> Manually iterating over count 10% faster than using iterator for generic array
+        for i in 0..<array.count {
+            encode(array[i])
+        }
+        self.endArray()
+    }
+
+    fileprivate func beginMap(_ mappingCount: Int) {
+        switch Int64(mappingCount) {
+        case 0...0xf:
+            bytes.append(0b1000_0000 | UInt8(mappingCount))
+        case 0x10...0xffff:
+            bytes.append(0xde)
+            _appendBigEndian(UInt16(mappingCount))
+        case 0x1_0000...0xffff_ffff:
+            bytes.append(0xdf)
+            _appendBigEndian(UInt32(mappingCount))
+        default:
+            // FIXME: better error handling.  Trapping is at least secure.
+            fatalError("map is too long")
+        }
+
+        if enableIntegrityChecks {
+            _expectedElementCount.append(mappingCount * 2)
+            _actualElementCount.append(0)
+        }
+    }
+
+    fileprivate func endMap() {
+        if enableIntegrityChecks {
+            let expectedCount = _expectedElementCount.removeLast()
+            let actualCount = _actualElementCount.removeLast()
+            if expectedCount != actualCount {
+                fatalError("Actual number of elements in the map (\(actualCount)) does not match the expected number (\(expectedCount))")
+            }
+
+            _addedElement()
+        }
+    }
+
+    public func append<Tk: Comparable, Tv>(_ dict: [Tk: Tv], encodeKey: (Tk) -> Void, encodeValue: (Tv) -> Void) {
+        self.beginMap(dict.count)
+        for (key, value) in dict.sorted(byKey: <) {
+            encodeKey(key)
+            encodeValue(value)
+        }
+        self.endMap()
+    }
+
+    public func appendExtended(type: Int8, data: [UInt8]) {
+        switch Int64(data.count) {
+        case 1:
+            // fixext1
+            bytes.append(0xd4)
+        case 2:
+            // fixext2
+            bytes.append(0xd5)
+        case 4:
+            // fixext4
+            bytes.append(0xd6)
+        case 8:
+            // fixext8
+            bytes.append(0xd7)
+        case 16:
+            // fixext16
+            bytes.append(0xd8)
+        case 0...0xff:
+            // ext8
+            bytes.append(0xc7)
+            bytes.append(UInt8(data.count))
+        case 0x100...0xffff:
+            // ext16
+            bytes.append(0xc8)
+            _appendBigEndian(UInt16(data.count))
+        case 0x1_0000...0xffff_ffff:
+            // ext32
+            bytes.append(0xc9)
+            _appendBigEndian(UInt32(data.count))
+        default:
+            fatalError("extended data is too long")
+        }
+        bytes.append(UInt8(bitPattern: type))
+        bytes += data
+
         _addedElement()
     }
-  }
-
-  public func append<Tk: Comparable, Tv>(_ dict: [Tk: Tv], encodeKey: (Tk) -> Void, encodeValue: (Tv) -> Void) {
-    self.beginMap(dict.count)
-    for (key, value) in dict.sorted(byKey: <) {
-      encodeKey(key)
-      encodeValue(value)
-    }
-    self.endMap()
-  }
-
-  public func appendExtended(type: Int8, data: [UInt8]) {
-    switch Int64(data.count) {
-    case 1:
-      // fixext1
-      bytes.append(0xd4)
-    case 2:
-      // fixext2
-      bytes.append(0xd5)
-    case 4:
-      // fixext4
-      bytes.append(0xd6)
-    case 8:
-      // fixext8
-      bytes.append(0xd7)
-    case 16:
-      // fixext16
-      bytes.append(0xd8)
-    case 0...0xff:
-      // ext8
-      bytes.append(0xc7)
-      bytes.append(UInt8(data.count))
-    case 0x100...0xffff:
-      // ext16
-      bytes.append(0xc8)
-      _appendBigEndian(UInt16(data.count))
-    case 0x1_0000...0xffff_ffff:
-      // ext32
-      bytes.append(0xc9)
-      _appendBigEndian(UInt32(data.count))
-    default:
-      fatalError("extended data is too long")
-    }
-    bytes.append(UInt8(bitPattern: type))
-    bytes += data
-
-    _addedElement()
-  }
 }
 
 @available(*, unavailable)
-extension MsgPackEncoder: Sendable { }
+extension MsgPackEncoder: Sendable {}
 
 internal func _safeUInt32ToInt(_ x: UInt32) -> Int? {
-  return Int(exactly: x)
+    return Int(exactly: x)
 }
 
-enum MsgPackError : Swift.Error {
-  case decodeFailed
+enum MsgPackError: Swift.Error {
+    case decodeFailed
 }
 
-
 // MARK: MessagePack Decoder
 
-
 /// A decoder for MessagePack.
 ///
 /// This decoder provides a StAX-like interface.
 public final class MsgPackDecoder: Decoder {
-  // FIXME: This should be a Generator.
-  // Currently it is not for performance reasons (StdlibUnittest
-  // code can not be specialized).
-  //
-  // Or maybe not, since the caller might want to know how many
-  // bytes were consumed.
-  internal let _bytes: ArraySlice<UInt8>
-
-  internal var _consumedCount: Int = 0
-
-  public var consumedCount: Int {
-    return _consumedCount
-  }
-
-  public init(_ bytes: ArraySlice<UInt8>) {
-    self._bytes = bytes
-  }
-
-  internal func _fail() throws -> Never  {
-    throw MsgPackError.decodeFailed
-  }
-
-  internal func _failIf(_ fn: () throws -> Bool) throws {
-    if try fn() { try _fail() }
-  }
-
-  internal func _unwrapOrFail<T>(_ maybeValue: Optional<T>) throws -> T {
-    if let value = maybeValue {
-      return value
-    }
-    try _fail()
-  }
-
-  internal func _haveNBytes(_ count: Int) throws {
-    try _failIf { _bytes.count < _consumedCount + count }
-  }
-
-  internal func _consumeByte() throws -> UInt8 {
-    try _haveNBytes(1)
-    let result = _bytes[_consumedCount]
-    _consumedCount += 1
-    return result
-  }
-
-  internal func _consumeByteIf(_ byte: UInt8) throws {
-    try _failIf { try _consumeByte() != byte }
-  }
-
-  internal func _readBigEndianUInt16() throws -> UInt16 {
-    var result: UInt16 = 0
-    for _ in 0..<2 {
-      result <<= 8
-      result |= UInt16(try _consumeByte())
-    }
-    return result
-  }
-
-  internal func _readBigEndianUInt32() throws -> UInt32 {
-    var result: UInt32 = 0
-    for _ in 0..<4 {
-      result <<= 8
-      result |= UInt32(try _consumeByte())
-    }
-    return result
-  }
-
-  internal func _readBigEndianInt64() throws -> Int64 {
-    let result = try _readBigEndianUInt64()
-    return Int64(bitPattern: result)
-  }
-
-  internal func _readBigEndianUInt64() throws -> UInt64 {
-    var result: UInt64 = 0
-    for _ in 0..<8 {
-      result <<= 8
-      result |= UInt64(try _consumeByte())
-    }
-    return result
-  }
-
-  internal func _rewind<T>(
-    _ code: () throws -> T
-  ) -> T? {
-    let originalPosition = _consumedCount
-    do {
-      return try code()
-    } catch _ as MsgPackError {
-      // MsgPack deserialization error.  Back up to the old position and return nil.
-      _consumedCount = originalPosition
-      return nil
-    } catch {
-      // Unexpected error.  Back up to the old position and return nil.
-      // This used to preconditionFailure() but now it fails gracefully.
-      _consumedCount = originalPosition
-      return nil
-    }
-  }
-
-  public func readInt64() -> Int64? {
-    return _rewind {
-      try _consumeByteIf(0xd3)
-      return try _readBigEndianInt64()
-    }
-  }
-
-  public func readUInt64() -> UInt64? {
-    return _rewind {
-      try _consumeByteIf(0xcf)
-      return try _readBigEndianUInt64()
-    }
-  }
+    // FIXME: This should be a Generator.
+    // Currently it is not for performance reasons (StdlibUnittest
+    // code can not be specialized).
+    //
+    // Or maybe not, since the caller might want to know how many
+    // bytes were consumed.
+    internal let _bytes: ArraySlice<UInt8>
+
+    internal var _consumedCount: Int = 0
+
+    public var consumedCount: Int {
+        return _consumedCount
+    }
+
+    public init(_ bytes: ArraySlice<UInt8>) {
+        self._bytes = bytes
+    }
+
+    internal func _fail() throws -> Never {
+        throw MsgPackError.decodeFailed
+    }
+
+    internal func _failIf(_ fn: () throws -> Bool) throws {
+        if try fn() { try _fail() }
+    }
+
+    internal func _unwrapOrFail<T>(_ maybeValue: Optional<T>) throws -> T {
+        if let value = maybeValue {
+            return value
+        }
+        try _fail()
+    }
+
+    internal func _haveNBytes(_ count: Int) throws {
+        try _failIf { _bytes.count < _consumedCount + count }
+    }
+
+    internal func _consumeByte() throws -> UInt8 {
+        try _haveNBytes(1)
+        let result = _bytes[_consumedCount]
+        _consumedCount += 1
+        return result
+    }
+
+    internal func _consumeByteIf(_ byte: UInt8) throws {
+        try _failIf { try _consumeByte() != byte }
+    }
+
+    internal func _readBigEndianUInt16() throws -> UInt16 {
+        var result: UInt16 = 0
+        for _ in 0..<2 {
+            result <<= 8
+            result |= UInt16(try _consumeByte())
+        }
+        return result
+    }
+
+    internal func _readBigEndianUInt32() throws -> UInt32 {
+        var result: UInt32 = 0
+        for _ in 0..<4 {
+            result <<= 8
+            result |= UInt32(try _consumeByte())
+        }
+        return result
+    }
+
+    internal func _readBigEndianInt64() throws -> Int64 {
+        let result = try _readBigEndianUInt64()
+        return Int64(bitPattern: result)
+    }
+
+    internal func _readBigEndianUInt64() throws -> UInt64 {
+        var result: UInt64 = 0
+        for _ in 0..<8 {
+            result <<= 8
+            result |= UInt64(try _consumeByte())
+        }
+        return result
+    }
+
+    internal func _rewind<T>(
+        _ code: () throws -> T
+    ) -> T? {
+        let originalPosition = _consumedCount
+        do {
+            return try code()
+        } catch _ as MsgPackError {
+            // MsgPack deserialization error.  Back up to the old position and return nil.
+            _consumedCount = originalPosition
+            return nil
+        } catch {
+            // Unexpected error.  Back up to the old position and return nil.
+            // This used to preconditionFailure() but now it fails gracefully.
+            _consumedCount = originalPosition
+            return nil
+        }
+    }
+
+    public func readInt64() -> Int64? {
+        return _rewind {
+            try _consumeByteIf(0xd3)
+            return try _readBigEndianInt64()
+        }
+    }
+
+    public func readUInt64() -> UInt64? {
+        return _rewind {
+            try _consumeByteIf(0xcf)
+            return try _readBigEndianUInt64()
+        }
+    }
 
     public func readByte() -> UInt8? {
         return _rewind {
@@ -441,245 +437,239 @@ public final class MsgPackDecoder: Decoder {
         }
     }
 
-  public func readNil() -> Bool {
-    let value: Bool? = _rewind {
-      try _consumeByteIf(0xc0)
-      return true
+    public func readNil() -> Bool {
+        let value: Bool? = _rewind {
+            try _consumeByteIf(0xc0)
+            return true
+        }
+        // .Some(true) means nil, nil means fail...
+        return value != nil
     }
-    // .Some(true) means nil, nil means fail...
-    return value != nil
-  }
 
-  public func readBool() -> Bool? {
-    return _rewind {
-      switch try _consumeByte() {
-      case 0xc2:
-        return false
-      case 0xc3:
-        return true
-      default:
-        try _fail()
-      }
-    }
-  }
-
-  public func readFloat32() -> Float32? {
-    return _rewind {
-      try _consumeByteIf(0xca)
-      let bitPattern = try _readBigEndianUInt32()
-      return Float32(bitPattern: bitPattern)
-    }
-  }
-
-  public func readFloat64() -> Float64? {
-    return _rewind {
-      try _consumeByteIf(0xcb)
-      let bitPattern = try _readBigEndianUInt64()
-      return Float64(bitPattern: bitPattern)
-    }
-  }
-
-  internal func _consumeBytes(_ length: Int) throws -> [UInt8] {
-    try _haveNBytes(length)
-    let result = _bytes[_consumedCount..<_consumedCount + length]
-    _consumedCount += length
-    return [UInt8](result)
-  }
-
-  public func readString() -> String? {
-    return _rewind {
-      let length: Int
-      switch try _consumeByte() {
-      case let byte where byte & 0b1110_0000 == 0b1010_0000:
-        // fixstr
-        length = Int(byte & 0b0001_1111)
-      case 0xd9:
-        // str8
-        let count = try _consumeByte()
-        // Reject overlong encodings.
-        try _failIf { count <= 0x1f }
-        length = Int(count)
-      case 0xda:
-        // str16
-        let count = try _readBigEndianUInt16()
-        // Reject overlong encodings.
-        try _failIf { count <= 0xff }
-        length = Int(count)
-      case 0xdb:
-        // str32
-        let count = try _readBigEndianUInt32()
-        // Reject overlong encodings.
-        try _failIf { count <= 0xffff }
-        length = Int(count)
-      default:
-        try _fail()
-      }
-      let utf8 = try _consumeBytes(length)
-      return String(decoding: utf8, as: Unicode.UTF8.self)
-    }
-  }
-
-  public func readBinary() -> [UInt8]? {
-    return _rewind {
-      let length: Int
-      switch try _consumeByte() {
-      case 0xc4:
-        // bin8
-        length = Int(try _consumeByte())
-      case 0xc5:
-        // bin16
-        let count = try _readBigEndianUInt16()
-        // Reject overlong encodings.
-        try _failIf { count <= 0xff }
-        length = Int(count)
-      case 0xc6:
-        // bin32
-        let count = try _readBigEndianUInt32()
-        // Reject overlong encodings.
-        try _failIf { count <= 0xffff }
-        length = Int(count)
-      default:
-        try _fail()
-      }
-      return try _consumeBytes(length)
-    }
-  }
-
-  public func readBeginArray() -> Int? {
-    return _rewind {
-      switch try _consumeByte() {
-      case let byte where byte & 0b1111_0000 == 0b1001_0000:
-        // fixarray
-        return Int(byte & 0b0000_1111)
-      case 0xdc:
-        // array16
-        let length = try _readBigEndianUInt16()
-        // Reject overlong encodings.
-        try _failIf { length <= 0xf }
-        return Int(length)
-      case 0xdd:
-        // array32
-        let length = try _readBigEndianUInt32()
-        // Reject overlong encodings.
-        try _failIf { length <= 0xffff }
-        return try _unwrapOrFail(_safeUInt32ToInt(length))
-      default:
-        try _fail()
-      }
-    }
-  }
-
-  public func readArray<T>(_ decodeElement: () throws -> T) -> [T]? {
-    guard let count = self.readBeginArray() else { return nil }
-
-    // If count is 0, then return an empty array.
-    guard count > 0 else { return [T]() }
-
-    // Otherwise decode the array.  If any items cannot be decoded as expected, then return nil as the entire array is considered to be bad.
-    var array = [T]()
-    array.reserveCapacity(count)
-    for _ in 1...count
-    {
-      guard let element = try? decodeElement() else { return nil }
-      array.append(element)
-    }
-    return array
-  }
-
-  public func readBeginMap() -> Int? {
-    return _rewind {
-      switch try _consumeByte() {
-      case let byte where byte & 0b1111_0000 == 0b1000_0000:
-        // fixarray
-        return Int(byte & 0b0000_1111)
-      case 0xde:
-        // array16
-        let length = try _readBigEndianUInt16()
-        // Reject overlong encodings.
-        try _failIf { length <= 0xf }
-        return Int(length)
-      case 0xdf:
-        // array32
-        let length = try _readBigEndianUInt32()
-        // Reject overlong encodings.
-        try _failIf { length <= 0xffff }
-        return try _unwrapOrFail(_safeUInt32ToInt(length))
-      default:
-        try _fail()
-      }
-    }
-  }
-
-  public func readDictionary<Tk, Tv>(_ decodeKey: () throws -> Tk, _ decodeValue: () throws -> Tv) -> [Tk: Tv]? {
-    guard let count = self.readBeginMap() else { return nil }
-
-    // If count is 0, then return an empty dictionary.
-    guard count > 0 else { return [Tk: Tv]() }
-
-    // Otherwise, decode the dictionary.
-    var dict = [Tk: Tv]()
-    for _ in 1...count
-    {
-      guard let key = try? decodeKey() else { return nil }
-      guard let value = try? decodeValue() else { return nil }
-      dict[key] = value
-    }
-    return dict
-  }
-
-  public func readExtended() -> (type: Int8, data: [UInt8])? {
-    return _rewind {
-      let length: Int
-      switch try _consumeByte() {
-      case 0xd4:
-        // fixext1
-        length = 1
-      case 0xd5:
-        // fixext2
-        length = 2
-      case 0xd6:
-        // fixext4
-        length = 4
-      case 0xd7:
-        // fixext8
-        length = 8
-      case 0xd8:
-        // fixext16
-        length = 16
-      case 0xc7:
-        // ext8
-        let count = try _consumeByte()
-        // Reject overlong encodings.
-        try _failIf {
-          count == 1 ||
-          count == 2 ||
-          count == 4 ||
-          count == 8 ||
-          count == 16
-        }
-        length = Int(count)
-      case 0xc8:
-        // ext16
-        let count = try _readBigEndianUInt16()
-        try _failIf { count <= 0xff }
-        length = Int(count)
-      case 0xc9:
-        // ext32
-        let count = try _readBigEndianUInt32()
-        // Reject overlong encodings.
-        try _failIf { count <= 0xffff }
-        length = Int(count)
-      default:
-        try _fail()
-      }
-      let type = try _consumeByte()
-      let result = try _consumeBytes(length)
-      return (Int8(bitPattern: type), result)
+    public func readBool() -> Bool? {
+        return _rewind {
+            switch try _consumeByte() {
+            case 0xc2:
+                return false
+            case 0xc3:
+                return true
+            default:
+                try _fail()
+            }
+        }
+    }
+
+    public func readFloat32() -> Float32? {
+        return _rewind {
+            try _consumeByteIf(0xca)
+            let bitPattern = try _readBigEndianUInt32()
+            return Float32(bitPattern: bitPattern)
+        }
+    }
+
+    public func readFloat64() -> Float64? {
+        return _rewind {
+            try _consumeByteIf(0xcb)
+            let bitPattern = try _readBigEndianUInt64()
+            return Float64(bitPattern: bitPattern)
+        }
+    }
+
+    internal func _consumeBytes(_ length: Int) throws -> [UInt8] {
+        try _haveNBytes(length)
+        let result = _bytes[_consumedCount..<_consumedCount + length]
+        _consumedCount += length
+        return [UInt8](result)
+    }
+
+    public func readString() -> String? {
+        return _rewind {
+            let length: Int
+            switch try _consumeByte() {
+            case let byte where byte & 0b1110_0000 == 0b1010_0000:
+                // fixstr
+                length = Int(byte & 0b0001_1111)
+            case 0xd9:
+                // str8
+                let count = try _consumeByte()
+                // Reject overlong encodings.
+                try _failIf { count <= 0x1f }
+                length = Int(count)
+            case 0xda:
+                // str16
+                let count = try _readBigEndianUInt16()
+                // Reject overlong encodings.
+                try _failIf { count <= 0xff }
+                length = Int(count)
+            case 0xdb:
+                // str32
+                let count = try _readBigEndianUInt32()
+                // Reject overlong encodings.
+                try _failIf { count <= 0xffff }
+                length = Int(count)
+            default:
+                try _fail()
+            }
+            let utf8 = try _consumeBytes(length)
+            return String(decoding: utf8, as: Unicode.UTF8.self)
+        }
+    }
+
+    public func readBinary() -> [UInt8]? {
+        return _rewind {
+            let length: Int
+            switch try _consumeByte() {
+            case 0xc4:
+                // bin8
+                length = Int(try _consumeByte())
+            case 0xc5:
+                // bin16
+                let count = try _readBigEndianUInt16()
+                // Reject overlong encodings.
+                try _failIf { count <= 0xff }
+                length = Int(count)
+            case 0xc6:
+                // bin32
+                let count = try _readBigEndianUInt32()
+                // Reject overlong encodings.
+                try _failIf { count <= 0xffff }
+                length = Int(count)
+            default:
+                try _fail()
+            }
+            return try _consumeBytes(length)
+        }
+    }
+
+    public func readBeginArray() -> Int? {
+        return _rewind {
+            switch try _consumeByte() {
+            case let byte where byte & 0b1111_0000 == 0b1001_0000:
+                // fixarray
+                return Int(byte & 0b0000_1111)
+            case 0xdc:
+                // array16
+                let length = try _readBigEndianUInt16()
+                // Reject overlong encodings.
+                try _failIf { length <= 0xf }
+                return Int(length)
+            case 0xdd:
+                // array32
+                let length = try _readBigEndianUInt32()
+                // Reject overlong encodings.
+                try _failIf { length <= 0xffff }
+                return try _unwrapOrFail(_safeUInt32ToInt(length))
+            default:
+                try _fail()
+            }
+        }
+    }
+
+    public func readArray<T>(_ decodeElement: () throws -> T) -> [T]? {
+        guard let count = self.readBeginArray() else { return nil }
+
+        // If count is 0, then return an empty array.
+        guard count > 0 else { return [T]() }
+
+        // Otherwise decode the array.  If any items cannot be decoded as expected, then return nil as the entire array is considered to be bad.
+        var array = [T]()
+        array.reserveCapacity(count)
+        for _ in 1...count {
+            guard let element = try? decodeElement() else { return nil }
+            array.append(element)
+        }
+        return array
+    }
+
+    public func readBeginMap() -> Int? {
+        return _rewind {
+            switch try _consumeByte() {
+            case let byte where byte & 0b1111_0000 == 0b1000_0000:
+                // fixarray
+                return Int(byte & 0b0000_1111)
+            case 0xde:
+                // array16
+                let length = try _readBigEndianUInt16()
+                // Reject overlong encodings.
+                try _failIf { length <= 0xf }
+                return Int(length)
+            case 0xdf:
+                // array32
+                let length = try _readBigEndianUInt32()
+                // Reject overlong encodings.
+                try _failIf { length <= 0xffff }
+                return try _unwrapOrFail(_safeUInt32ToInt(length))
+            default:
+                try _fail()
+            }
+        }
+    }
+
+    public func readDictionary<Tk, Tv>(_ decodeKey: () throws -> Tk, _ decodeValue: () throws -> Tv) -> [Tk: Tv]? {
+        guard let count = self.readBeginMap() else { return nil }
+
+        // If count is 0, then return an empty dictionary.
+        guard count > 0 else { return [Tk: Tv]() }
+
+        // Otherwise, decode the dictionary.
+        var dict = [Tk: Tv]()
+        for _ in 1...count {
+            guard let key = try? decodeKey() else { return nil }
+            guard let value = try? decodeValue() else { return nil }
+            dict[key] = value
+        }
+        return dict
+    }
+
+    public func readExtended() -> (type: Int8, data: [UInt8])? {
+        return _rewind {
+            let length: Int
+            switch try _consumeByte() {
+            case 0xd4:
+                // fixext1
+                length = 1
+            case 0xd5:
+                // fixext2
+                length = 2
+            case 0xd6:
+                // fixext4
+                length = 4
+            case 0xd7:
+                // fixext8
+                length = 8
+            case 0xd8:
+                // fixext16
+                length = 16
+            case 0xc7:
+                // ext8
+                let count = try _consumeByte()
+                // Reject overlong encodings.
+                try _failIf {
+                    count == 1 || count == 2 || count == 4 || count == 8 || count == 16
+                }
+                length = Int(count)
+            case 0xc8:
+                // ext16
+                let count = try _readBigEndianUInt16()
+                try _failIf { count <= 0xff }
+                length = Int(count)
+            case 0xc9:
+                // ext32
+                let count = try _readBigEndianUInt32()
+                // Reject overlong encodings.
+                try _failIf { count <= 0xffff }
+                length = Int(count)
+            default:
+                try _fail()
+            }
+            let type = try _consumeByte()
+            let result = try _consumeBytes(length)
+            return (Int8(bitPattern: type), result)
+        }
     }
-  }
 }
 
 @available(*, unavailable)
-extension MsgPackDecoder: Sendable { }
+extension MsgPackDecoder: Sendable {}
 
 /// There was additional code to support a DOM-like representation of a MessagePack object, but it has been removed since we have no plans to use it.
diff --git a/Sources/SWBUtil/MsgPackSerialization.swift b/Sources/SWBUtil/MsgPackSerialization.swift
index c9485ff3..653a0b4c 100644
--- a/Sources/SWBUtil/MsgPackSerialization.swift
+++ b/Sources/SWBUtil/MsgPackSerialization.swift
@@ -12,23 +12,21 @@
 
 // MARK: Serializer
 
-
-public final class MsgPackSerializer: Serializer
-{
-    static let bytesEncoded = Statistic("MsgPackSerializer.bytesEncoded",
-        "The number of bytes encoded by the serializer.")
+public final class MsgPackSerializer: Serializer {
+    static let bytesEncoded = Statistic(
+        "MsgPackSerializer.bytesEncoded",
+        "The number of bytes encoded by the serializer."
+    )
 
     private let encoder: any Encoder
     public let delegate: (any SerializerDelegate)?
 
-    public init(delegate: (any SerializerDelegate)? = nil)
-    {
+    public init(delegate: (any SerializerDelegate)? = nil) {
         self.encoder = MsgPackEncoder()
         self.delegate = delegate
     }
 
-    deinit
-    {
+    deinit {
         MsgPackSerializer.bytesEncoded += encoder.bytes.count
     }
 
@@ -36,121 +34,103 @@ public final class MsgPackSerializer: Serializer
     public var byteString: ByteString { return ByteString(encoder.bytes) }
 
     /// Serialize an `Int`.
-    public func serialize(_ int: Int)
-    {
+    public func serialize(_ int: Int) {
         encoder.append(Int64(int))
     }
 
     /// Serialize a `UInt`.
-    public func serialize(_ uint: UInt)
-    {
+    public func serialize(_ uint: UInt) {
         encoder.append(UInt64(uint))
     }
 
     /// Serialize a `UInt8`.
-    public func serialize(_ byte: UInt8)
-    {
+    public func serialize(_ byte: UInt8) {
         encoder.append(byte)
     }
 
     /// Serialize a `Bool`.
-    public func serialize(_ bool: Bool)
-    {
+    public func serialize(_ bool: Bool) {
         encoder.append(bool)
     }
 
     /// Serialize a `Float32`.
-    public func serialize(_ float: Float32)
-    {
+    public func serialize(_ float: Float32) {
         encoder.append(float)
     }
 
     /// Serialize a `Float64`.
-    public func serialize(_ float: Float64)
-    {
+    public func serialize(_ float: Float64) {
         encoder.append(float)
     }
 
     /// Serialize a `String`.
-    public func serialize(_ string: String)
-    {
+    public func serialize(_ string: String) {
         encoder.append(string)
     }
 
     // Serialize an array of bytes.
-    public func serialize(_ bytes: [UInt8])
-    {
+    public func serialize(_ bytes: [UInt8]) {
         encoder.append(bytes)
     }
 
     /// Serialize a `Serializable` scalar element.
-    public func serialize<T: Serializable>(_ element: T)
-    {
+    public func serialize<T: Serializable>(_ element: T) {
         element.serialize(to: self)
     }
 
     /// Serialize an `Array` whose elements are `Serializable`.
-    public func serialize<T: Serializable>(_ array: [T])
-    {
+    public func serialize<T: Serializable>(_ array: [T]) {
         encoder.append(array) { (element) in self.serialize(element) }
     }
 
     /// Serialize a `Dictionary` whose keys and values are `Serializable`.
-    public func serialize<Tk: Serializable & Comparable, Tv: Serializable>(_ dict: [Tk: Tv])
-    {
+    public func serialize<Tk: Serializable & Comparable, Tv: Serializable>(_ dict: [Tk: Tv]) {
         encoder.append(dict, encodeKey: { (key) in self.serialize(key) }, encodeValue: { (value) in self.serialize(value) })
     }
 
     /// Serialize a `Dictionary` whose keys and values are `[Serializable]`.
-    public func serialize<Tk: Serializable & Comparable, Tv: Serializable>(_ dict: [Tk: [Tv]])
-    {
+    public func serialize<Tk: Serializable & Comparable, Tv: Serializable>(_ dict: [Tk: [Tv]]) {
         encoder.append(dict, encodeKey: { (key) in self.serialize(key) }, encodeValue: { (value) in self.serialize(value) })
     }
 
     /// Serialize a `Dictionary` whose keys and values are `[Serializable]`.
-    public func serialize<Tk: Serializable & Comparable, Tv: Serializable>(_ dict: [Tk?: [Tv]])
-    {
+    public func serialize<Tk: Serializable & Comparable, Tv: Serializable>(_ dict: [Tk?: [Tv]]) {
         encoder.append(dict, encodeKey: { (key) in self.serialize(key) }, encodeValue: { (value) in self.serialize(value) })
     }
 
     /// Serialize `nil`.
-    public func serializeNil()
-    {
+    public func serializeNil() {
         encoder.appendNil()
     }
 
     /// Begin serializing an aggregate element as a scalar, by noting the number of individual elements that make up the aggregate element.
-    public func beginAggregate(_ count: Int)
-    {
+    public func beginAggregate(_ count: Int) {
         encoder.beginArray(count)
     }
 
     /// End serializing an aggregate element as a scalar.
-    public func endAggregate()
-    {
+    public func endAggregate() {
         encoder.endArray()
     }
 }
 
 @available(*, unavailable)
-extension MsgPackSerializer: Sendable { }
+extension MsgPackSerializer: Sendable {}
 
 // MARK: Deserializer
 
-
 // FIXME: The exceptions here could be much more descriptive, e.g. when some nested element couldn't be decoded.  I'm not sure whether that improvement is really worth it, though.
 
-
-public final class MsgPackDeserializer: Deserializer
-{
-    static let bytesDecoded = Statistic("MsgPackDeserializer.bytesDecoded",
-        "The number of bytes decoded by the deserializer.")
+public final class MsgPackDeserializer: Deserializer {
+    static let bytesDecoded = Statistic(
+        "MsgPackDeserializer.bytesDecoded",
+        "The number of bytes decoded by the deserializer."
+    )
 
     private var decoder: any Decoder
     public let delegate: (any DeserializerDelegate)?
 
-    public init(_ bytes: ArraySlice<UInt8>, delegate: (any DeserializerDelegate)? = nil)
-    {
+    public init(_ bytes: ArraySlice<UInt8>, delegate: (any DeserializerDelegate)? = nil) {
         // Assume the full stream will be decoded.
         MsgPackDeserializer.bytesDecoded += bytes.count
 
@@ -159,107 +139,101 @@ public final class MsgPackDeserializer: Deserializer
     }
 
     /// Deserialize an `Int`.  Throws if the next item to be deserialized is not an `Int`.
-    public func deserialize() throws -> Int
-    {
+    public func deserialize() throws -> Int {
         guard let int = decoder.readInt64() else { throw DeserializerError.incorrectType("Could not decode an Int64.") }
         return Int(int)
     }
 
     /// Deserialize a `UInt`.  Throws if the next item to be deserialized is not a `UInt`.
-    public func deserialize() throws -> UInt
-    {
+    public func deserialize() throws -> UInt {
         guard let uint = decoder.readUInt64() else { throw DeserializerError.incorrectType("Could not decode a UInt64.") }
         return UInt(uint)
     }
 
     /// Deserialize a `UInt8`.  Throws if the next item to be deserialized is not a `UInt8`.
-    public func deserialize() throws -> UInt8
-    {
+    public func deserialize() throws -> UInt8 {
         guard let byte = decoder.readByte() else { throw DeserializerError.incorrectType("Could not decode a UInt8.") }
-        return  byte
+        return byte
     }
 
     /// Deserialize a `Bool`.  Throws if the next item to be deserialized is not a `Bool`.
-    public func deserialize() throws -> Bool
-    {
+    public func deserialize() throws -> Bool {
         guard let bool = decoder.readBool() else { throw DeserializerError.incorrectType("Could not decode a Bool") }
         return bool
     }
 
     /// Deserialize a `Float32`.  Throws if the next item to be deserialized is not a `Float32`.
-    public func deserialize() throws -> Float32
-    {
+    public func deserialize() throws -> Float32 {
         guard let float = decoder.readFloat32() else { throw DeserializerError.incorrectType("Could not decode a Float32") }
         return float
     }
 
     /// Deserialize a `Float64`.  Throws if the next item to be deserialized is not a `Float64`.
-    public func deserialize() throws -> Float64
-    {
+    public func deserialize() throws -> Float64 {
         guard let float = decoder.readFloat64() else { throw DeserializerError.incorrectType("Could not decode a Float64") }
         return float
     }
 
     /// Deserialize a `String`.  Throws if the next item to be deserialized is not a `String`.
-    public func deserialize() throws -> String
-    {
+    public func deserialize() throws -> String {
         guard let string = decoder.readString() else { throw DeserializerError.incorrectType("Could not decode a String") }
         return string
     }
 
     /// Deserialize an array of bytes.  Throws if the next item to be deserialized is not such an array.
-    public func deserialize() throws -> [UInt8]
-    {
+    public func deserialize() throws -> [UInt8] {
         guard let bytes = decoder.readBinary() else { throw DeserializerError.incorrectType("Could not decode an array of bytes") }
         return bytes
     }
 
     /// Deserialize a `Serializable` scalar element.
-    public func deserialize<T: Serializable>() throws -> T
-    {
+    public func deserialize<T: Serializable>() throws -> T {
         return try T.init(from: self)
     }
 
     /// Deserialize an `Array`.  Throws if the next item to be deserialized is not an `Array`, or if the array could not be read.
-    public func deserialize<T: Serializable>() throws -> [T]
-    {
-        guard let array: [T] = decoder.readArray(
-            { return try self.deserialize() }
-        ) else { throw DeserializerError.deserializationFailed("Could not deserialize an Array.") }
+    public func deserialize<T: Serializable>() throws -> [T] {
+        guard
+            let array: [T] = decoder.readArray(
+                { return try self.deserialize() }
+            )
+        else { throw DeserializerError.deserializationFailed("Could not deserialize an Array.") }
         return array
     }
 
     /// Deserialize a `Dictionary`.  Throws if the next item to be deserialized is not a `Dictionary`, or if the dictionary could not be read.
-    public func deserialize<Tk: Serializable, Tv: Serializable>() throws -> [Tk: Tv]
-    {
-        guard let dict: [Tk: Tv] = decoder.readDictionary(
-            { return try self.deserialize() },
-            { return try self.deserialize() }
-        ) else { throw DeserializerError.deserializationFailed("Could not deserialize a Dictionary.") }
+    public func deserialize<Tk: Serializable, Tv: Serializable>() throws -> [Tk: Tv] {
+        guard
+            let dict: [Tk: Tv] = decoder.readDictionary(
+                { return try self.deserialize() },
+                { return try self.deserialize() }
+            )
+        else { throw DeserializerError.deserializationFailed("Could not deserialize a Dictionary.") }
         return dict
     }
 
-    public func deserialize<Tk: Serializable, Tv: Serializable>() throws -> [Tk: [Tv]]
-    {
-        guard let dict: [Tk: [Tv]] = decoder.readDictionary(
-            { return try self.deserialize() },
-            { return try self.deserialize() }
-            ) else { throw DeserializerError.deserializationFailed("Could not deserialize a Dictionary.") }
+    public func deserialize<Tk: Serializable, Tv: Serializable>() throws -> [Tk: [Tv]] {
+        guard
+            let dict: [Tk: [Tv]] = decoder.readDictionary(
+                { return try self.deserialize() },
+                { return try self.deserialize() }
+            )
+        else { throw DeserializerError.deserializationFailed("Could not deserialize a Dictionary.") }
         return dict
     }
 
-    public func deserialize<Tk: Serializable, Tv: Serializable>() throws -> [Tk?: [Tv]]
-    {
-        guard let dict: [Tk?: [Tv]] = decoder.readDictionary(
-            { return try self.deserialize() },
-            { return try self.deserialize() }
-            ) else { throw DeserializerError.deserializationFailed("Could not deserialize a Dictionary.") }
+    public func deserialize<Tk: Serializable, Tv: Serializable>() throws -> [Tk?: [Tv]] {
+        guard
+            let dict: [Tk?: [Tv]] = decoder.readDictionary(
+                { return try self.deserialize() },
+                { return try self.deserialize() }
+            )
+        else { throw DeserializerError.deserializationFailed("Could not deserialize a Dictionary.") }
         return dict
     }
 
     /// Deserialize `nil`.  Returns `true` if nil was deserialized.  If `nil` could not be deserialized, then returns `false` and does not consume any data from the byte string.
-    public func deserializeNil() -> Bool
-    {
+    public func deserializeNil() -> Bool {
         return decoder.readNil()
     }
 
@@ -285,21 +259,19 @@ public final class MsgPackDeserializer: Deserializer
 
     /// Begin deserializing an aggregate element.  Throws if the next item to be deserialized is not an aggregate.
     /// - parameter: expectedCount: Throws if the number of elements to be deserialized is not this number.
-    public func beginAggregate(_ expectedCount: Int) throws
-    {
+    public func beginAggregate(_ expectedCount: Int) throws {
         let _ = try beginAggregate(expectedCount...expectedCount)
     }
 
     /// Begin deserializing an aggregate element.  Throws if the next item to be deserialized is not an aggregate.
     /// - returns: The count of elements serialized.
-    public func beginAggregate() throws -> Int
-    {
+    public func beginAggregate() throws -> Int {
         return try _beginAggregate(nil)
     }
 }
 
 @available(*, unavailable)
-extension MsgPackDeserializer: Sendable { }
+extension MsgPackDeserializer: Sendable {}
 
 extension Optional: @retroactive Comparable where Wrapped: Comparable {
     public static func < (lhs: Self, rhs: Self) -> Bool {
diff --git a/Sources/SWBUtil/OSLog.swift b/Sources/SWBUtil/OSLog.swift
index dfcd05aa..c3a83b70 100644
--- a/Sources/SWBUtil/OSLog.swift
+++ b/Sources/SWBUtil/OSLog.swift
@@ -13,79 +13,79 @@
 import func Foundation.NSLog
 
 #if canImport(os)
-public import os
-
-/// A wrapper around the OSLog.
-public final class OSLog: Sendable {
-
-    /// Payload of a log message.
-    public struct Payload: Sendable {
-        public let message: String
-        public let file: String
-        public let line: UInt
-        public let function: String
-
-        init(message: String, file: String, line: UInt, function: String) {
-            self.message = message
-            self.file = file
-            self.line = line
-            self.function = function
+    public import os
+
+    /// A wrapper around the OSLog.
+    public final class OSLog: Sendable {
+
+        /// Payload of a log message.
+        public struct Payload: Sendable {
+            public let message: String
+            public let file: String
+            public let line: UInt
+            public let function: String
+
+            init(message: String, file: String, line: UInt, function: String) {
+                self.message = message
+                self.file = file
+                self.line = line
+                self.function = function
+            }
         }
-    }
 
-    /// The default OSLog instance.
-    static let `default` = OSLog()
+        /// The default OSLog instance.
+        static let `default` = OSLog()
 
-    /// The underlying log reference. If nil, the default log will be used.
-    let log: os.OSLog?
+        /// The underlying log reference. If nil, the default log will be used.
+        let log: os.OSLog?
 
-    /// The formatter for the log messages.
-    let formatter: any OSLogMessageFormatter
+        /// The formatter for the log messages.
+        let formatter: any OSLogMessageFormatter
 
-    /// Queue to dispatch the log on.
-    private let queue = SWBQueue(label: "\(OSLog.self).queue", autoreleaseFrequency: .workItem)
+        /// Queue to dispatch the log on.
+        private let queue = SWBQueue(label: "\(OSLog.self).queue", autoreleaseFrequency: .workItem)
 
-    /// Create an instance of OSLog.
-    public init(_ log: os.OSLog? = nil, formatter: any OSLogMessageFormatter = DefaultOSLogMessageFormatter()) {
-        self.log = log
-        self.formatter = formatter
-    }
+        /// Create an instance of OSLog.
+        public init(_ log: os.OSLog? = nil, formatter: any OSLogMessageFormatter = DefaultOSLogMessageFormatter()) {
+            self.log = log
+            self.formatter = formatter
+        }
 
-    deinit {
-        queue.blocking_sync{}
-    }
+        deinit {
+            queue.blocking_sync {}
+        }
 
-    /// Log a message.
-    public func log(_ message: @Sendable @escaping @autoclosure () -> String, file: String = #file, function: String = #function, line: UInt = #line) {
-        queue.async { [log, formatter] in
-            // Construct and format the payload.
-            let payload = Payload(message: message(), file: file, line: line, function: function)
-            let formattedMessage = formatter.format(payload)
+        /// Log a message.
+        public func log(_ message: @Sendable @escaping @autoclosure () -> String, file: String = #file, function: String = #function, line: UInt = #line) {
+            queue.async { [log, formatter] in
+                // Construct and format the payload.
+                let payload = Payload(message: message(), file: file, line: line, function: function)
+                let formattedMessage = formatter.format(payload)
 
-            os_log("%@", log: log ?? .default, formattedMessage)
+                os_log("%@", log: log ?? .default, formattedMessage)
+            }
         }
     }
-}
 
-extension OSLog {
-    /// Log a message using the default OSLog instance.
-    public static func log(_ message: @Sendable @escaping @autoclosure () -> String, file: String = #file, function: String = #function, line: UInt = #line) {
-        OSLog.default.log(message(), file: file, function: function, line: line)
+    extension OSLog {
+        /// Log a message using the default OSLog instance.
+        public static func log(_ message: @Sendable @escaping @autoclosure () -> String, file: String = #file, function: String = #function, line: UInt = #line) {
+            OSLog.default.log(message(), file: file, function: function, line: line)
+        }
     }
-}
 
-/// A formatter for OSLog messages.
-public protocol OSLogMessageFormatter: Sendable {
-    func format(_ payload: OSLog.Payload) -> String
-}
+    /// A formatter for OSLog messages.
+    public protocol OSLogMessageFormatter: Sendable {
+        func format(_ payload: OSLog.Payload) -> String
+    }
 
-/// The default formatter that displays the entire payload.
-public struct DefaultOSLogMessageFormatter: OSLogMessageFormatter, Sendable {
+    /// The default formatter that displays the entire payload.
+    public struct DefaultOSLogMessageFormatter: OSLogMessageFormatter, Sendable {
 
-    public init(){}
+        public init() {}
 
-    public func format(_ payload: OSLog.Payload) -> String {
-        return "\(payload.file):\(payload.line):\(payload.function) \(payload.message)"
+        public func format(_ payload: OSLog.Payload) -> String {
+            return "\(payload.file):\(payload.line):\(payload.function) \(payload.message)"
+        }
     }
-}
 #endif
diff --git a/Sources/SWBUtil/OrderedSet.swift b/Sources/SWBUtil/OrderedSet.swift
index c03b26d4..cfa3f801 100644
--- a/Sources/SWBUtil/OrderedSet.swift
+++ b/Sources/SWBUtil/OrderedSet.swift
@@ -37,7 +37,7 @@ public struct OrderedSet<Element: Hashable>: Hashable {
         hasher.combine(array)
     }
 
-    public static func ==<T>(lhs: OrderedSet<T>, rhs: OrderedSet<T>) -> Bool {
+    public static func == <T>(lhs: OrderedSet<T>, rhs: OrderedSet<T>) -> Bool {
         return lhs.array == rhs.array
     }
 
@@ -78,7 +78,7 @@ public struct OrderedSet<Element: Hashable>: Hashable {
 
     /// Removes the elements of the given set from this set.
     /// - parameter other: A set of the same type as the current set.
-    public mutating func subtract<S>(_ other: S) where Element == S.Element, S : Sequence {
+    public mutating func subtract<S>(_ other: S) where Element == S.Element, S: Sequence {
         let removeIndices = other.compactMap { uniqueIndices.removeValue(forKey: $0) }.sorted()
         for index in removeIndices.reversed() {
             array.remove(at: index)
@@ -97,7 +97,7 @@ public struct OrderedSet<Element: Hashable>: Hashable {
     /// Returns a new set containing the elements of the receiver that do not occur in the given sequence.
     /// - parameter sequence: Another sequence whose elements will be removed from the receiver if present.
     /// - returns: A new ordered set.
-    public func subtracting<S>(_ sequence: S) -> OrderedSet<Element> where Element == S.Element, S : Sequence {
+    public func subtracting<S>(_ sequence: S) -> OrderedSet<Element> where Element == S.Element, S: Sequence {
         var newSet = self
         newSet.subtract(sequence)
         return newSet
@@ -193,7 +193,7 @@ extension OrderedSet {
     /// Returns a new set containing the elements of the receiver followed by the elements of another sequence.
     /// - parameter sequence: Another sequence.
     /// - returns: A new ordered set.
-    public func appending<S>(contentsOf sequence: S) -> OrderedSet<Element> where Element == S.Element, S : Sequence {
+    public func appending<S>(contentsOf sequence: S) -> OrderedSet<Element> where Element == S.Element, S: Sequence {
         var newSet = self
         newSet.append(contentsOf: sequence)
         return newSet
diff --git a/Sources/SWBUtil/OutputByteStream.swift b/Sources/SWBUtil/OutputByteStream.swift
index 01f3328f..6a8054a0 100644
--- a/Sources/SWBUtil/OutputByteStream.swift
+++ b/Sources/SWBUtil/OutputByteStream.swift
@@ -79,7 +79,7 @@ public final class JSONOutputStreamer {
 }
 
 @available(*, unavailable)
-extension JSONOutputStreamer: Sendable { }
+extension JSONOutputStreamer: Sendable {}
 
 // This extension contains methods designed to write JSON to the stream,
 // where the *value* (not the key) of the dictionary is pre-encoded JSON bytes.
@@ -223,33 +223,33 @@ public final class OutputByteStream: TextOutputStream {
             case 0x20...0x21, 0x23...0x5B, 0x5D...0xFF:
                 buffer.append(character)
 
-                // Single-character escaped characters.
-            case 0x22: // '"'
-                buffer.append(0x5C) // '\'
-                buffer.append(0x22) // '"'
-            case 0x5C: // '\\'
-                buffer.append(0x5C) // '\'
-                buffer.append(0x5C) // '\'
-            case 0x08: // '\b'
-                buffer.append(0x5C) // '\'
-                buffer.append(0x62) // 'b'
-            case 0x0C: // '\f'
-                buffer.append(0x5C) // '\'
-                buffer.append(0x66) // 'f'
-            case 0x0A: // '\n'
-                buffer.append(0x5C) // '\'
-                buffer.append(0x6E) // 'n'
-            case 0x0D: // '\r'
-                buffer.append(0x5C) // '\'
-                buffer.append(0x72) // 'r'
-            case 0x09: // '\t'
-                buffer.append(0x5C) // '\'
-                buffer.append(0x74) // 't'
-
-                // Multi-character escaped characters.
+            // Single-character escaped characters.
+            case 0x22:  // '"'
+                buffer.append(0x5C)  // '\'
+                buffer.append(0x22)  // '"'
+            case 0x5C:  // '\\'
+                buffer.append(0x5C)  // '\'
+                buffer.append(0x5C)  // '\'
+            case 0x08:  // '\b'
+                buffer.append(0x5C)  // '\'
+                buffer.append(0x62)  // 'b'
+            case 0x0C:  // '\f'
+                buffer.append(0x5C)  // '\'
+                buffer.append(0x66)  // 'f'
+            case 0x0A:  // '\n'
+                buffer.append(0x5C)  // '\'
+                buffer.append(0x6E)  // 'n'
+            case 0x0D:  // '\r'
+                buffer.append(0x5C)  // '\'
+                buffer.append(0x72)  // 'r'
+            case 0x09:  // '\t'
+                buffer.append(0x5C)  // '\'
+                buffer.append(0x74)  // 't'
+
+            // Multi-character escaped characters.
             default:
-                buffer.append(0x5C) // '\'
-                buffer.append(0x75) // 'u'
+                buffer.append(0x5C)  // '\'
+                buffer.append(0x75)  // 'u'
                 buffer.append(hexdigit(0))
                 buffer.append(hexdigit(0))
                 buffer.append(hexdigit(character >> 4))
@@ -260,7 +260,7 @@ public final class OutputByteStream: TextOutputStream {
 }
 
 @available(*, unavailable)
-extension OutputByteStream: Sendable { }
+extension OutputByteStream: Sendable {}
 
 /// Define an output stream operator. We need it to be left associative, so we
 /// use `<<<`.
@@ -275,55 +275,55 @@ precedencegroup StreamingPrecedence {
 // NOTE: It would be nice to use a protocol here and the adopt it by all the things we can efficiently stream out. However, that doesn't work because we ultimately need to provide a manual overload for, e.g., TextOutputStreamable, but that will then cause ambiguous lookup versus the implementation just using the defined protocol.
 
 @discardableResult
-public func <<<(stream: OutputByteStream, value: UInt8) -> OutputByteStream {
+public func <<< (stream: OutputByteStream, value: UInt8) -> OutputByteStream {
     stream.write(value)
     return stream
 }
 
 @discardableResult
-public func <<<(stream: OutputByteStream, value: [UInt8]) -> OutputByteStream {
+public func <<< (stream: OutputByteStream, value: [UInt8]) -> OutputByteStream {
     stream.write(value)
     return stream
 }
 
 @discardableResult
-public func <<<(stream: OutputByteStream, value: Data) -> OutputByteStream {
+public func <<< (stream: OutputByteStream, value: Data) -> OutputByteStream {
     stream.write(value)
     return stream
 }
 
 @discardableResult
-public func <<<(stream: OutputByteStream, value: ArraySlice<UInt8>) -> OutputByteStream {
+public func <<< (stream: OutputByteStream, value: ArraySlice<UInt8>) -> OutputByteStream {
     stream.write(value)
     return stream
 }
 
 @discardableResult
-public func <<<<S: Sequence>(stream: OutputByteStream, value: S) -> OutputByteStream where S.Iterator.Element == UInt8 {
+public func <<< <S: Sequence>(stream: OutputByteStream, value: S) -> OutputByteStream where S.Iterator.Element == UInt8 {
     stream.write(value)
     return stream
 }
 
 @discardableResult
-public func <<<(stream: OutputByteStream, value: String) -> OutputByteStream {
+public func <<< (stream: OutputByteStream, value: String) -> OutputByteStream {
     stream.write(value)
     return stream
 }
 
 @discardableResult
-public func <<<(stream: OutputByteStream, value: Character) -> OutputByteStream {
+public func <<< (stream: OutputByteStream, value: Character) -> OutputByteStream {
     stream.write(value)
     return stream
 }
 
 @discardableResult
-public func <<<(stream: OutputByteStream, value: any ByteStreamable) -> OutputByteStream {
+public func <<< (stream: OutputByteStream, value: any ByteStreamable) -> OutputByteStream {
     stream.write(value)
     return stream
 }
 
 @discardableResult
-public func <<<(stream: OutputByteStream, value: any TextOutputStreamable) -> OutputByteStream {
+public func <<< (stream: OutputByteStream, value: any TextOutputStreamable) -> OutputByteStream {
     stream.write(value)
     return stream
 }
@@ -471,7 +471,7 @@ public enum Format: Sendable {
 
         func writeTo(_ stream: OutputByteStream) {
             stream <<< UInt8(ascii: "{")
-            for (offset: i, element: (key: key, value: value)) in items.enumerated() {
+            for (offset:i, element:(key:key, value:value)) in items.enumerated() {
                 if i != 0 { stream <<< UInt8(ascii: ",") }
                 stream <<< Format.asJSON(key) <<< ":" <<< Format.asJSON(value)
             }
@@ -487,9 +487,9 @@ public enum Format: Sendable {
 
         func writeTo(_ stream: OutputByteStream) {
             stream <<< UInt8(ascii: "{")
-            for (offset: i, element: (key: key, value: value)) in items.enumerated() {
+            for (offset:i, element:(key:key, value:value)) in items.enumerated() {
                 if i != 0 { stream <<< UInt8(ascii: ",") }
-                stream <<< Format.asJSON(key) <<< ":" <<< /*Format.asJSON*/(value) // value is pre-escaped
+                stream <<< Format.asJSON(key) <<< ":" <<< /*Format.asJSON*/ (value)  // value is pre-escaped
             }
             stream <<< UInt8(ascii: "}")
         }
@@ -505,7 +505,7 @@ public enum Format: Sendable {
         func writeTo(_ stream: OutputByteStream) {
             stream <<< UInt8(ascii: "{")
             for i in 0..<items.count {
-                let (key: key, value: value) = items[i]
+                let (key:key, value:value) = items[i]
                 if i != 0 { stream <<< UInt8(ascii: ",") }
                 stream <<< Format.asJSON(key) <<< ":" <<< Format.asJSON(value)
             }
@@ -523,9 +523,9 @@ public enum Format: Sendable {
         func writeTo(_ stream: OutputByteStream) {
             stream <<< UInt8(ascii: "{")
             for i in 0..<items.count {
-                let (key: key, value: value) = items[i]
+                let (key:key, value:value) = items[i]
                 if i != 0 { stream <<< UInt8(ascii: ",") }
-                stream <<< Format.asJSON(key) <<< ":" <<< /*Format.asJSON*/(value) // value is pre-escaped
+                stream <<< Format.asJSON(key) <<< ":" <<< /*Format.asJSON*/ (value)  // value is pre-escaped
             }
             stream <<< UInt8(ascii: "}")
         }
diff --git a/Sources/SWBUtil/POSIX.swift b/Sources/SWBUtil/POSIX.swift
index 6a4e85d4..16872a22 100644
--- a/Sources/SWBUtil/POSIX.swift
+++ b/Sources/SWBUtil/POSIX.swift
@@ -15,23 +15,23 @@ import SWBLibc
 public import protocol Foundation.LocalizedError
 
 #if canImport(System)
-public import System
+    public import System
 #else
-public import SystemPackage
+    public import SystemPackage
 #endif
 
 public enum POSIX: Sendable {
     public static func getenv(_ name: String) throws -> String? {
         #if os(Windows)
-        try name.withCString(encodedAs: CInterop.PlatformUnicodeEncoding.self) { wName in
-            do {
-                return try SWB_GetEnvironmentVariableW(wName)
-            } catch let error as Win32Error where error.error == ERROR_ENVVAR_NOT_FOUND {
-                return nil
+            try name.withCString(encodedAs: CInterop.PlatformUnicodeEncoding.self) { wName in
+                do {
+                    return try SWB_GetEnvironmentVariableW(wName)
+                } catch let error as Win32Error where error.error == ERROR_ENVVAR_NOT_FOUND {
+                    return nil
+                }
             }
-        }
         #else
-        return SWBLibc.getenv(name).map { String(cString: $0) } ?? nil
+            return SWBLibc.getenv(name).map { String(cString: $0) } ?? nil
         #endif
     }
 
@@ -39,38 +39,46 @@ public enum POSIX: Sendable {
         let nameString = String(cString: name)
         let valueString = String(cString: value)
         #if os(Windows)
-        if overwrite == 0 {
-            if nameString.withCString(encodedAs: CInterop.PlatformUnicodeEncoding.self, { GetEnvironmentVariableW($0, nil, 0) }) == 0 && GetLastError() != ERROR_ENVVAR_NOT_FOUND {
-                throw POSIXError(errno, context: "GetEnvironmentVariableW", nameString)
+            if overwrite == 0 {
+                if nameString.withCString(encodedAs: CInterop.PlatformUnicodeEncoding.self, { GetEnvironmentVariableW($0, nil, 0) }) == 0 && GetLastError() != ERROR_ENVVAR_NOT_FOUND {
+                    throw POSIXError(errno, context: "GetEnvironmentVariableW", nameString)
+                }
+                return
+            }
+            guard
+                nameString.withCString(
+                    encodedAs: CInterop.PlatformUnicodeEncoding.self,
+                    { nameWString in
+                        valueString.withCString(
+                            encodedAs: CInterop.PlatformUnicodeEncoding.self,
+                            { valueWString in
+                                SetEnvironmentVariableW(nameWString, valueWString)
+                            }
+                        )
+                    }
+                )
+            else {
+                throw POSIXError(errno, context: "SetEnvironmentVariableW", nameString, valueString)
             }
-            return
-        }
-        guard nameString.withCString(encodedAs: CInterop.PlatformUnicodeEncoding.self, { nameWString in
-            valueString.withCString(encodedAs: CInterop.PlatformUnicodeEncoding.self, { valueWString in
-                SetEnvironmentVariableW(nameWString, valueWString)
-            })
-        }) else {
-            throw POSIXError(errno, context: "SetEnvironmentVariableW", nameString, valueString)
-        }
         #else
-        let ret = SWBLibc.setenv(name, value, overwrite)
-        if ret != 0 {
-            throw POSIXError(errno, context: "setenv", nameString)
-        }
+            let ret = SWBLibc.setenv(name, value, overwrite)
+            if ret != 0 {
+                throw POSIXError(errno, context: "setenv", nameString)
+            }
         #endif
     }
 
     public static func unsetenv(_ name: UnsafePointer<CChar>) throws {
         let nameString = String(cString: name)
         #if os(Windows)
-        guard nameString.withCString(encodedAs: CInterop.PlatformUnicodeEncoding.self, { SetEnvironmentVariableW($0, nil) }) else {
-            throw POSIXError(errno, context: "SetEnvironmentVariableW", nameString)
-        }
+            guard nameString.withCString(encodedAs: CInterop.PlatformUnicodeEncoding.self, { SetEnvironmentVariableW($0, nil) }) else {
+                throw POSIXError(errno, context: "SetEnvironmentVariableW", nameString)
+            }
         #else
-        let ret = SWBLibc.unsetenv(name)
-        if ret != 0 {
-            throw POSIXError(errno, context: "unsetenv", nameString)
-        }
+            let ret = SWBLibc.unsetenv(name)
+            if ret != 0 {
+                throw POSIXError(errno, context: "unsetenv", nameString)
+            }
         #endif
     }
 }
@@ -111,8 +119,7 @@ public func eintrLoop<T>(_ f: () throws -> T) throws -> T {
     while true {
         do {
             return try f()
-        }
-        catch let e as POSIXError where e.code == EINTR {
+        } catch let e as POSIXError where e.code == EINTR {
             continue
         }
     }
diff --git a/Sources/SWBUtil/Pair.swift b/Sources/SWBUtil/Pair.swift
index dbe3b7c8..70cb4900 100644
--- a/Sources/SWBUtil/Pair.swift
+++ b/Sources/SWBUtil/Pair.swift
@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-
 /// Utility wrapper for pairs of values.
 public struct Pair<First, Second> {
     private let values: (First, Second)
diff --git a/Sources/SWBUtil/Path.swift b/Sources/SWBUtil/Path.swift
index 08557011..4face7a0 100644
--- a/Sources/SWBUtil/Path.swift
+++ b/Sources/SWBUtil/Path.swift
@@ -14,9 +14,9 @@ import SWBLibc
 import Foundation
 
 #if canImport(System)
-public import System
+    public import System
 #else
-public import SystemPackage
+    public import SystemPackage
 #endif
 
 private extension String.UTF8View {
@@ -38,9 +38,9 @@ private extension String.UTF8View {
 public struct Path: Serializable, Sendable {
     private var useLegacyImplementation: Bool {
         #if os(Windows)
-        return false
+            return false
         #else
-        return true
+            return true
         #endif
     }
 
@@ -68,39 +68,39 @@ public struct Path: Serializable, Sendable {
 
     /// The system path separator.
     #if os(Windows)
-    public static let pathSeparator = Character("\\")
-    @inline(__always) public static var pathSeparatorUTF8: UInt8 { UInt8(ascii: "\\") }
-    public static let pathEnvironmentSeparator = Character(";")
-    @inline(__always) public static func isUTF8PathSeparator(_ char: UInt8, separators: (some Collection<Character>)? = ([Character]?).none) -> Bool {
-        guard let separators else {
-            return char == pathSeparatorUTF8 || char == UInt8(ascii: "/")
+        public static let pathSeparator = Character("\\")
+        @inline(__always) public static var pathSeparatorUTF8: UInt8 { UInt8(ascii: "\\") }
+        public static let pathEnvironmentSeparator = Character(";")
+        @inline(__always) public static func isUTF8PathSeparator(_ char: UInt8, separators: (some Collection<Character>)? = ([Character]?).none) -> Bool {
+            guard let separators else {
+                return char == pathSeparatorUTF8 || char == UInt8(ascii: "/")
+            }
+            // This is a bit inefficient, but separators should always be nil outside of tests
+            return separators.contains(String(decoding: CollectionOfOne(char), as: UTF8.self))
         }
-        // This is a bit inefficient, but separators should always be nil outside of tests
-        return separators.contains(String(decoding: CollectionOfOne(char), as: UTF8.self))
-    }
-    @inline(__always) public static func firstPathSeparatorIndex(in str: some StringProtocol, separators: (some Collection<Character>)?) -> String.Index? {
-        guard let separators else {
-            return str.utf8.firstIndex(where: { Path.isUTF8PathSeparator($0, separators: separators) })
+        @inline(__always) public static func firstPathSeparatorIndex(in str: some StringProtocol, separators: (some Collection<Character>)?) -> String.Index? {
+            guard let separators else {
+                return str.utf8.firstIndex(where: { Path.isUTF8PathSeparator($0, separators: separators) })
+            }
+            return str.firstIndex(where: { separators.contains($0) })
         }
-        return str.firstIndex(where: { separators.contains($0) })
-    }
     #else
-    public static let pathSeparator = Character("/")
-    @inline(__always) public static var pathSeparatorUTF8: UInt8 { UInt8(ascii: "/") }
-    public static let pathEnvironmentSeparator = Character(":")
-    @inline(__always) public static func isUTF8PathSeparator(_ char: UInt8, separators: (some Collection<Character>)? = ([Character]?).none) -> Bool {
-        guard let separators else  {
-            return char == pathSeparatorUTF8
+        public static let pathSeparator = Character("/")
+        @inline(__always) public static var pathSeparatorUTF8: UInt8 { UInt8(ascii: "/") }
+        public static let pathEnvironmentSeparator = Character(":")
+        @inline(__always) public static func isUTF8PathSeparator(_ char: UInt8, separators: (some Collection<Character>)? = ([Character]?).none) -> Bool {
+            guard let separators else {
+                return char == pathSeparatorUTF8
+            }
+            // This is a bit inefficient, but separators should always be nil outside of tests
+            return separators.contains(String(decoding: CollectionOfOne(char), as: UTF8.self))
         }
-        // This is a bit inefficient, but separators should always be nil outside of tests
-        return separators.contains(String(decoding: CollectionOfOne(char), as: UTF8.self))
-    }
-    @inline(__always) public static func firstPathSeparatorIndex(in str: some StringProtocol, separators: (some Collection<Character>)?) -> String.Index? {
-        guard let separators else {
-            return str.utf8.firstIndex(of: pathSeparatorUTF8)
+        @inline(__always) public static func firstPathSeparatorIndex(in str: some StringProtocol, separators: (some Collection<Character>)?) -> String.Index? {
+            guard let separators else {
+                return str.utf8.firstIndex(of: pathSeparatorUTF8)
+            }
+            return str.firstIndex(where: { separators.contains($0) })
         }
-        return str.firstIndex(where: { separators.contains($0) })
-    }
     #endif
 
     @inline(__always) public static func isPathSeparator(_ char: Character, separators: (some Collection<Character>)?) -> Bool {
@@ -114,8 +114,8 @@ public struct Path: Serializable, Sendable {
     //Reserved path characters
     //See https://learn.microsoft.com/en-us/windows/win32/fileio/naming-a-file#naming-conventions
     #if os(Windows)
-       static let reservedPathCharacters = CharacterSet(charactersIn: "\\<>:|*?\u{000000}\"").union(CharacterSet(charactersIn: "\u{000001}"..."\u{00001F}"))
-       static let reservedRootPathCharacters = CharacterSet(charactersIn: "<>\"|*\u{000000}").union(CharacterSet(charactersIn: "\u{000001}"..."\u{00001F}"))
+        static let reservedPathCharacters = CharacterSet(charactersIn: "\\<>:|*?\u{000000}\"").union(CharacterSet(charactersIn: "\u{000001}"..."\u{00001F}"))
+        static let reservedRootPathCharacters = CharacterSet(charactersIn: "<>\"|*\u{000000}").union(CharacterSet(charactersIn: "\u{000001}"..."\u{00001F}"))
     #else
         static let reservedPathCharacters = CharacterSet(charactersIn: "/\u{000000}")
         static let reservedRootPathCharacters = CharacterSet(charactersIn: "\u{000000}")
@@ -124,9 +124,9 @@ public struct Path: Serializable, Sendable {
     /// Returns the null device path; `/dev/null` on Unix-like platforms, or `NUL` on Windows.
     public static var null: Path {
         #if os(Windows)
-        Path("NUL")
+            Path("NUL")
         #else
-        Path("/dev/null")
+            Path("/dev/null")
         #endif
     }
 
@@ -172,9 +172,9 @@ public struct Path: Serializable, Sendable {
         // performing this conversion early.
         rawPath.makeContiguousUTF8()
         #if os(Windows)
-        if rawPath.hasPrefix("/") {
-            rawPath.removeFirst()
-        }
+            if rawPath.hasPrefix("/") {
+                rawPath.removeFirst()
+            }
         #endif
         let fp = Path(rawPath)
         precondition(fp.isAbsolute, "path '\(fp.str)' is not absolute")
@@ -198,12 +198,12 @@ public struct Path: Serializable, Sendable {
     /// - note: It's not clear if relying on the working directory in this manner is a good idea, but there are some places we need an absolute root path.
     public static var root: Path {
         #if os(Windows)
-        var fp = FilePath(FileManager.default.currentDirectoryPath)
-        fp.components.removeAll()
-        return Path(fp.string).withTrailingSlash
+            var fp = FilePath(FileManager.default.currentDirectoryPath)
+            fp.components.removeAll()
+            return Path(fp.string).withTrailingSlash
         #else
-        // Performance optimization for Unix-like platforms, and because FileManager's currentDirectoryPath can crash if there is an error retrieving the current directory: https://github.com/swiftlang/swift-foundation/issues/946
-        return Path("/")
+            // Performance optimization for Unix-like platforms, and because FileManager's currentDirectoryPath can crash if there is an error retrieving the current directory: https://github.com/swiftlang/swift-foundation/issues/946
+            return Path("/")
         #endif
     }
 
@@ -438,13 +438,13 @@ public struct Path: Serializable, Sendable {
     /// POSIX/GNU is extremely forgiving.
     public var isConformant: Bool {
         #if os(Windows)
-        //FIXME: The legacy implementation of will not work for windows roots. By default on windows we never use the legacy implementation.
-        precondition(!useLegacyImplementation)
-        if let root = _impl.root?.string {
-            if root.rangeOfCharacter(from: Path.reservedRootPathCharacters) != nil {
-                return false
+            //FIXME: The legacy implementation of will not work for windows roots. By default on windows we never use the legacy implementation.
+            precondition(!useLegacyImplementation)
+            if let root = _impl.root?.string {
+                if root.rangeOfCharacter(from: Path.reservedRootPathCharacters) != nil {
+                    return false
+                }
             }
-        }
         #endif
         // Validate the non-root portion
         if useLegacyImplementation {
@@ -472,9 +472,9 @@ public struct Path: Serializable, Sendable {
     public var commandQuoted: String? {
         guard isConformant else { return nil }
         #if os(Windows)
-        return "\"\(str)\""
+            return "\"\(str)\""
         #else
-        return str.quotedStringListRepresentation
+            return str.quotedStringListRepresentation
         #endif
     }
 
@@ -751,8 +751,7 @@ public struct Path: Serializable, Sendable {
                     if !nextCharacterIsEscaped {
                         isInPathComponent = false
                     }
-                }
-                else {
+                } else {
                     // If we're not in a path component, then we found a new one.
                     if !isInPathComponent {
                         numComponents += 1
@@ -762,8 +761,7 @@ public struct Path: Serializable, Sendable {
                 // Handle escape characters.
                 if nextCharacterIsEscaped {
                     nextCharacterIsEscaped = false
-                }
-                else {
+                } else {
                     nextCharacterIsEscaped = (byte == UInt8(ascii: "\\"))
                 }
             }
@@ -786,13 +784,11 @@ public struct Path: Serializable, Sendable {
                     }
                     break
                 }
-            }
-            else if idx == utf8Str.startIndex {
+            } else if idx == utf8Str.startIndex {
                 // If we didn't encounter a path separator, then the full string is the trailing subpath.
                 firstIdx = idx
                 break
-            }
-            else {
+            } else {
                 // If we're not in a path component, then we found a new one.
                 if !isInPathComponent {
                     numPathComponentsInPath += 1
@@ -871,13 +867,13 @@ extension Path: Hashable {
 }
 
 extension Path: Equatable {
-    public static func ==(lhs: Path, rhs: Path) -> Bool {
+    public static func == (lhs: Path, rhs: Path) -> Bool {
         return lhs.str == rhs.str
     }
 }
 
 extension Path: Comparable {
-    public static func <(lhs: Path, rhs: Path) -> Bool {
+    public static func < (lhs: Path, rhs: Path) -> Bool {
         return lhs.str < rhs.str
     }
 }
@@ -949,9 +945,9 @@ extension Path {
     /// This is necessary for some cases where tools may treat the `\` character as part of an escape sequence rather than a path separator even on Windows. Use sparingly.
     public var strWithPosixSlashes: String {
         #if os(Windows)
-        str.replacingOccurrences(of: "\\", with: "/")
+            str.replacingOccurrences(of: "\\", with: "/")
         #else
-        str
+            str
         #endif
     }
 }
@@ -960,35 +956,34 @@ extension String {
     @_spi(Testing) public var canonicalPathRepresentation: String {
         get throws {
             #if os(Windows)
-            return try withCString(encodedAs: UTF16.self) { platformPath in
-                return try platformPath.withCanonicalPathRepresentation { canonicalPath in
-                    return String(decodingCString: canonicalPath, as: UTF16.self)
+                return try withCString(encodedAs: UTF16.self) { platformPath in
+                    return try platformPath.withCanonicalPathRepresentation { canonicalPath in
+                        return String(decodingCString: canonicalPath, as: UTF16.self)
+                    }
                 }
-            }
             #else
-            return self
+                return self
             #endif
         }
     }
 }
 
 extension Path {
-     @_spi(Testing) public var canonicalPathRepresentation: String {
+    @_spi(Testing) public var canonicalPathRepresentation: String {
         get throws {
             #if os(Windows)
-            return try withPlatformString { platformPath in
-                return try platformPath.withCanonicalPathRepresentation { canonicalPath in
-                    return String(decodingCString: canonicalPath, as: UTF16.self)
+                return try withPlatformString { platformPath in
+                    return try platformPath.withCanonicalPathRepresentation { canonicalPath in
+                        return String(decodingCString: canonicalPath, as: UTF16.self)
+                    }
                 }
-            }
             #else
-            return str
+                return str
             #endif
         }
     }
 }
 
-
 /// A wrapper for a string which is used to identify an absolute path on the file system.
 public struct AbsolutePath: Hashable, Equatable, Serializable, Sendable {
     public let path: Path
@@ -1019,7 +1014,7 @@ public struct AbsolutePath: Hashable, Equatable, Serializable, Sendable {
         try self.init(validating: Path(from: deserializer))
     }
 
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         path.serialize(to: serializer)
     }
 
@@ -1058,7 +1053,7 @@ public struct RelativePath: Hashable, Equatable, Serializable, Sendable {
         try self.init(validating: Path(from: deserializer))
     }
 
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         path.serialize(to: serializer)
     }
 
diff --git a/Sources/SWBUtil/PathWindows.swift b/Sources/SWBUtil/PathWindows.swift
index f20d909d..7667d398 100644
--- a/Sources/SWBUtil/PathWindows.swift
+++ b/Sources/SWBUtil/PathWindows.swift
@@ -11,79 +11,80 @@
 //===----------------------------------------------------------------------===//
 
 #if os(Windows)
-import WinSDK
+    import WinSDK
 
-#if canImport(System)
-public import System
-#else
-public import SystemPackage
-#endif
+    #if canImport(System)
+        public import System
+    #else
+        public import SystemPackage
+    #endif
 
-extension UnsafePointer where Pointee == CInterop.PlatformChar {
-    /// Invokes `body` with a resolved and potentially `\\?\`-prefixed version of the pointee,
-    /// to ensure long paths greater than MAX_PATH (260) characters are handled correctly.
-    ///
-    /// - seealso: https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation
-    public func withCanonicalPathRepresentation<Result>(_ body: (Self) throws -> Result) throws -> Result {
-        // 1. Normalize the path first.
-        // Contrary to the documentation, this works on long paths independently
-        // of the registry or process setting to enable long paths (but it will also
-        // not add the \\?\ prefix required by other functions under these conditions).
-        let dwLength: DWORD = GetFullPathNameW(self, 0, nil, nil)
-        return try withUnsafeTemporaryAllocation(of: WCHAR.self, capacity: Int(dwLength)) { pwszFullPath in
-            guard (1..<dwLength).contains(GetFullPathNameW(self, DWORD(pwszFullPath.count), pwszFullPath.baseAddress, nil)) else {
-                throw Win32Error(GetLastError())
-            }
+    extension UnsafePointer where Pointee == CInterop.PlatformChar {
+        /// Invokes `body` with a resolved and potentially `\\?\`-prefixed version of the pointee,
+        /// to ensure long paths greater than MAX_PATH (260) characters are handled correctly.
+        ///
+        /// - seealso: https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation
+        public func withCanonicalPathRepresentation<Result>(_ body: (Self) throws -> Result) throws -> Result {
+            // 1. Normalize the path first.
+            // Contrary to the documentation, this works on long paths independently
+            // of the registry or process setting to enable long paths (but it will also
+            // not add the \\?\ prefix required by other functions under these conditions).
+            let dwLength: DWORD = GetFullPathNameW(self, 0, nil, nil)
+            return try withUnsafeTemporaryAllocation(of: WCHAR.self, capacity: Int(dwLength)) { pwszFullPath in
+                guard (1..<dwLength).contains(GetFullPathNameW(self, DWORD(pwszFullPath.count), pwszFullPath.baseAddress, nil)) else {
+                    throw Win32Error(GetLastError())
+                }
 
-            // 1.5 Leave \\.\ prefixed paths alone since device paths are already an exact representation and PathCchCanonicalizeEx will mangle these.
-            if let base = pwszFullPath.baseAddress,
-                base[0] == UInt8(ascii: "\\"),
-                base[1] == UInt8(ascii: "\\"),
-                base[2] == UInt8(ascii: "."),
-                base[3] == UInt8(ascii: "\\") {
-                return try body(base)
-            }
+                // 1.5 Leave \\.\ prefixed paths alone since device paths are already an exact representation and PathCchCanonicalizeEx will mangle these.
+                if let base = pwszFullPath.baseAddress,
+                    base[0] == UInt8(ascii: "\\"),
+                    base[1] == UInt8(ascii: "\\"),
+                    base[2] == UInt8(ascii: "."),
+                    base[3] == UInt8(ascii: "\\")
+                {
+                    return try body(base)
+                }
 
-            // 2. Canonicalize the path.
-            // This will add the \\?\ prefix if needed based on the path's length.
-            var pwszCanonicalPath: LPWSTR?
-            let flags: ULONG = numericCast(PATHCCH_ALLOW_LONG_PATHS.rawValue)
-            let result = PathAllocCanonicalize(pwszFullPath.baseAddress, flags, &pwszCanonicalPath)
-            if let pwszCanonicalPath {
-                defer { LocalFree(pwszCanonicalPath) }
-                if result == S_OK {
-                    // 3. Perform the operation on the normalized path.
-                    return try body(pwszCanonicalPath)
+                // 2. Canonicalize the path.
+                // This will add the \\?\ prefix if needed based on the path's length.
+                var pwszCanonicalPath: LPWSTR?
+                let flags: ULONG = numericCast(PATHCCH_ALLOW_LONG_PATHS.rawValue)
+                let result = PathAllocCanonicalize(pwszFullPath.baseAddress, flags, &pwszCanonicalPath)
+                if let pwszCanonicalPath {
+                    defer { LocalFree(pwszCanonicalPath) }
+                    if result == S_OK {
+                        // 3. Perform the operation on the normalized path.
+                        return try body(pwszCanonicalPath)
+                    }
                 }
+                throw Win32Error(WIN32_FROM_HRESULT(result))
             }
-            throw Win32Error(WIN32_FROM_HRESULT(result))
         }
     }
-}
 
-@inline(__always)
-fileprivate func HRESULT_CODE(_ hr: HRESULT) -> DWORD {
-    DWORD(hr) & 0xffff
-}
+    @inline(__always)
+    fileprivate func HRESULT_CODE(_ hr: HRESULT) -> DWORD {
+        DWORD(hr) & 0xffff
+    }
 
-@inline(__always)
-fileprivate func HRESULT_FACILITY(_ hr: HRESULT) -> DWORD {
-    DWORD(hr << 16) & 0x1fff
-}
+    @inline(__always)
+    fileprivate func HRESULT_FACILITY(_ hr: HRESULT) -> DWORD {
+        DWORD(hr << 16) & 0x1fff
+    }
 
-@inline(__always)
-fileprivate func SUCCEEDED(_ hr: HRESULT) -> Bool {
-    hr >= 0
-}
+    @inline(__always)
+    fileprivate func SUCCEEDED(_ hr: HRESULT) -> Bool {
+        hr >= 0
+    }
 
-// This is a non-standard extension to the Windows SDK that allows us to convert
-// an HRESULT to a Win32 error code.
-@inline(__always)
-fileprivate func WIN32_FROM_HRESULT(_ hr: HRESULT) -> DWORD {
-    if SUCCEEDED(hr) { return DWORD(ERROR_SUCCESS) }
-    if HRESULT_FACILITY(hr) == FACILITY_WIN32 {
-        return HRESULT_CODE(hr)
+    // This is a non-standard extension to the Windows SDK that allows us to convert
+    // an HRESULT to a Win32 error code.
+    @inline(__always)
+    fileprivate func WIN32_FROM_HRESULT(_ hr: HRESULT) -> DWORD {
+        if SUCCEEDED(hr) { return DWORD(ERROR_SUCCESS) }
+        if HRESULT_FACILITY(hr) == FACILITY_WIN32 {
+            return HRESULT_CODE(hr)
+        }
+        return DWORD(hr)
     }
-    return DWORD(hr)
-}
 #endif
diff --git a/Sources/SWBUtil/PluginManager.swift b/Sources/SWBUtil/PluginManager.swift
index 98e7d387..ce883669 100644
--- a/Sources/SWBUtil/PluginManager.swift
+++ b/Sources/SWBUtil/PluginManager.swift
@@ -79,7 +79,8 @@ import SWBLibc
         case ".bundle":
             pluginPath = path
             let shallow = !localFS.exists(path.join("Contents"))
-            let executableBasePath = shallow
+            let executableBasePath =
+                shallow
                 ? path.join(Path(name).basenameWithoutSuffix)
                 : path.join("Contents").join("MacOS").join(Path(name).basenameWithoutSuffix)
             executablePath = {
@@ -91,13 +92,13 @@ import SWBLibc
                 }
                 return executableBasePath
             }()
-            let infoPlistPath = shallow
+            let infoPlistPath =
+                shallow
                 ? path.join("Info.plist")
                 : path.join("Contents").join("Info.plist")
             if let plist = try? PropertyList.fromPath(infoPlistPath, fs: localFS), let cfBundleIdentifier = plist.dictValue?["CFBundleIdentifier"]?.stringValue {
                 pluginIdentifier = cfBundleIdentifier
-            }
-            else {
+            } else {
                 pluginIdentifier = path.basename
             }
         default:
@@ -226,8 +227,8 @@ public typealias PluginInitializationFunction = @Sendable @PluginExtensionSystem
 
 public var useStaticPluginInitialization: Bool {
     #if USE_STATIC_PLUGIN_INITIALIZATION
-    true
+        true
     #else
-    false
+        false
     #endif
 }
diff --git a/Sources/SWBUtil/Process+Async.swift b/Sources/SWBUtil/Process+Async.swift
index 93cecc3e..7863533f 100644
--- a/Sources/SWBUtil/Process+Async.swift
+++ b/Sources/SWBUtil/Process+Async.swift
@@ -36,7 +36,7 @@ extension Process {
     @available(watchOS, deprecated: 11.0, message: "Use the AsyncSequence-returning overload.")
     @available(visionOS, deprecated: 2.0, message: "Use the AsyncSequence-returning overload.")
     public func _makeStream(for keyPath: ReferenceWritableKeyPath<Process, Pipe?>, using pipe: Pipe) -> AsyncThrowingStream<SWBDispatchData, any Error> {
-        precondition(!isRunning) // the pipe setters will raise `NSInvalidArgumentException` anyways
+        precondition(!isRunning)  // the pipe setters will raise `NSInvalidArgumentException` anyways
         self[keyPath: keyPath] = pipe
         return pipe.fileHandleForReading._bytes()
     }
@@ -46,7 +46,7 @@ extension Process {
     /// - note: This method will mutate the `standardOutput` or `standardError` property of the Process object, replacing any existing `Pipe` or `FileHandle` which may be set. It must be called before the process is started.
     @available(macOS 15.0, iOS 18.0, tvOS 18.0, watchOS 11.0, visionOS 2.0, *)
     public func makeStream(for keyPath: ReferenceWritableKeyPath<Process, Pipe?>, using pipe: Pipe) -> some AsyncSequence<SWBDispatchData, any Error> {
-        precondition(!isRunning) // the pipe setters will raise `NSInvalidArgumentException` anyways
+        precondition(!isRunning)  // the pipe setters will raise `NSInvalidArgumentException` anyways
         self[keyPath: keyPath] = pipe
         return pipe.fileHandleForReading.bytes()
     }
@@ -81,7 +81,6 @@ extension Process {
     }
 }
 
-
 extension Process {
     /// Runs the process and suspends until completion.
     ///
diff --git a/Sources/SWBUtil/Process.swift b/Sources/SWBUtil/Process.swift
index 0c696dca..f9112e2f 100644
--- a/Sources/SWBUtil/Process.swift
+++ b/Sources/SWBUtil/Process.swift
@@ -14,53 +14,53 @@ public import Foundation
 import SWBLibc
 
 #if os(Windows)
-public typealias pid_t = Int32
+    public typealias pid_t = Int32
 #endif
 
 #if !canImport(Darwin)
-extension ProcessInfo {
-    public var isMacCatalystApp: Bool {
-        false
+    extension ProcessInfo {
+        public var isMacCatalystApp: Bool {
+            false
+        }
     }
-}
 #endif
 
 #if (!canImport(Foundation.NSTask) || targetEnvironment(macCatalyst)) && canImport(Darwin)
-public final class Process: @unchecked Sendable {
-    public enum TerminationReason: Int, Sendable {
-        case exit = 1
-        case uncaughtSignal = 2
-    }
+    public final class Process: @unchecked Sendable {
+        public enum TerminationReason: Int, Sendable {
+            case exit = 1
+            case uncaughtSignal = 2
+        }
 
-    public var currentDirectoryURL: URL?
-    public var executableURL: URL?
-    public var arguments: [String]?
-    public var environment: [String: String]?
-    public var processIdentifier: Int32 { -1 }
-    public var standardError: Any?
-    public var standardInput: Any?
-    public var standardOutput: Any?
-    public var isRunning: Bool { false }
-    public var terminationStatus: Int32 { -1 }
-    public var terminationReason: TerminationReason { .exit }
-    public var terminationHandler: ((Process) -> Void)?
-    public var qualityOfService: QualityOfService = .default
-
-    public init() {
-    }
+        public var currentDirectoryURL: URL?
+        public var executableURL: URL?
+        public var arguments: [String]?
+        public var environment: [String: String]?
+        public var processIdentifier: Int32 { -1 }
+        public var standardError: Any?
+        public var standardInput: Any?
+        public var standardOutput: Any?
+        public var isRunning: Bool { false }
+        public var terminationStatus: Int32 { -1 }
+        public var terminationReason: TerminationReason { .exit }
+        public var terminationHandler: ((Process) -> Void)?
+        public var qualityOfService: QualityOfService = .default
+
+        public init() {
+        }
 
-    public func terminate() {
-    }
+        public func terminate() {
+        }
 
-    public func waitUntilExit() {
-    }
+        public func waitUntilExit() {
+        }
 
-    public func run() throws {
-        throw StubError.error("Process spawning is unavailable")
+        public func run() throws {
+            throw StubError.error("Process spawning is unavailable")
+        }
     }
-}
 #else
-public typealias Process = Foundation.Process
+    public typealias Process = Foundation.Process
 #endif
 
 extension Process {
@@ -186,10 +186,10 @@ extension Process {
         let output = try await outputTask
 
         #if !canImport(Darwin)
-        // Clear the pipes to prevent file descriptor leaks on platforms using swift-corelibs-foundation
-        // This asserts on Darwin
-        process.standardOutputPipe = nil
-        process.standardErrorPipe = nil
+            // Clear the pipes to prevent file descriptor leaks on platforms using swift-corelibs-foundation
+            // This asserts on Darwin
+            process.standardOutputPipe = nil
+            process.standardErrorPipe = nil
         #endif
 
         return try (.init(process), output)
@@ -223,57 +223,58 @@ public enum Processes: Sendable {
 
         public init?(rawValue: Int32) {
             #if os(Windows)
-            let dwExitCode = DWORD(bitPattern: rawValue)
-            // Do the same thing as swift-corelibs-foundation (the input value is the GetExitCodeProcess return value)
-            if (dwExitCode & 0xF0000000) == 0x80000000     // HRESULT
-                || (dwExitCode & 0xF0000000) == 0xC0000000 // NTSTATUS
-                || (dwExitCode & 0xF0000000) == 0xE0000000 // NTSTATUS (Customer)
-                || dwExitCode == 3 {
-                self = .uncaughtSignal(Int32(dwExitCode & 0x3FFFFFFF))
-            } else {
-                self = .exit(Int32(bitPattern: UInt32(dwExitCode)))
-            }
+                let dwExitCode = DWORD(bitPattern: rawValue)
+                // Do the same thing as swift-corelibs-foundation (the input value is the GetExitCodeProcess return value)
+                if (dwExitCode & 0xF0000000) == 0x80000000  // HRESULT
+                    || (dwExitCode & 0xF0000000) == 0xC0000000  // NTSTATUS
+                    || (dwExitCode & 0xF0000000) == 0xE0000000  // NTSTATUS (Customer)
+                    || dwExitCode == 3
+                {
+                    self = .uncaughtSignal(Int32(dwExitCode & 0x3FFFFFFF))
+                } else {
+                    self = .exit(Int32(bitPattern: UInt32(dwExitCode)))
+                }
             #else
-            func WSTOPSIG(_ status: Int32) -> Int32 {
-                return status >> 8
-            }
-
-            func WIFCONTINUED(_ status: Int32) -> Bool {
-                return _WSTATUS(status) == 0x7f && WSTOPSIG(status) == 0x13
-            }
-
-            func WIFSTOPPED(_ status: Int32) -> Bool {
-                return _WSTATUS(status) == 0x7f && WSTOPSIG(status) != 0x13
-            }
-
-            func WIFEXITED(_ status: Int32) -> Bool {
-                return _WSTATUS(status) == 0
-            }
-
-            func _WSTATUS(_ status: Int32) -> Int32 {
-                return status & 0x7f
-            }
-
-            func WIFSIGNALED(_ status: Int32) -> Bool {
-                return (_WSTATUS(status) != 0) && (_WSTATUS(status) != 0x7f)
-            }
-
-            func WEXITSTATUS(_ status: Int32) -> Int32 {
-                return (status >> 8) & 0xff
-            }
-
-            func WTERMSIG(_ status: Int32) -> Int32 {
-                return status & 0x7f
-            }
-
-            if WIFSIGNALED(rawValue) {
-                self = .uncaughtSignal(WTERMSIG(rawValue))
-            } else if WIFEXITED(rawValue) {
-                self = .exit(WEXITSTATUS(rawValue))
-            } else {
-                assert(WIFCONTINUED(rawValue) || WIFSTOPPED(rawValue))
-                return nil
-            }
+                func WSTOPSIG(_ status: Int32) -> Int32 {
+                    return status >> 8
+                }
+
+                func WIFCONTINUED(_ status: Int32) -> Bool {
+                    return _WSTATUS(status) == 0x7f && WSTOPSIG(status) == 0x13
+                }
+
+                func WIFSTOPPED(_ status: Int32) -> Bool {
+                    return _WSTATUS(status) == 0x7f && WSTOPSIG(status) != 0x13
+                }
+
+                func WIFEXITED(_ status: Int32) -> Bool {
+                    return _WSTATUS(status) == 0
+                }
+
+                func _WSTATUS(_ status: Int32) -> Int32 {
+                    return status & 0x7f
+                }
+
+                func WIFSIGNALED(_ status: Int32) -> Bool {
+                    return (_WSTATUS(status) != 0) && (_WSTATUS(status) != 0x7f)
+                }
+
+                func WEXITSTATUS(_ status: Int32) -> Int32 {
+                    return (status >> 8) & 0xff
+                }
+
+                func WTERMSIG(_ status: Int32) -> Int32 {
+                    return status & 0x7f
+                }
+
+                if WIFSIGNALED(rawValue) {
+                    self = .uncaughtSignal(WTERMSIG(rawValue))
+                } else if WIFEXITED(rawValue) {
+                    self = .exit(WEXITSTATUS(rawValue))
+                } else {
+                    assert(WIFCONTINUED(rawValue) || WIFSTOPPED(rawValue))
+                    return nil
+                }
             #endif
         }
 
@@ -302,10 +303,10 @@ public enum Processes: Sendable {
                 return false
             case let .uncaughtSignal(signal):
                 #if os(Windows)
-                // Windows doesn't support the concept of signals, so just always return false for now.
-                return false
+                    // Windows doesn't support the concept of signals, so just always return false for now.
+                    return false
                 #else
-                return signal == SIGINT || signal == SIGKILL
+                    return signal == SIGINT || signal == SIGKILL
                 #endif
             }
         }
@@ -320,10 +321,10 @@ extension Processes.ExitStatus {
             self = .exit(process.terminationStatus)
         case .uncaughtSignal:
             self = .uncaughtSignal(process.terminationStatus)
-#if canImport(Foundation.NSTask) || !canImport(Darwin)
-        @unknown default:
-            throw StubError.error("Process terminated with unknown termination reason value: \(process.terminationReason)")
-#endif
+        #if canImport(Foundation.NSTask) || !canImport(Darwin)
+            @unknown default:
+                throw StubError.error("Process terminated with unknown termination reason value: \(process.terminationReason)")
+        #endif
         }
     }
 }
@@ -444,10 +445,11 @@ extension RunProcessNonZeroExitError: CustomStringConvertible, LocalizedError {
         let message = "\(commandIdentityPrefixString) \(status)."
         switch output {
         case let .separate(stdout, stderr) where !stdout.isEmpty || !stderr.isEmpty:
-            return message + [
-                !stdout.isEmpty ? " The command's standard output was:\n\n\(stdout.asString)" : nil,
-                !stderr.isEmpty ? " The command's standard error was:\n\n\(stderr.asString)" : nil,
-            ].compactMap { $0 }.joined(separator: "\n\n")
+            return message
+                + [
+                    !stdout.isEmpty ? " The command's standard output was:\n\n\(stdout.asString)" : nil,
+                    !stderr.isEmpty ? " The command's standard error was:\n\n\(stderr.asString)" : nil,
+                ].compactMap { $0 }.joined(separator: "\n\n")
         case let .merged(output) where !output.isEmpty:
             return message + " The command's output was:\n\n\(output.asString)"
         default:
diff --git a/Sources/SWBUtil/ProcessInfo.swift b/Sources/SWBUtil/ProcessInfo.swift
index 691a03d1..50e0d303 100644
--- a/Sources/SWBUtil/ProcessInfo.swift
+++ b/Sources/SWBUtil/ProcessInfo.swift
@@ -14,11 +14,11 @@ public import Foundation
 import SWBLibc
 
 #if os(Windows)
-#if canImport(System)
-import System
-#else
-import SystemPackage
-#endif
+    #if canImport(System)
+        import System
+    #else
+        import SystemPackage
+    #endif
 #endif
 
 // Defined in System.framework's sys/resource.h, but not available to Swift
@@ -27,57 +27,57 @@ fileprivate let IOPOL_TYPE_VFS_HFS_CASE_SENSITIVITY: Int32 = 1
 extension ProcessInfo {
     public var userID: Int {
         #if os(Windows)
-        return 0
+            return 0
         #else
-        return Int(getuid())
+            return Int(getuid())
         #endif
     }
 
     public var effectiveUserID: Int {
         #if os(Windows)
-        return 0
+            return 0
         #else
-        return Int(geteuid())
+            return Int(geteuid())
         #endif
     }
 
     public var groupID: Int {
         #if os(Windows)
-        return 0
+            return 0
         #else
-        return Int(getgid())
+            return Int(getgid())
         #endif
     }
 
     public var effectiveGroupID: Int {
         #if os(Windows)
-        return 0
+            return 0
         #else
-        return Int(getegid())
+            return Int(getegid())
         #endif
     }
 
     public var shortUserName: String {
         #if os(Windows)
-        var capacity = UNLEN + 1
-        let pointer = UnsafeMutablePointer<CInterop.PlatformChar>.allocate(capacity: Int(capacity))
-        defer { pointer.deallocate() }
-        if GetUserNameW(pointer, &capacity) {
-            return String(platformString: pointer)
-        }
-        return ""
+            var capacity = UNLEN + 1
+            let pointer = UnsafeMutablePointer<CInterop.PlatformChar>.allocate(capacity: Int(capacity))
+            defer { pointer.deallocate() }
+            if GetUserNameW(pointer, &capacity) {
+                return String(platformString: pointer)
+            }
+            return ""
         #else
-        let uid = geteuid().orIfZero(getuid())
-        return (getpwuid(uid)?.pointee.pw_name).map { String(cString: $0) } ?? String(uid)
+            let uid = geteuid().orIfZero(getuid())
+            return (getpwuid(uid)?.pointee.pw_name).map { String(cString: $0) } ?? String(uid)
         #endif
     }
 
     public var shortGroupName: String {
         #if os(Windows)
-        return ""
+            return ""
         #else
-        let gid = getegid().orIfZero(getgid())
-        return (getgrgid(gid)?.pointee.gr_name).map { String(cString: $0) } ?? String(gid)
+            let gid = getegid().orIfZero(getgid())
+            return (getgrgid(gid)?.pointee.gr_name).map { String(cString: $0) } ?? String(gid)
         #endif
     }
 
@@ -88,43 +88,42 @@ extension ProcessInfo {
 
     public var isRunningUnderFilesystemCaseSensitivityIOPolicy: Bool {
         #if os(macOS)
-        return getiopolicy_np(IOPOL_TYPE_VFS_HFS_CASE_SENSITIVITY, IOPOL_SCOPE_PROCESS) == 1
+            return getiopolicy_np(IOPOL_TYPE_VFS_HFS_CASE_SENSITIVITY, IOPOL_SCOPE_PROCESS) == 1
         #else
-        return false
+            return false
         #endif
     }
 
     public func hostOperatingSystem() throws -> OperatingSystem {
         #if os(Windows)
-        return .windows
+            return .windows
         #elseif os(Linux)
-        return .linux
+            return .linux
         #elseif os(FreeBSD)
-        return .freebsd
+            return .freebsd
         #elseif os(OpenBSD)
-        return .openbsd
+            return .openbsd
         #else
-        if try FileManager.default.isReadableFile(atPath: systemVersionPlistURL.filePath.str) {
-            switch try systemVersion().productName {
-            case "Mac OS X", "macOS":
-                return .macOS
-            case "iPhone OS":
-                return .iOS(simulator: simulatorRoot != nil)
-            case "Apple TVOS":
-                return .tvOS(simulator: simulatorRoot != nil)
-            case "Watch OS":
-                return .watchOS(simulator: simulatorRoot != nil)
-            case "xrOS":
-                return .visionOS(simulator: simulatorRoot != nil)
-            default:
-                break
+            if try FileManager.default.isReadableFile(atPath: systemVersionPlistURL.filePath.str) {
+                switch try systemVersion().productName {
+                case "Mac OS X", "macOS":
+                    return .macOS
+                case "iPhone OS":
+                    return .iOS(simulator: simulatorRoot != nil)
+                case "Apple TVOS":
+                    return .tvOS(simulator: simulatorRoot != nil)
+                case "Watch OS":
+                    return .watchOS(simulator: simulatorRoot != nil)
+                case "xrOS":
+                    return .visionOS(simulator: simulatorRoot != nil)
+                default:
+                    break
+                }
             }
-        }
-        return .unknown
+            return .unknown
         #endif
     }
 
-
 }
 
 public struct LinuxDistribution: Hashable, Sendable {
@@ -240,7 +239,8 @@ public enum OperatingSystem: Hashable, Sendable {
         let osReleasePath = Path("/etc/os-release")
         if fs.exists(osReleasePath) {
             if let osReleaseData = try? fs.read(osReleasePath),
-               let osRelease = String(data: Data(osReleaseData.bytes), encoding: .utf8) {
+                let osRelease = String(data: Data(osReleaseData.bytes), encoding: .utf8)
+            {
                 if let distribution = parseOSRelease(osRelease) {
                     return distribution
                 }
@@ -386,10 +386,10 @@ extension ImageFormat {
 
     public var usesRpaths: Bool {
         switch self {
-            case .macho, .elf:
-                return true
-            case .pe:
-                return false
+        case .macho, .elf:
+            return true
+        case .pe:
+            return false
         }
     }
 
@@ -419,4 +419,3 @@ extension FixedWidthInteger {
         return self != 0 ? self : other
     }
 }
-
diff --git a/Sources/SWBUtil/PropertyList.swift b/Sources/SWBUtil/PropertyList.swift
index 3e96dbdd..c3442107 100644
--- a/Sources/SWBUtil/PropertyList.swift
+++ b/Sources/SWBUtil/PropertyList.swift
@@ -11,16 +11,16 @@
 //===----------------------------------------------------------------------===//
 
 #if canImport(Darwin)
-import class CoreFoundation.CFBoolean
-import func CoreFoundation.CFBooleanGetTypeID
-import func CoreFoundation.CFBooleanGetValue
-import func CoreFoundation.CFEqual
-import func CoreFoundation.CFGetTypeID
-import func CoreFoundation.CFHash
-import class CoreFoundation.CFNumber
-import func CoreFoundation.CFNumberGetTypeID
-import func CoreFoundation.CFNumberIsFloatType
-import typealias CoreFoundation.CFTypeRef
+    import class CoreFoundation.CFBoolean
+    import func CoreFoundation.CFBooleanGetTypeID
+    import func CoreFoundation.CFBooleanGetValue
+    import func CoreFoundation.CFEqual
+    import func CoreFoundation.CFGetTypeID
+    import func CoreFoundation.CFHash
+    import class CoreFoundation.CFNumber
+    import func CoreFoundation.CFNumberGetTypeID
+    import func CoreFoundation.CFNumberIsFloatType
+    import typealias CoreFoundation.CFTypeRef
 #endif
 
 public import struct Foundation.Data
@@ -68,35 +68,35 @@ extension PropertyListConversionError: CustomStringConvertible {
 }
 
 public struct OpaquePropertyListItem: Equatable, Hashable, @unchecked Sendable {
-#if canImport(Darwin)
-    fileprivate var wrappedValue: CFTypeRef
+    #if canImport(Darwin)
+        fileprivate var wrappedValue: CFTypeRef
 
-    fileprivate init(_ wrappedValue: CFTypeRef) {
-        self.wrappedValue = wrappedValue
-    }
+        fileprivate init(_ wrappedValue: CFTypeRef) {
+            self.wrappedValue = wrappedValue
+        }
 
-    public static func == (lhs: OpaquePropertyListItem, rhs: OpaquePropertyListItem) -> Bool {
-        return CFEqual(lhs.wrappedValue, rhs.wrappedValue)
-    }
+        public static func == (lhs: OpaquePropertyListItem, rhs: OpaquePropertyListItem) -> Bool {
+            return CFEqual(lhs.wrappedValue, rhs.wrappedValue)
+        }
 
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(CFHash(wrappedValue))
-    }
-#else
-    fileprivate var wrappedValue: NSObject
+        public func hash(into hasher: inout Hasher) {
+            hasher.combine(CFHash(wrappedValue))
+        }
+    #else
+        fileprivate var wrappedValue: NSObject
 
-    fileprivate init(_ wrappedValue: NSObject) {
-        self.wrappedValue = wrappedValue
-    }
+        fileprivate init(_ wrappedValue: NSObject) {
+            self.wrappedValue = wrappedValue
+        }
 
-    public static func == (lhs: OpaquePropertyListItem, rhs: OpaquePropertyListItem) -> Bool {
-        return lhs.wrappedValue.isEqual(rhs.wrappedValue)
-    }
+        public static func == (lhs: OpaquePropertyListItem, rhs: OpaquePropertyListItem) -> Bool {
+            return lhs.wrappedValue.isEqual(rhs.wrappedValue)
+        }
 
-    public func hash(into hasher: inout Hasher) {
-        wrappedValue.hash(into: &hasher)
-    }
-#endif
+        public func hash(into hasher: inout Hasher) {
+            wrappedValue.hash(into: &hasher)
+        }
+    #endif
 }
 
 public enum PropertyListItem: Hashable, Sendable {
@@ -244,15 +244,19 @@ extension PropertyListItem {
     public func withConcreteBooleans(forKeys booleanKeyNames: Set<String>) -> PropertyListItem {
         switch self {
         case .plDict(let d):
-            return .plDict(Dictionary<String, PropertyListItem>(uniqueKeysWithValues: d.sorted(byKey: <).map { (key, value) -> (String, PropertyListItem) in
-                if case .plDict = value {
-                    return (key, value.withConcreteBooleans(forKeys: booleanKeyNames))
-                }
-                if booleanKeyNames.contains(key), let bool = value.looselyTypedBoolValue {
-                    return (key, .plBool(bool))
-                }
-                return (key, value)
-            }))
+            return .plDict(
+                Dictionary<String, PropertyListItem>(
+                    uniqueKeysWithValues: d.sorted(byKey: <).map { (key, value) -> (String, PropertyListItem) in
+                        if case .plDict = value {
+                            return (key, value.withConcreteBooleans(forKeys: booleanKeyNames))
+                        }
+                        if booleanKeyNames.contains(key), let bool = value.looselyTypedBoolValue {
+                            return (key, .plBool(bool))
+                        }
+                        return (key, value)
+                    }
+                )
+            )
         default:
             return self
         }
@@ -372,7 +376,7 @@ public extension PropertyListItem {
     /// `PropertyListItemConvertible` hence we cannot use the overload above.
     @_disfavoredOverload
     init(_ x: [any PropertyListItemConvertible]) {
-        self = .plArray(x.map{$0.propertyListItem})
+        self = .plArray(x.map { $0.propertyListItem })
     }
 
     /// This overload is intended only to support dictionaries with heterogeneous values.
@@ -477,7 +481,7 @@ public extension PropertyListItem {
             stream.write(UInt8(ascii: "{"))
             var first = true
             let sortedValue = value.sorted(byKey: <)
-            for (key,item) in sortedValue {
+            for (key, item) in sortedValue {
                 if !first { stream.write(UInt8(ascii: ",")) }
                 stream.write(UInt8(ascii: "\""))
                 stream.writeJSONEscaped(key)
@@ -528,7 +532,7 @@ public extension PropertyListItem {
 
         case .plDict(let value):
             let dict = NSMutableDictionary()
-            for (key,item) in value {
+            for (key, item) in value {
                 dict.setObject(item.unsafePropertyList, forKey: key as NSString)
             }
             return dict
@@ -621,7 +625,7 @@ public extension PropertyListItem {
 }
 
 extension PropertyListItem: Equatable {
-    public static func ==(lhs: PropertyListItem, rhs: PropertyListItem) -> Bool {
+    public static func == (lhs: PropertyListItem, rhs: PropertyListItem) -> Bool {
         switch (lhs, rhs) {
         case (.plBool(let lhs), .plBool(let rhs)): return lhs == rhs
         case (.plBool, _): return false
@@ -646,14 +650,14 @@ extension PropertyListItem: Equatable {
 }
 
 private func convertToPropertyListItem(_ item: Any) -> PropertyListItem {
-    switch(item) {
-#if canImport(Darwin)
-    case let asBool as CFBoolean where CFGetTypeID(asBool) == CFBooleanGetTypeID():
-        return .plBool(CFBooleanGetValue(asBool))
+    switch (item) {
+    #if canImport(Darwin)
+        case let asBool as CFBoolean where CFGetTypeID(asBool) == CFBooleanGetTypeID():
+            return .plBool(CFBooleanGetValue(asBool))
 
-    case let asNumber as NSNumber where CFGetTypeID(asNumber) == CFNumberGetTypeID() && CFNumberIsFloatType(unsafeBitCast(asNumber, to: CFNumber.self)):
-        return .plDouble(asNumber as! Double)
-#endif
+        case let asNumber as NSNumber where CFGetTypeID(asNumber) == CFNumberGetTypeID() && CFNumberIsFloatType(unsafeBitCast(asNumber, to: CFNumber.self)):
+            return .plDouble(asNumber as! Double)
+    #endif
 
     case let asInt as Int:
         return .plInt(asInt)
@@ -685,19 +689,19 @@ private func convertToPropertyListItem(_ item: Any) -> PropertyListItem {
 
     case let asDict as NSDictionary:
         var result = Dictionary<String, PropertyListItem>(minimumCapacity: asDict.count)
-        for (key,value) in asDict {
+        for (key, value) in asDict {
             let valueItem = convertToPropertyListItem(value)
             result[key as! String] = valueItem
         }
         return .plDict(result)
 
-#if canImport(Darwin)
-    case let asCFType as CFTypeRef:
-        return .plOpaque(.init(asCFType))
-#else
-    case let asNSObject as NSObject:
-        return .plOpaque(.init(asNSObject))
-#endif
+    #if canImport(Darwin)
+        case let asCFType as CFTypeRef:
+            return .plOpaque(.init(asCFType))
+    #else
+        case let asNSObject as NSObject:
+            return .plOpaque(.init(asNSObject))
+    #endif
 
     default:
         fatalError("unable to convert \(item) (a `\(type(of: item))` to a `PropertyListItem`")
@@ -714,8 +718,7 @@ public enum PropertyList: Sendable {
             _ = try fs.getFileInfo(path)
         } catch let error as POSIXError {
             throw PropertyListConversionError.fileError(error)
-        }
-        catch _ {
+        } catch _ {
             throw PropertyListConversionError.unknown
         }
 
@@ -759,7 +762,6 @@ public enum PropertyList: Sendable {
         return try fromStringWithFormat(string).propertyList
     }
 
-
     /// Create a property list from `string`, and return the property list and the format it was read from.
     public static func fromBytesWithFormat(_ bytes: [UInt8]) throws -> (propertyList: PropertyListItem, format: PropertyListSerialization.PropertyListFormat) {
         do {
@@ -812,12 +814,12 @@ public enum PropertyList: Sendable {
 }
 
 extension PropertyList {
-    public static func encode<Value>(_ value: Value) throws -> PropertyListItem where Value : Encodable {
+    public static func encode<Value>(_ value: Value) throws -> PropertyListItem where Value: Encodable {
         // FIXME: Make this more efficient! We should be able to encode directly into the PropertyListItem object rather than first serializing to a binary plist.
         return try PropertyList.fromBytes(Array(PropertyListEncoder().encode(value)))
     }
 
-    public static func decode<T>(_ type: T.Type, from propertyListItem: PropertyListItem) throws -> T where T : Decodable {
+    public static func decode<T>(_ type: T.Type, from propertyListItem: PropertyListItem) throws -> T where T: Decodable {
         // FIXME: Make this more efficient! We should be able to decode directly from the PropertyListItem object rather than first serializing to a binary plist.
         return try PropertyListDecoder().decode(type, from: Data(propertyListItem.asBytes(.binary)))
     }
@@ -889,9 +891,11 @@ extension PropertyListItem {
                     if keyPath.keyPath.count == 1 {
                         values.append(PropertyListItemKeyPathValue(actualKeyPath: [key], value: value))
                     } else {
-                        values.append(contentsOf: value[keyPath.dropFirst()].map {
-                            PropertyListItemKeyPathValue(actualKeyPath: [key] + $0.actualKeyPath, value: $0.value)
-                        })
+                        values.append(
+                            contentsOf: value[keyPath.dropFirst()].map {
+                                PropertyListItemKeyPathValue(actualKeyPath: [key] + $0.actualKeyPath, value: $0.value)
+                            }
+                        )
                     }
                 }
             }
@@ -912,9 +916,9 @@ extension PropertyListSerialization {
                 return result
             }
             #if canImport(Darwin)
-            table.setObject(value, forKey: value as! (any NSCopying))
+                table.setObject(value, forKey: value as! (any NSCopying))
             #else
-            table.setObject(value, forKey: value as! AnyHashable)
+                table.setObject(value, forKey: value as! AnyHashable)
             #endif
             return value
         }
@@ -945,13 +949,14 @@ extension PropertyListSerialization {
 
             init(dictionary: NSDictionary, memoTable: NSMutableDictionary) {
                 // Create the sorted key list.
-                orderedKeys = dictionary.allKeys.sorted(by: { lhs, rhs in
-                    guard let lhs = lhs as? String, let rhs = rhs as? String else {
-                        // This is a rule of property lists in general, not a limitation of the implementation.
-                        preconditionFailure("property list dictionaries may only have keys which are strings")
-                    }
-                    return lhs < rhs
-                }) as NSArray
+                orderedKeys =
+                    dictionary.allKeys.sorted(by: { lhs, rhs in
+                        guard let lhs = lhs as? String, let rhs = rhs as? String else {
+                            // This is a rule of property lists in general, not a limitation of the implementation.
+                            preconditionFailure("property list dictionaries may only have keys which are strings")
+                        }
+                        return lhs < rhs
+                    }) as NSArray
 
                 let count = orderedKeys.count
                 let stableCopy = NSMutableDictionary(capacity: count)
@@ -959,18 +964,18 @@ extension PropertyListSerialization {
                     // Replace the entry with a stable copy of the key and value.
                     let key = GetInternedValue(orderedKeys[i], memoTable)
                     #if canImport(Darwin)
-                    stableCopy.setObject(GetStableValueReplacement(dictionary[key] as Any, memoTable), forKey: key as! (any NSCopying))
+                        stableCopy.setObject(GetStableValueReplacement(dictionary[key] as Any, memoTable), forKey: key as! (any NSCopying))
                     #else
-                    stableCopy.setObject(GetStableValueReplacement(dictionary[key] as Any, memoTable), forKey: key as! AnyHashable)
+                        stableCopy.setObject(GetStableValueReplacement(dictionary[key] as Any, memoTable), forKey: key as! AnyHashable)
                     #endif
                 }
 
                 self.dictionary = stableCopy
 
                 #if canImport(Darwin)
-                super.init()
+                    super.init()
                 #else
-                super.init(objects: nil, forKeys: nil, count: 0)
+                    super.init(objects: nil, forKeys: nil, count: 0)
                 #endif
             }
 
@@ -979,17 +984,17 @@ extension PropertyListSerialization {
             }
 
             #if canImport(Darwin)
-            required convenience override init() {
-                self.init(objects: nil, forKeys: nil, count: 0)
-            }
+                required convenience override init() {
+                    self.init(objects: nil, forKeys: nil, count: 0)
+                }
 
-            override init(objects: UnsafePointer<AnyObject>?, forKeys keys: UnsafePointer<any NSCopying>?, count: Int) {
-                super.init(objects: objects, forKeys: keys, count: count)
-            }
+                override init(objects: UnsafePointer<AnyObject>?, forKeys keys: UnsafePointer<any NSCopying>?, count: Int) {
+                    super.init(objects: objects, forKeys: keys, count: count)
+                }
             #else
-            required init(objects: UnsafePointer<AnyObject>!, forKeys keys: UnsafePointer<NSObject>!, count: Int) {
-                super.init(objects: objects, forKeys: keys, count: count)
-            }
+                required init(objects: UnsafePointer<AnyObject>!, forKeys keys: UnsafePointer<NSObject>!, count: Int) {
+                    super.init(objects: objects, forKeys: keys, count: count)
+                }
             #endif
 
             override var count: Int {
@@ -1010,10 +1015,10 @@ extension PropertyListSerialization {
 
         // Not working on Linux
         #if !canImport(Darwin)
-        return try data(fromPropertyList: plist, format: format, options: options)
+            return try data(fromPropertyList: plist, format: format, options: options)
         #else
-        // Convert the input property list to something which will have a stable representation when serialized.
-        return try data(fromPropertyList: GetStableValueReplacement(plist, memoTable), format: format, options: options)
+            // Convert the input property list to something which will have a stable representation when serialized.
+            return try data(fromPropertyList: GetStableValueReplacement(plist, memoTable), format: format, options: options)
         #endif
     }
 }
diff --git a/Sources/SWBUtil/Queue.swift b/Sources/SWBUtil/Queue.swift
index 28c55254..fc30384a 100644
--- a/Sources/SWBUtil/Queue.swift
+++ b/Sources/SWBUtil/Queue.swift
@@ -82,7 +82,7 @@ public struct Queue<T>: ExpressibleByArrayLiteral, RandomAccessCollection {
     }
 
     /// Append a sequence of elements to the queue.
-    public mutating func append<S>(contentsOf newElements: S) where Element == S.Iterator.Element, S : Sequence {
+    public mutating func append<S>(contentsOf newElements: S) where Element == S.Iterator.Element, S: Sequence {
         for item in newElements {
             append(item)
         }
diff --git a/Sources/SWBUtil/RateLimiter.swift b/Sources/SWBUtil/RateLimiter.swift
index f034de76..b1049823 100644
--- a/Sources/SWBUtil/RateLimiter.swift
+++ b/Sources/SWBUtil/RateLimiter.swift
@@ -42,4 +42,4 @@ public struct RateLimiter: ~Copyable {
 }
 
 @available(*, unavailable)
-extension RateLimiter: Sendable { }
+extension RateLimiter: Sendable {}
diff --git a/Sources/SWBUtil/RegEx.swift b/Sources/SWBUtil/RegEx.swift
index 9669a22b..cde00712 100644
--- a/Sources/SWBUtil/RegEx.swift
+++ b/Sources/SWBUtil/RegEx.swift
@@ -41,7 +41,7 @@ public struct RegEx: Sendable {
         let nsString = string as NSString
 
         return regex.firstMatch(in: string, range: NSMakeRange(0, nsString.length)).map { match -> [String] in
-            return (1 ..< match.numberOfRanges).map { idx -> String in
+            return (1..<match.numberOfRanges).map { idx -> String in
                 let range = match.range(at: idx)
                 return range.location == NSNotFound ? "" : nsString.substring(with: range)
             }
@@ -75,8 +75,8 @@ public struct RegEx: Sendable {
     public func matchGroups(in string: String) -> [[String]] {
         let nsString = string as NSString
 
-        return regex.matches(in: string, range: NSMakeRange(0, nsString.length)).map{ match -> [String] in
-            return (1 ..< match.numberOfRanges).map { idx -> String in
+        return regex.matches(in: string, range: NSMakeRange(0, nsString.length)).map { match -> [String] in
+            return (1..<match.numberOfRanges).map { idx -> String in
                 let range = match.range(at: idx)
                 return range.location == NSNotFound ? "" : nsString.substring(with: range)
             }
@@ -99,7 +99,7 @@ public struct RegEx: Sendable {
 }
 
 @available(*, unavailable)
-extension RegEx.MatchResult: Sendable { }
+extension RegEx.MatchResult: Sendable {}
 
 // Unsafe Sendable wrapper for Swift Regexs known to be thread safe because they don't include custom components or non-sendable transform closures.
 public struct UnsafeSendableRegex<Output: Sendable>: @unchecked Sendable {
diff --git a/Sources/SWBUtil/ResponseFiles.swift b/Sources/SWBUtil/ResponseFiles.swift
index b1d42fa1..ef25a227 100644
--- a/Sources/SWBUtil/ResponseFiles.swift
+++ b/Sources/SWBUtil/ResponseFiles.swift
@@ -82,7 +82,7 @@ public enum ResponseFiles: Sendable {
     }
 
     private enum UnixTokenState {
-      case normal, escaping, quoted
+        case normal, escaping, quoted
     }
 
     /// Tokenizes a response file line generated by `UNIXShellCommandCodec` using the `.singleQuotes` strategy.
@@ -142,7 +142,7 @@ public enum ResponseFiles: Sendable {
     }
 
     private enum WindowsTokenState {
-      case normal, escaping
+        case normal, escaping
     }
 
     private static func tokenizeWindowsShellQuotedResponseFileArg<S: StringProtocol>(_ arg: S) -> String {
diff --git a/Sources/SWBUtil/Result.swift b/Sources/SWBUtil/Result.swift
index 51955ebf..ec772f26 100644
--- a/Sources/SWBUtil/Result.swift
+++ b/Sources/SWBUtil/Result.swift
@@ -16,7 +16,7 @@ private enum ResultType: Int, Serializable {
 }
 
 extension Result: Serializable where Success: Serializable, Failure: Serializable {
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serializeAggregate(2) {
             switch self {
             case let .success(value):
diff --git a/Sources/SWBUtil/SWBDispatch.swift b/Sources/SWBUtil/SWBDispatch.swift
index 1efc4729..333de315 100644
--- a/Sources/SWBUtil/SWBDispatch.swift
+++ b/Sources/SWBUtil/SWBDispatch.swift
@@ -18,9 +18,9 @@ public import SWBLibc
 public import Foundation
 
 #if canImport(System)
-public import System
+    public import System
 #else
-public import SystemPackage
+    public import SystemPackage
 #endif
 
 /// Represents a `dispatch_fd_t` which is a POSIX file descriptor on Unix-like platforms, or a HANDLE on Windows.
@@ -28,25 +28,25 @@ public import SystemPackage
 /// It performs non-owning conversions from FileDescriptors and FileHandles, but not the reverse. The raw fd/HANDLE value is inaccessible to callers and privately forwarded to relevant Dispatch APIs.
 public struct DispatchFD: Sendable {
     #if os(Windows)
-    fileprivate let rawValue: Int
+        fileprivate let rawValue: Int
     #else
-    fileprivate let rawValue: Int32
+        fileprivate let rawValue: Int32
     #endif
 
     public init(fileDescriptor: FileDescriptor) {
         #if os(Windows)
-        rawValue = _get_osfhandle(fileDescriptor.rawValue)
+            rawValue = _get_osfhandle(fileDescriptor.rawValue)
         #else
-        rawValue = fileDescriptor.rawValue
+            rawValue = fileDescriptor.rawValue
         #endif
     }
 
     init(fileHandle: FileHandle) {
         #if os(Windows)
-        // This may look unsafe, but is how swift-corelibs-dispatch works. Basically, dispatch_fd_t directly represents either a POSIX file descriptor OR a Windows HANDLE pointer address, meaning that the fileDescriptor parameter of various Dispatch APIs is actually NOT a file descriptor on Windows but rather a HANDLE. This means that the handle should NOT be converted using _open_osfhandle, and the return value of this function should ONLY be passed to Dispatch functions where the fileDescriptor parameter is masquerading as a HANDLE in this manner. Use with extreme caution.
-        rawValue = .init(bitPattern: fileHandle._handle)
+            // This may look unsafe, but is how swift-corelibs-dispatch works. Basically, dispatch_fd_t directly represents either a POSIX file descriptor OR a Windows HANDLE pointer address, meaning that the fileDescriptor parameter of various Dispatch APIs is actually NOT a file descriptor on Windows but rather a HANDLE. This means that the handle should NOT be converted using _open_osfhandle, and the return value of this function should ONLY be passed to Dispatch functions where the fileDescriptor parameter is masquerading as a HANDLE in this manner. Use with extreme caution.
+            rawValue = .init(bitPattern: fileHandle._handle)
         #else
-        rawValue = fileHandle.fileDescriptor
+            rawValue = fileHandle.fileDescriptor
         #endif
     }
 }
@@ -183,15 +183,25 @@ public final class SWBDispatchIO: Sendable {
     }
 
     public func read(offset: off_t, length: Int, queue: SWBQueue, ioHandler: @escaping (Bool, SWBDispatchData?, Int32) -> Void) {
-        io.read(offset: offset, length: length, queue: queue.queue, ioHandler: { done, data, error in
-            ioHandler(done, data.map { SWBDispatchData($0) }, error)
-        })
+        io.read(
+            offset: offset,
+            length: length,
+            queue: queue.queue,
+            ioHandler: { done, data, error in
+                ioHandler(done, data.map { SWBDispatchData($0) }, error)
+            }
+        )
     }
 
     public func write(offset: off_t, data: SWBDispatchData, queue: SWBQueue, ioHandler: @escaping (Bool, SWBDispatchData?, Int32) -> Void) {
-        io.write(offset: offset, data: data.dispatchData, queue: queue.queue, ioHandler: { done, data, error in
-            ioHandler(done, data.map { SWBDispatchData($0) }, error)
-        })
+        io.write(
+            offset: offset,
+            data: data.dispatchData,
+            queue: queue.queue,
+            ioHandler: { done, data, error in
+                ioHandler(done, data.map { SWBDispatchData($0) }, error)
+            }
+        )
     }
 
     public func write(offset: off_t, data: SWBDispatchData, queue: SWBQueue) async throws {
@@ -342,7 +352,7 @@ fileprivate extension SWBQueue.DispatchWorkItemFlags {
 fileprivate func assertNoConcurrency<T>(_ block: () throws -> T) rethrows -> T {
     try withUnsafeCurrentTask { task in
         #if false
-        assert(task == nil, "Attempted to perform blocking operation on the Swift Concurrency thread pool")
+            assert(task == nil, "Attempted to perform blocking operation on the Swift Concurrency thread pool")
         #endif
         return try block()
     }
diff --git a/Sources/SWBUtil/ScopedKeepAliveCache.swift b/Sources/SWBUtil/ScopedKeepAliveCache.swift
index 06a5b344..f1236dfb 100644
--- a/Sources/SWBUtil/ScopedKeepAliveCache.swift
+++ b/Sources/SWBUtil/ScopedKeepAliveCache.swift
@@ -80,8 +80,7 @@ public final class ScopedKeepAliveCache<Key: Hashable & Sendable, Value: Sendabl
             return try store.getOrInsert(key) {
                 try baseCache.getOrInsert(key, body)
             }
-        }
-        else {
+        } else {
             return try baseCache.getOrInsert(key, body)
         }
     }
diff --git a/Sources/SWBUtil/Serialization.swift b/Sources/SWBUtil/Serialization.swift
index ad9ecfa5..3d2f1221 100644
--- a/Sources/SWBUtil/Serialization.swift
+++ b/Sources/SWBUtil/Serialization.swift
@@ -18,7 +18,6 @@ public import protocol Foundation.LocalizedError
 
 // MARK: Serializer and Deserializer protocols
 
-
 /// A `Serializer` is used to create a serialized `ByteString` representation of a collection of objects or other data, suitable for writing as a single file or otherwise transporting as a single piece of data.  Classes or structs to be serialized by adopt either the `Serializable` or `PolymorphicSerializable` protocols.  Many common built-in types already adopt `Serializable` through extensions.
 ///
 /// An element is serialized by invoking the serializer like so:
@@ -42,8 +41,7 @@ public import protocol Foundation.LocalizedError
 ///     serializer.endAggregate()
 ///
 /// A `Serializer` can be instantiated with a `SerializerDelegate` object to provide custom behavior or record information during serialization.
-public protocol Serializer
-{
+public protocol Serializer {
     init(delegate: (any SerializerDelegate)?)
 
     /// The `ByteString` containing the serialized data.
@@ -101,45 +99,38 @@ public protocol Serializer
     func endAggregate()
 }
 
-public extension Serializer
-{
+public extension Serializer {
     /// Convenience function for serializing a single value to bytes.
-    static func serialize<T: Serializable>(_ value: T, delegate: (any SerializerDelegate)? = nil) -> ByteString
-    {
+    static func serialize<T: Serializable>(_ value: T, delegate: (any SerializerDelegate)? = nil) -> ByteString {
         let serializer = Self.init(delegate: delegate)
         value.serialize(to: serializer)
         return serializer.byteString
     }
 
     /// Serialize an optional `Serializable` scalar element.
-    func serialize<T: Serializable>(_ optional: T?)
-    {
+    func serialize<T: Serializable>(_ optional: T?) {
         guard let element = optional else { self.serializeNil(); return }
         self.serialize(element)
     }
 
     /// Serialize an optional array of bytes.
-    func serialize(_ optional: [UInt8]?)
-    {
+    func serialize(_ optional: [UInt8]?) {
         guard let element = optional else { self.serializeNil(); return }
         self.serialize(element)
     }
 
     // Serialize a date.
-    func serialize(_ date: Date)
-    {
+    func serialize(_ date: Date) {
         self.serialize(date.timeIntervalSinceReferenceDate)
     }
 
     /// Serialize an optional `Array` whose elements are `Serializable`.
-    func serialize<T: Serializable>(_ optional: [T]?)
-    {
+    func serialize<T: Serializable>(_ optional: [T]?) {
         guard let array = optional else { self.serializeNil(); return }
         self.serialize(array)
     }
 
-    func serialize<T: Serializable>(_ array: [[T]])
-    {
+    func serialize<T: Serializable>(_ array: [[T]]) {
         self.serializeAggregate(2) {
             self.serialize(array.count as Int)
             self.serializeAggregate(array.count) {
@@ -151,44 +142,37 @@ public extension Serializer
     }
 
     /// Serialize an optional `Dictionary` whose keys and values are `Serializable`.
-    func serialize<Tk: Serializable & Comparable, Tv: Serializable>(_ optional: [Tk: Tv]?)
-    {
+    func serialize<Tk: Serializable & Comparable, Tv: Serializable>(_ optional: [Tk: Tv]?) {
         guard let dict = optional else { self.serializeNil(); return }
         self.serialize(dict)
     }
 
     /// Serialize a `PolymorphicSerializable` element.
-    func serialize<T: PolymorphicSerializable>(_ object: T)
-    {
+    func serialize<T: PolymorphicSerializable>(_ object: T) {
         let wrappedElement = PolymorphicSerializableWrapper<T>(object)
         self.serialize(wrappedElement)
     }
 
     /// Serialize an `Array` whose elements are `PolymorphicSerializable`.
-    func serialize<T: PolymorphicSerializable>(_ array: [T])
-    {
+    func serialize<T: PolymorphicSerializable>(_ array: [T]) {
         let wrappedElements = array.map { PolymorphicSerializableWrapper<T>($0) }
         self.serialize(wrappedElements)
     }
 
     /// Serialize a `Dictionary` whose keys are `Serializable` and whose values are `PolymorphicSerializable`.
-    func serialize<Tk: Serializable & Comparable, Tv: PolymorphicSerializable>(_ dict: [Tk: Tv])
-    {
+    func serialize<Tk: Serializable & Comparable, Tv: PolymorphicSerializable>(_ dict: [Tk: Tv]) {
         var wrappedDict = [Tk: PolymorphicSerializableWrapper<Tv>](minimumCapacity: dict.count)
-        for (key, value) in dict.sorted(byKey: <)
-        {
+        for (key, value) in dict.sorted(byKey: <) {
             wrappedDict[key] = PolymorphicSerializableWrapper<Tv>(value)
         }
         self.serialize(wrappedDict)
     }
 
     /// Serialize a `Dictionary` whose keys are `PolymorphicSerializable` and whose values are `Serializable`.
-    func serialize<Tk: PolymorphicSerializable & Comparable, Tv: Serializable>(_ dict: [Tk: Tv])
-    {
+    func serialize<Tk: PolymorphicSerializable & Comparable, Tv: Serializable>(_ dict: [Tk: Tv]) {
         // In order to do this, we serialize the dictionary as a sequence of key-value pairs, so that we don't need to make PolymorphicSerializableWrapper<Tk> conform to Hashable and Equatable.
         self.beginAggregate(dict.count)
-        for (key, value) in dict.sorted(byKey: <)
-        {
+        for (key, value) in dict.sorted(byKey: <) {
             // Each pair is encoded as a 2-element sequence.
             self.beginAggregate(2)
             self.serialize(key)
@@ -199,12 +183,10 @@ public extension Serializer
     }
 
     /// Serialize a `Dictionary` whose keys and values are `PolymorphicSerializable`.
-    func serialize<Tk: PolymorphicSerializable & Comparable, Tv: PolymorphicSerializable>(_ dict: [Tk: Tv])
-    {
+    func serialize<Tk: PolymorphicSerializable & Comparable, Tv: PolymorphicSerializable>(_ dict: [Tk: Tv]) {
         // In order to do this, we serialize the dictionary as a sequence of key-value pairs, so that we don't need to make PolymorphicSerializableWrapper<Tk> conform to Hashable and Equatable.
         self.beginAggregate(dict.count)
-        for (key, value) in dict.sorted(byKey: <)
-        {
+        for (key, value) in dict.sorted(byKey: <) {
             // Each pair is encoded as a 2-element sequence.
             self.beginAggregate(2)
             self.serialize(key)
@@ -215,37 +197,31 @@ public extension Serializer
     }
 
     /// Serialize an optional `PolymorphicSerializable` element.
-    func serialize<T: PolymorphicSerializable>(_ optional: T?)
-    {
+    func serialize<T: PolymorphicSerializable>(_ optional: T?) {
         guard let element = optional else { self.serializeNil(); return }
         self.serialize(element)
     }
 
     /// Serialize an optional `Array` whose elements are `PolymorphicSerializable`.
-    func serialize<T: PolymorphicSerializable>(_ optional: [T]?)
-    {
+    func serialize<T: PolymorphicSerializable>(_ optional: [T]?) {
         guard let array = optional else { self.serializeNil(); return }
         self.serialize(array)
     }
 
     /// Serialize an optional `Dictionary` whose keys are `Serializable` and whose values are `PolymorphicSerializable`.
-    func serialize<Tk: Serializable & Comparable, Tv: PolymorphicSerializable>(_ optional: [Tk: Tv]?)
-    {
+    func serialize<Tk: Serializable & Comparable, Tv: PolymorphicSerializable>(_ optional: [Tk: Tv]?) {
         guard let dict = optional else { self.serializeNil(); return }
         self.serialize(dict)
     }
 
-
     /// Serialize an optional `Dictionary` whose keys are `PolymorphicSerializable` and whose values are `Serializable`.
-    func serialize<Tk: PolymorphicSerializable & Comparable, Tv: Serializable>(_ optional: [Tk: Tv]?)
-    {
+    func serialize<Tk: PolymorphicSerializable & Comparable, Tv: Serializable>(_ optional: [Tk: Tv]?) {
         guard let dict = optional else { self.serializeNil(); return }
         self.serialize(dict)
     }
 
     /// Serialize an optional `Dictionary` whose keys and values are `PolymorphicSerializable`.
-    func serialize<Tk: PolymorphicSerializable & Comparable, Tv: PolymorphicSerializable>(_ optional: [Tk: Tv]?)
-    {
+    func serialize<Tk: PolymorphicSerializable & Comparable, Tv: PolymorphicSerializable>(_ optional: [Tk: Tv]?) {
         guard let dict = optional else { self.serializeNil(); return }
         self.serialize(dict)
     }
@@ -274,11 +250,9 @@ public extension Serializer
 ///     guard var delegate = serializer.delegate as? ConcreteSerializerDelegate else { fatalError("delegate must be a ConcreteSerializerDelegate") }
 ///
 /// `let` may be used instead of `var` if the object is not modifying the content of the delegate.
-public protocol SerializerDelegate: AnyObject
-{
+public protocol SerializerDelegate: AnyObject {
 }
 
-
 /// A `Deserializer` is used to unpack a serialized `ByteString` representation of a collection of objects or other data which was serialized with a corresponding `Serializer`.
 ///
 /// An element is deserialized by invoking the deserializer in a context where the type to be deserializer can be inferred by the compiler, like so:
@@ -306,8 +280,7 @@ public protocol SerializerDelegate: AnyObject
 ///     try super.init(from: deserializer)
 ///
 /// A `Deserializer` can be instantiated with a `DeserializerDelegate` object to provide custom behavior or record information during deserialization.
-public protocol Deserializer
-{
+public protocol Deserializer {
     init(_ bytes: ArraySlice<UInt8>, delegate: (any DeserializerDelegate)?)
 
     var delegate: (any DeserializerDelegate)? { get }
@@ -371,47 +344,38 @@ public protocol Deserializer
     func beginAggregate() throws -> Int
 }
 
-
-public extension Deserializer
-{
+public extension Deserializer {
     /// Convenience function for serializing a single value from bytes.
-    static func deserialize<T: Serializable>(_ bytes: ByteString, delegate: (any DeserializerDelegate)? = nil) throws -> T
-    {
+    static func deserialize<T: Serializable>(_ bytes: ByteString, delegate: (any DeserializerDelegate)? = nil) throws -> T {
         let deserializer = Self.init(bytes, delegate: delegate)
         return try deserializer.deserialize()
     }
 
-    init(_ byteString: ByteString, delegate: (any DeserializerDelegate)? = nil)
-    {
+    init(_ byteString: ByteString, delegate: (any DeserializerDelegate)? = nil) {
         self.init(ArraySlice(byteString.bytes), delegate: delegate)
     }
 
     /// Deserialize an optional `Serializable` scalar element.
-    func deserialize<T: Serializable>() throws -> T?
-    {
+    func deserialize<T: Serializable>() throws -> T? {
         return self.deserializeNil() ? nil : (try self.deserialize() as T)
     }
 
     /// Deserialize an optional array of bytes.
-    func deserialize() throws -> [UInt8]?
-    {
+    func deserialize() throws -> [UInt8]? {
         return self.deserializeNil() ? nil : (try self.deserialize() as [UInt8])
     }
 
     /// Deserialize a date.
-    func deserialize() throws -> Date
-    {
+    func deserialize() throws -> Date {
         return try Date(timeIntervalSinceReferenceDate: self.deserialize())
     }
 
     /// Deserialize an optional `Array`.  Throws if the next item to be deserialized is not nil or an `Array`, or if the array could not be read.
-    func deserialize<T: Serializable>() throws -> [T]?
-    {
+    func deserialize<T: Serializable>() throws -> [T]? {
         return self.deserializeNil() ? nil : (try self.deserialize() as [T])
     }
 
-    func deserialize<T: Serializable>() throws -> [[T]]
-    {
+    func deserialize<T: Serializable>() throws -> [[T]] {
         try beginAggregate(2)
         let count = try deserialize() as Int
         guard count >= 0 else { throw DeserializerError.unexpectedValue("Expected array count >= 0") }
@@ -420,7 +384,7 @@ public extension Deserializer
         var result = [[T]]()
         result.reserveCapacity(count)
 
-        for _ in 0 ..< count {
+        for _ in 0..<count {
             result.append(try deserialize())
         }
 
@@ -428,46 +392,39 @@ public extension Deserializer
     }
 
     /// Deserialize an optional `Dictionary` whose keys and values are `Serializable`.  Throws if the next item to be deserialized is not nil or a `Dictionary`, or if the dictionary could not be read.
-    func deserialize<Tk: Serializable, Tv: Serializable>() throws -> [Tk: Tv]?
-    {
+    func deserialize<Tk: Serializable, Tv: Serializable>() throws -> [Tk: Tv]? {
         return self.deserializeNil() ? nil : (try self.deserialize() as [Tk: Tv])
     }
 
     /// Deserialize a `PolymorphicSerializable` element.
-    func deserialize<T: PolymorphicSerializable>() throws -> T
-    {
+    func deserialize<T: PolymorphicSerializable>() throws -> T {
         let wrappedElement: PolymorphicSerializableWrapper<T> = try self.deserialize()
         return wrappedElement.value
     }
 
     /// Deserialize an `Array` whose elements are `PolymorphicSerializable`.
-    func deserialize<T: PolymorphicSerializable>() throws -> [T]
-    {
+    func deserialize<T: PolymorphicSerializable>() throws -> [T] {
         let wrappedElements: [PolymorphicSerializableWrapper<T>] = try self.deserialize()
         return wrappedElements.map { $0.value }
     }
 
     /// Deserialize a `Dictionary` whose keys are `Serializable` and whose values are `PolymorphicSerializable`.
-    func deserialize<Tk: Serializable, Tv: PolymorphicSerializable>() throws -> [Tk: Tv]
-    {
+    func deserialize<Tk: Serializable, Tv: PolymorphicSerializable>() throws -> [Tk: Tv] {
         let wrappedDict: [Tk: PolymorphicSerializableWrapper<Tv>] = try self.deserialize()
         var dict = [Tk: Tv](minimumCapacity: wrappedDict.count)
-        for (key, wrappedValue) in wrappedDict
-        {
+        for (key, wrappedValue) in wrappedDict {
             dict[key] = wrappedValue.value
         }
         return dict
     }
 
     /// Deserialize a `Dictionary` whose keys are `PolymorphicSerializable` and whose values are `Serializable`.
-    func deserialize<Tk: PolymorphicSerializable, Tv: Serializable>() throws -> [Tk: Tv]
-    {
+    func deserialize<Tk: PolymorphicSerializable, Tv: Serializable>() throws -> [Tk: Tv] {
         // The dictionary is serialized as a sequence of key-value pairs.
         let count = try self.beginAggregate()
         guard count > 0 else { return [:] }
         var dict = [Tk: Tv](minimumCapacity: count)
-        for _ in 1...count
-        {
+        for _ in 1...count {
             // Each pair is encoded as a 2-element sequence.
             try self.beginAggregate(2)
             let key: PolymorphicSerializableWrapper<Tk> = try self.deserialize()
@@ -478,14 +435,12 @@ public extension Deserializer
     }
 
     /// Deserialize a `Dictionary` whose keys and values are `PolymorphicSerializable`.
-    func deserialize<Tk: PolymorphicSerializable, Tv: PolymorphicSerializable>() throws -> [Tk: Tv]
-    {
+    func deserialize<Tk: PolymorphicSerializable, Tv: PolymorphicSerializable>() throws -> [Tk: Tv] {
         // The dictionary is serialized as a sequence of key-value pairs.
         let count = try self.beginAggregate()
         guard count > 0 else { return [:] }
         var dict = [Tk: Tv](minimumCapacity: count)
-        for _ in 1...count
-        {
+        for _ in 1...count {
             // Each pair is encoded as a 2-element sequence.
             try self.beginAggregate(2)
             let key: PolymorphicSerializableWrapper<Tk> = try self.deserialize()
@@ -496,32 +451,27 @@ public extension Deserializer
     }
 
     /// Deserialize an optional `PolymorphicSerializable` element.
-    func deserialize<T: PolymorphicSerializable>() throws -> T?
-    {
+    func deserialize<T: PolymorphicSerializable>() throws -> T? {
         return self.deserializeNil() ? nil : (try self.deserialize() as T)
     }
 
     /// Deserialize an optional `Array` whose elements are `PolymorphicSerializable`.
-    func deserialize<T: PolymorphicSerializable>() throws -> [T]?
-    {
+    func deserialize<T: PolymorphicSerializable>() throws -> [T]? {
         return self.deserializeNil() ? nil : (try self.deserialize() as [T])
     }
 
     /// Deserialize an optional `Dictionary` whose keys are `Serializable` and whose values are `PolymorphicSerializable`.
-    func deserialize<Tk: Serializable, Tv: PolymorphicSerializable>() throws -> [Tk: Tv]?
-    {
+    func deserialize<Tk: Serializable, Tv: PolymorphicSerializable>() throws -> [Tk: Tv]? {
         return self.deserializeNil() ? nil : (try self.deserialize() as [Tk: Tv])
     }
 
     /// Deserialize an optional `Dictionary` whose keys are `PolymorphicSerializable` and whose values are `Serializable`.
-    func deserialize<Tk: PolymorphicSerializable, Tv: Serializable>() throws -> [Tk: Tv]?
-    {
+    func deserialize<Tk: PolymorphicSerializable, Tv: Serializable>() throws -> [Tk: Tv]? {
         return self.deserializeNil() ? nil : (try self.deserialize() as [Tk: Tv])
     }
 
     /// Deserialize an optional `Dictionary` whose keys and values are `PolymorphicSerializable`.
-    func deserialize<Tk: PolymorphicSerializable, Tv: PolymorphicSerializable>() throws -> [Tk: Tv]?
-    {
+    func deserialize<Tk: PolymorphicSerializable, Tv: PolymorphicSerializable>() throws -> [Tk: Tv]? {
         return self.deserializeNil() ? nil : (try self.deserialize() as [Tk: Tv])
     }
 
@@ -540,7 +490,6 @@ public extension Deserializer
     }
 }
 
-
 /// Protocol for a delegate to be used by an instance of a `Deserializer`.
 ///
 /// Such a delegate typically has two purposes:
@@ -553,13 +502,10 @@ public extension Deserializer
 ///     guard var delegate = deserializer.delegate as? ConcreteDeserializerDelegate else { throw DeserializerError.invalidDelegate("delegate must be a ConcreteDeserializerDelegate") }
 ///
 /// `let` may be used instead of `var` if the object is not modifying the content of the delegate.
-public protocol DeserializerDelegate
-{
+public protocol DeserializerDelegate {
 }
 
-
-public enum DeserializerError: Swift.Error, LocalizedError, CustomStringConvertible
-{
+public enum DeserializerError: Swift.Error, LocalizedError, CustomStringConvertible {
     /// A class' `init(from:)` method can throw this error if it does not get the type of `DeserializerDelegate` it expects.
     case invalidDelegate(String)
     /// This error is thrown if the type of the next item to be deserialized is not of the expected type.
@@ -584,27 +530,23 @@ public enum DeserializerError: Swift.Error, LocalizedError, CustomStringConverti
 
     public var errorDescription: String? { description }
 
-    public var errorString: String
-    {
+    public var errorString: String {
         switch self
         {
-            case .invalidDelegate(let str): return str
-            case .incorrectType(let str): return str
-            case .unexpectedValue(let str): return str
-            case .deserializationFailed(let str): return str
+        case .invalidDelegate(let str): return str
+        case .incorrectType(let str): return str
+        case .unexpectedValue(let str): return str
+        case .deserializationFailed(let str): return str
         }
     }
 }
 
-
 // MARK: Serializable protocol
 
-
 /// Protocol for simple types which can be serialized.
 ///
 /// Class hierarchies should adopt `PolymorphicSerializable` instead.
-public protocol Serializable
-{
+public protocol Serializable {
     /// Serialize the receiver.
     func serialize<T: Serializer>(to serializer: T)
 
@@ -621,7 +563,7 @@ public protocol SerializableCodable: Serializable, Codable {
 }
 
 extension SerializableCodable {
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         try! serializer.serialize(Array(JSONEncoder(outputFormatting: [.sortedKeys, .withoutEscapingSlashes]).encode(self)))
     }
 
@@ -649,12 +591,12 @@ extension SerializableCodable {
 
 /// May be used to migrate a Serializable type to SerializableCodable without requiring an updated client immediately. Types conforming to this protocol will still use legacy serialization, but support legacy or codable deserialization. Once client versions in use all support deserializing the codable representation, these types can switch to `SerializableCodable`.
 public protocol PendingSerializableCodable: Serializable, Codable {
-    func legacySerialize<T>(to serializer: T) where T : Serializer
+    func legacySerialize<T>(to serializer: T) where T: Serializer
     init(fromLegacy deserializer: any Deserializer) throws
 }
 
 extension PendingSerializableCodable {
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         legacySerialize(to: serializer)
     }
 
@@ -678,14 +620,12 @@ extension PendingSerializableCodable {
 
 // MARK: PolymorphicSerializable protocol.
 
-
 /// Protocol for types which can be serialized as polymorphic elements, where the type of each element is read during deserialization so the correct class or struct can be instantiated.  The top-level class typically will implement `classForCode()` to return the class to be instantiated based on the code it is passed by the deserializer, while all classes will implement the other methods.  Each class should return a unique value for `serializableTypeCode`, although this is not enforced.
 ///
 /// Elements of these types will be wrapped in a `PolymorphicSerializableWrapper` struct to be serialized.  They should never be serialized directly (which is why this protocol does not adopt `Serializable`).
 ///
 /// `PolymorphicSerializable` does not support serializing multiple types of a given protocol, because deserialization cannot infer the type to instantiate if all it has to work with is the protocol.  A class hierarchy should be used instead.
-public protocol PolymorphicSerializable
-{
+public protocol PolymorphicSerializable {
     /// Serialize the receiver.
     func serialize<T: Serializer>(to serializer: T)
 
@@ -717,22 +657,18 @@ extension PolymorphicSerializable {
 
 public typealias SerializableTypeCode = UInt
 
-
 /// A wrapper for a user-defined type which can be serialized as aggregate elements.
-fileprivate struct PolymorphicSerializableWrapper<T: PolymorphicSerializable>: Serializable
-{
+fileprivate struct PolymorphicSerializableWrapper<T: PolymorphicSerializable>: Serializable {
     /// The element being wrapped.
     let value: T
 
     /// Wrap the element for serialization.
-    init(_ value: T)
-    {
+    init(_ value: T) {
         self.value = value
     }
 
     /// Serialize the wrapper - including the type code for the element - and the element.
-    func serialize<S: Serializer>(to serializer: S)
-    {
+    func serialize<S: Serializer>(to serializer: S) {
         serializer.beginAggregate(2)
         type(of: self.value).serializableTypeCode.serialize(to: serializer)
         self.value.serialize(to: serializer)
@@ -740,8 +676,7 @@ fileprivate struct PolymorphicSerializableWrapper<T: PolymorphicSerializable>: S
     }
 
     /// Create a new instance of the wrapper with an instance of the wrapped element inside it.
-    init(from deserializer: any Deserializer) throws
-    {
+    init(from deserializer: any Deserializer) throws {
         try deserializer.beginAggregate(2)
         let code: SerializableTypeCode = try deserializer.deserialize()
         guard let classType = T.classForCode(code) else { throw DeserializerError.incorrectType("Unexpected serializable type code for concrete '\(type(of: T.self))': \(code)") }
@@ -749,144 +684,112 @@ fileprivate struct PolymorphicSerializableWrapper<T: PolymorphicSerializable>: S
     }
 }
 
-
 // MARK: Serialization for built-in types
 
-
-extension Int: Serializable
-{
-    public init(from deserializer: any Deserializer) throws
-    {
+extension Int: Serializable {
+    public init(from deserializer: any Deserializer) throws {
         self = try deserializer.deserialize()
     }
 
-    public func serialize<T: Serializer>(to serializer: T)
-    {
+    public func serialize<T: Serializer>(to serializer: T) {
         serializer.serialize(self)
     }
 }
 
-extension UInt: Serializable
-{
-    public init(from deserializer: any Deserializer) throws
-    {
+extension UInt: Serializable {
+    public init(from deserializer: any Deserializer) throws {
         self = try deserializer.deserialize()
     }
 
-    public func serialize<T: Serializer>(to serializer: T)
-    {
+    public func serialize<T: Serializer>(to serializer: T) {
         serializer.serialize(self)
     }
 }
 
-extension Int32: Serializable
-{
-    public init(from deserializer: any Deserializer) throws
-    {
+extension Int32: Serializable {
+    public init(from deserializer: any Deserializer) throws {
         // We use `truncatingBitPattern` here because we encode 32-bit values as normal UInts. It is up to the client to never use this in a way which could lose bits.
         self = Int32(try deserializer.deserialize() as Int)
     }
 
-    public func serialize<T: Serializer>(to serializer: T)
-    {
+    public func serialize<T: Serializer>(to serializer: T) {
         serializer.serialize(Int(self))
     }
 }
 
-extension UInt32: Serializable
-{
-    public init(from deserializer: any Deserializer) throws
-    {
+extension UInt32: Serializable {
+    public init(from deserializer: any Deserializer) throws {
         // We use `truncatingBitPattern` here because we encode 32-bit values as normal UInts. It is up to the client to never use this in a way which could lose bits.
         self = UInt32(truncatingIfNeeded: try deserializer.deserialize() as UInt)
     }
 
-    public func serialize<T: Serializer>(to serializer: T)
-    {
+    public func serialize<T: Serializer>(to serializer: T) {
         serializer.serialize(UInt(self))
     }
 }
 
-extension Int64: Serializable
-{
-    public init(from deserializer: any Deserializer) throws
-    {
+extension Int64: Serializable {
+    public init(from deserializer: any Deserializer) throws {
         // We assume that this is a lossless conversion which should have no type checks.
         self = Int64(try deserializer.deserialize() as Int)
     }
 
-    public func serialize<T: Serializer>(to serializer: T)
-    {
+    public func serialize<T: Serializer>(to serializer: T) {
         // Despite the name here, we expect UInt to always be 64-bits and thus this does not truncate.
         assert(Int64(Int(truncatingIfNeeded: self)) == self)
         serializer.serialize(Int(truncatingIfNeeded: self))
     }
 }
 
-extension UInt64: Serializable
-{
-    public init(from deserializer: any Deserializer) throws
-    {
+extension UInt64: Serializable {
+    public init(from deserializer: any Deserializer) throws {
         // We assume that this is a lossless conversion which should have no type checks.
         self = UInt64(try deserializer.deserialize() as UInt)
     }
 
-    public func serialize<T: Serializer>(to serializer: T)
-    {
+    public func serialize<T: Serializer>(to serializer: T) {
         // Despite the name here, we expect UInt to always be 64-bits and thus this does not truncate.
         assert(UInt64(UInt(truncatingIfNeeded: self)) == self)
         serializer.serialize(UInt(truncatingIfNeeded: self))
     }
 }
 
-extension Bool: Serializable
-{
-    public init(from deserializer: any Deserializer) throws
-    {
+extension Bool: Serializable {
+    public init(from deserializer: any Deserializer) throws {
         self = try deserializer.deserialize()
     }
 
-    public func serialize<T: Serializer>(to serializer: T)
-    {
+    public func serialize<T: Serializer>(to serializer: T) {
         serializer.serialize(self)
     }
 }
 
-extension Float32: Serializable
-{
-    public init(from deserializer: any Deserializer) throws
-    {
+extension Float32: Serializable {
+    public init(from deserializer: any Deserializer) throws {
         self = try deserializer.deserialize()
     }
 
-    public func serialize<T: Serializer>(to serializer: T)
-    {
+    public func serialize<T: Serializer>(to serializer: T) {
         serializer.serialize(self)
     }
 }
 
-extension Float64: Serializable
-{
-    public init(from deserializer: any Deserializer) throws
-    {
+extension Float64: Serializable {
+    public init(from deserializer: any Deserializer) throws {
         self = try deserializer.deserialize()
     }
 
-    public func serialize<T: Serializer>(to serializer: T)
-    {
+    public func serialize<T: Serializer>(to serializer: T) {
         serializer.serialize(self)
     }
 }
 
-extension String: Serializable
-{
-    public init(from deserializer: any Deserializer) throws
-    {
+extension String: Serializable {
+    public init(from deserializer: any Deserializer) throws {
         self = try deserializer.deserialize()
     }
 
-    public func serialize<T: Serializer>(to serializer: T)
-    {
+    public func serialize<T: Serializer>(to serializer: T) {
         serializer.serialize(self)
     }
 }
@@ -917,7 +820,7 @@ extension Set: Serializable where Element: Serializable & Comparable {
 }
 
 extension OrderedSet: Serializable where Element: Serializable {
-    public func serialize<T>(to serializer: T) where T : Serializer {
+    public func serialize<T>(to serializer: T) where T: Serializer {
         serializer.serialize(elements)
     }
 
@@ -928,9 +831,7 @@ extension OrderedSet: Serializable where Element: Serializable {
 
 // MARK: Encoder and Decoder protocols
 
-
-protocol Encoder: AnyObject
-{
+protocol Encoder: AnyObject {
     /// The byte array containing the encoded data.
     var bytes: [UInt8] { get }
 
@@ -977,9 +878,7 @@ protocol Encoder: AnyObject
     func endArray()
 }
 
-
-protocol Decoder: AnyObject
-{
+protocol Decoder: AnyObject {
     /// Decode an `Int64` from the encoded bytes and consume that item.  Returns nil and does not consume the next item if it is not an `Int64`.
     func readInt64() -> Int64?
 
diff --git a/Sources/SWBUtil/Signatures.swift b/Sources/SWBUtil/Signatures.swift
index eb3c1e27..e15e5f73 100644
--- a/Sources/SWBUtil/Signatures.swift
+++ b/Sources/SWBUtil/Signatures.swift
@@ -12,7 +12,7 @@
 
 public import Foundation
 #if os(macOS)
-private import Security
+    private import Security
 #endif
 
 public struct CodeSignatureInfo: Codable, Sendable {
@@ -23,7 +23,7 @@ public struct CodeSignatureInfo: Codable, Sendable {
 
     enum CodingKeys: String, CodingKey {
         case isSigned = "signed"
-        case identifier = "bundleIndentifier" // NOTE: bundle identifier is mis-spelled
+        case identifier = "bundleIndentifier"  // NOTE: bundle identifier is mis-spelled
         case mainExecutable = "mainExecutable"
         case source = "source"
         case runtimeVersion = "runtimeVersion"
@@ -50,7 +50,7 @@ public struct CodeSignatureInfo: Codable, Sendable {
     // Custom attributes not returned by SecCodeInfo* APIs.
     public let signatureType: SignatureType?
     public let signatureIdentifier: String?
-    public let additionalInfo: [String:String]?
+    public let additionalInfo: [String: String]?
 
     public enum SignatureType: String, Codable, Sendable {
         case appleDeveloperProgram = "AppleDeveloperProgram"
@@ -58,154 +58,142 @@ public struct CodeSignatureInfo: Codable, Sendable {
     }
 
     #if os(macOS)
-    init(_ dict: NSDictionary?, additionalInfo: [String:String]?) {
-        self.additionalInfo = additionalInfo
-
-        guard let dict else {
-            self.isSigned = false
-            self.identifier = nil
-            self.mainExecutable = nil
-            self.source = nil
-            self.runtimeVersion = nil
-            self.cdHashes = nil
-            self.timestamp = nil
-            self.isSecureTimestamp = false
-            self.certificates = nil
-
-            self.signatureType = nil
-            self.signatureIdentifier = nil
-
-            return
-        }
+        init(_ dict: NSDictionary?, additionalInfo: [String: String]?) {
+            self.additionalInfo = additionalInfo
+
+            guard let dict else {
+                self.isSigned = false
+                self.identifier = nil
+                self.mainExecutable = nil
+                self.source = nil
+                self.runtimeVersion = nil
+                self.cdHashes = nil
+                self.timestamp = nil
+                self.isSecureTimestamp = false
+                self.certificates = nil
 
-        self.identifier = dict[kSecCodeInfoIdentifier] as? String
+                self.signatureType = nil
+                self.signatureIdentifier = nil
 
-        // According to `SecCode.h`, this is the recommended way to determine if an item is signed.
-        self.isSigned = identifier != nil
+                return
+            }
 
-        if let certificates = dict[kSecCodeInfoCertificates] as? NSArray {
-            self.certificates = certificates.compactMap { SecCertificateCopyData($0 as! SecCertificate) as Data }
-        }
-        else {
-            self.certificates = nil
-        }
+            self.identifier = dict[kSecCodeInfoIdentifier] as? String
 
-        // NOTE: Other types of signatures will be supported at a later date: rdar://105992196.
-        if let appleDeveloperTeamID = dict[kSecCodeInfoTeamIdentifier] as? String {
-            self.signatureType  = SignatureType.appleDeveloperProgram
-            self.signatureIdentifier = appleDeveloperTeamID
-        }
-        else if isSigned {
-            // NOTE: "signed" binaries with no code certificates are currently treated as un-signed as there is no
-            // real signature data to validate. This is a design choice instead of just relying on the identifier,
-            // which could be changed by anyone.
-            if let firstCert = self.certificates?.first {
-                self.signatureType = SignatureType.selfSigned
-                self.signatureIdentifier = firstCert.sha256HexString
+            // According to `SecCode.h`, this is the recommended way to determine if an item is signed.
+            self.isSigned = identifier != nil
+
+            if let certificates = dict[kSecCodeInfoCertificates] as? NSArray {
+                self.certificates = certificates.compactMap { SecCertificateCopyData($0 as! SecCertificate) as Data }
+            } else {
+                self.certificates = nil
             }
-            else {
+
+            // NOTE: Other types of signatures will be supported at a later date: rdar://105992196.
+            if let appleDeveloperTeamID = dict[kSecCodeInfoTeamIdentifier] as? String {
+                self.signatureType = SignatureType.appleDeveloperProgram
+                self.signatureIdentifier = appleDeveloperTeamID
+            } else if isSigned {
+                // NOTE: "signed" binaries with no code certificates are currently treated as un-signed as there is no
+                // real signature data to validate. This is a design choice instead of just relying on the identifier,
+                // which could be changed by anyone.
+                if let firstCert = self.certificates?.first {
+                    self.signatureType = SignatureType.selfSigned
+                    self.signatureIdentifier = firstCert.sha256HexString
+                } else {
+                    self.signatureType = nil
+                    self.signatureIdentifier = nil
+                }
+            } else {
                 self.signatureType = nil
                 self.signatureIdentifier = nil
             }
-        }
-        else {
-            self.signatureType = nil
-            self.signatureIdentifier = nil
-        }
 
-        self.mainExecutable = dict[kSecCodeInfoMainExecutable] as? String
-        self.source = dict[kSecCodeInfoSource] as? String
-        self.runtimeVersion = dict[kSecCodeInfoRuntimeVersion] as? String
-        if let hashes = dict[kSecCodeInfoCdHashes] as? NSArray {
-            self.cdHashes = hashes.compactMap { $0 as? Data }
-        }
-        else {
-            self.cdHashes = nil
-        }
+            self.mainExecutable = dict[kSecCodeInfoMainExecutable] as? String
+            self.source = dict[kSecCodeInfoSource] as? String
+            self.runtimeVersion = dict[kSecCodeInfoRuntimeVersion] as? String
+            if let hashes = dict[kSecCodeInfoCdHashes] as? NSArray {
+                self.cdHashes = hashes.compactMap { $0 as? Data }
+            } else {
+                self.cdHashes = nil
+            }
 
-        if let secureTimestamp = dict[kSecCodeInfoTimestamp] as? String {
-            self.timestamp = secureTimestamp
-            self.isSecureTimestamp = true
-        }
-        else if let timestamp = dict[kSecCodeInfoTime] as? String {
-            self.timestamp = timestamp
-            self.isSecureTimestamp = false
-        }
-        else {
-            self.timestamp = nil
-            self.isSecureTimestamp = false
+            if let secureTimestamp = dict[kSecCodeInfoTimestamp] as? String {
+                self.timestamp = secureTimestamp
+                self.isSecureTimestamp = true
+            } else if let timestamp = dict[kSecCodeInfoTime] as? String {
+                self.timestamp = timestamp
+                self.isSecureTimestamp = false
+            } else {
+                self.timestamp = nil
+                self.isSecureTimestamp = false
+            }
         }
-    }
     #endif
 
     static public func invokeCodesignVerification(for path: String, treatUnsignedAsError: Bool) async throws {
         #if os(macOS)
-        let executionResult = try await Process.getOutput(url: URL(filePath: "/usr/bin/codesign"), arguments: ["-vvvv", path])
-        let stdoutContent = String(data: executionResult.stdout, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        let stderrContent = String(data: executionResult.stderr, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-
-        // codesign puts the `-vvvv` additional content into stdout, whereas the initial message is in stderr.
-        let output = "\(stderrContent)\n\(stdoutContent)"
-
-        guard executionResult.exitStatus.isSuccess else {
-            if stderrContent.contains("code object is not signed at all") {
-                if treatUnsignedAsError {
-                    throw CodeSignatureInfo.Error.codesignVerificationFailed(description: "Code object is not signed", output: output)
+            let executionResult = try await Process.getOutput(url: URL(filePath: "/usr/bin/codesign"), arguments: ["-vvvv", path])
+            let stdoutContent = String(data: executionResult.stdout, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+            let stderrContent = String(data: executionResult.stderr, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+
+            // codesign puts the `-vvvv` additional content into stdout, whereas the initial message is in stderr.
+            let output = "\(stderrContent)\n\(stdoutContent)"
+
+            guard executionResult.exitStatus.isSuccess else {
+                if stderrContent.contains("code object is not signed at all") {
+                    if treatUnsignedAsError {
+                        throw CodeSignatureInfo.Error.codesignVerificationFailed(description: "Code object is not signed", output: output)
+                    } else {
+                        // this is fine
+                        return
+                    }
+                } else if stderrContent.contains("a sealed resource is missing or invalid") {
+                    throw CodeSignatureInfo.Error.codesignVerificationFailed(description: "A sealed resource is missing or invalid", output: output)
+                } else if stderrContent.contains("CSSMERR_TP_CERT_REVOKED") {
+                    throw CodeSignatureInfo.Error.codesignVerificationFailed(description: "The signing certificate has been revoked (CSSMERR_TP_CERT_REVOKED)", output: output)
+                } else {
+                    throw CodeSignatureInfo.Error.codesignVerificationFailed(description: "Codesign verification failed", output: output)
                 }
-                else {
-                    // this is fine
-                    return
-                }
-            }
-            else if stderrContent.contains("a sealed resource is missing or invalid") {
-                throw CodeSignatureInfo.Error.codesignVerificationFailed(description: "A sealed resource is missing or invalid", output: output)
-            }
-            else if stderrContent.contains("CSSMERR_TP_CERT_REVOKED") {
-                throw CodeSignatureInfo.Error.codesignVerificationFailed(description: "The signing certificate has been revoked (CSSMERR_TP_CERT_REVOKED)", output: output)
-            }
-            else {
-                throw CodeSignatureInfo.Error.codesignVerificationFailed(description: "Codesign verification failed", output: output)
             }
-        }
         #else
-        // FIXME:When implementing rdar://107627846, we need to think about out to have this codepath use the ClientExecutionDelegates
-        // in order to allow for different platform overrides on execution.
+            // FIXME:When implementing rdar://107627846, we need to think about out to have this codepath use the ClientExecutionDelegates
+            // in order to allow for different platform overrides on execution.
         #endif
     }
 
-    static public func load(from path: Path, additionalInfo: [String:String]?, skipValidation: Bool = false) async throws -> CodeSignatureInfo {
+    static public func load(from path: Path, additionalInfo: [String: String]?, skipValidation: Bool = false) async throws -> CodeSignatureInfo {
         return try await Self.load(from: path.str, additionalInfo: additionalInfo, skipValidation: skipValidation)
     }
 
-    static public func load(from path: String, additionalInfo: [String:String]?, skipValidation: Bool = false) async throws -> CodeSignatureInfo {
+    static public func load(from path: String, additionalInfo: [String: String]?, skipValidation: Bool = false) async throws -> CodeSignatureInfo {
         #if os(macOS)
-        let url = URL(fileURLWithPath: path).resolvingSymlinksInPath()
+            let url = URL(fileURLWithPath: path).resolvingSymlinksInPath()
 
-        var info: CFDictionary?
-        var code: SecStaticCode?
+            var info: CFDictionary?
+            var code: SecStaticCode?
 
-        let result = SecStaticCodeCreateWithPath(url as CFURL, SecCSFlags(rawValue: 0), &code)
-        if result != 0 {
-            throw MacError(result)
-        }
+            let result = SecStaticCodeCreateWithPath(url as CFURL, SecCSFlags(rawValue: 0), &code)
+            if result != 0 {
+                throw MacError(result)
+            }
 
-        let result2 = SecCodeCopySigningInformation(code!, [SecCSFlags(rawValue: kSecCSSigningInformation)], &info)
-        if result2 != 0 {
-            throw MacError(result2)
-        }
+            let result2 = SecCodeCopySigningInformation(code!, [SecCSFlags(rawValue: kSecCSSigningInformation)], &info)
+            if result2 != 0 {
+                throw MacError(result2)
+            }
 
-        if !skipValidation {
-            try await invokeCodesignVerification(for: path, treatUnsignedAsError: false)
-        }
+            if !skipValidation {
+                try await invokeCodesignVerification(for: path, treatUnsignedAsError: false)
+            }
 
-        return CodeSignatureInfo(info as NSDictionary?, additionalInfo: additionalInfo)
+            return CodeSignatureInfo(info as NSDictionary?, additionalInfo: additionalInfo)
         #else
-        throw Error.notSupported
+            throw Error.notSupported
         #endif
     }
 }
 
-
 public extension Data {
     var sha256HexString: String {
         let sha = SHA256Context()
diff --git a/Sources/SWBUtil/Static.swift b/Sources/SWBUtil/Static.swift
index 28aa6a66..fa20bbbe 100644
--- a/Sources/SWBUtil/Static.swift
+++ b/Sources/SWBUtil/Static.swift
@@ -30,7 +30,7 @@ public struct StaticStorageKey: Hashable, Sendable {
         hasher.combine(column)
     }
 
-    public static func ==(lhs: StaticStorageKey, rhs: StaticStorageKey) -> Bool {
+    public static func == (lhs: StaticStorageKey, rhs: StaticStorageKey) -> Bool {
         return lhs.file.utf8Start == rhs.file.utf8Start && lhs.line == rhs.line && lhs.column == rhs.column
     }
 }
diff --git a/Sources/SWBUtil/Statistics.swift b/Sources/SWBUtil/Statistics.swift
index 7d9fd51b..8a33bd6f 100644
--- a/Sources/SWBUtil/Statistics.swift
+++ b/Sources/SWBUtil/Statistics.swift
@@ -34,7 +34,7 @@ public final class StatisticsGroup: Sendable {
     ///
     /// This is useful when using statistics to probe program behavior from within tests, and the test can guarantee no concurrent access.
     public func zero() {
-        _statistics.withLock { $0.forEach{ $0.zero() } }
+        _statistics.withLock { $0.forEach { $0.zero() } }
     }
 }
 
@@ -83,7 +83,7 @@ public let allStatistics = StatisticsGroup("swift-build")
 
 // MARK: Utilities
 
-public func +=(statistic: Statistic, rhs: Int = 1) {
+public func += (statistic: Statistic, rhs: Int = 1) {
     statistic.increment(rhs)
 }
 
diff --git a/Sources/SWBUtil/String.swift b/Sources/SWBUtil/String.swift
index 24b53d54..b3fda5f2 100644
--- a/Sources/SWBUtil/String.swift
+++ b/Sources/SWBUtil/String.swift
@@ -17,7 +17,7 @@ public protocol EncodableInUTF8Sequence {
     static func fromArrayToDecodedString(_ data: Array<Self>) -> String?
     static func fromArraySliceToDecodedString(_ data: ArraySlice<Self>) -> String?
 }
-extension UInt8 : EncodableInUTF8Sequence {
+extension UInt8: EncodableInUTF8Sequence {
     public static func fromArrayToDecodedString(_ data: [UInt8]) -> String? {
         return String(bytes: data, encoding: .utf8)
     }
@@ -25,7 +25,7 @@ extension UInt8 : EncodableInUTF8Sequence {
         return String(bytes: data, encoding: .utf8)
     }
 }
-public extension Array where Element : EncodableInUTF8Sequence {
+public extension Array where Element: EncodableInUTF8Sequence {
     /// Convert an array of maybe-UTF8 bytes into a readable representation, if possible.
     ///
     /// This method is only intended for use as a debugging aid -- actual program logic that needs to work with byte sequences and also effect String conversion (for example in comparisons) should (and augment, if necessary) use the ByteString type and properly handle UTF8 decoding issues.
@@ -33,7 +33,7 @@ public extension Array where Element : EncodableInUTF8Sequence {
         return Element.fromArrayToDecodedString(self) ?? String(describing: self)
     }
 }
-public extension ArraySlice where Element : EncodableInUTF8Sequence {
+public extension ArraySlice where Element: EncodableInUTF8Sequence {
     /// Convert an array of maybe-UTF8 bytes into a readable representation, if possible.
     ///
     /// This method is only intended for use as a debugging aid -- actual program logic that needs to work with byte sequences and also effect String conversion (for example in comparisons) should (and augment, if necessary) use the ByteString type and properly handle UTF8 decoding issues.
@@ -43,16 +43,16 @@ public extension ArraySlice where Element : EncodableInUTF8Sequence {
 }
 
 public extension Character {
-    var isVowel: Bool { return ["a","e","i","o","u","A","E","I","O","U"].contains(self) }
+    var isVowel: Bool { return ["a", "e", "i", "o", "u", "A", "E", "I", "O", "U"].contains(self) }
 }
 
 public extension String {
     /// The platform newline character sequence: `\r\n` on Windows, `\n` on all other platforms.
     static var newline: String {
         #if os(Windows)
-        "\r\n"
+            "\r\n"
         #else
-        "\n"
+            "\n"
         #endif
     }
 
@@ -167,7 +167,6 @@ public extension Substring {
 
 // MARK: Transformations
 
-
 public extension String {
     /// Escapes the string for use in a Swift string literal.
     var asSwiftStringLiteralContent: String {
@@ -313,9 +312,9 @@ fileprivate extension Unicode.Scalar {
         func lowNibbleAsHex(_ v: UInt32) -> String {
             let nibble = v & 15
             if nibble < 10 {
-                return String(Unicode.Scalar(nibble+48)!)    // 48 = '0'
+                return String(Unicode.Scalar(nibble + 48)!)  // 48 = '0'
             } else {
-                return String(Unicode.Scalar(nibble-10+65)!) // 65 = 'A'
+                return String(Unicode.Scalar(nibble - 10 + 65)!)  // 65 = 'A'
             }
         }
 
@@ -326,7 +325,7 @@ fileprivate extension Unicode.Scalar {
         } else if self == "\"" {
             return "\\\""
         } else if self == "?" {
-            return "\\?" // used to avoid trigraphs
+            return "\\?"  // used to avoid trigraphs
         } else if _isPrintableASCII {
             return String(self)
         } else if self == "\0" {
@@ -383,7 +382,7 @@ fileprivate extension Unicode.Scalar {
 /// Extension of String for quoted string list representation.  This isn't exactly the same as shell script quoting.
 public extension String {
     /// Returns a form of the receiver that escapes whitespace and some special characters.  This isn't exactly the same as shell script quoting.
-    var quotedStringListRepresentation : String {
+    var quotedStringListRepresentation: String {
         // Create an output stream and append the quoted string list representation to it.
         let stream = OutputByteStream();
         writeQuotedStringListRepresentation(self, to: stream)
@@ -396,7 +395,7 @@ public extension String {
 /// Extension of [String] for quoted string list representation.  This isn't exactly the same as shell script quoting.
 public extension Sequence where Iterator.Element == String {
     /// Returns a form of the receiver that escapes whitespace and some special characters.  This isn't exactly the same as shell script quoting.
-    var quotedStringListRepresentation : String {
+    var quotedStringListRepresentation: String {
         // Create an output stream and append the quoted string list representations of each of the items to it.
         let stream = OutputByteStream();
         for (i, string) in self.enumerated() {
@@ -427,7 +426,6 @@ fileprivate func writeQuotedStringListRepresentation(_ string: String, to stream
     }
 }
 
-
 // MARK: QuotedCustomDescription
 
 /// Extension of String that makes quoted-string-describable.
@@ -459,177 +457,176 @@ extension String {
         let replacementUnichar: Unicode.Scalar = "_"
         var mangledUnichars: [Unicode.Scalar] = self.precomposedStringWithCanonicalMapping.unicodeScalars.map {
             switch $0.value {
-            case
-            // A-Z
+            case  // A-Z
             0x0041...0x005A,
-            // a-z
-            0x0061...0x007A,
-            // 0-9
-            0x0030...0x0039,
-            // _
-            0x005F,
-            // Latin (1)
-            0x00AA...0x00AA,
-            // Special characters (1)
-            0x00B5...0x00B5, 0x00B7...0x00B7,
-            // Latin (2)
-            0x00BA...0x00BA, 0x00C0...0x00D6, 0x00D8...0x00F6,
-            0x00F8...0x01F5, 0x01FA...0x0217, 0x0250...0x02A8,
-            // Special characters (2)
-            0x02B0...0x02B8, 0x02BB...0x02BB, 0x02BD...0x02C1,
-            0x02D0...0x02D1, 0x02E0...0x02E4, 0x037A...0x037A,
-            // Greek (1)
-            0x0386...0x0386, 0x0388...0x038A, 0x038C...0x038C,
-            0x038E...0x03A1, 0x03A3...0x03CE, 0x03D0...0x03D6,
-            0x03DA...0x03DA, 0x03DC...0x03DC, 0x03DE...0x03DE,
-            0x03E0...0x03E0, 0x03E2...0x03F3,
-            // Cyrillic
-            0x0401...0x040C, 0x040E...0x044F, 0x0451...0x045C,
-            0x045E...0x0481, 0x0490...0x04C4, 0x04C7...0x04C8,
-            0x04CB...0x04CC, 0x04D0...0x04EB, 0x04EE...0x04F5,
-            0x04F8...0x04F9,
-            // Armenian (1)
-            0x0531...0x0556,
-            // Special characters (3)
-            0x0559...0x0559,
-            // Armenian (2)
-            0x0561...0x0587,
-            // Hebrew
-            0x05B0...0x05B9, 0x05BB...0x05BD, 0x05BF...0x05BF,
-            0x05C1...0x05C2, 0x05D0...0x05EA, 0x05F0...0x05F2,
-            // Arabic (1)
-            0x0621...0x063A, 0x0640...0x0652,
-            // Digits (1)
-            0x0660...0x0669,
-            // Arabic (2)
-            0x0670...0x06B7, 0x06BA...0x06BE, 0x06C0...0x06CE,
-            0x06D0...0x06DC, 0x06E5...0x06E8, 0x06EA...0x06ED,
-            // Digits (2)
-            0x06F0...0x06F9,
-            // Devanagari and Special character 0x093D.
-            0x0901...0x0903, 0x0905...0x0939, 0x093D...0x094D,
-            0x0950...0x0952, 0x0958...0x0963,
-            // Digits (3)
-            0x0966...0x096F,
-            // Bengali (1)
-            0x0981...0x0983, 0x0985...0x098C, 0x098F...0x0990,
-            0x0993...0x09A8, 0x09AA...0x09B0, 0x09B2...0x09B2,
-            0x09B6...0x09B9, 0x09BE...0x09C4, 0x09C7...0x09C8,
-            0x09CB...0x09CD, 0x09DC...0x09DD, 0x09DF...0x09E3,
-            // Digits (4)
-            0x09E6...0x09EF,
-            // Bengali (2)
-            0x09F0...0x09F1,
-            // Gurmukhi (1)
-            0x0A02...0x0A02, 0x0A05...0x0A0A, 0x0A0F...0x0A10,
-            0x0A13...0x0A28, 0x0A2A...0x0A30, 0x0A32...0x0A33,
-            0x0A35...0x0A36, 0x0A38...0x0A39, 0x0A3E...0x0A42,
-            0x0A47...0x0A48, 0x0A4B...0x0A4D, 0x0A59...0x0A5C,
-            0x0A5E...0x0A5E,
-            // Digits (5)
-            0x0A66...0x0A6F,
-            // Gurmukhi (2)
-            0x0A74...0x0A74,
-            // Gujarti
-            0x0A81...0x0A83, 0x0A85...0x0A8B, 0x0A8D...0x0A8D,
-            0x0A8F...0x0A91, 0x0A93...0x0AA8, 0x0AAA...0x0AB0,
-            0x0AB2...0x0AB3, 0x0AB5...0x0AB9, 0x0ABD...0x0AC5,
-            0x0AC7...0x0AC9, 0x0ACB...0x0ACD, 0x0AD0...0x0AD0,
-            0x0AE0...0x0AE0,
-            // Digits (6)
-            0x0AE6...0x0AEF,
-            // Oriya and Special character 0x0B3D
-            0x0B01...0x0B03, 0x0B05...0x0B0C, 0x0B0F...0x0B10,
-            0x0B13...0x0B28, 0x0B2A...0x0B30, 0x0B32...0x0B33,
-            0x0B36...0x0B39, 0x0B3D...0x0B43, 0x0B47...0x0B48,
-            0x0B4B...0x0B4D, 0x0B5C...0x0B5D, 0x0B5F...0x0B61,
-            // Digits (7)
-            0x0B66...0x0B6F,
-            // Tamil
-            0x0B82...0x0B83, 0x0B85...0x0B8A, 0x0B8E...0x0B90,
-            0x0B92...0x0B95, 0x0B99...0x0B9A, 0x0B9C...0x0B9C,
-            0x0B9E...0x0B9F, 0x0BA3...0x0BA4, 0x0BA8...0x0BAA,
-            0x0BAE...0x0BB5, 0x0BB7...0x0BB9, 0x0BBE...0x0BC2,
-            0x0BC6...0x0BC8, 0x0BCA...0x0BCD,
-            // Digits (8)
-            0x0BE7...0x0BEF,
-            // Telugu
-            0x0C01...0x0C03, 0x0C05...0x0C0C, 0x0C0E...0x0C10,
-            0x0C12...0x0C28, 0x0C2A...0x0C33, 0x0C35...0x0C39,
-            0x0C3E...0x0C44, 0x0C46...0x0C48, 0x0C4A...0x0C4D,
-            0x0C60...0x0C61,
-            // Digits (9)
-            0x0C66...0x0C6F,
-            // Kannada
-            0x0C82...0x0C83, 0x0C85...0x0C8C, 0x0C8E...0x0C90,
-            0x0C92...0x0CA8, 0x0CAA...0x0CB3, 0x0CB5...0x0CB9,
-            0x0CBE...0x0CC4, 0x0CC6...0x0CC8, 0x0CCA...0x0CCD,
-            0x0CDE...0x0CDE, 0x0CE0...0x0CE1,
-            // Digits (10)
-            0x0CE6...0x0CEF,
-            // Malayam
-            0x0D02...0x0D03, 0x0D05...0x0D0C, 0x0D0E...0x0D10,
-            0x0D12...0x0D28, 0x0D2A...0x0D39, 0x0D3E...0x0D43,
-            0x0D46...0x0D48, 0x0D4A...0x0D4D, 0x0D60...0x0D61,
-            // Digits (11)
-            0x0D66...0x0D6F,
-            // Thai...including Digits 0x0E50...0x0E59 }
-            0x0E01...0x0E3A, 0x0E40...0x0E5B,
-            // Lao (1)
-            0x0E81...0x0E82, 0x0E84...0x0E84, 0x0E87...0x0E88,
-            0x0E8A...0x0E8A, 0x0E8D...0x0E8D, 0x0E94...0x0E97,
-            0x0E99...0x0E9F, 0x0EA1...0x0EA3, 0x0EA5...0x0EA5,
-            0x0EA7...0x0EA7, 0x0EAA...0x0EAB, 0x0EAD...0x0EAE,
-            0x0EB0...0x0EB9, 0x0EBB...0x0EBD, 0x0EC0...0x0EC4,
-            0x0EC6...0x0EC6, 0x0EC8...0x0ECD,
-            // Digits (12)
-            0x0ED0...0x0ED9,
-            // Lao (2)
-            0x0EDC...0x0EDD,
-            // Tibetan (1)
-            0x0F00...0x0F00, 0x0F18...0x0F19,
-            // Digits (13)
-            0x0F20...0x0F33,
-            // Tibetan (2)
-            0x0F35...0x0F35, 0x0F37...0x0F37, 0x0F39...0x0F39,
-            0x0F3E...0x0F47, 0x0F49...0x0F69, 0x0F71...0x0F84,
-            0x0F86...0x0F8B, 0x0F90...0x0F95, 0x0F97...0x0F97,
-            0x0F99...0x0FAD, 0x0FB1...0x0FB7, 0x0FB9...0x0FB9,
-            // Georgian
-            0x10A0...0x10C5, 0x10D0...0x10F6,
-            // Latin (3)
-            0x1E00...0x1E9B, 0x1EA0...0x1EF9,
-            // Greek (2)
-            0x1F00...0x1F15, 0x1F18...0x1F1D, 0x1F20...0x1F45,
-            0x1F48...0x1F4D, 0x1F50...0x1F57, 0x1F59...0x1F59,
-            0x1F5B...0x1F5B, 0x1F5D...0x1F5D, 0x1F5F...0x1F7D,
-            0x1F80...0x1FB4, 0x1FB6...0x1FBC,
-            // Special characters (4)
-            0x1FBE...0x1FBE,
-            // Greek (3)
-            0x1FC2...0x1FC4, 0x1FC6...0x1FCC, 0x1FD0...0x1FD3,
-            0x1FD6...0x1FDB, 0x1FE0...0x1FEC, 0x1FF2...0x1FF4,
-            0x1FF6...0x1FFC,
-            // Special characters (5)
-            0x203F...0x2040,
-            // Latin (4)
-            0x207F...0x207F,
-            // Special characters (6)
-            0x2102...0x2102, 0x2107...0x2107, 0x210A...0x2113,
-            0x2115...0x2115, 0x2118...0x211D, 0x2124...0x2124,
-            0x2126...0x2126, 0x2128...0x2128, 0x212A...0x2131,
-            0x2133...0x2138, 0x2160...0x2182, 0x3005...0x3007,
-            0x3021...0x3029,
-            // Hiragana
-            0x3041...0x3093, 0x309B...0x309C,
-            // Katakana
-            0x30A1...0x30F6, 0x30FB...0x30FC,
-            // Bopmofo [sic]
-            0x3105...0x312C,
-            // CJK Unified Ideographs
-            0x4E00...0x9FA5,
-            // Hangul,
-            0xAC00...0xD7A3:
+                // a-z
+                0x0061...0x007A,
+                // 0-9
+                0x0030...0x0039,
+                // _
+                0x005F,
+                // Latin (1)
+                0x00AA...0x00AA,
+                // Special characters (1)
+                0x00B5...0x00B5, 0x00B7...0x00B7,
+                // Latin (2)
+                0x00BA...0x00BA, 0x00C0...0x00D6, 0x00D8...0x00F6,
+                0x00F8...0x01F5, 0x01FA...0x0217, 0x0250...0x02A8,
+                // Special characters (2)
+                0x02B0...0x02B8, 0x02BB...0x02BB, 0x02BD...0x02C1,
+                0x02D0...0x02D1, 0x02E0...0x02E4, 0x037A...0x037A,
+                // Greek (1)
+                0x0386...0x0386, 0x0388...0x038A, 0x038C...0x038C,
+                0x038E...0x03A1, 0x03A3...0x03CE, 0x03D0...0x03D6,
+                0x03DA...0x03DA, 0x03DC...0x03DC, 0x03DE...0x03DE,
+                0x03E0...0x03E0, 0x03E2...0x03F3,
+                // Cyrillic
+                0x0401...0x040C, 0x040E...0x044F, 0x0451...0x045C,
+                0x045E...0x0481, 0x0490...0x04C4, 0x04C7...0x04C8,
+                0x04CB...0x04CC, 0x04D0...0x04EB, 0x04EE...0x04F5,
+                0x04F8...0x04F9,
+                // Armenian (1)
+                0x0531...0x0556,
+                // Special characters (3)
+                0x0559...0x0559,
+                // Armenian (2)
+                0x0561...0x0587,
+                // Hebrew
+                0x05B0...0x05B9, 0x05BB...0x05BD, 0x05BF...0x05BF,
+                0x05C1...0x05C2, 0x05D0...0x05EA, 0x05F0...0x05F2,
+                // Arabic (1)
+                0x0621...0x063A, 0x0640...0x0652,
+                // Digits (1)
+                0x0660...0x0669,
+                // Arabic (2)
+                0x0670...0x06B7, 0x06BA...0x06BE, 0x06C0...0x06CE,
+                0x06D0...0x06DC, 0x06E5...0x06E8, 0x06EA...0x06ED,
+                // Digits (2)
+                0x06F0...0x06F9,
+                // Devanagari and Special character 0x093D.
+                0x0901...0x0903, 0x0905...0x0939, 0x093D...0x094D,
+                0x0950...0x0952, 0x0958...0x0963,
+                // Digits (3)
+                0x0966...0x096F,
+                // Bengali (1)
+                0x0981...0x0983, 0x0985...0x098C, 0x098F...0x0990,
+                0x0993...0x09A8, 0x09AA...0x09B0, 0x09B2...0x09B2,
+                0x09B6...0x09B9, 0x09BE...0x09C4, 0x09C7...0x09C8,
+                0x09CB...0x09CD, 0x09DC...0x09DD, 0x09DF...0x09E3,
+                // Digits (4)
+                0x09E6...0x09EF,
+                // Bengali (2)
+                0x09F0...0x09F1,
+                // Gurmukhi (1)
+                0x0A02...0x0A02, 0x0A05...0x0A0A, 0x0A0F...0x0A10,
+                0x0A13...0x0A28, 0x0A2A...0x0A30, 0x0A32...0x0A33,
+                0x0A35...0x0A36, 0x0A38...0x0A39, 0x0A3E...0x0A42,
+                0x0A47...0x0A48, 0x0A4B...0x0A4D, 0x0A59...0x0A5C,
+                0x0A5E...0x0A5E,
+                // Digits (5)
+                0x0A66...0x0A6F,
+                // Gurmukhi (2)
+                0x0A74...0x0A74,
+                // Gujarti
+                0x0A81...0x0A83, 0x0A85...0x0A8B, 0x0A8D...0x0A8D,
+                0x0A8F...0x0A91, 0x0A93...0x0AA8, 0x0AAA...0x0AB0,
+                0x0AB2...0x0AB3, 0x0AB5...0x0AB9, 0x0ABD...0x0AC5,
+                0x0AC7...0x0AC9, 0x0ACB...0x0ACD, 0x0AD0...0x0AD0,
+                0x0AE0...0x0AE0,
+                // Digits (6)
+                0x0AE6...0x0AEF,
+                // Oriya and Special character 0x0B3D
+                0x0B01...0x0B03, 0x0B05...0x0B0C, 0x0B0F...0x0B10,
+                0x0B13...0x0B28, 0x0B2A...0x0B30, 0x0B32...0x0B33,
+                0x0B36...0x0B39, 0x0B3D...0x0B43, 0x0B47...0x0B48,
+                0x0B4B...0x0B4D, 0x0B5C...0x0B5D, 0x0B5F...0x0B61,
+                // Digits (7)
+                0x0B66...0x0B6F,
+                // Tamil
+                0x0B82...0x0B83, 0x0B85...0x0B8A, 0x0B8E...0x0B90,
+                0x0B92...0x0B95, 0x0B99...0x0B9A, 0x0B9C...0x0B9C,
+                0x0B9E...0x0B9F, 0x0BA3...0x0BA4, 0x0BA8...0x0BAA,
+                0x0BAE...0x0BB5, 0x0BB7...0x0BB9, 0x0BBE...0x0BC2,
+                0x0BC6...0x0BC8, 0x0BCA...0x0BCD,
+                // Digits (8)
+                0x0BE7...0x0BEF,
+                // Telugu
+                0x0C01...0x0C03, 0x0C05...0x0C0C, 0x0C0E...0x0C10,
+                0x0C12...0x0C28, 0x0C2A...0x0C33, 0x0C35...0x0C39,
+                0x0C3E...0x0C44, 0x0C46...0x0C48, 0x0C4A...0x0C4D,
+                0x0C60...0x0C61,
+                // Digits (9)
+                0x0C66...0x0C6F,
+                // Kannada
+                0x0C82...0x0C83, 0x0C85...0x0C8C, 0x0C8E...0x0C90,
+                0x0C92...0x0CA8, 0x0CAA...0x0CB3, 0x0CB5...0x0CB9,
+                0x0CBE...0x0CC4, 0x0CC6...0x0CC8, 0x0CCA...0x0CCD,
+                0x0CDE...0x0CDE, 0x0CE0...0x0CE1,
+                // Digits (10)
+                0x0CE6...0x0CEF,
+                // Malayam
+                0x0D02...0x0D03, 0x0D05...0x0D0C, 0x0D0E...0x0D10,
+                0x0D12...0x0D28, 0x0D2A...0x0D39, 0x0D3E...0x0D43,
+                0x0D46...0x0D48, 0x0D4A...0x0D4D, 0x0D60...0x0D61,
+                // Digits (11)
+                0x0D66...0x0D6F,
+                // Thai...including Digits 0x0E50...0x0E59 }
+                0x0E01...0x0E3A, 0x0E40...0x0E5B,
+                // Lao (1)
+                0x0E81...0x0E82, 0x0E84...0x0E84, 0x0E87...0x0E88,
+                0x0E8A...0x0E8A, 0x0E8D...0x0E8D, 0x0E94...0x0E97,
+                0x0E99...0x0E9F, 0x0EA1...0x0EA3, 0x0EA5...0x0EA5,
+                0x0EA7...0x0EA7, 0x0EAA...0x0EAB, 0x0EAD...0x0EAE,
+                0x0EB0...0x0EB9, 0x0EBB...0x0EBD, 0x0EC0...0x0EC4,
+                0x0EC6...0x0EC6, 0x0EC8...0x0ECD,
+                // Digits (12)
+                0x0ED0...0x0ED9,
+                // Lao (2)
+                0x0EDC...0x0EDD,
+                // Tibetan (1)
+                0x0F00...0x0F00, 0x0F18...0x0F19,
+                // Digits (13)
+                0x0F20...0x0F33,
+                // Tibetan (2)
+                0x0F35...0x0F35, 0x0F37...0x0F37, 0x0F39...0x0F39,
+                0x0F3E...0x0F47, 0x0F49...0x0F69, 0x0F71...0x0F84,
+                0x0F86...0x0F8B, 0x0F90...0x0F95, 0x0F97...0x0F97,
+                0x0F99...0x0FAD, 0x0FB1...0x0FB7, 0x0FB9...0x0FB9,
+                // Georgian
+                0x10A0...0x10C5, 0x10D0...0x10F6,
+                // Latin (3)
+                0x1E00...0x1E9B, 0x1EA0...0x1EF9,
+                // Greek (2)
+                0x1F00...0x1F15, 0x1F18...0x1F1D, 0x1F20...0x1F45,
+                0x1F48...0x1F4D, 0x1F50...0x1F57, 0x1F59...0x1F59,
+                0x1F5B...0x1F5B, 0x1F5D...0x1F5D, 0x1F5F...0x1F7D,
+                0x1F80...0x1FB4, 0x1FB6...0x1FBC,
+                // Special characters (4)
+                0x1FBE...0x1FBE,
+                // Greek (3)
+                0x1FC2...0x1FC4, 0x1FC6...0x1FCC, 0x1FD0...0x1FD3,
+                0x1FD6...0x1FDB, 0x1FE0...0x1FEC, 0x1FF2...0x1FF4,
+                0x1FF6...0x1FFC,
+                // Special characters (5)
+                0x203F...0x2040,
+                // Latin (4)
+                0x207F...0x207F,
+                // Special characters (6)
+                0x2102...0x2102, 0x2107...0x2107, 0x210A...0x2113,
+                0x2115...0x2115, 0x2118...0x211D, 0x2124...0x2124,
+                0x2126...0x2126, 0x2128...0x2128, 0x212A...0x2131,
+                0x2133...0x2138, 0x2160...0x2182, 0x3005...0x3007,
+                0x3021...0x3029,
+                // Hiragana
+                0x3041...0x3093, 0x309B...0x309C,
+                // Katakana
+                0x30A1...0x30F6, 0x30FB...0x30FC,
+                // Bopmofo [sic]
+                0x3105...0x312C,
+                // CJK Unified Ideographs
+                0x4E00...0x9FA5,
+                // Hangul,
+                0xAC00...0xD7A3:
                 return $0
             default:
                 return replacementUnichar
@@ -639,15 +636,14 @@ extension String {
         // Apply further restrictions to the prefix.
         loop: for (idx, c) in mangledUnichars.enumerated() {
             switch c.value {
-            case
-            // 0-9
+            case  // 0-9
             0x0030...0x0039,
-            // Annex D.
-            0x0660...0x0669, 0x06F0...0x06F9, 0x0966...0x096F,
-            0x09E6...0x09EF, 0x0A66...0x0A6F, 0x0AE6...0x0AEF,
-            0x0B66...0x0B6F, 0x0BE7...0x0BEF, 0x0C66...0x0C6F,
-            0x0CE6...0x0CEF, 0x0D66...0x0D6F, 0x0E50...0x0E59,
-            0x0ED0...0x0ED9, 0x0F20...0x0F33:
+                // Annex D.
+                0x0660...0x0669, 0x06F0...0x06F9, 0x0966...0x096F,
+                0x09E6...0x09EF, 0x0A66...0x0A6F, 0x0AE6...0x0AEF,
+                0x0B66...0x0B6F, 0x0BE7...0x0BEF, 0x0C66...0x0C6F,
+                0x0CE6...0x0CEF, 0x0D66...0x0D6F, 0x0E50...0x0E59,
+                0x0ED0...0x0ED9, 0x0F20...0x0F33:
                 mangledUnichars[idx] = replacementUnichar
                 break loop
             default:
@@ -659,7 +655,7 @@ extension String {
         // FIXME: We should only construct a new string if anything changed.
         // FIXME: There doesn't seem to be a way to create a string from an
         //        array of Unicode scalars; but there must be a better way.
-        return mangledUnichars.reduce(""){ $0 + String($1) }
+        return mangledUnichars.reduce("") { $0 + String($1) }
     }
 
     /// Mangles the contents to a valid C99 Extended Identifier.  This method
@@ -670,7 +666,7 @@ extension String {
 }
 
 /// Check equality directly between a UTF8 sequence and a string.
-public func ==<T: Collection>(lhs: T, rhs: String) -> Bool where T.Iterator.Element == UInt8 {
+public func == <T: Collection>(lhs: T, rhs: String) -> Bool where T.Iterator.Element == UInt8 {
     let n = lhs.count
     let rhs = rhs.utf8
     if n != rhs.count {
@@ -713,9 +709,9 @@ extension String {
     /// - parameter decodingBytes: The byte sequence to decode.
     /// - parameter as: The codec used to decode the byte sequence.
     /// - parameter byteSwap: Whether to byte-swap each code unit as it is read. This should be set to `true` when decoding a big-endian UTF-16 or UTF-32 byte stream (host OS endianness does not matter).
-    public init?<C, Encoding>(decodingBytes bytes: C, as sourceEncoding: Encoding.Type, byteSwap: Bool = false) where C : RandomAccessCollection, C.Index : SignedInteger, C.Element == UInt8, Encoding : UnicodeCodec {
+    public init?<C, Encoding>(decodingBytes bytes: C, as sourceEncoding: Encoding.Type, byteSwap: Bool = false) where C: RandomAccessCollection, C.Index: SignedInteger, C.Element == UInt8, Encoding: UnicodeCodec {
         guard var codeUnitIterator = BinaryDataIterator<C, Encoding.CodeUnit>(bytes, byteSwap: byteSwap) else {
-            return nil // bytes is not a multiple of the encoding's code unit bit width
+            return nil  // bytes is not a multiple of the encoding's code unit bit width
         }
         var scalars: [Unicode.Scalar] = []
         var decoder = Encoding()
@@ -732,7 +728,7 @@ extension String {
 }
 
 /// Helper type for Unicode string decoding that iterates over an 8-bit byte sequence and returns (possibly byte-swapped) integers specified by the generic parameter `T`, which may be of arbitrary byte width.
-fileprivate struct BinaryDataIterator<C, T: UnsignedInteger & FixedWidthInteger> : IteratorProtocol where C : RandomAccessCollection, C.Index : SignedInteger, C.Element == UInt8 {
+fileprivate struct BinaryDataIterator<C, T: UnsignedInteger & FixedWidthInteger>: IteratorProtocol where C: RandomAccessCollection, C.Index: SignedInteger, C.Element == UInt8 {
     typealias Element = T
 
     private let unitByteWidth = Element.bitWidth / 8
@@ -769,41 +765,41 @@ fileprivate struct BinaryDataIterator<C, T: UnsignedInteger & FixedWidthInteger>
 }
 
 #if canImport(Darwin)
-public import class CoreFoundation.CFString
-public import enum CoreFoundation.CFStringBuiltInEncodings
-public import func CoreFoundation.CFStringCreateWithCString
-public import func CoreFoundation.CFStringGetCharactersPtr
-public import func CoreFoundation.CFStringGetLength
-public import func CoreFoundation.CFRangeMake
-public import func CoreFoundation.CFStringGetCharacters
-public import var CoreFoundation.kCFAllocatorDefault
-
-extension String {
-    public init(_ cfString: CFString) {
-        #if canImport(Darwin)
-        self = cfString as String
-        #else
-        let count = CFStringGetLength(cfString)
-        if let ptr = CFStringGetCharactersPtr(cfString) {
-            self.init(utf16CodeUnits: CFStringGetCharactersPtr(cfString), count: count)
-        } else {
-            let buffer = UnsafeMutableBufferPointer<UInt16>.allocate(capacity: count)
-            defer { buffer.deallocate() }
-            CFStringGetCharacters(cfString, CFRangeMake(0, count), buffer.baseAddress)
-            self.init(utf16CodeUnits: buffer.baseAddress!, count: count)
+    public import class CoreFoundation.CFString
+    public import enum CoreFoundation.CFStringBuiltInEncodings
+    public import func CoreFoundation.CFStringCreateWithCString
+    public import func CoreFoundation.CFStringGetCharactersPtr
+    public import func CoreFoundation.CFStringGetLength
+    public import func CoreFoundation.CFRangeMake
+    public import func CoreFoundation.CFStringGetCharacters
+    public import var CoreFoundation.kCFAllocatorDefault
+
+    extension String {
+        public init(_ cfString: CFString) {
+            #if canImport(Darwin)
+                self = cfString as String
+            #else
+                let count = CFStringGetLength(cfString)
+                if let ptr = CFStringGetCharactersPtr(cfString) {
+                    self.init(utf16CodeUnits: CFStringGetCharactersPtr(cfString), count: count)
+                } else {
+                    let buffer = UnsafeMutableBufferPointer<UInt16>.allocate(capacity: count)
+                    defer { buffer.deallocate() }
+                    CFStringGetCharacters(cfString, CFRangeMake(0, count), buffer.baseAddress)
+                    self.init(utf16CodeUnits: buffer.baseAddress!, count: count)
+                }
+            #endif
         }
-        #endif
-    }
 
-    public var asCFString: CFString {
-        #if canImport(Darwin)
-        return self as CFString
-        #else
-        var this = self
-        return this.withUTF8 { $0.withMemoryRebound(to: CChar.self) { CFStringCreateWithCString(kCFAllocatorDefault, $0.baseAddress, CFStringBuiltInEncodings.UTF8.rawValue) } }
-        #endif
+        public var asCFString: CFString {
+            #if canImport(Darwin)
+                return self as CFString
+            #else
+                var this = self
+                return this.withUTF8 { $0.withMemoryRebound(to: CChar.self) { CFStringCreateWithCString(kCFAllocatorDefault, $0.baseAddress, CFStringBuiltInEncodings.UTF8.rawValue) } }
+            #endif
+        }
     }
-}
 #endif
 
 /// Convenience for creating fraction strings with "thin space" padding around the slash
diff --git a/Sources/SWBUtil/SwiftDriverTripleExtensions.swift b/Sources/SWBUtil/SwiftDriverTripleExtensions.swift
index ef7af6ca..dcff554c 100644
--- a/Sources/SWBUtil/SwiftDriverTripleExtensions.swift
+++ b/Sources/SWBUtil/SwiftDriverTripleExtensions.swift
@@ -19,10 +19,5 @@ package func normalizedTriplesCompareDisregardingOSVersions(_ firstTripleString:
     let secondTriple = Triple(secondTripleString, normalizing: true)
 
     // Ignore OS versions in the comparison
-    return firstTriple.arch == secondTriple.arch &&
-    firstTriple.subArch == secondTriple.subArch &&
-    firstTriple.vendor == secondTriple.vendor &&
-    firstTriple.os == secondTriple.os &&
-    firstTriple.environment == secondTriple.environment &&
-    firstTriple.objectFormat == secondTriple.objectFormat
+    return firstTriple.arch == secondTriple.arch && firstTriple.subArch == secondTriple.subArch && firstTriple.vendor == secondTriple.vendor && firstTriple.os == secondTriple.os && firstTriple.environment == secondTriple.environment && firstTriple.objectFormat == secondTriple.objectFormat
 }
diff --git a/Sources/SWBUtil/TAPIFileList.swift b/Sources/SWBUtil/TAPIFileList.swift
index d27c23c6..d189da5e 100644
--- a/Sources/SWBUtil/TAPIFileList.swift
+++ b/Sources/SWBUtil/TAPIFileList.swift
@@ -64,9 +64,12 @@ public struct TAPIFileList: Sendable {
     }
 
     public init(version: FormatVersion, headers: [(headerVisibility: HeaderVisibility, path: String)]) throws {
-        try self.init(version: version, headerInfos: headers.map {
-            HeaderInfo(visibility: $0.headerVisibility, path: Path($0.path), language: nil, isSwiftCompatibilityHeader: nil)
-        })
+        try self.init(
+            version: version,
+            headerInfos: headers.map {
+                HeaderInfo(visibility: $0.headerVisibility, path: Path($0.path), language: nil, isSwiftCompatibilityHeader: nil)
+            }
+        )
     }
 
     public init(version: FormatVersion, headerInfos: [HeaderInfo]) throws {
@@ -77,7 +80,7 @@ public struct TAPIFileList: Sendable {
         // Note that order is important for file lists, and must be preserved. We only sort
         // here in order to guarantee that any errors are displayed consistently given the same input.
         for (_, pair) in Dictionary(grouping: headerInfos, by: { $0.path.str }).sorted(byKey: <) {
-            assert(!pair.isEmpty) // impossible
+            assert(!pair.isEmpty)  // impossible
             let visibilities = Set(pair.map { $0.visibility })
             guard let headerVisibility = visibilities.only else {
                 throw TAPIFileListError.duplicateEntry(path: pair[0].path.str, visibilities: visibilities)
@@ -100,7 +103,7 @@ extension TAPIFileList: Encodable {
 
     public func encode(to encoder: any Swift.Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(String(version.rawValue), forKey: .version) // required to be a string, not integer
+        try container.encode(String(version.rawValue), forKey: .version)  // required to be a string, not integer
         try container.encode(headerInfos, forKey: .headers)
     }
 }
diff --git a/Sources/SWBUtil/UniqueSerialization.swift b/Sources/SWBUtil/UniqueSerialization.swift
index 6304f62d..0cb0004e 100644
--- a/Sources/SWBUtil/UniqueSerialization.swift
+++ b/Sources/SWBUtil/UniqueSerialization.swift
@@ -27,7 +27,7 @@ public final class UniquingSerializationCoordinator {
 }
 
 @available(*, unavailable)
-extension UniquingSerializationCoordinator: Sendable { }
+extension UniquingSerializationCoordinator: Sendable {}
 
 public final class UniquingDeserializationCoordinator {
     private var data: [Any] = []
@@ -35,7 +35,7 @@ public final class UniquingDeserializationCoordinator {
     public init() {
     }
 
-    public func addUnique<T>(_ x : T) {
+    public func addUnique<T>(_ x: T) {
         data.append(x)
     }
 
@@ -50,7 +50,7 @@ public final class UniquingDeserializationCoordinator {
 }
 
 @available(*, unavailable)
-extension UniquingDeserializationCoordinator: Sendable { }
+extension UniquingDeserializationCoordinator: Sendable {}
 
 public protocol UniquingSerializerDelegate: SerializerDelegate {
     var uniquingCoordinator: UniquingSerializationCoordinator { get }
@@ -74,8 +74,7 @@ fileprivate struct UniqueSerializableWrapper<T: Serializable & Hashable>: Serial
             if let index = coordinator.getOrInsert(value) {
                 serializer.serialize(1)
                 serializer.serialize(index)
-            }
-            else {
+            } else {
                 serializer.serialize(0)
                 value.serialize(to: serializer)
             }
@@ -111,8 +110,7 @@ public extension Serializer {
     func serializeUniquely<T: Serializable & Hashable>(_ xOpt: T?) {
         if let x = xOpt {
             serializeUniquely(x)
-        }
-        else {
+        } else {
             serializeNil()
         }
     }
@@ -126,8 +124,7 @@ public extension Deserializer {
     func deserializeUniquely<T: Serializable & Hashable>() throws -> T? {
         if deserializeNil() {
             return nil
-        }
-        else {
+        } else {
             return try .some(self.deserializeUniquely() as T)
         }
     }
diff --git a/Sources/SWBUtil/UserDefaults.swift b/Sources/SWBUtil/UserDefaults.swift
index e1a58763..41f427ea 100644
--- a/Sources/SWBUtil/UserDefaults.swift
+++ b/Sources/SWBUtil/UserDefaults.swift
@@ -49,7 +49,7 @@ public enum UserDefaults: Sendable {
 
     /// We load user defaults from the `org.swift.swift-build` domain.  By convention the lookup methods will override these with the process environment.  See the `internalDefaults` property for more details.
     nonisolated(unsafe) private static let defaults: Foundation.UserDefaults = {
-        let defaults =  Foundation.UserDefaults(suiteName: "org.swift.swift-build")!
+        let defaults = Foundation.UserDefaults(suiteName: "org.swift.swift-build")!
         // Preserved for backwards compatibility
         defaults.addSuite(named: "com.apple.dt.XCBuild")
         return defaults
@@ -325,11 +325,9 @@ public enum ActivityTextShorteningLevel: Int, Codable, Comparable, RawRepresenta
     public static let `default`: ActivityTextShorteningLevel = .full
 }
 
-
 // MARK: -
 // MARK: Exporting user defaults from Xcode to Swift Build.
 
-
 /// List of user defaults we want Xcode to export from its domain down to Swift Build.
 ///
 /// These defaults primarily fall into two sets:
@@ -357,7 +355,6 @@ public let xcodeUserDefaultsToExportToSwiftBuild = [
     "EnableFixFor23297285",
 ]
 
-
 /// Global function which exports the supplied user default key, if present in the standard UserDefaults, to the process environment if it has not already been set.
 public func exportUserDefaultToEnvironment(_ key: String) {
     if let _ = getEnvironmentVariable(EnvironmentKey(key)) {
diff --git a/Sources/SWBUtil/VFS.swift b/Sources/SWBUtil/VFS.swift
index 2fcafc10..980ced56 100644
--- a/Sources/SWBUtil/VFS.swift
+++ b/Sources/SWBUtil/VFS.swift
@@ -46,7 +46,7 @@ public final class VFS {
         // Gather the complete, ordered, flat list of non-empty directories.
         func gatherAllDirectories(_ path: Path, _ directory: Directory, _ result: inout [(path: Path, directory: Directory)]) {
             // Visit all children.
-            for (key: name, value: child) in directory.children.sorted(byKey: <) {
+            for (key:name, value:child) in directory.children.sorted(byKey: <) {
                 gatherAllDirectories(path.join(name), child, &result)
             }
 
@@ -58,16 +58,23 @@ public final class VFS {
         var allDirectories = [(path: Path, directory: Directory)]()
         gatherAllDirectories(.root, root, &allDirectories)
 
-        return VFSOverlay(version: 0, caseSensitive: false, roots: allDirectories.map { path, directory in
-            VFSOverlay.Root(name: path.str, contents: directory.externalContents.sorted(byKey: <).map { name, path in
-                VFSOverlay.Root.Contents(name: name, externalContents: path.str)
-            })
-        })
+        return VFSOverlay(
+            version: 0,
+            caseSensitive: false,
+            roots: allDirectories.map { path, directory in
+                VFSOverlay.Root(
+                    name: path.str,
+                    contents: directory.externalContents.sorted(byKey: <).map { name, path in
+                        VFSOverlay.Root.Contents(name: name, externalContents: path.str)
+                    }
+                )
+            }
+        )
     }
 }
 
 @available(*, unavailable)
-extension VFS: Sendable { }
+extension VFS: Sendable {}
 
 public struct VFSOverlay: PropertyListItemConvertible, Sendable {
     struct Root: PropertyListItemConvertible {
@@ -80,7 +87,7 @@ public struct VFSOverlay: PropertyListItemConvertible, Sendable {
                 return .plDict([
                     "type": type.propertyListItem,
                     "name": name.propertyListItem,
-                    "external-contents": externalContents.propertyListItem
+                    "external-contents": externalContents.propertyListItem,
                 ])
             }
         }
@@ -93,7 +100,7 @@ public struct VFSOverlay: PropertyListItemConvertible, Sendable {
             return .plDict([
                 "type": type.propertyListItem,
                 "name": name.propertyListItem,
-                "contents": contents.propertyListItem
+                "contents": contents.propertyListItem,
             ])
         }
     }
@@ -105,8 +112,8 @@ public struct VFSOverlay: PropertyListItemConvertible, Sendable {
     public var propertyListItem: PropertyListItem {
         return .plDict([
             "version": version.propertyListItem,
-            "case-sensitive": String(caseSensitive).propertyListItem, // serialized as string for some reason
-            "roots": roots.propertyListItem
+            "case-sensitive": String(caseSensitive).propertyListItem,  // serialized as string for some reason
+            "roots": roots.propertyListItem,
         ])
     }
 }
@@ -131,7 +138,7 @@ public struct DirectoryRemapVFSOverlay: PropertyListItemConvertible, Sendable {
             return .plDict([
                 "type": "directory-remap".propertyListItem,
                 "name": name.propertyListItem,
-                "external-contents": externalContents.propertyListItem
+                "external-contents": externalContents.propertyListItem,
             ])
         }
     }
@@ -151,9 +158,9 @@ public struct DirectoryRemapVFSOverlay: PropertyListItemConvertible, Sendable {
     public var propertyListItem: PropertyListItem {
         let values = [
             "version": version.propertyListItem,
-            "case-sensitive": String(caseSensitive).propertyListItem, // serialized as string for some reason
+            "case-sensitive": String(caseSensitive).propertyListItem,  // serialized as string for some reason
             "redirecting-with": redirectingWith.rawValue.propertyListItem,
-            "roots": remapping.propertyListItem
+            "roots": remapping.propertyListItem,
         ]
         return .plDict(values)
     }
diff --git a/Sources/SWBUtil/Version.swift b/Sources/SWBUtil/Version.swift
index 70bafbe0..16971d2f 100644
--- a/Sources/SWBUtil/Version.swift
+++ b/Sources/SWBUtil/Version.swift
@@ -64,8 +64,7 @@ public struct Version: CustomStringConvertible, Sendable {
         if let max = maximumNumberOfComponents {
             if components.count > max { throw StubError.error("There are too many components: '\(s)', maximumNumberOfComponents: \(max)") }
             self.init(Version.normalized(components, max))
-        }
-        else {
+        } else {
             self.init(components)
         }
     }
@@ -139,34 +138,33 @@ extension Version: Comparable {
 
         if lhs.rawValue.count == rhs.rawValue.count {
             return (lhs.rawValue, rhs.rawValue)
-        }
-        else {
+        } else {
             let n = max(lhs.rawValue.count, rhs.rawValue.count)
             return (Version.normalized(lhs.rawValue, n), normalized(rhs.rawValue, n))
         }
     }
 
-    public static func ==(lhs: Version, rhs: Version) -> Bool {
+    public static func == (lhs: Version, rhs: Version) -> Bool {
         let (l, r) = Version.comparableValue(lhs: lhs, rhs: rhs)
         return l == r
     }
 
-    public static func <(lhs: Version, rhs: Version) -> Bool {
+    public static func < (lhs: Version, rhs: Version) -> Bool {
         let (l, r) = Version.comparableValue(lhs: lhs, rhs: rhs)
         return l.lexicographicallyPrecedes(r)
     }
 
-    public static func <=(lhs: Version, rhs: Version) -> Bool {
+    public static func <= (lhs: Version, rhs: Version) -> Bool {
         let (l, r) = Version.comparableValue(lhs: lhs, rhs: rhs)
         return l.lexicographicallyPrecedes(r) || l == r
     }
 
-    public static func >(lhs: Version, rhs: Version) -> Bool {
+    public static func > (lhs: Version, rhs: Version) -> Bool {
         let (l, r) = Version.comparableValue(lhs: lhs, rhs: rhs)
         return r.lexicographicallyPrecedes(l)
     }
 
-    public static func >=(lhs: Version, rhs: Version) -> Bool {
+    public static func >= (lhs: Version, rhs: Version) -> Bool {
         let (l, r) = Version.comparableValue(lhs: lhs, rhs: rhs)
         return r.lexicographicallyPrecedes(l) || l == r
     }
@@ -360,52 +358,52 @@ public struct FuzzyVersion: Hashable, CustomStringConvertible, Sendable {
         return rawValue.enumerated().map { i, v in fuzzyComponents[i] ? "*" : String(v) }.joined(separator: ".")
     }
 
-    public static func ==(fuzzy: FuzzyVersion, normal: Version) -> Bool {
+    public static func == (fuzzy: FuzzyVersion, normal: Version) -> Bool {
         let (f, n) = comparableValue(fuzzy: fuzzy, normal: normal)
         return f == n
     }
 
-    public static func ==(normal: Version, fuzzy: FuzzyVersion) -> Bool {
+    public static func == (normal: Version, fuzzy: FuzzyVersion) -> Bool {
         let (f, n) = comparableValue(fuzzy: fuzzy, normal: normal)
         return n == f
     }
 
-    public static func <(fuzzy: FuzzyVersion, normal: Version) -> Bool {
+    public static func < (fuzzy: FuzzyVersion, normal: Version) -> Bool {
         let (f, n) = comparableValue(fuzzy: fuzzy, normal: normal)
         return f.lexicographicallyPrecedes(n)
     }
 
-    public static func <(normal: Version, fuzzy: FuzzyVersion) -> Bool {
+    public static func < (normal: Version, fuzzy: FuzzyVersion) -> Bool {
         let (f, n) = comparableValue(fuzzy: fuzzy, normal: normal)
         return n.lexicographicallyPrecedes(f)
     }
 
-    public static func <=(fuzzy: FuzzyVersion, normal: Version) -> Bool {
+    public static func <= (fuzzy: FuzzyVersion, normal: Version) -> Bool {
         let (f, n) = comparableValue(fuzzy: fuzzy, normal: normal)
         return f.lexicographicallyPrecedes(n) || f == n
     }
 
-    public static func <=(normal: Version, fuzzy: FuzzyVersion) -> Bool {
+    public static func <= (normal: Version, fuzzy: FuzzyVersion) -> Bool {
         let (f, n) = comparableValue(fuzzy: fuzzy, normal: normal)
         return n.lexicographicallyPrecedes(f) || n == f
     }
 
-    public static func >(fuzzy: FuzzyVersion, normal: Version) -> Bool {
+    public static func > (fuzzy: FuzzyVersion, normal: Version) -> Bool {
         let (f, n) = comparableValue(fuzzy: fuzzy, normal: normal)
         return n.lexicographicallyPrecedes(f)
     }
 
-    public static func >(normal: Version, fuzzy: FuzzyVersion) -> Bool {
+    public static func > (normal: Version, fuzzy: FuzzyVersion) -> Bool {
         let (f, n) = comparableValue(fuzzy: fuzzy, normal: normal)
         return f.lexicographicallyPrecedes(n)
     }
 
-    public static func >=(fuzzy: FuzzyVersion, normal: Version) -> Bool {
+    public static func >= (fuzzy: FuzzyVersion, normal: Version) -> Bool {
         let (f, n) = comparableValue(fuzzy: fuzzy, normal: normal)
         return n.lexicographicallyPrecedes(f) || f == n
     }
 
-    public static func >=(normal: Version, fuzzy: FuzzyVersion) -> Bool {
+    public static func >= (normal: Version, fuzzy: FuzzyVersion) -> Bool {
         let (f, n) = comparableValue(fuzzy: fuzzy, normal: normal)
         return f.lexicographicallyPrecedes(n) || n == f
     }
@@ -436,17 +434,17 @@ extension ProcessInfo {
     /// - note: This is still in terms of *product* version, for example "10.15", NOT a Darwin version like "19.0.0" as returned by `uname -r`.
     public var operatingSystemKernelVersion: Version {
         #if canImport(Darwin)
-        let kern_osproductversion = "kern.osproductversion"
-        var len: Int = 0
-        if sysctlbyname(kern_osproductversion, nil, &len, nil, 0) == 0 {
-            var p = [CChar](repeating: 0, count: len)
-            if sysctlbyname(kern_osproductversion, &p, &len, nil, 0) == 0 {
-                do {
-                    return try Version(String(cString: p))
-                } catch {
+            let kern_osproductversion = "kern.osproductversion"
+            var len: Int = 0
+            if sysctlbyname(kern_osproductversion, nil, &len, nil, 0) == 0 {
+                var p = [CChar](repeating: 0, count: len)
+                if sysctlbyname(kern_osproductversion, &p, &len, nil, 0) == 0 {
+                    do {
+                        return try Version(String(cString: p))
+                    } catch {
+                    }
                 }
             }
-        }
         #endif
         return Version()
     }
@@ -479,23 +477,23 @@ extension ProcessInfo {
 
     func systemVersion() throws -> SystemVersion {
         #if !canImport(Darwin)
-        return SystemVersion(
-            productName: ProcessInfo.processInfo.operatingSystemVersionString,
-            productBuildVersion: .init(major: 1, train: "A", build: 1)
-        )
+            return SystemVersion(
+                productName: ProcessInfo.processInfo.operatingSystemVersionString,
+                productBuildVersion: .init(major: 1, train: "A", build: 1)
+            )
         #else
-        let url = systemVersionPlistURL
-        let filePath = try url.filePath
-        guard FileManager.default.isReadableFile(atPath: filePath.str) else {
-            throw StubError.error("No system version plist at \(filePath.str)")
-        }
-        let version: SystemVersion
-        do {
-            version = try PropertyListDecoder().decode(SystemVersion.self, from: Data(contentsOf: url))
-        } catch {
-            throw StubError.error("Failed to decode contents of '\(filePath.str)': \(error.localizedDescription)")
-        }
-        return version
+            let url = systemVersionPlistURL
+            let filePath = try url.filePath
+            guard FileManager.default.isReadableFile(atPath: filePath.str) else {
+                throw StubError.error("No system version plist at \(filePath.str)")
+            }
+            let version: SystemVersion
+            do {
+                version = try PropertyListDecoder().decode(SystemVersion.self, from: Data(contentsOf: url))
+            } catch {
+                throw StubError.error("Failed to decode contents of '\(filePath.str)': \(error.localizedDescription)")
+            }
+            return version
         #endif
     }
 }
diff --git a/Sources/SWBUtil/Win32.swift b/Sources/SWBUtil/Win32.swift
index 3c19f65a..3e72e499 100644
--- a/Sources/SWBUtil/Win32.swift
+++ b/Sources/SWBUtil/Win32.swift
@@ -11,56 +11,60 @@
 //===----------------------------------------------------------------------===//
 
 #if os(Windows)
-public import WinSDK
+    public import WinSDK
 
-/// Calls a Win32 API function that fills a (potentially long path) null-terminated string buffer by continually attempting to allocate more memory up until the true max path is reached.
-/// This is especially useful for protecting against race conditions like with GetCurrentDirectoryW where the measured length may no longer be valid on subsequent calls.
-/// - parameter initialSize: Initial size of the buffer (including the null terminator) to allocate to hold the returned string.
-/// - parameter maxSize: Maximum size of the buffer (including the null terminator) to allocate to hold the returned string.
-/// - parameter body: Closure to call the Win32 API function to populate the provided buffer.
-///   Should return the number of UTF-16 code units (not including the null terminator) copied, 0 to indicate an error.
-///   If the buffer is not of sufficient size, should return a value greater than or equal to the size of the buffer.
-private func FillNullTerminatedWideStringBuffer(initialSize: DWORD, maxSize: DWORD, _ body: (UnsafeMutableBufferPointer<WCHAR>) throws -> DWORD) throws -> String {
-    var bufferCount = max(1, min(initialSize, maxSize))
-    while bufferCount <= maxSize {
-        if let result = try withUnsafeTemporaryAllocation(of: WCHAR.self, capacity: Int(bufferCount), { buffer in
-            let count = try body(buffer)
-            switch count {
-            case 0:
-                throw Win32Error(GetLastError())
-            case 1..<DWORD(buffer.count):
-                let result = String(decodingCString: buffer.baseAddress!, as: UTF16.self)
-                assert(result.utf16.count == count, "Parsed UTF-16 count \(result.utf16.count) != reported UTF-16 count \(count)")
+    /// Calls a Win32 API function that fills a (potentially long path) null-terminated string buffer by continually attempting to allocate more memory up until the true max path is reached.
+    /// This is especially useful for protecting against race conditions like with GetCurrentDirectoryW where the measured length may no longer be valid on subsequent calls.
+    /// - parameter initialSize: Initial size of the buffer (including the null terminator) to allocate to hold the returned string.
+    /// - parameter maxSize: Maximum size of the buffer (including the null terminator) to allocate to hold the returned string.
+    /// - parameter body: Closure to call the Win32 API function to populate the provided buffer.
+    ///   Should return the number of UTF-16 code units (not including the null terminator) copied, 0 to indicate an error.
+    ///   If the buffer is not of sufficient size, should return a value greater than or equal to the size of the buffer.
+    private func FillNullTerminatedWideStringBuffer(initialSize: DWORD, maxSize: DWORD, _ body: (UnsafeMutableBufferPointer<WCHAR>) throws -> DWORD) throws -> String {
+        var bufferCount = max(1, min(initialSize, maxSize))
+        while bufferCount <= maxSize {
+            if let result = try withUnsafeTemporaryAllocation(
+                of: WCHAR.self,
+                capacity: Int(bufferCount),
+                { buffer in
+                    let count = try body(buffer)
+                    switch count {
+                    case 0:
+                        throw Win32Error(GetLastError())
+                    case 1..<DWORD(buffer.count):
+                        let result = String(decodingCString: buffer.baseAddress!, as: UTF16.self)
+                        assert(result.utf16.count == count, "Parsed UTF-16 count \(result.utf16.count) != reported UTF-16 count \(count)")
+                        return result
+                    default:
+                        bufferCount *= 2
+                        return nil
+                    }
+                }
+            ) {
                 return result
-            default:
-                bufferCount *= 2
-                return nil
             }
-        }) {
-            return result
         }
+        throw Win32Error(DWORD(ERROR_INSUFFICIENT_BUFFER))
     }
-    throw Win32Error(DWORD(ERROR_INSUFFICIENT_BUFFER))
-}
 
-private let maxPathLength = DWORD(Int16.max) // https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation
-private let maxEnvVarLength = DWORD(Int16.max) // https://devblogs.microsoft.com/oldnewthing/20100203-00/
+    private let maxPathLength = DWORD(Int16.max)  // https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation
+    private let maxEnvVarLength = DWORD(Int16.max)  // https://devblogs.microsoft.com/oldnewthing/20100203-00/
 
-@_spi(Testing) public func SWB_GetModuleFileNameW(_ hModule: HMODULE?) throws -> String {
-    try FillNullTerminatedWideStringBuffer(initialSize: DWORD(MAX_PATH), maxSize: maxPathLength) {
-        GetModuleFileNameW(hModule, $0.baseAddress!, DWORD($0.count))
+    @_spi(Testing) public func SWB_GetModuleFileNameW(_ hModule: HMODULE?) throws -> String {
+        try FillNullTerminatedWideStringBuffer(initialSize: DWORD(MAX_PATH), maxSize: maxPathLength) {
+            GetModuleFileNameW(hModule, $0.baseAddress!, DWORD($0.count))
+        }
     }
-}
 
-public func SWB_GetEnvironmentVariableW(_ wName: LPCWSTR) throws -> String {
-    try FillNullTerminatedWideStringBuffer(initialSize: 1024, maxSize: maxEnvVarLength) {
-        GetEnvironmentVariableW(wName, $0.baseAddress!, DWORD($0.count))
+    public func SWB_GetEnvironmentVariableW(_ wName: LPCWSTR) throws -> String {
+        try FillNullTerminatedWideStringBuffer(initialSize: 1024, maxSize: maxEnvVarLength) {
+            GetEnvironmentVariableW(wName, $0.baseAddress!, DWORD($0.count))
+        }
     }
-}
 
-public func SWB_GetWindowsDirectoryW() throws -> String {
-    try FillNullTerminatedWideStringBuffer(initialSize: DWORD(MAX_PATH), maxSize: maxPathLength) {
-        GetWindowsDirectoryW($0.baseAddress!, DWORD($0.count))
+    public func SWB_GetWindowsDirectoryW() throws -> String {
+        try FillNullTerminatedWideStringBuffer(initialSize: DWORD(MAX_PATH), maxSize: maxPathLength) {
+            GetWindowsDirectoryW($0.baseAddress!, DWORD($0.count))
+        }
     }
-}
 #endif
diff --git a/Sources/SWBUtil/Win32Error.swift b/Sources/SWBUtil/Win32Error.swift
index 35de1fef..17de403a 100644
--- a/Sources/SWBUtil/Win32Error.swift
+++ b/Sources/SWBUtil/Win32Error.swift
@@ -11,29 +11,29 @@
 //===----------------------------------------------------------------------===//
 
 #if os(Windows)
-public import WinSDK
-import Foundation
+    public import WinSDK
+    import Foundation
 
-public struct Win32Error: Error, CustomStringConvertible {
-    public let error: DWORD
+    public struct Win32Error: Error, CustomStringConvertible {
+        public let error: DWORD
 
-    public init(_ error: DWORD) {
-        self.error = error
-    }
+        public init(_ error: DWORD) {
+            self.error = error
+        }
 
-    public var description: String {
-        let flags: DWORD = DWORD(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS)
-        var buffer: UnsafeMutablePointer<WCHAR>?
-        let length: DWORD = withUnsafeMutablePointer(to: &buffer) {
-            $0.withMemoryRebound(to: WCHAR.self, capacity: 2) {
-                FormatMessageW(flags, nil, error, 0, $0, 0, nil)
+        public var description: String {
+            let flags: DWORD = DWORD(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS)
+            var buffer: UnsafeMutablePointer<WCHAR>?
+            let length: DWORD = withUnsafeMutablePointer(to: &buffer) {
+                $0.withMemoryRebound(to: WCHAR.self, capacity: 2) {
+                    FormatMessageW(flags, nil, error, 0, $0, 0, nil)
+                }
             }
+            guard let buffer, length > 0 else {
+                return "Win32 Error Code \(error)"
+            }
+            defer { LocalFree(buffer) }
+            return String(decodingCString: buffer, as: UTF16.self).trimmingCharacters(in: .whitespacesAndNewlines)
         }
-        guard let buffer, length > 0 else {
-            return "Win32 Error Code \(error)"
-        }
-        defer { LocalFree(buffer) }
-        return String(decodingCString: buffer, as: UTF16.self).trimmingCharacters(in: .whitespacesAndNewlines)
     }
-}
 #endif
diff --git a/Sources/SWBUtil/XCBuildDataArchive.swift b/Sources/SWBUtil/XCBuildDataArchive.swift
index 1a450533..57da8233 100644
--- a/Sources/SWBUtil/XCBuildDataArchive.swift
+++ b/Sources/SWBUtil/XCBuildDataArchive.swift
@@ -11,81 +11,83 @@
 //===----------------------------------------------------------------------===//
 
 #if canImport(AppleArchive) && canImport(System)
-import AppleArchive
-import System
-public import struct Foundation.UUID
+    import AppleArchive
+    import System
+    public import struct Foundation.UUID
 
-/// A simple interface over a create-or-update compressed Apple Archive (.aar) file protected by an exclusive file lock, for archiving an XCBuildData directory.
-///
-/// This class is thread-safe and access to the underlying archive file is atomic across multiple processes.
-public final class XCBuildDataArchive: Sendable {
-    /// The path to the .yaa archive file which will be written to.
-    public let archiveFilePath: Path
+    /// A simple interface over a create-or-update compressed Apple Archive (.aar) file protected by an exclusive file lock, for archiving an XCBuildData directory.
+    ///
+    /// This class is thread-safe and access to the underlying archive file is atomic across multiple processes.
+    public final class XCBuildDataArchive: Sendable {
+        /// The path to the .yaa archive file which will be written to.
+        public let archiveFilePath: Path
 
-    public init(filePath: Path) {
-        self.archiveFilePath = filePath
-    }
-
-    /// Adds the contents of the specified build data directory into the archive. The directory argument is expected to be the path to an XCBuildData directory (which contains the manifest, build description, build database, and other auxiliary files).
-    public func appendBuildDataDirectory(from buildDataDirectory: Path, uuid: UUID) throws {
-        if buildDataDirectory.basename != "XCBuildData" {
-            throw StubError.error("\(buildDataDirectory.str) is not an XCBuildData directory")
+        public init(filePath: Path) {
+            self.archiveFilePath = filePath
         }
-        return try withTemporaryDirectory { tmpDir in
-            let tempDirectory = tmpDir.join(uuid.description)
-            try localFS.copy(buildDataDirectory, to: tempDirectory)
-            try appendDirectoryContents(from: tempDirectory)
-        }
-    }
 
-    private func appendDirectoryContents(from sourcePath: Path) throws {
-        // Append to the archive if it already exists -- this is necessary in order to support cases
-        // where xcodebuild invokes another instance of itself in a shell script. We use exclusive
-        // locks to guarantee integrity of the archive, but in practice the locking should only ever
-        // come into play when there are 3 or more xcodebuild processes (the top level process plus
-        // 2 or more potentially concurrent xcodebuilds running in shell scripts as part of the top
-        // level build). Very few projects do this, so there shouldn't be a general efficiency concern
-        // regarding the blocking locks.
-        let exists: Bool
-        let fd: FileDescriptor
-        do {
-            fd = try FileDescriptor.open(FilePath(archiveFilePath.str), .writeOnly, options: [.create, .exclusiveCreate, .exclusiveLock], permissions: FilePermissions([.ownerReadWrite, .groupRead, .otherRead]))
-            exists = false
-        } catch Errno.fileExists {
-            fd = try FileDescriptor.open(FilePath(archiveFilePath.str), .readWrite, options: [.exclusiveLock])
-            exists = true
+        /// Adds the contents of the specified build data directory into the archive. The directory argument is expected to be the path to an XCBuildData directory (which contains the manifest, build description, build database, and other auxiliary files).
+        public func appendBuildDataDirectory(from buildDataDirectory: Path, uuid: UUID) throws {
+            if buildDataDirectory.basename != "XCBuildData" {
+                throw StubError.error("\(buildDataDirectory.str) is not an XCBuildData directory")
+            }
+            return try withTemporaryDirectory { tmpDir in
+                let tempDirectory = tmpDir.join(uuid.description)
+                try localFS.copy(buildDataDirectory, to: tempDirectory)
+                try appendDirectoryContents(from: tempDirectory)
+            }
         }
 
-        try fd.closeAfter {
-            try ArchiveByteStream.withFileStream(fd: fd, automaticClose: false) { writeFileStream in
-                guard let compressStream = exists
-                        ? ArchiveByteStream.compressionStream(appendingTo: writeFileStream)
-                        : ArchiveByteStream.compressionStream(using: .lzfse, writingTo: writeFileStream) else {
-                    throw StubError.error("Unable to create compression stream for \(exists ? "existing" : "new") file: \(archiveFilePath.str)")
-                }
+        private func appendDirectoryContents(from sourcePath: Path) throws {
+            // Append to the archive if it already exists -- this is necessary in order to support cases
+            // where xcodebuild invokes another instance of itself in a shell script. We use exclusive
+            // locks to guarantee integrity of the archive, but in practice the locking should only ever
+            // come into play when there are 3 or more xcodebuild processes (the top level process plus
+            // 2 or more potentially concurrent xcodebuilds running in shell scripts as part of the top
+            // level build). Very few projects do this, so there shouldn't be a general efficiency concern
+            // regarding the blocking locks.
+            let exists: Bool
+            let fd: FileDescriptor
+            do {
+                fd = try FileDescriptor.open(FilePath(archiveFilePath.str), .writeOnly, options: [.create, .exclusiveCreate, .exclusiveLock], permissions: FilePermissions([.ownerReadWrite, .groupRead, .otherRead]))
+                exists = false
+            } catch Errno.fileExists {
+                fd = try FileDescriptor.open(FilePath(archiveFilePath.str), .readWrite, options: [.exclusiveLock])
+                exists = true
+            }
 
-                defer {
-                    try? compressStream.close()
-                }
+            try fd.closeAfter {
+                try ArchiveByteStream.withFileStream(fd: fd, automaticClose: false) { writeFileStream in
+                    guard
+                        let compressStream = exists
+                            ? ArchiveByteStream.compressionStream(appendingTo: writeFileStream)
+                            : ArchiveByteStream.compressionStream(using: .lzfse, writingTo: writeFileStream)
+                    else {
+                        throw StubError.error("Unable to create compression stream for \(exists ? "existing" : "new") file: \(archiveFilePath.str)")
+                    }
 
-                guard let encodeStream = ArchiveStream.encodeStream(writingTo: compressStream) else {
-                    throw StubError.error("Unable to create encode stream for \(exists ? "existing" : "new") file: \(archiveFilePath.str)")
-                }
+                    defer {
+                        try? compressStream.close()
+                    }
 
-                defer {
-                    try? encodeStream.close()
-                }
+                    guard let encodeStream = ArchiveStream.encodeStream(writingTo: compressStream) else {
+                        throw StubError.error("Unable to create encode stream for \(exists ? "existing" : "new") file: \(archiveFilePath.str)")
+                    }
 
-                // Only store the most minimal info: entry type, path, symlink info, and data.
-                // Other attributes like uid, gid, timestamps, etc., are not of interest here.
-                // See AADefs.h from the AppleArchive headers for the key meanings.
-                guard let keySet = ArchiveHeader.FieldKeySet("TYP,PAT,LNK,DAT") else {
-                    throw StubError.error("Unable to create archive key set")
-                }
+                    defer {
+                        try? encodeStream.close()
+                    }
+
+                    // Only store the most minimal info: entry type, path, symlink info, and data.
+                    // Other attributes like uid, gid, timestamps, etc., are not of interest here.
+                    // See AADefs.h from the AppleArchive headers for the key meanings.
+                    guard let keySet = ArchiveHeader.FieldKeySet("TYP,PAT,LNK,DAT") else {
+                        throw StubError.error("Unable to create archive key set")
+                    }
 
-                try encodeStream.writeDirectoryContents(archiveFrom: FilePath(sourcePath.dirname.str), path: FilePath(sourcePath.basename), keySet: keySet)
+                    try encodeStream.writeDirectoryContents(archiveFrom: FilePath(sourcePath.dirname.str), path: FilePath(sourcePath.basename), keySet: keySet)
+                }
             }
         }
     }
-}
 #endif
diff --git a/Sources/SWBWebAssemblyPlatform/Plugin.swift b/Sources/SWBWebAssemblyPlatform/Plugin.swift
index dbc99e82..ab8f8cb2 100644
--- a/Sources/SWBWebAssemblyPlatform/Plugin.swift
+++ b/Sources/SWBWebAssemblyPlatform/Plugin.swift
@@ -34,15 +34,18 @@ struct WebAssemblyPlatformSpecsExtension: SpecificationsExtension {
 struct WebAssemblyPlatformExtension: PlatformInfoExtension {
     func additionalPlatforms(context: any PlatformInfoExtensionAdditionalPlatformsContext) throws -> [(path: Path, data: [String: PropertyListItem])] {
         [
-            (.root, [
-                "Type": .plString("Platform"),
-                "Name": .plString("webassembly"),
-                "Identifier": .plString("webassembly"),
-                "Description": .plString("webassembly"),
-                "FamilyName": .plString("WebAssembly"),
-                "FamilyIdentifier": .plString("webassembly"),
-                "IsDeploymentPlatform": .plString("YES"),
-            ])
+            (
+                .root,
+                [
+                    "Type": .plString("Platform"),
+                    "Name": .plString("webassembly"),
+                    "Identifier": .plString("webassembly"),
+                    "Description": .plString("webassembly"),
+                    "FamilyName": .plString("WebAssembly"),
+                    "FamilyIdentifier": .plString("webassembly"),
+                    "IsDeploymentPlatform": .plString("YES"),
+                ]
+            )
         ]
     }
 }
@@ -76,11 +79,12 @@ struct WebAssemblySDKRegistryExtension: SDKRegistryExtension {
             "wasm32-unknown-wasip1-threads": ("wasm32", "wasip1", "threads"),
         ]
 
-        let wasmSwiftSDKs = (try? SwiftSDK.findSDKs(
-            targetTriples: Array(supportedTriples.keys),
-            fs: context.fs,
-            hostOperatingSystem: context.hostOperatingSystem
-        )) ?? []
+        let wasmSwiftSDKs =
+            (try? SwiftSDK.findSDKs(
+                targetTriples: Array(supportedTriples.keys),
+                fs: context.fs,
+                hostOperatingSystem: context.hostOperatingSystem
+            )) ?? []
 
         var wasmSDKs: [(path: Path, platform: SWBCore.Platform?, data: [String: PropertyListItem])] = []
 
@@ -93,35 +97,42 @@ struct WebAssemblySDKRegistryExtension: SDKRegistryExtension {
                 let wasiSysroot = wasmSDK.path.join(tripleProperties.sdkRootPath)
                 let swiftResourceDir = wasmSDK.path.join(tripleProperties.swiftResourcesPath)
 
-                wasmSDKs.append((wasiSysroot, wasmPlatform, [
-                    "Type": .plString("SDK"),
-                    "Version": .plString("1.0.0"),
-                    "CanonicalName": .plString(wasmSDK.identifier),
-                    "Aliases": ["webassembly", "wasi"],
-                    "IsBaseSDK": .plBool(true),
-                    "DefaultProperties": .plDict([
-                        "PLATFORM_NAME": .plString("webassembly"),
-                    ].merging(defaultProperties, uniquingKeysWith: { _, new in new })),
-                    "CustomProperties": .plDict([
-                        "LLVM_TARGET_TRIPLE_OS_VERSION": .plString(os),
-                        "SWIFT_LIBRARY_PATH": .plString(swiftResourceDir.join("wasi").str),
-                        "SWIFT_RESOURCE_DIR": .plString(swiftResourceDir.str),
-                        // HACK: Ld step does not use swiftc as linker driver but instead uses clang, so we need to add some Swift specific flags
-                        // assuming static linking.
-                        // Tracked in https://github.com/swiftlang/swift-build/issues/3
-                        "OTHER_LDFLAGS": .plArray(["-lc++", "-lc++abi", "-resource-dir", "$(SWIFT_RESOURCE_DIR)/clang", "@$(SWIFT_LIBRARY_PATH)/static-executable-args.lnk"]),
-                    ]),
-                    "SupportedTargets": .plDict([
-                        "webassembly": .plDict([
-                            "Archs": .plArray([.plString(arch)]),
-                            "LLVMTargetTripleEnvironment": .plString(env ?? ""),
-                            "LLVMTargetTripleSys": .plString(os),
-                            "LLVMTargetTripleVendor": .plString("unknown"),
-                        ])
-                    ]),
-                    // TODO: Leave compatible toolchain information in Swift SDKs
-                    // "Toolchains": .plArray([])
-                ]))
+                wasmSDKs.append(
+                    (
+                        wasiSysroot, wasmPlatform,
+                        [
+                            "Type": .plString("SDK"),
+                            "Version": .plString("1.0.0"),
+                            "CanonicalName": .plString(wasmSDK.identifier),
+                            "Aliases": ["webassembly", "wasi"],
+                            "IsBaseSDK": .plBool(true),
+                            "DefaultProperties": .plDict(
+                                [
+                                    "PLATFORM_NAME": .plString("webassembly")
+                                ].merging(defaultProperties, uniquingKeysWith: { _, new in new })
+                            ),
+                            "CustomProperties": .plDict([
+                                "LLVM_TARGET_TRIPLE_OS_VERSION": .plString(os),
+                                "SWIFT_LIBRARY_PATH": .plString(swiftResourceDir.join("wasi").str),
+                                "SWIFT_RESOURCE_DIR": .plString(swiftResourceDir.str),
+                                // HACK: Ld step does not use swiftc as linker driver but instead uses clang, so we need to add some Swift specific flags
+                                // assuming static linking.
+                                // Tracked in https://github.com/swiftlang/swift-build/issues/3
+                                "OTHER_LDFLAGS": .plArray(["-lc++", "-lc++abi", "-resource-dir", "$(SWIFT_RESOURCE_DIR)/clang", "@$(SWIFT_LIBRARY_PATH)/static-executable-args.lnk"]),
+                            ]),
+                            "SupportedTargets": .plDict([
+                                "webassembly": .plDict([
+                                    "Archs": .plArray([.plString(arch)]),
+                                    "LLVMTargetTripleEnvironment": .plString(env ?? ""),
+                                    "LLVMTargetTripleSys": .plString(os),
+                                    "LLVMTargetTripleVendor": .plString("unknown"),
+                                ])
+                            ]),
+                            // TODO: Leave compatible toolchain information in Swift SDKs
+                            // "Toolchains": .plArray([])
+                        ]
+                    )
+                )
             }
         }
 
diff --git a/Sources/SWBWindowsPlatform/KnownFolders.swift b/Sources/SWBWindowsPlatform/KnownFolders.swift
index e9e7dbe9..c7f9ebde 100644
--- a/Sources/SWBWindowsPlatform/KnownFolders.swift
+++ b/Sources/SWBWindowsPlatform/KnownFolders.swift
@@ -14,25 +14,25 @@ import SWBUtil
 import Foundation
 
 #if os(Windows)
-import WinSDK
+    import WinSDK
 
-private var KF_FLAG_DEFAULT: DWORD {
-    DWORD(WinSDK.KF_FLAG_DEFAULT.rawValue)
-}
+    private var KF_FLAG_DEFAULT: DWORD {
+        DWORD(WinSDK.KF_FLAG_DEFAULT.rawValue)
+    }
 
-private func SUCCEEDED(_ hr: HRESULT) -> Bool {
-    hr >= 0
-}
+    private func SUCCEEDED(_ hr: HRESULT) -> Bool {
+        hr >= 0
+    }
 
-private func _url(for id: KNOWNFOLDERID) -> URL? {
-    var pszPath: PWSTR?
-    let hr: HRESULT = withUnsafePointer(to: id) { id in
-        SHGetKnownFolderPath(id, KF_FLAG_DEFAULT, nil, &pszPath)
+    private func _url(for id: KNOWNFOLDERID) -> URL? {
+        var pszPath: PWSTR?
+        let hr: HRESULT = withUnsafePointer(to: id) { id in
+            SHGetKnownFolderPath(id, KF_FLAG_DEFAULT, nil, &pszPath)
+        }
+        guard SUCCEEDED(hr) else { return nil }
+        defer { CoTaskMemFree(pszPath) }
+        return URL(filePath: String(decodingCString: pszPath!, as: UTF16.self), directoryHint: .isDirectory)
     }
-    guard SUCCEEDED(hr) else { return nil }
-    defer { CoTaskMemFree(pszPath) }
-    return URL(filePath: String(decodingCString: pszPath!, as: UTF16.self), directoryHint: .isDirectory)
-}
 #endif
 
 extension URL {
@@ -40,21 +40,21 @@ extension URL {
     ///
     /// An example of a concrete path is `C:\Users\User\AppData\Local\Programs`
     static var userProgramFiles: URL? {
-#if os(Windows)
-        _url(for: FOLDERID_UserProgramFiles)
-#else
-        nil
-#endif
+        #if os(Windows)
+            _url(for: FOLDERID_UserProgramFiles)
+        #else
+            nil
+        #endif
     }
 
     /// Maps to the environment variable `%ProgramFiles(x86)%`
     ///
     /// An example of a concrete path is `C:\Program Files (x86)`
     static var programFilesX86: URL? {
-#if os(Windows)
-        _url(for: FOLDERID_ProgramFilesX86)
-#else
-        nil
-#endif
+        #if os(Windows)
+            _url(for: FOLDERID_ProgramFilesX86)
+        #else
+            nil
+        #endif
     }
 }
diff --git a/Sources/SWBWindowsPlatform/Plugin.swift b/Sources/SWBWindowsPlatform/Plugin.swift
index b3c095ef..38a48cca 100644
--- a/Sources/SWBWindowsPlatform/Plugin.swift
+++ b/Sources/SWBWindowsPlatform/Plugin.swift
@@ -35,9 +35,9 @@ public final class WindowsPlugin: Sendable {
     }
 
     func cachedLatestVSInstallDirectory(fs: any FSProxy) async throws -> Path? {
-       try await latestVsInstallationDirectory.value {
+        try await latestVsInstallationDirectory.value {
             let installations = try await cachedVSInstallations()
-            .sorted(by: { $0.installationVersion > $1.installationVersion })
+                .sorted(by: { $0.installationVersion > $1.installationVersion })
             if let latest = installations.first {
                 let msvcDir = latest.installationPath.join("VC").join("Tools").join("MSVC")
                 if fs.exists(msvcDir) {
@@ -81,7 +81,7 @@ struct WindowsPlatformSpecsExtension: SpecificationsExtension {
             }
             return [vcToolsInstallDir: dir.str]
         } else {
-           return [:]
+            return [:]
         }
     }
 }
@@ -111,16 +111,19 @@ struct WindowsPlatformExtension: PlatformInfoExtension {
                 throw StubError.error("Unexpected top-level property list type in \(windowsInfoPlistPath.str) (expected dictionary)")
             }
 
-            return (windowsInfoPlistPath.dirname, dict.merging([
-                "Type": .plString("Platform"),
-                "Name": .plString("windows"),
-                "Identifier": .plString("windows"),
-                "Description": .plString("Windows"),
-                "FamilyName": .plString("Windows"),
-                "FamilyIdentifier": .plString("windows"),
-                "IsDeploymentPlatform": .plString("YES"),
-                "Version": .plString(version),
-            ]) { old, new in new })
+            return (
+                windowsInfoPlistPath.dirname,
+                dict.merging([
+                    "Type": .plString("Platform"),
+                    "Name": .plString("windows"),
+                    "Identifier": .plString("windows"),
+                    "Description": .plString("Windows"),
+                    "FamilyName": .plString("Windows"),
+                    "FamilyIdentifier": .plString("windows"),
+                    "IsDeploymentPlatform": .plString("YES"),
+                    "Version": .plString(version),
+                ]) { old, new in new }
+            )
         }
     }
 
@@ -177,29 +180,34 @@ struct WindowsSDKRegistryExtension: SDKRegistryExtension {
         ]
 
         return try [
-            (windowsSDKSettingsPlistPath.dirname, windowsPlatform, dict.merging([
-                "Type": .plString("SDK"),
-                "Version": .plString(Version(ProcessInfo.processInfo.operatingSystemVersion).zeroTrimmed.description),
-                "CanonicalName": .plString("windows"),
-                "IsBaseSDK": .plBool(true),
-                "DefaultProperties": .plDict([
-                    "PLATFORM_NAME": .plString("windows"),
-                ].merging(defaultProperties, uniquingKeysWith: { _, new in new })),
-                "SupportedTargets": .plDict([
-                    "windows": .plDict([
-                        "Archs": .plArray([
-                            .plString("aarch64"),
-                            .plString("arm64ec"),
-                            .plString("armv7"),
-                            .plString("i686"),
-                            .plString("x86_64"),
-                        ]),
-                        "LLVMTargetTripleEnvironment": .plString("msvc"),
-                        "LLVMTargetTripleSys": .plString("windows"),
-                        "LLVMTargetTripleVendor": .plString("unknown"),
-                    ])
-                ]),
-            ]) { old, new in new })
+            (
+                windowsSDKSettingsPlistPath.dirname, windowsPlatform,
+                dict.merging([
+                    "Type": .plString("SDK"),
+                    "Version": .plString(Version(ProcessInfo.processInfo.operatingSystemVersion).zeroTrimmed.description),
+                    "CanonicalName": .plString("windows"),
+                    "IsBaseSDK": .plBool(true),
+                    "DefaultProperties": .plDict(
+                        [
+                            "PLATFORM_NAME": .plString("windows")
+                        ].merging(defaultProperties, uniquingKeysWith: { _, new in new })
+                    ),
+                    "SupportedTargets": .plDict([
+                        "windows": .plDict([
+                            "Archs": .plArray([
+                                .plString("aarch64"),
+                                .plString("arm64ec"),
+                                .plString("armv7"),
+                                .plString("i686"),
+                                .plString("x86_64"),
+                            ]),
+                            "LLVMTargetTripleEnvironment": .plString("msvc"),
+                            "LLVMTargetTripleSys": .plString("windows"),
+                            "LLVMTargetTripleVendor": .plString("unknown"),
+                        ])
+                    ]),
+                ]) { old, new in new }
+            )
         ]
     }
 }
diff --git a/Sources/SWBWindowsPlatform/VSInstallation.swift b/Sources/SWBWindowsPlatform/VSInstallation.swift
index 68c35abb..eb00b11b 100644
--- a/Sources/SWBWindowsPlatform/VSInstallation.swift
+++ b/Sources/SWBWindowsPlatform/VSInstallation.swift
@@ -65,10 +65,12 @@ public struct VSInstallation: Decodable, Sendable {
     private static func vswherePath(fs: any FSProxy) throws -> Path? {
         var paths: [Path] = []
         if let path = getEnvironmentVariable(.path) {
-            paths.append(contentsOf: path.split(separator: Path.pathEnvironmentSeparator).map(Path.init).filter {
-                // PATH may contain unexpanded shell variable references
-                $0.isAbsolute
-            })
+            paths.append(
+                contentsOf: path.split(separator: Path.pathEnvironmentSeparator).map(Path.init).filter {
+                    // PATH may contain unexpanded shell variable references
+                    $0.isAbsolute
+                }
+            )
         }
         if let programFilesX86 = URL.programFilesX86?.appending(components: "Microsoft Visual Studio", "Installer") {
             // This is a fixed location that will be maintained, according to the vswhere documentation.
diff --git a/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleBuildCommand.swift b/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleBuildCommand.swift
index e3f50afa..bef79813 100644
--- a/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleBuildCommand.swift
+++ b/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleBuildCommand.swift
@@ -520,15 +520,17 @@ private final class PlanningOperationDelegate: SWBPlanningOperationDelegate, Sen
     public func provisioningTaskInputs(targetGUID: String, provisioningSourceData: SWBProvisioningTaskInputsSourceData) async -> SWBProvisioningTaskInputs {
         let identity = provisioningSourceData.signingCertificateIdentifier
         if identity == "-" {
-            let signedEntitlements = provisioningSourceData.entitlementsDestination == "Signature"
-            ? provisioningSourceData.productTypeEntitlements.merging(["application-identifier": .plString(provisioningSourceData.bundleIdentifier)], uniquingKeysWith: { _, new in new }).merging(provisioningSourceData.projectEntitlements ?? [:], uniquingKeysWith: { _, new in new })
-            : [:]
+            let signedEntitlements =
+                provisioningSourceData.entitlementsDestination == "Signature"
+                ? provisioningSourceData.productTypeEntitlements.merging(["application-identifier": .plString(provisioningSourceData.bundleIdentifier)], uniquingKeysWith: { _, new in new }).merging(provisioningSourceData.projectEntitlements ?? [:], uniquingKeysWith: { _, new in new })
+                : [:]
 
-            let simulatedEntitlements = provisioningSourceData.entitlementsDestination == "__entitlements"
-            ? provisioningSourceData.productTypeEntitlements.merging(["application-identifier": .plString(provisioningSourceData.bundleIdentifier)], uniquingKeysWith: { _, new in new }).merging(provisioningSourceData.projectEntitlements ?? [:], uniquingKeysWith: { _, new in new })
-            : [:]
+            let simulatedEntitlements =
+                provisioningSourceData.entitlementsDestination == "__entitlements"
+                ? provisioningSourceData.productTypeEntitlements.merging(["application-identifier": .plString(provisioningSourceData.bundleIdentifier)], uniquingKeysWith: { _, new in new }).merging(provisioningSourceData.projectEntitlements ?? [:], uniquingKeysWith: { _, new in new })
+                : [:]
 
-            return SWBProvisioningTaskInputs(identityHash: "-", identityName: "-", profileName: nil, profileUUID: nil, profilePath: nil, designatedRequirements: nil, signedEntitlements: signedEntitlements.merging(provisioningSourceData.sdkRoot.contains("simulator") ? ["get-task-allow": .plBool(true)] : [:], uniquingKeysWith: { _, new  in new }), simulatedEntitlements: simulatedEntitlements, appIdentifierPrefix: nil, teamIdentifierPrefix: nil, isEnterpriseTeam: nil, keychainPath: nil, errors: [], warnings: [])
+            return SWBProvisioningTaskInputs(identityHash: "-", identityName: "-", profileName: nil, profileUUID: nil, profilePath: nil, designatedRequirements: nil, signedEntitlements: signedEntitlements.merging(provisioningSourceData.sdkRoot.contains("simulator") ? ["get-task-allow": .plBool(true)] : [:], uniquingKeysWith: { _, new in new }), simulatedEntitlements: simulatedEntitlements, appIdentifierPrefix: nil, teamIdentifierPrefix: nil, isEnterpriseTeam: nil, keychainPath: nil, errors: [], warnings: [])
         } else if identity.isEmpty {
             return SWBProvisioningTaskInputs()
         } else {
@@ -536,18 +538,20 @@ private final class PlanningOperationDelegate: SWBPlanningOperationDelegate, Sen
         }
     }
 
-    public func executeExternalTool(commandLine: [String], workingDirectory: String?, environment: [String : String]) async throws -> SWBExternalToolResult {
+    public func executeExternalTool(commandLine: [String], workingDirectory: String?, environment: [String: String]) async throws -> SWBExternalToolResult {
         .deferred
     }
 }
 
 func registerBuildCommands() {
-    for commandClass in ([
-        SWBServiceConsoleBuildCommand.self,
-        SWBServiceConsolePrepareForIndexCommand.self,
-        SWBServiceConsoleCreateBuildDescriptionCommand.self,
-        SWBServiceConsoleDependencyInfoCommand.self,
-    ] as [any SWBServiceConsoleCommand.Type]) { SWBServiceConsoleCommandRegistry.registerCommandClass(commandClass) }
+    for commandClass
+        in ([
+            SWBServiceConsoleBuildCommand.self,
+            SWBServiceConsolePrepareForIndexCommand.self,
+            SWBServiceConsoleCreateBuildDescriptionCommand.self,
+            SWBServiceConsoleDependencyInfoCommand.self,
+        ] as [any SWBServiceConsoleCommand.Type])
+    { SWBServiceConsoleCommandRegistry.registerCommandClass(commandClass) }
 }
 
 extension SwiftBuildMessage.BuildCompletedInfo.Result {
@@ -578,7 +582,8 @@ extension SWBBuildRequest {
             indexRegularBuildIntermediatesPath: nil,
             indexPCHPath: derivedDataPath.str,
             indexDataStoreFolderPath: derivedDataPath.str,
-            indexEnableDataStore: parameters.arenaInfo?.indexEnableDataStore ?? false)
+            indexEnableDataStore: parameters.arenaInfo?.indexEnableDataStore ?? false
+        )
 
         parameters.arenaInfo = arenaInfo
         configuredTargets = configuredTargets.map { configuredTarget in
diff --git a/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleBuildCommandProtocol.swift b/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleBuildCommandProtocol.swift
index c1ca969a..ea338765 100644
--- a/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleBuildCommandProtocol.swift
+++ b/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleBuildCommandProtocol.swift
@@ -478,7 +478,8 @@ extension SwiftBuildMessage.LocationContext: Codable, Equatable, Sendable {
         case .task:
             self = try .task(
                 taskID: container.decode(Int.self, forKey: .taskID),
-                targetID: container.decode(Int.self, forKey: .targetID))
+                targetID: container.decode(Int.self, forKey: .targetID)
+            )
         case .target:
             self = try .target(targetID: container.decode(Int.self, forKey: .targetID))
         case .globalTask:
diff --git a/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleCreateXCFrameworkCommand.swift b/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleCreateXCFrameworkCommand.swift
index 32233a56..1ac57509 100644
--- a/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleCreateXCFrameworkCommand.swift
+++ b/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleCreateXCFrameworkCommand.swift
@@ -18,9 +18,7 @@ class SWBServiceConsoleCreateXCFrameworkCommand: SWBServiceConsoleCommand {
 
     public static func perform(invocation: SWBServiceConsoleCommandInvocation) async -> SWBCommandResult {
         let (passed, message) = await invocation.console.service.createXCFramework(invocation.commandLine, currentWorkingDirectory: Path.currentDirectory.str, developerPath: nil)
-        return passed ?
-            .success(SWBServiceConsoleResult(output: message + "\n", shouldContinue: false)) :
-            .failure(.failedCommandError(description: message + "\n"))
+        return passed ? .success(SWBServiceConsoleResult(output: message + "\n", shouldContinue: false)) : .failure(.failedCommandError(description: message + "\n"))
     }
 
     public static func validate(invocation: SWBServiceConsoleCommandInvocation) -> SWBServiceConsoleError? {
@@ -35,4 +33,3 @@ func registerXCFrameworkCommands() {
         SWBServiceConsoleCommandRegistry.registerCommandClass(command)
     }
 }
-
diff --git a/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleGeneralCommands.swift b/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleGeneralCommands.swift
index 82f62947..44bbc72c 100644
--- a/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleGeneralCommands.swift
+++ b/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleGeneralCommands.swift
@@ -103,10 +103,10 @@ class SWBServiceConsoleOpenIDEConsoleCommand: SWBServiceConsoleCommand {
 
     static func perform(invocation: SWBServiceConsoleCommandInvocation) async -> SWBCommandResult {
         #if os(macOS) || targetEnvironment(macCatalyst)
-        DistributedNotificationCenter.default.post(name: Notification.Name("IDEOpenXCBuildConsole"), object: nil)
-        return .success(SWBServiceConsoleResult(output: "ok\n"))
+            DistributedNotificationCenter.default.post(name: Notification.Name("IDEOpenXCBuildConsole"), object: nil)
+            return .success(SWBServiceConsoleResult(output: "ok\n"))
         #else
-        return .failure(.invalidCommandError(description: "not supported on this platform\n"))
+            return .failure(.invalidCommandError(description: "not supported on this platform\n"))
         #endif
     }
 }
@@ -122,7 +122,7 @@ class SWBServiceConsoleSendPIFCommand: SWBServiceConsoleCommand {
             "guid": "W1",
             "name": "aWorkspace",
             "path": "/tmp/aWorkspace.xcworkspace/contents.xcworkspacedata",
-            "projects": ["PROJECT"]
+            "projects": ["PROJECT"],
         ]
         let projectPIF: SWBPropertyListItem = [
             "guid": "P1",
@@ -136,7 +136,7 @@ class SWBServiceConsoleSendPIFCommand: SWBServiceConsoleCommand {
                     "name": "Config1",
                     "buildSettings": [
                         "USER_PROJECT_SETTING": "USER_PROJECT_VALUE"
-                    ]
+                    ],
                 ]
             ],
             "groupTree": [
@@ -144,20 +144,20 @@ class SWBServiceConsoleSendPIFCommand: SWBServiceConsoleCommand {
                 "type": "group",
                 "name": "SomeFiles",
                 "sourceTree": "PROJECT_DIR",
-                "path": "/tmp/SomeProject/SomeFiles"
-            ]
+                "path": "/tmp/SomeProject/SomeFiles",
+            ],
         ]
         let topLevelPIF: SWBPropertyListItem = [
             [
                 "type": "workspace",
                 "signature": "WORKSPACE",
-                "contents": workspacePIF
+                "contents": workspacePIF,
             ],
             [
                 "type": "project",
                 "signature": "PROJECT",
-                "contents": projectPIF
-            ]
+                "contents": projectPIF,
+            ],
         ]
 
         do {
@@ -217,12 +217,16 @@ class SWBServiceConsolePassThroughCommand {
         // FIXME: We need to be able to abstract the console output.
         let stdoutHandle = FileHandle.standardOutput
         let stderrHandle = FileHandle.standardError
-        let result = await invocation.console.service.executeCommandLineTool(invocation.commandLine, workingDirectory: Path.currentDirectory,
-                                                    stdoutHandler:{ data in
-                                                        try! stdoutHandle.write(contentsOf: data)
-        }, stderrHandler:{ data in
-            try! stderrHandle.write(contentsOf: data)
-        })
+        let result = await invocation.console.service.executeCommandLineTool(
+            invocation.commandLine,
+            workingDirectory: Path.currentDirectory,
+            stdoutHandler: { data in
+                try! stdoutHandle.write(contentsOf: data)
+            },
+            stderrHandler: { data in
+                try! stderrHandle.write(contentsOf: data)
+            }
+        )
 
         if result {
             return .success(SWBServiceConsoleResult(output: ""))
diff --git a/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleSessionCommands.swift b/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleSessionCommands.swift
index abad7e59..700b0885 100644
--- a/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleSessionCommands.swift
+++ b/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleSessionCommands.swift
@@ -112,13 +112,15 @@ class SWBServiceConsoleDeleteSessionCommand: SWBServiceConsoleCommand {
 }
 
 func registerSessionCommands() {
-    for commandClass in ([
-        SWBServiceConsoleCreateSessionCommand.self,
-        SWBServiceConsoleListSessionsCommand.self,
-        SWBServiceConsoleShowSessionCommand.self,
-        SWBServiceConsoleSelectSessionCommand.self,
-        SWBServiceConsoleDeleteSessionCommand.self,
-    ] as [any SWBServiceConsoleCommand.Type]) {
+    for commandClass
+        in ([
+            SWBServiceConsoleCreateSessionCommand.self,
+            SWBServiceConsoleListSessionsCommand.self,
+            SWBServiceConsoleShowSessionCommand.self,
+            SWBServiceConsoleSelectSessionCommand.self,
+            SWBServiceConsoleDeleteSessionCommand.self,
+        ] as [any SWBServiceConsoleCommand.Type])
+    {
         SWBServiceConsoleCommandRegistry.registerCommandClass(commandClass)
     }
 }
diff --git a/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleXcodeCommands.swift b/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleXcodeCommands.swift
index 8a2e2295..74c2e80a 100644
--- a/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleXcodeCommands.swift
+++ b/Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleXcodeCommands.swift
@@ -61,13 +61,15 @@ class SWBServiceConsoleDescribeBuildSettingsCommand: SWBServiceConsoleCommand {
 }
 
 func registerXcodeCommands() {
-    for commandClass in ([
-        SWBServiceConsoleShowPlatformsCommand.self,
-        SWBServiceConsoleShowSDKsCommand.self,
-        SWBServiceConsoleShowSpecsCommand.self,
-        SWBServiceConsoleShowToolchainsCommand.self,
-        SWBServiceConsoleDescribeBuildSettingsCommand.self
-    ] as [any SWBServiceConsoleCommand.Type]) {
+    for commandClass
+        in ([
+            SWBServiceConsoleShowPlatformsCommand.self,
+            SWBServiceConsoleShowSDKsCommand.self,
+            SWBServiceConsoleShowSpecsCommand.self,
+            SWBServiceConsoleShowToolchainsCommand.self,
+            SWBServiceConsoleDescribeBuildSettingsCommand.self,
+        ] as [any SWBServiceConsoleCommand.Type])
+    {
         SWBServiceConsoleCommandRegistry.registerCommandClass(commandClass)
     }
 }
diff --git a/Sources/SwiftBuild/ProjectModel/BuildConfig.swift b/Sources/SwiftBuild/ProjectModel/BuildConfig.swift
index 51a7b675..da5fd3e1 100644
--- a/Sources/SwiftBuild/ProjectModel/BuildConfig.swift
+++ b/Sources/SwiftBuild/ProjectModel/BuildConfig.swift
@@ -55,4 +55,3 @@ extension ProjectModel.BuildConfig: Codable {
         case impartedBuildProperties
     }
 }
-
diff --git a/Sources/SwiftBuild/ProjectModel/BuildFile.swift b/Sources/SwiftBuild/ProjectModel/BuildFile.swift
index 6b7a310d..cf6d2e4e 100644
--- a/Sources/SwiftBuild/ProjectModel/BuildFile.swift
+++ b/Sources/SwiftBuild/ProjectModel/BuildFile.swift
@@ -79,7 +79,6 @@ extension ProjectModel {
     }
 }
 
-
 extension ProjectModel.BuildFile: Codable {
     public init(from decoder: any Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
@@ -127,5 +126,3 @@ extension ProjectModel.BuildFile: Codable {
         case targetReference
     }
 }
-
-
diff --git a/Sources/SwiftBuild/ProjectModel/BuildPhases.swift b/Sources/SwiftBuild/ProjectModel/BuildPhases.swift
index 1c291740..46a507e9 100644
--- a/Sources/SwiftBuild/ProjectModel/BuildPhases.swift
+++ b/Sources/SwiftBuild/ProjectModel/BuildPhases.swift
@@ -198,8 +198,6 @@ extension ProjectModel {
     }
 }
 
-
-
 extension ProjectModel.BuildPhase: Codable {
     public init(from decoder: any Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
@@ -430,4 +428,3 @@ extension ProjectModel.ShellScriptBuildPhase: Codable {
         case alwaysRunForInstallHdrs
     }
 }
-
diff --git a/Sources/SwiftBuild/ProjectModel/BuildRule.swift b/Sources/SwiftBuild/ProjectModel/BuildRule.swift
index 67cff696..f5bae798 100644
--- a/Sources/SwiftBuild/ProjectModel/BuildRule.swift
+++ b/Sources/SwiftBuild/ProjectModel/BuildRule.swift
@@ -45,14 +45,13 @@ extension ProjectModel {
     }
 }
 
-
 extension ProjectModel.BuildRule: Codable {
     public init(from decoder: any Decoder) throws {
         let container = try decoder.singleValueContainer()
         let dict = try container.decode([String: Value].self)
         guard let id = dict[PIFKey_guid]?.string,
-              let name = dict[PIFKey_name]?.string,
-              let typeId = dict[PIFKey_BuildRule_fileTypeIdentifier]?.string
+            let name = dict[PIFKey_name]?.string,
+            let typeId = dict[PIFKey_BuildRule_fileTypeIdentifier]?.string
         else {
             throw DecodingError.dataCorruptedError(in: container, debugDescription: "Unable to find expected values")
         }
@@ -60,7 +59,8 @@ extension ProjectModel.BuildRule: Codable {
         self.name = name
 
         if typeId == PIFKey_BuildRule_fileTypeIdentifier_pattern_proxy,
-           let pattern = dict[PIFKey_BuildRule_filePatterns]?.string {
+            let pattern = dict[PIFKey_BuildRule_filePatterns]?.string
+        {
             self.input = .filePattern(pattern)
         } else {
             self.input = .fileType(typeId)
@@ -69,8 +69,8 @@ extension ProjectModel.BuildRule: Codable {
         switch dict[PIFKey_BuildRule_compilerSpecificationIdentifier]?.string {
         case PIFKey_BuildRule_compilerSpecificationIdentifier_com_apple_compilers_proxy_script:
             guard let contents = dict[PIFKey_BuildRule_scriptContents]?.string,
-                  let inputPaths = dict[PIFKey_BuildRule_inputFilePaths]?.array,
-                  let outputPaths = dict[PIFKey_BuildRule_outputFilePaths]?.array
+                let inputPaths = dict[PIFKey_BuildRule_inputFilePaths]?.array,
+                let outputPaths = dict[PIFKey_BuildRule_outputFilePaths]?.array
             else {
                 throw DecodingError.dataCorruptedError(in: container, debugDescription: "Failed to decode proxy script information.")
             }
@@ -83,7 +83,8 @@ extension ProjectModel.BuildRule: Codable {
 
             let dependencyInfo: Action.DependencyInfoFormat?
             if let format = dict[PIFKey_BuildRule_dependencyFileFormat]?.string,
-               let paths = dict[PIFKey_BuildRule_dependencyFilePaths]?.array {
+                let paths = dict[PIFKey_BuildRule_dependencyFilePaths]?.array
+            {
 
                 if format == "dependencyInfo" {
                     dependencyInfo = .dependencyInfo(paths[0])
@@ -200,4 +201,3 @@ extension ProjectModel.BuildRule: Codable {
         return dict
     }
 }
-
diff --git a/Sources/SwiftBuild/ProjectModel/BuildSettings.swift b/Sources/SwiftBuild/ProjectModel/BuildSettings.swift
index 6ca92cc0..c903de23 100644
--- a/Sources/SwiftBuild/ProjectModel/BuildSettings.swift
+++ b/Sources/SwiftBuild/ProjectModel/BuildSettings.swift
@@ -112,7 +112,7 @@ extension ProjectModel {
             case LD_WARN_DUPLICATE_LIBRARIES
 
             // @available(*, deprecated, renamed: "GENERATE_PRELINK_OBJECT_FILE") // can't add @available because it breaks CaseIterable
-            case GENERATE_MASTER_OBJECT_FILE // ignore-unacceptable-language
+            case GENERATE_MASTER_OBJECT_FILE  // ignore-unacceptable-language
         }
 
         public enum MultipleValueSetting: String, CaseIterable, Sendable, Hashable, Codable {
@@ -208,7 +208,6 @@ extension ProjectModel {
         @available(*, deprecated, message: "Use subscripts to set platform-specific settings instead")
         public var platformSpecificSettings = [Platform: [Declaration: [String]]]()
 
-
         public subscript(_ setting: SingleValueSetting) -> String? {
             get { singleValueSettings[setting.rawValue] }
             set { singleValueSettings[setting.rawValue] = newValue }
@@ -241,7 +240,6 @@ extension ProjectModel {
     }
 }
 
-
 public extension ProjectModel.BuildSettings.Platform {
     func toPlatformFilter() -> [ProjectModel.PlatformFilter] {
         var result: [ProjectModel.PlatformFilter] = []
diff --git a/Sources/SwiftBuild/ProjectModel/Project.swift b/Sources/SwiftBuild/ProjectModel/Project.swift
index e1dd832b..09236a76 100644
--- a/Sources/SwiftBuild/ProjectModel/Project.swift
+++ b/Sources/SwiftBuild/ProjectModel/Project.swift
@@ -172,7 +172,6 @@ extension ProjectModel {
 
 }
 
-
 extension ProjectModel.Project: Codable {
     public init(from decoder: any Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
@@ -222,4 +221,3 @@ extension ProjectModel.Project: Codable {
         case appPreferencesBuildSettings
     }
 }
-
diff --git a/Sources/SwiftBuild/ProjectModel/References.swift b/Sources/SwiftBuild/ProjectModel/References.swift
index 796ffebe..a5517f76 100644
--- a/Sources/SwiftBuild/ProjectModel/References.swift
+++ b/Sources/SwiftBuild/ProjectModel/References.swift
@@ -120,10 +120,8 @@ extension ProjectModel {
         }
     }
 
-
 }
 
-
 extension ProjectModel.Reference: Codable {
     public init(from decoder: any Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
@@ -212,7 +210,6 @@ extension ProjectModel.FileReference: Codable {
         case "y", "ym", "ymm", "ypp", "yp", "yxx":
             return "sourcecode.yacc"
 
-
         // FIXME: This is probably now more important because of resources support.
         case "xcassets":
             return "folder.assetcatalog"
@@ -237,7 +234,7 @@ extension ProjectModel.FileReference: Codable {
             return "folder.rkassets"
 
         default:
-            return XCBuildFileType.all.first{ $0.fileTypes.contains(pathExtension) }?.fileTypeIdentifier ?? "file"
+            return XCBuildFileType.all.first { $0.fileTypes.contains(pathExtension) }?.fileTypeIdentifier ?? "file"
         }
     }
 
@@ -274,4 +271,3 @@ extension ProjectModel.Group: Codable {
     }
 
 }
-
diff --git a/Sources/SwiftBuild/ProjectModel/TargetDependency.swift b/Sources/SwiftBuild/ProjectModel/TargetDependency.swift
index 88dc8c43..3c07970a 100644
--- a/Sources/SwiftBuild/ProjectModel/TargetDependency.swift
+++ b/Sources/SwiftBuild/ProjectModel/TargetDependency.swift
@@ -46,4 +46,3 @@ extension ProjectModel.TargetDependency: Codable {
         case platformFilters
     }
 }
-
diff --git a/Sources/SwiftBuild/ProjectModel/Targets.swift b/Sources/SwiftBuild/ProjectModel/Targets.swift
index e04e722a..68268cae 100644
--- a/Sources/SwiftBuild/ProjectModel/Targets.swift
+++ b/Sources/SwiftBuild/ProjectModel/Targets.swift
@@ -58,7 +58,7 @@ extension ProjectModel {
             let buildConfig = create(id)
 
             precondition(!buildConfig.name.isEmpty)
-            precondition(!buildConfigs.contains{ $0.name == buildConfig.name })
+            precondition(!buildConfigs.contains { $0.name == buildConfig.name })
 
             self.buildConfigs.append(buildConfig)
             return buildConfig
@@ -69,7 +69,6 @@ extension ProjectModel {
             set { buildConfigs[id: tag.value] = newValue }
         }
 
-
         // MARK: - BuildPhase
         public typealias BuildPhaseTag<Phase> = XTag<Phase, GUID>
 
@@ -126,7 +125,8 @@ extension ProjectModel {
         public subscript(buildPhase tag: BuildPhaseTag<HeadersBuildPhase>) -> HeadersBuildPhase {
             get {
                 guard let idx = firstPhaseIndex(tag.value),
-                      case let .headers(t) = buildPhases[idx] else { fatalError() }
+                    case let .headers(t) = buildPhases[idx]
+                else { fatalError() }
                 return t
             }
             set {
@@ -140,7 +140,8 @@ extension ProjectModel {
         public subscript(buildPhase tag: BuildPhaseTag<SourcesBuildPhase>) -> SourcesBuildPhase {
             get {
                 guard let idx = firstPhaseIndex(tag.value),
-                      case let .sources(t) = buildPhases[idx] else { fatalError() }
+                    case let .sources(t) = buildPhases[idx]
+                else { fatalError() }
                 return t
             }
             set {
@@ -154,7 +155,8 @@ extension ProjectModel {
         public subscript(buildPhase tag: BuildPhaseTag<FrameworksBuildPhase>) -> FrameworksBuildPhase {
             get {
                 guard let idx = firstPhaseIndex(tag.value),
-                      case let .frameworks(t) = buildPhases[idx] else { fatalError() }
+                    case let .frameworks(t) = buildPhases[idx]
+                else { fatalError() }
                 return t
             }
             set {
@@ -168,7 +170,8 @@ extension ProjectModel {
         public subscript(buildPhase tag: BuildPhaseTag<CopyBundleResourcesBuildPhase>) -> CopyBundleResourcesBuildPhase {
             get {
                 guard let idx = firstPhaseIndex(tag.value),
-                      case let .copyBundleResources(t) = buildPhases[idx] else { fatalError() }
+                    case let .copyBundleResources(t) = buildPhases[idx]
+                else { fatalError() }
                 return t
             }
             set {
@@ -182,7 +185,8 @@ extension ProjectModel {
         public subscript(buildPhase tag: BuildPhaseTag<CopyFilesBuildPhase>) -> CopyFilesBuildPhase {
             get {
                 guard let idx = firstPhaseIndex(tag.value),
-                      case let .copyFiles(t) = buildPhases[idx] else { fatalError() }
+                    case let .copyFiles(t) = buildPhases[idx]
+                else { fatalError() }
                 return t
             }
             set {
@@ -196,7 +200,8 @@ extension ProjectModel {
         public subscript(buildPhase tag: BuildPhaseTag<ShellScriptBuildPhase>) -> ShellScriptBuildPhase {
             get {
                 guard let idx = firstPhaseIndex(tag.value),
-                      case let .shellScript(t) = buildPhases[idx] else { fatalError() }
+                    case let .shellScript(t) = buildPhases[idx]
+                else { fatalError() }
                 return t
             }
             set {
@@ -208,46 +213,50 @@ extension ProjectModel {
         }
 
         @discardableResult public mutating func withFrameworksBuildPhase<T>(_ modify: (inout FrameworksBuildPhase) -> T) -> T {
-            let phaseTag = firstPhaseTag({
-                switch $0 {
-                case .frameworks(_): return true
-                default: return false
-                }
-            }) ?? (addFrameworksBuildPhase { id in FrameworksBuildPhase(id: id) })
+            let phaseTag =
+                firstPhaseTag({
+                    switch $0 {
+                    case .frameworks(_): return true
+                    default: return false
+                    }
+                }) ?? (addFrameworksBuildPhase { id in FrameworksBuildPhase(id: id) })
 
             return modify(&self[buildPhase: phaseTag])
         }
 
         @discardableResult public mutating func withCopyBundleResourcesBuildPhase<T>(_ modify: (inout CopyBundleResourcesBuildPhase) -> T) -> T {
-            let phaseTag = firstPhaseTag({
-                switch $0 {
-                case .copyBundleResources(_): return true
-                default: return false
-                }
-            }) ?? (addCopyBundleResourcesBuildPhase { id in CopyBundleResourcesBuildPhase(id: id) })
+            let phaseTag =
+                firstPhaseTag({
+                    switch $0 {
+                    case .copyBundleResources(_): return true
+                    default: return false
+                    }
+                }) ?? (addCopyBundleResourcesBuildPhase { id in CopyBundleResourcesBuildPhase(id: id) })
 
             return modify(&self[buildPhase: phaseTag])
         }
 
         @discardableResult public mutating func withHeadersBuildPhase<T>(_ modify: (inout HeadersBuildPhase) -> T) -> T {
-            let phaseTag = firstPhaseTag({
-                switch $0 {
-                case .headers(_): return true
-                default: return false
-                }
-            }) ?? (addHeadersBuildPhase { id in HeadersBuildPhase(id: id) })
+            let phaseTag =
+                firstPhaseTag({
+                    switch $0 {
+                    case .headers(_): return true
+                    default: return false
+                    }
+                }) ?? (addHeadersBuildPhase { id in HeadersBuildPhase(id: id) })
 
             return modify(&self[buildPhase: phaseTag])
         }
 
         @discardableResult public mutating func withSourcesBuildPhase<T>(_ modify: (inout SourcesBuildPhase) -> T) -> T {
 
-            let phaseTag = firstPhaseTag({
-                switch $0 {
-                case .sources(_): return true
-                default: return false
-                }
-            }) ?? (addSourcesBuildPhase { id in SourcesBuildPhase(id: id) })
+            let phaseTag =
+                firstPhaseTag({
+                    switch $0 {
+                    case .sources(_): return true
+                    default: return false
+                    }
+                }) ?? (addSourcesBuildPhase { id in SourcesBuildPhase(id: id) })
 
             return modify(&self[buildPhase: phaseTag])
         }
@@ -265,7 +274,6 @@ extension ProjectModel {
             return buildPhases.firstIndex(where: { $0.common.id == guid })
         }
 
-
         // MARK: - BuildRule
 
         private var nextBuildRuleId: GUID {
@@ -291,7 +299,6 @@ extension ProjectModel {
             dependencies.append(dependency)
         }
 
-
         /// Adds a dependency on another target.  It is the caller's responsibility to avoid creating dependency cycles.  A dependency of one target on another ensures that the other target is built first. If `linkProduct` is true, the receiver will also be configured to link against the product produced by the other target (this presumes that the product type is one that can be linked against).
         @discardableResult public mutating func addDependency(on targetId: GUID, platformFilters: Set<PlatformFilter>, linkProduct: Bool = false) -> TargetDependency {
             let dependency = TargetDependency(targetId: targetId, platformFilters: platformFilters)
@@ -449,7 +456,8 @@ extension ProjectModel.Target: Codable {
         case .packageProduct:
             try container.encode("packageProduct", forKey: .type)
             if let first = self.buildPhases.first,
-               case let .frameworks(phase) = first {
+                case let .frameworks(phase) = first
+            {
                 try container.encode(phase, forKey: .frameworksBuildPhase)
             }
 
@@ -524,4 +532,3 @@ extension ProjectModel.AggregateTarget: Codable {
         case customTasks
     }
 }
-
diff --git a/Sources/SwiftBuild/SWBBuildAction.swift b/Sources/SwiftBuild/SWBBuildAction.swift
index aa3276e4..86e590d1 100644
--- a/Sources/SwiftBuild/SWBBuildAction.swift
+++ b/Sources/SwiftBuild/SWBBuildAction.swift
@@ -13,8 +13,8 @@
 import SWBProtocol
 
 public enum SWBBuildAction: String, Sendable {
-    case analyze = "analyze" // used by legacy target-based builds using xcodebuild
-    case archive = "archive" // used by legacy target-based builds using xcodebuild
+    case analyze = "analyze"  // used by legacy target-based builds using xcodebuild
+    case archive = "archive"  // used by legacy target-based builds using xcodebuild
     case clean = "clean"
     case build = "build"
     case exportLoc = "exportloc"
diff --git a/Sources/SwiftBuild/SWBBuildOperation.swift b/Sources/SwiftBuild/SWBBuildOperation.swift
index ea47f02f..1f89f3d5 100644
--- a/Sources/SwiftBuild/SWBBuildOperation.swift
+++ b/Sources/SwiftBuild/SWBBuildOperation.swift
@@ -56,22 +56,22 @@ public final class SWBBuildOperation: Sendable {
     /// The state of the operation.
     public private(set) var state: SWBBuildOperationState {
         get {
-            return lockedState.withLock{$0}
+            return lockedState.withLock { $0 }
         }
         set {
-            lockedState.withLock{$0 = newValue}
+            lockedState.withLock { $0 = newValue }
         }
     }
 
-#if DEBUG
-    /// The set of active targets, for assertion purposes.
-    private var activeTargets = Set<Int>()
-#endif
+    #if DEBUG
+        /// The set of active targets, for assertion purposes.
+        private var activeTargets = Set<Int>()
+    #endif
 
-#if DEBUG
-    /// The set of active tasks, for assertion purposes.
-    private var activeTasks = Set<Int>()
-#endif
+    #if DEBUG
+        /// The set of active tasks, for assertion purposes.
+        private var activeTasks = Set<Int>()
+    #endif
 
     init(session: SWBBuildServiceSession, delegate: (any SWBPlanningOperationDelegate)?, request: SWBBuildRequest, onlyCreateBuildDescription: Bool, retainBuildDescription: Bool) async throws {
         self.session = session
@@ -157,44 +157,44 @@ public final class SWBBuildOperation: Sendable {
             self.completion.signal()
         case let message as BuildOperationTargetStarted:
             assert(state == .running, "invalid state: \(state)")
-#if DEBUG
-            do {
-                let inserted = activeTargets.insert(message.id).inserted
-                assert(inserted)
-            }
-#endif
+            #if DEBUG
+                do {
+                    let inserted = activeTargets.insert(message.id).inserted
+                    assert(inserted)
+                }
+            #endif
             continuation.yield(.init(message))
         case let message as BuildOperationTargetUpToDate:
             assert(state == .running, "invalid state: \(state)")
             continuation.yield(.targetUpToDate(.init(guid: message.guid)))
         case let message as BuildOperationTargetEnded:
             assert(state == .running, "invalid state: \(state)")
-#if DEBUG
-            guard activeTargets.remove(message.id) != nil else {
-                fatalError("unexpected target message")
-            }
-#endif
+            #if DEBUG
+                guard activeTargets.remove(message.id) != nil else {
+                    fatalError("unexpected target message")
+                }
+            #endif
             continuation.yield(.init(message))
         case let message as BuildOperationTaskUpToDate:
             continuation.yield(.init(message))
         case let message as BuildOperationTaskStarted:
             assert(state == .requested || state == .running, "invalid state: \(state)")
-#if DEBUG
-            do {
-                let inserted = activeTasks.insert(message.id).inserted
-                assert(inserted)
-            }
-#endif
+            #if DEBUG
+                do {
+                    let inserted = activeTasks.insert(message.id).inserted
+                    assert(inserted)
+                }
+            #endif
             continuation.yield(.init(message))
         case let message as BuildOperationTaskEnded:
             assert(state == .requested || state == .running, "invalid state: \(state)")
-#if DEBUG
-            do {
-                guard activeTasks.remove(message.id) != nil else {
-                    fatalError("unexpected target message")
+            #if DEBUG
+                do {
+                    guard activeTasks.remove(message.id) != nil else {
+                        fatalError("unexpected target message")
+                    }
                 }
-            }
-#endif
+            #endif
             continuation.yield(.init(message))
         case let message as BuildOperationTargetPreparedForIndex:
             assert(state == .running, "invalid state: \(state)")
diff --git a/Sources/SwiftBuild/SWBBuildRequest.swift b/Sources/SwiftBuild/SWBBuildRequest.swift
index ba20964f..32b2245d 100644
--- a/Sources/SwiftBuild/SWBBuildRequest.swift
+++ b/Sources/SwiftBuild/SWBBuildRequest.swift
@@ -300,7 +300,7 @@ public struct SWBBuildRequest: Codable, Sendable {
     /// Whether or not legacy build locations are being used. Currently, this flag is only relevant for clean build folder.
     public var useLegacyBuildLocations = false
 
-    public init() { }
+    public init() {}
 
     /// Add a configured target to build to the request.
     public mutating func add(target configuredTarget: SWBConfiguredTarget) {
diff --git a/Sources/SwiftBuild/SWBBuildService.swift b/Sources/SwiftBuild/SWBBuildService.swift
index 66429672..e5813a3f 100644
--- a/Sources/SwiftBuild/SWBBuildService.swift
+++ b/Sources/SwiftBuild/SWBBuildService.swift
@@ -15,7 +15,6 @@ public import Foundation
 import SWBProtocol
 import SWBUtil
 
-
 /// A generic error from Swift Build.
 //
 // FIXME: We should refine this.
@@ -124,7 +123,7 @@ public final class SWBBuildService: Sendable {
         IPCMessage(message).serialize(to: serializer)
         let contents = serializer.byteString
 
-        contents.bytes.withUnsafeBytes{ buffer in
+        contents.bytes.withUnsafeBytes { buffer in
             self.connection.send(SWBDispatchData(bytes: buffer), onChannel: channel)
         }
     }
@@ -134,7 +133,7 @@ public final class SWBBuildService: Sendable {
     }
 
     internal func openChannel(handler block: @Sendable @escaping (UInt64, any Message) -> Void) -> UInt64 {
-        return self.connection.openChannel{ channel, data in
+        return self.connection.openChannel { channel, data in
             // Deserialize the message.
             //
             // FIXME: Shouldn't need to copy here.
@@ -195,7 +194,7 @@ public final class SWBBuildService: Sendable {
     }
 
     // ABI compatibility
-    public func createSession(name: String, developerPath: String? = nil, cachePath: String?, inferiorProductsPath: String?, environment: [String:String]?) async -> (Result<SWBBuildServiceSession, any Error>, [SwiftBuildMessage.DiagnosticInfo]) {
+    public func createSession(name: String, developerPath: String? = nil, cachePath: String?, inferiorProductsPath: String?, environment: [String: String]?) async -> (Result<SWBBuildServiceSession, any Error>, [SwiftBuildMessage.DiagnosticInfo]) {
         await createSession(name: name, developerPath: developerPath, resourceSearchPaths: [], cachePath: cachePath, inferiorProductsPath: inferiorProductsPath, environment: environment)
     }
 
@@ -207,7 +206,7 @@ public final class SWBBuildService: Sendable {
     ///   - inferiorProductsPath: If provided, the path to where inferior Xcode build data is located.
     ///   - environment: If provided, a set of environment variables that are relevant to the build session's context
     /// - returns: The new session.
-    public func createSession(name: String, developerPath: String? = nil, resourceSearchPaths: [String], cachePath: String?, inferiorProductsPath: String?, environment: [String:String]?) async -> (Result<SWBBuildServiceSession, any Error>, [SwiftBuildMessage.DiagnosticInfo]) {
+    public func createSession(name: String, developerPath: String? = nil, resourceSearchPaths: [String], cachePath: String?, inferiorProductsPath: String?, environment: [String: String]?) async -> (Result<SWBBuildServiceSession, any Error>, [SwiftBuildMessage.DiagnosticInfo]) {
         do {
             let response = try await send(request: CreateSessionRequest(name: name, developerPath: developerPath.map(Path.init), resourceSearchPaths: resourceSearchPaths.map(Path.init), cachePath: cachePath.map(Path.init), inferiorProductsPath: inferiorProductsPath.map(Path.init), environment: environment))
             let diagnostics = response.diagnostics.map { SwiftBuildMessage.DiagnosticInfo(.init($0, .global)) }
@@ -221,7 +220,7 @@ public final class SWBBuildService: Sendable {
         }
     }
 
-    public func createSession(name: String, swiftToolchainPath: String, resourceSearchPaths: [String], cachePath: String?, inferiorProductsPath: String?, environment: [String:String]?) async -> (Result<SWBBuildServiceSession, any Error>, [SwiftBuildMessage.DiagnosticInfo]) {
+    public func createSession(name: String, swiftToolchainPath: String, resourceSearchPaths: [String], cachePath: String?, inferiorProductsPath: String?, environment: [String: String]?) async -> (Result<SWBBuildServiceSession, any Error>, [SwiftBuildMessage.DiagnosticInfo]) {
         do {
             let response = try await send(request: CreateSessionRequest(name: name, developerPath: .swiftToolchain(Path(swiftToolchainPath)), resourceSearchPaths: resourceSearchPaths.map(Path.init), cachePath: cachePath.map(Path.init), inferiorProductsPath: inferiorProductsPath.map(Path.init), environment: environment))
             let diagnostics = response.diagnostics.map { SwiftBuildMessage.DiagnosticInfo(.init($0, .global)) }
diff --git a/Sources/SwiftBuild/SWBBuildServiceConnection.swift b/Sources/SwiftBuild/SWBBuildServiceConnection.swift
index 19efb51c..ce45a46a 100644
--- a/Sources/SwiftBuild/SWBBuildServiceConnection.swift
+++ b/Sources/SwiftBuild/SWBBuildServiceConnection.swift
@@ -17,9 +17,9 @@ import SWBUtil
 public import Foundation
 
 #if canImport(System)
-import System
+    import System
 #else
-import SystemPackage
+    import SystemPackage
 #endif
 
 typealias swb_build_service_connection_message_handler_t = @Sendable (UInt64, SWBDispatchData) -> Void
@@ -155,10 +155,10 @@ typealias swb_build_service_connection_message_handler_t = @Sendable (UInt64, SW
         _isClosed.withLock { closed in
             if !closed {
                 #if os(Windows)
-                // FIXME: This is getting hit sometimes in the test suite
-                print("connection wasn’t closed before being deallocated")
+                    // FIXME: This is getting hit sometimes in the test suite
+                    print("connection wasn’t closed before being deallocated")
                 #else
-                assertionFailure("connection wasn’t closed before being deallocated")
+                    assertionFailure("connection wasn’t closed before being deallocated")
                 #endif
             }
         }
@@ -178,7 +178,8 @@ typealias swb_build_service_connection_message_handler_t = @Sendable (UInt64, SW
 
             guard let binaryFile = FileHandle(forReadingAtPath: asanDylib),
                 let macho = try? MachO(data: binaryFile),
-                let rpaths = try? macho.slices()[0].rpaths() else {
+                let rpaths = try? macho.slices()[0].rpaths()
+            else {
                 throw StubError.error("Could not open client library executable at \(asanDylib)")
             }
 
@@ -188,25 +189,26 @@ typealias swb_build_service_connection_message_handler_t = @Sendable (UInt64, SW
                 //  - From xcodebuild.
                 //  - Environments in which DEVELOPER_DIR is set in the environment, such as our tests being run by the xctest agent.  This will be used instead of looking at the main bundle.
                 // Note that we can't assume the Xcode bundle is named 'Xcode.app' - people name that bundle all sorts of things.
-                let currentXcodeApp = getEnvironmentVariable("DEVELOPER_DIR").map({ Path($0).normalize().dirname.dirname.str }) ?? { () -> String in
-                    let executablePath = Path(Bundle.main.executablePath ?? "")
-                    switch executablePath {
-                    case _ where executablePath.basename.hasPrefix("xcodebuild"):
-                        // Remove 'Contents/Developer/usr/bin/xcodebuild*'.
-                        return executablePath.dirname.dirname.dirname.dirname.dirname.str
-                    default:
-                        // Otherwise we assume we were called from Xcode.app and we return our main bundle's path.
-                        return Bundle.main.bundlePath
-                    }
-                }()
+                let currentXcodeApp =
+                    getEnvironmentVariable("DEVELOPER_DIR").map({ Path($0).normalize().dirname.dirname.str })
+                    ?? { () -> String in
+                        let executablePath = Path(Bundle.main.executablePath ?? "")
+                        switch executablePath {
+                        case _ where executablePath.basename.hasPrefix("xcodebuild"):
+                            // Remove 'Contents/Developer/usr/bin/xcodebuild*'.
+                            return executablePath.dirname.dirname.dirname.dirname.dirname.str
+                        default:
+                            // Otherwise we assume we were called from Xcode.app and we return our main bundle's path.
+                            return Bundle.main.bundlePath
+                        }
+                    }()
                 for rpath in rpaths {
                     // Now we look for the rpath the linker added.  We expect it to end in "lib/darwin".  Additionally we expect it to either contain "/Applications/Xcode.app/", or be a path into DEVELOPER_DIR (for unit testing, since the main bundle will be the test runner).
                     if rpath.hasSuffix("lib/darwin") {
                         var xcodeRelativeRpath: String? = nil
                         if rpath.starts(with: currentXcodeApp + "/") {
                             xcodeRelativeRpath = "\(rpath.dropFirst((currentXcodeApp + "/").count))"
-                        }
-                        else if rpath.contains("/Applications/Xcode.app/") {
+                        } else if rpath.contains("/Applications/Xcode.app/") {
                             if let endOfXcodeApp = rpath.range(of: "/Applications/Xcode.app/")?.upperBound {
                                 xcodeRelativeRpath = String(rpath[endOfXcodeApp...])
                             }
@@ -224,12 +226,18 @@ typealias swb_build_service_connection_message_handler_t = @Sendable (UInt64, SW
 
             // Only launch in asan mode if we were able to find the dylib, matching Xcode's behavior.
             if let asanDylib = asanDylibPath, let url = serviceExecutableURL(for: variant, serviceBundleURL: serviceBundleURL), url.lastPathComponent.hasSuffix("_asan") {
-                return (url, environment.merging([
-                    "DYLD_INSERT_LIBRARIES": asanDylib,
-
-                    // If asan is enabled, inject the DYLD_IMAGE_SUFFIX environment variable so that the service loads up the _asan framework variants if they're present.
-                    "DYLD_IMAGE_SUFFIX": "_asan"
-                ], uniquingKeysWith: { _, new in new }))
+                return (
+                    url,
+                    environment.merging(
+                        [
+                            "DYLD_INSERT_LIBRARIES": asanDylib,
+
+                            // If asan is enabled, inject the DYLD_IMAGE_SUFFIX environment variable so that the service loads up the _asan framework variants if they're present.
+                            "DYLD_IMAGE_SUFFIX": "_asan",
+                        ],
+                        uniquingKeysWith: { _, new in new }
+                    )
+                )
             }
         }
 
@@ -266,8 +274,8 @@ typealias swb_build_service_connection_message_handler_t = @Sendable (UInt64, SW
         }
 
         // Wait for any ongoing dispatch I/O to finish.
-        _stateQueue.blocking_sync { _stdinWriter }?.barrier { }
-        _stateQueue.blocking_sync { _stdoutReader }?.barrier { }
+        _stateQueue.blocking_sync { _stdinWriter }?.barrier {}
+        _stateQueue.blocking_sync { _stdoutReader }?.barrier {}
     }
 
     /// Resumes the connection.  Does nothing if the connection isn’t currently suspended.
@@ -351,10 +359,10 @@ typealias swb_build_service_connection_message_handler_t = @Sendable (UInt64, SW
 
         // Close down the send and receive queues.
         await _stateQueue.sync { [self] in
-            _stdinWriter?.barrier { }
+            _stdinWriter?.barrier {}
             _stdinWriter?.close()
             _stdinWriter = nil
-            _stdoutReader?.barrier { }
+            _stdoutReader?.barrier {}
             _stdoutReader?.close()
             _stdoutReader = nil
         }
@@ -406,7 +414,7 @@ extension SWBBuildServiceConnection {
         // Create the header, which consists of the channel number followed by the payload size.
         var headerData = withUnsafeBytes(of: channel.littleEndian) { SWBDispatchData(bytes: $0) }
         withUnsafeBytes(of: UInt32(data.count).littleEndian) { headerData.append($0) }
-        assert(headerData.count == 12) // UInt64 + UInt32
+        assert(headerData.count == 12)  // UInt64 + UInt32
         headerData.append(data)
 
         // Schedule the dispatch I/O operation to write the header followed by the payload.
@@ -467,19 +475,16 @@ extension SWBBuildServiceConnection {
             let bundleURL: URL? =
                 if case let candidateURL = executableURL.deletingLastPathComponent(), candidateURL.pathExtension == "bundle" {
                     candidateURL
-                }
-                else if case let candidateURL = executableURL.deletingLastPathComponent().deletingLastPathComponent().deletingLastPathComponent(), candidateURL.pathExtension == "bundle" {
+                } else if case let candidateURL = executableURL.deletingLastPathComponent().deletingLastPathComponent().deletingLastPathComponent(), candidateURL.pathExtension == "bundle" {
                     candidateURL
-                }
-                else {
+                } else {
                     nil
                 }
 
             let bundle: Bundle? =
                 if let bundleURL {
                     Bundle(url: bundleURL)
-                }
-                else {
+                } else {
                     nil
                 }
 
@@ -500,7 +505,8 @@ extension SWBBuildServiceConnection {
         // Look for the service inside a PlugIns bundle.
         if let buildServiceBundleURL = Bundle(for: SWBBuildServiceConnection.self).builtInPlugInsURL?.appendingPathComponent("SWBBuildService.bundle"),
             let bundle = Bundle(url: buildServiceBundleURL),
-            let executableURL = bundle.executableURL {
+            let executableURL = bundle.executableURL
+        {
             if useASanMode, let asanExecutableURL = executableURL.asanURLVariant {
                 return BuildServiceLocation(executable: asanExecutableURL, bundle: bundle)
             }
@@ -646,9 +652,9 @@ extension SWBBuildServiceConnectionMode {
             return try InProcessConnection(variant: variant, serviceBundleURL: serviceBundleURL, stdinPipe: stdinPipe, stdoutPipe: stdoutPipe)
         case .outOfProcess:
             #if os(macOS) || targetEnvironment(macCatalyst) || !canImport(Darwin)
-            return try OutOfProcessConnection(variant: variant, serviceBundleURL: serviceBundleURL, stdinPipe: stdinPipe, stdoutPipe: stdoutPipe)
+                return try OutOfProcessConnection(variant: variant, serviceBundleURL: serviceBundleURL, stdinPipe: stdinPipe, stdoutPipe: stdoutPipe)
             #else
-            throw StubError.error("Out-of-process mode is unavailable; use in-process mode.")
+                throw StubError.error("Out-of-process mode is unavailable; use in-process mode.")
             #endif
         }
     }
@@ -712,16 +718,21 @@ fileprivate final class InProcessStaticConnection: ConnectionTransport {
             buildServicePlugInsDirectory = URL(fileURLWithPath: path.dirname.str, isDirectory: true)
         }
         launched = true
-        self.startFunc(Int32(inputFD), Int32(outputFD), buildServicePlugInsDirectory, { [done, terminationHandler] error in
-            defer { done.signal() }
-
-            #if !canImport(Darwin)
-            // Workaround for a compiler crash presumably related to Objective-C bridging on non-Darwin platforms (rdar://130826719&136043295)
-            terminationHandler?(error as! (any Error)?)
-            #else
-            terminationHandler?(error)
-            #endif
-        })
+        self.startFunc(
+            Int32(inputFD),
+            Int32(outputFD),
+            buildServicePlugInsDirectory,
+            { [done, terminationHandler] error in
+                defer { done.signal() }
+
+                #if !canImport(Darwin)
+                    // Workaround for a compiler crash presumably related to Objective-C bridging on non-Darwin platforms (rdar://130826719&136043295)
+                    terminationHandler?(error as! (any Error)?)
+                #else
+                    terminationHandler?(error)
+                #endif
+            }
+        )
     }
 
     func terminate() async {
@@ -783,8 +794,7 @@ fileprivate final class InProcessConnection: ConnectionTransport {
             let buildServiceFrameworkExecutableURL: URL
             if variant.useASanMode {
                 buildServiceFrameworkExecutableURL = normalBuildServiceFrameworkExecutableURL.asanURLVariant ?? normalBuildServiceFrameworkExecutableURL
-            }
-            else {
+            } else {
                 buildServiceFrameworkExecutableURL = normalBuildServiceFrameworkExecutableURL
             }
 
@@ -813,10 +823,10 @@ fileprivate final class InProcessConnection: ConnectionTransport {
 
         let entryPointName = "swiftbuildServiceEntryPoint"
         #if !canImport(Darwin)
-        // Workaround for a compiler crash presumably related to Objective-C bridging on non-Darwin platforms (rdar://130826719&136043295)
-        typealias swiftbuildServiceEntryPoint_t = @convention(c) (Int32, Int32, URL?, @Sendable @escaping (Any) -> Void) -> Void
+            // Workaround for a compiler crash presumably related to Objective-C bridging on non-Darwin platforms (rdar://130826719&136043295)
+            typealias swiftbuildServiceEntryPoint_t = @convention(c) (Int32, Int32, URL?, @Sendable @escaping (Any) -> Void) -> Void
         #else
-        typealias swiftbuildServiceEntryPoint_t = @convention(c) (Int32, Int32, URL?, @Sendable @escaping ((any Error)?) -> Void) -> Void
+            typealias swiftbuildServiceEntryPoint_t = @convention(c) (Int32, Int32, URL?, @Sendable @escaping ((any Error)?) -> Void) -> Void
         #endif
         guard let entryPointFunc: swiftbuildServiceEntryPoint_t = Library.lookup(handle, entryPointName) else {
             throw StubError.error("unable to find \(entryPointName) function in service executable")
@@ -827,16 +837,21 @@ fileprivate final class InProcessConnection: ConnectionTransport {
 
         // Launch the service, in process (on background queues).
         launched = true
-        entryPointFunc(Int32(inputFD), Int32(outputFD), buildServicePlugInsDirectory, { [done, terminationHandler] error in
-            defer { done.signal() }
-
-            #if !canImport(Darwin)
-            // Workaround for a compiler crash presumably related to Objective-C bridging on non-Darwin platforms (rdar://130826719&136043295)
-            terminationHandler?(error as! (any Error)?)
-            #else
-            terminationHandler?(error)
-            #endif
-        })
+        entryPointFunc(
+            Int32(inputFD),
+            Int32(outputFD),
+            buildServicePlugInsDirectory,
+            { [done, terminationHandler] error in
+                defer { done.signal() }
+
+                #if !canImport(Darwin)
+                    // Workaround for a compiler crash presumably related to Objective-C bridging on non-Darwin platforms (rdar://130826719&136043295)
+                    terminationHandler?(error as! (any Error)?)
+                #else
+                    terminationHandler?(error)
+                #endif
+            }
+        )
     }
 
     func terminate() async {
@@ -851,127 +866,127 @@ fileprivate final class InProcessConnection: ConnectionTransport {
 }
 
 #if os(macOS) || targetEnvironment(macCatalyst) || !canImport(Darwin)
-fileprivate final class OutOfProcessConnection: ConnectionTransport {
-    private let task: SWBUtil.Process
-    private let done = WaitCondition()
-
-    init(variant: SWBBuildServiceVariant, serviceBundleURL: URL?, stdinPipe: IOPipe, stdoutPipe: IOPipe) throws {
-        /// Create and configure an NSTask for launching the Swift Build subprocess.
-        task = Process()
-
-        // Compute the launch path and environment.
-        var updatedEnvironment = ProcessInfo.processInfo.environment
-        // Add the contents of the SWBBuildServiceEnvironmentOverrides user default.
-        updatedEnvironment = updatedEnvironment.addingContents(of: (UserDefaults.standard.dictionary(forKey: "SWBBuildServiceEnvironmentOverrides") as? [String: String]) ?? [:])
-        // Remove inferior DYLD_LIBRARY_PATH paths into toolchains, or which contain a compiler library known to cause issues when mismatched. Swift Build does not need these when used by an inferior Xcode, and they can interfere with loading of correct clang and swift libraries.
-        if let libraryPaths = updatedEnvironment["DYLD_LIBRARY_PATH"]?.components(separatedBy: ":") {
-            updatedEnvironment["DYLD_LIBRARY_PATH"] = try libraryPaths.filter {
-                var path = Path($0).normalize()
-                let libExt = try ProcessInfo.processInfo.hostOperatingSystem().imageFormat.dynamicLibraryExtension
-                for knownCompilerLibrary in ["libclang.\(libExt)", "lib_InternalSwiftScan.\(libExt)"] {
-                    if localFS.exists(path.join(knownCompilerLibrary)) {
-                        return false
+    fileprivate final class OutOfProcessConnection: ConnectionTransport {
+        private let task: SWBUtil.Process
+        private let done = WaitCondition()
+
+        init(variant: SWBBuildServiceVariant, serviceBundleURL: URL?, stdinPipe: IOPipe, stdoutPipe: IOPipe) throws {
+            /// Create and configure an NSTask for launching the Swift Build subprocess.
+            task = Process()
+
+            // Compute the launch path and environment.
+            var updatedEnvironment = ProcessInfo.processInfo.environment
+            // Add the contents of the SWBBuildServiceEnvironmentOverrides user default.
+            updatedEnvironment = updatedEnvironment.addingContents(of: (UserDefaults.standard.dictionary(forKey: "SWBBuildServiceEnvironmentOverrides") as? [String: String]) ?? [:])
+            // Remove inferior DYLD_LIBRARY_PATH paths into toolchains, or which contain a compiler library known to cause issues when mismatched. Swift Build does not need these when used by an inferior Xcode, and they can interfere with loading of correct clang and swift libraries.
+            if let libraryPaths = updatedEnvironment["DYLD_LIBRARY_PATH"]?.components(separatedBy: ":") {
+                updatedEnvironment["DYLD_LIBRARY_PATH"] = try libraryPaths.filter {
+                    var path = Path($0).normalize()
+                    let libExt = try ProcessInfo.processInfo.hostOperatingSystem().imageFormat.dynamicLibraryExtension
+                    for knownCompilerLibrary in ["libclang.\(libExt)", "lib_InternalSwiftScan.\(libExt)"] {
+                        if localFS.exists(path.join(knownCompilerLibrary)) {
+                            return false
+                        }
                     }
-                }
-                while !path.isRoot && !path.isEmpty {
-                    if path.fileExtension == "xctoolchain" {
-                        return false
+                    while !path.isRoot && !path.isEmpty {
+                        if path.fileExtension == "xctoolchain" {
+                            return false
+                        }
+                        path = path.dirname
+                    }
+                    return true
+                }.joined(separator: ":")
+            }
+            let (launchURL, environment) = try SWBBuildServiceConnection.effectiveLaunchURL(for: variant, serviceBundleURL: serviceBundleURL, environment: updatedEnvironment)
+
+            #if os(macOS) || targetEnvironment(macCatalyst)
+                let hostVersion = try Version(ProcessInfo.processInfo.operatingSystemVersion)
+                if let buildVersion = try MachO(reader: BinaryReader(data: FileHandle(forReadingFrom: launchURL))).slices().flatMap({ try $0.buildVersions() }).filter({ $0.platform == .macOS }).only {
+                    if buildVersion.minOSVersion > hostVersion {
+                        throw StubError.error("Couldn't launch the build service process '\(try launchURL.filePath.str)' because it requires macOS \(buildVersion.minOSVersion.canonicalDeploymentTargetForm) or later (running macOS \(hostVersion.canonicalDeploymentTargetForm)).")
                     }
-                    path = path.dirname
                 }
-                return true
-            }.joined(separator: ":")
-        }
-        let (launchURL, environment) = try SWBBuildServiceConnection.effectiveLaunchURL(for: variant, serviceBundleURL: serviceBundleURL, environment: updatedEnvironment)
+            #endif
 
-        #if os(macOS) || targetEnvironment(macCatalyst)
-        let hostVersion = try Version(ProcessInfo.processInfo.operatingSystemVersion)
-        if let buildVersion = try MachO(reader: BinaryReader(data: FileHandle(forReadingFrom: launchURL))).slices().flatMap({ try $0.buildVersions() }).filter({ $0.platform == .macOS }).only {
-            if buildVersion.minOSVersion > hostVersion {
-                throw StubError.error("Couldn't launch the build service process '\(try launchURL.filePath.str)' because it requires macOS \(buildVersion.minOSVersion.canonicalDeploymentTargetForm) or later (running macOS \(hostVersion.canonicalDeploymentTargetForm)).")
+            task.executableURL = launchURL
+            task.currentDirectoryURL = launchURL.deletingLastPathComponent()
+            task.environment = environment
+
+            // Similar to the rationale for giving 'userInitiated' QoS for the 'SWBBuildService.ServiceHostConnection.receiveQueue' queue (see comments for that).
+            // Start the service subprocess with the max QoS so it is setup to service 'userInitiated' requests if required.
+            task.qualityOfService = .userInitiated
+
+            task.standardInput = FileHandle(fileDescriptor: stdinPipe.readEnd.rawValue)
+            task.standardOutput = FileHandle(fileDescriptor: stdoutPipe.writeEnd.rawValue)
+        }
+
+        var state: SWBBuildServiceConnection.State {
+            if task.isRunning {
+                return .running
+            } else {
+                switch task.terminationReason {
+                case .exit:
+                    return .exited
+                case .uncaughtSignal:
+                    return .crashed
+                #if canImport(Foundation.NSTask) || !canImport(Darwin)
+                    @unknown default:
+                        preconditionFailure()
+                #endif
+                }
             }
         }
-        #endif
-
-        task.executableURL = launchURL
-        task.currentDirectoryURL = launchURL.deletingLastPathComponent()
-        task.environment = environment
-
-        // Similar to the rationale for giving 'userInitiated' QoS for the 'SWBBuildService.ServiceHostConnection.receiveQueue' queue (see comments for that).
-        // Start the service subprocess with the max QoS so it is setup to service 'userInitiated' requests if required.
-        task.qualityOfService = .userInitiated
 
-        task.standardInput = FileHandle(fileDescriptor: stdinPipe.readEnd.rawValue)
-        task.standardOutput = FileHandle(fileDescriptor: stdoutPipe.writeEnd.rawValue)
-    }
-
-    var state: SWBBuildServiceConnection.State {
-        if task.isRunning {
-            return .running
-        } else {
-            switch task.terminationReason {
-            case .exit:
-                return .exited
-            case .uncaughtSignal:
-                return .crashed
-            #if canImport(Foundation.NSTask) || !canImport(Darwin)
-            @unknown default:
-                preconditionFailure()
-            #endif
-            }
+        var subprocessPID: pid_t? {
+            return task.processIdentifier
         }
-    }
 
-    var subprocessPID: pid_t? {
-        return task.processIdentifier
-    }
+        func start(terminationHandler: (@Sendable ((any Error)?) -> Void)?) throws {
+            // Install a termination handler that suspends us if we detect the termination of the subprocess.
+            task.terminationHandler = { [self] task in
+                defer { done.signal() }
 
-    func start(terminationHandler: (@Sendable ((any Error)?) -> Void)?) throws {
-        // Install a termination handler that suspends us if we detect the termination of the subprocess.
-        task.terminationHandler = { [self] task in
-            defer { done.signal() }
+                do {
+                    try terminationHandler?(RunProcessNonZeroExitError(task))
+                } catch {
+                    terminationHandler?(error)
+                }
+            }
 
             do {
-                try terminationHandler?(RunProcessNonZeroExitError(task))
+                // Launch the Swift Build subprocess.
+                try task.run()
             } catch {
-                terminationHandler?(error)
+                // terminationHandler isn't going to be called if `run()` throws.
+                done.signal()
+                throw error
             }
-        }
 
-        do {
-            // Launch the Swift Build subprocess.
-            try task.run()
-        } catch {
-            // terminationHandler isn't going to be called if `run()` throws.
-            done.signal()
-            throw error
+            #if os(macOS)
+                do {
+                    // If IBAutoAttach is enabled, send the message so Xcode will attach to the inferior.
+                    try Debugger.requestXcodeAutoAttachIfEnabled(task.processIdentifier)
+                } catch {
+                    // Terminate the subprocess if start() is going to throw, so that close() will not get stuck.
+                    task.terminate()
+                }
+            #endif
         }
 
-        #if os(macOS)
-        do {
-            // If IBAutoAttach is enabled, send the message so Xcode will attach to the inferior.
-            try Debugger.requestXcodeAutoAttachIfEnabled(task.processIdentifier)
-        } catch {
-            // Terminate the subprocess if start() is going to throw, so that close() will not get stuck.
+        func terminate() async {
+            assert(task.processIdentifier > 0)
             task.terminate()
+            await done.wait()
+            assert(!task.isRunning)
         }
-        #endif
-    }
-
-    func terminate() async {
-        assert(task.processIdentifier > 0)
-        task.terminate()
-        await done.wait()
-        assert(!task.isRunning)
-    }
 
-    /// Wait for the subprocess to terminate.
-    func close() async {
-        assert(task.processIdentifier > 0)
-        await done.wait()
-        assert(!task.isRunning)
+        /// Wait for the subprocess to terminate.
+        func close() async {
+            assert(task.processIdentifier > 0)
+            await done.wait()
+            assert(!task.isRunning)
+        }
     }
-}
 #endif
 
 extension UnsafePointer where Pointee == UInt8 {
diff --git a/Sources/SwiftBuild/SWBBuildServiceConsole.swift b/Sources/SwiftBuild/SWBBuildServiceConsole.swift
index 397fddcd..c5267ade 100644
--- a/Sources/SwiftBuild/SWBBuildServiceConsole.swift
+++ b/Sources/SwiftBuild/SWBBuildServiceConsole.swift
@@ -88,9 +88,9 @@ extension SWBServiceConsoleError: CustomStringConvertible {
         // TODO: Display each error type differently?
         switch self {
         case SWBServiceConsoleError.failedCommandError(let msg),
-             SWBServiceConsoleError.invalidCommandError(let msg),
-             SWBServiceConsoleError.protocolError(let msg),
-             SWBServiceConsoleError.requestError(let msg):
+            SWBServiceConsoleError.invalidCommandError(let msg),
+            SWBServiceConsoleError.protocolError(let msg),
+            SWBServiceConsoleError.requestError(let msg):
             return msg
         }
     }
diff --git a/Sources/SwiftBuild/SWBBuildServiceSession.swift b/Sources/SwiftBuild/SWBBuildServiceSession.swift
index b86e3a52..c3eb8944 100644
--- a/Sources/SwiftBuild/SWBBuildServiceSession.swift
+++ b/Sources/SwiftBuild/SWBBuildServiceSession.swift
@@ -134,10 +134,10 @@ public final class SWBBuildServiceSession: Sendable {
         closed.withLock { closed in
             if !closed {
                 #if os(Windows)
-                // FIXME: This is getting hit sometimes in the test suite
-                print("Expected SWBBuildServiceSession to be closed before deinit")
+                    // FIXME: This is getting hit sometimes in the test suite
+                    print("Expected SWBBuildServiceSession to be closed before deinit")
                 #else
-                assertionFailure("Expected SWBBuildServiceSession to be closed before deinit")
+                    assertionFailure("Expected SWBBuildServiceSession to be closed before deinit")
                 #endif
             }
         }
@@ -245,7 +245,8 @@ public final class SWBBuildServiceSession: Sendable {
 
         return try SWBIndexingHeaderInfo(
             productName: msg.productName,
-            copiedPathMap: Dictionary(uniqueKeysWithValues: msg.copiedPathMap.map { (try AbsolutePath(validating: $0.key), try AbsolutePath(validating: $0.value)) }))
+            copiedPathMap: Dictionary(uniqueKeysWithValues: msg.copiedPathMap.map { (try AbsolutePath(validating: $0.key), try AbsolutePath(validating: $0.value)) })
+        )
     }
 
     /// Generate information about the documentation that will be built for a given build request.
@@ -264,9 +265,11 @@ public final class SWBBuildServiceSession: Sendable {
             throw StubError.error("The documentation info operation was cancelled.")
         }
 
-        return SWBDocumentationInfo(builtDocumentationBundles: msg.output.map {
-            SWBDocumentationBundleInfo(outputPath: $0.outputPath.normalize().str, targetIdentifier: $0.targetIdentifier)
-        })
+        return SWBDocumentationInfo(
+            builtDocumentationBundles: msg.output.map {
+                SWBDocumentationBundleInfo(outputPath: $0.outputPath.normalize().str, targetIdentifier: $0.targetIdentifier)
+            }
+        )
     }
 
     /// Generate and return information about the localizable content of a given build request.
@@ -441,7 +444,7 @@ public final class SWBBuildServiceSession: Sendable {
                 request: buildRequest.messagePayloadRepresentation,
                 targets: targets.map { TargetGUID(rawValue: $0.rawValue) }
             )
-         )
+        )
 
         return response.configuredTargets.map {
             SWBConfiguredTargetIdentifier(
@@ -453,7 +456,6 @@ public final class SWBBuildServiceSession: Sendable {
 
     // MARK: Macro evaluation
 
-
     // Helper methods to send a macro evaluation request and handle the response.
 
     /// Dispatch a macro evaluation request expecting a string response.
@@ -480,63 +482,58 @@ public final class SWBBuildServiceSession: Sendable {
         }
     }
 
-
     // Public methods to perform macro evaluations for a level and build parameters.
 
-    public func evaluateMacroAsString(_ macro: String, level: SWBMacroEvaluationLevel, buildParameters: SWBBuildParameters, overrides: [String : String]?) async throws -> String {
+    public func evaluateMacroAsString(_ macro: String, level: SWBMacroEvaluationLevel, buildParameters: SWBBuildParameters, overrides: [String: String]?) async throws -> String {
         let parameters = buildParameters.messagePayloadRepresentation
         let request = MacroEvaluationRequest(sessionHandle: uid, context: .components(level: level.toSWBRequest, buildParameters: parameters), request: .macro(macro), overrides: overrides, resultType: .string)
         return try await sendMacroEvaluationStringRequest(self, request)
     }
 
-    public func evaluateMacroAsStringList(_ macro: String, level: SWBMacroEvaluationLevel, buildParameters: SWBBuildParameters, overrides: [String : String]?) async throws -> [String] {
+    public func evaluateMacroAsStringList(_ macro: String, level: SWBMacroEvaluationLevel, buildParameters: SWBBuildParameters, overrides: [String: String]?) async throws -> [String] {
         let parameters = buildParameters.messagePayloadRepresentation
         let request = MacroEvaluationRequest(sessionHandle: uid, context: .components(level: level.toSWBRequest, buildParameters: parameters), request: .macro(macro), overrides: overrides, resultType: .stringList)
         return try await sendMacroEvaluationStringListRequest(self, request)
     }
 
-    public func evaluateMacroAsBoolean(_ macro: String, level: SWBMacroEvaluationLevel, buildParameters: SWBBuildParameters, overrides: [String : String]?) async throws -> Bool {
+    public func evaluateMacroAsBoolean(_ macro: String, level: SWBMacroEvaluationLevel, buildParameters: SWBBuildParameters, overrides: [String: String]?) async throws -> Bool {
         let parameters = buildParameters.messagePayloadRepresentation
         let request = MacroEvaluationRequest(sessionHandle: uid, context: .components(level: level.toSWBRequest, buildParameters: parameters), request: .macro(macro), overrides: overrides, resultType: .string)
         return try await sendMacroEvaluationStringRequest(self, request) == "YES"
     }
 
-    public func evaluateMacroExpressionAsString(_ expr: String, level: SWBMacroEvaluationLevel, buildParameters: SWBBuildParameters, overrides: [String : String]?) async throws -> String {
+    public func evaluateMacroExpressionAsString(_ expr: String, level: SWBMacroEvaluationLevel, buildParameters: SWBBuildParameters, overrides: [String: String]?) async throws -> String {
         let parameters = buildParameters.messagePayloadRepresentation
         let request = MacroEvaluationRequest(sessionHandle: uid, context: .components(level: level.toSWBRequest, buildParameters: parameters), request: .stringExpression(expr), overrides: overrides, resultType: .string)
         return try await sendMacroEvaluationStringRequest(self, request)
     }
 
-    public func evaluateMacroExpressionAsStringList(_ expr: String, level: SWBMacroEvaluationLevel, buildParameters: SWBBuildParameters, overrides: [String : String]?) async throws -> [String] {
+    public func evaluateMacroExpressionAsStringList(_ expr: String, level: SWBMacroEvaluationLevel, buildParameters: SWBBuildParameters, overrides: [String: String]?) async throws -> [String] {
         let parameters = buildParameters.messagePayloadRepresentation
         let request = MacroEvaluationRequest(sessionHandle: uid, context: .components(level: level.toSWBRequest, buildParameters: parameters), request: .stringExpression(expr), overrides: overrides, resultType: .stringList)
         return try await sendMacroEvaluationStringListRequest(self, request)
     }
 
-    public func evaluateMacroExpressionArrayAsStringList(_ expr: [String], level: SWBMacroEvaluationLevel, buildParameters: SWBBuildParameters, overrides: [String : String]?) async throws -> [String] {
+    public func evaluateMacroExpressionArrayAsStringList(_ expr: [String], level: SWBMacroEvaluationLevel, buildParameters: SWBBuildParameters, overrides: [String: String]?) async throws -> [String] {
         let parameters = buildParameters.messagePayloadRepresentation
         let request = MacroEvaluationRequest(sessionHandle: uid, context: .components(level: level.toSWBRequest, buildParameters: parameters), request: .stringExpressionArray(expr), overrides: overrides, resultType: .stringList)
         return try await sendMacroEvaluationStringListRequest(self, request)
     }
 
-
     // MARK: Other methods to get information about macros
 
-    public func allExportedMacroNamesAndValues(level: SWBMacroEvaluationLevel, buildParameters: SWBBuildParameters) async throws -> [String : String] {
+    public func allExportedMacroNamesAndValues(level: SWBMacroEvaluationLevel, buildParameters: SWBBuildParameters) async throws -> [String: String] {
         let parameters = buildParameters.messagePayloadRepresentation
         return try await service.send(request: AllExportedMacrosAndValuesRequest(sessionHandle: uid, context: .components(level: level.toSWBRequest, buildParameters: parameters))).result
     }
 
-
     // MARK: Build settings editor support
 
-
     public func buildSettingsEditorInfo(level: SWBMacroEvaluationLevel, buildParameters: SWBBuildParameters) async throws -> SWBBuildSettingsEditorInfo {
         let parameters = buildParameters.messagePayloadRepresentation
         return SWBBuildSettingsEditorInfo(from: try await service.send(request: BuildSettingsEditorInfoRequest(sessionHandle: uid, context: .components(level: level.toSWBRequest, buildParameters: parameters))).result)
     }
 
-
     /// Loads the workspace at the specified container path.
     ///
     /// The container path may be:
@@ -819,7 +816,7 @@ extension SWBBuildQoS {
 
 extension SWBBuildRequest {
     var messagePayloadRepresentation: BuildRequestMessagePayload {
-        return BuildRequestMessagePayload(parameters: parameters.messagePayloadRepresentation, configuredTargets: configuredTargets.map{ $0.messagePayloadRepresentation }, dependencyScope: dependencyScope.messagePayload, continueBuildingAfterErrors: continueBuildingAfterErrors, hideShellScriptEnvironment: hideShellScriptEnvironment, useParallelTargets: useParallelTargets, useImplicitDependencies: useImplicitDependencies, useDryRun: useDryRun, showNonLoggedProgress: showNonLoggedProgress, recordBuildBacktraces: recordBuildBacktraces, generatePrecompiledModulesReport: generatePrecompiledModulesReport, buildPlanDiagnosticsDirPath: buildPlanDiagnosticsDirPath.map(Path.init), buildCommand: buildCommand.messagePayloadRepresentation, schemeCommand: schemeCommand?.messagePayloadRepresentation, containerPath: containerPath.map(Path.init), buildDescriptionID: buildDescriptionID, qos: qos?.messagePayloadRepresentation, schedulerLaneWidthOverride: schedulerLaneWidthOverride, jsonRepresentation: try? jsonData())
+        return BuildRequestMessagePayload(parameters: parameters.messagePayloadRepresentation, configuredTargets: configuredTargets.map { $0.messagePayloadRepresentation }, dependencyScope: dependencyScope.messagePayload, continueBuildingAfterErrors: continueBuildingAfterErrors, hideShellScriptEnvironment: hideShellScriptEnvironment, useParallelTargets: useParallelTargets, useImplicitDependencies: useImplicitDependencies, useDryRun: useDryRun, showNonLoggedProgress: showNonLoggedProgress, recordBuildBacktraces: recordBuildBacktraces, generatePrecompiledModulesReport: generatePrecompiledModulesReport, buildPlanDiagnosticsDirPath: buildPlanDiagnosticsDirPath.map(Path.init), buildCommand: buildCommand.messagePayloadRepresentation, schemeCommand: schemeCommand?.messagePayloadRepresentation, containerPath: containerPath.map(Path.init), buildDescriptionID: buildDescriptionID, qos: qos?.messagePayloadRepresentation, schedulerLaneWidthOverride: schedulerLaneWidthOverride, jsonRepresentation: try? jsonData())
     }
 }
 
@@ -832,7 +829,7 @@ extension SWBConfiguredTarget {
 extension SWBBuildParameters {
     var messagePayloadRepresentation: BuildParametersMessagePayload {
         let overridesPayload = overrides.messagePayloadRepresentation
-        return BuildParametersMessagePayload(action: action ?? "", configuration: configurationName, activeRunDestination: activeRunDestination.flatMap{RunDestinationInfo($0)}, activeArchitecture: activeArchitecture, arenaInfo: arenaInfo.flatMap{ArenaInfo($0)}, overrides: overridesPayload)
+        return BuildParametersMessagePayload(action: action ?? "", configuration: configurationName, activeRunDestination: activeRunDestination.flatMap { RunDestinationInfo($0) }, activeArchitecture: activeArchitecture, arenaInfo: arenaInfo.flatMap { ArenaInfo($0) }, overrides: overridesPayload)
     }
 }
 
diff --git a/Sources/SwiftBuild/SWBPreviewSupport.swift b/Sources/SwiftBuild/SWBPreviewSupport.swift
index 4c1248bb..7cc65f72 100644
--- a/Sources/SwiftBuild/SWBPreviewSupport.swift
+++ b/Sources/SwiftBuild/SWBPreviewSupport.swift
@@ -32,11 +32,11 @@ public struct SWBPreviewInfo: SWBPreviewInfoContext, Equatable, Sendable {
     public let pifGUID: String
 
     public let compileCommandLine: [String]
-    public let linkCommandLine: [String] // empty when XOJIT is active
+    public let linkCommandLine: [String]  // empty when XOJIT is active
 
     public let thunkSourceFile: String
     public let thunkObjectFile: String
-    public let thunkLibrary: String // empty when XOJIT is active
+    public let thunkLibrary: String  // empty when XOJIT is active
 
     @_spi(Testing) public init(sdkRoot: String, sdkVariant: String?, buildVariant: String, architecture: String, compileCommandLine: [String], linkCommandLine: [String], thunkSourceFile: String, thunkObjectFile: String, thunkLibrary: String, pifGUID: String) {
         self.sdkRoot = sdkRoot
@@ -113,7 +113,7 @@ public struct SWBPreviewTargetDependencyInfo: SWBPreviewInfoContext, Hashable, S
         architecture: String,
         pifGUID: String,
         productModuleName: String,
-        objectFileInputMap: [String : Set<String>],
+        objectFileInputMap: [String: Set<String>],
         linkCommandLine: [String],
         linkerWorkingDirectory: String?,
         swiftEnableOpaqueTypeErasure: Bool,
diff --git a/Sources/SwiftBuild/SWBPropertyList.swift b/Sources/SwiftBuild/SWBPropertyList.swift
index 3b01e374..1d2a7cf7 100644
--- a/Sources/SwiftBuild/SWBPropertyList.swift
+++ b/Sources/SwiftBuild/SWBPropertyList.swift
@@ -119,7 +119,7 @@ extension SWBPropertyListItem {
         case let .plDouble(value):
             self = .plDouble(value)
         case let .plArray(value):
-            self = try .plArray(value.map { try .init($0 ) })
+            self = try .plArray(value.map { try .init($0) })
         case let .plDict(value):
             self = try .plDict(value.mapValues { try .init($0) })
         case let .plOpaque(value):
diff --git a/Sources/SwiftBuild/SWBSystemInfo.swift b/Sources/SwiftBuild/SWBSystemInfo.swift
index 7f127361..ac143b7b 100644
--- a/Sources/SwiftBuild/SWBSystemInfo.swift
+++ b/Sources/SwiftBuild/SWBSystemInfo.swift
@@ -20,7 +20,8 @@ public struct SWBSystemInfo: Sendable {
         return Self(
             operatingSystemVersion: processInfo.operatingSystemVersion,
             productBuildVersion: try processInfo.productBuildVersion().description,
-            nativeArchitecture: Architecture.host.stringValue ?? "undefined_arch")
+            nativeArchitecture: Architecture.host.stringValue ?? "undefined_arch"
+        )
     }
 
     public let operatingSystemVersion: OperatingSystemVersion
diff --git a/Sources/SwiftBuild/SWBTerminal.swift b/Sources/SwiftBuild/SWBTerminal.swift
index 86e57e8f..292a1ade 100644
--- a/Sources/SwiftBuild/SWBTerminal.swift
+++ b/Sources/SwiftBuild/SWBTerminal.swift
@@ -15,7 +15,7 @@ import SWBUtil
 
 import Foundation
 
-func swbuild_handle_command_result(result: SWBServiceConsoleResult)  {
+func swbuild_handle_command_result(result: SWBServiceConsoleResult) {
     print(result.output, terminator: "")
 }
 
diff --git a/Sources/SwiftBuild/SWBUserInfo.swift b/Sources/SwiftBuild/SWBUserInfo.swift
index f88bee58..1644a5a4 100644
--- a/Sources/SwiftBuild/SWBUserInfo.swift
+++ b/Sources/SwiftBuild/SWBUserInfo.swift
@@ -27,7 +27,8 @@ public struct SWBUserInfo: Sendable {
             gid: processInfo.effectiveGroupID,
             homeDirectory: Path.homeDirectory.str,
             processEnvironment: processInfo.cleanEnvironment,
-            buildSystemEnvironment: processInfo.cleanEnvironment)
+            buildSystemEnvironment: processInfo.cleanEnvironment
+        )
     }()
 
     public let userName: String
diff --git a/Sources/SwiftBuild/SWBuildMessage+Protocol.swift b/Sources/SwiftBuild/SWBuildMessage+Protocol.swift
index 7cdd1049..310ddf85 100644
--- a/Sources/SwiftBuild/SWBuildMessage+Protocol.swift
+++ b/Sources/SwiftBuild/SWBuildMessage+Protocol.swift
@@ -105,7 +105,7 @@ extension Array where Element == SwiftBuildMessage {
                 } else {
                     return .buildOutput(.init(data: dataString))
                 }
-            }()
+            }(),
         ]
     }
 
@@ -124,16 +124,18 @@ extension Array where Element == SwiftBuildMessage {
                 case .global:
                     return .buildDiagnostic(.init(message: message.message))
                 }
-            }()
+            }(),
         ]
     }
 }
 
 fileprivate extension Dictionary where Key == AbsolutePath, Value == AbsolutePath {
     init(_ other: [String: String]) throws {
-        self = try Dictionary(uniqueKeysWithValues: other.map {
-            try (AbsolutePath(validating: $0.key), AbsolutePath(validating: $0.value))
-        })
+        self = try Dictionary(
+            uniqueKeysWithValues: other.map {
+                try (AbsolutePath(validating: $0.key), AbsolutePath(validating: $0.value))
+            }
+        )
     }
 }
 
diff --git a/Sources/SwiftBuild/SwiftBuildVersion.swift b/Sources/SwiftBuild/SwiftBuildVersion.swift
index 8895010d..fc5a6e07 100644
--- a/Sources/SwiftBuild/SwiftBuildVersion.swift
+++ b/Sources/SwiftBuild/SwiftBuildVersion.swift
@@ -15,6 +15,6 @@ import SWBUtil
 import Foundation
 
 public func SwiftBuildGetVersion() throws -> String {
-    final class C { }
+    final class C {}
     return try ((Bundle(for: C.self).infoDictionary?["CFBundleVersion"] as? String).map { try Version($0) } ?? Version()).description
 }
diff --git a/Sources/SwiftBuild/TerminalAttributes.swift b/Sources/SwiftBuild/TerminalAttributes.swift
index 4f8fd2ab..e11db08c 100644
--- a/Sources/SwiftBuild/TerminalAttributes.swift
+++ b/Sources/SwiftBuild/TerminalAttributes.swift
@@ -14,7 +14,7 @@ import SWBLibc
 
 final class TerminalAttributes {
     #if !os(Windows)
-    private var term_attrs = termios()
+        private var term_attrs = termios()
     #endif
 
     fileprivate init() {
@@ -22,35 +22,35 @@ final class TerminalAttributes {
 
     fileprivate func save() {
         #if !os(Windows)
-        if tcgetattr(STDIN_FILENO, &term_attrs) == -1 {
-            // If we got an error here, just assume it is because the terminal wasn't capable.
-            return
-        }
+            if tcgetattr(STDIN_FILENO, &term_attrs) == -1 {
+                // If we got an error here, just assume it is because the terminal wasn't capable.
+                return
+            }
         #endif
     }
 
     fileprivate func restore() {
         #if !os(Windows)
-        // Ignore failures, there isn't anything we can do.
-        tcsetattr(STDIN_FILENO, TCSAFLUSH, &term_attrs)
+            // Ignore failures, there isn't anything we can do.
+            tcsetattr(STDIN_FILENO, TCSAFLUSH, &term_attrs)
         #endif
     }
 
     func disableEcho() {
         #if !os(Windows)
-        // Get the current terminal attributes.
-        var attrs = termios()
-        if tcgetattr(STDIN_FILENO, &attrs) == -1 {
-            // If we got an error here, just assume it is because the terminal wasn't capable.
-            return
-        }
+            // Get the current terminal attributes.
+            var attrs = termios()
+            if tcgetattr(STDIN_FILENO, &attrs) == -1 {
+                // If we got an error here, just assume it is because the terminal wasn't capable.
+                return
+            }
 
-        // Clear the echo flag and update the attributes.
-        attrs.c_lflag &= ~tcflag_t(ECHO)
-        if tcsetattr(STDIN_FILENO, TCSAFLUSH, &attrs) == -1 {
-            perror("tcsetattr")
-            return
-        }
+            // Clear the echo flag and update the attributes.
+            attrs.c_lflag &= ~tcflag_t(ECHO)
+            if tcsetattr(STDIN_FILENO, TCSAFLUSH, &attrs) == -1 {
+                perror("tcsetattr")
+                return
+            }
         #endif
     }
 }
diff --git a/Sources/SwiftBuildTestSupport/CoreQualificationTester.swift b/Sources/SwiftBuildTestSupport/CoreQualificationTester.swift
index 8495d9ff..1f8f3a93 100644
--- a/Sources/SwiftBuildTestSupport/CoreQualificationTester.swift
+++ b/Sources/SwiftBuildTestSupport/CoreQualificationTester.swift
@@ -71,35 +71,35 @@ final package class CoreQualificationTester: Sendable {
 
     package func checkResults(events: [SwiftBuildMessage], sourceLocation: SourceLocation = #_sourceLocation, _ block: (CoreQualificationTesterResults) async throws -> Void) async throws {
         //try await XCTContext.runActivity(named: "Analyze Build Results") { activity in
-            var loggedEvents: [String] = []
-            var diagnostics: [LoggedDiagnostic] = []
-            for event in events {
-                switch event {
-                case let .diagnostic(message):
-                    diagnostics.append(.init(message))
-                default:
-                    break
-                }
-                try loggedEvents.append(String(decoding: JSONEncoder(outputFormatting: [.sortedKeys, .withoutEscapingSlashes]).encode(event), as: UTF8.self))
+        var loggedEvents: [String] = []
+        var diagnostics: [LoggedDiagnostic] = []
+        for event in events {
+            switch event {
+            case let .diagnostic(message):
+                diagnostics.append(.init(message))
+            default:
+                break
             }
+            try loggedEvents.append(String(decoding: JSONEncoder(outputFormatting: [.sortedKeys, .withoutEscapingSlashes]).encode(event), as: UTF8.self))
+        }
 
-            // TODO: <rdar://59432231> Longer term, we should find a way to share code with BuildOperationTester, which has a number of APIs for building up a human readable build transcript.
-            //activity.attach(name: "Event Log", plistObject: loggedEvents)
-            //activity.attach(name: "Diagnostics", plistObject: diagnostics.map { $0.description })
-            //activity.attach(name: "Output", string: events.allOutput().bytes.unsafeStringValue)
+        // TODO: <rdar://59432231> Longer term, we should find a way to share code with BuildOperationTester, which has a number of APIs for building up a human readable build transcript.
+        //activity.attach(name: "Event Log", plistObject: loggedEvents)
+        //activity.attach(name: "Diagnostics", plistObject: diagnostics.map { $0.description })
+        //activity.attach(name: "Output", string: events.allOutput().bytes.unsafeStringValue)
 
-            let results = CoreQualificationTesterResults(events: events, diagnostics: diagnostics, fs: fs)
+        let results = CoreQualificationTesterResults(events: events, diagnostics: diagnostics, fs: fs)
 
-            defer {
-                let validationResults = results.validate(sourceLocation: sourceLocation)
+        defer {
+            let validationResults = results.validate(sourceLocation: sourceLocation)
 
-                // Print the event log in the case of unchecked errors/warnings, which is useful on platforms where XCTAttachment doesn't exist
-                if validationResults.hadUncheckedErrors || validationResults.hadUncheckedWarnings {
-                    Issue.record("Build failed with unchecked errors and/or warnings; event log follows:\n\n\(loggedEvents.joined(separator: "\n"))", sourceLocation: sourceLocation)
-                }
+            // Print the event log in the case of unchecked errors/warnings, which is useful on platforms where XCTAttachment doesn't exist
+            if validationResults.hadUncheckedErrors || validationResults.hadUncheckedWarnings {
+                Issue.record("Build failed with unchecked errors and/or warnings; event log follows:\n\n\(loggedEvents.joined(separator: "\n"))", sourceLocation: sourceLocation)
             }
+        }
 
-            try await block(results)
+        try await block(results)
         //}
     }
 }
@@ -287,7 +287,7 @@ package final class CoreQualificationTesterResults: DiagnosticsCheckingResult, F
 }
 
 @available(*, unavailable)
-extension CoreQualificationTesterResults: Sendable { }
+extension CoreQualificationTesterResults: Sendable {}
 
 package enum EntitlementsDestination: Sendable {
     case signed
@@ -393,8 +393,8 @@ fileprivate extension SwiftBuildMessage.DiagnosticInfo.Kind {
         case .remark:
             return .remark
         #if !SWIFT_PACKAGE
-        @unknown default:
-            preconditionFailure("Unknown Behavior value")
+            @unknown default:
+                preconditionFailure("Unknown Behavior value")
         #endif
         }
     }
diff --git a/Sources/SwiftBuildTestSupport/EmptyBuildOperationDelegate.swift b/Sources/SwiftBuildTestSupport/EmptyBuildOperationDelegate.swift
index fb2f62b7..1aada368 100644
--- a/Sources/SwiftBuildTestSupport/EmptyBuildOperationDelegate.swift
+++ b/Sources/SwiftBuildTestSupport/EmptyBuildOperationDelegate.swift
@@ -24,7 +24,7 @@ package final class EmptyBuildOperationDelegate: SWBPlanningOperationDelegate, S
         SWBProvisioningTaskInputs()
     }
 
-    package func executeExternalTool(commandLine: [String], workingDirectory: String?, environment: [String : String]) async throws -> SwiftBuild.SWBExternalToolResult {
+    package func executeExternalTool(commandLine: [String], workingDirectory: String?, environment: [String: String]) async throws -> SwiftBuild.SWBExternalToolResult {
         .deferred
     }
 }
diff --git a/Sources/SwiftBuildTestSupport/TaskBacktraces.swift b/Sources/SwiftBuildTestSupport/TaskBacktraces.swift
index e0f196fa..51b89532 100644
--- a/Sources/SwiftBuildTestSupport/TaskBacktraces.swift
+++ b/Sources/SwiftBuildTestSupport/TaskBacktraces.swift
@@ -23,13 +23,15 @@ import Foundation
 
 extension BuildOperationTester.BuildResults {
     private func getBacktraceID(_ task: Task, sourceLocation: SourceLocation = #_sourceLocation) -> BuildOperationBacktraceFrameEmitted.Identifier? {
-        guard let frameID: BuildOperationBacktraceFrameEmitted.Identifier = events.compactMap ({ (event) -> BuildOperationBacktraceFrameEmitted.Identifier? in
-            guard case .emittedBuildBacktraceFrame(let frame) = event, case .task(let signature) = frame.identifier, BuildOperationTaskSignature.taskIdentifier(ByteString(encodingAsUTF8: task.identifier.rawValue)) == signature else {
-                return nil
-            }
-            return frame.identifier
-            // Iff the task is a dynamic task, there may be more than one corresponding frame if it was requested multiple times, in which case we choose the first. Non-dynamic tasks always have a 1-1 relationship with frames.
-        }).sorted().first else {
+        guard
+            let frameID: BuildOperationBacktraceFrameEmitted.Identifier = events.compactMap({ (event) -> BuildOperationBacktraceFrameEmitted.Identifier? in
+                guard case .emittedBuildBacktraceFrame(let frame) = event, case .task(let signature) = frame.identifier, BuildOperationTaskSignature.taskIdentifier(ByteString(encodingAsUTF8: task.identifier.rawValue)) == signature else {
+                    return nil
+                }
+                return frame.identifier
+                // Iff the task is a dynamic task, there may be more than one corresponding frame if it was requested multiple times, in which case we choose the first. Non-dynamic tasks always have a 1-1 relationship with frames.
+            }).sorted().first
+        else {
             Issue.record("Did not find a single build backtrace frame for task: \(task.identifier)", sourceLocation: sourceLocation)
             return nil
         }
@@ -92,7 +94,7 @@ extension BuildOperationTester.BuildResults {
 
 extension BuildOperationTester {
     /// Ensure that the build is a null build.
-    package func checkNullBuild(_ name: String? = nil, parameters: BuildParameters? = nil, runDestination: RunDestinationInfo?, buildRequest inputBuildRequest: BuildRequest? = nil, buildCommand: BuildCommand? = nil, schemeCommand: SchemeCommand? = .launch, persistent: Bool = false, serial: Bool = false, buildOutputMap: [String:String]? = nil, signableTargets: Set<String> = [], signableTargetInputs: [String: ProvisioningTaskInputs] = [:], clientDelegate: (any ClientDelegate)? = nil, excludedTasks: Set<String> = ["ClangStatCache", "LinkAssetCatalogSignature"], diagnosticsToValidate: Set<DiagnosticKind> = [.note, .error, .warning], sourceLocation: SourceLocation = #_sourceLocation) async throws {
+    package func checkNullBuild(_ name: String? = nil, parameters: BuildParameters? = nil, runDestination: RunDestinationInfo?, buildRequest inputBuildRequest: BuildRequest? = nil, buildCommand: BuildCommand? = nil, schemeCommand: SchemeCommand? = .launch, persistent: Bool = false, serial: Bool = false, buildOutputMap: [String: String]? = nil, signableTargets: Set<String> = [], signableTargetInputs: [String: ProvisioningTaskInputs] = [:], clientDelegate: (any ClientDelegate)? = nil, excludedTasks: Set<String> = ["ClangStatCache", "LinkAssetCatalogSignature"], diagnosticsToValidate: Set<DiagnosticKind> = [.note, .error, .warning], sourceLocation: SourceLocation = #_sourceLocation) async throws {
 
         func body(results: BuildResults) throws -> Void {
             results.consumeTasksMatchingRuleTypes(excludedTasks)
diff --git a/Sources/SwiftBuildTestSupport/TestBuildOperationDelegate.swift b/Sources/SwiftBuildTestSupport/TestBuildOperationDelegate.swift
index 2ef9b99b..88eccfbf 100644
--- a/Sources/SwiftBuildTestSupport/TestBuildOperationDelegate.swift
+++ b/Sources/SwiftBuildTestSupport/TestBuildOperationDelegate.swift
@@ -28,15 +28,17 @@ package final class TestBuildOperationDelegate: SWBPlanningOperationDelegate, SW
 
         let identity = provisioningSourceData.signingCertificateIdentifier
         if identity == "-" {
-            let signedEntitlements = provisioningSourceData.entitlementsDestination == "Signature"
+            let signedEntitlements =
+                provisioningSourceData.entitlementsDestination == "Signature"
                 ? provisioningSourceData.productTypeEntitlements.merging(["application-identifier": .plString(provisioningSourceData.bundleIdentifier)], uniquingKeysWith: { _, new in new }).merging(provisioningSourceData.projectEntitlements ?? [:], uniquingKeysWith: { _, new in new })
                 : [:]
 
-            let simulatedEntitlements = provisioningSourceData.entitlementsDestination == "__entitlements"
+            let simulatedEntitlements =
+                provisioningSourceData.entitlementsDestination == "__entitlements"
                 ? provisioningSourceData.productTypeEntitlements.merging(["application-identifier": .plString(provisioningSourceData.bundleIdentifier)], uniquingKeysWith: { _, new in new }).merging(provisioningSourceData.projectEntitlements ?? [:], uniquingKeysWith: { _, new in new })
                 : [:]
 
-            return SWBProvisioningTaskInputs(identityHash: "-", identityName: "-", profileName: nil, profileUUID: nil, profilePath: nil, designatedRequirements: nil, signedEntitlements: signedEntitlements.merging(provisioningSourceData.sdkRoot.contains("simulator") ? ["get-task-allow": .plBool(true)] : [:], uniquingKeysWith: { _, new  in new }), simulatedEntitlements: simulatedEntitlements, appIdentifierPrefix: nil, teamIdentifierPrefix: nil, isEnterpriseTeam: nil, keychainPath: nil, errors: [], warnings: [])
+            return SWBProvisioningTaskInputs(identityHash: "-", identityName: "-", profileName: nil, profileUUID: nil, profilePath: nil, designatedRequirements: nil, signedEntitlements: signedEntitlements.merging(provisioningSourceData.sdkRoot.contains("simulator") ? ["get-task-allow": .plBool(true)] : [:], uniquingKeysWith: { _, new in new }), simulatedEntitlements: simulatedEntitlements, appIdentifierPrefix: nil, teamIdentifierPrefix: nil, isEnterpriseTeam: nil, keychainPath: nil, errors: [], warnings: [])
         } else if identity.isEmpty {
             return SWBProvisioningTaskInputs()
         } else {
@@ -44,10 +46,10 @@ package final class TestBuildOperationDelegate: SWBPlanningOperationDelegate, SW
         }
     }
 
-    package func executeExternalTool(commandLine: [String], workingDirectory: String?, environment: [String : String]) async throws -> SwiftBuild.SWBExternalToolResult {
+    package func executeExternalTool(commandLine: [String], workingDirectory: String?, environment: [String: String]) async throws -> SwiftBuild.SWBExternalToolResult {
         .deferred
     }
 }
 
 @available(*, unavailable)
-extension TestBuildOperationDelegate: Sendable { }
+extension TestBuildOperationDelegate: Sendable {}
diff --git a/Sources/SwiftBuildTestSupport/TestUtilities.swift b/Sources/SwiftBuildTestSupport/TestUtilities.swift
index f644a308..786c9b15 100644
--- a/Sources/SwiftBuildTestSupport/TestUtilities.swift
+++ b/Sources/SwiftBuildTestSupport/TestUtilities.swift
@@ -203,7 +203,7 @@ extension SWBRunDestinationInfo: _RunDestinationInfo {
 
 extension SWBBuildService {
     /// Overload of `createSession` which supplies an inferior products path.
-    package func createSession(name: String, developerPath: String? = nil, cachePath: String?, environment: [String:String] = [:]) async -> (Result<SWBBuildServiceSession, any Error>, [SwiftBuildMessage.DiagnosticInfo]) {
+    package func createSession(name: String, developerPath: String? = nil, cachePath: String?, environment: [String: String] = [:]) async -> (Result<SWBBuildServiceSession, any Error>, [SwiftBuildMessage.DiagnosticInfo]) {
         return await createSession(name: name, developerPath: developerPath, cachePath: cachePath, inferiorProductsPath: Core.inferiorProductsPath()?.str, environment: environment)
     }
 }
@@ -216,7 +216,8 @@ extension SWBBuildServiceSession {
             enableBuildSystemCaching: userPreferences.enableBuildSystemCaching,
             activityTextShorteningLevel: userPreferences.activityTextShorteningLevel.rawValue,
             usePerConfigurationBuildLocations: userPreferences.usePerConfigurationBuildLocations,
-            allowsExternalToolExecution: userPreferences.allowsExternalToolExecution)
+            allowsExternalToolExecution: userPreferences.allowsExternalToolExecution
+        )
     }
 
     package func generateIndexingFileSettings(for request: SWBBuildRequest, targetID: String, delegate: any SWBIndexingDelegate) async throws -> SWBIndexingFileSettings {
@@ -228,7 +229,8 @@ extension SWBSystemInfo {
     package static let defaultForTesting = Self(
         operatingSystemVersion: OperatingSystemVersion(majorVersion: 99, minorVersion: 99, patchVersion: 0),
         productBuildVersion: "99A1",
-        nativeArchitecture: "x86_64")
+        nativeArchitecture: "x86_64"
+    )
 }
 
 extension SWBUserInfo {
@@ -236,14 +238,14 @@ extension SWBUserInfo {
         var env: [String: String] = [:]
         let homeDirectory: String
         #if os(Windows)
-        homeDirectory = "C:\\Users\\exampleUser"
-        env = ["PATH": "FOO;BAR;BAZ"]
-        if let vcToolsInstallDir = getEnvironmentVariable("VCToolsInstallDir") {
-            env["VCToolsInstallDir"] = vcToolsInstallDir
-        }
+            homeDirectory = "C:\\Users\\exampleUser"
+            env = ["PATH": "FOO;BAR;BAZ"]
+            if let vcToolsInstallDir = getEnvironmentVariable("VCToolsInstallDir") {
+                env["VCToolsInstallDir"] = vcToolsInstallDir
+            }
         #else
-        homeDirectory = "/Users/exampleUser"
-        env = ["PATH": "FOO:BAR:BAZ"]
+            homeDirectory = "/Users/exampleUser"
+            env = ["PATH": "FOO:BAR:BAZ"]
         #endif
         return Self(
             userName: "exampleUser",
@@ -252,7 +254,8 @@ extension SWBUserInfo {
             gid: 5678,
             homeDirectory: homeDirectory,
             processEnvironment: env,
-            buildSystemEnvironment: env)
+            buildSystemEnvironment: env
+        )
     }()
 }
 
@@ -281,7 +284,7 @@ extension SWBPropertyListItem {
         case let .plDouble(value):
             self = .plDouble(value)
         case let .plArray(value):
-            self = try .plArray(value.map { try .init($0 ) })
+            self = try .plArray(value.map { try .init($0) })
         case let .plDict(value):
             self = try .plDict(value.mapValues { try .init($0) })
         case let .plOpaque(value):
diff --git a/Tests/SWBAndroidPlatformTests/AndroidSDKTests.swift b/Tests/SWBAndroidPlatformTests/AndroidSDKTests.swift
index 9439339e..c2244492 100644
--- a/Tests/SWBAndroidPlatformTests/AndroidSDKTests.swift
+++ b/Tests/SWBAndroidPlatformTests/AndroidSDKTests.swift
@@ -35,23 +35,21 @@ fileprivate struct AndroidSDKTests {
         try await withNDKVersions(fs: fs, sdkPath: sdkPath, versions: Version("24"), Version("25"), Version("26")) { host, fs, sdkPath, ndkVersionPaths in
             for ndkVersionPath in ndkVersionPaths {
                 try await fs.writeFileContents(ndkVersionPath.path.join("meta").join("abis.json")) { contents in
-                    contents <<<
-                """
-                {
-                }
-                """
+                    contents <<< """
+                        {
+                        }
+                        """
                 }
 
                 try await fs.writeFileContents(ndkVersionPath.path.join("meta").join("platforms.json")) { contents in
-                    contents <<<
-                """
-                {
-                    "min": 21,
-                    "max": 35,
-                    "aliases": {
-                    }
-                }
-                """
+                    contents <<< """
+                        {
+                            "min": 21,
+                            "max": 35,
+                            "aliases": {
+                            }
+                        }
+                        """
                 }
             }
 
@@ -92,79 +90,77 @@ fileprivate struct AndroidSDKTests {
     @Test func abis_r26_3() async throws {
         try await withNDKVersion(version: Version("26.3.11579264")) { host, fs, sdkPath, ndkVersionPath in
             try await fs.writeFileContents(ndkVersionPath.path.join("meta").join("abis.json")) { contents in
-                contents <<<
-                """
-                {
-                    "armeabi-v7a": {
-                        "bitness": 32,
-                        "default": true,
-                        "deprecated": false,
-                        "proc": "armv7-a",
-                        "arch": "arm",
-                        "triple": "arm-linux-androideabi",
-                        "llvm_triple": "armv7-none-linux-androideabi"
-                    },
-                    "arm64-v8a": {
-                        "bitness": 64,
-                        "default": true,
-                        "deprecated": false,
-                        "proc": "aarch64",
-                        "arch": "arm64",
-                        "triple": "aarch64-linux-android",
-                        "llvm_triple": "aarch64-none-linux-android"
-                    },
-                    "x86": {
-                        "bitness": 32,
-                        "default": true,
-                        "deprecated": false,
-                        "proc": "i686",
-                        "arch": "x86",
-                        "triple": "i686-linux-android",
-                        "llvm_triple": "i686-none-linux-android"
-                    },
-                    "x86_64": {
-                        "bitness": 64,
-                        "default": true,
-                        "deprecated": false,
-                        "proc": "x86_64",
-                        "arch": "x86_64",
-                        "triple": "x86_64-linux-android",
-                        "llvm_triple": "x86_64-none-linux-android"
+                contents <<< """
+                    {
+                        "armeabi-v7a": {
+                            "bitness": 32,
+                            "default": true,
+                            "deprecated": false,
+                            "proc": "armv7-a",
+                            "arch": "arm",
+                            "triple": "arm-linux-androideabi",
+                            "llvm_triple": "armv7-none-linux-androideabi"
+                        },
+                        "arm64-v8a": {
+                            "bitness": 64,
+                            "default": true,
+                            "deprecated": false,
+                            "proc": "aarch64",
+                            "arch": "arm64",
+                            "triple": "aarch64-linux-android",
+                            "llvm_triple": "aarch64-none-linux-android"
+                        },
+                        "x86": {
+                            "bitness": 32,
+                            "default": true,
+                            "deprecated": false,
+                            "proc": "i686",
+                            "arch": "x86",
+                            "triple": "i686-linux-android",
+                            "llvm_triple": "i686-none-linux-android"
+                        },
+                        "x86_64": {
+                            "bitness": 64,
+                            "default": true,
+                            "deprecated": false,
+                            "proc": "x86_64",
+                            "arch": "x86_64",
+                            "triple": "x86_64-linux-android",
+                            "llvm_triple": "x86_64-none-linux-android"
+                        }
                     }
-                }
-                """
+                    """
             }
 
             try await fs.writeFileContents(ndkVersionPath.path.join("meta").join("platforms.json")) { contents in
-                contents <<<
-                """
-                {
-                    "min": 21,
-                    "max": 34,
-                    "aliases": {
-                        "20": 19,
-                        "25": 24,
-                        "J": 16,
-                        "J-MR1": 17,
-                        "J-MR2": 18,
-                        "K": 19,
-                        "L": 21,
-                        "L-MR1": 22,
-                        "M": 23,
-                        "N": 24,
-                        "N-MR1": 24,
-                        "O": 26,
-                        "O-MR1": 27,
-                        "P": 28,
-                        "Q": 29,
-                        "R": 30,
-                        "S": 31,
-                        "Sv2": 32,
-                        "Tiramisu": 33,
-                        "UpsideDownCake": 34
+                contents <<< """
+                    {
+                        "min": 21,
+                        "max": 34,
+                        "aliases": {
+                            "20": 19,
+                            "25": 24,
+                            "J": 16,
+                            "J-MR1": 17,
+                            "J-MR2": 18,
+                            "K": 19,
+                            "L": 21,
+                            "L-MR1": 22,
+                            "M": 23,
+                            "N": 24,
+                            "N-MR1": 24,
+                            "O": 26,
+                            "O-MR1": 27,
+                            "P": 28,
+                            "Q": 29,
+                            "R": 30,
+                            "S": 31,
+                            "Sv2": 32,
+                            "Tiramisu": 33,
+                            "UpsideDownCake": 34
+                        }
                     }
-                }
-                """
+                    """
             }
 
             let installations = try AndroidSDK.NDK.findInstallations(host: host, sdkPath: sdkPath, fs: fs)
@@ -234,94 +230,92 @@ fileprivate struct AndroidSDKTests {
     @Test func abis_r27() async throws {
         try await withNDKVersion(version: Version("27.0.11718014")) { host, fs, sdkPath, ndkVersionPath in
             try await fs.writeFileContents(ndkVersionPath.path.join("meta").join("abis.json")) { contents in
-                contents <<<
-                """
-                {
-                    "armeabi-v7a": {
-                        "bitness": 32,
-                        "default": true,
-                        "deprecated": false,
-                        "proc": "armv7-a",
-                        "arch": "arm",
-                        "triple": "arm-linux-androideabi",
-                        "llvm_triple": "armv7-none-linux-androideabi",
-                        "min_os_version": 21
-                    },
-                    "arm64-v8a": {
-                        "bitness": 64,
-                        "default": true,
-                        "deprecated": false,
-                        "proc": "aarch64",
-                        "arch": "arm64",
-                        "triple": "aarch64-linux-android",
-                        "llvm_triple": "aarch64-none-linux-android",
-                        "min_os_version": 21
-                    },
-                    "riscv64": {
-                        "bitness": 64,
-                        "default": false,
-                        "deprecated": false,
-                        "proc": "riscv64",
-                        "arch": "riscv64",
-                        "triple": "riscv64-linux-android",
-                        "llvm_triple": "riscv64-none-linux-android",
-                        "min_os_version": 35
-                    },
-                    "x86": {
-                        "bitness": 32,
-                        "default": true,
-                        "deprecated": false,
-                        "proc": "i686",
-                        "arch": "x86",
-                        "triple": "i686-linux-android",
-                        "llvm_triple": "i686-none-linux-android",
-                        "min_os_version": 21
-                    },
-                    "x86_64": {
-                        "bitness": 64,
-                        "default": true,
-                        "deprecated": false,
-                        "proc": "x86_64",
-                        "arch": "x86_64",
-                        "triple": "x86_64-linux-android",
-                        "llvm_triple": "x86_64-none-linux-android",
-                        "min_os_version": 21
+                contents <<< """
+                    {
+                        "armeabi-v7a": {
+                            "bitness": 32,
+                            "default": true,
+                            "deprecated": false,
+                            "proc": "armv7-a",
+                            "arch": "arm",
+                            "triple": "arm-linux-androideabi",
+                            "llvm_triple": "armv7-none-linux-androideabi",
+                            "min_os_version": 21
+                        },
+                        "arm64-v8a": {
+                            "bitness": 64,
+                            "default": true,
+                            "deprecated": false,
+                            "proc": "aarch64",
+                            "arch": "arm64",
+                            "triple": "aarch64-linux-android",
+                            "llvm_triple": "aarch64-none-linux-android",
+                            "min_os_version": 21
+                        },
+                        "riscv64": {
+                            "bitness": 64,
+                            "default": false,
+                            "deprecated": false,
+                            "proc": "riscv64",
+                            "arch": "riscv64",
+                            "triple": "riscv64-linux-android",
+                            "llvm_triple": "riscv64-none-linux-android",
+                            "min_os_version": 35
+                        },
+                        "x86": {
+                            "bitness": 32,
+                            "default": true,
+                            "deprecated": false,
+                            "proc": "i686",
+                            "arch": "x86",
+                            "triple": "i686-linux-android",
+                            "llvm_triple": "i686-none-linux-android",
+                            "min_os_version": 21
+                        },
+                        "x86_64": {
+                            "bitness": 64,
+                            "default": true,
+                            "deprecated": false,
+                            "proc": "x86_64",
+                            "arch": "x86_64",
+                            "triple": "x86_64-linux-android",
+                            "llvm_triple": "x86_64-none-linux-android",
+                            "min_os_version": 21
+                        }
                     }
-                }
-                """
+                    """
             }
 
             try await fs.writeFileContents(ndkVersionPath.path.join("meta").join("platforms.json")) { contents in
-                contents <<<
-                """
-                {
-                    "min": 21,
-                    "max": 35,
-                    "aliases": {
-                        "20": 19,
-                        "25": 24,
-                        "J": 16,
-                        "J-MR1": 17,
-                        "J-MR2": 18,
-                        "K": 19,
-                        "L": 21,
-                        "L-MR1": 22,
-                        "M": 23,
-                        "N": 24,
-                        "N-MR1": 24,
-                        "O": 26,
-                        "O-MR1": 27,
-                        "P": 28,
-                        "Q": 29,
-                        "R": 30,
-                        "S": 31,
-                        "Sv2": 32,
-                        "Tiramisu": 33,
-                        "UpsideDownCake": 34,
-                        "VanillaIceCream": 35
+                contents <<< """
+                    {
+                        "min": 21,
+                        "max": 35,
+                        "aliases": {
+                            "20": 19,
+                            "25": 24,
+                            "J": 16,
+                            "J-MR1": 17,
+                            "J-MR2": 18,
+                            "K": 19,
+                            "L": 21,
+                            "L-MR1": 22,
+                            "M": 23,
+                            "N": 24,
+                            "N-MR1": 24,
+                            "O": 26,
+                            "O-MR1": 27,
+                            "P": 28,
+                            "Q": 29,
+                            "R": 30,
+                            "S": 31,
+                            "Sv2": 32,
+                            "Tiramisu": 33,
+                            "UpsideDownCake": 34,
+                            "VanillaIceCream": 35
+                        }
                     }
-                }
-                """
+                    """
             }
 
             let installations = try AndroidSDK.NDK.findInstallations(host: host, sdkPath: sdkPath, fs: fs)
diff --git a/Tests/SWBAndroidPlatformTests/SWBAndroidPlatformTests.swift b/Tests/SWBAndroidPlatformTests/SWBAndroidPlatformTests.swift
index 6e3a3129..3c979f69 100644
--- a/Tests/SWBAndroidPlatformTests/SWBAndroidPlatformTests.swift
+++ b/Tests/SWBAndroidPlatformTests/SWBAndroidPlatformTests.swift
@@ -32,18 +32,22 @@ fileprivate struct AndroidBuildOperationTests: CoreBasedTests {
                         TestFile("main.c"),
                         TestFile("dynamic.c"),
                         TestFile("static.c"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ARCHS": arch,
-                        "CODE_SIGNING_ALLOWED": "NO",
-                        "DEFINES_MODULE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "android.ndk",
-                        "SUPPORTED_PLATFORMS": "android",
-                        "ANDROID_DEPLOYMENT_TARGET": "22.0",
-                        "ANDROID_DEPLOYMENT_TARGET[arch=riscv64]": "35.0",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ARCHS": arch,
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "DEFINES_MODULE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "android.ndk",
+                            "SUPPORTED_PLATFORMS": "android",
+                            "ANDROID_DEPLOYMENT_TARGET": "22.0",
+                            "ANDROID_DEPLOYMENT_TARGET[arch=riscv64]": "35.0",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -57,7 +61,7 @@ fileprivate struct AndroidBuildOperationTests: CoreBasedTests {
                             TestFrameworksBuildPhase([
                                 TestBuildFile(.target("dynamiclib")),
                                 TestBuildFile(.target("staticlib")),
-                            ])
+                            ]),
                         ],
                         dependencies: [
                             "dynamiclib",
@@ -68,15 +72,18 @@ fileprivate struct AndroidBuildOperationTests: CoreBasedTests {
                         "dynamiclib",
                         type: .dynamicLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "DYLIB_INSTALL_NAME_BASE": "$ORIGIN",
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "DYLIB_INSTALL_NAME_BASE": "$ORIGIN",
 
-                                // FIXME: Find a way to make these default
-                                "EXECUTABLE_PREFIX": "lib",
-                            ])
+                                    // FIXME: Find a way to make these default
+                                    "EXECUTABLE_PREFIX": "lib",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["dynamic.c"]),
+                            TestSourcesBuildPhase(["dynamic.c"])
                         ],
                         productReferenceName: "libdynamiclib.so"
                     ),
@@ -84,21 +91,25 @@ fileprivate struct AndroidBuildOperationTests: CoreBasedTests {
                         "staticlib",
                         type: .staticLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                // FIXME: Find a way to make these default
-                                "EXECUTABLE_PREFIX": "lib",
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    // FIXME: Find a way to make these default
+                                    "EXECUTABLE_PREFIX": "lib"
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["static.c"]),
+                            TestSourcesBuildPhase(["static.c"])
                         ]
                     ),
-                ])
+                ]
+            )
             let core = try await getCore()
             let androidExtension = try #require(core.pluginManager.extensions(of: SDKRegistryExtensionPoint.self).compactMap { $0 as? AndroidSDKRegistryExtension }.only)
             let (_, androidNdk) = try #require(await androidExtension.plugin.effectiveInstallation(host: core.hostOperatingSystem))
             if androidNdk.version < Version(27) && arch == "riscv64" {
-                return // riscv64 support was introduced in NDK r27
+                return  // riscv64 support was introduced in NDK r27
             }
 
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
@@ -137,7 +148,7 @@ fileprivate struct AndroidBuildOperationTests: CoreBasedTests {
                         .pathEqual(prefix: "-L", tmpDir.join("build/Debug-android")),
                         .pathEqual(prefix: "@", tmpDir.join("build/TestProject.build/Debug-android/dynamiclib.build/Objects-normal/\(arch)/dynamiclib.LinkFileList")),
                         "-Xlinker", "-soname", "-Xlinker", "$ORIGIN/libdynamiclib.so",
-                        "-o", .path(tmpDir.join("build/Debug-android/libdynamiclib.so"))
+                        "-o", .path(tmpDir.join("build/Debug-android/libdynamiclib.so")),
                     ])
                 }
 
@@ -152,7 +163,7 @@ fileprivate struct AndroidBuildOperationTests: CoreBasedTests {
                         .pathEqual(prefix: "@", tmpDir.join("build/TestProject.build/Debug-android/tool.build/Objects-normal/\(arch)/tool.LinkFileList")),
                         "-ldynamiclib",
                         "-lstaticlib",
-                        "-o", .path(tmpDir.join("build/Debug-android/tool"))
+                        "-o", .path(tmpDir.join("build/Debug-android/tool")),
                     ])
                 }
 
diff --git a/Tests/SWBApplePlatformTests/AppleCommandLineSpecTests.swift b/Tests/SWBApplePlatformTests/AppleCommandLineSpecTests.swift
index 46fff813..8ffff8e3 100644
--- a/Tests/SWBApplePlatformTests/AppleCommandLineSpecTests.swift
+++ b/Tests/SWBApplePlatformTests/AppleCommandLineSpecTests.swift
@@ -182,7 +182,7 @@ fileprivate struct AppleCommandLineSpecTests: CoreBasedTests {
         }
     }
 
-    @Test(.skipHostOS(.windows)) // xcstringstool is Apple-specific
+    @Test(.skipHostOS(.windows))  // xcstringstool is Apple-specific
     func stringCatalogCompilerOutputParser() async throws {
         let delegate = CapturingTaskParserDelegate()
         let task = OutputParserMockTask(basenames: [], exec: "xcstringstool")
diff --git a/Tests/SWBApplePlatformTests/EXUtilTaskConstructionTests.swift b/Tests/SWBApplePlatformTests/EXUtilTaskConstructionTests.swift
index efda1c9e..1d01f04c 100644
--- a/Tests/SWBApplePlatformTests/EXUtilTaskConstructionTests.swift
+++ b/Tests/SWBApplePlatformTests/EXUtilTaskConstructionTests.swift
@@ -18,7 +18,6 @@ import SWBTaskConstruction
 import SWBTestSupport
 import SWBUtil
 
-
 @Suite
 fileprivate struct EXUtilTaskConstructionTests: CoreBasedTests {
 
@@ -31,8 +30,9 @@ fileprivate struct EXUtilTaskConstructionTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("source.swift"),
-                    ]),
+                        TestFile("source.swift")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -48,7 +48,8 @@ fileprivate struct EXUtilTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -59,14 +60,16 @@ fileprivate struct EXUtilTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES",
-                                    "EX_ENABLE_EXTENSION_POINT_GENERATION" : "YES"
-                                ]),
+                                    "EX_ENABLE_EXTENSION_POINT_GENERATION": "YES",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["source.swift"]),
+                            TestSourcesBuildPhase(["source.swift"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -95,8 +98,9 @@ fileprivate struct EXUtilTaskConstructionTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("source.swift"),
-                    ]),
+                        TestFile("source.swift")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -112,7 +116,8 @@ fileprivate struct EXUtilTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -121,25 +126,29 @@ fileprivate struct EXUtilTaskConstructionTests: CoreBasedTests {
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
-                                buildSettings: [:]),
+                                buildSettings: [:]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["source.swift"]),
+                            TestSourcesBuildPhase(["source.swift"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
             try await tester.checkBuild(runDestination: .iOS) { results in
 
-                let generatorTask = try #require(results.checkTask(.matchRuleType("AppExtensionPListGenerator")) { task in
-                    task.checkCommandLineMatches(["exutil", "generate-appextension-plist", .anySequence])
-                    task.checkInputs(contain: [.name("source.swiftconstvalues")])
-                    task.checkOutputs(contain: [.namePattern(.suffix("appextension-generated-info.plist"))])
-                    results.checkNoDiagnostics()
-                    return task
-                })
+                let generatorTask = try #require(
+                    results.checkTask(.matchRuleType("AppExtensionPListGenerator")) { task in
+                        task.checkCommandLineMatches(["exutil", "generate-appextension-plist", .anySequence])
+                        task.checkInputs(contain: [.name("source.swiftconstvalues")])
+                        task.checkOutputs(contain: [.namePattern(.suffix("appextension-generated-info.plist"))])
+                        results.checkNoDiagnostics()
+                        return task
+                    }
+                )
 
                 results.checkTask(.matchRuleType("ProcessInfoPlistFile")) { task in
                     results.checkTaskFollows(task, antecedent: generatorTask)
diff --git a/Tests/SWBBuildServiceTests/BuildDependencyInfoTests.swift b/Tests/SWBBuildServiceTests/BuildDependencyInfoTests.swift
index 0883a288..717cfec3 100644
--- a/Tests/SWBBuildServiceTests/BuildDependencyInfoTests.swift
+++ b/Tests/SWBBuildServiceTests/BuildDependencyInfoTests.swift
@@ -42,7 +42,8 @@ import Foundation
                     TestFile("libBar.a"),
                     TestFile("libBaz.a"),
                     TestFile("libQux.tbd"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Config",
@@ -56,19 +57,26 @@ import Foundation
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
                         "TAPI_EXEC": tapiToolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestAggregateTarget(
                     "AggregateTarget",
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
-                            buildSettings: [:]),
+                        TestBuildConfiguration(
+                            "Config",
+                            buildSettings: [:]
+                        )
                     ],
                     buildPhases: [
-                        TestCopyFilesBuildPhase([
-                            "Copied.txt",
-                        ], destinationSubfolder: .absolute, destinationSubpath: "/tmp/OtherFiles"),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Copied.txt"
+                            ],
+                            destinationSubfolder: .absolute,
+                            destinationSubpath: "/tmp/OtherFiles"
+                        )
                     ],
                     dependencies: ["AppTarget"]
                 ),
@@ -76,17 +84,19 @@ import Foundation
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
-                            buildSettings: [:]),
+                        TestBuildConfiguration(
+                            "Config",
+                            buildSettings: [:]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "AppClass.swift",
+                            "AppClass.swift"
                         ]),
                         TestFrameworksBuildPhase([
                             "FwkTarget.framework",
                             "AppKit.framework",
-                        ])
+                        ]),
                     ],
                     dependencies: ["FrameworkTarget"]
                 ),
@@ -94,59 +104,66 @@ import Foundation
                     "FwkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
-                            buildSettings: [:]),
+                        TestBuildConfiguration(
+                            "Config",
+                            buildSettings: [:]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "FwkClass.swift",
+                            "FwkClass.swift"
                         ]),
                         TestFrameworksBuildPhase([
                             "Foundation.framework",
                             "libFoo.dylib",
                             "libDylibTarget.dylib",
                             "libStaticLibTarget.a",
-                        ])
+                        ]),
                     ]
                 ),
                 TestStandardTarget(
                     "DylibTarget",
                     type: .dynamicLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
+                        TestBuildConfiguration(
+                            "Config",
                             buildSettings: [
-                                "EXECUTABLE_PREFIX": "lib",
-                            ]),
+                                "EXECUTABLE_PREFIX": "lib"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "DylibClass.swift",
+                            "DylibClass.swift"
                         ]),
                         TestFrameworksBuildPhase([
                             "Foundation.framework",
                             "libBar.a",
                             "libQux.tbd",
-                        ])
+                        ]),
                     ]
                 ),
                 TestStandardTarget(
                     "StaticLibTarget",
                     type: .staticLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
-                            buildSettings: [:]),
+                        TestBuildConfiguration(
+                            "Config",
+                            buildSettings: [:]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "StaticLibClass.swift",
+                            "StaticLibClass.swift"
                         ]),
                         TestFrameworksBuildPhase([
                             "Foundation.framework",
                             "libBaz.a",
-                        ])
+                        ]),
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try BuildDependencyInfoTester(core, testProject)
         let workspace = tester.workspace
@@ -156,13 +173,17 @@ import Foundation
         let CONFIGURATION = "Config"
         let buildType = "Release"
         let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
-        let parameters = BuildParameters(configuration: CONFIGURATION, activeRunDestination: runDestination, overrides: [
+        let parameters = BuildParameters(
+            configuration: CONFIGURATION,
+            activeRunDestination: runDestination,
+            overrides: [
                 "SYMROOT": SYMROOT,
                 "OBJROOT": OBJROOT,
                 "DSTROOT": DSTROOT,
                 "DEPLOYMENT_POSTPROCESSING": "YES",
                 "DEPLOYMENT_LOCATION": "YES",
-            ])
+            ]
+        )
         let targets = workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
         let buildRequest = BuildRequest(parameters: parameters, buildTargets: targets, dependencyScope: .workspace, continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
         try await tester.checkBuildDependencyInfo(buildRequest: buildRequest) { results in
@@ -264,7 +285,8 @@ import Foundation
                     // Sources
                     TestFile("AppClass.swift"),
                     TestFile("Copied.txt"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Config",
@@ -278,24 +300,31 @@ import Foundation
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
                         "TAPI_EXEC": tapiToolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestAggregateTarget(
                     "AggregateTarget",
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
+                        TestBuildConfiguration(
+                            "Config",
                             buildSettings: [
                                 "OTHER_LDFLAGS": [
                                     "-framework Foo",
                                     "-lBar",
                                 ].joined(separator: " ")
-                            ]),
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestCopyFilesBuildPhase([
-                            "Copied.txt",
-                        ], destinationSubfolder: .absolute, destinationSubpath: "/tmp/OtherFiles"),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Copied.txt"
+                            ],
+                            destinationSubfolder: .absolute,
+                            destinationSubpath: "/tmp/OtherFiles"
+                        )
                     ],
                     dependencies: ["AppTarget"]
                 ),
@@ -303,7 +332,8 @@ import Foundation
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
+                        TestBuildConfiguration(
+                            "Config",
                             buildSettings: [
                                 "OTHER_LDFLAGS": [
                                     // Test framework linkages.
@@ -336,17 +366,19 @@ import Foundation
 
                                     // TODO: we should support positional arguments as well but that requires a complete understanding of all possible linker args, will come back to this
                                 ].joined(separator: " ")
-                            ]),
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "AppClass.swift",
-                        ]),
+                            "AppClass.swift"
+                        ])
                         // No frameworks build phase because we should capture info from OTHER_LDFLAGS even if there isn't one.
                     ],
                     dependencies: []
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try BuildDependencyInfoTester(core, testProject)
         let workspace = tester.workspace
@@ -356,13 +388,17 @@ import Foundation
         let CONFIGURATION = "Config"
         let buildType = "Release"
         let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
-        let parameters = BuildParameters(configuration: CONFIGURATION, activeRunDestination: runDestination, overrides: [
+        let parameters = BuildParameters(
+            configuration: CONFIGURATION,
+            activeRunDestination: runDestination,
+            overrides: [
                 "SYMROOT": SYMROOT,
                 "OBJROOT": OBJROOT,
                 "DSTROOT": DSTROOT,
                 "DEPLOYMENT_POSTPROCESSING": "YES",
                 "DEPLOYMENT_LOCATION": "YES",
-            ])
+            ]
+        )
         let targets = workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
         let buildRequest = BuildRequest(parameters: parameters, buildTargets: targets, dependencyScope: .workspace, continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
         try await tester.checkBuildDependencyInfo(buildRequest: buildRequest) { results in
@@ -455,7 +491,8 @@ import Foundation
 
                     // Linked libraries
                     TestFile("Cocoa.framework"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Config",
@@ -469,32 +506,36 @@ import Foundation
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
                         "TAPI_EXEC": tapiToolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
+                        TestBuildConfiguration(
+                            "Config",
                             buildSettings: [
                                 "OTHER_LDFLAGS": [
                                     "-framework Foo",
                                     "-lBar",
                                 ].joined(separator: " ")
-                            ]),
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "AppClass.swift",
+                            "AppClass.swift"
                         ]),
                         TestFrameworksBuildPhase([
-                            "Cocoa.framework",
-                        ])
+                            "Cocoa.framework"
+                        ]),
                     ],
                     dependencies: []
-                ),
-            ])
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try BuildDependencyInfoTester(core, testProject)
         let workspace = tester.workspace
@@ -504,13 +545,17 @@ import Foundation
         let CONFIGURATION = "Config"
         let buildType = "Release"
         let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
-        let parameters = BuildParameters(configuration: CONFIGURATION, activeRunDestination: runDestination, overrides: [
+        let parameters = BuildParameters(
+            configuration: CONFIGURATION,
+            activeRunDestination: runDestination,
+            overrides: [
                 "SYMROOT": SYMROOT,
                 "OBJROOT": OBJROOT,
                 "DSTROOT": DSTROOT,
                 "DEPLOYMENT_POSTPROCESSING": "YES",
                 "DEPLOYMENT_LOCATION": "YES",
-            ])
+            ]
+        )
         let targets = workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
         let buildRequest = BuildRequest(parameters: parameters, buildTargets: targets, dependencyScope: .workspace, continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
         try await tester.checkBuildDependencyInfo(buildRequest: buildRequest) { origResults in
@@ -546,9 +591,9 @@ import Foundation
             let data = try encoder.encode(origResults.info)
 
             // Useful for debugging.
-//            if let prettyPrintedString = String(data:data, encoding: String.Encoding.utf8) {
-//                print("\(prettyPrintedString)")
-//            }
+            //            if let prettyPrintedString = String(data:data, encoding: String.Encoding.utf8) {
+            //                print("\(prettyPrintedString)")
+            //            }
             // TODO: Check that the JSON we produce is correct.  We don't do this yet so we can iterate on the format rapidly.
 
             // Round-trip the data back to a BuildDependencyInfo object and check it.
@@ -561,10 +606,8 @@ import Foundation
 
 }
 
-
 // MARK: - Testing infrastructure
 
-
 fileprivate final class BuildDependencyInfoTester {
     class Results {
         let info: BuildDependencyInfo
@@ -591,8 +634,7 @@ fileprivate final class BuildDependencyInfoTester {
                 uncheckedTargets.removeValue(forKey: target)
                 // We pass the Target back here to save on boilerplate in the tests' checker blocks, but if we add more stuff to TargetDependencyInfo in the future we may want to pass that instead, unless we end up adding more infrastructure to this class like we have for the inputs and outputs.
                 check(target)
-            }
-            else if matchedTargets.isEmpty {
+            } else if matchedTargets.isEmpty {
                 Issue.record(Comment(rawValue: "unable to find target with name '\(targetName)'" + (projectName != nil ? " in project '\(projectName!)" : "")), sourceLocation: sourceLocation)
             } else {
                 Issue.record(Comment(rawValue: "found multiple targets with name '\(targetName)'" + (projectName != nil ? " in project '\(projectName!)" : "") + ": \(matchedTargets.map({ $0.0 }))"), sourceLocation: sourceLocation)
@@ -613,8 +655,7 @@ fileprivate final class BuildDependencyInfoTester {
                 inputs.remove(input)
                 uncheckedInputsByTarget[target] = inputs
                 check(input)
-            }
-            else if matchedInputs.isEmpty {
+            } else if matchedInputs.isEmpty {
                 Issue.record(Comment("unable to find input named '\(name.stringForm)' for target '\(target.targetName)', among inputs: \(inputs)"), sourceLocation: sourceLocation)
             } else {
                 Issue.record(Comment("found multiple inputs named '\(name.stringForm)' for target '\(target.targetName)': \(matchedInputs)"), sourceLocation: sourceLocation)
@@ -636,8 +677,7 @@ fileprivate final class BuildDependencyInfoTester {
             if let outputPath = matchedOutputPaths.only {
                 outputPaths.remove(outputPath)
                 uncheckedOutputPathsByTarget[target] = outputPaths
-            }
-            else if matchedOutputPaths.isEmpty {
+            } else if matchedOutputPaths.isEmpty {
                 Issue.record(Comment("unable to find output path '\(path)' for target '\(target.targetName)'"), sourceLocation: sourceLocation)
             } else {
                 Issue.record(Comment("found multiple output path '\(path)' for target '\(target.targetName)'"), sourceLocation: sourceLocation)
diff --git a/Tests/SWBBuildSystemPerfTests/ClangExplicitModulesPerfTests.swift b/Tests/SWBBuildSystemPerfTests/ClangExplicitModulesPerfTests.swift
index b6c5cd6d..fb1a0127 100644
--- a/Tests/SWBBuildSystemPerfTests/ClangExplicitModulesPerfTests.swift
+++ b/Tests/SWBBuildSystemPerfTests/ClangExplicitModulesPerfTests.swift
@@ -36,76 +36,87 @@ fileprivate struct ClangExplicitModulesPerfTests: CoreBasedTests, PerfTests {
                                 TestFile("Framework.h"),
                                 TestFile("Shared.h"),
                                 TestFile("Shared.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                "DSTROOT": tmpDirPath.join("dstroot").str,
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    "DSTROOT": tmpDirPath.join("dstroot").str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase((0..<numSources).map { TestBuildFile("file-\($0).m") }),
-                                ], dependencies: ["Framework"]),
+                                    TestSourcesBuildPhase((0..<numSources).map { TestBuildFile("file-\($0).m") })
+                                ],
+                                dependencies: ["Framework"]
+                            ),
                             TestStandardTarget(
                                 "Framework",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "DEFINES_MODULE": "YES",
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "DEFINES_MODULE": "YES"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["Shared.m"]),
                                     TestHeadersBuildPhase([
                                         TestBuildFile("Framework.h", headerVisibility: .public),
                                         TestBuildFile("Shared.h", headerVisibility: .public),
                                     ]),
-                                ])
-                        ])])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             for i in 0..<numSources {
-                try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/file-\(i).m")) { stream in stream <<< """
-                    #include <Framework/Framework.h>
-
-                    void test\(i)() {
-                        NSLog(@"%@", [[Shared alloc] init]);
-                        }
-                    """
+                try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/file-\(i).m")) { stream in
+                    stream <<< """
+                        #include <Framework/Framework.h>
+
+                        void test\(i)() {
+                            NSLog(@"%@", [[Shared alloc] init]);
+                            }
+                        """
                 }
             }
 
             try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/Framework.h")) { stream in
-                stream <<<
-                """
-                #include <Framework/Shared.h>
-                """
+                stream <<< """
+                    #include <Framework/Shared.h>
+                    """
             }
 
             try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/Shared.h")) { stream in
-                stream <<<
-                """
-                #include <Foundation/Foundation.h>
-                @interface Shared: NSObject {}
-                @end
+                stream <<< """
+                    #include <Foundation/Foundation.h>
+                    @interface Shared: NSObject {}
+                    @end
 
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/Shared.m")) { stream in
-                stream <<<
-                """
-                #include "Shared.h"
-                @implementation Shared {}
-                @end
-                """
+                stream <<< """
+                    #include "Shared.h"
+                    @implementation Shared {}
+                    @end
+                    """
             }
 
             try await measure {
@@ -133,76 +144,87 @@ fileprivate struct ClangExplicitModulesPerfTests: CoreBasedTests, PerfTests {
                                 TestFile("Framework.h"),
                                 TestFile("Shared.h"),
                                 TestFile("Shared.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                "DSTROOT": tmpDirPath.join("dstroot").str,
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    "DSTROOT": tmpDirPath.join("dstroot").str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase((0..<numSources).map { TestBuildFile("file-\($0).m") }),
-                                ], dependencies: ["Framework"]),
+                                    TestSourcesBuildPhase((0..<numSources).map { TestBuildFile("file-\($0).m") })
+                                ],
+                                dependencies: ["Framework"]
+                            ),
                             TestStandardTarget(
                                 "Framework",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "DEFINES_MODULE": "YES",
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "DEFINES_MODULE": "YES"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["Shared.m"]),
                                     TestHeadersBuildPhase([
                                         TestBuildFile("Framework.h", headerVisibility: .public),
                                         TestBuildFile("Shared.h", headerVisibility: .public),
                                     ]),
-                                ])
-                        ])])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             for i in 0..<numSources {
-                try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/file-\(i).m")) { stream in stream <<< """
-                    #include <Framework/Framework.h>
-
-                    void test\(i)() {
-                        NSLog(@"%@", [[Shared alloc] init]);
-                        }
-                    """
+                try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/file-\(i).m")) { stream in
+                    stream <<< """
+                        #include <Framework/Framework.h>
+
+                        void test\(i)() {
+                            NSLog(@"%@", [[Shared alloc] init]);
+                            }
+                        """
                 }
             }
 
             try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/Framework.h")) { stream in
-                stream <<<
-                """
-                #include <Framework/Shared.h>
-                """
+                stream <<< """
+                    #include <Framework/Shared.h>
+                    """
             }
 
             try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/Shared.h")) { stream in
-                stream <<<
-                """
-                #include <Foundation/Foundation.h>
-                @interface Shared: NSObject {}
-                @end
+                stream <<< """
+                    #include <Foundation/Foundation.h>
+                    @interface Shared: NSObject {}
+                    @end
 
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/Shared.m")) { stream in
-                stream <<<
-                """
-                #include "Shared.h"
-                @implementation Shared {}
-                @end
-                """
+                stream <<< """
+                    #include "Shared.h"
+                    @implementation Shared {}
+                    @end
+                    """
             }
 
             try await measure {
diff --git a/Tests/SWBBuildSystemPerfTests/DependencyValidatorPerfTests.swift b/Tests/SWBBuildSystemPerfTests/DependencyValidatorPerfTests.swift
index fb5e1cea..09ac35c5 100644
--- a/Tests/SWBBuildSystemPerfTests/DependencyValidatorPerfTests.swift
+++ b/Tests/SWBBuildSystemPerfTests/DependencyValidatorPerfTests.swift
@@ -23,22 +23,26 @@ fileprivate struct DependencyValidatorPerfTests: CoreBasedTests, PerfTests {
     func dependencyValidatorBuildOperationPerf(on: Bool) async throws {
         try await withTemporaryDirectory { tmp in
             let targets = (0..<10).map { i in
-                TestStandardTarget("Target_\(i)",
-                                   type: .framework,
-                                   buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: [
-                                        "CODE_SIGNING_ALLOWED": "NO",
-                                        "DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING": "YES",
-                                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                                        "SWIFT_VERSION": "5",
-                                        "SWIFT_COMPILATION_MODE": "wholemodule",
-                                        "SWIFT_ENABLE_EXPLICIT_MODULES": "NO",
-                                        "VALIDATE_DEPENDENCIES": on ? "YES" : "NO",
-                                    ])
-                                   ],
-                                   buildPhases: [
-                                    TestSourcesBuildPhase((0..<100).map { i in TestBuildFile("File\(i).swift") })
-                                   ]
+                TestStandardTarget(
+                    "Target_\(i)",
+                    type: .framework,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "CODE_SIGNING_ALLOWED": "NO",
+                                "DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING": "YES",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SWIFT_VERSION": "5",
+                                "SWIFT_COMPILATION_MODE": "wholemodule",
+                                "SWIFT_ENABLE_EXPLICIT_MODULES": "NO",
+                                "VALIDATE_DEPENDENCIES": on ? "YES" : "NO",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase((0..<100).map { i in TestBuildFile("File\(i).swift") })
+                    ]
                 )
             }
 
@@ -46,12 +50,13 @@ fileprivate struct DependencyValidatorPerfTests: CoreBasedTests, PerfTests {
                 "Workspace",
                 sourceRoot: tmp,
                 projects: [
-                    TestProject("aProject",
-                                groupTree: TestGroup("SomeFiles", children: [
-                                ] + (0..<100).map { i in TestFile("File\(i).swift", sourceTree: .buildSetting("SRCROOT")) }),
-                                targets: targets
-                               )
-                ])
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup("SomeFiles", children: [] + (0..<100).map { i in TestFile("File\(i).swift", sourceTree: .buildSetting("SRCROOT")) }),
+                        targets: targets
+                    )
+                ]
+            )
             let core = try await getCore()
 
             try await measure {
diff --git a/Tests/SWBBuildSystemPerfTests/ModulesVerifierPerfTests.swift b/Tests/SWBBuildSystemPerfTests/ModulesVerifierPerfTests.swift
index dd248926..dc1a6b4a 100644
--- a/Tests/SWBBuildSystemPerfTests/ModulesVerifierPerfTests.swift
+++ b/Tests/SWBBuildSystemPerfTests/ModulesVerifierPerfTests.swift
@@ -23,39 +23,51 @@ fileprivate struct ModulesVerifierPerfTests: CoreBasedTests, PerfTests {
     func modulesVerifierPerf(verify: Bool) async throws {
         try await withTemporaryDirectory { tmpDir in
             let srcRoot = tmpDir.join("VerifyModulePerfTest")
-            let testProject = TestProject("MyProject",
-                                          sourceRoot: srcRoot,
-                                          groupTree: TestGroup("SomeFiles", path: "", children: [
-                                            TestFile("MyFramework.h"),
-                                            TestFile("MyFramework_Private.h"),
-                                            TestFile("PublicHeader.h"),
-                                            TestFile("PrivateHeader.h"),
-                                            TestFile("SourceFile.m"),
-                                          ]),
-                                          buildConfigurations: [
-                                            TestBuildConfiguration("Debug", buildSettings: [
-                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                "GENERATE_INFOPLIST_FILE": "YES",
-                                                "DEFINES_MODULE": "YES",
-                                                "MODULEMAP_FILE": "public.modulemap",
-                                                "MODULEMAP_PRIVATE_FILE": "private.modulemap",
-                                                "INSTALL_OWNER": "",
-                                                "INSTALL_GROUP": "staff",
-                                            ])
-                                          ],
-                                          targets: [
-                                            TestStandardTarget("MyFramework", type: .framework, buildPhases: [
-                                                TestHeadersBuildPhase([
-                                                    TestBuildFile("MyFramework.h", headerVisibility: .public),
-                                                    TestBuildFile("MyFramework_Private.h", headerVisibility: .private),
-                                                    TestBuildFile("PublicHeader.h", headerVisibility: .public),
-                                                    TestBuildFile("PrivateHeader.h", headerVisibility: .private),
-                                                ]),
-                                                TestSourcesBuildPhase([
-                                                    "SourceFile.m"
-                                                ])
-                                            ])
-                                          ]
+            let testProject = TestProject(
+                "MyProject",
+                sourceRoot: srcRoot,
+                groupTree: TestGroup(
+                    "SomeFiles",
+                    path: "",
+                    children: [
+                        TestFile("MyFramework.h"),
+                        TestFile("MyFramework_Private.h"),
+                        TestFile("PublicHeader.h"),
+                        TestFile("PrivateHeader.h"),
+                        TestFile("SourceFile.m"),
+                    ]
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "DEFINES_MODULE": "YES",
+                            "MODULEMAP_FILE": "public.modulemap",
+                            "MODULEMAP_PRIVATE_FILE": "private.modulemap",
+                            "INSTALL_OWNER": "",
+                            "INSTALL_GROUP": "staff",
+                        ]
+                    )
+                ],
+                targets: [
+                    TestStandardTarget(
+                        "MyFramework",
+                        type: .framework,
+                        buildPhases: [
+                            TestHeadersBuildPhase([
+                                TestBuildFile("MyFramework.h", headerVisibility: .public),
+                                TestBuildFile("MyFramework_Private.h", headerVisibility: .private),
+                                TestBuildFile("PublicHeader.h", headerVisibility: .public),
+                                TestBuildFile("PrivateHeader.h", headerVisibility: .private),
+                            ]),
+                            TestSourcesBuildPhase([
+                                "SourceFile.m"
+                            ]),
+                        ]
+                    )
+                ]
             )
 
             let core = try await getCore()
@@ -96,9 +108,13 @@ fileprivate struct ModulesVerifierPerfTests: CoreBasedTests, PerfTests {
                 stream <<< "}\n"
             }
 
-            let params = BuildParameters(action: .build, configuration: "Debug", overrides: [
-                "ENABLE_MODULE_VERIFIER": verify ? "YES" : "NO",
-            ])
+            let params = BuildParameters(
+                action: .build,
+                configuration: "Debug",
+                overrides: [
+                    "ENABLE_MODULE_VERIFIER": verify ? "YES" : "NO"
+                ]
+            )
 
             try await tester.checkBuild(parameters: params, runDestination: .macOS, serial: true) { results in
             }
@@ -106,7 +122,7 @@ fileprivate struct ModulesVerifierPerfTests: CoreBasedTests, PerfTests {
             let filesToTouch = [srcRoot.join("PublicHeader.h"), srcRoot.join("PrivateHeader.h")]
 
             try await measure {
-                for _ in 0..<5 { // loop enough to make the measured time longer, and the standard deviation relatively low
+                for _ in 0..<5 {  // loop enough to make the measured time longer, and the standard deviation relatively low
                     for file in filesToTouch {
                         try tester.fs.touch(file)
                     }
diff --git a/Tests/SWBBuildSystemPerfTests/SwiftDriverPerfTests.swift b/Tests/SWBBuildSystemPerfTests/SwiftDriverPerfTests.swift
index 3c019423..99f09788 100644
--- a/Tests/SWBBuildSystemPerfTests/SwiftDriverPerfTests.swift
+++ b/Tests/SWBBuildSystemPerfTests/SwiftDriverPerfTests.swift
@@ -34,40 +34,51 @@ fileprivate struct SwiftDriverPerfTests: CoreBasedTests, PerfTests {
         let tmpDir = try NamedTemporaryDirectory()
         let targets = (0..<Config.numTargets).map { targetNum -> (any TestTarget) in
             TestStandardTarget(
-                "Target\(targetNum)", type: .framework,
+                "Target\(targetNum)",
+                type: .framework,
                 buildPhases: [
-                    TestSourcesBuildPhase((0..<Config.numSwiftFiles).map({ TestBuildFile("Target-\(targetNum)-File-\($0).swift") })),
+                    TestSourcesBuildPhase((0..<Config.numSwiftFiles).map({ TestBuildFile("Target-\(targetNum)-File-\($0).swift") }))
                 ],
                 provisioningSourceData: [
                     SWBProtocol.ProvisioningSourceData(
                         configurationName: "Debug",
                         provisioningStyle: .manual,
-                        bundleIdentifierFromInfoPlist: "$(PRODUCT_BUNDLE_IDENTIFIER)")])
+                        bundleIdentifierFromInfoPlist: "$(PRODUCT_BUNDLE_IDENTIFIER)"
+                    )
+                ]
+            )
         }
 
         let swiftVersion = try await self.swiftVersion
         let testProject = TestProject(
             "aProject",
             defaultConfigurationName: "Debug",
-            groupTree: TestGroup("Root", children: (0..<Config.numTargets).flatMap { targetNum in
-                (0..<Config.numSwiftFiles).map { TestFile("Target-\(targetNum)-File-\($0).swift") }
-            }),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SWIFT_VERSION": swiftVersion,
-
-                    "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-
-                    "DSTROOT": tmpDir.path.join("dstroot").str,
-                ]
-            )],
+            groupTree: TestGroup(
+                "Root",
+                children: (0..<Config.numTargets).flatMap { targetNum in
+                    (0..<Config.numSwiftFiles).map { TestFile("Target-\(targetNum)-File-\($0).swift") }
+                }
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SWIFT_VERSION": swiftVersion,
+
+                        "SWIFT_USE_INTEGRATED_DRIVER": "YES",
+
+                        "DSTROOT": tmpDir.path.join("dstroot").str,
+                    ]
+                )
+            ],
             targets: targets
         )
-        let testWorkspace = TestWorkspace("aWorkspace",
-                                          sourceRoot: tmpDir.path.join("Test"),
-                                          projects: [testProject])
+        let testWorkspace = TestWorkspace(
+            "aWorkspace",
+            sourceRoot: tmpDir.path.join("Test"),
+            projects: [testProject]
+        )
         let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
         // Write the source files.
@@ -85,7 +96,7 @@ fileprivate struct SwiftDriverPerfTests: CoreBasedTests, PerfTests {
 
         return { resultsCheck in
 
-            _ = tmpDir // hold a strong reference here :)
+            _ = tmpDir  // hold a strong reference here :)
 
             for _ in 0..<Config.iterations {
 
@@ -120,38 +131,46 @@ fileprivate struct SwiftDriverPerfTests: CoreBasedTests, PerfTests {
         let swiftVersion = try await self.swiftVersion
         try await withTemporaryDirectory { tmpDir in
             let filenames = (0..<(getEnvironmentVariable("CI") != nil ? 100 : 1000)).map { "File-\($0).swift" }
-            let testWorkspace = TestWorkspace("aWorkspace",
-                                              sourceRoot: tmpDir.path.join("Test"),
-                                              projects: [TestProject(
-                                                "aProject",
-                                                defaultConfigurationName: "Debug",
-                                                groupTree: TestGroup("Root", children: filenames.map { TestFile($0) }),
-                                                buildConfigurations: [TestBuildConfiguration(
-                                                    "Debug",
-                                                    buildSettings: [
-                                                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                        "SWIFT_VERSION": swiftVersion,
-                                                        "DSTROOT": tmpDir.path.join("dstroot").str,
-                                                    ]
-                                                )],
-                                                targets: [
-                                                    TestStandardTarget(
-                                                        "Framework", type: .framework,
-                                                        buildPhases: [
-                                                            TestSourcesBuildPhase(filenames.map { TestBuildFile($0) }),
-                                                        ])
-                                                ]
-                                              )])
+            let testWorkspace = TestWorkspace(
+                "aWorkspace",
+                sourceRoot: tmpDir.path.join("Test"),
+                projects: [
+                    TestProject(
+                        "aProject",
+                        defaultConfigurationName: "Debug",
+                        groupTree: TestGroup("Root", children: filenames.map { TestFile($0) }),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "DSTROOT": tmpDir.path.join("dstroot").str,
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "Framework",
+                                type: .framework,
+                                buildPhases: [
+                                    TestSourcesBuildPhase(filenames.map { TestBuildFile($0) })
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
             for name in filenames {
                 try await localFS.writeFileContents(SRCROOT.join(name)) { contents in
                     contents <<< """
-                    class \(name.mangledToC99ExtendedIdentifier()) {
-                        let x = 1
-                        func bar() {}
-                    }
-                    """
+                        class \(name.mangledToC99ExtendedIdentifier()) {
+                            let x = 1
+                            func bar() {}
+                        }
+                        """
                 }
             }
 
@@ -171,4 +190,3 @@ fileprivate struct SwiftDriverPerfTests: CoreBasedTests, PerfTests {
         }
     }
 }
-
diff --git a/Tests/SWBBuildSystemTests/APIDigesterBuildOperationTests.swift b/Tests/SWBBuildSystemTests/APIDigesterBuildOperationTests.swift
index afd19b47..eccefe74 100644
--- a/Tests/SWBBuildSystemTests/APIDigesterBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/APIDigesterBuildOperationTests.swift
@@ -31,17 +31,21 @@ fileprivate struct APIDigesterBuildOperationTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("foo.swift"),
-                    ]),
+                        TestFile("foo.swift")
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ARCHS": "$(ARCHS_STANDARD)",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "$(HOST_PLATFORM)",
-                        "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
-                        "SWIFT_VERSION": swiftVersion,
-                        "CODE_SIGNING_ALLOWED": "NO",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ARCHS": "$(ARCHS_STANDARD)",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "$(HOST_PLATFORM)",
+                            "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
+                            "SWIFT_VERSION": swiftVersion,
+                            "CODE_SIGNING_ALLOWED": "NO",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -51,10 +55,11 @@ fileprivate struct APIDigesterBuildOperationTests: CoreBasedTests {
                             TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["foo.swift"]),
+                            TestSourcesBuildPhase(["foo.swift"])
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
@@ -64,11 +69,17 @@ fileprivate struct APIDigesterBuildOperationTests: CoreBasedTests {
                 stream <<< "public func foo() -> Int { 42 }"
             }
 
-            try await tester.checkBuild(parameters: BuildParameters(configuration: "Debug", overrides: [
-                "RUN_SWIFT_ABI_GENERATION_TOOL": "YES",
-                "SWIFT_API_DIGESTER_MODE": "api",
-                "SWIFT_ABI_GENERATION_TOOL_OUTPUT_DIR": tmpDir.join("baseline").join("ABI").str,
-            ]), runDestination: .host) { results in
+            try await tester.checkBuild(
+                parameters: BuildParameters(
+                    configuration: "Debug",
+                    overrides: [
+                        "RUN_SWIFT_ABI_GENERATION_TOOL": "YES",
+                        "SWIFT_API_DIGESTER_MODE": "api",
+                        "SWIFT_ABI_GENERATION_TOOL_OUTPUT_DIR": tmpDir.join("baseline").join("ABI").str,
+                    ]
+                ),
+                runDestination: .host
+            ) { results in
                 results.checkNoErrors()
             }
 
@@ -76,12 +87,18 @@ fileprivate struct APIDigesterBuildOperationTests: CoreBasedTests {
                 stream <<< "public func foo() -> String { \"hello, world!\" }"
             }
 
-            try await tester.checkBuild(parameters: BuildParameters(configuration: "Debug", overrides: [
-                "RUN_SWIFT_ABI_CHECKER_TOOL": "YES",
-                "SWIFT_API_DIGESTER_MODE": "api",
-                "SWIFT_ABI_CHECKER_BASELINE_DIR": tmpDir.join("baseline").str,
-                "SWIFT_ABI_CHECKER_DOWNGRADE_ERRORS": "YES",
-            ]), runDestination: .host) { results in
+            try await tester.checkBuild(
+                parameters: BuildParameters(
+                    configuration: "Debug",
+                    overrides: [
+                        "RUN_SWIFT_ABI_CHECKER_TOOL": "YES",
+                        "SWIFT_API_DIGESTER_MODE": "api",
+                        "SWIFT_ABI_CHECKER_BASELINE_DIR": tmpDir.join("baseline").str,
+                        "SWIFT_ABI_CHECKER_DOWNGRADE_ERRORS": "YES",
+                    ]
+                ),
+                runDestination: .host
+            ) { results in
                 results.checkWarning(.contains("func foo() has return type change from Swift.Int to Swift.String"))
                 results.checkNoDiagnostics()
             }
diff --git a/Tests/SWBBuildSystemTests/AppIntentsNLTrainingTests.swift b/Tests/SWBBuildSystemTests/AppIntentsNLTrainingTests.swift
index da54a2b7..64d571a4 100644
--- a/Tests/SWBBuildSystemTests/AppIntentsNLTrainingTests.swift
+++ b/Tests/SWBBuildSystemTests/AppIntentsNLTrainingTests.swift
@@ -38,64 +38,74 @@ fileprivate struct AppIntentsNLTrainingTests: CoreBasedTests {
                     children: [
                         TestFile(appShortcutsStringsFileName),
                         TestFile(appIntentsSourceFileName),
-                        TestFile(infoPlistFileName)
-                    ]),
+                        TestFile(infoPlistFileName),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
-                        "ARCHS": "$(ARCHS_STANDARD)",
-                        "CODE_SIGN_IDENTITY": "-",
-                        "PRODUCT_BUNDLE_IDENTIFIER": "com.foo.bar",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "iphoneos",
-                        "SWIFT_EXEC": swiftCompilerPath.str,
-                        "SWIFT_VERSION": swiftVersion,
-                        "VERSIONING_SYSTEM": "apple-generic",
-                        "INFOPLIST_FILE": "Sources/Info.plist",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
+                            "ARCHS": "$(ARCHS_STANDARD)",
+                            "CODE_SIGN_IDENTITY": "-",
+                            "PRODUCT_BUNDLE_IDENTIFIER": "com.foo.bar",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "iphoneos",
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": swiftVersion,
+                            "VERSIONING_SYSTEM": "apple-generic",
+                            "INFOPLIST_FILE": "Sources/Info.plist",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
-                        "testTarget", type: .bundle,
+                        "testTarget",
+                        type: .bundle,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "USE_HEADERMAP": "NO",
-                                "DEFINES_MODULE": "YES",
-                                "PACKAGE_RESOURCE_BUNDLE_NAME": "best_resources",
-                                "APPLY_RULES_IN_COPY_FILES": "YES",
-                                // Disable the SetOwnerAndGroup action by setting them to empty values.
-                                "INSTALL_GROUP": "",
-                                "INSTALL_OWNER": "",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "USE_HEADERMAP": "NO",
+                                    "DEFINES_MODULE": "YES",
+                                    "PACKAGE_RESOURCE_BUNDLE_NAME": "best_resources",
+                                    "APPLY_RULES_IN_COPY_FILES": "YES",
+                                    // Disable the SetOwnerAndGroup action by setting them to empty values.
+                                    "INSTALL_GROUP": "",
+                                    "INSTALL_OWNER": "",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([TestBuildFile(appShortcutsStringsFileName)]),
                             TestSourcesBuildPhase([TestBuildFile(appIntentsSourceFileName)]),
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot
 
             let projectDir = tester.workspace.projects[0].sourceRoot
 
-            try await tester.fs.writePlist(SRCROOT.join("Sources/Info.plist"), .plDict([
-                "CFBundleDevelopmentRegion": .plString("en"),
-                "CFBundleName": .plString("$(EXECUTABLE_NAME)"),
-                "CFBundleIdentifier": .plString("com.foo.bar")
-            ]))
+            try await tester.fs.writePlist(
+                SRCROOT.join("Sources/Info.plist"),
+                .plDict([
+                    "CFBundleDevelopmentRegion": .plString("en"),
+                    "CFBundleName": .plString("$(EXECUTABLE_NAME)"),
+                    "CFBundleIdentifier": .plString("com.foo.bar"),
+                ])
+            )
 
             try await tester.fs.writeFileContents(projectDir.join(appShortcutsStringsFileName)) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     /* Valid strings file with correct utterance syntax for \(appShortcutsStringsFileName) (contains ${applicationName}) */
                     "Call ${applicationName}" = "Call ${applicationName}";
                     """
             }
 
             try await tester.fs.writeFileContents(projectDir.join(appIntentsSourceFileName)) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     import AppIntents
                     import SwiftUI
 
@@ -152,4 +162,3 @@ fileprivate struct AppIntentsNLTrainingTests: CoreBasedTests {
         }
     }
 }
-
diff --git a/Tests/SWBBuildSystemTests/AppShortcutsStringsValidationTests.swift b/Tests/SWBBuildSystemTests/AppShortcutsStringsValidationTests.swift
index 94b0a9a6..9d833a5c 100644
--- a/Tests/SWBBuildSystemTests/AppShortcutsStringsValidationTests.swift
+++ b/Tests/SWBBuildSystemTests/AppShortcutsStringsValidationTests.swift
@@ -36,42 +36,51 @@ fileprivate struct AppShortcutsStringsValidationTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift"),
-                        TestFile(appShortcutsStringsFileName)
-                    ]),
+                        TestFile(appShortcutsStringsFileName),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "USE_HEADERMAP": "NO",
-                        "SWIFT_EXEC": swiftCompilerPath.str,
-                        "SWIFT_VERSION": swiftVersion,
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "USE_HEADERMAP": "NO",
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": swiftVersion,
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
-                        "testTarget", type: .bundle,
+                        "testTarget",
+                        type: .bundle,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "USE_HEADERMAP": "NO",
-                                "DEFINES_MODULE": "YES",
-                                "PACKAGE_RESOURCE_BUNDLE_NAME": "best_resources",
-                                "APPLY_RULES_IN_COPY_FILES": "YES",
-                                // Disable the SetOwnerAndGroup action by setting them to empty values.
-                                "INSTALL_GROUP": "",
-                                "INSTALL_OWNER": "",
-                                // Test only strings validation
-                                "APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING": "NO",
-                                "DSTROOT": tmpDir.join("dstroot").str,
-                                "LM_ENABLE_LINK_GENERATION": "YES",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "USE_HEADERMAP": "NO",
+                                    "DEFINES_MODULE": "YES",
+                                    "PACKAGE_RESOURCE_BUNDLE_NAME": "best_resources",
+                                    "APPLY_RULES_IN_COPY_FILES": "YES",
+                                    // Disable the SetOwnerAndGroup action by setting them to empty values.
+                                    "INSTALL_GROUP": "",
+                                    "INSTALL_OWNER": "",
+                                    // Test only strings validation
+                                    "APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING": "NO",
+                                    "DSTROOT": tmpDir.join("dstroot").str,
+                                    "LM_ENABLE_LINK_GENERATION": "YES",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([TestBuildFile(appShortcutsStringsFileName)]),
                             TestSourcesBuildPhase(["source.swift"]),
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
@@ -79,15 +88,13 @@ fileprivate struct AppShortcutsStringsValidationTests: CoreBasedTests {
             let parameters = BuildParameters(action: .install, configuration: "Debug")
 
             try await tester.fs.writeFileContents(projectDir.join("source.swift")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     struct Tester {}
                     """
             }
 
             try await tester.fs.writeFileContents(projectDir.join(appShortcutsStringsFileName)) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     "key" = "Invalid strings file"
                     """
             }
@@ -115,42 +122,51 @@ fileprivate struct AppShortcutsStringsValidationTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift"),
-                        TestFile(appShortcutsStringsFileName)
-                    ]),
+                        TestFile(appShortcutsStringsFileName),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "USE_HEADERMAP": "NO",
-                        "SWIFT_EXEC": swiftCompilerPath.str,
-                        "SWIFT_VERSION": swiftVersion,
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "USE_HEADERMAP": "NO",
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": swiftVersion,
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
-                        "testTarget", type: .bundle,
+                        "testTarget",
+                        type: .bundle,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "USE_HEADERMAP": "NO",
-                                "DEFINES_MODULE": "YES",
-                                "PACKAGE_RESOURCE_BUNDLE_NAME": "best_resources",
-                                "APPLY_RULES_IN_COPY_FILES": "YES",
-                                // Disable the SetOwnerAndGroup action by setting them to empty values.
-                                "INSTALL_GROUP": "",
-                                "INSTALL_OWNER": "",
-                                // Test only strings validation
-                                "APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING": "NO",
-                                "DSTROOT": tmpDir.join("dstroot").str,
-                                "LM_ENABLE_LINK_GENERATION": "YES",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "USE_HEADERMAP": "NO",
+                                    "DEFINES_MODULE": "YES",
+                                    "PACKAGE_RESOURCE_BUNDLE_NAME": "best_resources",
+                                    "APPLY_RULES_IN_COPY_FILES": "YES",
+                                    // Disable the SetOwnerAndGroup action by setting them to empty values.
+                                    "INSTALL_GROUP": "",
+                                    "INSTALL_OWNER": "",
+                                    // Test only strings validation
+                                    "APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING": "NO",
+                                    "DSTROOT": tmpDir.join("dstroot").str,
+                                    "LM_ENABLE_LINK_GENERATION": "YES",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([TestBuildFile(appShortcutsStringsFileName)]),
                             TestSourcesBuildPhase(["source.swift"]),
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
@@ -158,8 +174,7 @@ fileprivate struct AppShortcutsStringsValidationTests: CoreBasedTests {
             let parameters = BuildParameters(action: .install, configuration: "Debug")
 
             try await tester.fs.writeFileContents(projectDir.join("source.swift")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     import AppIntents
                     struct TestIntent: AppIntent {
                         static let title: LocalizedStringResource = "Play Sound Effect"
@@ -187,8 +202,7 @@ fileprivate struct AppShortcutsStringsValidationTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(projectDir.join(appShortcutsStringsFileName)) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     /* Valid strings file without correct utterance syntax for \(appShortcutsStringsFileName) */
                     "Call" = "Incorrect utterance syntax 1";
                     """
@@ -202,15 +216,17 @@ fileprivate struct AppShortcutsStringsValidationTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("ValidateAppShortcutStringsMetadata")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName.asString.hasSuffix("appshortcutstringsprocessor") {
-                        task.checkCommandLine([executableName.asString,
-                                               "--source-file", "\(SRCROOT)/\(appShortcutsStringsFileName)",
-                                               "--input-data-path", metadataFolderPath,
-                                               "--platform-family",  "macOS",
-                                               "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
-                                               "--validate-assistant-intents",
-                                               "--metadata-file-list", "\(tmpDir.str)/build/AppShortcutsProject.build/Debug/testTarget.build/testTarget.DependencyMetadataFileList"
-                                              ])
+                        executableName.asString.hasSuffix("appshortcutstringsprocessor")
+                    {
+                        task.checkCommandLine([
+                            executableName.asString,
+                            "--source-file", "\(SRCROOT)/\(appShortcutsStringsFileName)",
+                            "--input-data-path", metadataFolderPath,
+                            "--platform-family", "macOS",
+                            "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
+                            "--validate-assistant-intents",
+                            "--metadata-file-list", "\(tmpDir.str)/build/AppShortcutsProject.build/Debug/testTarget.build/testTarget.DependencyMetadataFileList",
+                        ])
                     }
                 }
                 // 2 Errors for missing application name as the phrases in the app shortcut are combined with the
@@ -221,8 +237,7 @@ fileprivate struct AppShortcutsStringsValidationTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(projectDir.join(appShortcutsStringsFileName)) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     /* Valid strings file with correct utterance syntax for \(appShortcutsStringsFileName) (contains ${applicationName}) */
                     "key" = "Correct utterance ${applicationName}";
                     """
diff --git a/Tests/SWBBuildSystemTests/AppleScriptTests.swift b/Tests/SWBBuildSystemTests/AppleScriptTests.swift
index 2b432a56..47dd6ed8 100644
--- a/Tests/SWBBuildSystemTests/AppleScriptTests.swift
+++ b/Tests/SWBBuildSystemTests/AppleScriptTests.swift
@@ -35,8 +35,9 @@ fileprivate struct AppleScriptTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("Foo.applescript"),
-                            ]),
+                                TestFile("Foo.applescript")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -46,8 +47,9 @@ fileprivate struct AppleScriptTests: CoreBasedTests {
                                     "INSTALL_PATH": "$(HOME)/Library/Automator",
                                     "OTHER_OSAFLAGS": "-x -t 0 -c 0",
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "WRAPPER_EXTENSION": "action"
-                                ]),
+                                    "WRAPPER_EXTENSION": "action",
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -55,20 +57,25 @@ fileprivate struct AppleScriptTests: CoreBasedTests {
                                 type: .bundle,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "Foo.applescript",
-                                    ]),
+                                        "Foo.applescript"
+                                    ])
                                 ]
                             )
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot
 
             // Write the Info.plist file.
-            try await tester.fs.writePlist(SRCROOT.join("Info.plist"), .plDict([
-                "CFBundleDevelopmentRegion": .plString("en"),
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)")
-            ]))
+            try await tester.fs.writePlist(
+                SRCROOT.join("Info.plist"),
+                .plDict([
+                    "CFBundleDevelopmentRegion": .plString("en"),
+                    "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                ])
+            )
 
             // Write the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Foo.applescript")) { contents in
diff --git a/Tests/SWBBuildSystemTests/BuildBacktraceTests.swift b/Tests/SWBBuildSystemTests/BuildBacktraceTests.swift
index aaaf5bd0..04edce4a 100644
--- a/Tests/SWBBuildSystemTests/BuildBacktraceTests.swift
+++ b/Tests/SWBBuildSystemTests/BuildBacktraceTests.swift
@@ -35,13 +35,15 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
                             children: [
                                 TestFile("foo.c"),
                                 TestFile("bar.c"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                ])
+                                    "PRODUCT_NAME": "$(TARGET_NAME)"
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -49,22 +51,27 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "foo.c",
-                                    ]),
-                                ]),
+                                        "foo.c"
+                                    ])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "TargetBar",
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "bar.c",
+                                        "bar.c"
                                     ]),
                                     TestFrameworksBuildPhase([
                                         "TargetFoo.framework"
-                                    ])
-                                ], dependencies: ["TargetFoo"]),
-                        ])
-                ])
+                                    ]),
+                                ],
+                                dependencies: ["TargetFoo"]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, fileSystem: localFS)
             let parameters = BuildParameters(configuration: "Debug")
@@ -73,16 +80,14 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/foo.c")) { file in
-                file <<<
-                    """
+                file <<< """
                     int foo(void) {
                         return 1;
                     }
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/bar.c")) { file in
-                file <<<
-                    """
+                file <<< """
                     int bar(void) {
                         return 2;
                     }
@@ -102,8 +107,7 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
             try await tester.checkNullBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true)
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/foo.c")) { file in
-                file <<<
-                    """
+                file <<< """
                     int foo2(void) {
                         return 42;
                     }
@@ -113,53 +117,68 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
             try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true) { results in
                 results.checkNoDiagnostics()
                 results.checkTask(.matchTargetName("TargetFoo"), .matchRuleType("CompileC")) { task in
-                    results.checkBacktrace(task, [
-                        "<category='ruleInputRebuilt' description='an input of 'Compile foo.c (\(results.runDestinationTargetArchitecture))' changed'>",
-                        "<category='ruleHadInvalidValue' description='file '\(SRCROOT.join("Sources/foo.c").str)' changed'>"
-                    ])
+                    results.checkBacktrace(
+                        task,
+                        [
+                            "<category='ruleInputRebuilt' description='an input of 'Compile foo.c (\(results.runDestinationTargetArchitecture))' changed'>",
+                            "<category='ruleHadInvalidValue' description='file '\(SRCROOT.join("Sources/foo.c").str)' changed'>",
+                        ]
+                    )
                 }
                 results.checkTask(.matchTargetName("TargetBar"), .matchRuleType("Ld")) { task in
-                    results.checkBacktrace(task, [
-                        "<category='ruleInputRebuilt' description='an input of 'Link TargetBar (\(results.runDestinationTargetArchitecture))' changed'>",
-                        "<category='ruleInputRebuilt' description='the task producing file '\(SRCROOT.str)/build/EagerLinkingTBDs/Debug/TargetFoo.framework/Versions/A/TargetFoo.tbd' ran'>",
-                        "<category='ruleInputRebuilt' description='an input of 'Generate TBD TargetFoo' changed'>",
-                        "<category='ruleInputRebuilt' description='the task producing file '\(SRCROOT.str)/build/Debug/TargetFoo.framework/Versions/A/TargetFoo' ran'>",
-                        "<category='ruleInputRebuilt' description='an input of 'Link TargetFoo (\(results.runDestinationTargetArchitecture))' changed'>",
-                        "<category='ruleInputRebuilt' description='the task producing file '\(SRCROOT.str)/build/aProject.build/Debug/TargetFoo.build/Objects-normal/\(results.runDestinationTargetArchitecture)/foo.o' ran'>",
-                        "<category='ruleInputRebuilt' description='an input of 'Compile foo.c (\(results.runDestinationTargetArchitecture))' changed'>",
-                        "<category='ruleHadInvalidValue' description='file '\(SRCROOT.str)/Sources/foo.c' changed'>"
-                    ])
+                    results.checkBacktrace(
+                        task,
+                        [
+                            "<category='ruleInputRebuilt' description='an input of 'Link TargetBar (\(results.runDestinationTargetArchitecture))' changed'>",
+                            "<category='ruleInputRebuilt' description='the task producing file '\(SRCROOT.str)/build/EagerLinkingTBDs/Debug/TargetFoo.framework/Versions/A/TargetFoo.tbd' ran'>",
+                            "<category='ruleInputRebuilt' description='an input of 'Generate TBD TargetFoo' changed'>",
+                            "<category='ruleInputRebuilt' description='the task producing file '\(SRCROOT.str)/build/Debug/TargetFoo.framework/Versions/A/TargetFoo' ran'>",
+                            "<category='ruleInputRebuilt' description='an input of 'Link TargetFoo (\(results.runDestinationTargetArchitecture))' changed'>",
+                            "<category='ruleInputRebuilt' description='the task producing file '\(SRCROOT.str)/build/aProject.build/Debug/TargetFoo.build/Objects-normal/\(results.runDestinationTargetArchitecture)/foo.o' ran'>",
+                            "<category='ruleInputRebuilt' description='an input of 'Compile foo.c (\(results.runDestinationTargetArchitecture))' changed'>",
+                            "<category='ruleHadInvalidValue' description='file '\(SRCROOT.str)/Sources/foo.c' changed'>",
+                        ]
+                    )
                 }
             }
 
-            let modifiedParameters = BuildParameters(configuration: "Debug", overrides: ["GCC_PREPROCESSOR_DEFINITIONS": "MY_DEF",])
+            let modifiedParameters = BuildParameters(configuration: "Debug", overrides: ["GCC_PREPROCESSOR_DEFINITIONS": "MY_DEF"])
             let modifiedBuildRequest = BuildRequest(parameters: modifiedParameters, buildTargets: tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: modifiedParameters, target: $0) }), dependencyScope: .workspace, continueBuildingAfterErrors: true, useParallelTargets: true, useImplicitDependencies: false, useDryRun: false)
             try await tester.checkBuild(runDestination: .macOS, buildRequest: modifiedBuildRequest, persistent: true) { results in
                 results.checkNoDiagnostics()
                 results.checkTask(.matchTargetName("TargetFoo"), .matchRuleType("CompileC")) { task in
-                    results.checkBacktrace(task, [
-                        "<category='ruleInputRebuilt' description='an input of 'Compile foo.c (\(results.runDestinationTargetArchitecture))' changed'>",
-                        "<category='ruleInputRebuilt' description='the task producing file '\(SRCROOT.str)/build/aProject.build/Debug/TargetFoo.build/Objects-normal/\(results.runDestinationTargetArchitecture)/7187679823f38a2a940e0043cdf9d637-common-args.resp' ran'>",
-                        "<category='ruleSignatureChanged' description='arguments, environment, or working directory of 'Write 7187679823f38a2a940e0043cdf9d637-common-args.resp (\(results.runDestinationTargetArchitecture))' changed'>"
-                    ])
+                    results.checkBacktrace(
+                        task,
+                        [
+                            "<category='ruleInputRebuilt' description='an input of 'Compile foo.c (\(results.runDestinationTargetArchitecture))' changed'>",
+                            "<category='ruleInputRebuilt' description='the task producing file '\(SRCROOT.str)/build/aProject.build/Debug/TargetFoo.build/Objects-normal/\(results.runDestinationTargetArchitecture)/7187679823f38a2a940e0043cdf9d637-common-args.resp' ran'>",
+                            "<category='ruleSignatureChanged' description='arguments, environment, or working directory of 'Write 7187679823f38a2a940e0043cdf9d637-common-args.resp (\(results.runDestinationTargetArchitecture))' changed'>",
+                        ]
+                    )
                 }
                 if tester.fs.fileSystemMode == .checksumOnly {
                     results.checkTask(.matchTargetName("TargetBar"), .matchRuleType("CompileC")) { task in
-                        results.checkBacktrace(task, [
-                            "<category='ruleSignatureChanged' description='signature of 'Compile bar.c (\(results.runDestinationTargetArchitecture))' changed'>"
-                        ])
+                        results.checkBacktrace(
+                            task,
+                            [
+                                "<category='ruleSignatureChanged' description='signature of 'Compile bar.c (\(results.runDestinationTargetArchitecture))' changed'>"
+                            ]
+                        )
                     }
                     // Ensure "Ld" is not executed, because contents of "bar.o" are unchanged
                     results.checkNoTask()
                 } else {
                     results.checkTask(.matchTargetName("TargetBar"), .matchRuleType("Ld")) { task in
-                        results.checkBacktrace(task, [
-                            "<category='ruleInputRebuilt' description='an input of 'Link TargetBar (\(results.runDestinationTargetArchitecture))' changed'>",
-                            "<category='ruleInputRebuilt' description='the task producing file '\(SRCROOT.str)/build/aProject.build/Debug/TargetBar.build/Objects-normal/\(results.runDestinationTargetArchitecture)/bar.o' ran'>",
-                            "<category='ruleInputRebuilt' description='an input of 'Compile bar.c (\(results.runDestinationTargetArchitecture))' changed'>",
-                            "<category='ruleInputRebuilt' description='the task producing file '\(SRCROOT.str)/build/aProject.build/Debug/TargetBar.build/Objects-normal/\(results.runDestinationTargetArchitecture)/7187679823f38a2a940e0043cdf9d637-common-args.resp' ran'>",
-                            "<category='ruleSignatureChanged' description='arguments, environment, or working directory of 'Write 7187679823f38a2a940e0043cdf9d637-common-args.resp (\(results.runDestinationTargetArchitecture))' changed'>"
-                        ])
+                        results.checkBacktrace(
+                            task,
+                            [
+                                "<category='ruleInputRebuilt' description='an input of 'Link TargetBar (\(results.runDestinationTargetArchitecture))' changed'>",
+                                "<category='ruleInputRebuilt' description='the task producing file '\(SRCROOT.str)/build/aProject.build/Debug/TargetBar.build/Objects-normal/\(results.runDestinationTargetArchitecture)/bar.o' ran'>",
+                                "<category='ruleInputRebuilt' description='an input of 'Compile bar.c (\(results.runDestinationTargetArchitecture))' changed'>",
+                                "<category='ruleInputRebuilt' description='the task producing file '\(SRCROOT.str)/build/aProject.build/Debug/TargetBar.build/Objects-normal/\(results.runDestinationTargetArchitecture)/7187679823f38a2a940e0043cdf9d637-common-args.resp' ran'>",
+                                "<category='ruleSignatureChanged' description='arguments, environment, or working directory of 'Write 7187679823f38a2a940e0043cdf9d637-common-args.resp (\(results.runDestinationTargetArchitecture))' changed'>",
+                            ]
+                        )
                     }
                 }
             }
@@ -179,15 +198,17 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
                             "Sources",
                             path: "Sources",
                             children: [
-                                TestFile("foo.swift"),
-                            ]),
+                                TestFile("foo.swift")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "SWIFT_VERSION": swiftVersion
-                                ])
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -195,11 +216,14 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "foo.swift",
-                                    ]),
-                                ])
-                        ])
-                ])
+                                        "foo.swift"
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, fileSystem: localFS)
             let parameters = BuildParameters(configuration: "Debug")
@@ -208,8 +232,7 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/foo.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     func foo() {}
                     """
             }
@@ -217,24 +240,29 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
             try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true) { results in
                 results.checkNoDiagnostics()
                 results.checkTask(.matchTargetName("TargetFoo"), .matchRuleType("SwiftEmitModule")) { task in
-                    results.checkBacktrace(task, [
-                        "<category='dynamicTaskRegistration' description=''>",
-                        "<category='dynamicTaskRequest' description='task was scheduled by the Swift driver'>",
-                        "<category='ruleNeverBuilt' description=''Compile TargetFoo (\(results.runDestinationTargetArchitecture))' had never run'>"
-                    ])
+                    results.checkBacktrace(
+                        task,
+                        [
+                            "<category='dynamicTaskRegistration' description=''>",
+                            "<category='dynamicTaskRequest' description='task was scheduled by the Swift driver'>",
+                            "<category='ruleNeverBuilt' description=''Compile TargetFoo (\(results.runDestinationTargetArchitecture))' had never run'>",
+                        ]
+                    )
                 }
                 results.checkTask(.matchTargetName("TargetFoo"), .matchRuleType("SwiftCompile")) { task in
-                    results.checkBacktrace(task, [
-                        "<category='dynamicTaskRegistration' description=''>",
-                        "<category='dynamicTaskRequest' description='task was scheduled by the Swift driver'>",
-                        "<category='ruleNeverBuilt' description=''Compile TargetFoo (\(results.runDestinationTargetArchitecture))' had never run'>"
-                    ])
+                    results.checkBacktrace(
+                        task,
+                        [
+                            "<category='dynamicTaskRegistration' description=''>",
+                            "<category='dynamicTaskRequest' description='task was scheduled by the Swift driver'>",
+                            "<category='ruleNeverBuilt' description=''Compile TargetFoo (\(results.runDestinationTargetArchitecture))' had never run'>",
+                        ]
+                    )
                 }
             }
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/foo.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     func foo() {}
 
                     func bar() {}
@@ -244,20 +272,26 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
             try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true) { results in
                 results.checkNoDiagnostics()
                 results.checkTask(.matchTargetName("TargetFoo"), .matchRuleType("SwiftEmitModule")) { task in
-                    results.checkBacktrace(task, [
-                        "<category='dynamicTaskRegistration' description=''>",
-                        "<category='dynamicTaskRequest' description='task was scheduled by the Swift driver'>",
-                        "<category='ruleInputRebuilt' description='an input of 'Compile TargetFoo (\(results.runDestinationTargetArchitecture))' changed'>",
-                        "<category='ruleHadInvalidValue' description='file '\(tmpDirPath.str)/Test/aProject/Sources/foo.swift' changed'>"
-                    ])
+                    results.checkBacktrace(
+                        task,
+                        [
+                            "<category='dynamicTaskRegistration' description=''>",
+                            "<category='dynamicTaskRequest' description='task was scheduled by the Swift driver'>",
+                            "<category='ruleInputRebuilt' description='an input of 'Compile TargetFoo (\(results.runDestinationTargetArchitecture))' changed'>",
+                            "<category='ruleHadInvalidValue' description='file '\(tmpDirPath.str)/Test/aProject/Sources/foo.swift' changed'>",
+                        ]
+                    )
                 }
                 results.checkTask(.matchTargetName("TargetFoo"), .matchRuleType("SwiftCompile")) { task in
-                    results.checkBacktrace(task, [
-                        "<category='dynamicTaskRegistration' description=''>",
-                        "<category='dynamicTaskRequest' description='task was scheduled by the Swift driver'>",
-                        "<category='ruleInputRebuilt' description='an input of 'Compile TargetFoo (\(results.runDestinationTargetArchitecture))' changed'>",
-                        "<category='ruleHadInvalidValue' description='file '\(tmpDirPath.str)/Test/aProject/Sources/foo.swift' changed'>"
-                    ])
+                    results.checkBacktrace(
+                        task,
+                        [
+                            "<category='dynamicTaskRegistration' description=''>",
+                            "<category='dynamicTaskRequest' description='task was scheduled by the Swift driver'>",
+                            "<category='ruleInputRebuilt' description='an input of 'Compile TargetFoo (\(results.runDestinationTargetArchitecture))' changed'>",
+                            "<category='ruleHadInvalidValue' description='file '\(tmpDirPath.str)/Test/aProject/Sources/foo.swift' changed'>",
+                        ]
+                    )
                 }
             }
         }
@@ -276,14 +310,16 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
                             "Sources",
                             path: "Sources",
                             children: [
-                                TestFile("foo.c"),
-                            ]),
+                                TestFile("foo.c")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                ])
+                                    "PRODUCT_NAME": "$(TARGET_NAME)"
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -291,11 +327,14 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "foo.c",
-                                    ]),
-                                ])
-                        ])
-                ])
+                                        "foo.c"
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, fileSystem: localFS)
             let parameters = BuildParameters(configuration: "Debug")
@@ -304,8 +343,7 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/foo.c")) { file in
-                file <<<
-                    """
+                file <<< """
                     int foo(void) { return 42; }
                     """
             }
@@ -319,9 +357,12 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
             try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true) { results in
                 results.checkNoDiagnostics()
                 results.checkTask(.matchTargetName("TargetFoo"), .matchRuleType("CompileC")) { task in
-                    results.checkBacktrace(task, [
-                        "<category='ruleHadInvalidValue' description='outputs of 'Compile foo.c (\(results.runDestinationTargetArchitecture))' were missing or modified'>",
-                    ])
+                    results.checkBacktrace(
+                        task,
+                        [
+                            "<category='ruleHadInvalidValue' description='outputs of 'Compile foo.c (\(results.runDestinationTargetArchitecture))' were missing or modified'>"
+                        ]
+                    )
                 }
             }
         }
@@ -339,23 +380,28 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             path: "Sources",
-                            children: []),
+                            children: []
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                ])
+                                    "PRODUCT_NAME": "$(TARGET_NAME)"
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
                                 "TargetFoo",
                                 type: .framework,
                                 buildPhases: [
-                                    TestShellScriptBuildPhase(name: "Script", originalObjectID: "X", contents: "true", alwaysOutOfDate: true),
-                                ])
-                        ])
-                ])
+                                    TestShellScriptBuildPhase(name: "Script", originalObjectID: "X", contents: "true", alwaysOutOfDate: true)
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, fileSystem: localFS)
             let parameters = BuildParameters(configuration: "Debug")
@@ -364,18 +410,24 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
             try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true) { results in
                 results.checkNoDiagnostics()
                 results.checkTask(.matchTargetName("TargetFoo"), .matchRuleType("PhaseScriptExecution")) { task in
-                    results.checkBacktrace(task, [
-                        "<category='ruleNeverBuilt' description=''Run custom shell script 'Script'' had never run'>"
-                    ])
+                    results.checkBacktrace(
+                        task,
+                        [
+                            "<category='ruleNeverBuilt' description=''Run custom shell script 'Script'' had never run'>"
+                        ]
+                    )
                 }
             }
 
             try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true) { results in
                 results.checkNoDiagnostics()
                 results.checkTask(.matchTargetName("TargetFoo"), .matchRuleType("PhaseScriptExecution")) { task in
-                    results.checkBacktrace(task, [
-                        "<category='ruleHadInvalidValue' description=''Run custom shell script 'Script'' was configured to run in every incremental build'>"
-                    ])
+                    results.checkBacktrace(
+                        task,
+                        [
+                            "<category='ruleHadInvalidValue' description=''Run custom shell script 'Script'' was configured to run in every incremental build'>"
+                        ]
+                    )
                 }
             }
         }
@@ -394,8 +446,9 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
                             "Sources",
                             path: "Sources",
                             children: [
-                                TestFile("foo.c"),
-                            ]),
+                                TestFile("foo.c")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -406,8 +459,9 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
                                     "GENERATE_INFOPLIST_FILE": "YES",
                                     "INSTALL_GROUP": "",
                                     "INSTALL_OWNER": "",
-                                    "DSTROOT": tmpDirPath.join("DSTROOT").str
-                                ])
+                                    "DSTROOT": tmpDirPath.join("DSTROOT").str,
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -415,11 +469,14 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
                                 type: .application,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "foo.c",
-                                    ]),
-                                ]),
-                        ])
-                ])
+                                        "foo.c"
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, fileSystem: localFS)
             let parameters = BuildParameters(action: .install, configuration: "Debug")
@@ -429,8 +486,7 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/foo.c")) { file in
-                file <<<
-                    """
+                file <<< """
                     int main() {}
                     int foo(void) {
                         return 1;
@@ -445,8 +501,7 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
             try await tester.checkNullBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true, signableTargets: Set(provisioningInputs.keys), signableTargetInputs: provisioningInputs)
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/foo.c")) { file in
-                file <<<
-                    """
+                file <<< """
                     int main() {}
                     int foo2(void) {
                         return 42;
@@ -457,16 +512,19 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
             try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true, signableTargets: Set(provisioningInputs.keys), signableTargetInputs: provisioningInputs) { results in
                 results.checkNoDiagnostics()
                 results.checkTask(.matchTargetName("TargetFoo"), .matchRuleType("RegisterWithLaunchServices")) { task in
-                    results.checkBacktrace(task, [
-                        "<category='ruleInputRebuilt' description='an input of 'Register TargetFoo.app' changed'>",
-                        "<category='ruleInputRebuilt' description=''Validate TargetFoo.app' mutated '\(tmpDirPath.join("DSTROOT").str)/Applications/TargetFoo.app''>",
-                        "<category='ruleInputRebuilt' description='an input of 'Validate TargetFoo.app' changed'>",
-                        "<category='ruleInputRebuilt' description=''Sign TargetFoo.app' mutated '\(tmpDirPath.join("DSTROOT").str)/Applications/TargetFoo.app' and '\(tmpDirPath.join("DSTROOT").str)/Applications/TargetFoo.app/Contents/MacOS/TargetFoo''>",
-                        "<category='ruleInputRebuilt' description='an input of 'Sign TargetFoo.app' changed'>",
-                        "<category='ruleInputRebuilt' description='an input of file '\(SRCROOT.str)/Sources/foo.c/' changed'>",
-                        "<category='ruleInputRebuilt' description='an input of signature of directory tree at '\(SRCROOT.str)/Sources/foo.c' changed'>",
-                        "<category='ruleHadInvalidValue' description='contents of '\(SRCROOT.str)/Sources/foo.c' changed'>"
-                    ])
+                    results.checkBacktrace(
+                        task,
+                        [
+                            "<category='ruleInputRebuilt' description='an input of 'Register TargetFoo.app' changed'>",
+                            "<category='ruleInputRebuilt' description=''Validate TargetFoo.app' mutated '\(tmpDirPath.join("DSTROOT").str)/Applications/TargetFoo.app''>",
+                            "<category='ruleInputRebuilt' description='an input of 'Validate TargetFoo.app' changed'>",
+                            "<category='ruleInputRebuilt' description=''Sign TargetFoo.app' mutated '\(tmpDirPath.join("DSTROOT").str)/Applications/TargetFoo.app' and '\(tmpDirPath.join("DSTROOT").str)/Applications/TargetFoo.app/Contents/MacOS/TargetFoo''>",
+                            "<category='ruleInputRebuilt' description='an input of 'Sign TargetFoo.app' changed'>",
+                            "<category='ruleInputRebuilt' description='an input of file '\(SRCROOT.str)/Sources/foo.c/' changed'>",
+                            "<category='ruleInputRebuilt' description='an input of signature of directory tree at '\(SRCROOT.str)/Sources/foo.c' changed'>",
+                            "<category='ruleHadInvalidValue' description='contents of '\(SRCROOT.str)/Sources/foo.c' changed'>",
+                        ]
+                    )
                 }
             }
         }
@@ -487,13 +545,15 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
                             children: [
                                 TestFile("foo.c"),
                                 TestFile("bar.c"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                ])
+                                    "PRODUCT_NAME": "$(TARGET_NAME)"
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -501,22 +561,27 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "foo.c",
-                                    ]),
-                                ]),
+                                        "foo.c"
+                                    ])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "TargetBar",
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "bar.c",
+                                        "bar.c"
                                     ]),
                                     TestFrameworksBuildPhase([
                                         "TargetFoo.framework"
-                                    ])
-                                ], dependencies: ["TargetFoo"]),
-                        ])
-                ])
+                                    ]),
+                                ],
+                                dependencies: ["TargetFoo"]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, fileSystem: localFS)
             let parameters = BuildParameters(configuration: "Debug")
@@ -525,16 +590,14 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/foo.c")) { file in
-                file <<<
-                    """
+                file <<< """
                     int foo(void) {
                         return 1;
                     }
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/bar.c")) { file in
-                file <<<
-                    """
+                file <<< """
                     int bar(void) {
                         return 2;
                     }
@@ -548,8 +611,7 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
             try await tester.checkNullBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true)
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/foo.c")) { file in
-                file <<<
-                    """
+                file <<< """
                     int foo2(void) {
                         return 42;
                     }
@@ -559,17 +621,20 @@ fileprivate struct BuildBacktraceTests: CoreBasedTests {
             try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true) { results in
                 results.checkNoDiagnostics()
                 results.checkTask(.matchTargetName("TargetBar"), .matchRuleType("Ld")) { task in
-                    results.checkTextualBacktrace(task, """
-                    #0: an input of 'Link TargetBar (\(results.runDestinationTargetArchitecture))' changed
-                    #1: the task producing file '\(SRCROOT.str)/build/EagerLinkingTBDs/Debug/TargetFoo.framework/Versions/A/TargetFoo.tbd' ran
-                    #2: an input of 'Generate TBD TargetFoo' changed
-                    #3: the task producing file '\(SRCROOT.str)/build/Debug/TargetFoo.framework/Versions/A/TargetFoo' ran
-                    #4: an input of 'Link TargetFoo (\(results.runDestinationTargetArchitecture))' changed
-                    #5: the task producing file '\(SRCROOT.str)/build/aProject.build/Debug/TargetFoo.build/Objects-normal/\(results.runDestinationTargetArchitecture)/foo.o' ran
-                    #6: an input of 'Compile foo.c (\(results.runDestinationTargetArchitecture))' changed
-                    #7: file '\(SRCROOT.str)/Sources/foo.c' changed
-
-                    """)
+                    results.checkTextualBacktrace(
+                        task,
+                        """
+                        #0: an input of 'Link TargetBar (\(results.runDestinationTargetArchitecture))' changed
+                        #1: the task producing file '\(SRCROOT.str)/build/EagerLinkingTBDs/Debug/TargetFoo.framework/Versions/A/TargetFoo.tbd' ran
+                        #2: an input of 'Generate TBD TargetFoo' changed
+                        #3: the task producing file '\(SRCROOT.str)/build/Debug/TargetFoo.framework/Versions/A/TargetFoo' ran
+                        #4: an input of 'Link TargetFoo (\(results.runDestinationTargetArchitecture))' changed
+                        #5: the task producing file '\(SRCROOT.str)/build/aProject.build/Debug/TargetFoo.build/Objects-normal/\(results.runDestinationTargetArchitecture)/foo.o' ran
+                        #6: an input of 'Compile foo.c (\(results.runDestinationTargetArchitecture))' changed
+                        #7: file '\(SRCROOT.str)/Sources/foo.c' changed
+
+                        """
+                    )
                 }
             }
         }
diff --git a/Tests/SWBBuildSystemTests/BuildCommandTests.swift b/Tests/SWBBuildSystemTests/BuildCommandTests.swift
index 07da60df..8c39bf47 100644
--- a/Tests/SWBBuildSystemTests/BuildCommandTests.swift
+++ b/Tests/SWBBuildSystemTests/BuildCommandTests.swift
@@ -32,14 +32,20 @@ fileprivate struct BuildCommandTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup("Sources", children: [TestFile("CFile.c"), TestFile("SwiftFile.swift"), TestFile("ObjCFile.m")]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)",
-                                            "SWIFT_ENABLE_EXPLICIT_MODULES": "NO",
-                                            "SWIFT_VERSION": swiftVersion])],
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_ENABLE_EXPLICIT_MODULES": "NO",
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "aLibrary", type: .staticLibrary,
+                                "aLibrary",
+                                type: .staticLibrary,
                                 buildConfigurations: [TestBuildConfiguration("Debug")],
                                 buildPhases: [TestSourcesBuildPhase(["CFile.c", "SwiftFile.swift", "ObjCFile.m"])]
                             )
@@ -75,7 +81,7 @@ fileprivate struct BuildCommandTests: CoreBasedTests {
                 results.checkTaskExists(.matchRule(["SwiftCompile", "normal", results.runDestinationTargetArchitecture, "Compiling \(swiftFile.basename)", swiftFile.str]))
                 results.checkTaskExists(.matchRule(["SwiftEmitModule", "normal", results.runDestinationTargetArchitecture, "Emitting module for aLibrary"]))
                 if runDestination == .linux {  // FIXME: This needs to be investigated... We should be able to use core.hostOperatingSystem.imageFormat.requiresSwiftModulewrap to test for this, but on Windows using this causes the test to fail as the SwiftModuleWrap does not seem to be added.
-                    results.checkTaskExists(.matchRule(["SwiftModuleWrap", "normal", results.runDestinationTargetArchitecture,  "Wrapping Swift module aLibrary"]))
+                    results.checkTaskExists(.matchRule(["SwiftModuleWrap", "normal", results.runDestinationTargetArchitecture, "Wrapping Swift module aLibrary"]))
                 }
                 results.checkNoTask()
             }
@@ -114,23 +120,29 @@ fileprivate struct BuildCommandTests: CoreBasedTests {
             var targets: [any TestTarget] = [
                 TestAggregateTarget("All", dependencies: ["aFramework"] + (multipleTargets ? ["bFramework"] : [])),
                 TestStandardTarget(
-                    "aFramework", type: .framework,
+                    "aFramework",
+                    type: .framework,
                     buildConfigurations: [TestBuildConfiguration("Debug")],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile(fileName)
-                        ]),
-                    ])
+                        ])
+                    ]
+                ),
             ]
             if multipleTargets {
-                targets.append(TestStandardTarget(
-                    "bFramework", type: .framework,
-                    buildConfigurations: [TestBuildConfiguration("Debug")],
-                    buildPhases: [
-                        TestSourcesBuildPhase([
-                            TestBuildFile(fileName)
-                        ]),
-                    ]))
+                targets.append(
+                    TestStandardTarget(
+                        "bFramework",
+                        type: .framework,
+                        buildConfigurations: [TestBuildConfiguration("Debug")],
+                        buildPhases: [
+                            TestSourcesBuildPhase([
+                                TestBuildFile(fileName)
+                            ])
+                        ]
+                    )
+                )
             }
             let testWorkspace = TestWorkspace(
                 "Test",
@@ -138,14 +150,22 @@ fileprivate struct BuildCommandTests: CoreBasedTests {
                 projects: [
                     TestProject(
                         "aProject",
-                        groupTree: TestGroup("Sources", children: [
-                            TestFile(fileName, fileType: fileType),
-                        ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])],
-                        targets: targets)
-                ])
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile(fileName, fileType: fileType)
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]
+                            )
+                        ],
+                        targets: targets
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Create the input file.
@@ -270,28 +290,40 @@ fileprivate struct BuildCommandTests: CoreBasedTests {
                     projects: [
                         TestProject(
                             "aProject",
-                            groupTree: TestGroup("Sources", children: [
-                                TestFile("CFile.c"),
-                            ]),
-                            buildConfigurations: [TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])],
+                            groupTree: TestGroup(
+                                "Sources",
+                                children: [
+                                    TestFile("CFile.c")
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]
+                                )
+                            ],
                             targets: [
                                 TestStandardTarget(
-                                    "aLibrary", type: .staticLibrary,
+                                    "aLibrary",
+                                    type: .staticLibrary,
                                     buildConfigurations: [TestBuildConfiguration("Debug")],
                                     buildPhases: [
-                                        TestSourcesBuildPhase(["CFile.c"]),
+                                        TestSourcesBuildPhase(["CFile.c"])
                                     ],
-                                    dependencies: ["aLibraryDep"]),
+                                    dependencies: ["aLibraryDep"]
+                                ),
                                 TestStandardTarget(
-                                    "aLibraryDep", type: .staticLibrary,
+                                    "aLibraryDep",
+                                    type: .staticLibrary,
                                     buildConfigurations: [TestBuildConfiguration("Debug")],
                                     buildPhases: [
-                                        TestSourcesBuildPhase(["CFile.c"]),
-                                    ])
-                            ])
-                    ])
+                                        TestSourcesBuildPhase(["CFile.c"])
+                                    ]
+                                ),
+                            ]
+                        )
+                    ]
+                )
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
                 // Create the input files.
@@ -334,15 +366,21 @@ fileprivate struct BuildCommandTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup("Sources", children: [TestFile("Metal.metal")]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)",
-                                            "SWIFT_ENABLE_EXPLICIT_MODULES": "NO",
-                                            "TOOLCHAINS": core.environment["TOOLCHAINS"] ?? "$(inherited)",
-                                            "SWIFT_VERSION": swiftVersion])],
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_ENABLE_EXPLICIT_MODULES": "NO",
+                                    "TOOLCHAINS": core.environment["TOOLCHAINS"] ?? "$(inherited)",
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "aLibrary", type: .staticLibrary,
+                                "aLibrary",
+                                type: .staticLibrary,
                                 buildConfigurations: [TestBuildConfiguration("Debug")],
                                 buildPhases: [TestSourcesBuildPhase(["Metal.metal"])]
                             )
diff --git a/Tests/SWBBuildSystemTests/BuildDescriptionConstructionTests.swift b/Tests/SWBBuildSystemTests/BuildDescriptionConstructionTests.swift
index b43f8b6b..592b03bb 100644
--- a/Tests/SWBBuildSystemTests/BuildDescriptionConstructionTests.swift
+++ b/Tests/SWBBuildSystemTests/BuildDescriptionConstructionTests.swift
@@ -36,14 +36,16 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "Sources", children: [
+                    "Sources",
+                    children: [
                         // App target sources
                         TestFile("main.m"),
                         // Framework target sources
                         TestFile("ClassOne.swift"),
                         // Plugin target sources
                         TestFile("ClassTwo.swift"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -56,22 +58,29 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                             "CODE_SIGN_IDENTITY": "-",
                             "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
                         ]
-                    )],
+                    )
+                ],
                 targets: [
                     TestStandardTarget(
                         "AppTarget",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["main.m"]),
-                            TestCopyFilesBuildPhase([
-                                TestBuildFile("FwkTarget.framework", codeSignOnCopy: true),
-                            ], destinationSubfolder: .frameworks),
-                            TestCopyFilesBuildPhase([
-                                TestBuildFile("PluginTarget.bundle", codeSignOnCopy: true),
-                            ], destinationSubfolder: .plugins),
+                            TestCopyFilesBuildPhase(
+                                [
+                                    TestBuildFile("FwkTarget.framework", codeSignOnCopy: true)
+                                ],
+                                destinationSubfolder: .frameworks
+                            ),
+                            TestCopyFilesBuildPhase(
+                                [
+                                    TestBuildFile("PluginTarget.bundle", codeSignOnCopy: true)
+                                ],
+                                destinationSubfolder: .plugins
+                            ),
                         ],
                         dependencies: ["FwkTarget", "PluginTarget"]
                     ),
@@ -79,23 +88,24 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                         "FwkTarget",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["ClassOne.swift"]),
+                            TestSourcesBuildPhase(["ClassOne.swift"])
                         ]
                     ),
                     TestStandardTarget(
                         "PluginTarget",
                         type: .bundle,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["ClassTwo.swift"]),
+                            TestSourcesBuildPhase(["ClassTwo.swift"])
                         ]
-                    )
-                ])
+                    ),
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: true)
 
             // Signing info for building for iOS.
@@ -137,11 +147,13 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "Sources", children: [
+                    "Sources",
+                    children: [
                         TestFile("Fwk.h"),
                         TestFile("Fwk.m"),
                         TestFile("ClassOne.swift"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -151,28 +163,32 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "TAPI_EXEC": tapiToolPath.str,
                         ]
-                    )],
+                    )
+                ],
                 targets: [
                     TestStandardTarget(
                         "FwkTarget",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["ClassOne.swift"]),
-                            TestHeadersBuildPhase([TestBuildFile("Fwk.h", headerVisibility: .public)])
+                            TestHeadersBuildPhase([TestBuildFile("Fwk.h", headerVisibility: .public)]),
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: true)
 
             try await tester.checkBuildDescription(runDestination: .macOS) { results in
                 results.checkNoDiagnostics()
 
-                #expect(results.buildDescription.copiedPathMap == [
-                    "\(tmpDir.str)/build/Debug/FwkTarget.framework/Versions/A/Headers/Fwk.h": "\(tmpDir.str)/Fwk.h"
-                ])
+                #expect(
+                    results.buildDescription.copiedPathMap == [
+                        "\(tmpDir.str)/build/Debug/FwkTarget.framework/Versions/A/Headers/Fwk.h": "\(tmpDir.str)/Fwk.h"
+                    ]
+                )
             }
         }
     }
@@ -184,12 +200,14 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "Sources", children: [
+                    "Sources",
+                    children: [
                         TestFile("Fwk.h"),
                         TestFile("Subdir/Fwk.h"),
                         TestFile("Fwk.m"),
                         TestFile("ClassOne.swift"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -199,7 +217,8 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "PUBLIC_HEADERS_FOLDER_PATH": "foo/bar",
                         ]
-                    )],
+                    )
+                ],
                 targets: [
                     TestAggregateTarget(
                         "All",
@@ -209,7 +228,7 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                         "lib1",
                         type: .dynamicLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([
@@ -222,7 +241,7 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                         "lib2",
                         type: .dynamicLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([
@@ -231,7 +250,8 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                             ])
                         ]
                     ),
-                ])
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: true)
 
             try await tester.checkBuildDescription(runDestination: .host) { results in
@@ -259,9 +279,11 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "Sources", children: [
-                        TestFile("Test.h"),
-                    ]),
+                    "Sources",
+                    children: [
+                        TestFile("Test.h")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -270,26 +292,30 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                             "COPY_HEADERS_RUN_UNIFDEF": "YES",
                             "GCC_OPTIMIZATION_LEVEL": "0",
                         ]
-                    )],
+                    )
+                ],
                 targets: [
                     TestStandardTarget(
                         "Empty",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([TestBuildFile("Test.h", headerVisibility: .public)])
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: true)
 
             try await tester.checkBuildDescription(runDestination: .macOS) { results in
                 results.checkNoDiagnostics()
-                #expect(results.buildDescription.copiedPathMap == [
-                    "\(tmpDir.str)/build/Debug/Empty.framework/Versions/A/Headers/Test.h": "\(tmpDir.str)/Test.h"
-                ])
+                #expect(
+                    results.buildDescription.copiedPathMap == [
+                        "\(tmpDir.str)/build/Debug/Empty.framework/Versions/A/Headers/Test.h": "\(tmpDir.str)/Test.h"
+                    ]
+                )
             }
 
             try await tester.checkBuildDescription(BuildParameters(action: .build, configuration: "Debug", overrides: ["COPY_HEADERS_UNIFDEF_FLAGS": "-B"]), runDestination: .macOS) { results in
@@ -312,15 +338,19 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
             TestPackageProductTarget(
                 "\(libraryName)Product",
                 frameworksBuildPhase: TestFrameworksBuildPhase([
-                    TestBuildFile(.target("\(packageTargetName)"))]),
+                    TestBuildFile(.target("\(packageTargetName)"))
+                ]),
                 dynamicTargetVariantName: offerDynamicVariant ? "\(libraryName)Product-dynamic" : "",
                 buildConfigurations: [
                     // Targets need to opt-in to specialization.
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "auto",
-                        "SDK_VARIANT": "auto",
-                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "SDKROOT": "auto",
+                            "SDK_VARIANT": "auto",
+                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                        ]
+                    )
                 ],
                 dependencies: ["\(packageTargetName)"] + (hasResourceBundle ? [resourceBundleName] : [])
             ),
@@ -329,41 +359,60 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                 type: .framework,
                 buildConfigurations: [
                     // Targets need to opt-in to specialization.
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "auto",
-                        "SDK_VARIANT": "auto",
-                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "SDKROOT": "auto",
+                            "SDK_VARIANT": "auto",
+                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                        ]
+                    )
                 ],
                 buildPhases: [TestFrameworksBuildPhase([TestBuildFile(.target("\(packageTargetName)"))])],
                 dependencies: [TestTargetDependency("\(packageTargetName)")] + dependencyOnResourceBundle
             ),
-        ] + ((packageTarget != nil) ? [] : [
-            TestStandardTarget("\(packageTargetName)",
-                               type: .objectFile,
-                               buildConfigurations: [
-                                // Targets need to opt-in to specialization.
-                                TestBuildConfiguration("Debug", buildSettings: [
+        ]
+            + ((packageTarget != nil)
+                ? []
+                : [
+                    TestStandardTarget(
+                        "\(packageTargetName)",
+                        type: .objectFile,
+                        buildConfigurations: [
+                            // Targets need to opt-in to specialization.
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
                                     "SDKROOT": "auto",
                                     "SDK_VARIANT": "auto",
                                     "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                ]),
-                               ],
-                               dependencies: dependencyOnResourceBundle,
-                               dynamicTargetVariantName: "\(packageTargetName)-dynamic"),
-            TestStandardTarget("\(packageTargetName)-dynamic",
-                               type: .framework,
-                               buildConfigurations: [
-                                // Targets need to opt-in to specialization.
-                                TestBuildConfiguration("Debug", buildSettings: [
+                                ]
+                            )
+                        ],
+                        dependencies: dependencyOnResourceBundle,
+                        dynamicTargetVariantName: "\(packageTargetName)-dynamic"
+                    ),
+                    TestStandardTarget(
+                        "\(packageTargetName)-dynamic",
+                        type: .framework,
+                        buildConfigurations: [
+                            // Targets need to opt-in to specialization.
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
                                     "SDKROOT": "auto",
                                     "SDK_VARIANT": "auto",
                                     "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                ]),
-                               ], dependencies: dependencyOnResourceBundle),
-        ]) + (hasResourceBundle ? [
-            TestStandardTarget(resourceBundleName, type: .bundle),
-        ] : [])
+                                ]
+                            )
+                        ],
+                        dependencies: dependencyOnResourceBundle
+                    ),
+                ])
+            + (hasResourceBundle
+                ? [
+                    TestStandardTarget(resourceBundleName, type: .bundle)
+                ] : [])
     }
 
     func withTesterForPackageDiamondProblemDiagnostic(topLevelTargetName: String = "App", topLevelTargetType: TestStandardTarget.TargetType = .application, disableDiagnostic: Bool = false, hasDiamondProblem: Bool = true, hasCopyResources: Bool = false, hasResourceBundle: Bool = false, offerDynamicVariant: Bool = false, requiresMultiPass: Bool = false, body: (BuildOperationTester, Path) async throws -> Void) async throws {
@@ -374,101 +423,115 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                 TestBuildFile(.auto("C.framework")),
             ])
 
-            let workspace = TestWorkspace("Workspace",
-                                          sourceRoot: tmpDir,
-                                          projects: [TestProject("aProject",
-                                                                 groupTree: TestGroup("SomeFiles"),
-                                                                 buildConfigurations: [
-                                                                    TestBuildConfiguration("Debug", buildSettings: [
-                                                                        "CODE_SIGNING_ALLOWED": "NO",
-                                                                        "ALWAYS_SEARCH_USER_PATHS": "NO"
-                                                                    ])
-                                                                 ],
-                                                                 targets: [
-                                                                    TestStandardTarget(
-                                                                        topLevelTargetName,
-                                                                        type: topLevelTargetType,
-                                                                        buildConfigurations: [
-                                                                            TestBuildConfiguration("Debug", buildSettings: ["DISABLE_DIAMOND_PROBLEM_DIAGNOSTIC": disableDiagnostic ? "YES" : "NO", "SDKROOT": "iphoneos"]),
-                                                                        ],
-                                                                        buildPhases: hasCopyResources ? [ frameworksBuildPhase, TestCopyFilesBuildPhase([ TestBuildFile(.target("PackageLib")) ], destinationSubfolder: .frameworks) ] : [ frameworksBuildPhase ],
-                                                                        dependencies: hasDiamondProblem ? ["iOSFwk", "iOSFwk-3", "PackageLibProduct"] : ["iOSFwk", "iOSFwk-3"]
-                                                                    ),
-                                                                    TestStandardTarget(
-                                                                        "iOSFwk",
-                                                                        type: .framework,
-                                                                        buildConfigurations: [
-                                                                            TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "A", "SDKROOT": "iphoneos"]),
-                                                                        ],
-                                                                        buildPhases: [
-                                                                            TestFrameworksBuildPhase([
-                                                                                TestBuildFile(.target("PackageLibProduct")),
-                                                                            ]),
-                                                                        ],
-                                                                        dependencies: ["PackageLibProduct"]
-                                                                    ),
-                                                                    TestStandardTarget(
-                                                                        "iOSFwk-2",
-                                                                        type: .framework,
-                                                                        buildConfigurations: [
-                                                                            TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "B", "SDKROOT": "iphoneos"]),
-                                                                        ],
-                                                                        buildPhases: [
-                                                                            TestFrameworksBuildPhase([
-                                                                                TestBuildFile(.target("PackageLibProduct")),
-                                                                            ]),
-                                                                        ],
-                                                                        dependencies: ["PackageLibProduct"]
-                                                                    ),
-                                                                    TestStandardTarget(
-                                                                        "iOSFwk-3",
-                                                                        type: .framework,
-                                                                        buildConfigurations: [
-                                                                            TestBuildConfiguration("Debug", buildSettings: ["DISABLE_DIAMOND_PROBLEM_DIAGNOSTIC": disableDiagnostic ? "YES" : "NO", "PRODUCT_NAME": "C", "SDKROOT": "iphoneos"]),
-                                                                        ],
-                                                                        buildPhases: [ TestFrameworksBuildPhase([
-                                                                            TestBuildFile(.auto("D.framework")),
-                                                                            TestBuildFile(.auto("E.framework")),
-                                                                            TestBuildFile(.target("PackageLib2Product")),
-                                                                        ]) ],
-                                                                        dependencies: hasDiamondProblem ? ["iOSFwk-4", "iOSFwk-5", "PackageLib2Product"] : []
-                                                                    ),
-                                                                    TestStandardTarget(
-                                                                        "iOSFwk-4",
-                                                                        type: .framework,
-                                                                        buildConfigurations: [
-                                                                            TestBuildConfiguration("Debug", buildSettings: ["DISABLE_DIAMOND_PROBLEM_DIAGNOSTIC": disableDiagnostic ? "YES" : "NO", "PRODUCT_NAME": "D", "SDKROOT": "iphoneos"]),
-                                                                        ],
-                                                                        buildPhases: [
-                                                                            TestFrameworksBuildPhase([
-                                                                                TestBuildFile(.target("PackageLibProduct")),
-                                                                            ]),
-                                                                        ],
-                                                                        dependencies: ["PackageLibProduct"]
-                                                                    ),
-                                                                    TestStandardTarget(
-                                                                        "iOSFwk-5",
-                                                                        type: .framework,
-                                                                        buildConfigurations: [
-                                                                            TestBuildConfiguration("Debug", buildSettings: ["DISABLE_DIAMOND_PROBLEM_DIAGNOSTIC": disableDiagnostic ? "YES" : "NO", "PRODUCT_NAME": "E", "SDKROOT": "iphoneos"]),
-                                                                        ],
-                                                                        buildPhases: [
-                                                                            TestFrameworksBuildPhase([
-                                                                                TestBuildFile(.target("PackageLibProduct")),
-                                                                            ]),
-                                                                        ],
-                                                                        dependencies: ["PackageLibProduct"]
-                                                                    ),
-                                                                 ]
-                                                                ),
-                                                     TestPackageProject("aPackage", groupTree: TestGroup("SomeFiles"),
-                                                                        buildConfigurations: [
-                                                                            TestBuildConfiguration("Debug", buildSettings: [
-                                                                                "ALWAYS_SEARCH_USER_PATHS": "NO"
-                                                                            ])
-                                                                        ],
-                                                                        targets: targetsForPackageProduct(libraryName: "PackageLib", offerDynamicVariant: offerDynamicVariant, hasResourceBundle: hasResourceBundle) + (requiresMultiPass ? targetsForPackageProduct(libraryName: "PackageLib2", offerDynamicVariant: offerDynamicVariant, packageTarget: "PackageLib", hasResourceBundle: hasResourceBundle) : [])),
-                                          ]
+            let workspace = TestWorkspace(
+                "Workspace",
+                sourceRoot: tmpDir,
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup("SomeFiles"),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                topLevelTargetName,
+                                type: topLevelTargetType,
+                                buildConfigurations: [
+                                    TestBuildConfiguration("Debug", buildSettings: ["DISABLE_DIAMOND_PROBLEM_DIAGNOSTIC": disableDiagnostic ? "YES" : "NO", "SDKROOT": "iphoneos"])
+                                ],
+                                buildPhases: hasCopyResources ? [frameworksBuildPhase, TestCopyFilesBuildPhase([TestBuildFile(.target("PackageLib"))], destinationSubfolder: .frameworks)] : [frameworksBuildPhase],
+                                dependencies: hasDiamondProblem ? ["iOSFwk", "iOSFwk-3", "PackageLibProduct"] : ["iOSFwk", "iOSFwk-3"]
+                            ),
+                            TestStandardTarget(
+                                "iOSFwk",
+                                type: .framework,
+                                buildConfigurations: [
+                                    TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "A", "SDKROOT": "iphoneos"])
+                                ],
+                                buildPhases: [
+                                    TestFrameworksBuildPhase([
+                                        TestBuildFile(.target("PackageLibProduct"))
+                                    ])
+                                ],
+                                dependencies: ["PackageLibProduct"]
+                            ),
+                            TestStandardTarget(
+                                "iOSFwk-2",
+                                type: .framework,
+                                buildConfigurations: [
+                                    TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "B", "SDKROOT": "iphoneos"])
+                                ],
+                                buildPhases: [
+                                    TestFrameworksBuildPhase([
+                                        TestBuildFile(.target("PackageLibProduct"))
+                                    ])
+                                ],
+                                dependencies: ["PackageLibProduct"]
+                            ),
+                            TestStandardTarget(
+                                "iOSFwk-3",
+                                type: .framework,
+                                buildConfigurations: [
+                                    TestBuildConfiguration("Debug", buildSettings: ["DISABLE_DIAMOND_PROBLEM_DIAGNOSTIC": disableDiagnostic ? "YES" : "NO", "PRODUCT_NAME": "C", "SDKROOT": "iphoneos"])
+                                ],
+                                buildPhases: [
+                                    TestFrameworksBuildPhase([
+                                        TestBuildFile(.auto("D.framework")),
+                                        TestBuildFile(.auto("E.framework")),
+                                        TestBuildFile(.target("PackageLib2Product")),
+                                    ])
+                                ],
+                                dependencies: hasDiamondProblem ? ["iOSFwk-4", "iOSFwk-5", "PackageLib2Product"] : []
+                            ),
+                            TestStandardTarget(
+                                "iOSFwk-4",
+                                type: .framework,
+                                buildConfigurations: [
+                                    TestBuildConfiguration("Debug", buildSettings: ["DISABLE_DIAMOND_PROBLEM_DIAGNOSTIC": disableDiagnostic ? "YES" : "NO", "PRODUCT_NAME": "D", "SDKROOT": "iphoneos"])
+                                ],
+                                buildPhases: [
+                                    TestFrameworksBuildPhase([
+                                        TestBuildFile(.target("PackageLibProduct"))
+                                    ])
+                                ],
+                                dependencies: ["PackageLibProduct"]
+                            ),
+                            TestStandardTarget(
+                                "iOSFwk-5",
+                                type: .framework,
+                                buildConfigurations: [
+                                    TestBuildConfiguration("Debug", buildSettings: ["DISABLE_DIAMOND_PROBLEM_DIAGNOSTIC": disableDiagnostic ? "YES" : "NO", "PRODUCT_NAME": "E", "SDKROOT": "iphoneos"])
+                                ],
+                                buildPhases: [
+                                    TestFrameworksBuildPhase([
+                                        TestBuildFile(.target("PackageLibProduct"))
+                                    ])
+                                ],
+                                dependencies: ["PackageLibProduct"]
+                            ),
+                        ]
+                    ),
+                    TestPackageProject(
+                        "aPackage",
+                        groupTree: TestGroup("SomeFiles"),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO"
+                                ]
+                            )
+                        ],
+                        targets: targetsForPackageProduct(libraryName: "PackageLib", offerDynamicVariant: offerDynamicVariant, hasResourceBundle: hasResourceBundle) + (requiresMultiPass ? targetsForPackageProduct(libraryName: "PackageLib2", offerDynamicVariant: offerDynamicVariant, packageTarget: "PackageLib", hasResourceBundle: hasResourceBundle) : [])
+                    ),
+                ]
             )
             try await body(BuildOperationTester(getCore(), workspace, simulated: true), tmpDir)
         }
@@ -484,9 +547,12 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                         "aProject",
                         groupTree: TestGroup("SomeFiles"),
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)"
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)"
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -494,15 +560,21 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                                 type: .framework,
                                 buildConfigurations: [
                                     // Targets need to opt-in to specialization.
-                                    TestBuildConfiguration("Debug", buildSettings: [
-                                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                                        "SDKROOT": "auto",
-                                        "SDK_VARIANT": "auto",
-                                        "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
-                                    ]),
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                                            "SDKROOT": "auto",
+                                            "SDK_VARIANT": "auto",
+                                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
+                                        ]
+                                    )
+                                ],
+                                buildPhases: [
+                                    TestFrameworksBuildPhase([
+                                        TestBuildFile(.target("PackageLib")), TestBuildFile(.target("Utility")), TestBuildFile(.target("PackageLibProduct2")), TestBuildFile(.target("Mock")),
+                                    ])
                                 ],
-                                buildPhases: [ TestFrameworksBuildPhase([
-                                    TestBuildFile(.target("PackageLib")), TestBuildFile(.target("Utility")), TestBuildFile(.target("PackageLibProduct2")), TestBuildFile(.target("Mock"))]) ],
                                 dependencies: ["PackageLib", "Utility", "PackageLibProduct2", "Mock"]
                             ),
                             TestStandardTarget("PackageLib", type: .objectFile),
@@ -511,14 +583,20 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                                 type: .framework,
                                 buildConfigurations: [
                                     // Targets need to opt-in to specialization.
-                                    TestBuildConfiguration("Debug", buildSettings: [
-                                        "SDKROOT": "auto",
-                                        "SDK_VARIANT": "auto",
-                                        "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
-                                    ]),
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "SDKROOT": "auto",
+                                            "SDK_VARIANT": "auto",
+                                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
+                                        ]
+                                    )
+                                ],
+                                buildPhases: [
+                                    TestFrameworksBuildPhase([
+                                        TestBuildFile(.target("PackageLib2")), TestBuildFile(.target("Utility")),
+                                    ])
                                 ],
-                                buildPhases: [ TestFrameworksBuildPhase([
-                                    TestBuildFile(.target("PackageLib2")), TestBuildFile(.target("Utility"))]) ],
                                 dependencies: ["PackageLib2", "Utility"]
                             ),
                             TestStandardTarget("PackageLib2", type: .objectFile),
@@ -526,7 +604,8 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                             TestStandardTarget("Utility-dynamic", type: .framework),
                             TestPackageProductTarget("Mock", frameworksBuildPhase: TestFrameworksBuildPhase()),
                         ]
-                    )]
+                    )
+                ]
             )
 
             try await body(BuildOperationTester(getCore(), workspace, simulated: true), tmpDir)
@@ -695,86 +774,110 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
     @Test(.requireSDKs(.iOS))
     func packageDiamondProblemDiagnosticTransitive() async throws {
         try await withTemporaryDirectory { tmpDir in
-            let workspace = TestWorkspace("Workspace",
-                                          sourceRoot: tmpDir,
-                                          projects: [
-                                            TestPackageProject("aPackage", groupTree: TestGroup("SomeFiles", children: [TestFile("test.c")]), targets: [
-                                                TestPackageProductTarget(
-                                                    "PackageLibProduct",
-                                                    frameworksBuildPhase: TestFrameworksBuildPhase([
-                                                        TestBuildFile(.target("PackageLib"))]),
-                                                    buildConfigurations: [
-                                                        // Targets need to opt-in to specialization.
-                                                        TestBuildConfiguration("Debug", buildSettings: [
-                                                            "SDKROOT": "auto",
-                                                            "SDK_VARIANT": "auto",
-                                                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
-                                                        ]),
-                                                    ],
-                                                    dependencies: ["PackageLib", "SecondPackageLibProduct"]
-                                                ),
-                                                TestStandardTarget(
-                                                    "PackageLib", type: .objectFile,
-                                                    buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "PackageLib",])],
-                                                    buildPhases: [TestFrameworksBuildPhase([
-                                                        TestBuildFile(.target("SecondPackageLibProduct"))]),
-                                                                  TestSourcesBuildPhase([TestBuildFile("test.c")])],
-                                                    dependencies: ["SecondPackageLibProduct"]
-                                                ),
-                                                TestPackageProductTarget(
-                                                    "SecondPackageLibProduct",
-                                                    frameworksBuildPhase: TestFrameworksBuildPhase([
-                                                        TestBuildFile(.target("SecondPackageLib"))]),
-                                                    buildConfigurations: [
-                                                        // Targets need to opt-in to specialization.
-                                                        TestBuildConfiguration("Debug", buildSettings: [
-                                                            "SDKROOT": "auto",
-                                                            "SDK_VARIANT": "auto",
-                                                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
-                                                        ]),
-                                                    ],
-                                                    dependencies: ["SecondPackageLib"]
-                                                ),
-                                                TestStandardTarget("SecondPackageLib", type: .objectFile,
-                                                                   buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "SecondPackageLib",])], buildPhases: [TestSourcesBuildPhase([TestBuildFile("test.c")])]),
-                                            ]
-                                                              ),
-                                            TestProject("aProject",
-                                                        groupTree: TestGroup("SomeFiles"),
-                                                        targets: [
-                                                            TestStandardTarget(
-                                                                "App",
-                                                                type: .application,
-                                                                buildConfigurations: [
-                                                                    TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"]),
-                                                                ],
-                                                                buildPhases: [
-                                                                    TestFrameworksBuildPhase([
-                                                                        TestBuildFile(.auto("A.framework")),
-                                                                        TestBuildFile(.target("SecondPackageLibProduct")),
-                                                                    ]),
-                                                                ],
-                                                                dependencies: ["iOSFwk", "SecondPackageLibProduct"]
-                                                            ),
-                                                            TestStandardTarget(
-                                                                "iOSFwk",
-                                                                type: .framework,
-                                                                buildConfigurations: [
-                                                                    TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "A", "SDKROOT": "iphoneos"]),
-                                                                ],
-                                                                buildPhases: [
-                                                                    TestFrameworksBuildPhase([
-                                                                        TestBuildFile(.target("PackageLibProduct")),
-                                                                    ]),
-                                                                ],
-                                                                dependencies: ["PackageLibProduct"]
-                                                            )])]
+            let workspace = TestWorkspace(
+                "Workspace",
+                sourceRoot: tmpDir,
+                projects: [
+                    TestPackageProject(
+                        "aPackage",
+                        groupTree: TestGroup("SomeFiles", children: [TestFile("test.c")]),
+                        targets: [
+                            TestPackageProductTarget(
+                                "PackageLibProduct",
+                                frameworksBuildPhase: TestFrameworksBuildPhase([
+                                    TestBuildFile(.target("PackageLib"))
+                                ]),
+                                buildConfigurations: [
+                                    // Targets need to opt-in to specialization.
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "SDKROOT": "auto",
+                                            "SDK_VARIANT": "auto",
+                                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
+                                        ]
+                                    )
+                                ],
+                                dependencies: ["PackageLib", "SecondPackageLibProduct"]
+                            ),
+                            TestStandardTarget(
+                                "PackageLib",
+                                type: .objectFile,
+                                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "PackageLib"])],
+                                buildPhases: [
+                                    TestFrameworksBuildPhase([
+                                        TestBuildFile(.target("SecondPackageLibProduct"))
+                                    ]),
+                                    TestSourcesBuildPhase([TestBuildFile("test.c")]),
+                                ],
+                                dependencies: ["SecondPackageLibProduct"]
+                            ),
+                            TestPackageProductTarget(
+                                "SecondPackageLibProduct",
+                                frameworksBuildPhase: TestFrameworksBuildPhase([
+                                    TestBuildFile(.target("SecondPackageLib"))
+                                ]),
+                                buildConfigurations: [
+                                    // Targets need to opt-in to specialization.
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "SDKROOT": "auto",
+                                            "SDK_VARIANT": "auto",
+                                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
+                                        ]
+                                    )
+                                ],
+                                dependencies: ["SecondPackageLib"]
+                            ),
+                            TestStandardTarget(
+                                "SecondPackageLib",
+                                type: .objectFile,
+                                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "SecondPackageLib"])],
+                                buildPhases: [TestSourcesBuildPhase([TestBuildFile("test.c")])]
+                            ),
+                        ]
+                    ),
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup("SomeFiles"),
+                        targets: [
+                            TestStandardTarget(
+                                "App",
+                                type: .application,
+                                buildConfigurations: [
+                                    TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"])
+                                ],
+                                buildPhases: [
+                                    TestFrameworksBuildPhase([
+                                        TestBuildFile(.auto("A.framework")),
+                                        TestBuildFile(.target("SecondPackageLibProduct")),
+                                    ])
+                                ],
+                                dependencies: ["iOSFwk", "SecondPackageLibProduct"]
+                            ),
+                            TestStandardTarget(
+                                "iOSFwk",
+                                type: .framework,
+                                buildConfigurations: [
+                                    TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "A", "SDKROOT": "iphoneos"])
+                                ],
+                                buildPhases: [
+                                    TestFrameworksBuildPhase([
+                                        TestBuildFile(.target("PackageLibProduct"))
+                                    ])
+                                ],
+                                dependencies: ["PackageLibProduct"]
+                            ),
+                        ]
+                    ),
+                ]
             )
 
             let tester = try await BuildOperationTester(getCore(), workspace, simulated: true)
             let parameters = BuildParameters(configuration: "Debug", arena: arenaInfo(from: tmpDir.join("build")))
             let target = try #require(tester.workspace.allTargets.filter({ $0.name == "App" }).first, "could not find app target")
-            try await tester.checkBuildDescription(runDestination: .iOS, buildRequest: BuildRequest(parameters: parameters, buildTargets: [ BuildRequest.BuildTargetInfo(parameters: parameters, target: target) ], continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)) { results in
+            try await tester.checkBuildDescription(runDestination: .iOS, buildRequest: BuildRequest(parameters: parameters, buildTargets: [BuildRequest.BuildTargetInfo(parameters: parameters, target: target)], continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)) { results in
                 results.checkError(.equal("Swift package product 'SecondPackageLibProduct' is linked as a static library by 'App' and 'iOSFwk'. This will result in duplication of library code."))
                 results.checkNoDiagnostics()
             }
@@ -784,69 +887,94 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS))
     func packageDiamondProblemDiagnosticDoesNotFlagExecutables() async throws {
         try await withTemporaryDirectory { tmpDir in
-            let workspace = TestWorkspace("Workspace",
-                                          sourceRoot: tmpDir,
-                                          projects: [
-                                            TestPackageProject("aPackage", groupTree: TestGroup("SomeFiles", children: [TestFile("test.c")]),
-                                                               buildConfigurations: [
-                                                                TestBuildConfiguration("Debug", buildSettings: [
-                                                                    "CODE_SIGNING_ALLOWED": "NO"
-                                                                ])
-                                                               ],
-                                                               targets: [
-                                                                TestStandardTarget(
-                                                                    "PackageExecutable", type: .commandLineTool,
-                                                                    buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "PackageExecutable",])],
-                                                                    buildPhases: [
-                                                                        TestSourcesBuildPhase([TestBuildFile("test.c")])],
-                                                                    dependencies: ["SecondPackageLibProduct"]
-                                                                ),
-                                                                TestPackageProductTarget(
-                                                                    "PackageLibProduct",
-                                                                    frameworksBuildPhase: TestFrameworksBuildPhase([
-                                                                        TestBuildFile(.target("PackageLib"))]),
-                                                                    buildConfigurations: [
-                                                                        // Targets need to opt-in to specialization.
-                                                                        TestBuildConfiguration("Debug", buildSettings: [
-                                                                            "SDKROOT": "auto",
-                                                                            "SDK_VARIANT": "auto",
-                                                                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
-                                                                        ]),
-                                                                    ],
-                                                                    dependencies: ["PackageLib", "SecondPackageLibProduct"]
-                                                                ),
-                                                                TestStandardTarget(
-                                                                    "PackageLib", type: .dynamicLibrary,
-                                                                    buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "PackageLib",])],
-                                                                    buildPhases: [TestFrameworksBuildPhase([
-                                                                        TestBuildFile(.target("SecondPackageLibProduct"))]),
-                                                                                  TestSourcesBuildPhase([TestBuildFile("test.c")])],
-                                                                    dependencies: ["SecondPackageLibProduct", "PackageExecutable"]
-                                                                ),
-                                                                TestPackageProductTarget(
-                                                                    "SecondPackageLibProduct",
-                                                                    frameworksBuildPhase: TestFrameworksBuildPhase([
-                                                                        TestBuildFile(.target("SecondPackageLib"))]),
-                                                                    buildConfigurations: [
-                                                                        // Targets need to opt-in to specialization.
-                                                                        TestBuildConfiguration("Debug", buildSettings: [
-                                                                            "SDKROOT": "auto",
-                                                                            "SDK_VARIANT": "auto",
-                                                                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
-                                                                        ]),
-                                                                    ],
-                                                                    dependencies: ["SecondPackageLib"]
-                                                                ),
-                                                                TestStandardTarget("SecondPackageLib", type: .objectFile,
-                                                                                   buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "SecondPackageLib",])], buildPhases: [TestSourcesBuildPhase([TestBuildFile("test.c")])]),
-                                                               ]
-                                                              )]
+            let workspace = TestWorkspace(
+                "Workspace",
+                sourceRoot: tmpDir,
+                projects: [
+                    TestPackageProject(
+                        "aPackage",
+                        groupTree: TestGroup("SomeFiles", children: [TestFile("test.c")]),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO"
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "PackageExecutable",
+                                type: .commandLineTool,
+                                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "PackageExecutable"])],
+                                buildPhases: [
+                                    TestSourcesBuildPhase([TestBuildFile("test.c")])
+                                ],
+                                dependencies: ["SecondPackageLibProduct"]
+                            ),
+                            TestPackageProductTarget(
+                                "PackageLibProduct",
+                                frameworksBuildPhase: TestFrameworksBuildPhase([
+                                    TestBuildFile(.target("PackageLib"))
+                                ]),
+                                buildConfigurations: [
+                                    // Targets need to opt-in to specialization.
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "SDKROOT": "auto",
+                                            "SDK_VARIANT": "auto",
+                                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
+                                        ]
+                                    )
+                                ],
+                                dependencies: ["PackageLib", "SecondPackageLibProduct"]
+                            ),
+                            TestStandardTarget(
+                                "PackageLib",
+                                type: .dynamicLibrary,
+                                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "PackageLib"])],
+                                buildPhases: [
+                                    TestFrameworksBuildPhase([
+                                        TestBuildFile(.target("SecondPackageLibProduct"))
+                                    ]),
+                                    TestSourcesBuildPhase([TestBuildFile("test.c")]),
+                                ],
+                                dependencies: ["SecondPackageLibProduct", "PackageExecutable"]
+                            ),
+                            TestPackageProductTarget(
+                                "SecondPackageLibProduct",
+                                frameworksBuildPhase: TestFrameworksBuildPhase([
+                                    TestBuildFile(.target("SecondPackageLib"))
+                                ]),
+                                buildConfigurations: [
+                                    // Targets need to opt-in to specialization.
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "SDKROOT": "auto",
+                                            "SDK_VARIANT": "auto",
+                                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
+                                        ]
+                                    )
+                                ],
+                                dependencies: ["SecondPackageLib"]
+                            ),
+                            TestStandardTarget(
+                                "SecondPackageLib",
+                                type: .objectFile,
+                                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "SecondPackageLib"])],
+                                buildPhases: [TestSourcesBuildPhase([TestBuildFile("test.c")])]
+                            ),
+                        ]
+                    )
+                ]
             )
 
             let tester = try await BuildOperationTester(getCore(), workspace, simulated: true)
             let parameters = BuildParameters(configuration: "Debug", arena: arenaInfo(from: tmpDir.join("build")))
             let target = try #require(tester.workspace.allTargets.filter({ $0.name == "PackageLibProduct" }).first, "could not find package product target")
-            try await tester.checkBuildDescription(runDestination: .macOS, buildRequest: BuildRequest(parameters: parameters, buildTargets: [ BuildRequest.BuildTargetInfo(parameters: parameters, target: target) ], continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)) { results in
+            try await tester.checkBuildDescription(runDestination: .macOS, buildRequest: BuildRequest(parameters: parameters, buildTargets: [BuildRequest.BuildTargetInfo(parameters: parameters, target: target)], continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)) { results in
                 results.checkNoDiagnostics()
             }
         }
@@ -855,81 +983,104 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS))
     func packageDiamondProblemDiagnosticWithBundleLoader() async throws {
         try await withTemporaryDirectory { tmpDir in
-            let workspace = try await TestWorkspace("Workspace",
-                                                    sourceRoot: tmpDir,
-                                                    projects: [TestPackageProject( /* this isn't quite right, but I can't get the diagnostic in a normal target. fix with rdar://79639888 */
-                                                        "aProject",
-                                                        groupTree: TestGroup(
-                                                            "SomeFiles",
-                                                            children: [
-                                                                TestFile("SwiftyJSON.swift"),
-                                                                TestFile("SwiftyJSONTests.swift"),
-                                                            ]),
-                                                        buildConfigurations: [
-                                                            TestBuildConfiguration("Debug", buildSettings: [
-                                                                "CODE_SIGN_IDENTITY": "",
-                                                                "CODE_SIGNING_ALLOWED": "NO",
-                                                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                                                "SWIFT_VERSION": "4.2",
-                                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                                "USE_HEADERMAP": "NO",
-                                                                "SKIP_INSTALL": "YES",
-                                                                "MACOSX_DEPLOYMENT_TARGET": "10.15",
-                                                                "IPHONEOS_DEPLOYMENT_TARGET": "13.0",
-                                                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                                                "SUPPORTS_MACCATALYST": "YES",
-                                                            ]),
-                                                        ],
-                                                        targets: [
-                                                            TestStandardTarget(
-                                                                "SwiftJSONTests", type: .unitTest,
-                                                                buildConfigurations: [
-                                                                    TestBuildConfiguration("Debug", buildSettings: [
-                                                                        // The extraneous path separators tests path normalization.
-                                                                        "BUNDLE_LOADER[sdk=macosx*]": "$(BUILT_PRODUCTS_DIR)/SwiftyJSON.app/Contents/MacOS/.//SwiftyJSON",
-                                                                        "BUNDLE_LOADER": "$(BUILT_PRODUCTS_DIR)///SwiftyJSON.app/SwiftyJSON",
-                                                                    ])
-                                                                ],
-                                                                buildPhases: [
-                                                                    TestSourcesBuildPhase(["SwiftyJSONTests.swift"]),
-                                                                    TestFrameworksBuildPhase([
-                                                                        TestBuildFile(.target("PackageLibProduct")),
-                                                                    ]),
-                                                                ],
-                                                                dependencies: [
-                                                                    "SwiftyJSON", "PackageLibProduct",
-                                                                ]),
-
-                                                            TestStandardTarget(
-                                                                "SwiftyJSON", type: .application,
-                                                                buildConfigurations: [
-                                                                    TestBuildConfiguration("Debug", buildSettings: [
-                                                                        "MACH_O_TYPE": "mh_execute",
-                                                                    ])
-                                                                ],
-                                                                buildPhases: [
-                                                                    TestSourcesBuildPhase(["SwiftyJSON.swift"]),
-                                                                    TestFrameworksBuildPhase([
-                                                                        TestBuildFile(.target("PackageLibProduct")),
-                                                                    ]),
-                                                                ], dependencies: ["PackageLibProduct"]),
-                                                            TestPackageProductTarget(
-                                                                "PackageLibProduct",
-                                                                frameworksBuildPhase: TestFrameworksBuildPhase([
-                                                                    TestBuildFile(.target("PackageLib"))]),
-                                                                buildConfigurations: [
-                                                                    // Targets need to opt-in to specialization.
-                                                                    TestBuildConfiguration("Debug", buildSettings: [
-                                                                        "SDKROOT": "auto",
-                                                                        "SDK_VARIANT": "auto",
-                                                                        "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
-                                                                    ]),
-                                                                ],
-                                                                dependencies: ["PackageLib"]
-                                                            ),
-                                                            TestStandardTarget("PackageLib", type: .objectFile),
-                                                        ])
-                                                    ])
+            let workspace = try await TestWorkspace(
+                "Workspace",
+                sourceRoot: tmpDir,
+                projects: [
+                    TestPackageProject( /* this isn't quite right, but I can't get the diagnostic in a normal target. fix with rdar://79639888 */
+                        "aProject",
+                        groupTree: TestGroup(
+                            "SomeFiles",
+                            children: [
+                                TestFile("SwiftyJSON.swift"),
+                                TestFile("SwiftyJSONTests.swift"),
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGN_IDENTITY": "",
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": "4.2",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "USE_HEADERMAP": "NO",
+                                    "SKIP_INSTALL": "YES",
+                                    "MACOSX_DEPLOYMENT_TARGET": "10.15",
+                                    "IPHONEOS_DEPLOYMENT_TARGET": "13.0",
+                                    "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                    "SUPPORTS_MACCATALYST": "YES",
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "SwiftJSONTests",
+                                type: .unitTest,
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            // The extraneous path separators tests path normalization.
+                                            "BUNDLE_LOADER[sdk=macosx*]": "$(BUILT_PRODUCTS_DIR)/SwiftyJSON.app/Contents/MacOS/.//SwiftyJSON",
+                                            "BUNDLE_LOADER": "$(BUILT_PRODUCTS_DIR)///SwiftyJSON.app/SwiftyJSON",
+                                        ]
+                                    )
+                                ],
+                                buildPhases: [
+                                    TestSourcesBuildPhase(["SwiftyJSONTests.swift"]),
+                                    TestFrameworksBuildPhase([
+                                        TestBuildFile(.target("PackageLibProduct"))
+                                    ]),
+                                ],
+                                dependencies: [
+                                    "SwiftyJSON", "PackageLibProduct",
+                                ]
+                            ),
+
+                            TestStandardTarget(
+                                "SwiftyJSON",
+                                type: .application,
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "MACH_O_TYPE": "mh_execute"
+                                        ]
+                                    )
+                                ],
+                                buildPhases: [
+                                    TestSourcesBuildPhase(["SwiftyJSON.swift"]),
+                                    TestFrameworksBuildPhase([
+                                        TestBuildFile(.target("PackageLibProduct"))
+                                    ]),
+                                ],
+                                dependencies: ["PackageLibProduct"]
+                            ),
+                            TestPackageProductTarget(
+                                "PackageLibProduct",
+                                frameworksBuildPhase: TestFrameworksBuildPhase([
+                                    TestBuildFile(.target("PackageLib"))
+                                ]),
+                                buildConfigurations: [
+                                    // Targets need to opt-in to specialization.
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "SDKROOT": "auto",
+                                            "SDK_VARIANT": "auto",
+                                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
+                                        ]
+                                    )
+                                ],
+                                dependencies: ["PackageLib"]
+                            ),
+                            TestStandardTarget("PackageLib", type: .objectFile),
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), workspace, simulated: true)
             try await tester.checkBuildDescription(BuildParameters(configuration: "Debug", arena: arenaInfo(from: tmpDir.join("build"))), runDestination: .macOS) { results in
                 results.checkError(.equal("Swift package product 'PackageLibProduct' is linked as a static library by 'SwiftJSONTests' and 'SwiftyJSON'. This will result in duplication of library code."))
@@ -946,49 +1097,55 @@ fileprivate struct BuildDescriptionConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "Sources", children: []),
+                    "Sources",
+                    children: []
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
                             "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "SYMROOT": tmpDir.join("custom").str
+                            "SYMROOT": tmpDir.join("custom").str,
                         ]
-                    )],
+                    )
+                ],
                 targets: [
                     TestStandardTarget(
                         "FwkTarget",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
-                        buildPhases: [
-                        ]
-                    ),
-                ])
+                        buildPhases: []
+                    )
+                ]
+            )
             let testProject2 = TestProject(
                 "bProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "Sources", children: []),
+                    "Sources",
+                    children: []
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "PRODUCT_NAME": "$(TARGET_NAME)"
                         ]
-                    )],
+                    )
+                ],
                 targets: [
                     TestStandardTarget(
                         "FwkTarget2",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
-                        buildPhases: [
-                        ]
-                    ),
-                ])
+                        buildPhases: []
+                    )
+                ]
+            )
             let testWorkspace = TestWorkspace("workspace", sourceRoot: tmpDir, projects: [testProject, testProject2])
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testWorkspace, simulated: true)
diff --git a/Tests/SWBBuildSystemTests/BuildOperationDescriptionTests.swift b/Tests/SWBBuildSystemTests/BuildOperationDescriptionTests.swift
index 0b547dcd..a97d093f 100644
--- a/Tests/SWBBuildSystemTests/BuildOperationDescriptionTests.swift
+++ b/Tests/SWBBuildSystemTests/BuildOperationDescriptionTests.swift
@@ -69,7 +69,8 @@ fileprivate struct BuildOperationDescriptionTests: CoreBasedTests {
                 TestProject(
                     "aProject",
                     groupTree: TestGroup(
-                        "Sources", children: [
+                        "Sources",
+                        children: [
                             // Application sources
                             TestFile("main.c"),
                             TestFile("Info-Foo.plist"),
@@ -82,19 +83,23 @@ fileprivate struct BuildOperationDescriptionTests: CoreBasedTests {
                             TestFile("Quux.swift"),
                             TestFile("Crux.swift"),
                             TestFile("Info-Bar.plist"),
-                        ]),
-                    buildConfigurations: [TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "VERSIONING_SYSTEM": "apple-generic",
-                            "CURRENT_PROJECT_VERSION": "3.1",
-                            "ENABLE_SDK_IMPORTS": "NO",
                         ]
-                    )],
+                    ),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "VERSIONING_SYSTEM": "apple-generic",
+                                "CURRENT_PROJECT_VERSION": "3.1",
+                                "ENABLE_SDK_IMPORTS": "NO",
+                            ]
+                        )
+                    ],
                     targets: [
                         TestStandardTarget(
-                            "Foo", type: .application,
+                            "Foo",
+                            type: .application,
                             buildConfigurations: [
                                 TestBuildConfiguration(
                                     "Debug",
@@ -102,7 +107,7 @@ fileprivate struct BuildOperationDescriptionTests: CoreBasedTests {
                                         "INFOPLIST_FILE": "Info-Foo.plist",
                                         "SWIFT_VERSION": swiftVersion,
                                     ]
-                                ),
+                                )
                             ],
                             buildPhases: [
                                 TestHeadersBuildPhase([]),
@@ -113,7 +118,8 @@ fileprivate struct BuildOperationDescriptionTests: CoreBasedTests {
                             dependencies: ["Bar"]
                         ),
                         TestStandardTarget(
-                            "Bar", type: .framework,
+                            "Bar",
+                            type: .framework,
                             buildConfigurations: [
                                 TestBuildConfiguration(
                                     "Debug",
@@ -124,7 +130,7 @@ fileprivate struct BuildOperationDescriptionTests: CoreBasedTests {
                                         "CLANG_ENABLE_MODULES": "YES",
                                         "SWIFT_VERSION": swiftVersion,
                                     ]
-                                ),
+                                )
                             ],
                             buildPhases: [
                                 TestHeadersBuildPhase([
@@ -133,9 +139,12 @@ fileprivate struct BuildOperationDescriptionTests: CoreBasedTests {
                                 ]),
                                 TestSourcesBuildPhase(["Bar.m", "Baz.m", "Quux.swift", "Crux.swift"]),
                                 TestFrameworksBuildPhase([]),
-                            ]),
-                    ])
-            ])
+                            ]
+                        ),
+                    ]
+                )
+            ]
+        )
     }
 
     /// Generate a `BuildDescription` from our test workspace, build it, and check results.  Then try doing it again to make sure we can use the results loaded from the on-disk cache.
@@ -151,9 +160,9 @@ fileprivate struct BuildOperationDescriptionTests: CoreBasedTests {
                 stream <<< "int main() { return 0; }\n"
             }
             try await tester.fs.writePlist(testWorkspace.sourceRoot.join("aProject/Info-Foo.plist"), .plDict(["key": .plString("value")]))
-            try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Bar.h"))  { $0 <<< "#include \"Baz.h\"\n" }
+            try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Bar.h")) { $0 <<< "#include \"Baz.h\"\n" }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Bar.m")) { _ in }
-            try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Baz.h"))  { _ in }
+            try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Baz.h")) { _ in }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Baz.m")) { _ in }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Quux.swift")) { _ in }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Crux.swift")) { _ in }
@@ -358,9 +367,9 @@ fileprivate struct BuildOperationDescriptionTests: CoreBasedTests {
                 stream <<< "int main() { return 0; }\n"
             }
             try await tester.fs.writePlist(testWorkspace.sourceRoot.join("aProject/Info-Foo.plist"), .plDict(["key": .plString("value")]))
-            try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Bar.h"))  { $0 <<< "#include \"Baz.h\"\n" }
+            try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Bar.h")) { $0 <<< "#include \"Baz.h\"\n" }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Bar.m")) { _ in }
-            try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Baz.h"))  { _ in }
+            try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Baz.h")) { _ in }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Baz.m")) { _ in }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Quux.swift")) { _ in }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Crux.swift")) { _ in }
@@ -487,9 +496,9 @@ fileprivate struct BuildOperationDescriptionTests: CoreBasedTests {
                 stream <<< "int main() { return 0; }\n"
             }
             try await tester.fs.writePlist(testWorkspace.sourceRoot.join("aProject/Info-Foo.plist"), .plDict(["key": .plString("value")]))
-            try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Bar.h"))  { $0 <<< "#include \"Baz.h\"\n" }
+            try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Bar.h")) { $0 <<< "#include \"Baz.h\"\n" }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Bar.m")) { _ in }
-            try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Baz.h"))  { _ in }
+            try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Baz.h")) { _ in }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Baz.m")) { _ in }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Quux.swift")) { _ in }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Crux.swift")) { _ in }
@@ -554,7 +563,6 @@ fileprivate struct BuildOperationDescriptionTests: CoreBasedTests {
                 // Check that the delegate was passed build started and build ended events in the right place.
                 results.checkCapstoneEvents()
 
-
                 // Make sure there were only 2 configured targets deserialized among all the tasks, and that all of the configured targets in the build request are contained in the deserialized description.
                 var targets = Set<ConfiguredTarget>()
                 var targetRefs = Set<Ref<ConfiguredTarget>>()
@@ -582,4 +590,3 @@ fileprivate struct BuildOperationDescriptionTests: CoreBasedTests {
         }
     }
 }
-
diff --git a/Tests/SWBBuildSystemTests/BuildOperationTests.swift b/Tests/SWBBuildSystemTests/BuildOperationTests.swift
index 25f8c854..345d54dd 100644
--- a/Tests/SWBBuildSystemTests/BuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/BuildOperationTests.swift
@@ -42,37 +42,44 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                         TestFile("main.swift"),
                         TestFile("dynamic library.swift"),
                         TestFile("static library.swift"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ARCHS": "$(ARCHS_STANDARD)",
-                        "CODE_SIGNING_ALLOWED": ProcessInfo.processInfo.hostOperatingSystem() == .macOS ? "YES" : "NO",
-                        "CODE_SIGN_IDENTITY": "-",
-                        "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
-                        "DEFINES_MODULE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "$(HOST_PLATFORM)",
-                        "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
-                        "SWIFT_VERSION": swiftVersion,
-                        "LINKER_DRIVER": linkerDriver,
-                        "SWIFT_OPTIMIZATION_LEVEL": optimizationLevel,
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ARCHS": "$(ARCHS_STANDARD)",
+                            "CODE_SIGNING_ALLOWED": ProcessInfo.processInfo.hostOperatingSystem() == .macOS ? "YES" : "NO",
+                            "CODE_SIGN_IDENTITY": "-",
+                            "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
+                            "DEFINES_MODULE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "$(HOST_PLATFORM)",
+                            "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
+                            "SWIFT_VERSION": swiftVersion,
+                            "LINKER_DRIVER": linkerDriver,
+                            "SWIFT_OPTIMIZATION_LEVEL": optimizationLevel,
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "tool",
                         type: .commandLineTool,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "LD_RUNPATH_SEARCH_PATHS": "@loader_path/",
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "LD_RUNPATH_SEARCH_PATHS": "@loader_path/"
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["main.swift"]),
                             TestFrameworksBuildPhase([
                                 TestBuildFile(.target("dynamiclib")),
                                 TestBuildFile(.target("staticlib")),
-                            ])
+                            ]),
                         ],
                         dependencies: [
                             "dynamiclib",
@@ -83,34 +90,41 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                         "dynamiclib",
                         type: .dynamicLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "DYLIB_INSTALL_NAME_BASE": "$ORIGIN",
-                                "DYLIB_INSTALL_NAME_BASE[sdk=macosx*]": "@rpath",
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "DYLIB_INSTALL_NAME_BASE": "$ORIGIN",
+                                    "DYLIB_INSTALL_NAME_BASE[sdk=macosx*]": "@rpath",
 
-                                // FIXME: Find a way to make these default
-                                "EXECUTABLE_PREFIX": "lib",
-                                "EXECUTABLE_PREFIX[sdk=windows*]": "",
-                            ])
+                                    // FIXME: Find a way to make these default
+                                    "EXECUTABLE_PREFIX": "lib",
+                                    "EXECUTABLE_PREFIX[sdk=windows*]": "",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["dynamic library.swift"]),
+                            TestSourcesBuildPhase(["dynamic library.swift"])
                         ]
                     ),
                     TestStandardTarget(
                         "staticlib",
                         type: .staticLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                // FIXME: Find a way to make these default
-                                "EXECUTABLE_PREFIX": "lib",
-                                "EXECUTABLE_PREFIX[sdk=windows*]": "",
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    // FIXME: Find a way to make these default
+                                    "EXECUTABLE_PREFIX": "lib",
+                                    "EXECUTABLE_PREFIX[sdk=windows*]": "",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["static library.swift"]),
+                            TestSourcesBuildPhase(["static library.swift"])
                         ]
                     ),
-                ])
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
@@ -138,7 +152,7 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
             let provisioningInputs = [
                 "dynamiclib": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict([:])),
                 "staticlib": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict([:])),
-                "tool": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict([:]))
+                "tool": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict([:])),
             ]
 
             let destination: RunDestinationInfo = .host
@@ -166,20 +180,24 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("main.swift"),
-                    ]),
+                        TestFile("main.swift")
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ARCHS": "$(ARCHS_STANDARD)",
-                        "CODE_SIGNING_ALLOWED": ProcessInfo.processInfo.hostOperatingSystem() == .macOS ? "YES" : "NO",
-                        "CODE_SIGN_IDENTITY": "-",
-                        "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
-                        "DEFINES_MODULE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "$(HOST_PLATFORM)",
-                        "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
-                        "SWIFT_VERSION": swiftVersion,
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ARCHS": "$(ARCHS_STANDARD)",
+                            "CODE_SIGNING_ALLOWED": ProcessInfo.processInfo.hostOperatingSystem() == .macOS ? "YES" : "NO",
+                            "CODE_SIGN_IDENTITY": "-",
+                            "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
+                            "DEFINES_MODULE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "$(HOST_PLATFORM)",
+                            "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
+                            "SWIFT_VERSION": swiftVersion,
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -189,10 +207,11 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                             TestBuildConfiguration("Debug")
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["main.swift"]),
+                            TestSourcesBuildPhase(["main.swift"])
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
@@ -228,36 +247,43 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                         TestFile("main.swift"),
                         TestFile("dynamic.swift"),
                         TestFile("static.swift"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ARCHS": "$(ARCHS_STANDARD)",
-                        "CODE_SIGNING_ALLOWED": ProcessInfo.processInfo.hostOperatingSystem() == .macOS ? "YES" : "NO",
-                        "CODE_SIGN_IDENTITY": "-",
-                        "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
-                        "DEFINES_MODULE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "$(HOST_PLATFORM)",
-                        "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
-                        "SWIFT_VERSION": swiftVersion,
-                        "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ARCHS": "$(ARCHS_STANDARD)",
+                            "CODE_SIGNING_ALLOWED": ProcessInfo.processInfo.hostOperatingSystem() == .macOS ? "YES" : "NO",
+                            "CODE_SIGN_IDENTITY": "-",
+                            "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
+                            "DEFINES_MODULE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "$(HOST_PLATFORM)",
+                            "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
+                            "SWIFT_VERSION": swiftVersion,
+                            "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "tool",
                         type: .commandLineTool,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "LD_RUNPATH_SEARCH_PATHS": "@loader_path/",
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "LD_RUNPATH_SEARCH_PATHS": "@loader_path/"
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["main.swift"]),
                             TestFrameworksBuildPhase([
                                 TestBuildFile(.target("dynamiclib")),
                                 TestBuildFile(.target("staticlib")),
-                            ])
+                            ]),
                         ],
                         dependencies: [
                             "dynamiclib",
@@ -268,34 +294,41 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                         "dynamiclib",
                         type: .dynamicLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "DYLIB_INSTALL_NAME_BASE": "$ORIGIN",
-                                "DYLIB_INSTALL_NAME_BASE[sdk=macosx*]": "@rpath",
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "DYLIB_INSTALL_NAME_BASE": "$ORIGIN",
+                                    "DYLIB_INSTALL_NAME_BASE[sdk=macosx*]": "@rpath",
 
-                                // FIXME: Find a way to make these default
-                                "EXECUTABLE_PREFIX": "lib",
-                                "EXECUTABLE_PREFIX[sdk=windows*]": "",
-                            ])
+                                    // FIXME: Find a way to make these default
+                                    "EXECUTABLE_PREFIX": "lib",
+                                    "EXECUTABLE_PREFIX[sdk=windows*]": "",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["dynamic.swift"]),
+                            TestSourcesBuildPhase(["dynamic.swift"])
                         ]
                     ),
                     TestStandardTarget(
                         "staticlib",
                         type: .staticLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                // FIXME: Find a way to make these default
-                                "EXECUTABLE_PREFIX": "lib",
-                                "EXECUTABLE_PREFIX[sdk=windows*]": "",
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    // FIXME: Find a way to make these default
+                                    "EXECUTABLE_PREFIX": "lib",
+                                    "EXECUTABLE_PREFIX[sdk=windows*]": "",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["static.swift"]),
+                            TestSourcesBuildPhase(["static.swift"])
                         ]
                     ),
-                ])
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
@@ -323,7 +356,7 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
             let provisioningInputs = [
                 "dynamiclib": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict([:])),
                 "staticlib": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict([:])),
-                "tool": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict([:]))
+                "tool": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict([:])),
             ]
 
             let destination: RunDestinationInfo = .host
@@ -371,36 +404,43 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                         TestFile("main.swift"),
                         TestFile("dynamic.swift"),
                         TestFile("static.swift"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ARCHS": "$(ARCHS_STANDARD)",
-                        "CODE_SIGNING_ALLOWED": ProcessInfo.processInfo.hostOperatingSystem() == .macOS ? "YES" : "NO",
-                        "CODE_SIGN_IDENTITY": "-",
-                        "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
-                        "DEFINES_MODULE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "$(HOST_PLATFORM)",
-                        "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
-                        "SWIFT_VERSION": swiftVersion,
-                        "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ARCHS": "$(ARCHS_STANDARD)",
+                            "CODE_SIGNING_ALLOWED": ProcessInfo.processInfo.hostOperatingSystem() == .macOS ? "YES" : "NO",
+                            "CODE_SIGN_IDENTITY": "-",
+                            "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
+                            "DEFINES_MODULE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "$(HOST_PLATFORM)",
+                            "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
+                            "SWIFT_VERSION": swiftVersion,
+                            "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "tool",
                         type: .commandLineTool,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "LD_RUNPATH_SEARCH_PATHS": "@loader_path/",
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "LD_RUNPATH_SEARCH_PATHS": "@loader_path/"
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["main.swift"]),
                             TestFrameworksBuildPhase([
                                 TestBuildFile(.target("dynamiclib")),
                                 TestBuildFile(.target("staticlib")),
-                            ])
+                            ]),
                         ],
                         dependencies: [
                             "dynamiclib",
@@ -411,34 +451,41 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                         "dynamiclib",
                         type: .dynamicLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "DYLIB_INSTALL_NAME_BASE": "$ORIGIN",
-                                "DYLIB_INSTALL_NAME_BASE[sdk=macosx*]": "@rpath",
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "DYLIB_INSTALL_NAME_BASE": "$ORIGIN",
+                                    "DYLIB_INSTALL_NAME_BASE[sdk=macosx*]": "@rpath",
 
-                                // FIXME: Find a way to make these default
-                                "EXECUTABLE_PREFIX": "lib",
-                                "EXECUTABLE_PREFIX[sdk=windows*]": "",
-                            ])
+                                    // FIXME: Find a way to make these default
+                                    "EXECUTABLE_PREFIX": "lib",
+                                    "EXECUTABLE_PREFIX[sdk=windows*]": "",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["dynamic.swift"]),
+                            TestSourcesBuildPhase(["dynamic.swift"])
                         ]
                     ),
                     TestStandardTarget(
                         "staticlib",
                         type: .staticLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                // FIXME: Find a way to make these default
-                                "EXECUTABLE_PREFIX": "lib",
-                                "EXECUTABLE_PREFIX[sdk=windows*]": "",
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    // FIXME: Find a way to make these default
+                                    "EXECUTABLE_PREFIX": "lib",
+                                    "EXECUTABLE_PREFIX[sdk=windows*]": "",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["static.swift"]),
+                            TestSourcesBuildPhase(["static.swift"])
                         ]
                     ),
-                ])
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
@@ -466,7 +513,7 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
             let provisioningInputs = [
                 "dynamiclib": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict([:])),
                 "staticlib": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict([:])),
-                "tool": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict([:]))
+                "tool": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict([:])),
             ]
 
             let destination: RunDestinationInfo = .host
@@ -485,34 +532,42 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("test.swift"),
-                    ]),
+                        TestFile("test.swift")
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ARCHS": "$(ARCHS_STANDARD)",
-                        "CODE_SIGNING_ALLOWED": "NO",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "$(HOST_PLATFORM)",
-                        "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
-                        "SWIFT_VERSION": swiftVersion,
-                        "INDEX_DATA_STORE_DIR": "\(tmpDir.join("index").str)",
-                        "LINKER_DRIVER": "swiftc"
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ARCHS": "$(ARCHS_STANDARD)",
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "$(HOST_PLATFORM)",
+                            "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
+                            "SWIFT_VERSION": swiftVersion,
+                            "INDEX_DATA_STORE_DIR": "\(tmpDir.join("index").str)",
+                            "LINKER_DRIVER": "swiftc",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "MyTests",
                         type: .unitTest,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_TEST_ENTRYPOINTS_FOR_BUNDLES": "YES"
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_TEST_ENTRYPOINTS_FOR_BUNDLES": "YES"
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["test.swift"]),
+                            TestSourcesBuildPhase(["test.swift"])
                         ],
-                    ),
-                ])
+                    )
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
             try localFS.createDirectory(tmpDir.join("index"))
@@ -520,20 +575,20 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
 
             try await tester.fs.writeFileContents(projectDir.join("test.swift")) { stream in
                 stream <<< """
-                    import Testing
-                    import XCTest
-                    @Suite struct MySuite {
-                        @Test func myTest() {
-                            #expect(42 == 42)
+                        import Testing
+                        import XCTest
+                        @Suite struct MySuite {
+                            @Test func myTest() {
+                                #expect(42 == 42)
+                            }
                         }
-                    }
 
-                    final class MYXCTests: XCTestCase {
-                        func testFoo() {
-                            XCTAssertTrue(true)
+                        final class MYXCTests: XCTestCase {
+                            func testFoo() {
+                                XCTAssertTrue(true)
+                            }
                         }
-                    }
-                """
+                    """
             }
 
             let destination: RunDestinationInfo = .host
@@ -557,33 +612,40 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                     children: [
                         TestFile("library.swift"),
                         TestFile("test.swift"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ARCHS": "$(ARCHS_STANDARD)",
-                        "CODE_SIGNING_ALLOWED": "NO",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "$(HOST_PLATFORM)",
-                        "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
-                        "SWIFT_VERSION": swiftVersion,
-                        "INDEX_DATA_STORE_DIR": "\(tmpDir.join("index").str)",
-                        "LINKER_DRIVER": "swiftc"
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ARCHS": "$(ARCHS_STANDARD)",
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "$(HOST_PLATFORM)",
+                            "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
+                            "SWIFT_VERSION": swiftVersion,
+                            "INDEX_DATA_STORE_DIR": "\(tmpDir.join("index").str)",
+                            "LINKER_DRIVER": "swiftc",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "UnitTestRunner",
                         type: .swiftpmTestRunner,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "LD_RUNPATH_SEARCH_PATHS": "$(RPATH_ORIGIN)",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "LD_RUNPATH_SEARCH_PATHS": "$(RPATH_ORIGIN)"
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(),
                             TestFrameworksBuildPhase([
                                 "MyTests.so"
-                            ])
+                            ]),
                         ],
                         dependencies: ["MyTests"]
                     ),
@@ -591,17 +653,21 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                         "MyTests",
                         type: .unitTest,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "LD_RUNPATH_SEARCH_PATHS": "$(RPATH_ORIGIN)",
-                                "LD_DYLIB_INSTALL_NAME": "MyTests.so"
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "LD_RUNPATH_SEARCH_PATHS": "$(RPATH_ORIGIN)",
+                                    "LD_DYLIB_INSTALL_NAME": "MyTests.so",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["test.swift"]),
                             TestFrameworksBuildPhase([
-                                TestBuildFile(.target("library")),
-                            ])
-                        ], dependencies: [
+                                TestBuildFile(.target("library"))
+                            ]),
+                        ],
+                        dependencies: [
                             "library"
                         ],
                         productReferenceName: "MyTests.so"
@@ -610,20 +676,24 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                         "library",
                         type: .dynamicLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "LD_RUNPATH_SEARCH_PATHS": "$(RPATH_ORIGIN)",
-                                "LD_DYLIB_INSTALL_NAME": "liblibrary.so",
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "LD_RUNPATH_SEARCH_PATHS": "$(RPATH_ORIGIN)",
+                                    "LD_DYLIB_INSTALL_NAME": "liblibrary.so",
 
-                                // FIXME: Find a way to make these default
-                                "EXECUTABLE_PREFIX": "lib",
-                                "EXECUTABLE_PREFIX[sdk=windows*]": "",
-                            ])
+                                    // FIXME: Find a way to make these default
+                                    "EXECUTABLE_PREFIX": "lib",
+                                    "EXECUTABLE_PREFIX[sdk=windows*]": "",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["library.swift"]),
+                            TestSourcesBuildPhase(["library.swift"])
                         ],
-                    )
-                ])
+                    ),
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
             try localFS.createDirectory(tmpDir.join("index"))
@@ -635,21 +705,21 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
 
             try await tester.fs.writeFileContents(projectDir.join("test.swift")) { stream in
                 stream <<< """
-                    import Testing
-                    import XCTest
-                    import library
-                    @Suite struct MySuite {
-                        @Test func myTest() {
-                            #expect(foo() == 42)
+                        import Testing
+                        import XCTest
+                        import library
+                        @Suite struct MySuite {
+                            @Test func myTest() {
+                                #expect(foo() == 42)
+                            }
                         }
-                    }
 
-                    final class MYXCTests: XCTestCase {
-                        func testFoo() {
-                            XCTAssertTrue(true)
+                        final class MYXCTests: XCTestCase {
+                            func testFoo() {
+                                XCTAssertTrue(true)
+                            }
                         }
-                    }
-                """
+                    """
             }
 
             let destination: RunDestinationInfo = .host
@@ -681,35 +751,42 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                     children: [
                         TestFile("library.swift"),
                         TestFile("test.swift"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ARCHS": "$(ARCHS_STANDARD)",
-                        "CODE_SIGNING_ALLOWED": "NO",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "$(HOST_PLATFORM)",
-                        "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
-                        "SWIFT_VERSION": swiftVersion,
-                        "INDEX_DATA_STORE_DIR": "\(tmpDir.join("index").str)",
-                        "LINKER_DRIVER": "swiftc",
-                        "ENABLE_TESTABILITY": "NO",
-                        "SWIFT_ENABLE_TESTABILITY": "NO",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ARCHS": "$(ARCHS_STANDARD)",
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "$(HOST_PLATFORM)",
+                            "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
+                            "SWIFT_VERSION": swiftVersion,
+                            "INDEX_DATA_STORE_DIR": "\(tmpDir.join("index").str)",
+                            "LINKER_DRIVER": "swiftc",
+                            "ENABLE_TESTABILITY": "NO",
+                            "SWIFT_ENABLE_TESTABILITY": "NO",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "UnitTestRunner",
                         type: .swiftpmTestRunner,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "LD_RUNPATH_SEARCH_PATHS": "$(RPATH_ORIGIN)",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "LD_RUNPATH_SEARCH_PATHS": "$(RPATH_ORIGIN)"
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(),
                             TestFrameworksBuildPhase([
                                 "MyTests.so"
-                            ])
+                            ]),
                         ],
                         dependencies: ["MyTests"]
                     ),
@@ -717,17 +794,21 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                         "MyTests",
                         type: .unitTest,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "LD_RUNPATH_SEARCH_PATHS": "$(RPATH_ORIGIN)",
-                                "LD_DYLIB_INSTALL_NAME": "MyTests.so"
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "LD_RUNPATH_SEARCH_PATHS": "$(RPATH_ORIGIN)",
+                                    "LD_DYLIB_INSTALL_NAME": "MyTests.so",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["test.swift"]),
                             TestFrameworksBuildPhase([
-                                TestBuildFile(.target("library")),
-                            ])
-                        ], dependencies: [
+                                TestBuildFile(.target("library"))
+                            ]),
+                        ],
+                        dependencies: [
                             "library"
                         ],
                         productReferenceName: "MyTests.so"
@@ -736,20 +817,24 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                         "library",
                         type: .dynamicLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "LD_RUNPATH_SEARCH_PATHS": "$(RPATH_ORIGIN)",
-                                "LD_DYLIB_INSTALL_NAME": "liblibrary.so",
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "LD_RUNPATH_SEARCH_PATHS": "$(RPATH_ORIGIN)",
+                                    "LD_DYLIB_INSTALL_NAME": "liblibrary.so",
 
-                                // FIXME: Find a way to make these default
-                                "EXECUTABLE_PREFIX": "lib",
-                                "EXECUTABLE_PREFIX[sdk=windows*]": "",
-                            ])
+                                    // FIXME: Find a way to make these default
+                                    "EXECUTABLE_PREFIX": "lib",
+                                    "EXECUTABLE_PREFIX[sdk=windows*]": "",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["library.swift"]),
+                            TestSourcesBuildPhase(["library.swift"])
                         ],
-                    )
-                ])
+                    ),
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
             try localFS.createDirectory(tmpDir.join("index"))
@@ -761,21 +846,21 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
 
             try await tester.fs.writeFileContents(projectDir.join("test.swift")) { stream in
                 stream <<< """
-                    import Testing
-                    import XCTest
-                    import library
-                    @Suite struct MySuite {
-                        @Test func myTest() {
-                            #expect(foo() == 42)
+                        import Testing
+                        import XCTest
+                        import library
+                        @Suite struct MySuite {
+                            @Test func myTest() {
+                                #expect(foo() == 42)
+                            }
                         }
-                    }
 
-                    final class MYXCTests: XCTestCase {
-                        func testFoo() {
-                            XCTAssertTrue(true)
+                        final class MYXCTests: XCTestCase {
+                            func testFoo() {
+                                XCTAssertTrue(true)
+                            }
                         }
-                    }
-                """
+                    """
             }
 
             let destination: RunDestinationInfo = .host
@@ -808,36 +893,45 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", children: [
-                                TestFile("Foo.y")]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "USE_HEADERMAP": "NO",
-                                "YACC": tmpDirPath.join("yacc-script").str,
-                            ])],
+                            "Sources",
+                            children: [
+                                TestFile("Foo.y")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "USE_HEADERMAP": "NO",
+                                    "YACC": tmpDirPath.join("yacc-script").str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Foo", type: .staticLibrary,
+                                "Foo",
+                                type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["Foo.y"]),
-                                ]),
-                        ])
-                ])
+                                    TestSourcesBuildPhase(["Foo.y"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Foo.y")) { stream in
-                stream <<<
-                """
-                %{
-                static int yylex() { return 0; }
-                static int yyerror(const char *format) { return 0; }
-                %}
-                %%
-                list:
-                ;
-                %%
-                """
+                stream <<< """
+                    %{
+                    static int yylex() { return 0; }
+                    static int yyerror(const char *format) { return 0; }
+                    %}
+                    %%
+                    list:
+                    ;
+                    %%
+                    """
             }
 
             guard let yaccPath = tester.findExecutable(basename: "yacc") else {
@@ -854,8 +948,16 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
             }
             try tester.fs.setFilePermissions(tmpDirPath.join("yacc-script"), permissions: 0o755)
 
-            tester.userInfo = UserInfo(user: "exampleUser", group: "exampleGroup", uid: 1234, gid:12345, home: Path("/Users/exampleUser"), environment: [
-                "ENV_KEY": "ENV_VALUE"])
+            tester.userInfo = UserInfo(
+                user: "exampleUser",
+                group: "exampleGroup",
+                uid: 1234,
+                gid: 12345,
+                home: Path("/Users/exampleUser"),
+                environment: [
+                    "ENV_KEY": "ENV_VALUE"
+                ]
+            )
 
             try await tester.checkBuild(runDestination: .host) { results in
                 // We expect one task with one line of output.
@@ -871,7 +973,7 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
 
     // MARK: Simulated Project Builds
 
-    @Test(.requireSDKs(.host), .skipHostOS(.windows)) // FIXME: Windows: Need to implement /usr/bin/true support for skipped tasks in tests
+    @Test(.requireSDKs(.host), .skipHostOS(.windows))  // FIXME: Windows: Need to implement /usr/bin/true support for skipped tasks in tests
     func simulatedEmptyTarget() async throws {
         try await withTemporaryDirectory { tmpDirPath async throws -> Void in
             let testWorkspace = TestWorkspace(
@@ -884,9 +986,12 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                         targets: [
                             TestAggregateTarget(
                                 "mock",
-                                buildPhases: [])
-                        ])
-                ])
+                                buildPhases: []
+                            )
+                        ]
+                    )
+                ]
+            )
 
             try await BuildOperationTester(getCore(), testWorkspace, simulated: true).checkBuild(runDestination: .host) { results in
                 // Check that the delegate was passed build started and build ended events in the right place.
@@ -907,35 +1012,49 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                         "aProject",
                         groupTree: TestGroup("Sources", children: [TestFile("foo.c")]),
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)"
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                ]
+                            )
                         ],
                         targets: [
                             TestAggregateTarget(
                                 "combo",
                                 buildPhases: [],
-                                dependencies: ["agg1", "agg2", "agg3"]),
+                                dependencies: ["agg1", "agg2", "agg3"]
+                            ),
                             TestAggregateTarget(
                                 "agg1",
                                 buildPhases: [
                                     TestShellScriptBuildPhase(
-                                        name: "Script1", originalObjectID: "Script1", contents: "echo Script1", inputs: [],
+                                        name: "Script1",
+                                        originalObjectID: "Script1",
+                                        contents: "echo Script1",
+                                        inputs: [],
                                         outputs: [
                                             "/tmp/script-output"
-                                        ])
-                                ]),
+                                        ]
+                                    )
+                                ]
+                            ),
                             TestAggregateTarget(
                                 "agg2",
                                 buildPhases: [
                                     TestShellScriptBuildPhase(
-                                        name: "Script2", originalObjectID: "Script2", contents: "echo Script2", inputs: [],
+                                        name: "Script2",
+                                        originalObjectID: "Script2",
+                                        contents: "echo Script2",
+                                        inputs: [],
                                         outputs: [
                                             "/tmp/script-output",
                                             "/tmp/script-output2",
-                                        ])
-                                ]),
+                                        ]
+                                    )
+                                ]
+                            ),
                             TestStandardTarget(
                                 "agg3",
                                 type: .application,
@@ -947,9 +1066,12 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                 ],
                                 buildRules: [
                                     TestBuildRule(filePattern: "*.c", script: "cp $INPUT_FILE_PATH /tmp/b", outputs: ["/tmp/b"])
-                                ])
-                        ])
-                ])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: true)
 
             try await tester.checkBuild(runDestination: .macOS) { results in
@@ -958,17 +1080,21 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 results.checkWarning(.contains("duplicate output file '/tmp/script-output'"))
                 results.checkNoWarnings()
 
-                results.checkError("""
-Multiple commands produce \'/tmp/b\'
-Target \'agg3\' (project \'aProject\') has custom build rule with input \'\(tmpDirPath.str)/Test/aProject/foo.c\'
-Target \'agg3\' (project \'aProject\') has custom build rule with input \'\(tmpDirPath.str)/Test/aProject/foo.c\'
-Consider making this custom build rule architecture-neutral by unchecking \'Run once per architecture\' in Build Rules, or ensure that it produces distinct output file paths for each architecture and variant combination.
-""")
-                results.checkError("""
-Multiple commands produce '/tmp/script-output'
-That command depends on command in Target 'agg1' (project \'aProject\'): script phase “Script1”
-That command depends on command in Target 'agg2' (project \'aProject\'): script phase “Script2”
-""")
+                results.checkError(
+                    """
+                    Multiple commands produce \'/tmp/b\'
+                    Target \'agg3\' (project \'aProject\') has custom build rule with input \'\(tmpDirPath.str)/Test/aProject/foo.c\'
+                    Target \'agg3\' (project \'aProject\') has custom build rule with input \'\(tmpDirPath.str)/Test/aProject/foo.c\'
+                    Consider making this custom build rule architecture-neutral by unchecking \'Run once per architecture\' in Build Rules, or ensure that it produces distinct output file paths for each architecture and variant combination.
+                    """
+                )
+                results.checkError(
+                    """
+                    Multiple commands produce '/tmp/script-output'
+                    That command depends on command in Target 'agg1' (project \'aProject\'): script phase “Script1”
+                    That command depends on command in Target 'agg2' (project \'aProject\'): script phase “Script2”
+                    """
+                )
                 results.checkNoErrors()
 
                 // Find the two script tasks.
@@ -991,35 +1117,43 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", children: [
+                            "Sources",
+                            children: [
                                 TestFile("CoreFoo.h"),
                                 TestFile("CoreFoo.m"),
                                 TestFile("Thing.swift"),
                                 TestFile("Info.plist"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "VERSIONING_SYSTEM": "apple-generic",
-                                "CURRENT_PROJECT_VERSION": "3.1",
-                                "INFOPLIST_FILE": "Info.plist",
-                                "DEFINES_MODULE": "YES",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "SWIFT_VERSION": swiftVersion,
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "VERSIONING_SYSTEM": "apple-generic",
+                                    "CURRENT_PROJECT_VERSION": "3.1",
+                                    "INFOPLIST_FILE": "Info.plist",
+                                    "DEFINES_MODULE": "YES",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase(["CoreFoo.m", "Thing.swift"]),
                                     TestFrameworksBuildPhase([]),
                                     TestHeadersBuildPhase([TestBuildFile("CoreFoo.h", headerVisibility: .public)]),
-                                ])
-                        ])
-                ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             // FIXME: For now, we cannot actually use simulation here because the symlink tasks don't go through the VFS: <rdar://problem/24976205> [Swift Build] Add llbuild+Swift Build VFS support for missing symlink
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
@@ -1070,36 +1204,44 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", children: [
+                            "Sources",
+                            children: [
                                 TestFile("CoreFoo.h"),
                                 TestFile("CoreFoo.m"),
                                 TestFile("Thing.swift"),
                                 TestFile("Info.plist"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "VERSIONING_SYSTEM": "apple-generic",
-                                "CURRENT_PROJECT_VERSION": "3.1",
-                                "INFOPLIST_FILE": "Info.plist",
-                                "DEFINES_MODULE": "YES",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "MODULEMAP_FILE": "module.modulemap",
-                                "SWIFT_VERSION": swiftVersion,
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "VERSIONING_SYSTEM": "apple-generic",
+                                    "CURRENT_PROJECT_VERSION": "3.1",
+                                    "INFOPLIST_FILE": "Info.plist",
+                                    "DEFINES_MODULE": "YES",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "MODULEMAP_FILE": "module.modulemap",
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase(["CoreFoo.m", "Thing.swift"]),
                                     TestFrameworksBuildPhase([]),
                                     TestHeadersBuildPhase([TestBuildFile("CoreFoo.h", headerVisibility: .public)]),
-                                ])
-                        ])
-                ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -1160,11 +1302,19 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                             TestAggregateTarget(
                                 "Target",
                                 buildPhases: [
-                                    TestShellScriptBuildPhase(name: "Script", originalObjectID: "X", contents: "true",
-                                                              inputs: ["missing-input-file.txt"], alwaysOutOfDate: true),
-                                ])
-                        ])
-                ])
+                                    TestShellScriptBuildPhase(
+                                        name: "Script",
+                                        originalObjectID: "X",
+                                        contents: "true",
+                                        inputs: ["missing-input-file.txt"],
+                                        alwaysOutOfDate: true
+                                    )
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: true)
 
             try await tester.checkBuild(runDestination: .host) { results in
@@ -1206,16 +1356,21 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                             TestAggregateTarget(
                                 "C",
                                 buildPhases: [TestShellScriptBuildPhase(name: "C", originalObjectID: "C", contents: "true", alwaysOutOfDate: true)],
-                                dependencies: ["B"]),
+                                dependencies: ["B"]
+                            ),
                             TestAggregateTarget(
                                 "B",
                                 buildPhases: [TestShellScriptBuildPhase(name: "B", originalObjectID: "B", contents: "true", alwaysOutOfDate: true)],
-                                dependencies: ["A"]),
+                                dependencies: ["A"]
+                            ),
                             TestAggregateTarget(
                                 "A",
-                                buildPhases: [TestShellScriptBuildPhase(name: "A", originalObjectID: "A", contents: "true", alwaysOutOfDate: true)]),
-                        ])
-                ])
+                                buildPhases: [TestShellScriptBuildPhase(name: "A", originalObjectID: "A", contents: "true", alwaysOutOfDate: true)]
+                            ),
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: true)
             let targetD = tester.workspace.projects[0].targets[0]
             let targetC = tester.workspace.projects[0].targets[1]
@@ -1232,7 +1387,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 //
                 // NOTE: This test isn't completely deterministic, it could report a false negative, but in practice this is very unlikely. It should never have a false positive.
                 results.checkCapstoneEvents()
-                for (first,second) in [("A", "B"), ("B", "C"), ("C", "D")] {
+                for (first, second) in [("A", "B"), ("B", "C"), ("C", "D")] {
                     // Check the order of the gate tasks.
                     let firstTask = try findScript(first)
                     let secondTask = try findScript(second)
@@ -1266,8 +1421,10 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                             TestAggregateTarget("B", buildPhases: [TestShellScriptBuildPhase(name: "B", originalObjectID: "B", contents: "true", alwaysOutOfDate: true)]),
                             TestAggregateTarget("C", buildPhases: [TestShellScriptBuildPhase(name: "C", originalObjectID: "C", contents: "true", alwaysOutOfDate: true)]),
                             TestAggregateTarget("D", buildPhases: [TestShellScriptBuildPhase(name: "D", originalObjectID: "D", contents: "true", alwaysOutOfDate: true)]),
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: true)
 
             let parameters = BuildParameters(configuration: "Debug", overrides: ["DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING": "YES"])
@@ -1282,7 +1439,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 //
                 // NOTE: This test isn't completely deterministic, it could report a false negative, but in practice this is very unlikely. It should never have a false positive.
                 results.checkCapstoneEvents()
-                for (first,second) in [("A", "B"), ("B", "C"), ("C", "D")] {
+                for (first, second) in [("A", "B"), ("B", "C"), ("C", "D")] {
                     // Check the order of the gate tasks.
                     let firstTask = try findScript(first)
                     let secondTask = try findScript(second)
@@ -1311,9 +1468,12 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     TestShellScriptBuildPhase(name: "B", originalObjectID: "B", contents: "true", alwaysOutOfDate: true),
                                     TestShellScriptBuildPhase(name: "C", originalObjectID: "C", contents: "true", alwaysOutOfDate: true),
                                     TestShellScriptBuildPhase(name: "D", originalObjectID: "D", contents: "true", alwaysOutOfDate: true),
-                                ]),
-                        ])
-                ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: true)
 
             try await tester.checkBuild(runDestination: .host) { results in
@@ -1325,7 +1485,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 // Verify the targets were built in order.
                 //
                 // NOTE: This test isn't completely deterministic, it could report a false negative, but in practice this is very unlikely. It should never have a false positive.
-                for (first,second) in [("A", "B"), ("B", "C"), ("C", "D")] {
+                for (first, second) in [("A", "B"), ("B", "C"), ("C", "D")] {
                     let firstEnd = try findScript(first)
                     let secondBegin = try findScript(second)
                     results.check(event: .taskHadEvent(firstEnd, event: .completed), precedes: .taskHadEvent(secondBegin, event: .started))
@@ -1354,60 +1514,76 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
+                            "Sources",
+                            path: "Sources",
+                            children: [
                                 TestFile("CoreFoo.h"),
                                 TestFile("CoreFoo.m"),
                                 TestFile("Swifty.swift"),
                                 TestFile("Info.plist"),
                                 TestFile("Settings.plist"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "DEFINES_MODULE": "YES",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "VERSIONING_SYSTEM": "apple-generic",
-                                "CURRENT_PROJECT_VERSION": "3.1",
-                                "SWIFT_VERSION": swiftVersion,
-                                "INFOPLIST_FILE": "Sources/Info.plist",
-                                // Use this to introduce a file the linker depends on that we don't otherwise see.
-                                "OTHER_LDFLAGS": "-exported_symbols_list $(SRCROOT)/Sources/CoreFoo.exports",
-
-                                "INSTALL_OWNER": "",
-                                "INSTALL_GROUP": GetCurrentUserGroupName()!,
-                                "INSTALL_MODE_FLAG": "+w",
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "DEFINES_MODULE": "YES",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "VERSIONING_SYSTEM": "apple-generic",
+                                    "CURRENT_PROJECT_VERSION": "3.1",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "INFOPLIST_FILE": "Sources/Info.plist",
+                                    // Use this to introduce a file the linker depends on that we don't otherwise see.
+                                    "OTHER_LDFLAGS": "-exported_symbols_list $(SRCROOT)/Sources/CoreFoo.exports",
+
+                                    "INSTALL_OWNER": "",
+                                    "INSTALL_GROUP": GetCurrentUserGroupName()!,
+                                    "INSTALL_MODE_FLAG": "+w",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildPhases: [
                                     TestHeadersBuildPhase([TestBuildFile("CoreFoo.h", headerVisibility: .public)]),
                                     TestSourcesBuildPhase(["CoreFoo.m", "Swifty.swift"]),
                                     TestResourcesBuildPhase(["Settings.plist"]),
                                     TestFrameworksBuildPhase([]),
                                     // This shell script validates we honor the specified working directory.
-                                    TestShellScriptBuildPhase(name: "Run Script", originalObjectID: "Mock", contents: {
-                                        let stream = OutputByteStream()
-                                        stream <<< "echo \"DIRECTORY: $(basename ${PWD})\"\n"
-                                        stream <<< "echo \"TARGET_NAME: ${TARGET_NAME}\"\n"
-                                        stream <<< "exit 0\n"
-                                        return stream.bytes.asString }(),
-                                                              outputs: ["/tmp/mock.txt"]
-                                                             ),
-                                ])
-                        ])
-                ])
+                                    TestShellScriptBuildPhase(
+                                        name: "Run Script",
+                                        originalObjectID: "Mock",
+                                        contents: {
+                                            let stream = OutputByteStream()
+                                            stream <<< "echo \"DIRECTORY: $(basename ${PWD})\"\n"
+                                            stream <<< "echo \"TARGET_NAME: ${TARGET_NAME}\"\n"
+                                            stream <<< "exit 0\n"
+                                            return stream.bytes.asString
+                                        }(),
+                                        outputs: ["/tmp/mock.txt"]
+                                    ),
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
             // Write the Info.plist file.
-            try await tester.fs.writePlist(SRCROOT.join("Sources/Info.plist"), .plDict([
-                "CFBundleDevelopmentRegion": .plString("en"),
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)")
-            ]))
+            try await tester.fs.writePlist(
+                SRCROOT.join("Sources/Info.plist"),
+                .plDict([
+                    "CFBundleDevelopmentRegion": .plString("en"),
+                    "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                ])
+            )
 
             // Write the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/CoreFoo.exports")) { contents in
@@ -1426,17 +1602,20 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
             try tester.fs.write(SRCROOT.join("Sources/Settings.plist"), contents: settingsContents)
 
             // We enable deployment postprocessing explicitly, to check the full range of basic behaviors.
-            let parameters = BuildParameters(action: .install, configuration: "Debug", overrides: [
-                "DSTROOT": tmpDirPath.join("dst").str,
-            ])
+            let parameters = BuildParameters(
+                action: .install,
+                configuration: "Debug",
+                overrides: [
+                    "DSTROOT": tmpDirPath.join("dst").str
+                ]
+            )
 
             // Check the initial build.
             try await tester.checkBuild(parameters: parameters, runDestination: .macOS, persistent: true) { results in
                 // Check that the module session validation file was written.
                 if let moduleSessionFilePath = results.buildDescription.moduleSessionFilePath {
                     #expect(tester.fs.exists(moduleSessionFilePath))
-                }
-                else {
+                } else {
                     Issue.record("No module session validation file path was computed")
                 }
 
@@ -1463,13 +1642,16 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 }
 
                 // Check that we get the expected target names in the progress report.
-                let targetNamesInProgressEvents = results.events.reduce(Set<String>(), { (result, event) in
-                    var result = result
-                    if case .totalProgressChanged(let targetName?, _, _) = event {
-                        result.insert(targetName)
+                let targetNamesInProgressEvents = results.events.reduce(
+                    Set<String>(),
+                    { (result, event) in
+                        var result = result
+                        if case .totalProgressChanged(let targetName?, _, _) = event {
+                            result.insert(targetName)
+                        }
+                        return result
                     }
-                    return result
-                })
+                )
                 #expect(targetNamesInProgressEvents == ["CoreFoo"])
 
                 let events = results.events.filter {
@@ -1664,7 +1846,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
 
             // Replace Swift compiler version string in manifest.
             let xcbuildDataDir = SRCROOT.join("build/XCBuildData")
-             for item in try tester.fs.listdir(xcbuildDataDir) {
+            for item in try tester.fs.listdir(xcbuildDataDir) {
                 let path = xcbuildDataDir.join(item)
                 if path.basename.hasSuffix("-manifest.xcbuild") {
                     let contents = try tester.fs.read(path).asString
@@ -1711,85 +1893,130 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         TestProject(
                             "aProject",
                             groupTree: TestGroup(
-                                "Sources", path: "Sources", children: [
-                                    TestGroup("Foo", path: "Foo", children: [
-                                        TestFile("Foo.m"),
-                                    ]),
-                                    TestGroup("CoreFoo", path: "CoreFoo", children: [
-                                        TestGroup("Internal", path: "Internal", children: [
-                                            TestFile("CoreFoo_Internal.h", guid: "FR_CoreFoo_Internal1")
-                                        ]),
-                                        TestFile("CoreFoo.h", guid: "FR_CoreFoo1"),
-                                        // We have to hide this in a subdirectory in order to hide it from local header search from CoreFoo.h
-                                        TestGroup("Public", path: "Public", children: [
-                                            TestFile("CoreFoo_Thing.h"),
-                                        ]),
-                                        TestFile("CoreFoo.m"),
-                                    ]),
-                                    TestGroup("StaticFoo", path: "StaticFoo", children: [
-                                        TestFile("StaticFoo.h"),
-                                        TestFile("StaticFoo_Internal.h"),
-                                        TestFile("StaticFoo.m"),
-                                    ]),
-                                    TestGroup("Hidden", path: "Hidden", children: [
-                                        hiddensCoreFoo,
-                                        hiddensCoreFooInternal
-                                    ]),
-                                ]),
-                            buildConfigurations: [TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                    "CLANG_ENABLE_MODULES": "\(enableModules)",
+                                "Sources",
+                                path: "Sources",
+                                children: [
+                                    TestGroup(
+                                        "Foo",
+                                        path: "Foo",
+                                        children: [
+                                            TestFile("Foo.m")
+                                        ]
+                                    ),
+                                    TestGroup(
+                                        "CoreFoo",
+                                        path: "CoreFoo",
+                                        children: [
+                                            TestGroup(
+                                                "Internal",
+                                                path: "Internal",
+                                                children: [
+                                                    TestFile("CoreFoo_Internal.h", guid: "FR_CoreFoo_Internal1")
+                                                ]
+                                            ),
+                                            TestFile("CoreFoo.h", guid: "FR_CoreFoo1"),
+                                            // We have to hide this in a subdirectory in order to hide it from local header search from CoreFoo.h
+                                            TestGroup(
+                                                "Public",
+                                                path: "Public",
+                                                children: [
+                                                    TestFile("CoreFoo_Thing.h")
+                                                ]
+                                            ),
+                                            TestFile("CoreFoo.m"),
+                                        ]
+                                    ),
+                                    TestGroup(
+                                        "StaticFoo",
+                                        path: "StaticFoo",
+                                        children: [
+                                            TestFile("StaticFoo.h"),
+                                            TestFile("StaticFoo_Internal.h"),
+                                            TestFile("StaticFoo.m"),
+                                        ]
+                                    ),
+                                    TestGroup(
+                                        "Hidden",
+                                        path: "Hidden",
+                                        children: [
+                                            hiddensCoreFoo,
+                                            hiddensCoreFooInternal,
+                                        ]
+                                    ),
                                 ]
-                            )],
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                        "CLANG_ENABLE_MODULES": "\(enableModules)",
+                                    ]
+                                )
+                            ],
                             targets: [
                                 // Main app, which depends on a framework, and the framework depends on a static library.
                                 TestStandardTarget(
-                                    "Foo", type: .staticLibrary,
+                                    "Foo",
+                                    type: .staticLibrary,
                                     buildPhases: [
                                         TestSourcesBuildPhase(["Foo.m"]),
                                         TestHeadersBuildPhase([]),
                                     ],
                                     // FIXME: Reverse this when rdar://problem/28138044 is fixed.
-                                    dependencies: ["StaticFoo"]),
+                                    dependencies: ["StaticFoo"]
+                                ),
                                 TestStandardTarget(
-                                    "CoreFoo", type: .framework,
+                                    "CoreFoo",
+                                    type: .framework,
                                     buildConfigurations: [
-                                        TestBuildConfiguration("Debug",
-                                                               buildSettings: [
-                                                                "DEFINES_MODULE": "YES"])],
+                                        TestBuildConfiguration(
+                                            "Debug",
+                                            buildSettings: [
+                                                "DEFINES_MODULE": "YES"
+                                            ]
+                                        )
+                                    ],
                                     buildPhases: [
                                         TestSourcesBuildPhase(["CoreFoo.m"]),
                                         TestHeadersBuildPhase([
                                             TestBuildFile("CoreFoo.h", headerVisibility: .public),
                                             TestBuildFile("CoreFoo_Thing.h", headerVisibility: .public),
                                             TestBuildFile("CoreFoo_Internal.h"),
-                                        ])],
+                                        ]),
+                                    ],
                                     // FIXME: Reverse this when rdar://problem/28138044 is fixed.
-                                    dependencies: []),
+                                    dependencies: []
+                                ),
                                 TestStandardTarget(
-                                    "StaticFoo", type: .staticLibrary,
+                                    "StaticFoo",
+                                    type: .staticLibrary,
                                     buildPhases: [
                                         TestSourcesBuildPhase(["StaticFoo.m"]),
                                         TestHeadersBuildPhase([
                                             TestBuildFile("StaticFoo.h", headerVisibility: .public),
                                             TestBuildFile("StaticFoo_Internal.h"),
-                                        ])],
+                                        ]),
+                                    ],
                                     // FIXME: Reverse this when rdar://problem/28138044 is fixed.
-                                    dependencies: ["CoreFoo"]),
+                                    dependencies: ["CoreFoo"]
+                                ),
                                 // Add another target with "duplicate" CoreFoo.h headers, to verify that we pick the right product name in the project headers map.
                                 TestStandardTarget(
-                                    "Hidden", type: .framework,
+                                    "Hidden",
+                                    type: .framework,
                                     buildPhases: [
                                         TestHeadersBuildPhase([
                                             TestBuildFile(hiddensCoreFoo),
                                             TestBuildFile(hiddensCoreFooInternal),
-                                        ]),
-                                    ]),
-                            ])
-                    ])
+                                        ])
+                                    ]
+                                ),
+                            ]
+                        )
+                    ]
+                )
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
                 // Write the source files.
@@ -1920,22 +2147,34 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 projects: [
                     TestProject(
                         "aProject",
-                        groupTree: TestGroup("Sources", children: [
-                            TestFile("Assets.xcassets"),
-                        ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)"
-                            ])],
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile("Assets.xcassets")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Empty", type: .application,
+                                "Empty",
+                                type: .application,
                                 buildConfigurations: [TestBuildConfiguration("Debug")],
                                 buildPhases: [
-                                    TestResourcesBuildPhase(["Assets.xcassets"]),
-                                ])])])
+                                    TestResourcesBuildPhase(["Assets.xcassets"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
@@ -2012,8 +2251,10 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
     }
 
     /// Check that tasks don't interfere with incremental builds across platforms.
-    @Test(.requireSDKs(.iOS, .tvOS),
-          .skipDeveloperDirectoryWithEqualSign) // mig will fail on mounts due to rdar://137363780 (env can't handle commands with = signs in the filename)
+    @Test(
+        .requireSDKs(.iOS, .tvOS),
+        .skipDeveloperDirectoryWithEqualSign
+    )  // mig will fail on mounts due to rdar://137363780 (env can't handle commands with = signs in the filename)
     func incrementalRebuildAcrossPlatforms() async throws {
 
         try await withTemporaryDirectory { tmpDirPath async throws -> Void in
@@ -2024,27 +2265,34 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 projects: [
                     TestProject(
                         "aProject",
-                        groupTree: TestGroup("Sources", children: [
-                            TestFile("foo.applescript"),
-                            TestFile("foo.defs"),
-                            TestFile("foo.iconset"),
-                            TestFile("foo.fake-customrule")
-                        ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "ARCHS": "arm64e",
-                                "CODE_SIGNING_ALLOWED": "NO",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                            ])],
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile("foo.applescript"),
+                                TestFile("foo.defs"),
+                                TestFile("foo.iconset"),
+                                TestFile("foo.fake-customrule"),
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "ARCHS": "arm64e",
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Empty", type: .dynamicLibrary,
+                                "Empty",
+                                type: .dynamicLibrary,
                                 buildConfigurations: [TestBuildConfiguration("Debug")],
                                 buildPhases: [
                                     TestAppleScriptBuildPhase([
-                                        TestBuildFile("foo.applescript"),
+                                        TestBuildFile("foo.applescript")
                                     ]),
                                     TestSourcesBuildPhase([
                                         TestBuildFile("foo.defs", migCodegenFiles: .both),
@@ -2052,15 +2300,16 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     ]),
                                     TestResourcesBuildPhase([
                                         //TestBuildFile("foo.iconset"),
-                                    ])
+                                    ]),
                                 ],
                                 buildRules: [
-                                    TestBuildRule(filePattern: "*.fake-customrule", script: "touch \"${SCRIPT_OUTPUT_FILE_0}\"", outputs: ["$(DERIVED_FILE_DIR)/foo.fake-customruleout"]),
+                                    TestBuildRule(filePattern: "*.fake-customrule", script: "touch \"${SCRIPT_OUTPUT_FILE_0}\"", outputs: ["$(DERIVED_FILE_DIR)/foo.fake-customruleout"])
                                 ]
                             )
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
@@ -2101,34 +2350,44 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     TestProject(
                         "aProject",
                         groupTree: TestGroup("Sources"),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])],
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)"
+                                ]
+                            )
+                        ],
                         targets: [
-                            TestAggregateTarget("Empty",
-                                                buildPhases: [
-                                                    TestShellScriptBuildPhase(
-                                                        name: "Produce Magic File",
-                                                        originalObjectID: "S1",
-                                                        contents:
+                            TestAggregateTarget(
+                                "Empty",
+                                buildPhases: [
+                                    TestShellScriptBuildPhase(
+                                        name: "Produce Magic File",
+                                        originalObjectID: "S1",
+                                        contents:
                                             #"""
                                             echo "magic string" > "$SCRIPT_OUTPUT_FILE_0"
                                             """#,
-                                                        inputs: [],
-                                                        outputs: ["$FAKE_PATH_OUT"]),
-                                                    TestShellScriptBuildPhase(
-                                                        name: "Extract First Word",
-                                                        originalObjectID: "S2",
-                                                        contents:
+                                        inputs: [],
+                                        outputs: ["$FAKE_PATH_OUT"]
+                                    ),
+                                    TestShellScriptBuildPhase(
+                                        name: "Extract First Word",
+                                        originalObjectID: "S2",
+                                        contents:
                                             #"""
                                             cat "$SCRIPT_INPUT_FILE_0" | awk '{print $1;}' > "$SCRIPT_OUTPUT_FILE_0"
                                             """#,
-                                                        inputs: ["$FAKE_PATH_OUT"],
-                                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/first-word.txt"]),
-                                                ]
-                                               )])])
+                                        inputs: ["$FAKE_PATH_OUT"],
+                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/first-word.txt"]
+                                    ),
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, fileSystem: createFS(simulated: false, fileSystemMode: .checksumOnly))
 
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -2137,10 +2396,13 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 stream <<< "magic string\n"
             }
 
-            let overriddenParameters = BuildParameters(configuration: "Debug", overrides: [
-                "FUSE_BUILD_SCRIPT_PHASES": "NO",
-                "FAKE_PATH_OUT": Path(SRCROOT).join("aProject/magic.txt").str
-            ])
+            let overriddenParameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    "FUSE_BUILD_SCRIPT_PHASES": "NO",
+                    "FAKE_PATH_OUT": Path(SRCROOT).join("aProject/magic.txt").str,
+                ]
+            )
 
             // Check the initial build.
             try await tester.checkBuild(parameters: overriddenParameters, runDestination: .macOS, persistent: true) { results in
@@ -2248,12 +2510,15 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     TestProject(
                         "aProject",
                         groupTree: TestGroup("Sources"),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])],
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "ALL",
@@ -2271,7 +2536,8 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                             set -e; cat "${SCRIPT_INPUT_FILE_0}" > "$SCRIPT_OUTPUT_FILE_0"
                                             """#,
                                         inputs: ["$FAKE_PATH_IN"],
-                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/magic.txt"])
+                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/magic.txt"]
+                                    )
                                 ],
                                 dependencies: ["Other"]
                             ),
@@ -2287,7 +2553,8 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                             set -e; cat "$SCRIPT_INPUT_FILE_0" | awk '{print $1;}' > "$SCRIPT_OUTPUT_FILE_0"
                                             """#,
                                         inputs: ["$(SHARED_DERIVED_FILE_DIR)/magic.txt"],
-                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/first-word.txt"]),
+                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/first-word.txt"]
+                                    )
                                 ],
                                 dependencies: ["Other"]
                             ),
@@ -2303,11 +2570,15 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                             set -e; cat "$SCRIPT_INPUT_FILE_0" | tr a-z A-Z > "$SCRIPT_OUTPUT_FILE_0"
                                             """#,
                                         inputs: ["$(SHARED_DERIVED_FILE_DIR)/first-word.txt"],
-                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/final.txt"])
+                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/final.txt"]
+                                    )
                                 ],
                                 dependencies: ["Other"]
                             ),
-                        ])])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, fileSystem: createFS(simulated: false, fileSystemMode: .checksumOnly))
 
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -2316,10 +2587,13 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 stream <<< "magic string\n"
             }
 
-            let overriddenParameters = BuildParameters(configuration: "Debug", overrides: [
-                "FAKE_PATH_IN": Path(SRCROOT).join("aProject/magic.txt").str,
-                "FUSE_BUILD_SCRIPT_PHASES": "NO"
-            ])
+            let overriddenParameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    "FAKE_PATH_IN": Path(SRCROOT).join("aProject/magic.txt").str,
+                    "FUSE_BUILD_SCRIPT_PHASES": "NO",
+                ]
+            )
 
             // Check the initial build.
             try await tester.checkBuild(parameters: overriddenParameters, runDestination: .macOS, persistent: true) { results in
@@ -2414,21 +2688,33 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 projects: [
                     TestProject(
                         "aProject",
-                        groupTree: TestGroup("Sources", children: [
-                            TestFile("Empty.c"),
-                            TestFile("Test.txt"),
-                        ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])],
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile("Empty.c"),
+                                TestFile("Test.txt"),
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Empty", type: .framework,
+                                "Empty",
+                                type: .framework,
                                 buildConfigurations: [TestBuildConfiguration("Debug")],
                                 buildPhases: [
                                     TestCopyFilesBuildPhase(["Test.txt"], destinationSubfolder: .frameworks, onlyForDeployment: false),
                                     TestSourcesBuildPhase(["Empty.c"]),
-                                ])])])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Create the input files.
@@ -2456,26 +2742,38 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 projects: [
                     TestProject(
                         "aProject",
-                        groupTree: TestGroup("Sources", children: [
-                            TestFile("Empty.c"),
-                            TestFile("Empty.swift"),
-                            TestFile("Test.txt"),
-                        ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "DONT_GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_VERSION": swiftVersion,
-                            ])],
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile("Empty.c"),
+                                TestFile("Empty.swift"),
+                                TestFile("Test.txt"),
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "DONT_GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Empty", type: .framework,
+                                "Empty",
+                                type: .framework,
                                 buildConfigurations: [TestBuildConfiguration("Debug")],
                                 buildPhases: [
                                     TestCopyFilesBuildPhase(["Test.txt"], destinationSubfolder: .frameworks, onlyForDeployment: false),
                                     TestSourcesBuildPhase(["Empty.c", "Empty.swift"]),
-                                ])])])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Create the input files.
@@ -2489,7 +2787,6 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
             // Touch a file inside the directory.
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/build/Debug/Empty.framework/Versions/a.txt")) { stream in }
 
-
             try await tester.checkNullBuild(parameters: BuildParameters(configuration: "Debug", commandLineOverrides: ["OTHER_CFLAGS": "-fcolor-diagnostics"]), runDestination: .macOS, persistent: true, excludedTasks: ["ClangStatCache"])
 
             try await tester.checkNullBuild(parameters: BuildParameters(configuration: "Debug", commandLineOverrides: ["OTHER_CFLAGS": "-fmessage-length=1234"]), runDestination: .macOS, persistent: true, excludedTasks: ["ClangStatCache"])
@@ -2532,30 +2829,38 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", children: [
+                            "Sources",
+                            children: [
                                 TestFile("CoreFoo.m"),
                                 TestFile("Info.plist"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "VERSIONING_SYSTEM": "apple-generic",
-                                "CURRENT_PROJECT_VERSION": "3.1",
-                                "INFOPLIST_FILE": "Info.plist",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "CODE_SIGN_IDENTITY": "-",
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "VERSIONING_SYSTEM": "apple-generic",
+                                    "CURRENT_PROJECT_VERSION": "3.1",
+                                    "INFOPLIST_FILE": "Info.plist",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "CODE_SIGN_IDENTITY": "-",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["CoreFoo.m"]),
-                                ])
-                        ])
-                ])
+                                    TestSourcesBuildPhase(["CoreFoo.m"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Create the input files.
@@ -2563,7 +2868,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
 
             let initialPlDict: [String: PropertyListItem] = [
                 "CFBundleDevelopmentRegion": .plString("en"),
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)")
+                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
             ]
             let infoPlistPath = testWorkspace.sourceRoot.join("aProject/Info.plist")
             try await tester.fs.writePlist(infoPlistPath, .plDict(initialPlDict))
@@ -2596,20 +2901,29 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 projects: [
                     TestProject(
                         "aProject",
-                        groupTree: TestGroup("Sources", children: [
-                            TestFile("Source.swift"),
-                        ]),
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile("Source.swift")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)", "SWIFT_VERSION": swiftVersion]),
                             TestBuildConfiguration("Release", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)", "SWIFT_VERSION": swiftVersion]),
                         ],
                         targets: [
                             TestStandardTarget(
-                                "Foo", type: .framework,
+                                "Foo",
+                                type: .framework,
                                 buildConfigurations: [TestBuildConfiguration("Debug"), TestBuildConfiguration("Release")],
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["Source.swift"]),
-                                ])])])
+                                    TestSourcesBuildPhase(["Source.swift"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Create the input files.
@@ -2642,7 +2956,8 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         TestFile("watchosApp/Interface.storyboard"),
                         TestFile("watchosApp/Assets.xcassets"),
                         TestFile("watchosApp/Info.plist"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -2651,37 +2966,44 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                             "CODE_SIGNING_ALLOWED": "NO",
                             "SDKROOT": "iphoneos",
                             "WATCHOS_DEPLOYMENT_TARGET": "6.0",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Watchable WatchKit App",
                         type: .watchKitApp,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug",
-                                                   buildSettings: [
-                                                    "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
-                                                    "INFOPLIST_FILE": "watchosApp/Info.plist",
-                                                    "SDKROOT": "watchos",
-                                                    "SKIP_INSTALL": "YES",
-                                                    "TARGETED_DEVICE_FAMILY": "4",
-                                                   ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
+                                    "INFOPLIST_FILE": "watchosApp/Info.plist",
+                                    "SDKROOT": "watchos",
+                                    "SKIP_INSTALL": "YES",
+                                    "TARGETED_DEVICE_FAMILY": "4",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([
                                 "watchosApp/Interface.storyboard",
                                 "watchosApp/Assets.xcassets",
-                            ]),
+                            ])
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             let SRCROOT = tmpDirPath
 
-            try await tester.fs.writePlist(SRCROOT.join("watchosApp/Info.plist"), .plDict([
-                "CFBundleDevelopmentRegion": .plString("en"),
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)")
-            ]))
+            try await tester.fs.writePlist(
+                SRCROOT.join("watchosApp/Info.plist"),
+                .plDict([
+                    "CFBundleDevelopmentRegion": .plString("en"),
+                    "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                ])
+            )
 
             try await tester.fs.writeAssetCatalog(SRCROOT.join("watchosApp/Assets.xcassets"), .root, .appIcon("AppIcon"))
 
@@ -2707,14 +3029,21 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         "aProject",
                         groupTree: TestGroup("Sources"),
                         targets: [
-                            TestAggregateTarget("Empty",
-                                                buildPhases: [
-                                                    TestShellScriptBuildPhase(
-                                                        name: "Run Script",
-                                                        originalObjectID: "S1",
-                                                        contents: "echo ��� | xxd",
-                                                        alwaysOutOfDate: true
-                                                    )])])])
+                            TestAggregateTarget(
+                                "Empty",
+                                buildPhases: [
+                                    TestShellScriptBuildPhase(
+                                        name: "Run Script",
+                                        originalObjectID: "S1",
+                                        contents: "echo ��� | xxd",
+                                        alwaysOutOfDate: true
+                                    )
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -2741,14 +3070,21 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         "aProject",
                         groupTree: TestGroup("Sources"),
                         targets: [
-                            TestAggregateTarget("Empty",
-                                                buildPhases: [
-                                                    TestShellScriptBuildPhase(
-                                                        name: "Run Script",
-                                                        originalObjectID: "S1",
-                                                        contents: "which metal\nwhich clang\n",
-                                                        alwaysOutOfDate: true
-                                                    )])])])
+                            TestAggregateTarget(
+                                "Empty",
+                                buildPhases: [
+                                    TestShellScriptBuildPhase(
+                                        name: "Run Script",
+                                        originalObjectID: "S1",
+                                        contents: "which metal\nwhich clang\n",
+                                        alwaysOutOfDate: true
+                                    )
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -2777,21 +3113,47 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         "aProject",
                         groupTree: TestGroup("Sources"),
                         targets: [
-                            TestAggregateTarget("Empty",
-                                                buildPhases: [
-                                                    TestShellScriptBuildPhase(name: "Run Script", originalObjectID: "S1", contents: {
-                                                        let stream = OutputByteStream()
-                                                        stream <<< "true"
-                                                        return stream.bytes.asString }()),
-                                                    TestShellScriptBuildPhase(name: "Run Script", originalObjectID: "S2", contents: {
-                                                        let stream = OutputByteStream()
-                                                        stream <<< "echo 'run-once' > \(tmpDirPath.str)/var/s2-output"
-                                                        return stream.bytes.asString }(), inputs: ["\(tmpDirPath.str)/var/s2-input"], outputs: ["\(tmpDirPath.str)/var/s2-output"]),
-                                                    TestShellScriptBuildPhase(name: "Run Script", originalObjectID: "S3", contents: {
-                                                        let stream = OutputByteStream()
-                                                        stream <<< "echo 'always run' > \(tmpDirPath.str)/var/s3-output"
-                                                        return stream.bytes.asString }(), inputs: ["\(tmpDirPath.str)/var/s3-input"], outputs: ["\(tmpDirPath.str)/var/s3-output"], alwaysOutOfDate: true),
-                                                ])])])
+                            TestAggregateTarget(
+                                "Empty",
+                                buildPhases: [
+                                    TestShellScriptBuildPhase(
+                                        name: "Run Script",
+                                        originalObjectID: "S1",
+                                        contents: {
+                                            let stream = OutputByteStream()
+                                            stream <<< "true"
+                                            return stream.bytes.asString
+                                        }()
+                                    ),
+                                    TestShellScriptBuildPhase(
+                                        name: "Run Script",
+                                        originalObjectID: "S2",
+                                        contents: {
+                                            let stream = OutputByteStream()
+                                            stream <<< "echo 'run-once' > \(tmpDirPath.str)/var/s2-output"
+                                            return stream.bytes.asString
+                                        }(),
+                                        inputs: ["\(tmpDirPath.str)/var/s2-input"],
+                                        outputs: ["\(tmpDirPath.str)/var/s2-output"]
+                                    ),
+                                    TestShellScriptBuildPhase(
+                                        name: "Run Script",
+                                        originalObjectID: "S3",
+                                        contents: {
+                                            let stream = OutputByteStream()
+                                            stream <<< "echo 'always run' > \(tmpDirPath.str)/var/s3-output"
+                                            return stream.bytes.asString
+                                        }(),
+                                        inputs: ["\(tmpDirPath.str)/var/s3-input"],
+                                        outputs: ["\(tmpDirPath.str)/var/s3-output"],
+                                        alwaysOutOfDate: true
+                                    ),
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("\(tmpDirPath.str)/var/s1-input")) { stream in
@@ -2847,23 +3209,35 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 projects: [
                     TestProject(
                         "aProject",
-                        groupTree: TestGroup("Sources", children: [
-                            TestFile("main.c")]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "CODE_SIGNING_ALLOWED": "NO",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "INSTALL_OWNER": "",
-                                "INSTALL_GROUP": groupName,
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile("main.c")
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "INSTALL_OWNER": "",
+                                    "INSTALL_GROUP": groupName,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Tool", type: .commandLineTool,
+                                "Tool",
+                                type: .commandLineTool,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["main.c"]),
-                                ])])])
+                                    TestSourcesBuildPhase(["main.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Write the file data.
@@ -2872,10 +3246,15 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
             }
 
             // Check the initial build.
-            let parameters = BuildParameters(action: .install, configuration: "Debug", activeRunDestination: .host, overrides: [
-                "DSTROOT": tmpDirPath.join("dst").str,
-                "STRIP_INSTALLED_PRODUCT": "NO",
-            ])
+            let parameters = BuildParameters(
+                action: .install,
+                configuration: "Debug",
+                activeRunDestination: .host,
+                overrides: [
+                    "DSTROOT": tmpDirPath.join("dst").str,
+                    "STRIP_INSTALLED_PRODUCT": "NO",
+                ]
+            )
             try await tester.checkBuild(parameters: parameters, runDestination: .host, persistent: true) { results in
                 results.consumeTasksMatchingRuleTypes(["Gate", "Copy", "WriteAuxiliaryFile", "SymLink", "CreateBuildDirectory", "RegisterExecutionPolicyException", "ClangStatCache", "ProcessSDKImports"])
                 results.checkTask(.matchRuleType("CompileC")) { _ in }
@@ -2903,36 +3282,45 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         TestProject(
                             "aProject",
                             groupTree: TestGroup(
-                                "Sources", path: "Sources", children: [
+                                "Sources",
+                                path: "Sources",
+                                children: [
                                     TestFile("Source.c"),
                                     TestFile("Info.plist"),
-                                ]),
-                            buildConfigurations: [TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "CODE_SIGNING_ALLOWED": enableSigning ? "YES" : "NO",
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                    "CLANG_ENABLE_MODULES": "YES",
-                                    "USE_HEADERMAP": "NO",
-                                    "SKIP_INSTALL": "NO",
-                                    "INFOPLIST_FILE": "Sources/Info.plist",
-
-                                    // Force stripping and file attribute changes off by default.
-                                    "INSTALL_OWNER": "",
-                                    "INSTALL_GROUP": "",
-                                    "INSTALL_MODE_FLAG": "",
-                                    "STRIP_INSTALLED_PRODUCT": "NO",
-                                ].addingContents(of: settings)
-                            )],
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "CODE_SIGNING_ALLOWED": enableSigning ? "YES" : "NO",
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                        "CLANG_ENABLE_MODULES": "YES",
+                                        "USE_HEADERMAP": "NO",
+                                        "SKIP_INSTALL": "NO",
+                                        "INFOPLIST_FILE": "Sources/Info.plist",
+
+                                        // Force stripping and file attribute changes off by default.
+                                        "INSTALL_OWNER": "",
+                                        "INSTALL_GROUP": "",
+                                        "INSTALL_MODE_FLAG": "",
+                                        "STRIP_INSTALLED_PRODUCT": "NO",
+                                    ].addingContents(of: settings)
+                                )
+                            ],
                             targets: [
                                 TestStandardTarget(
-                                    targetName, type: targetType,
+                                    targetName,
+                                    type: targetType,
                                     buildPhases: [
-                                        TestSourcesBuildPhase([TestBuildFile("Source.c")]),
-                                    ])
-                            ])
-                    ])
+                                        TestSourcesBuildPhase([TestBuildFile("Source.c")])
+                                    ]
+                                )
+                            ]
+                        )
+                    ]
+                )
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
                 let SRCROOT = testWorkspace.sourceRoot.join("aProject")
                 let signableTargets: Set<String> = enableSigning ? [targetName] : []
@@ -2946,10 +3334,13 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
 
                 if targetType == .framework {
                     // Write the Info.plist file.
-                    try await tester.fs.writePlist(SRCROOT.join("Sources/Info.plist"), .plDict([
-                        "CFBundleDevelopmentRegion": .plString("en"),
-                        "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)")
-                    ]))
+                    try await tester.fs.writePlist(
+                        SRCROOT.join("Sources/Info.plist"),
+                        .plDict([
+                            "CFBundleDevelopmentRegion": .plString("en"),
+                            "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                        ])
+                    )
                 }
 
                 // Write the source files.
@@ -2964,13 +3355,16 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     }
                 }
 
-                // We enable deployment postprocessing explicitly, to check the full range of basic behaviors.
-                let parameters = BuildParameters(configuration: "Debug", overrides: [
-                    "DSTROOT": tmpDirPath.join("dst").str,
-                    "DEPLOYMENT_POSTPROCESSING": "YES",
-                    "DEPLOYMENT_LOCATION": "YES",
-                ])
-
+                // We enable deployment postprocessing explicitly, to check the full range of basic behaviors.
+                let parameters = BuildParameters(
+                    configuration: "Debug",
+                    overrides: [
+                        "DSTROOT": tmpDirPath.join("dst").str,
+                        "DEPLOYMENT_POSTPROCESSING": "YES",
+                        "DEPLOYMENT_LOCATION": "YES",
+                    ]
+                )
+
                 // Check the initial build.
                 try await tester.checkBuild(parameters: parameters, runDestination: generic ? .anyMac : .macOS, persistent: true, signableTargets: signableTargets, signableTargetInputs: signableTargetInputs) { results in
                     results.consumeTasksMatchingRuleTypes(taskTypesToExclude)
@@ -2998,7 +3392,6 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 }
                 try await tester.checkBuild(parameters: parameters, runDestination: generic ? .anyMac : .macOS, persistent: true, signableTargets: signableTargets, signableTargetInputs: signableTargetInputs) { results in
 
-
                     // We don't expect to rerun any `ProcessProductPackaging` tasks if we just change the source.
                     let expectedTasksSansProcessProductPackaging = Array(expectedTasks.drop(while: { $0 == "ProcessProductPackaging" }))
 
@@ -3018,22 +3411,38 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
         }
 
         // Check the behavior of chown/chmod.
-        try await checkScenario("Tool File Attributes", expectedTasks: ["ScanDependencies", "CompileC", "Ld", "SetGroup", "SetMode"], settings: [
-            "INSTALL_GROUP": GetCurrentUserGroupName()!,
-            "INSTALL_MODE_FLAG": "+w"])
+        try await checkScenario(
+            "Tool File Attributes",
+            expectedTasks: ["ScanDependencies", "CompileC", "Ld", "SetGroup", "SetMode"],
+            settings: [
+                "INSTALL_GROUP": GetCurrentUserGroupName()!,
+                "INSTALL_MODE_FLAG": "+w",
+            ]
+        )
 
         // Check the behavior of strip.
-        try await checkScenario("Tool Stripping", expectedTasks: ["ScanDependencies", "CompileC", "Ld", "Strip"], settings: [
-            "STRIP_INSTALLED_PRODUCT": "YES"])
+        try await checkScenario(
+            "Tool Stripping",
+            expectedTasks: ["ScanDependencies", "CompileC", "Ld", "Strip"],
+            settings: [
+                "STRIP_INSTALLED_PRODUCT": "YES"
+            ]
+        )
 
         // Check the behavior of signing.
         try await checkScenario("Tool Code Signing", expectedTasks: ["ScanDependencies", "CompileC", "Ld", "CodeSign"], enableSigning: true)
 
         // Check the behavior of mutation of a universal binary.
-        try await checkScenario("Universal Tool Mutation", expectedTasks: ["ScanDependencies", "ScanDependencies", "CompileC", "CompileC", "CreateUniversalBinary", "Ld", "Ld", "Strip"], generic: true, settings: [
-            "STRIP_INSTALLED_PRODUCT": "YES",
-            "ARCHS": "x86_64 x86_64h",
-            "VALID_ARCHS[sdk=macosx*]": "$(inherited) x86_64h"])
+        try await checkScenario(
+            "Universal Tool Mutation",
+            expectedTasks: ["ScanDependencies", "ScanDependencies", "CompileC", "CompileC", "CreateUniversalBinary", "Ld", "Ld", "Strip"],
+            generic: true,
+            settings: [
+                "STRIP_INSTALLED_PRODUCT": "YES",
+                "ARCHS": "x86_64 x86_64h",
+                "VALID_ARCHS[sdk=macosx*]": "$(inherited) x86_64h",
+            ]
+        )
 
         // Check the behavior of signing a framework.
         try await checkScenario("Framework Code Signing", expectedTasks: ["ScanDependencies", "CompileC", "Ld", "GenerateTAPI", "CodeSign"], enableSigning: true, targetType: .framework)
@@ -3050,36 +3459,49 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
-                                TestFile("Input-1.txt"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "USE_HEADERMAP": "NO",
-                                "INFOPLIST_FILE": "Sources/Info.plist",
+                            "Sources",
+                            path: "Sources",
+                            children: [
+                                TestFile("Input-1.txt")
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "USE_HEADERMAP": "NO",
+                                    "INFOPLIST_FILE": "Sources/Info.plist",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "Dest",
-                                buildPhases: [TestCopyFilesBuildPhase(["SourceBundle.bundle"], destinationSubfolder: .frameworks, destinationSubpath: "Dest", onlyForDeployment: false)]),
+                                buildPhases: [TestCopyFilesBuildPhase(["SourceBundle.bundle"], destinationSubfolder: .frameworks, destinationSubpath: "Dest", onlyForDeployment: false)]
+                            ),
                             TestStandardTarget(
-                                "SourceBundle", type: .bundle,
-                                buildPhases: [TestCopyFilesBuildPhase(["Input-1.txt"], destinationSubfolder: .frameworks, onlyForDeployment: false)]),
-                        ])
-                ])
+                                "SourceBundle",
+                                type: .bundle,
+                                buildPhases: [TestCopyFilesBuildPhase(["Input-1.txt"], destinationSubfolder: .frameworks, onlyForDeployment: false)]
+                            ),
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
             let signableTargets: Set<String> = ["App"]
 
             // Write the Info.plist file.
-            try await tester.fs.writePlist(SRCROOT.join("Sources/Info.plist"), .plDict([
-                "CFBundleDevelopmentRegion": .plString("en"),
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)")
-            ]))
+            try await tester.fs.writePlist(
+                SRCROOT.join("Sources/Info.plist"),
+                .plDict([
+                    "CFBundleDevelopmentRegion": .plString("en"),
+                    "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                ])
+            )
 
             // Write the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/Input-1.txt")) { contents in
@@ -3157,55 +3579,72 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
+                            "Sources",
+                            path: "Sources",
+                            children: [
                                 TestFile("File.c"),
                                 TestFile("Info.plist"),
-                                TestVariantGroup("Localizable.strings", children: [
-                                    TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja"),
-                                ]),
+                                TestVariantGroup(
+                                    "Localizable.strings",
+                                    children: [
+                                        TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja")
+                                    ]
+                                ),
                                 TestFile("AResource.plist"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "FRAMEWORK_SEARCH_PATHS": "$(inherited) \(tmpDirPath.str)",
-                                "COPY_PHASE_STRIP": "NO",
-                                "SDKROOT": "macosx",
-                                "INSTALLLOC_LANGUAGE": "ja",
-                                "DSTROOT": tmpDirPath.join("DSTROOT").str
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "FRAMEWORK_SEARCH_PATHS": "$(inherited) \(tmpDirPath.str)",
+                                    "COPY_PHASE_STRIP": "NO",
+                                    "SDKROOT": "macosx",
+                                    "INSTALLLOC_LANGUAGE": "ja",
+                                    "DSTROOT": tmpDirPath.join("DSTROOT").str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "App", type: .application,
+                                "App",
+                                type: .application,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         TestBuildFile("File.c")
                                     ]),
                                     TestFrameworksBuildPhase([
-                                        TestBuildFile("AFwk.framework"),
+                                        TestBuildFile("AFwk.framework")
                                     ]),
-                                    TestCopyFilesBuildPhase([
-                                        TestBuildFile("AFwk.framework", codeSignOnCopy: true, removeHeadersOnCopy: true),
-                                    ], destinationSubfolder: .frameworks, onlyForDeployment: false),
-                                ]),
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            TestBuildFile("AFwk.framework", codeSignOnCopy: true, removeHeadersOnCopy: true)
+                                        ],
+                                        destinationSubfolder: .frameworks,
+                                        onlyForDeployment: false
+                                    ),
+                                ]
+                            ),
                             TestStandardTarget(
-                                "AFwk", type: .framework,
+                                "AFwk",
+                                type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         TestBuildFile("File.c")
                                     ]),
                                     TestResourcesBuildPhase([
                                         TestBuildFile("Localizable.strings")
-                                    ])
+                                    ]),
                                 ]
-                            )
-                        ])
-                ])
+                            ),
+                        ]
+                    )
+                ]
+            )
             let core = try await self.getCore()
             let tester = try await BuildOperationTester(core, testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
@@ -3259,17 +3698,20 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 XCTAssertEqualSequences(delta.right, [])
 
                 // Check that all the non-localized content has been pruned.
-                XCTAssertEqualSequences(delta.left.sorted(), [
-                    "AFwk",
-                    "Headers",
-                    "Resources",
-                    "Versions/A/AFwk",
-                    "Versions/A/Headers",
-                    "Versions/A/Headers/AFwk.h",
-                    "Versions/A/Resources/AResource.plist",
-                    "Versions/A/Resources/Info.plist",
-                    "Versions/Current",
-                ])
+                XCTAssertEqualSequences(
+                    delta.left.sorted(),
+                    [
+                        "AFwk",
+                        "Headers",
+                        "Resources",
+                        "Versions/A/AFwk",
+                        "Versions/A/Headers",
+                        "Versions/A/Headers/AFwk.h",
+                        "Versions/A/Resources/AResource.plist",
+                        "Versions/A/Resources/Info.plist",
+                        "Versions/Current",
+                    ]
+                )
             }
         }
     }
@@ -3285,30 +3727,36 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
+                            "Sources",
+                            path: "Sources",
+                            children: [
                                 TestFile("App.c"),
                                 TestFile("Info.plist"),
                                 TestFile("ADynamicFwk.framework", path: tmpDirPath.join("ADynamicFwk.framework").str, sourceTree: .absolute),
-                                TestFile("AStaticFwk.framework", path: tmpDirPath.join("AStaticFwk.framework").str, sourceTree: .absolute)
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "FRAMEWORK_SEARCH_PATHS": "$(inherited) \(tmpDirPath.str)",
-                                "COPY_PHASE_STRIP": "NO",
-                                // Stripping bitcode varies by platform, and since it's not what we're testing here, we just turn it off.
-                                "STRIP_BITCODE_FROM_COPIED_FILES": "NO",
-                                "SDKROOT": runDestination.sdk,
-                                "SUPPORTS_MACCATALYST": runDestination.sdkVariant == MacCatalystInfo.sdkVariantName ? "YES" : "NO"
+                                TestFile("AStaticFwk.framework", path: tmpDirPath.join("AStaticFwk.framework").str, sourceTree: .absolute),
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "FRAMEWORK_SEARCH_PATHS": "$(inherited) \(tmpDirPath.str)",
+                                    "COPY_PHASE_STRIP": "NO",
+                                    // Stripping bitcode varies by platform, and since it's not what we're testing here, we just turn it off.
+                                    "STRIP_BITCODE_FROM_COPIED_FILES": "NO",
+                                    "SDKROOT": runDestination.sdk,
+                                    "SUPPORTS_MACCATALYST": runDestination.sdkVariant == MacCatalystInfo.sdkVariantName ? "YES" : "NO",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "App", type: .application,
+                                "App",
+                                type: .application,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         TestBuildFile("App.c")
@@ -3317,13 +3765,19 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                         TestBuildFile("ADynamicFwk.framework"),
                                         TestBuildFile("AStaticFwk.framework"),
                                     ]),
-                                    TestCopyFilesBuildPhase([
-                                        TestBuildFile("ADynamicFwk.framework", codeSignOnCopy: true, removeHeadersOnCopy: true),
-                                        TestBuildFile("AStaticFwk.framework", codeSignOnCopy: true, removeHeadersOnCopy: true),
-                                    ], destinationSubfolder: .frameworks, onlyForDeployment: false),
-                                ]),
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            TestBuildFile("ADynamicFwk.framework", codeSignOnCopy: true, removeHeadersOnCopy: true),
+                                            TestBuildFile("AStaticFwk.framework", codeSignOnCopy: true, removeHeadersOnCopy: true),
+                                        ],
+                                        destinationSubfolder: .frameworks,
+                                        onlyForDeployment: false
+                                    ),
+                                ]
+                            ),
                             TestStandardTarget(
-                                "App2", type: .application,
+                                "App2",
+                                type: .application,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         TestBuildFile("App.c")
@@ -3332,13 +3786,20 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                         TestBuildFile("ADynamicFwk.framework"),
                                         TestBuildFile("AStaticFwk.framework"),
                                     ]),
-                                    TestCopyFilesBuildPhase([
-                                        TestBuildFile("ADynamicFwk.framework", codeSignOnCopy: false, removeHeadersOnCopy: true),
-                                        TestBuildFile("AStaticFwk.framework", codeSignOnCopy: false, removeHeadersOnCopy: true),
-                                    ], destinationSubfolder: .frameworks, onlyForDeployment: false),
-                                ]),
-                        ])
-                ])
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            TestBuildFile("ADynamicFwk.framework", codeSignOnCopy: false, removeHeadersOnCopy: true),
+                                            TestBuildFile("AStaticFwk.framework", codeSignOnCopy: false, removeHeadersOnCopy: true),
+                                        ],
+                                        destinationSubfolder: .frameworks,
+                                        onlyForDeployment: false
+                                    ),
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
             let core = try await self.getCore()
             let tester = try await BuildOperationTester(core, testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
@@ -3348,35 +3809,44 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
             try await tester.fs.writeFramework(sourceDynamicFrameworkPath, archs: runDestination.platform == "macosx" ? ["arm64", "x86_64"] : ["arm64"], platform: #require(runDestination.buildVersionPlatform(core)), infoLookup: core, static: false) { _, _, headersDir, resourcesDir in
                 try await tester.fs.writeFileContents(headersDir.join("ADynamicFwk.h")) { $0 <<< "" }
                 try await tester.fs.writePlist(resourcesDir.join("ADynamicResource.plist"), .plDict([:]))
-                try await tester.fs.writePlist(resourcesDir.join("Info.plist"), .plDict([
-                    "CFBundleIdentifier": "com.apple.ADynamicFwk",
-                ]))
+                try await tester.fs.writePlist(
+                    resourcesDir.join("Info.plist"),
+                    .plDict([
+                        "CFBundleIdentifier": "com.apple.ADynamicFwk"
+                    ])
+                )
             }
 
             let sourceDynamicFrameworkFiles = try tester.fs.traverse(sourceDynamicFrameworkPath, { $0.relativeSubpath(from: sourceDynamicFrameworkPath) }).sorted().filter { !$0.contains("_CodeSignature") }
             if runDestination.platform == "macosx" {
-                XCTAssertEqualSequences(sourceDynamicFrameworkFiles, [
-                    "ADynamicFwk",
-                    "Headers",
-                    "Resources",
-                    "Versions",
-                    "Versions/A",
-                    "Versions/A/ADynamicFwk",
-                    "Versions/A/Headers",
-                    "Versions/A/Headers/ADynamicFwk.h",
-                    "Versions/A/Resources",
-                    "Versions/A/Resources/ADynamicResource.plist",
-                    "Versions/A/Resources/Info.plist",
-                    "Versions/Current",
-                ])
+                XCTAssertEqualSequences(
+                    sourceDynamicFrameworkFiles,
+                    [
+                        "ADynamicFwk",
+                        "Headers",
+                        "Resources",
+                        "Versions",
+                        "Versions/A",
+                        "Versions/A/ADynamicFwk",
+                        "Versions/A/Headers",
+                        "Versions/A/Headers/ADynamicFwk.h",
+                        "Versions/A/Resources",
+                        "Versions/A/Resources/ADynamicResource.plist",
+                        "Versions/A/Resources/Info.plist",
+                        "Versions/Current",
+                    ]
+                )
             } else {
-                XCTAssertEqualSequences(sourceDynamicFrameworkFiles, [
-                    "ADynamicFwk",
-                    "ADynamicResource.plist",
-                    "Headers",
-                    "Headers/ADynamicFwk.h",
-                    "Info.plist",
-                ])
+                XCTAssertEqualSequences(
+                    sourceDynamicFrameworkFiles,
+                    [
+                        "ADynamicFwk",
+                        "ADynamicResource.plist",
+                        "Headers",
+                        "Headers/ADynamicFwk.h",
+                        "Info.plist",
+                    ]
+                )
             }
 
             let platform = core.platformRegistry.lookup(name: runDestination.platform)
@@ -3386,39 +3856,48 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
             try await tester.fs.writeFramework(sourceStaticFrameworkPath, archs: runDestination.platform == "macosx" ? ["arm64", "x86_64"] : ["arm64"], platform: #require(runDestination.buildVersionPlatform(core)), infoLookup: core, static: true) { _, _, headersDir, resourcesDir in
                 try await tester.fs.writeFileContents(headersDir.join("AStaticFwk.h")) { $0 <<< "" }
                 try await tester.fs.writePlist(resourcesDir.join("AStaticResource.plist"), .plDict([:]))
-                try await tester.fs.writePlist(resourcesDir.join("Info.plist"), .plDict([
-                    "OSMinimumDriverKitVersion": "11.0",
-                    "LSMinimumSystemVersion": "11.0",
-                    "MinimumOSVersion": "11.0",
-                    "CFBundleSupportedPlatforms": bundleSupportedPlatforms,
-                    "CFBundleIdentifier": "com.apple.AStaticFwk",
-                ]))
+                try await tester.fs.writePlist(
+                    resourcesDir.join("Info.plist"),
+                    .plDict([
+                        "OSMinimumDriverKitVersion": "11.0",
+                        "LSMinimumSystemVersion": "11.0",
+                        "MinimumOSVersion": "11.0",
+                        "CFBundleSupportedPlatforms": bundleSupportedPlatforms,
+                        "CFBundleIdentifier": "com.apple.AStaticFwk",
+                    ])
+                )
             }
 
             let sourceStaticFrameworkFiles = try tester.fs.traverse(sourceStaticFrameworkPath, { $0.relativeSubpath(from: sourceStaticFrameworkPath) }).sorted().filter { !$0.contains("_CodeSignature") }
             if runDestination.platform == "macosx" {
-                XCTAssertEqualSequences(sourceStaticFrameworkFiles, [
-                    "AStaticFwk",
-                    "Headers",
-                    "Resources",
-                    "Versions",
-                    "Versions/A",
-                    "Versions/A/AStaticFwk",
-                    "Versions/A/Headers",
-                    "Versions/A/Headers/AStaticFwk.h",
-                    "Versions/A/Resources",
-                    "Versions/A/Resources/AStaticResource.plist",
-                    "Versions/A/Resources/Info.plist",
-                    "Versions/Current",
-                ])
+                XCTAssertEqualSequences(
+                    sourceStaticFrameworkFiles,
+                    [
+                        "AStaticFwk",
+                        "Headers",
+                        "Resources",
+                        "Versions",
+                        "Versions/A",
+                        "Versions/A/AStaticFwk",
+                        "Versions/A/Headers",
+                        "Versions/A/Headers/AStaticFwk.h",
+                        "Versions/A/Resources",
+                        "Versions/A/Resources/AStaticResource.plist",
+                        "Versions/A/Resources/Info.plist",
+                        "Versions/Current",
+                    ]
+                )
             } else {
-                XCTAssertEqualSequences(sourceStaticFrameworkFiles, [
-                    "AStaticFwk",
-                    "AStaticResource.plist",
-                    "Headers",
-                    "Headers/AStaticFwk.h",
-                    "Info.plist",
-                ])
+                XCTAssertEqualSequences(
+                    sourceStaticFrameworkFiles,
+                    [
+                        "AStaticFwk",
+                        "AStaticResource.plist",
+                        "Headers",
+                        "Headers/AStaticFwk.h",
+                        "Info.plist",
+                    ]
+                )
             }
 
             // Write the source files.
@@ -3471,21 +3950,27 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                             task.checkCommandLine(["builtin-copy", "-exclude", ".DS_Store", "-exclude", "CVS", "-exclude", ".svn", "-exclude", ".git", "-exclude", ".hg", "-exclude", "Headers", "-exclude", "PrivateHeaders", "-exclude", "Modules", "-exclude", "*.tbd", "-resolve-src-symlinks"] + (keepStaticBinary ? [] : ["-remove-static-executable"]) + ["\(tmpDirPath.str)/ADynamicFwk.framework", frameworkDestinationDir])
 
                             let destDynamicFrameworkPath = Path("\(frameworkDestinationDir)/ADynamicFwk.framework")
-                            let delta = try Set(sourceDynamicFrameworkFiles).diff(against: tester.fs.traverse(destDynamicFrameworkPath, { $0.relativeSubpath(from: destDynamicFrameworkPath) }).filter{ !$0.contains("_CodeSignature") })
+                            let delta = try Set(sourceDynamicFrameworkFiles).diff(against: tester.fs.traverse(destDynamicFrameworkPath, { $0.relativeSubpath(from: destDynamicFrameworkPath) }).filter { !$0.contains("_CodeSignature") })
                             XCTAssertEqualSequences(delta.right, [])
 
                             // Check that we removed all the headers
                             if runDestination.platform == "macosx" {
-                                XCTAssertEqualSequences(delta.left.sorted(), [
-                                    "Headers",
-                                    "Versions/A/Headers",
-                                    "Versions/A/Headers/ADynamicFwk.h",
-                                ])
+                                XCTAssertEqualSequences(
+                                    delta.left.sorted(),
+                                    [
+                                        "Headers",
+                                        "Versions/A/Headers",
+                                        "Versions/A/Headers/ADynamicFwk.h",
+                                    ]
+                                )
                             } else {
-                                XCTAssertEqualSequences(delta.left.sorted(), [
-                                    "Headers",
-                                    "Headers/ADynamicFwk.h",
-                                ])
+                                XCTAssertEqualSequences(
+                                    delta.left.sorted(),
+                                    [
+                                        "Headers",
+                                        "Headers/ADynamicFwk.h",
+                                    ]
+                                )
                             }
                         }
 
@@ -3493,35 +3978,47 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                             task.checkCommandLine(["builtin-copy", "-exclude", ".DS_Store", "-exclude", "CVS", "-exclude", ".svn", "-exclude", ".git", "-exclude", ".hg", "-exclude", "Headers", "-exclude", "PrivateHeaders", "-exclude", "Modules", "-exclude", "*.tbd", "-resolve-src-symlinks"] + (keepStaticBinary ? [] : ["-remove-static-executable"]) + ["\(tmpDirPath.str)/AStaticFwk.framework", frameworkDestinationDir])
 
                             let destStaticFrameworkPath = Path("\(frameworkDestinationDir)/AStaticFwk.framework")
-                            let delta = try Set(sourceStaticFrameworkFiles).diff(against: tester.fs.traverse(destStaticFrameworkPath, { $0.relativeSubpath(from: destStaticFrameworkPath) }).filter{ !$0.contains("_CodeSignature") })
+                            let delta = try Set(sourceStaticFrameworkFiles).diff(against: tester.fs.traverse(destStaticFrameworkPath, { $0.relativeSubpath(from: destStaticFrameworkPath) }).filter { !$0.contains("_CodeSignature") })
                             XCTAssertEqualSequences(delta.right, [])
 
                             // Check that we removed all the headers, as well as the binary (since it is static), if configured
                             if runDestination.platform == "macosx" {
                                 if keepStaticBinary {
-                                    XCTAssertEqualSequences(delta.left.sorted(), [
-                                        "Headers",
-                                        "Versions/A/Headers",
-                                        "Versions/A/Headers/AStaticFwk.h",
-                                    ])
+                                    XCTAssertEqualSequences(
+                                        delta.left.sorted(),
+                                        [
+                                            "Headers",
+                                            "Versions/A/Headers",
+                                            "Versions/A/Headers/AStaticFwk.h",
+                                        ]
+                                    )
                                 }
                             } else {
                                 if keepStaticBinary {
-                                    XCTAssertEqualSequences(delta.left.sorted(), [
-                                        "Headers",
-                                        "Headers/AStaticFwk.h",
-                                    ])
+                                    XCTAssertEqualSequences(
+                                        delta.left.sorted(),
+                                        [
+                                            "Headers",
+                                            "Headers/AStaticFwk.h",
+                                        ]
+                                    )
                                 } else if useAppStoreCodelessFrameworksWorkaround {
-                                    XCTAssertEqualSequences(delta.left.sorted(), [
-                                        "Headers",
-                                        "Headers/AStaticFwk.h",
-                                    ])
+                                    XCTAssertEqualSequences(
+                                        delta.left.sorted(),
+                                        [
+                                            "Headers",
+                                            "Headers/AStaticFwk.h",
+                                        ]
+                                    )
                                 } else {
-                                    XCTAssertEqualSequences(delta.left.sorted(), [
-                                        "AStaticFwk",
-                                        "Headers",
-                                        "Headers/AStaticFwk.h",
-                                    ])
+                                    XCTAssertEqualSequences(
+                                        delta.left.sorted(),
+                                        [
+                                            "AStaticFwk",
+                                            "Headers",
+                                            "Headers/AStaticFwk.h",
+                                        ]
+                                    )
                                 }
                             }
 
@@ -3578,52 +4075,67 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
+                            "Sources",
+                            path: "Sources",
+                            children: [
                                 TestFile("App.c"),
                                 TestFile("Fwk.c"),
                                 TestFile("Info.plist"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "USE_HEADERMAP": "NO",
-                                "SKIP_INSTALL": "NO",
-                                "INFOPLIST_FILE": "Sources/Info.plist",
-
-                                // Force stripping and file attribute changes off by default.
-                                "INSTALL_OWNER": "",
-                                "INSTALL_GROUP": "",
-                                "INSTALL_MODE_FLAG": "",
-                                "STRIP_INSTALLED_PRODUCT": "NO",
-                                "SDK_STAT_CACHE_ENABLE": "NO"
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "USE_HEADERMAP": "NO",
+                                    "SKIP_INSTALL": "NO",
+                                    "INFOPLIST_FILE": "Sources/Info.plist",
+
+                                    // Force stripping and file attribute changes off by default.
+                                    "INSTALL_OWNER": "",
+                                    "INSTALL_GROUP": "",
+                                    "INSTALL_MODE_FLAG": "",
+                                    "STRIP_INSTALLED_PRODUCT": "NO",
+                                    "SDK_STAT_CACHE_ENABLE": "NO",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "App", type: .application,
+                                "App",
+                                type: .application,
                                 buildPhases: [
                                     TestSourcesBuildPhase([TestBuildFile("App.c")]),
                                     TestCopyFilesBuildPhase([TestBuildFile("Fwk.framework", codeSignOnCopy: true)], destinationSubfolder: .frameworks),
-                                ], dependencies: ["Fwk"]),
+                                ],
+                                dependencies: ["Fwk"]
+                            ),
                             TestStandardTarget(
-                                "Fwk", type: .framework,
+                                "Fwk",
+                                type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase([TestBuildFile("Fwk.c")]),
-                                ]),
-                        ])
-                ])
+                                    TestSourcesBuildPhase([TestBuildFile("Fwk.c")])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
             let signableTargets: Set<String> = ["App"]
 
             // Write the Info.plist file.
-            try await tester.fs.writePlist(SRCROOT.join("Sources/Info.plist"), .plDict([
-                "CFBundleDevelopmentRegion": .plString("en"),
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)")
-            ]))
+            try await tester.fs.writePlist(
+                SRCROOT.join("Sources/Info.plist"),
+                .plDict([
+                    "CFBundleDevelopmentRegion": .plString("en"),
+                    "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                ])
+            )
 
             // Write the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/Fwk.c")) { contents in
@@ -3637,11 +4149,14 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
             }
 
             // We enable deployment postprocessing explicitly, to check the full range of basic behaviors.
-            let parameters = BuildParameters(configuration: "Debug", overrides: [
-                "DSTROOT": tmpDirPath.join("dst").str,
-                "DEPLOYMENT_POSTPROCESSING": "YES",
-                "DEPLOYMENT_LOCATION": "YES",
-            ])
+            let parameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    "DSTROOT": tmpDirPath.join("dst").str,
+                    "DEPLOYMENT_POSTPROCESSING": "YES",
+                    "DEPLOYMENT_LOCATION": "YES",
+                ]
+            )
 
             // Check the initial build.
             let taskTypesToExclude = Set(["Gate", "MkDir", "ProcessInfoPlistFile", "RegisterExecutionPolicyException", "RegisterWithLaunchServices", "SymLink", "Touch", "WriteAuxiliaryFile", "CreateBuildDirectory", "ClangStatCache", "ProcessSDKImports"])
@@ -3754,30 +4269,38 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
-                                TestFile("App.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "Sources",
+                            path: "Sources",
+                            children: [
+                                TestFile("App.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
 
-                                // we don't actually want to change rights here, so we fake that
-                                "CHOWN": "true",
+                                    // we don't actually want to change rights here, so we fake that
+                                    "CHOWN": "true",
 
-                                "DSTROOT": tmpDirPath.join("dstroot").str,
-                            ]
-                        )],
+                                    "DSTROOT": tmpDirPath.join("dstroot").str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "App",
                                 type: .application,
                                 buildPhases: [
-                                    TestSourcesBuildPhase([TestBuildFile("App.c")]),
-                                ]),
-                        ])
-                ])
+                                    TestSourcesBuildPhase([TestBuildFile("App.c")])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             if let enableBuildSystemCaching {
                 tester.userPreferences = tester.userPreferences.with(enableBuildSystemCaching: enableBuildSystemCaching)
@@ -3822,7 +4345,6 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
         }
     }
 
-
     @Test(.requireSDKs(.macOS), .requireXcode26())
     func copySwiftLibs_preSwiftOS_macos() async throws {
         // Swift does not exist in the OS, so shouldFilterSwiftLibs is false. macOS 10.14.3 does not
@@ -3924,9 +4446,9 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     TestBuildConfiguration(
                                         "Debug",
                                         buildSettings: [
-                                            "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
+                                            "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES"
                                         ]
-                                    ),
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
@@ -3935,12 +4457,16 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     TestFrameworksBuildPhase([
                                         "Framework.framework"
                                     ]),
-                                    TestCopyFilesBuildPhase([
-                                        "Framework.framework",
-                                    ], destinationSubfolder: .frameworks, onlyForDeployment: false)
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            "Framework.framework"
+                                        ],
+                                        destinationSubfolder: .frameworks,
+                                        onlyForDeployment: false
+                                    ),
                                 ],
                                 dependencies: [
-                                    "Framework",
+                                    "Framework"
                                 ]
                             ),
                             TestStandardTarget(
@@ -3949,7 +4475,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                 buildConfigurations: [
                                     TestBuildConfiguration(
                                         "Debug"
-                                    ),
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
@@ -3958,12 +4484,16 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     TestFrameworksBuildPhase([
                                         "SubFramework.framework"
                                     ]),
-                                    TestCopyFilesBuildPhase([
-                                        "SubFramework.framework",
-                                    ], destinationSubfolder: .frameworks, onlyForDeployment: false)
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            "SubFramework.framework"
+                                        ],
+                                        destinationSubfolder: .frameworks,
+                                        onlyForDeployment: false
+                                    ),
                                 ],
                                 dependencies: [
-                                    "SubFramework",
+                                    "SubFramework"
                                 ]
                             ),
                             TestStandardTarget(
@@ -3972,7 +4502,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                 buildConfigurations: [
                                     TestBuildConfiguration(
                                         "Debug"
-                                    ),
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
@@ -3987,14 +4517,14 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     TestBuildConfiguration(
                                         "Debug",
                                         buildSettings: [
-                                            "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
+                                            "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES"
                                         ]
-                                    ),
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "AppMain.c"
-                                    ]),
+                                    ])
                                 ]
                             ),
                             TestStandardTarget(
@@ -4004,17 +4534,21 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     TestBuildConfiguration(
                                         "Debug",
                                         buildSettings: [
-                                            "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
+                                            "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES"
                                         ]
-                                    ),
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "AppMain.c"
                                     ]),
-                                    TestCopyFilesBuildPhase([
-                                        "SystemExtension.systemextension",
-                                    ], destinationSubfolder: .frameworks, onlyForDeployment: false)
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            "SystemExtension.systemextension"
+                                        ],
+                                        destinationSubfolder: .frameworks,
+                                        onlyForDeployment: false
+                                    ),
                                 ],
                                 dependencies: [
                                     "SystemExtension"
@@ -4031,7 +4565,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "SysExMain.swift"
-                                    ]),
+                                    ])
                                 ]
                             ),
                             TestStandardTarget(
@@ -4049,12 +4583,13 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "Test.swift"
-                                    ]),
+                                    ])
                                 ]
-                            )
+                            ),
                         ]
                     )
-                ])
+                ]
+            )
 
             // Create a tester for driving the build.
             let tester = try await BuildOperationTester(core, testWorkspace, simulated: false)
@@ -4101,27 +4636,30 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
             }
 
             // Write a barebones Info.plist file.
-            try await tester.fs.writePlist(testWorkspace.sourceRoot.join("TestProject/Info.plist"), .plDict([
-                "CFBundleDevelopmentRegion": .plString("en"),
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)")
-            ]))
+            try await tester.fs.writePlist(
+                testWorkspace.sourceRoot.join("TestProject/Info.plist"),
+                .plDict([
+                    "CFBundleDevelopmentRegion": .plString("en"),
+                    "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                ])
+            )
 
             // Read and return the UUIDs out of a Mach-O.  There could be more than one in case there are multiple architectures.
-            func uuids(_ p : Path) throws -> Set<UUID> {
-                return  Set(try MachO(data: tester.fs.read(p)).slices().map{ try $0.uuid()! })
+            func uuids(_ p: Path) throws -> Set<UUID> {
+                return Set(try MachO(data: tester.fs.read(p)).slices().map { try $0.uuid()! })
             }
             let toolchain = try #require(core.toolchainRegistry.defaultToolchain)
 
             // Get the UUID for the libswiftFoundation.dylib in the toolchain.
             let libSwiftFoundationName = "libswiftFoundation.dylib"
-            func libSwiftFoundationPath(_ t : Toolchain) throws -> Path {
+            func libSwiftFoundationPath(_ t: Toolchain) throws -> Path {
                 return t.path.join(Path("usr/lib/swift-5.0/macosx/\(libSwiftFoundationName)"))
             }
             let toolchainLibSwiftFoundationUUIDs = shouldFilterSwiftLibs ? [] : try uuids(libSwiftFoundationPath(toolchain))
 
             // Get the UUID for libswiftCoreLocation.dylib in the toolchain.  We'll use it later.
             let libSwiftCoreLocationName = "libswiftCoreLocation.dylib"
-            func libSwiftCoreLocationPath(_ t : Toolchain) throws -> Path {
+            func libSwiftCoreLocationPath(_ t: Toolchain) throws -> Path {
                 return t.path.join(Path("usr/lib/swift-5.0/macosx/\(libSwiftCoreLocationName)"))
             }
 
@@ -4143,8 +4681,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     do {
                         let embeddedLibUUIDs = shouldFilterSwiftLibs ? [] : try uuids(embeddedLibSwiftFoundationPath)
                         #expect(toolchainLibSwiftFoundationUUIDs == embeddedLibUUIDs)
-                    }
-                    catch {
+                    } catch {
                         Issue.record("\(error)")
                     }
                     let embeddedLibSwiftCoreLocationPath = buildDir.join(Path("App.app/Contents/Frameworks/\(libSwiftCoreLocationName)"))
@@ -4154,7 +4691,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     let swiftDepsPath = tmpDirPath.join(Path("Test/TestProject/build/TestProject.build/Debug/App.build/SwiftStdLibToolInputDependencies.dep"))
                     let dependencyInfo = try DependencyInfo(bytes: tester.fs.read(swiftDepsPath).bytes)
 
-                    let expectedDependencyInfo =  DependencyInfo(
+                    let expectedDependencyInfo = DependencyInfo(
                         version: "swift-stdlib-tool",
                         inputs: ([
                             buildDir.join("App.app/Contents/Frameworks/Framework.framework/Framework").str,
@@ -4165,7 +4702,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                             buildDir.join("Framework.framework/Framework").str,
                             buildDir.join("Framework.framework/Versions/A/Framework").str,
                             buildDir.join("Framework.framework/Versions/A/Frameworks/SubFramework.framework/SubFramework").str,
-                            buildDir.join("Framework.framework/Versions/A/Frameworks/SubFramework.framework/Versions/A/SubFramework").str
+                            buildDir.join("Framework.framework/Versions/A/Frameworks/SubFramework.framework/Versions/A/SubFramework").str,
                         ]).sorted(),
                         missing: [],
                         outputs: []
@@ -4232,7 +4769,6 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         #expect(unitTestsDependencyInfo.outputs.contains(buildDir.join("UnitTests.xctest/Contents/Frameworks/libswiftCore.dylib").str) == !shouldFilterSwiftLibs)
                         #expect(unitTestsDependencyInfo.outputs.contains(buildDir.join("UnitTests.xctest/Contents/Frameworks/libswiftFoundation.dylib").str) == !shouldFilterSwiftLibs)
 
-
                         #expect(unitTestsDependencyInfo.inputs.contains(core.developerPath.path.join("Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.5/macosx/libswift_Concurrency.dylib").str) == shouldBackDeploySwiftConcurrency)
                         #expect(unitTestsDependencyInfo.outputs.contains(buildDir.join("SwiftlessApp.app/Contents/Frameworks/libswift_Concurrency.dylib").str) == shouldBackDeploySwiftConcurrency)
 
@@ -4313,7 +4849,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                             TestAggregateTarget(
                                 "All",
                                 dependencies: [
-                                    "App",
+                                    "App"
                                 ]
                             ),
                             TestStandardTarget(
@@ -4327,7 +4863,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "FrameworkSource.swift"
-                                    ]),
+                                    ])
                                 ]
                             ),
                             TestStandardTarget(
@@ -4337,9 +4873,9 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     TestBuildConfiguration(
                                         "Debug",
                                         buildSettings: [
-                                            "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
+                                            "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES"
                                         ]
-                                    ),
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
@@ -4350,10 +4886,11 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     ]),
                                 ],
                                 dependencies: ["Framework"]
-                            )
+                            ),
                         ]
                     )
-                ])
+                ]
+            )
 
             // Create a tester for driving the build.
             let tester = try await BuildOperationTester(core, testWorkspace, simulated: false)
@@ -4383,10 +4920,13 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
             }
 
             // Write a barebones Info.plist file.
-            try await tester.fs.writePlist(testWorkspace.sourceRoot.join("TestProject/Info.plist"), .plDict([
-                "CFBundleDevelopmentRegion": .plString("en"),
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)")
-            ]))
+            try await tester.fs.writePlist(
+                testWorkspace.sourceRoot.join("TestProject/Info.plist"),
+                .plDict([
+                    "CFBundleDevelopmentRegion": .plString("en"),
+                    "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                ])
+            )
 
             try await tester.fs.writePlist(testWorkspace.sourceRoot.join("TestProject/Entitlements.plist"), .plDict([:]))
 
@@ -4441,16 +4981,20 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     TestProject(
                         projectName,
                         groupTree: TestGroup("Sources"),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "DSTROOT": dstroot
-                            ])
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "DSTROOT": dstroot
+                                ]
+                            )
                         ],
                         targets: [
                             TestExternalTarget("mock", toolPath: "echo", arguments: "TARGET = $(TARGET_NAME) $(ALL_SETTINGS)")
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             let srcroot = testWorkspace.sourceRoot.join(projectName).str
@@ -4495,36 +5039,47 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 projects: [
                     TestProject(
                         "aProject",
-                        groupTree: TestGroup("Sources", children: [
-                            TestFile("Prefix.h"),
-                            TestFile("lib.c"),
-                            TestFile("main.c")
-                        ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "GCC_PREFIX_HEADER": "Sources/Prefix.h",
-                                "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
-                                "INDEX_ENABLE_DATA_STORE": "YES",
-                                "COMPILER_INDEX_STORE_ENABLE": "YES",
-                                "CLANG_INDEX_STORE_PATH": "\(tmpDirPath.str)/something"
-                            ])
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile("Prefix.h"),
+                                TestFile("lib.c"),
+                                TestFile("main.c"),
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "GCC_PREFIX_HEADER": "Sources/Prefix.h",
+                                    "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
+                                    "INDEX_ENABLE_DATA_STORE": "YES",
+                                    "COMPILER_INDEX_STORE_ENABLE": "YES",
+                                    "CLANG_INDEX_STORE_PATH": "\(tmpDirPath.str)/something",
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
-                                "Tool", type: .staticLibrary,
+                                "Tool",
+                                type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["main.c"]),
+                                    TestSourcesBuildPhase(["main.c"])
                                 ],
-                                dependencies: ["Library"]),
+                                dependencies: ["Library"]
+                            ),
                             TestStandardTarget(
-                                "Library", type: .staticLibrary,
+                                "Library",
+                                type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["lib.c"]),
-                                ]),
-                        ])
-                ])
+                                    TestSourcesBuildPhase(["lib.c"])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Sources/Prefix.h")) { stream in
@@ -4591,7 +5146,6 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
         }
     }
 
-
     /// Check that we don't have an explicit dependency on build-context dependent headermap or VFS contents.
     ///
     /// While this is a build consistency problem, in practice having this dependency leads to rebuilds on situations which are very important (such as switching schemes in Xcode).
@@ -4599,38 +5153,54 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
     func buildContextDependentHeadermapNonDependency() async throws {
         try await withTemporaryDirectory { tmpDirPath async throws -> Void in
             let mainTarget = TestStandardTarget(
-                "MainTarget", type: .framework,
+                "MainTarget",
+                type: .framework,
                 buildConfigurations: [TestBuildConfiguration("Debug")],
                 buildPhases: [
-                    TestSourcesBuildPhase(["MainTarget.c"]),
-                ])
+                    TestSourcesBuildPhase(["MainTarget.c"])
+                ]
+            )
             let otherTarget = TestStandardTarget(
-                "OtherTarget", type: .framework,
-                buildConfigurations: [TestBuildConfiguration(
-                    "Debug")],
+                "OtherTarget",
+                type: .framework,
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug"
+                    )
+                ],
                 buildPhases: [
                     TestSourcesBuildPhase(["OtherTarget.c"]),
-                    TestHeadersBuildPhase(["OtherTarget.h"])
-                ])
+                    TestHeadersBuildPhase(["OtherTarget.h"]),
+                ]
+            )
             let testWorkspace = TestWorkspace(
                 "Test",
                 sourceRoot: tmpDirPath.join("Test"),
                 projects: [
                     TestProject(
                         "aProject",
-                        groupTree: TestGroup("Sources", children: [
-                            TestFile("MainTarget.c"),
-                            TestFile("OtherTarget.c"),
-                            TestFile("OtherTarget.h")]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "USE_HEADERMAP": "YES",
-                                "CLANG_ENABLE_MODULES": "YES",
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile("MainTarget.c"),
+                                TestFile("OtherTarget.c"),
+                                TestFile("OtherTarget.h"),
                             ]
-                        )],
-                        targets: [mainTarget, otherTarget])])
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "USE_HEADERMAP": "YES",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                ]
+                            )
+                        ],
+                        targets: [mainTarget, otherTarget]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Write the test files.
@@ -4694,18 +5264,25 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     TestProject(
                         "aProject",
                         groupTree: TestGroup("Sources"),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CODE_SIGN_IDENTITY": "-",
-                            ]
-                        )],
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CODE_SIGN_IDENTITY": "-",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Tool", type: .commandLineTool,
-                                buildPhases: [
-                                ])])])
+                                "Tool",
+                                type: .commandLineTool,
+                                buildPhases: []
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             let parameters = BuildParameters(action: .build, configuration: "Debug")
@@ -4728,25 +5305,33 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     TestProject(
                         "aProject",
                         groupTree: TestGroup("Sources", children: [TestFile("main.c")]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "EXECUTABLE_EXTENSION": "dylib",
-                                "EXECUTABLE_PREFIX": "lib",
-                                "CODE_SIGN_IDENTITY": "-",
-                                "CODE_SIGNING_ALLOWED": "YES",
-                                "LD_DYLIB_INSTALL_NAME": "@rpath/libTool.dylib",
-                                "MACH_O_TYPE": "mh_dylib",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SUPPORTS_TEXT_BASED_API": "YES",
-                            ]
-                        )],
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "EXECUTABLE_EXTENSION": "dylib",
+                                    "EXECUTABLE_PREFIX": "lib",
+                                    "CODE_SIGN_IDENTITY": "-",
+                                    "CODE_SIGNING_ALLOWED": "YES",
+                                    "LD_DYLIB_INSTALL_NAME": "@rpath/libTool.dylib",
+                                    "MACH_O_TYPE": "mh_dylib",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SUPPORTS_TEXT_BASED_API": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Tool", type: .staticLibrary,
+                                "Tool",
+                                type: .staticLibrary,
                                 buildPhases: [
                                     TestSourcesBuildPhase(["main.c"])
-                                ])])])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/main.c"), body: { $0 <<< "" })
@@ -4773,29 +5358,32 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                             "SomeFiles",
                             children: [
                                 // App sources
-                                TestFile("main.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "INFOPLIST_FILE": "Info.plist",
-                                "CODE_SIGN_IDENTITY": "-",
-                                "SDKROOT": "macosx"
+                                TestFile("main.c")
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "INFOPLIST_FILE": "Info.plist",
+                                    "CODE_SIGN_IDENTITY": "-",
+                                    "SDKROOT": "macosx",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "App",
                                 type: .application,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "main.c",
-                                    ]),
-                                    TestFrameworksBuildPhase([
+                                        "main.c"
                                     ]),
+                                    TestFrameworksBuildPhase([]),
                                 ]
-                            )]
+                            )
+                        ]
                     )
                 ]
             )
@@ -4851,33 +5439,43 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("yacc.ym"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)"])],
+                                TestFile("yacc.ym")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)"
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Tool", type: .staticLibrary,
+                                "Tool",
+                                type: .staticLibrary,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "yacc.ym",
-                                    ])])])
-                ])
+                                        "yacc.ym"
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Write the file data.
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/yacc.ym")) { stream in
-                stream <<<
-                """
-                %{
-                int yylex(void);
-                void yyerror(const char *s);
-                %}
-                %%
-                null : ;
-                """
+                stream <<< """
+                    %{
+                    int yylex(void);
+                    void yyerror(const char *s);
+                    %}
+                    %%
+                    null : ;
+                    """
             }
 
             // Perform the initial for-launch build.
@@ -4918,14 +5516,16 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                 TestFile("file2.swift"),
                                 TestFile("file3.swift"),
                                 TestFile("file4.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "SWIFT_VERSION": swiftVersion,
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -4937,10 +5537,13 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                         "file2.swift",
                                         "file3.swift",
                                         "file4.swift",
-                                    ]),
-                                ]),
-                        ])
-                ])
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
@@ -4970,9 +5573,12 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
             }
 
             // We expect there will be only one subtask reported for the entire module when using WMO.
-            let parameters = BuildParameters(configuration: "Debug", overrides: [
-                "SWIFT_WHOLE_MODULE_OPTIMIZATION": "true",
-            ])
+            let parameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    "SWIFT_WHOLE_MODULE_OPTIMIZATION": "true"
+                ]
+            )
             try await tester.checkBuild(parameters: parameters, runDestination: .macOS, persistent: true) { results in
                 // Integrated Swift driver doesn't record jobs as subtasks.
                 results.check(notContains: .subtaskDidReportProgress(.scanning, count: 1))
@@ -4996,8 +5602,9 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                             "Sources",
                             path: "Sources",
                             children: [
-                                TestFile("file.swift"),
-                            ]),
+                                TestFile("file.swift")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -5005,7 +5612,8 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "SWIFT_VERSION": swiftVersion,
                                     "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -5014,10 +5622,13 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "file.swift"
-                                    ]),
-                                ]),
-                        ])
-                ])
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             // Ensure build system caching is enabled.
@@ -5067,8 +5678,10 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 }.max()
             }
 
-            #expect(try #require(build2HighestMaxTaskCount) <= #require(build1HighestMaxTaskCount),
-                          "Using a cached build system, the second build reported a higher max task count (\(String(describing: build2HighestMaxTaskCount))) compared to the initial failing build (\(String(describing: build1HighestMaxTaskCount)))!")
+            #expect(
+                try #require(build2HighestMaxTaskCount) <= #require(build1HighestMaxTaskCount),
+                "Using a cached build system, the second build reported a higher max task count (\(String(describing: build2HighestMaxTaskCount))) compared to the initial failing build (\(String(describing: build1HighestMaxTaskCount)))!"
+            )
         }
     }
     /// Check that TBD files can be generated and signed, end-to-end, for both Objective-C and Swift.
@@ -5076,35 +5689,47 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
         try await withTemporaryDirectory { (tmpDirPath: Path) async throws -> Void in
             let useFramework = productType == .framework || productType == .staticFramework
             let target = try await TestStandardTarget(
-                "Core", type: productType,
-                buildConfigurations: [TestBuildConfiguration(
-                    "Debug",
-                    buildSettings: [
-                        "INFOPLIST_FILE": useFramework ? "Info.plist" : "",
-                        "SUPPORTS_TEXT_BASED_API": useStubify ? "NO" : "YES",
-                        "GENERATE_TEXT_BASED_STUBS": useStubify ? "YES" : "NO",
-                        "CODE_SIGN_IDENTITY": "-",
-                        "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
-                        "TAPI_EXEC": tapiToolPath.str,
-                        "BUILD_VARIANTS": buildVariants.joined(separator: " "),
-                    ])],
+                "Core",
+                type: productType,
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "INFOPLIST_FILE": useFramework ? "Info.plist" : "",
+                            "SUPPORTS_TEXT_BASED_API": useStubify ? "NO" : "YES",
+                            "GENERATE_TEXT_BASED_STUBS": useStubify ? "YES" : "NO",
+                            "CODE_SIGN_IDENTITY": "-",
+                            "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
+                            "TAPI_EXEC": tapiToolPath.str,
+                            "BUILD_VARIANTS": buildVariants.joined(separator: " "),
+                        ]
+                    )
+                ],
                 buildPhases: [
                     TestSourcesBuildPhase(["Core.c"]),
-                    TestHeadersBuildPhase([.init("Core.h", headerVisibility: .public)])
-                ])
+                    TestHeadersBuildPhase([.init("Core.h", headerVisibility: .public)]),
+                ]
+            )
             let testProject = TestProject(
                 "aProject",
-                groupTree: TestGroup("Sources", children: [
-                    TestFile("Core.c"),
-                    TestFile("Core.h")]),
-                buildConfigurations: [TestBuildConfiguration(
-                    "Debug",
-                    buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "CLANG_ENABLE_MODULES": "YES",
+                groupTree: TestGroup(
+                    "Sources",
+                    children: [
+                        TestFile("Core.c"),
+                        TestFile("Core.h"),
                     ]
-                )],
-                targets: [target])
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "CLANG_ENABLE_MODULES": "YES",
+                        ]
+                    )
+                ],
+                targets: [target]
+            )
             let testWorkspace = TestWorkspace("Test", sourceRoot: tmpDirPath.join("Test"), projects: [testProject])
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -5235,30 +5860,42 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
     func incrementalFwkTAPI() async throws {
         try await withTemporaryDirectory { tmpDirPath async throws -> Void in
             let target = TestStandardTarget(
-                "Core", type: .framework,
-                buildConfigurations: [TestBuildConfiguration(
-                    "Debug",
-                    buildSettings: [
-                        "DEFINES_MODULE": "YES",
-                        "SUPPORTS_TEXT_BASED_API": "YES",
-                    ])],
+                "Core",
+                type: .framework,
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "DEFINES_MODULE": "YES",
+                            "SUPPORTS_TEXT_BASED_API": "YES",
+                        ]
+                    )
+                ],
                 buildPhases: [
                     TestSourcesBuildPhase(["Core.c"]),
                     TestHeadersBuildPhase([TestBuildFile("Core.h", headerVisibility: .public)]),
-                ])
+                ]
+            )
             let testProject = TestProject(
                 "aProject",
-                groupTree: TestGroup("Sources", children: [
-                    TestFile("Core.c"),
-                    TestFile("Core.h")]),
-                buildConfigurations: [TestBuildConfiguration(
-                    "Debug",
-                    buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "CLANG_ENABLE_MODULES": "YES",
+                groupTree: TestGroup(
+                    "Sources",
+                    children: [
+                        TestFile("Core.c"),
+                        TestFile("Core.h"),
                     ]
-                )],
-                targets: [target])
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "CLANG_ENABLE_MODULES": "YES",
+                        ]
+                    )
+                ],
+                targets: [target]
+            )
             let testWorkspace = TestWorkspace("Test", sourceRoot: tmpDirPath.join("Test"), projects: [testProject])
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -5298,22 +5935,36 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 projects: [
                     TestProject(
                         "aProject",
-                        groupTree: TestGroup("Sources", children: [
-                            TestFile("File.c"),
-                            TestFile("File.swift"),
-                            TestFile("File.m"),
-                        ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)",
-                                            "SWIFT_VERSION": swiftVersion])],
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile("File.c"),
+                                TestFile("File.swift"),
+                                TestFile("File.m"),
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "aFramework", type: .framework,
+                                "aFramework",
+                                type: .framework,
                                 buildConfigurations: [TestBuildConfiguration("Debug")],
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["File.c", "File.swift", "File.m"]),
-                                ])])])
+                                    TestSourcesBuildPhase(["File.c", "File.swift", "File.m"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Create the input files.
@@ -5322,7 +5973,6 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
             let objcFile = testWorkspace.sourceRoot.join("aProject/File.m")
             try await tester.fs.writeFileContents(objcFile) { stream in }
 
-
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
                 for ruleType in ["SwiftDriver Compilation Requirements", "SwiftDriver Compilation"] {
                     results.checkError("Build input file cannot be found: \'\(tmpDirPath.str)/Test/aProject/File.swift\'. Did you forget to declare this file as an output of a script phase or custom build rule which produces it? (for task: [\"\(ruleType)\", \"aFramework\", \"normal\", \"\(results.runDestinationTargetArchitecture)\", \"com.apple.xcode.tools.swift.compiler\"])")
@@ -5353,24 +6003,28 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     children: [
                         TestFile("shared.c"),
                         TestFile("main.c"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "DEBUG_INFORMATION_FORMAT": "dwarf",
-                        "CODE_SIGNING_ALLOWED": "NO",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "DSTROOT": "$(SRCROOT)/installable",
-                        // Disable the SetOwnerAndGroup action by setting them to empty values.
-                        "INSTALL_GROUP": "",
-                        "INSTALL_OWNER": "",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "DEBUG_INFORMATION_FORMAT": "dwarf",
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "DSTROOT": "$(SRCROOT)/installable",
+                            // Disable the SetOwnerAndGroup action by setting them to empty values.
+                            "INSTALL_GROUP": "",
+                            "INSTALL_OWNER": "",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Tool",
                         type: .commandLineTool,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug"),
+                            TestBuildConfiguration("Debug")
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["main.c"]),
@@ -5382,13 +6036,14 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         "Shared",
                         type: .staticLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug"),
+                            TestBuildConfiguration("Debug")
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["shared.c"]),
+                            TestSourcesBuildPhase(["shared.c"])
                         ]
                     ),
-                ])
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             let mainFile = SRCROOT.join("main.c")
@@ -5431,12 +6086,17 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     "SomeFiles",
                     children: [
                         TestFile("myext.xcappextensionpoints")
-                    ]),
-                buildConfigurations: [TestBuildConfiguration(
-                    "Debug",
-                    buildSettings: [
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)"])],
+                    ]
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                        ]
+                    )
+                ],
                 targets: [
                     TestStandardTarget(
                         "Foo",
@@ -5444,9 +6104,10 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         buildConfigurations: [TestBuildConfiguration("Debug")],
                         buildPhases: [
                             TestResourcesBuildPhase([
-                                "myext.xcappextensionpoints",
+                                "myext.xcappextensionpoints"
                             ])
-                        ]),
+                        ]
+                    )
                 ]
             )
 
@@ -5497,21 +6158,26 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                 TestFile("lex.l"),
                                 TestFile("mig.defs"),
                                 TestFile("yacc.y"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "ARCHS": "x86_64 x86_64h",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "BUILD_VARIANTS": "normal debug profile",
-                                "VALID_ARCHS": "$(inherited) x86_64h",
-                                "CLANG_WARN_IMPLICIT_FALLTHROUGH": "NO",
-                                "SDK_STAT_CACHE_ENABLE": "NO",
-                                "CLANG_USE_RESPONSE_FILE": "NO",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "ARCHS": "x86_64 x86_64h",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "BUILD_VARIANTS": "normal debug profile",
+                                    "VALID_ARCHS": "$(inherited) x86_64h",
+                                    "CLANG_WARN_IMPLICIT_FALLTHROUGH": "NO",
+                                    "SDK_STAT_CACHE_ENABLE": "NO",
+                                    "CLANG_USE_RESPONSE_FILE": "NO",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Tool", type: .staticLibrary,
+                                "Tool",
+                                type: .staticLibrary,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "dtrace.d",
@@ -5519,8 +6185,13 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                         "lex.l",
                                         "mig.defs",
                                         "yacc.y",
-                                    ])])])
-                ])
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(core, testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.str
             let buildDirectory = testWorkspace.sourceRoot.str
@@ -5542,17 +6213,16 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/yacc.y")) { stream in
-                stream <<<
-                """
-                %{
-                static int yylex() { return 0; }
-                static int yyerror(const char *format) { return 0; }
-                %}
-                %%
-                list:
-                ;
-                %%
-                """
+                stream <<< """
+                    %{
+                    static int yylex() { return 0; }
+                    static int yyerror(const char *format) { return 0; }
+                    %}
+                    %%
+                    list:
+                    ;
+                    %%
+                    """
             }
 
             let iigPath = try await self.iigPath
@@ -5627,20 +6297,30 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         "aProject",
                         groupTree: TestGroup(
                             "Sources",
-                            children: [TestFile("main.c")]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "ARCHS": "",
-                                "VALID_ARCHS": "none",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])],
+                            children: [TestFile("main.c")]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "ARCHS": "",
+                                    "VALID_ARCHS": "none",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Tool", type: .staticLibrary,
+                                "Tool",
+                                type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["main.c"])])])
-                ])
+                                    TestSourcesBuildPhase(["main.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             // Disable the memory cache by setting its limit to zero, to make sure we're actually going to reload the build description from disk.
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, buildDescriptionMaxCacheSize: (0, 1))
@@ -5673,13 +6353,17 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                 TestFile("tool.c"),
                                 TestFile("lib.c"),
                                 TestFile("deeplib.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "CODE_SIGNING_ALLOWED": "NO",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Tool",
@@ -5688,7 +6372,8 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     TestSourcesBuildPhase(["tool.c"]),
                                     TestFrameworksBuildPhase(["libLib.a"]),
                                 ],
-                                dependencies: ["Lib"]),
+                                dependencies: ["Lib"]
+                            ),
                             TestStandardTarget(
                                 "Lib",
                                 type: .staticLibrary,
@@ -5696,14 +6381,19 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     TestSourcesBuildPhase(["lib.c"]),
                                     TestFrameworksBuildPhase(["libDeepLib.a"]),
                                 ],
-                                dependencies: ["DeepLib"]),
+                                dependencies: ["DeepLib"]
+                            ),
                             TestStandardTarget(
                                 "DeepLib",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["deeplib.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["deeplib.c"])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -5742,13 +6432,19 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
 
                 // Verify that the dependency info indeed has the libraries we expected.
                 let actual = try DependencyInfo(bytes: try tester.fs.read(Path("\(buildDirectory)/aProject.build/Debug/Lib.build/Objects-normal/\(results.runDestinationTargetArchitecture)/Lib_libtool_dependency_info.dat")).bytes)
-                #expect(actual.inputs.sorted() == [
-                    "\(buildDirectory)/aProject.build/Debug/Lib.build/Objects-normal/\(results.runDestinationTargetArchitecture)/lib.o",
-                    "\(buildDirectory)/Debug/libDeepLib.a"
-                ].sorted())
-                #expect(actual.outputs.sorted() == [
-                    "\(buildDirectory)/Debug/libLib.a"
-                ].sorted())
+                #expect(
+                    actual.inputs.sorted()
+                        == [
+                            "\(buildDirectory)/aProject.build/Debug/Lib.build/Objects-normal/\(results.runDestinationTargetArchitecture)/lib.o",
+                            "\(buildDirectory)/Debug/libDeepLib.a",
+                        ].sorted()
+                )
+                #expect(
+                    actual.outputs.sorted()
+                        == [
+                            "\(buildDirectory)/Debug/libLib.a"
+                        ].sorted()
+                )
             }
 
             // Validate a null build.
@@ -5796,15 +6492,19 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                 TestFile("tool.c"),
                                 TestFile("lib.c"),
                                 TestFile("deeplib.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "CODE_SIGNING_ALLOWED": "NO",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "INSTALL_OWNER": "",
-                                "INSTALL_GROUP": GetCurrentUserGroupName()!,
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "INSTALL_OWNER": "",
+                                    "INSTALL_GROUP": GetCurrentUserGroupName()!,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Tool",
@@ -5814,7 +6514,8 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     TestSourcesBuildPhase(["tool.c"]),
                                     TestFrameworksBuildPhase(["libLib.a"]),
                                 ],
-                                dependencies: ["Lib"]),
+                                dependencies: ["Lib"]
+                            ),
                             TestStandardTarget(
                                 "Lib",
                                 type: .staticLibrary,
@@ -5823,15 +6524,20 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     TestSourcesBuildPhase(["lib.c"]),
                                     TestFrameworksBuildPhase(["libDeepLib.a"]),
                                 ],
-                                dependencies: ["DeepLib"]),
+                                dependencies: ["DeepLib"]
+                            ),
                             TestStandardTarget(
                                 "DeepLib",
                                 type: .staticLibrary,
                                 buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SKIP_INSTALL": "YES"])],
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["deeplib.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["deeplib.c"])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -5873,14 +6579,20 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
 
                 // Verify that the dependency info indeed has the libraries we expected.
                 let actual = try DependencyInfo(bytes: try tester.fs.read(Path("\(buildDirectory)/aProject.build/Debug/Lib.build/Objects-normal/\(results.runDestinationTargetArchitecture)/Lib_libtool_dependency_info.dat")).bytes)
-                #expect(actual.inputs.sorted() == [
-                    "\(buildDirectory)/aProject.build/Debug/Lib.build/Objects-normal/\(results.runDestinationTargetArchitecture)/lib.o",
-                    "\(buildDirectory)/UninstalledProducts/macosx/libDeepLib.a",
-                    "\(buildDirectory)/Debug/libDeepLib.a",
-                ].sorted())
-                #expect(actual.outputs.sorted() == [
-                    "\(buildDirectory)/UninstalledProducts/macosx/libLib.a"
-                ].sorted())
+                #expect(
+                    actual.inputs.sorted()
+                        == [
+                            "\(buildDirectory)/aProject.build/Debug/Lib.build/Objects-normal/\(results.runDestinationTargetArchitecture)/lib.o",
+                            "\(buildDirectory)/UninstalledProducts/macosx/libDeepLib.a",
+                            "\(buildDirectory)/Debug/libDeepLib.a",
+                        ].sorted()
+                )
+                #expect(
+                    actual.outputs.sorted()
+                        == [
+                            "\(buildDirectory)/UninstalledProducts/macosx/libLib.a"
+                        ].sorted()
+                )
             }
 
             // Validate a null build.
@@ -5924,19 +6636,29 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         "aProject",
                         groupTree: TestGroup(
                             "Sources",
-                            children: [TestFile("main.c")]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "BUILD_DESCRIPTION_CACHE_DIR": "\(tmpDirPath.str)/cache"
-                            ])],
+                            children: [TestFile("main.c")]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "BUILD_DESCRIPTION_CACHE_DIR": "\(tmpDirPath.str)/cache",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Tool", type: .staticLibrary,
+                                "Tool",
+                                type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["main.c"])])])
-                ])
+                                    TestSourcesBuildPhase(["main.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -5964,33 +6686,51 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                             children: [
                                 TestFile("tool1.c"),
                                 TestFile("tool2.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)"
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Tool1", type: .staticLibrary,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "BUILD_DESCRIPTION_CACHE_DIR": "\(tmpDirPath.str)/tool1_ignored",
-                                    ])],
+                                "Tool1",
+                                type: .staticLibrary,
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "BUILD_DESCRIPTION_CACHE_DIR": "\(tmpDirPath.str)/tool1_ignored"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["tool1.c"])]),
+                                    TestSourcesBuildPhase(["tool1.c"])
+                                ]
+                            ),
                             TestStandardTarget(
-                                "Tool2", type: .staticLibrary,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "BUILD_DESCRIPTION_CACHE_DIR": "\(tmpDirPath.str)/tool2_ignored",
-                                    ])],
+                                "Tool2",
+                                type: .staticLibrary,
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "BUILD_DESCRIPTION_CACHE_DIR": "\(tmpDirPath.str)/tool2_ignored"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["tool2.c"])])
-                        ])
-                ])
+                                    TestSourcesBuildPhase(["tool2.c"])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -6005,9 +6745,12 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 #expect("\(tmpDirPath.str)/Test/aProject/build/XCBuildData" == results.buildDescription.dir.str)
             }
 
-            let parameters = BuildParameters(configuration: "Debug", overrides: [
-                "BUILD_DESCRIPTION_CACHE_DIR": "\(tmpDirPath.str)/cache",
-            ])
+            let parameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    "BUILD_DESCRIPTION_CACHE_DIR": "\(tmpDirPath.str)/cache"
+                ]
+            )
             try await tester.checkBuild(parameters: parameters, runDestination: .macOS) { results in
                 #expect("\(tmpDirPath.str)/cache/XCBuildData" == results.buildDescription.dir.str)
             }
@@ -6024,25 +6767,39 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 projects: [
                     TestProject(
                         "aProject",
-                        groupTree: TestGroup("Sources", children: [
-                            TestFile("SwiftFile.swift"),
-                            TestFile("Metal.metal"),
-                        ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)",
-                                            "CODE_SIGN_IDENTITY": "-",
-                                            "INFOPLIST_FILE": "Info.plist",
-                                            "CODESIGN": "/usr/bin/true",
-                                            "TOOLCHAINS": core.environment["TOOLCHAINS"] ?? "$(inherited)",
-                                            "SWIFT_VERSION": swiftVersion])],
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile("SwiftFile.swift"),
+                                TestFile("Metal.metal"),
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CODE_SIGN_IDENTITY": "-",
+                                    "INFOPLIST_FILE": "Info.plist",
+                                    "CODESIGN": "/usr/bin/true",
+                                    "TOOLCHAINS": core.environment["TOOLCHAINS"] ?? "$(inherited)",
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "aFramework", type: .framework,
+                                "aFramework",
+                                type: .framework,
                                 buildConfigurations: [TestBuildConfiguration("Debug")],
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["SwiftFile.swift", "Metal.metal"]),
-                                ])])])
+                                    TestSourcesBuildPhase(["SwiftFile.swift", "Metal.metal"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(core, testWorkspace, simulated: false, fileSystem: localFS)
             let signableTargets: Set<String> = ["aFramework"]
 
@@ -6097,30 +6854,43 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 "Test",
                 sourceRoot: tmpDir.join("Test"),
                 projects: [
-                    TestProject("aProject",
-                                groupTree: TestGroup("Sources",
-                                                     children: [TestFile("main.swift")]),
-                                buildConfigurations: [TestBuildConfiguration("Debug",
-                                                                             buildSettings: [
-                                                                                "CODE_SIGNING_ALLOWED": "NO",
-                                                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                                                "SWIFT_VERSION": swiftVersion,
-                                                                                "LD_DEPENDENCY_INFO_FILE": tmpDir.join("foo/bar/baz").str
-                                                                             ])],
-                                targets: [TestStandardTarget("Tool", type: .commandLineTool,
-                                                             buildConfigurations: [TestBuildConfiguration("Debug")],
-                                                             buildPhases: [TestSourcesBuildPhase(["main.swift"])])])
-                ])
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [TestFile("main.swift")]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "LD_DEPENDENCY_INFO_FILE": tmpDir.join("foo/bar/baz").str,
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "Tool",
+                                type: .commandLineTool,
+                                buildConfigurations: [TestBuildConfiguration("Debug")],
+                                buildPhases: [TestSourcesBuildPhase(["main.swift"])]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, fileSystem: localFS)
 
             // create the files
             let projectDir = testWorkspace.sourceRoot.join("aProject")
             try await tester.fs.writeFileContents(projectDir.join("main.swift")) { stream in
-                stream <<<
-                """
-                struct Foo { }
-                """
+                stream <<< """
+                    struct Foo { }
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS) { results in
@@ -6158,19 +6928,23 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                 // For Script Phase: Run Me (FileLists)
                                 TestFile("in3.xcfilelist"),
                                 TestFile("out3.xcfilelist"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CODE_SIGN_IDENTITY": "-",
-                                "INFOPLIST_FILE": "Info.plist",
-                                "CODESIGN": "/usr/bin/true",
-
-                                // NOTE: THIS IS THE IMPORTANT SETTING! Ensure that opt-in is on, regardless of the default value.
-                                "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING": "YES",
-                                "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING_FOR_SCRIPT_OUTPUTS": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CODE_SIGN_IDENTITY": "-",
+                                    "INFOPLIST_FILE": "Info.plist",
+                                    "CODESIGN": "/usr/bin/true",
+
+                                    // NOTE: THIS IS THE IMPORTANT SETTING! Ensure that opt-in is on, regardless of the default value.
+                                    "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING": "YES",
+                                    "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING_FOR_SCRIPT_OUTPUTS": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Tool",
@@ -6184,7 +6958,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     TestShellScriptBuildPhase(name: "Run Me (Outputs)", shellPath: "/bin/bash", originalObjectID: "RunMe2", contents: #"cat "${SCRIPT_INPUT_FILE_0}" > "${SCRIPT_OUTPUT_FILE_0}""#, inputs: ["$(SRCROOT)/input2.txt"], outputs: ["$(TARGET_BUILD_DIR)/Tool.app/Contents/Resources/out2.txt"]),
                                     TestShellScriptBuildPhase(name: "Run Me (FileList)", shellPath: "/bin/bash", originalObjectID: "RunMe3", contents: #"cat "${SCRIPT_INPUT_FILE_LIST_0}" | xargs cat > "$TARGET_BUILD_DIR/Tool.app/Contents/Resources/out3.txt""#, inputs: [], inputFileLists: ["$(SRCROOT)/in3.xcfilelist"], outputs: [], outputFileLists: ["$(SRCROOT)/out3.xcfilelist"]),
                                     TestCopyFilesBuildPhase([TestBuildFile("Other.framework", codeSignOnCopy: true)], destinationSubfolder: .plugins, onlyForDeployment: false),
-                                    TestShellScriptBuildPhase(name: "Cycle Creator", shellPath: "/bin/bash", originalObjectID: "CycleMe", contents: "mkdir -p $BUILT_PRODUCTS_DIR/Tool.app/Contents/TestDir", inputs: [], outputs: ["$(BUILT_PRODUCTS_DIR)/Tool.app/Contents/TestDir"])
+                                    TestShellScriptBuildPhase(name: "Cycle Creator", shellPath: "/bin/bash", originalObjectID: "CycleMe", contents: "mkdir -p $BUILT_PRODUCTS_DIR/Tool.app/Contents/TestDir", inputs: [], outputs: ["$(BUILT_PRODUCTS_DIR)/Tool.app/Contents/TestDir"]),
                                 ],
                                 dependencies: ["Other"]
                             ),
@@ -6195,7 +6969,10 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     TestSourcesBuildPhase(["other.c"])
                                 ]
                             ),
-                        ])])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -6400,22 +7177,26 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                 // For Script Phase: Run Me (FileLists)
                                 TestFile("in3.xcfilelist"),
                                 TestFile("out3.xcfilelist"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "ARCHS[sdk=iphoneos*]": "arm64",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CODE_SIGN_IDENTITY": "Apple Developer",
-                                "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
-                                "CODESIGN": "/usr/bin/true",   // Codesign will otherwise fail; the only important part is that the task is run.
-                                "INFOPLIST_FILE": "Info.plist",
-                                "SDKROOT": "iphoneos",
-
-                                // NOTE: THIS IS THE IMPORTANT SETTING! Ensure that opt-in is on, regardless of the default value.
-                                "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING": "YES",
-                                "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING_FOR_SCRIPT_OUTPUTS": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "ARCHS[sdk=iphoneos*]": "arm64",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CODE_SIGN_IDENTITY": "Apple Developer",
+                                    "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
+                                    "CODESIGN": "/usr/bin/true",  // Codesign will otherwise fail; the only important part is that the task is run.
+                                    "INFOPLIST_FILE": "Info.plist",
+                                    "SDKROOT": "iphoneos",
+
+                                    // NOTE: THIS IS THE IMPORTANT SETTING! Ensure that opt-in is on, regardless of the default value.
+                                    "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING": "YES",
+                                    "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING_FOR_SCRIPT_OUTPUTS": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Tool",
@@ -6428,8 +7209,12 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     TestShellScriptBuildPhase(name: "Run Me", shellPath: "/bin/bash", originalObjectID: "RunMe1", contents: #"cat "${SCRIPT_INPUT_FILE_0}" > "${SCRIPT_OUTPUT_FILE_0}""#, inputs: ["$(SRCROOT)/input1.txt"], outputs: ["$(DERIVED_FILE_DIR)/out1"]),
                                     TestShellScriptBuildPhase(name: "Run Me (Outputs)", shellPath: "/bin/bash", originalObjectID: "RunMe2", contents: #"cat "${SCRIPT_INPUT_FILE_0}" > "${SCRIPT_OUTPUT_FILE_0}""#, inputs: ["$(SRCROOT)/input2.txt"], outputs: ["$(TARGET_BUILD_DIR)/Tool.app/out2.txt"]),
                                     TestShellScriptBuildPhase(name: "Run Me (FileList)", shellPath: "/bin/bash", originalObjectID: "RunMe3", contents: #"cat "${SCRIPT_INPUT_FILE_LIST_0}" | xargs cat > "$TARGET_BUILD_DIR/Tool.app/out3.txt""#, inputs: [], inputFileLists: ["$(SRCROOT)/in3.xcfilelist"], outputs: [], outputFileLists: ["$(SRCROOT)/out3.xcfilelist"]),
-                                ]),
-                        ])])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -6477,7 +7262,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
             let excludedTasks: Set<String> = ["CreateBuildDirectory", "MkDir", "WriteAuxiliaryFile", "ProcessInfoPlistFile", "Validate", "RegisterWithLaunchServices", "Touch", "Gate", "RegisterExecutionPolicyException", "ClangStatCache", "ProcessSDKImports"]
 
             let provisioningInputs = [
-                "Tool": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing"),
+                "Tool": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing")
             ]
 
             try await tester.checkBuild(runDestination: .iOS, persistent: true, signableTargets: Set(provisioningInputs.keys), signableTargetInputs: provisioningInputs) { results in
@@ -6609,25 +7394,31 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                 TestFile("in3.xcfilelist"),
                                 TestFile("out3.xcfilelist"),
                                 TestFile("out3_no.xcfilelist"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CODE_SIGN_IDENTITY": "-",
-                                "INFOPLIST_FILE": "Info.plist",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CODE_SIGN_IDENTITY": "-",
+                                    "INFOPLIST_FILE": "Info.plist",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget("All", dependencies: ["Tool", "NoTool"]),
                             TestStandardTarget(
                                 "Tool",
                                 type: .application,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug",
-                                                           buildSettings: [
-                                                            "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING": "YES",
-                                                            "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING_FOR_SCRIPT_OUTPUTS": "YES",
-                                                           ])
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING": "YES",
+                                            "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING_FOR_SCRIPT_OUTPUTS": "YES",
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["tool.c"]),
@@ -6637,15 +7428,18 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     TestShellScriptBuildPhase(name: "Run Me", shellPath: "/bin/bash", originalObjectID: "RunMe1", contents: #"cat "${SCRIPT_INPUT_FILE_0}" > "${SCRIPT_OUTPUT_FILE_0}""#, inputs: ["$(SRCROOT)/input1.txt"], outputs: ["$(DERIVED_FILE_DIR)/out1"]),
                                     TestShellScriptBuildPhase(name: "Run Me (Outputs)", shellPath: "/bin/bash", originalObjectID: "RunMe2", contents: #"cat "${SCRIPT_INPUT_FILE_0}" > "${SCRIPT_OUTPUT_FILE_0}""#, inputs: ["$(SRCROOT)/input2.txt"], outputs: ["$(TARGET_BUILD_DIR)/Tool.app/Contents/Resources/out2.txt"]),
                                     TestShellScriptBuildPhase(name: "Run Me (FileList)", shellPath: "/bin/bash", originalObjectID: "RunMe3", contents: #"cat "${SCRIPT_INPUT_FILE_LIST_0}" | xargs cat > "$TARGET_BUILD_DIR/Tool.app/Contents/Resources/out3.txt""#, inputs: [], inputFileLists: ["$(SRCROOT)/in3.xcfilelist"], outputs: [], outputFileLists: ["$(SRCROOT)/out3.xcfilelist"]),
-                                ]),
+                                ]
+                            ),
                             TestStandardTarget(
                                 "NoTool",
                                 type: .application,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug",
-                                                           buildSettings: [
-                                                            "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING": "NO",
-                                                           ])
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING": "NO"
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["tool.c"]),
@@ -6655,8 +7449,12 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     TestShellScriptBuildPhase(name: "Run Me", shellPath: "/bin/bash", originalObjectID: "RunMe1", contents: #"cat "${SCRIPT_INPUT_FILE_0}" > "${SCRIPT_OUTPUT_FILE_0}""#, inputs: ["$(SRCROOT)/input1.txt"], outputs: ["$(DERIVED_FILE_DIR)/out1"]),
                                     TestShellScriptBuildPhase(name: "Run Me (Outputs)", shellPath: "/bin/bash", originalObjectID: "RunMe2", contents: #"cat "${SCRIPT_INPUT_FILE_0}" > "${SCRIPT_OUTPUT_FILE_0}""#, inputs: ["$(SRCROOT)/input2.txt"], outputs: ["$(TARGET_BUILD_DIR)/NoTool.app/Contents/Resources/out2.txt"]),
                                     TestShellScriptBuildPhase(name: "Run Me (FileList)", shellPath: "/bin/bash", originalObjectID: "RunMe3", contents: #"cat "${SCRIPT_INPUT_FILE_LIST_0}" | xargs cat > "$TARGET_BUILD_DIR/NoTool.app/Contents/Resources/out3.txt""#, inputs: [], inputFileLists: ["$(SRCROOT)/in3.xcfilelist"], outputs: [], outputFileLists: ["$(SRCROOT)/out3_no.xcfilelist"]),
-                                ]),
-                        ])])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -6912,29 +7710,38 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                 TestFile("resource.txt"),
                                 TestFile("other.txt"),
                                 TestFile("Info.plist"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CODE_SIGN_IDENTITY": "-",
-                                "INFOPLIST_FILE": "Info.plist",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CODE_SIGN_IDENTITY": "-",
+                                    "INFOPLIST_FILE": "Info.plist",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "Embed",
                                 buildPhases: [
-                                    TestCopyFilesBuildPhase(["other.txt"], destinationSubfolder: .builtProductsDir, destinationSubpath: "Tool.app/Contents", onlyForDeployment: false),
+                                    TestCopyFilesBuildPhase(["other.txt"], destinationSubfolder: .builtProductsDir, destinationSubpath: "Tool.app/Contents", onlyForDeployment: false)
                                 ],
-                                dependencies: ["Tool"]),
+                                dependencies: ["Tool"]
+                            ),
                             TestStandardTarget(
                                 "Tool",
                                 type: .application,
                                 buildPhases: [
                                     TestSourcesBuildPhase(["tool.c"]),
                                     TestCopyFilesBuildPhase(["resource.txt"], destinationSubfolder: .resources, onlyForDeployment: false),
-                                ]),
-                        ])])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -6994,26 +7801,38 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     projects: [
                         TestProject(
                             "aProject",
-                            groupTree: TestGroup("Sources", children: [
-                                TestFile("File.c"),
-                                TestFile("File.swift"),
-                                TestFile("File.m"),
-                            ]),
-                            buildConfigurations: [TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "SDKROOT": "iphoneos",
-                                    "DONT_GENERATE_INFOPLIST_FILE": "YES",
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "SWIFT_VERSION": swiftVersion,
-                                ])],
+                            groupTree: TestGroup(
+                                "Sources",
+                                children: [
+                                    TestFile("File.c"),
+                                    TestFile("File.swift"),
+                                    TestFile("File.m"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "iphoneos",
+                                        "DONT_GENERATE_INFOPLIST_FILE": "YES",
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "SWIFT_VERSION": swiftVersion,
+                                    ]
+                                )
+                            ],
                             targets: [
                                 TestStandardTarget(
-                                    "aFramework", type: .framework,
+                                    "aFramework",
+                                    type: .framework,
                                     buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: buildSettings)],
                                     buildPhases: [
-                                        TestSourcesBuildPhase(["File.c", "File.swift", "File.m"]),
-                                    ])])])
+                                        TestSourcesBuildPhase(["File.c", "File.swift", "File.m"])
+                                    ]
+                                )
+                            ]
+                        )
+                    ]
+                )
 
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -7058,33 +7877,46 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                     projects: [
                         TestProject(
                             "aProject",
-                            groupTree: TestGroup("Sources", children: [
-                                TestFile("File.c"),
-                                TestFile("File.swift"),
-                                TestFile("File.m"),
-                            ]),
-                            buildConfigurations: [TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "SDKROOT": "macosx",
-                                    "DONT_GENERATE_INFOPLIST_FILE": "YES",
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "SWIFT_VERSION": swiftVersion,
-                                ])],
+                            groupTree: TestGroup(
+                                "Sources",
+                                children: [
+                                    TestFile("File.c"),
+                                    TestFile("File.swift"),
+                                    TestFile("File.m"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "macosx",
+                                        "DONT_GENERATE_INFOPLIST_FILE": "YES",
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "SWIFT_VERSION": swiftVersion,
+                                    ]
+                                )
+                            ],
                             targets: [
                                 TestStandardTarget(
-                                    "aFramework", type: .framework,
+                                    "aFramework",
+                                    type: .framework,
                                     buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: buildSettings)],
                                     buildPhases: [
-                                        TestSourcesBuildPhase(["File.c", "File.swift", "File.m"]),
-                                    ]),
+                                        TestSourcesBuildPhase(["File.c", "File.swift", "File.m"])
+                                    ]
+                                ),
                                 TestStandardTarget(
-                                    "anApp", type: .application,
+                                    "anApp",
+                                    type: .application,
                                     buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: buildSettings)],
                                     buildPhases: [
-                                        TestSourcesBuildPhase(["File.c", "File.swift", "File.m"]),
-                                    ])
-                            ])])
+                                        TestSourcesBuildPhase(["File.c", "File.swift", "File.m"])
+                                    ]
+                                ),
+                            ]
+                        )
+                    ]
+                )
 
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -7097,7 +7929,6 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 try await tester.checkBuild(runDestination: .anyMac) { results -> Void in
                     results.checkNoErrors()
 
-
                     for arch in expectedArchs {
                         results.checkTask(.matchRuleType("CompileC"), .matchRuleItemPattern(.suffix("File.c")), .matchRuleItem(arch)) { _ in }
                         results.checkTask(.matchRuleType("CompileC"), .matchRuleItemPattern(.suffix("File.m")), .matchRuleItem(arch)) { _ in }
@@ -7127,10 +7958,13 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 projects: [
                     TestProject(
                         "aProject",
-                        groupTree: TestGroup("Sources", children: [
-                            TestFile("File.swift"),
-                            TestFile("Model.xcdatamodel"),
-                        ]),
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile("File.swift"),
+                                TestFile("Model.xcdatamodel"),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -7144,17 +7978,20 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         ],
                         targets: [
                             TestStandardTarget(
-                                "aFramework", type: .framework,
+                                "aFramework",
+                                type: .framework,
                                 buildConfigurations: [TestBuildConfiguration("Debug")],
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["File.swift", "Model.xcdatamodel"]),
+                                    TestSourcesBuildPhase(["File.swift", "Model.xcdatamodel"])
                                 ],
                                 buildRules: [
                                     TestBuildRule(fileTypeIdentifier: "wrapper.xcdatamodel", script: "echo \"should run!\"", outputs: ["$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).mom"])
                                 ]
                             )
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, fileSystem: localFS)
 
@@ -7168,7 +8005,6 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 results.checkTask(.matchRuleType("RuleScriptExecution"), .matchRuleItemPattern(.suffix("DerivedSources/Model.mom"))) { _ in }
             }
 
-
             // Verify null build.
             try await tester.checkNullBuild(runDestination: .macOS, persistent: true, excludedTasks: ["ClangStatCache"], diagnosticsToValidate: [.error, .warning])
 
@@ -7185,7 +8021,6 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
         }
     }
 
-
     // rdar://97564149 (ER: add support for xcfilelists in build rules)
 
     // This test implements the following scenario:
@@ -7221,15 +8056,18 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         TestFile("suffix.txt"),
                         TestFile("example.fake-ts"),
                         TestFile("mock.c"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug",
-                                           buildSettings: [
-                                            "BUILD_VARIANTS": "debug",
-                                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                                            "GENERATE_INFOPLIST_FILE": "YES",
-                                            "ENABLE_USER_SCRIPT_SANDBOXING": "NO",
-                                           ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "BUILD_VARIANTS": "debug",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "ENABLE_USER_SCRIPT_SANDBOXING": "NO",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -7237,25 +8075,30 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         type: .application,
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("example.fake-ts"),
-                            ]),
+                                TestBuildFile("example.fake-ts")
+                            ])
                         ],
                         buildRules: [
-                            TestBuildRule(filePattern: "*.fake-ts",
-                                          script: #"bash "${SRCROOT}/fake-typescript-compiler.fake-sh""#,
-                                          inputs: ["$(SRCROOT)/fake-typescript-compiler.fake-sh"],
-                                          inputFileLists: ["$(SRCROOT)/extra-input-files.xcfilelist", "$(SRCROOT)/license.xcfilelist"],
-                                          outputs: ["$(INPUT_FILE_PATH).fake-js"],
-                                          outputFileLists: ["$(SRCROOT)/extra-output-files-odd.xcfilelist", "$(SRCROOT)/extra-output-files-even.xcfilelist"]),
-                            TestBuildRule(filePattern: "*.fake-js",
-                                          script: #"bash "${SRCROOT}/fake-uglifier.fake-sh""#,
-                                          inputs: ["$(SRCROOT)/fake-uglifier.fake-sh"],
-                                          inputFileLists: ["$(SRCROOT)/uglifier-input-files.xcfilelist"],
-                                          outputs: ["$(INPUT_FILE_PATH).fake-uglified"],
-                                          outputFileLists: []),
+                            TestBuildRule(
+                                filePattern: "*.fake-ts",
+                                script: #"bash "${SRCROOT}/fake-typescript-compiler.fake-sh""#,
+                                inputs: ["$(SRCROOT)/fake-typescript-compiler.fake-sh"],
+                                inputFileLists: ["$(SRCROOT)/extra-input-files.xcfilelist", "$(SRCROOT)/license.xcfilelist"],
+                                outputs: ["$(INPUT_FILE_PATH).fake-js"],
+                                outputFileLists: ["$(SRCROOT)/extra-output-files-odd.xcfilelist", "$(SRCROOT)/extra-output-files-even.xcfilelist"]
+                            ),
+                            TestBuildRule(
+                                filePattern: "*.fake-js",
+                                script: #"bash "${SRCROOT}/fake-uglifier.fake-sh""#,
+                                inputs: ["$(SRCROOT)/fake-uglifier.fake-sh"],
+                                inputFileLists: ["$(SRCROOT)/uglifier-input-files.xcfilelist"],
+                                outputs: ["$(INPUT_FILE_PATH).fake-uglified"],
+                                outputFileLists: []
+                            ),
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
 
             let testWorkspace = TestWorkspace("Test", sourceRoot: tmpDir.join("Test"), projects: [testProject])
 
@@ -7271,35 +8114,35 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 // also, add license text and year to the beginning of the generated file.
                 // also generate {one,two,three,four}.txt listed in output file lists
                 let script = #"""
-                    set -o errexit
-                    set -o xtrace
-                    set -o nounset
-                    set -o pipefail
+                        set -o errexit
+                        set -o xtrace
+                        set -o nounset
+                        set -o pipefail
 
 
-                    cat "${INPUT_FILE_PATH}" | sed -e "s/^/$(cat "${FAKE_PATH_PREFIX}")/g" -e "s/$/$(cat "${FAKE_PATH_SUFFIX}")/g" | cat "${FAKE_PATH_LICENSE_TEXT}" "${FAKE_PATH_LICENSE_YEAR}" - > "${SCRIPT_OUTPUT_FILE_0}"
+                        cat "${INPUT_FILE_PATH}" | sed -e "s/^/$(cat "${FAKE_PATH_PREFIX}")/g" -e "s/$/$(cat "${FAKE_PATH_SUFFIX}")/g" | cat "${FAKE_PATH_LICENSE_TEXT}" "${FAKE_PATH_LICENSE_YEAR}" - > "${SCRIPT_OUTPUT_FILE_0}"
 
-                    while read path_to_odd_file; do
-                        echo "ODD" > "${path_to_odd_file}"
-                    done < "${SCRIPT_OUTPUT_FILE_LIST_0}"
+                        while read path_to_odd_file; do
+                            echo "ODD" > "${path_to_odd_file}"
+                        done < "${SCRIPT_OUTPUT_FILE_LIST_0}"
 
-                    while read path_to_even_file; do
-                        echo "EVEN" > "${path_to_even_file}"
-                    done < "${SCRIPT_OUTPUT_FILE_LIST_1}"
-                """#
+                        while read path_to_even_file; do
+                            echo "EVEN" > "${path_to_even_file}"
+                        done < "${SCRIPT_OUTPUT_FILE_LIST_1}"
+                    """#
                 stream <<< script
             }
 
             try await fs.writeFileContents(Path(SRCROOT).join("fake-uglifier.fake-sh")) { stream in
                 let script = #"""
-                    set -o errexit
-                    set -o xtrace
-                    set -o nounset
-                    set -o pipefail
+                        set -o errexit
+                        set -o xtrace
+                        set -o nounset
+                        set -o pipefail
 
 
-                    cat "${INPUT_FILE_PATH}" | sed -e "s/^/UGLIFIED /g" > "${SCRIPT_OUTPUT_FILE_0}"
-                """#
+                        cat "${INPUT_FILE_PATH}" | sed -e "s/^/UGLIFIED /g" > "${SCRIPT_OUTPUT_FILE_0}"
+                    """#
                 stream <<< script
             }
 
@@ -7352,7 +8195,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 "FAKE_PATH_LICENSE_YEAR": Path(SRCROOT).join("license-year.txt").str,
                 "FAKE_PATH_LICENSE_TEXT": Path(SRCROOT).join("license-text.txt").str,
                 "FAKE_PATH_PREFIX": Path(SRCROOT).join("prefix.txt").str,
-                "FAKE_PATH_SUFFIX": Path(SRCROOT).join("suffix.txt").str
+                "FAKE_PATH_SUFFIX": Path(SRCROOT).join("suffix.txt").str,
             ]
             // Check the build.
             for enableSandboxingInTest in [true, false] {
@@ -7371,11 +8214,11 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         let path = task.outputPaths[0]
                         let output = try fs.read(path).asString
                         let expectedOutput = """
-                        LICENSE TEXT
-                        2021
-                        PREFIX Fake typescript code SUFFIX
-                        PREFIX Fake typescript code line 2 SUFFIX
-                        """
+                            LICENSE TEXT
+                            2021
+                            PREFIX Fake typescript code SUFFIX
+                            PREFIX Fake typescript code line 2 SUFFIX
+                            """
                         XCTAssertMatch(output, .contains(expectedOutput))
 
                         func check(pathFragment: String, expectedOutput: consuming sending Regex<Substring>, sourceLocation: SourceLocation = #_sourceLocation) throws {
@@ -7396,11 +8239,11 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         let path = task.outputPaths[0]
                         let output = try fs.read(path).asString
                         let expectedOutput = """
-                        UGLIFIED LICENSE TEXT
-                        UGLIFIED 2021
-                        UGLIFIED PREFIX Fake typescript code SUFFIX
-                        UGLIFIED PREFIX Fake typescript code line 2 SUFFIX
-                        """
+                            UGLIFIED LICENSE TEXT
+                            UGLIFIED 2021
+                            UGLIFIED PREFIX Fake typescript code SUFFIX
+                            UGLIFIED PREFIX Fake typescript code line 2 SUFFIX
+                            """
                         XCTAssertMatch(output, .contains(expectedOutput))
                     }
                 }
@@ -7424,15 +8267,18 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         TestFile("example-1.fake-ts"),
                         TestFile("example-2.fake-ts"),
                         TestFile("mock.c"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug",
-                                           buildSettings: [
-                                            "BUILD_VARIANTS": "debug",
-                                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                                            "GENERATE_INFOPLIST_FILE": "YES",
-                                            "ENABLE_USER_SCRIPT_SANDBOXING": "NO", // This test will run with both ON/OFF configurations
-                                           ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "BUILD_VARIANTS": "debug",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "ENABLE_USER_SCRIPT_SANDBOXING": "NO",  // This test will run with both ON/OFF configurations
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -7442,18 +8288,21 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                             TestSourcesBuildPhase([
                                 TestBuildFile("example-1.fake-ts"),
                                 TestBuildFile("example-2.fake-ts"),
-                            ]),
+                            ])
                         ],
                         buildRules: [
-                            TestBuildRule(filePattern: "*.fake-ts",
-                                          script: #"bash "${SRCROOT}/fake-typescript-compiler.fake-sh""#,
-                                          inputs: ["$(SRCROOT)/fake-typescript-compiler.fake-sh"],
-                                          inputFileLists: ["$(SRCROOT)/extra-input-files.xcfilelist"],
-                                          outputs: ["${INPUT_FILE_PATH}.E.fake-js", "${INPUT_FILE_PATH}.F.fake-js"],
-                                          outputFileLists: ["$(SRCROOT)/extra-output-files-A-B.xcfilelist", "$(SRCROOT)/extra-output-files-C-D.xcfilelist"]),
+                            TestBuildRule(
+                                filePattern: "*.fake-ts",
+                                script: #"bash "${SRCROOT}/fake-typescript-compiler.fake-sh""#,
+                                inputs: ["$(SRCROOT)/fake-typescript-compiler.fake-sh"],
+                                inputFileLists: ["$(SRCROOT)/extra-input-files.xcfilelist"],
+                                outputs: ["${INPUT_FILE_PATH}.E.fake-js", "${INPUT_FILE_PATH}.F.fake-js"],
+                                outputFileLists: ["$(SRCROOT)/extra-output-files-A-B.xcfilelist", "$(SRCROOT)/extra-output-files-C-D.xcfilelist"]
+                            )
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
 
             let testWorkspace = TestWorkspace("Test", sourceRoot: tmpDir.join("Test"), projects: [testProject])
 
@@ -7465,16 +8314,16 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
 
             try await fs.writeFileContents(Path(SRCROOT).join("fake-typescript-compiler.fake-sh")) { stream in
                 let script = #"""
-                    set -o errexit
-                    set -o xtrace
-                    set -o nounset
-                    set -o pipefail
-
-                    for outputAlphaCode in {A..F}
-                    do
-                        cat "${INPUT_FILE_PATH}" | sed -e "s/^/$(basename "${INPUT_FILE_PATH}"): /g" |  sed -e "s/^/$(cat "${FAKE_PATH_PREFIX}") ${outputAlphaCode}: /g" > "${INPUT_FILE_PATH}.${outputAlphaCode}.fake-js"
-                    done
-                """#
+                        set -o errexit
+                        set -o xtrace
+                        set -o nounset
+                        set -o pipefail
+
+                        for outputAlphaCode in {A..F}
+                        do
+                            cat "${INPUT_FILE_PATH}" | sed -e "s/^/$(basename "${INPUT_FILE_PATH}"): /g" |  sed -e "s/^/$(cat "${FAKE_PATH_PREFIX}") ${outputAlphaCode}: /g" > "${INPUT_FILE_PATH}.${outputAlphaCode}.fake-js"
+                        done
+                    """#
                 stream <<< script
             }
 
@@ -7507,7 +8356,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
             }
 
             let overrides = [
-                "FAKE_PATH_PREFIX": Path(SRCROOT).join("prefix.txt").str,
+                "FAKE_PATH_PREFIX": Path(SRCROOT).join("prefix.txt").str
             ]
             // Check the build.
             for enableSandboxingInTest in [true, false] {
@@ -7526,9 +8375,9 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         for elem in ["A", "B", "C", "D", "E", "F"] {
                             let output = try fs.read(Path(SRCROOT).join("example-1.fake-ts.\(elem).fake-js")).asString
                             let expectedOutput = """
-                            PREFIX \(elem): example-1.fake-ts: Example 1, line 1
-                            PREFIX \(elem): example-1.fake-ts: Example 1, line 2
-                            """
+                                PREFIX \(elem): example-1.fake-ts: Example 1, line 1
+                                PREFIX \(elem): example-1.fake-ts: Example 1, line 2
+                                """
                             XCTAssertMatch(output, .contains(expectedOutput))
                         }
                     }
@@ -7545,9 +8394,9 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         for elem in ["A", "B", "C", "D", "E", "F"] {
                             let output = try fs.read(Path(SRCROOT).join("example-2.fake-ts.\(elem).fake-js")).asString
                             let expectedOutput = """
-                            PREFIX \(elem): example-2.fake-ts: Example 2, line 1
-                            PREFIX \(elem): example-2.fake-ts: Example 2, line 2
-                            """
+                                PREFIX \(elem): example-2.fake-ts: Example 2, line 1
+                                PREFIX \(elem): example-2.fake-ts: Example 2, line 2
+                                """
                             XCTAssertMatch(output, .contains(expectedOutput))
                         }
                     }
@@ -7565,12 +8414,15 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 projects: [
                     TestProject(
                         "aProject",
-                        groupTree: TestGroup("Sources", children: [
-                            TestFile("File.swift"),
-                            TestFile("Extension.swift"),
-                            TestFile("resources.js"),
-                            TestFile("Info.plist")
-                        ]),
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile("File.swift"),
+                                TestFile("Extension.swift"),
+                                TestFile("resources.js"),
+                                TestFile("Info.plist"),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -7586,22 +8438,26 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         ],
                         targets: [
                             TestStandardTarget(
-                                "anApp", type: .application,
+                                "anApp",
+                                type: .application,
                                 buildConfigurations: [TestBuildConfiguration("Debug")],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["File.swift"]),
-                                    TestCopyFilesBuildPhase([TestBuildFile("anExtension.appex", codeSignOnCopy: true)], destinationSubfolder: .frameworks, destinationSubpath: "PlugIns", onlyForDeployment: false)
+                                    TestCopyFilesBuildPhase([TestBuildFile("anExtension.appex", codeSignOnCopy: true)], destinationSubfolder: .frameworks, destinationSubpath: "PlugIns", onlyForDeployment: false),
                                 ],
                                 dependencies: ["anExtension"]
                             ),
                             TestStandardTarget(
-                                "anExtension", type: .applicationExtension,
+                                "anExtension",
+                                type: .applicationExtension,
                                 buildConfigurations: [TestBuildConfiguration("Debug")],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["Extension.swift"]),
-                                    TestCopyFilesBuildPhase(["resources.js"], destinationSubfolder: .resources, onlyForDeployment: false)
-                                ])
-                        ])
+                                    TestCopyFilesBuildPhase(["resources.js"], destinationSubfolder: .resources, onlyForDeployment: false),
+                                ]
+                            ),
+                        ]
+                    )
                 ]
             )
 
@@ -7651,19 +8507,33 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 "Test",
                 sourceRoot: tmpDir.join("Test"),
                 projects: [
-                    TestProject( "aProject",
-                                 groupTree: TestGroup("Sources",
-                                                      children: [TestFile("main.c")]),
-                                 buildConfigurations: [TestBuildConfiguration("Debug",
-                                                                              buildSettings: [
-                                                                                "CODE_SIGNING_ALLOWED": "NO",
-                                                                                "CLANG_GENERATE_OPTIMIZATION_REMARKS": "YES",
-                                                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                                              ])],
-                                 targets: [TestStandardTarget("Tool", type: .commandLineTool,
-                                                              buildConfigurations: [TestBuildConfiguration("Debug")],
-                                                              buildPhases: [TestSourcesBuildPhase(["main.c"])])])
-                ])
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [TestFile("main.c")]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "CLANG_GENERATE_OPTIMIZATION_REMARKS": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "Tool",
+                                type: .commandLineTool,
+                                buildConfigurations: [TestBuildConfiguration("Debug")],
+                                buildPhases: [TestSourcesBuildPhase(["main.c"])]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, fileSystem: localFS)
 
@@ -7687,20 +8557,34 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 "Test",
                 sourceRoot: tmpDir.join("Test"),
                 projects: [
-                    TestProject( "aProject",
-                                 groupTree: TestGroup("Sources",
-                                                      children: [TestFile("main.c")]),
-                                 buildConfigurations: [TestBuildConfiguration("Debug",
-                                                                              buildSettings: [
-                                                                                "CODE_SIGNING_ALLOWED": "NO",
-                                                                                "LTO": "YES",
-                                                                                "CLANG_GENERATE_OPTIMIZATION_REMARKS": "YES",
-                                                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                                              ])],
-                                 targets: [TestStandardTarget("Tool", type: .commandLineTool,
-                                                              buildConfigurations: [TestBuildConfiguration("Debug")],
-                                                              buildPhases: [TestSourcesBuildPhase(["main.c"])])])
-                ])
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [TestFile("main.c")]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "LTO": "YES",
+                                    "CLANG_GENERATE_OPTIMIZATION_REMARKS": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "Tool",
+                                type: .commandLineTool,
+                                buildConfigurations: [TestBuildConfiguration("Debug")],
+                                buildPhases: [TestSourcesBuildPhase(["main.c"])]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, fileSystem: localFS)
 
@@ -7723,22 +8607,36 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 "Test",
                 sourceRoot: tmpDir.join("Test"),
                 projects: [
-                    TestProject("aProject",
-                                groupTree: TestGroup("Sources",
-                                                     children: [TestFile("main.c")]),
-                                buildConfigurations: [TestBuildConfiguration("Debug",
-                                                                             buildSettings: [
-                                                                                "CODE_SIGNING_ALLOWED": "NO",
-                                                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-
-                                                                                // Specify some file that doesn't exist to provoke missing input
-                                                                                "CLANG_USE_OPTIMIZATION_PROFILE": "YES",
-                                                                                "CLANG_OPTIMIZATION_PROFILE_FILE": tmpDir.join("Test").join("profile.txt").str,
-                                                                             ])],
-                                targets: [TestStandardTarget("Tool", type: .commandLineTool,
-                                                             buildConfigurations: [TestBuildConfiguration("Debug")],
-                                                             buildPhases: [TestSourcesBuildPhase(["main.c"])])])
-                ])
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [TestFile("main.c")]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+
+                                    // Specify some file that doesn't exist to provoke missing input
+                                    "CLANG_USE_OPTIMIZATION_PROFILE": "YES",
+                                    "CLANG_OPTIMIZATION_PROFILE_FILE": tmpDir.join("Test").join("profile.txt").str,
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "Tool",
+                                type: .commandLineTool,
+                                buildConfigurations: [TestBuildConfiguration("Debug")],
+                                buildPhases: [TestSourcesBuildPhase(["main.c"])]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, fileSystem: localFS)
 
@@ -7769,30 +8667,43 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                 "Test",
                 sourceRoot: tmpDir.join("Test"),
                 projects: [
-                    TestProject("aProject",
-                                groupTree: TestGroup("Sources",
-                                                     children: [TestFile("main.swift")]),
-                                buildConfigurations: [TestBuildConfiguration("Debug",
-                                                                             buildSettings: [
-                                                                                "CODE_SIGNING_ALLOWED": "NO",
-                                                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                                                "SWIFT_VERSION": swiftVersion,
-
-                                                                                // this will spawn some dynamic tasks
-                                                                                "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                                                             ])],
-                                targets: [TestStandardTarget("Tool", type: .commandLineTool,
-                                                             buildConfigurations: [TestBuildConfiguration("Debug")],
-                                                             buildPhases: [TestSourcesBuildPhase(["main.swift"])])])
-                ])
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [TestFile("main.swift")]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_VERSION": swiftVersion,
+
+                                    // this will spawn some dynamic tasks
+                                    "SWIFT_USE_INTEGRATED_DRIVER": "YES",
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "Tool",
+                                type: .commandLineTool,
+                                buildConfigurations: [TestBuildConfiguration("Debug")],
+                                buildPhases: [TestSourcesBuildPhase(["main.swift"])]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, fileSystem: localFS)
 
             // create the files
             let projectDir = testWorkspace.sourceRoot.join("aProject")
             try await tester.fs.writeFileContents(projectDir.join("main.swift")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     struct Foo { }
                     """
             }
@@ -7825,8 +8736,9 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                             "Sources",
                             path: "Sources",
                             children: [
-                                TestFile("Source.swift"),
-                            ]),
+                                TestFile("Source.swift")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -7837,8 +8749,9 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                     "ARCHS": "arm64e",
 
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                    "OTHER_SWIFT_FLAGS": "$(inherited) -Xfrontend -disable-implicit-string-processing-module-import"
-                                ])
+                                    "OTHER_SWIFT_FLAGS": "$(inherited) -Xfrontend -disable-implicit-string-processing-module-import",
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -7846,11 +8759,14 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "Source.swift",
-                                    ]),
-                                ]),
-                        ])
-                ])
+                                        "Source.swift"
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -7909,7 +8825,8 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
                         [
                             "\(SRCROOT.str)/build/Debug/TargetA.framework/Versions/A/TargetA",
                             "\(SRCROOT.str)/build/aProject.build/Debug/TargetA.build/Objects-normal/arm64e/TargetA_dependency_info.dat",
-                        ])
+                        ]
+                    )
                 }
             }
         }
diff --git a/Tests/SWBBuildSystemTests/BuildTaskBehaviorTests.swift b/Tests/SWBBuildSystemTests/BuildTaskBehaviorTests.swift
index aa8390b6..f576170a 100644
--- a/Tests/SWBBuildSystemTests/BuildTaskBehaviorTests.swift
+++ b/Tests/SWBBuildSystemTests/BuildTaskBehaviorTests.swift
@@ -63,7 +63,7 @@ fileprivate struct BuildTaskBehaviorTests: CoreBasedTests {
     /// Helper functions for creating PlannedTask/Task pairs.
     private func createTask(type: (any TaskTypeDescription)? = nil, forTarget: ConfiguredTarget? = nil, ruleInfo: [String], additionalSignatureData: String = "", commandLine: [String], additionalOutput: [String] = [], environment: EnvironmentBindings = EnvironmentBindings(), workingDirectory: Path = .root, inputs: [any PlannedNode], outputs: [any PlannedNode], mustPrecede: [any PlannedTask] = [], action: TaskAction?, execDescription: String? = nil, preparesForIndexing: Bool = false) -> ConstructedTask {
 
-        var builder = PlannedTaskBuilder(type: type ?? MockTaskTypeDescription(), ruleInfo: ruleInfo, additionalSignatureData: additionalSignatureData, commandLine: commandLine.map{ .literal(ByteString(encodingAsUTF8: $0)) }, additionalOutput: additionalOutput, environment: environment, inputs: inputs, outputs: outputs)
+        var builder = PlannedTaskBuilder(type: type ?? MockTaskTypeDescription(), ruleInfo: ruleInfo, additionalSignatureData: additionalSignatureData, commandLine: commandLine.map { .literal(ByteString(encodingAsUTF8: $0)) }, additionalOutput: additionalOutput, environment: environment, inputs: inputs, outputs: outputs)
         builder.forTarget = forTarget
         builder.workingDirectory = workingDirectory
         builder.mustPrecede = mustPrecede
@@ -99,12 +99,16 @@ fileprivate struct BuildTaskBehaviorTests: CoreBasedTests {
     }
 
     private func uniqueTaskNamesIncludedInEvents(_ events: [BuildOperationTester.BuildEvent]) -> [String] {
-        return Array(Set(events.compactMap {
-            switch $0 {
-            case .taskHadEvent(let task, _): return task.ruleInfo.first
-            default: return nil
-            }
-        }))
+        return Array(
+            Set(
+                events.compactMap {
+                    switch $0 {
+                    case .taskHadEvent(let task, _): return task.ruleInfo.first
+                    default: return nil
+                    }
+                }
+            )
+        )
     }
 
     @Test(.requireSDKs(.host))
@@ -164,9 +168,12 @@ fileprivate struct BuildTaskBehaviorTests: CoreBasedTests {
     func immediateCancellation() async throws {
         let (tester, _, _) = try await createBuildOperationTesterForCancellation()
 
-        try await tester.checkBuild(runDestination: .host, body: { results in
-            results.checkCapstoneEvents(last: .buildCancelled)
-        }) { operation in
+        try await tester.checkBuild(
+            runDestination: .host,
+            body: { results in
+                results.checkCapstoneEvents(last: .buildCancelled)
+            }
+        ) { operation in
             operation.cancel()
             await operation.build()
         }
@@ -176,27 +183,32 @@ fileprivate struct BuildTaskBehaviorTests: CoreBasedTests {
     func cancellationAfterStart() async throws {
         let (tester, taskWaitsForSemaphore, taskHasStartedSemaphore) = try await createBuildOperationTesterForCancellation()
 
-        try await tester.checkBuild(runDestination: .host, body: { results in
-            results.checkCapstoneEvents(last: .buildCancelled)
-
-            let waitTask = try #require(results.getTask(.matchRule(["wait"])))
-
-            // Check that waiting task did complete
-            results.check(event: .taskHadEvent(waitTask, event: .started), precedes: .taskHadEvent(waitTask, event: .completed))
-
-            // Ensure dependent task never ran (as we previously checked for 4 events which weren't involving it)
-            #expect(results.events.sorted(by: { String(describing: $0) < String(describing: $1) }) == [
-                .buildCancelled,
-                .buildReportedPathMap(copiedPathMap: [:], generatedFilesPathMap: [:]),
-                .buildStarted,
-                .taskHadEvent(waitTask, event: .completed),
-                .taskHadEvent(waitTask, event: .started),
-                .taskHadEvent(waitTask, event: .exit(.succeeded())),
-                .totalProgressChanged(targetName: nil, startedCount: 0, maxCount: 1),
-                .totalProgressChanged(targetName: nil, startedCount: 0, maxCount: 2),
-                .totalProgressChanged(targetName: nil, startedCount: 1, maxCount: 2),
-            ])
-        }) { operation in
+        try await tester.checkBuild(
+            runDestination: .host,
+            body: { results in
+                results.checkCapstoneEvents(last: .buildCancelled)
+
+                let waitTask = try #require(results.getTask(.matchRule(["wait"])))
+
+                // Check that waiting task did complete
+                results.check(event: .taskHadEvent(waitTask, event: .started), precedes: .taskHadEvent(waitTask, event: .completed))
+
+                // Ensure dependent task never ran (as we previously checked for 4 events which weren't involving it)
+                #expect(
+                    results.events.sorted(by: { String(describing: $0) < String(describing: $1) }) == [
+                        .buildCancelled,
+                        .buildReportedPathMap(copiedPathMap: [:], generatedFilesPathMap: [:]),
+                        .buildStarted,
+                        .taskHadEvent(waitTask, event: .completed),
+                        .taskHadEvent(waitTask, event: .started),
+                        .taskHadEvent(waitTask, event: .exit(.succeeded())),
+                        .totalProgressChanged(targetName: nil, startedCount: 0, maxCount: 1),
+                        .totalProgressChanged(targetName: nil, startedCount: 0, maxCount: 2),
+                        .totalProgressChanged(targetName: nil, startedCount: 1, maxCount: 2),
+                    ]
+                )
+            }
+        ) { operation in
             _Concurrency.Task<Void, Never> {
                 await taskHasStartedSemaphore.wait()
                 operation.cancel()
@@ -208,11 +220,13 @@ fileprivate struct BuildTaskBehaviorTests: CoreBasedTests {
 
     /// Stress concurrent access to the build system cache during rapid cancel
     /// then build scenarios.
-    @Test(.requireSDKs(.host), .skipHostOS(.windows, "no /usr/bin/true"),
-          // To aid in establishing the subtle concurrent
-          // timing required to trigger chaos, we disable early build operation
-          // cancellation.
-          .userDefaults(["SkipEarlyBuildOperationCancellation": "1"])
+    @Test(
+        .requireSDKs(.host),
+        .skipHostOS(.windows, "no /usr/bin/true"),
+        // To aid in establishing the subtle concurrent
+        // timing required to trigger chaos, we disable early build operation
+        // cancellation.
+        .userDefaults(["SkipEarlyBuildOperationCancellation": "1"])
     )
     func stressConcurrentCancellation() async throws {
         // We want to be sure that build system caching is turned on for this
@@ -236,9 +250,12 @@ fileprivate struct BuildTaskBehaviorTests: CoreBasedTests {
 
                         tester.userPreferences = prefs
 
-                        try await tester.checkBuild(runDestination: .host, body: { results in
-                            results.checkCapstoneEvents(last: .buildCancelled)
-                        }) { operation in
+                        try await tester.checkBuild(
+                            runDestination: .host,
+                            body: { results in
+                                results.checkCapstoneEvents(last: .buildCancelled)
+                            }
+                        ) { operation in
                             build1Ready.signal()
                             await startBuilds.wait()
 
@@ -264,14 +281,17 @@ fileprivate struct BuildTaskBehaviorTests: CoreBasedTests {
 
                         tester.userPreferences = prefs
 
-                        try await tester.checkBuild(runDestination: .host, body: { results in
-                            #expect(results.events.first! == .buildStarted)
+                        try await tester.checkBuild(
+                            runDestination: .host,
+                            body: { results in
+                                #expect(results.events.first! == .buildStarted)
 
-                            let waitTask = try #require(results.getTask(.matchRule(["wait"])))
+                                let waitTask = try #require(results.getTask(.matchRule(["wait"])))
 
-                            // Check that waiting task did complete
-                            results.check(event: .taskHadEvent(waitTask, event: .started), precedes: .taskHadEvent(waitTask, event: .completed))
-                        }) { operation in
+                                // Check that waiting task did complete
+                                results.check(event: .taskHadEvent(waitTask, event: .started), precedes: .taskHadEvent(waitTask, event: .completed))
+                            }
+                        ) { operation in
                             build2Ready.signal()
                             await startBuilds.wait()
                             _Concurrency.Task<Void, any Error> {
@@ -317,17 +337,22 @@ fileprivate struct BuildTaskBehaviorTests: CoreBasedTests {
         try await withTemporaryDirectory(fs: fs) { tmpDirPath in
             let scriptPath = tmpDirPath.join("script-\(#function)")
             let sentinelPath = tmpDirPath.join("sentinel")
-            try fs.write(scriptPath, contents: ByteString(encodingAsUTF8:
-            """
-            #!/bin/bash
-            set -e
-            echo "note: installing trap..."
-            trap "echo \\"note: received SIGINT\\"" SIGINT\n
-            echo OK > "\(sentinelPath.str)".tmp
-            mv "\(sentinelPath.str)".tmp "\(sentinelPath.str)"
-            while true; do sleep 1; done
-            echo "note: exited normally"\n
-            """))
+            try fs.write(
+                scriptPath,
+                contents: ByteString(
+                    encodingAsUTF8:
+                        """
+                        #!/bin/bash
+                        set -e
+                        echo "note: installing trap..."
+                        trap "echo \\"note: received SIGINT\\"" SIGINT\n
+                        echo OK > "\(sentinelPath.str)".tmp
+                        mv "\(sentinelPath.str)".tmp "\(sentinelPath.str)"
+                        while true; do sleep 1; done
+                        echo "note: exited normally"\n
+                        """
+                )
+            )
             try fs.setFilePermissions(scriptPath, permissions: 0o755)
 
             // Enable fast llbuild cancellation.
@@ -726,18 +751,30 @@ fileprivate struct BuildTaskBehaviorTests: CoreBasedTests {
     @Test(.requireSDKs(.host))
     func mutatedInputOrderingStability() async throws {
         let N = 10
-        let files = (0 ..< N).map { i in
+        let files = (0..<N).map { i in
             return MakePlannedPathNode(Path("/input-\(i).txt"))
         }
         let inputTasks = files.enumerated().map { (i, file) in
-            return createTask(ruleInfo: ["create-\(i)"], commandLine: ["n"],
-                              inputs: [], outputs: [file], mustPrecede: [],
-                              action: MockTaskAction(contents: "create-\(i)", output: file), preparesForIndexing: true)
+            return createTask(
+                ruleInfo: ["create-\(i)"],
+                commandLine: ["n"],
+                inputs: [],
+                outputs: [file],
+                mustPrecede: [],
+                action: MockTaskAction(contents: "create-\(i)", output: file),
+                preparesForIndexing: true
+            )
         }
         let merged = MakePlannedPathNode(Path("/merged.txt"))
-        let mergedTask = createTask(ruleInfo: ["merge"], commandLine: ["n"],
-                                    inputs: files, outputs: files, mustPrecede: [],
-                                    action: MockTaskAction(contents: "merge", output: merged), preparesForIndexing: true)
+        let mergedTask = createTask(
+            ruleInfo: ["merge"],
+            commandLine: ["n"],
+            inputs: files,
+            outputs: files,
+            mustPrecede: [],
+            action: MockTaskAction(contents: "merge", output: merged),
+            preparesForIndexing: true
+        )
         let tasks = inputTasks + [mergedTask]
 
         // Check for stability by comparing two manifests.
@@ -778,10 +815,13 @@ fileprivate struct BuildTaskBehaviorTests: CoreBasedTests {
                     return false
                 }
             }
-            #expect(taskEvents == [
-                .taskHadEvent(task, event: .started),
-                .taskHadEvent(task, event: .exit(.succeeded(metrics: nil))),
-                .taskHadEvent(task, event: .completed)])
+            #expect(
+                taskEvents == [
+                    .taskHadEvent(task, event: .started),
+                    .taskHadEvent(task, event: .exit(.succeeded(metrics: nil))),
+                    .taskHadEvent(task, event: .completed),
+                ]
+            )
         }
 
         // Check that we get a null build.
@@ -891,7 +931,8 @@ fileprivate struct BuildTaskBehaviorTests: CoreBasedTests {
                 inputs: [],
                 outputs: [MakePlannedDirectoryTreeNode(outputPath)],
                 mustPrecede: [],
-                action: nil)
+                action: nil
+            )
 
             let tester = try await BuildOperationTester(getCore(), [task], simulated: false, temporaryDirectory: tmpDir, fileSystem: fs)
 
@@ -927,10 +968,14 @@ fileprivate struct BuildTaskBehaviorTests: CoreBasedTests {
                 // Check the output.
                 results.checkTaskOutput(task) { output in
                     let lines = output.asString.split(separator: "\n").map(String.init).sorted()
-                    XCTAssertMatch(lines, [
-                        .suffix("/input"),
-                        .suffix("/input/subdir"),
-                        .suffix("/input/subdir/a.txt")])
+                    XCTAssertMatch(
+                        lines,
+                        [
+                            .suffix("/input"),
+                            .suffix("/input/subdir"),
+                            .suffix("/input/subdir/a.txt"),
+                        ]
+                    )
                 }
             }
 
@@ -944,11 +989,15 @@ fileprivate struct BuildTaskBehaviorTests: CoreBasedTests {
                 // Check the output.
                 results.checkTaskOutput(task) { output in
                     let lines = output.asString.split(separator: "\n").map(String.init).sorted()
-                    XCTAssertMatch(lines, [
-                        .suffix("/input"),
-                        .suffix("/input/subdir"),
-                        .suffix("/input/subdir/a.txt"),
-                        .suffix("/input/subdir/b.txt")])
+                    XCTAssertMatch(
+                        lines,
+                        [
+                            .suffix("/input"),
+                            .suffix("/input/subdir"),
+                            .suffix("/input/subdir/a.txt"),
+                            .suffix("/input/subdir/b.txt"),
+                        ]
+                    )
                 }
             }
         }
@@ -1031,7 +1080,7 @@ private final class AppendingTaskAction: TaskAction {
     }
 
     override func computeInitialSignature() -> ByteString {
-        return ByteString(encodingAsUTF8: contents + inputs.map{ $0.path.str }.joined(separator: " "))
+        return ByteString(encodingAsUTF8: contents + inputs.map { $0.path.str }.joined(separator: " "))
     }
 
     override func performTaskAction(_ task: any ExecutableTask, dynamicExecutionDelegate: any DynamicTaskExecutionDelegate, executionDelegate: any TaskExecutionDelegate, clientDelegate: any TaskExecutionClientDelegate, outputDelegate: any TaskOutputDelegate) async -> CommandResult {
diff --git a/Tests/SWBBuildSystemTests/CircularDependencyTests.swift b/Tests/SWBBuildSystemTests/CircularDependencyTests.swift
index 395dde37..63c7a131 100644
--- a/Tests/SWBBuildSystemTests/CircularDependencyTests.swift
+++ b/Tests/SWBBuildSystemTests/CircularDependencyTests.swift
@@ -29,23 +29,29 @@ fileprivate struct CircularDependencyTests: CoreBasedTests {
                 projects: [
                     TestProject(
                         "aProject",
-                        groupTree: TestGroup("Sources", children: [
-                            TestFile("HighLevel.h"),
-                            TestFile("HighLevel.m"),
-                            TestFile("LowLevel.h"),
-                            TestFile("LowLevel.m"),
-                        ]),
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile("HighLevel.h"),
+                                TestFile("HighLevel.m"),
+                                TestFile("LowLevel.h"),
+                                TestFile("LowLevel.m"),
+                            ]
+                        ),
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "ARCHS[sdk=iphoneos*]": "arm64",
-                                "CODE_SIGNING_ALLOWED": "NO",
-                                "GCC_GENERATE_DEBUGGING_SYMBOLS": "NO",
-                                "SDKROOT": "iphoneos",
-                                "DEFINES_MODULE": "NO",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "USE_HEADERMAP": "NO",
-                                "DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING": "YES",
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "ARCHS[sdk=iphoneos*]": "arm64",
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "GCC_GENERATE_DEBUGGING_SYMBOLS": "NO",
+                                    "SDKROOT": "iphoneos",
+                                    "DEFINES_MODULE": "NO",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "USE_HEADERMAP": "NO",
+                                    "DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING": "YES",
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -63,9 +69,11 @@ fileprivate struct CircularDependencyTests: CoreBasedTests {
                                     TestHeadersBuildPhase([TestBuildFile("LowLevel.h", headerVisibility: .public)]),
                                     TestSourcesBuildPhase([TestBuildFile("LowLevel.m")]),
                                 ]
-                            )
-                        ])
-                ])
+                            ),
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/HighLevel.h")) {
@@ -86,10 +94,22 @@ fileprivate struct CircularDependencyTests: CoreBasedTests {
 
             let buildParameters = BuildParameters(configuration: "Debug")
 
-            try await tester.checkBuild(parameters: buildParameters, runDestination: .iOS, buildRequest: BuildRequest(parameters: buildParameters, buildTargets: [
-                .init(parameters: buildParameters, target: tester.workspace.projects[0].targets[1]),
-                .init(parameters: buildParameters, target: tester.workspace.projects[0].targets[0])
-            ], dependencyScope: .workspace, continueBuildingAfterErrors: false, useParallelTargets: false, useImplicitDependencies: false, useDryRun: false)) { results in
+            try await tester.checkBuild(
+                parameters: buildParameters,
+                runDestination: .iOS,
+                buildRequest: BuildRequest(
+                    parameters: buildParameters,
+                    buildTargets: [
+                        .init(parameters: buildParameters, target: tester.workspace.projects[0].targets[1]),
+                        .init(parameters: buildParameters, target: tester.workspace.projects[0].targets[0]),
+                    ],
+                    dependencyScope: .workspace,
+                    continueBuildingAfterErrors: false,
+                    useParallelTargets: false,
+                    useImplicitDependencies: false,
+                    useDryRun: false
+                )
+            ) { results in
                 results.checkError(.prefix("Command CompileC failed."))
                 results.checkError(.prefix("\(tmpDirPath.str)/Test/aProject/LowLevel.m:1:10: [Lexical or Preprocessor Issue] \'HighLevel/HighLevel.h\' file not found"))
                 results.checkNoDiagnostics()
@@ -105,11 +125,13 @@ fileprivate struct CircularDependencyTests: CoreBasedTests {
                 try tester.fs.traverse(tmpDirPath.join("Test/aProject/build/Debug-iphoneos")) { paths.append($0) }
                 paths.sort()
 
-                #expect(paths == [
-                    tmpDirPath.join("Test/aProject/build/Debug-iphoneos/LowLevel.framework"),
-                    tmpDirPath.join("Test/aProject/build/Debug-iphoneos/LowLevel.framework/Headers"),
-                    tmpDirPath.join("Test/aProject/build/Debug-iphoneos/LowLevel.framework/Headers/LowLevel.h"),
-                ])
+                #expect(
+                    paths == [
+                        tmpDirPath.join("Test/aProject/build/Debug-iphoneos/LowLevel.framework"),
+                        tmpDirPath.join("Test/aProject/build/Debug-iphoneos/LowLevel.framework/Headers"),
+                        tmpDirPath.join("Test/aProject/build/Debug-iphoneos/LowLevel.framework/Headers/LowLevel.h"),
+                    ]
+                )
             }
         }
     }
diff --git a/Tests/SWBBuildSystemTests/ClangBuildOperationTests.swift b/Tests/SWBBuildSystemTests/ClangBuildOperationTests.swift
index 9aea1ef7..8000d11b 100644
--- a/Tests/SWBBuildSystemTests/ClangBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/ClangBuildOperationTests.swift
@@ -41,24 +41,31 @@ fileprivate struct ClangBuildOperationTests: CoreBasedTests {
                                     TestFile("Framework2.h"),
                                     TestFile("Shared2.h"),
                                     TestFile("Shared2.m"),
-                                ]),
-                            buildConfigurations: [TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "CLANG_ENABLE_MODULES": "YES",
-                                    "CLANG_ENABLE_EXPLICIT_MODULES": enableExplicitModules ? "YES" : "NO",
-                                    "RECORD_SYSTEM_HEADER_DEPENDENCIES_OUTSIDE_SYSROOT": "YES",
-                                ])],
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "CLANG_ENABLE_MODULES": "YES",
+                                        "CLANG_ENABLE_EXPLICIT_MODULES": enableExplicitModules ? "YES" : "NO",
+                                        "RECORD_SYSTEM_HEADER_DEPENDENCIES_OUTSIDE_SYSROOT": "YES",
+                                    ]
+                                )
+                            ],
                             targets: [
                                 TestStandardTarget(
                                     "Framework",
                                     type: .framework,
-                                    buildConfigurations: [TestBuildConfiguration(
-                                        "Debug",
-                                        buildSettings: [
-                                            "DEFINES_MODULE": "YES",
-                                        ])],
+                                    buildConfigurations: [
+                                        TestBuildConfiguration(
+                                            "Debug",
+                                            buildSettings: [
+                                                "DEFINES_MODULE": "YES"
+                                            ]
+                                        )
+                                    ],
                                     buildPhases: [
                                         TestSourcesBuildPhase(["Shared.m"]),
                                         TestHeadersBuildPhase([
@@ -66,95 +73,97 @@ fileprivate struct ClangBuildOperationTests: CoreBasedTests {
                                             TestBuildFile("Shared.h", headerVisibility: .public),
                                         ]),
                                         TestFrameworksBuildPhase(["Framework2.framework"]),
-                                    ], dependencies: ["Framework2"]),
+                                    ],
+                                    dependencies: ["Framework2"]
+                                ),
                                 TestStandardTarget(
                                     "Framework2",
                                     type: .framework,
-                                    buildConfigurations: [TestBuildConfiguration(
-                                        "Debug",
-                                        buildSettings: [
-                                            "DEFINES_MODULE": "YES",
-                                            "MODULEMAP_FILE_CONTENTS": """
-                                        framework module Framework2 [system] {
-                                            umbrella header \"Framework2.h\"
-                                            export *
-                                        }
-                                        """
-                                        ])],
+                                    buildConfigurations: [
+                                        TestBuildConfiguration(
+                                            "Debug",
+                                            buildSettings: [
+                                                "DEFINES_MODULE": "YES",
+                                                "MODULEMAP_FILE_CONTENTS": """
+                                                framework module Framework2 [system] {
+                                                    umbrella header \"Framework2.h\"
+                                                    export *
+                                                }
+                                                """,
+                                            ]
+                                        )
+                                    ],
                                     buildPhases: [
                                         TestSourcesBuildPhase(["Shared2.m"]),
                                         TestHeadersBuildPhase([
                                             TestBuildFile("Framework2.h", headerVisibility: .public),
                                             TestBuildFile("Shared2.h", headerVisibility: .public),
                                         ]),
-                                    ]),
-                            ])])
+                                    ]
+                                ),
+                            ]
+                        )
+                    ]
+                )
 
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
                 try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.m")) { stream in
-                    stream <<<
-            """
-            #include <Framework/Framework.h>
+                    stream <<< """
+                        #include <Framework/Framework.h>
 
-            void test() {
-                NSLog(@"%@", [[Shared alloc] init]);
-            }
+                        void test() {
+                            NSLog(@"%@", [[Shared alloc] init]);
+                        }
 
-            """
+                        """
                 }
 
                 try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework.h")) { stream in
-                    stream <<<
-            """
-            #include <Framework/Shared.h>
-            """
+                    stream <<< """
+                        #include <Framework/Shared.h>
+                        """
                 }
 
                 try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.h")) { stream in
-                    stream <<<
-            """
-            #include <Foundation/Foundation.h>
-            #include <Framework2/Framework2.h>
-            @interface Shared: Shared2 {}
-            @end
-
-            """
+                    stream <<< """
+                        #include <Foundation/Foundation.h>
+                        #include <Framework2/Framework2.h>
+                        @interface Shared: Shared2 {}
+                        @end
+
+                        """
                 }
 
                 try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.m")) { stream in
-                    stream <<<
-            """
-            #include "Shared.h"
-            @implementation Shared {}
-            @end
-            """
+                    stream <<< """
+                        #include "Shared.h"
+                        @implementation Shared {}
+                        @end
+                        """
                 }
 
                 try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework2.h")) { stream in
-                    stream <<<
-            """
-            #include <Framework2/Shared2.h>
-            """
+                    stream <<< """
+                        #include <Framework2/Shared2.h>
+                        """
                 }
 
                 try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared2.h")) { stream in
-                    stream <<<
-            """
-            #include <Foundation/Foundation.h>
-            @interface Shared2: NSObject {}
-            @end
+                    stream <<< """
+                        #include <Foundation/Foundation.h>
+                        @interface Shared2: NSObject {}
+                        @end
 
-            """
+                        """
                 }
 
                 try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared2.m")) { stream in
-                    stream <<<
-            """
-            #include "Shared2.h"
-            @implementation Shared2 {}
-            @end
-            """
+                    stream <<< """
+                        #include "Shared2.h"
+                        @implementation Shared2 {}
+                        @end
+                        """
                 }
 
                 // Clean build
diff --git a/Tests/SWBBuildSystemTests/ClangCompilationCachingTests.swift b/Tests/SWBBuildSystemTests/ClangCompilationCachingTests.swift
index c8aca8f5..75f23299 100644
--- a/Tests/SWBBuildSystemTests/ClangCompilationCachingTests.swift
+++ b/Tests/SWBBuildSystemTests/ClangCompilationCachingTests.swift
@@ -18,8 +18,11 @@ import SWBTaskExecution
 import SWBTestSupport
 import SWBUtil
 
-@Suite(.skipHostOS(.windows, "Windows platform has no CAS support yet"),
-       .requireDependencyScannerPlusCaching, .requireXcode26())
+@Suite(
+    .skipHostOS(.windows, "Windows platform has no CAS support yet"),
+    .requireDependencyScannerPlusCaching,
+    .requireXcode26()
+)
 fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
     let canUseCASPlugin: Bool
     let canUseCASPruning: Bool
@@ -44,30 +47,37 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.s"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_COMPILE_CACHE": "YES",
-                                "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
-                            ])],
+                                TestFile("file.s")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_COMPILE_CACHE": "YES",
+                                    "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.s"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.s"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.s")) { stream in
-                stream <<<
-                """
-                """
+                stream <<< """
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
@@ -89,15 +99,19 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("t.cpp"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_COMPILE_CACHE": "YES",
-                                "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
-                            ])],
+                                TestFile("t.cpp")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_COMPILE_CACHE": "YES",
+                                    "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "Aggregate",
@@ -105,50 +119,65 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                                     "Textual",
                                     "TextualWithFMod",
                                     "CppModules",
-                                ]),
+                                ]
+                            ),
                             TestStandardTarget(
                                 "Textual",
                                 type: .staticLibrary,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "CLANG_ENABLE_MODULES": "NO",
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "CLANG_ENABLE_MODULES": "NO"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["t.cpp"]),
-                                ]),
+                                    TestSourcesBuildPhase(["t.cpp"])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "TextualWithFMod",
                                 type: .staticLibrary,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "CLANG_ENABLE_MODULES": "YES",
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "CLANG_ENABLE_MODULES": "YES"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["t.cpp"]),
-                                ]),
+                                    TestSourcesBuildPhase(["t.cpp"])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "CppModules",
                                 type: .staticLibrary,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "CLANG_ENABLE_MODULES": "YES",
-                                        "OTHER_CFLAGS": "$(inherited) -fcxx-modules",
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "CLANG_ENABLE_MODULES": "YES",
+                                            "OTHER_CFLAGS": "$(inherited) -fcxx-modules",
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["t.cpp"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["t.cpp"])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/t.cpp")) { stream in
-                stream <<<
-                """
-                void foo(void) {}
-                """
+                stream <<< """
+                    void foo(void) {}
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
@@ -197,29 +226,36 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: buildSettings)],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: buildSettings
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let rawUserInfo = tester.userInfo
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int something = 1;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
 
             let metricsEnv = { (suffix: String) in ["SWIFTBUILD_METRICS_PATH": tmpDirPath.join("Test/aProject/build/XCBuildData/metrics-\(suffix).json").str] }
@@ -253,7 +289,7 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                 runDestination: runDestination,
                 persistent: true
             ) { results in
-                if tester.fs.fileSystemMode == .checksumOnly  {
+                if tester.fs.fileSystemMode == .checksumOnly {
                     // Updating timestamp of aProject/file.c will not re-trigger a "ScanDependencies" task
                 } else {
                     let scanTask: Task = try results.checkTask(.matchRuleType("ScanDependencies")) { $0 }
@@ -272,11 +308,10 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
 
             // Modify the source file to trigger a cache miss.
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int something = 1000;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1000;
+                    """
             }
 
             tester.userInfo = rawUserInfo.withAdditionalEnvironment(environment: metricsEnv("three"))
@@ -292,11 +327,10 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
 
             // Return to the original source -> should still be a hit.
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int something = 1;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
 
             tester.userInfo = rawUserInfo.withAdditionalEnvironment(environment: metricsEnv("four"))
@@ -331,26 +365,34 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_COMPILE_CACHE": "YES",
-                                "CCHROOT": cchrootPath.str,
-                                "CLANG_ENABLE_MODULES": "NO",
-                                "CLANG_ENABLE_EXPLICIT_MODULES": "NO",
-                                "EMIT_FRONTEND_COMMAND_LINES": "YES",
-                            ])],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_COMPILE_CACHE": "YES",
+                                    "CCHROOT": cchrootPath.str,
+                                    "CLANG_ENABLE_MODULES": "NO",
+                                    "CLANG_ENABLE_EXPLICIT_MODULES": "NO",
+                                    "EMIT_FRONTEND_COMMAND_LINES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             do {
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
@@ -425,19 +467,27 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: buildSettings)],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: buildSettings
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             do {
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
@@ -526,19 +576,27 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: buildSettings)],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: buildSettings
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             do {
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
@@ -595,27 +653,35 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_COMPILE_CACHE": "YES",
-                                "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
-                                "BLOCKLISTS_PATH": tmpDirPath.str,
-                                "CLANG_ENABLE_MODULES": "NO",
-                                "CLANG_ENABLE_EXPLICIT_MODULES": "NO",
-                                "EMIT_FRONTEND_COMMAND_LINES": "YES",
-                            ])],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_COMPILE_CACHE": "YES",
+                                    "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
+                                    "BLOCKLISTS_PATH": tmpDirPath.str,
+                                    "CLANG_ENABLE_MODULES": "NO",
+                                    "CLANG_ENABLE_EXPLICIT_MODULES": "NO",
+                                    "EMIT_FRONTEND_COMMAND_LINES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             do {
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
@@ -624,12 +690,11 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                 }
 
                 try await tester.fs.writeFileContents(blockListFilePath) { file in
-                    file <<<
-                            """
-                            {
-                                "KnownFailures": []
-                            }
-                            """
+                    file <<< """
+                        {
+                            "KnownFailures": []
+                        }
+                        """
                 }
 
                 try await tester.checkBuild(runDestination: .macOS) { results in
@@ -650,21 +715,27 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                 }
 
                 try await tester.fs.writeFileContents(blockListFilePath) { file in
-                    file <<<
-                            """
-                            {
-                                "KnownFailures": ["aProject"]
-                            }
-                            """
-                }
-
-                let buildParameters = BuildParameters(configuration: "Debug",
-                                                      // Hack to reset the build system's cache of the `CommandLineToolSpecInfo`,
-                                                      // which caches the `ClangCachingBlockListInfo`
-                                                      overrides: ["CC": clangCompilerPath.dirname.join("../bin/clang").str])
-                let buildRequest = BuildRequest(parameters: buildParameters,
-                                                buildTargets: tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: buildParameters, target: $0) }),
-                                                continueBuildingAfterErrors: true, useParallelTargets: true, useImplicitDependencies: false, useDryRun: false)
+                    file <<< """
+                        {
+                            "KnownFailures": ["aProject"]
+                        }
+                        """
+                }
+
+                let buildParameters = BuildParameters(
+                    configuration: "Debug",
+                    // Hack to reset the build system's cache of the `CommandLineToolSpecInfo`,
+                    // which caches the `ClangCachingBlockListInfo`
+                    overrides: ["CC": clangCompilerPath.dirname.join("../bin/clang").str]
+                )
+                let buildRequest = BuildRequest(
+                    parameters: buildParameters,
+                    buildTargets: tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: buildParameters, target: $0) }),
+                    continueBuildingAfterErrors: true,
+                    useParallelTargets: true,
+                    useImplicitDependencies: false,
+                    useDryRun: false
+                )
 
                 try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest) { results in
                     results.checkNoTask(.matchRuleType("ScanDependencies"))
@@ -712,28 +783,35 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: buildSettings)],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: buildSettings
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int something = 1;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
@@ -803,11 +881,10 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
 
             // Modify the source file to trigger a cache miss.
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int something = 1000;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1000;
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
@@ -834,7 +911,8 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                                 TestFile("header.h"),
                                 TestFile("file2.c"),
                                 TestFile("file3.c"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -843,13 +921,17 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                                     "CLANG_ENABLE_COMPILE_CACHE": "YES",
                                     "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
                                     "COMPILATION_CACHE_LIMIT_SIZE": "1",
-                                    "DSTROOT": tmpDirPath.join("dstroot").str])],
+                                    "DSTROOT": tmpDirPath.join("dstroot").str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library1",
                                 type: .staticLibrary,
                                 buildPhases: [TestSourcesBuildPhase(["file1.c"])],
-                                dependencies: ["Library2"]),
+                                dependencies: ["Library2"]
+                            ),
                             TestStandardTarget(
                                 "Library2",
                                 type: .staticLibrary,
@@ -858,8 +940,16 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                                         "Debug",
                                         buildSettings: [
                                             "GCC_PREFIX_HEADER": "header.h",
-                                            "GCC_PRECOMPILE_PREFIX_HEADER": "YES"])],
-                                buildPhases: [TestSourcesBuildPhase(["file2.c", "file3.c"])])])])
+                                            "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
+                                        ]
+                                    )
+                                ],
+                                buildPhases: [TestSourcesBuildPhase(["file2.c", "file3.c"])]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -968,7 +1058,8 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                                 TestFile("module.modulemap"),
                                 TestFile("header.h"),
                                 TestFile("file2.c"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -979,12 +1070,20 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                                     "COMPILATION_CACHE_LIMIT_SIZE": "1",
                                     "CLANG_ENABLE_MODULES": "YES",
                                     "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                    "DSTROOT": tmpDirPath.join("dstroot").str])],
+                                    "DSTROOT": tmpDirPath.join("dstroot").str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
-                                buildPhases: [TestSourcesBuildPhase(["file1.c", "file2.c"])])])])
+                                buildPhases: [TestSourcesBuildPhase(["file1.c", "file2.c"])]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -992,20 +1091,18 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                 stream <<< "int something = 1;"
             }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/module.modulemap")) { stream in
-                stream <<<
-                """
-                module M { header "header.h" }
-                """
+                stream <<< """
+                    module M { header "header.h" }
+                    """
             }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/header.h")) { stream in
                 stream <<< "typedef int my_int;"
             }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file2.c")) { stream in
-                stream <<<
-                """
-                #include "header.h"
-                my_int something = 1;
-                """
+                stream <<< """
+                    #include "header.h"
+                    my_int something = 1;
+                    """
             }
 
             // Clean build.
@@ -1039,11 +1136,10 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
 
             // Incremental build of a file that does depend on the module.
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file2.c")) { stream in
-                stream <<<
-                """
-                #include "header.h"
-                my_int something = 2;
-                """
+                stream <<< """
+                    #include "header.h"
+                    my_int something = 2;
+                    """
             }
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
                 results.checkNoDiagnostics()
@@ -1063,11 +1159,10 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
             }
             #expect(!tester.fs.exists(tmpDirPath.join("CompilationCache")))
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file2.c")) { stream in
-                stream <<<
-                """
-                #include "header.h"
-                my_int something = 3;
-                """
+                stream <<< """
+                    #include "header.h"
+                    my_int something = 3;
+                    """
             }
             // The module include-tree, PCM and diagnostics got removed; the TU include-tree got removed too.
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
@@ -1106,7 +1201,8 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                                 TestFile("header.h"),
                                 TestFile("file2.c"),
                                 TestFile("file3.c"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -1117,13 +1213,17 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                                     "COMPILATION_CACHE_LIMIT_SIZE": "1",
                                     "CLANG_ENABLE_MODULES": "YES",
                                     "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                    "DSTROOT": tmpDirPath.join("dstroot").str])],
+                                    "DSTROOT": tmpDirPath.join("dstroot").str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library1",
                                 type: .staticLibrary,
                                 buildPhases: [TestSourcesBuildPhase(["file1.c"])],
-                                dependencies: ["Library2"]),
+                                dependencies: ["Library2"]
+                            ),
                             TestStandardTarget(
                                 "Library2",
                                 type: .staticLibrary,
@@ -1132,46 +1232,48 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                                         "Debug",
                                         buildSettings: [
                                             "GCC_PREFIX_HEADER": "header.h",
-                                            "GCC_PRECOMPILE_PREFIX_HEADER": "YES"])],
-                                buildPhases: [TestSourcesBuildPhase(["file2.c", "file3.c"])])])])
+                                            "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
+                                        ]
+                                    )
+                                ],
+                                buildPhases: [TestSourcesBuildPhase(["file2.c", "file3.c"])]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file1.c")) { stream in
-                stream <<<
-                """
-                int something = 1;
-                """
+                stream <<< """
+                    int something = 1;
+                    """
             }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/module.modulemap")) { stream in
-                stream <<<
-                """
-                module M { header "M.h" }
-                """
+                stream <<< """
+                    module M { header "M.h" }
+                    """
             }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/M.h")) { stream in
-                stream <<<
-                """
-                typedef int my_int;
-                """
+                stream <<< """
+                    typedef int my_int;
+                    """
             }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/header.h")) { stream in
-                stream <<<
-                """
-                #include "M.h"
-                """
+                stream <<< """
+                    #include "M.h"
+                    """
             }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file2.c")) { stream in
-                stream <<<
-                """
-                my_int something = 1;
-                """
+                stream <<< """
+                    my_int something = 1;
+                    """
             }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file3.c")) { stream in
-                stream <<<
-                """
-                my_int something = 1;
-                """
+                stream <<< """
+                    my_int something = 1;
+                    """
             }
 
             // Clean build.
@@ -1193,10 +1295,9 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
 
             // Incremental build of a file that does not depend on the prefix header.
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file1.c")) { stream in
-                stream <<<
-                """
-                int something = 2;
-                """
+                stream <<< """
+                    int something = 2;
+                    """
             }
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
                 results.checkNoDiagnostics()
@@ -1212,10 +1313,9 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
 
             // Incremental build of a file that does depend on the prefix header.
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file2.c")) { stream in
-                stream <<<
-                """
-                my_int something = 2;
-                """
+                stream <<< """
+                    my_int something = 2;
+                    """
             }
             // Despite the low CAS size limit the PCH include-tree should not get garbage collected.
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
@@ -1237,10 +1337,9 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
             }
             #expect(!tester.fs.exists(tmpDirPath.join("CompilationCache")))
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file2.c")) { stream in
-                stream <<<
-                """
-                my_int something = 3;
-                """
+                stream <<< """
+                    my_int something = 3;
+                    """
             }
             // The module, PCH and TU include-trees got removed so the scanner needs to run again.
             // The module PCM got removed so the compiler needs to run again.
@@ -1282,41 +1381,47 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                             children: [
                                 TestFile("file1.c"),
                                 TestFile("file2.cpp"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_COMPILE_CACHE": "YES",
-                                "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
-                                "COMPILATION_CACHE_ENABLE_DIAGNOSTIC_REMARKS": "YES",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_COMPILE_CACHE": "YES",
+                                    "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
+                                    "COMPILATION_CACHE_ENABLE_DIAGNOSTIC_REMARKS": "YES",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file1.c", "file2.cpp"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file1.c", "file2.cpp"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file1.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int something = 1;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file2.cpp")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int otherthing = 2;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int otherthing = 2;
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
@@ -1376,30 +1481,38 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                             children: [
                                 TestFile("file.c"),
                                 TestFile("pch.h"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_COMPILE_CACHE": "YES",
-                                "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
-                                "COMPILATION_CACHE_ENABLE_DIAGNOSTIC_REMARKS": "YES",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
-                                "DSTROOT": tmpDirPath.join("dstroot").str,
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_COMPILE_CACHE": "YES",
+                                    "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
+                                    "COMPILATION_CACHE_ENABLE_DIAGNOSTIC_REMARKS": "YES",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
+                                    "DSTROOT": tmpDirPath.join("dstroot").str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: ["GCC_PREFIX_HEADER": "pch.h"]),
+                                    TestBuildConfiguration("Debug", buildSettings: ["GCC_PREFIX_HEADER": "pch.h"])
                                 ],
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -1463,35 +1576,42 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_COMPILE_CACHE": "YES",
-                                "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
-                                "COMPILATION_CACHE_ENABLE_DIAGNOSTIC_REMARKS": "YES",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "CLANG_ENABLE_EXPLICIT_MODULES": "NO",
-                            ])],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_COMPILE_CACHE": "YES",
+                                    "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
+                                    "COMPILATION_CACHE_ENABLE_DIAGNOSTIC_REMARKS": "YES",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "CLANG_ENABLE_EXPLICIT_MODULES": "NO",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int something = 1;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
@@ -1520,52 +1640,57 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                             groupTree: TestGroup(
                                 "Sources",
                                 children: [
-                                    TestFile("file.c"),
-                                ]),
-                            buildConfigurations: [TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "CLANG_ENABLE_COMPILE_CACHE": "YES",
-                                    "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
-                                    "COMPILATION_CACHE_ENABLE_DIAGNOSTIC_REMARKS": "YES",
-                                    "CLANG_ENABLE_MODULES": "YES",
-                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                    "HEADER_SEARCH_PATHS": "\(moduleDir.str)",
-                                    "CLANG_ENABLE_PREFIX_MAPPING": "YES",
-                                    "CLANG_OTHER_PREFIX_MAPPINGS": "\(moduleDir.str)=/^mod",
-                                    "DSTROOT": tmpDirPath.join("dstroot").str,
-                                    "EMIT_FRONTEND_COMMAND_LINES": "YES",
-                                ])],
+                                    TestFile("file.c")
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "CLANG_ENABLE_COMPILE_CACHE": "YES",
+                                        "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
+                                        "COMPILATION_CACHE_ENABLE_DIAGNOSTIC_REMARKS": "YES",
+                                        "CLANG_ENABLE_MODULES": "YES",
+                                        "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                        "HEADER_SEARCH_PATHS": "\(moduleDir.str)",
+                                        "CLANG_ENABLE_PREFIX_MAPPING": "YES",
+                                        "CLANG_OTHER_PREFIX_MAPPINGS": "\(moduleDir.str)=/^mod",
+                                        "DSTROOT": tmpDirPath.join("dstroot").str,
+                                        "EMIT_FRONTEND_COMMAND_LINES": "YES",
+                                    ]
+                                )
+                            ],
                             targets: [
                                 TestStandardTarget(
                                     "Library",
                                     type: .staticLibrary,
                                     buildPhases: [
-                                        TestSourcesBuildPhase(["file.c"]),
-                                    ]),
-                            ])])
+                                        TestSourcesBuildPhase(["file.c"])
+                                    ]
+                                )
+                            ]
+                        )
+                    ]
+                )
 
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
                 try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                    stream <<<
-                    """
-                    #include "other.h"
-                    void foo(void) {}
-                    """
+                    stream <<< """
+                        #include "other.h"
+                        void foo(void) {}
+                        """
                 }
                 try await tester.fs.writeFileContents(moduleDir.join("other.h")) { stream in
-                    stream <<<
-                    """
-                    int other;
-                    """
+                    stream <<< """
+                        int other;
+                        """
                 }
                 try await tester.fs.writeFileContents(moduleDir.join("module.modulemap")) { stream in
-                    stream <<<
-                    """
-                    module Other { header "other.h" }
-                    """
+                    stream <<< """
+                        module Other { header "other.h" }
+                        """
                 }
 
                 try await tester.checkBuild(runDestination: .macOS, persistent: true, body: body)
@@ -1628,40 +1753,50 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_COMPILE_CACHE": "YES",
-                                "COMPILATION_CACHE_ENABLE_DIAGNOSTIC_REMARKS": "YES",
-                                "DSTROOT": tmpDirPath.join("dstroot").str,
-                            ])],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_COMPILE_CACHE": "YES",
+                                    "COMPILATION_CACHE_ENABLE_DIAGNOSTIC_REMARKS": "YES",
+                                    "DSTROOT": tmpDirPath.join("dstroot").str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int something = 1;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
 
-            let parameters =  BuildParameters(configuration: "Debug", overrides: ["CCHROOT": "\(tmpDirPath.join("CCHROOT").str)"])
-            let parametersCustom =  BuildParameters(configuration: "Debug", overrides:[
-                "COMPILATION_CACHE_CAS_PATH": "\(tmpDirPath.join("Custom").str)",
-                "COMPILATION_CACHE_LIMIT_SIZE": "100K",
-            ])
+            let parameters = BuildParameters(configuration: "Debug", overrides: ["CCHROOT": "\(tmpDirPath.join("CCHROOT").str)"])
+            let parametersCustom = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    "COMPILATION_CACHE_CAS_PATH": "\(tmpDirPath.join("Custom").str)",
+                    "COMPILATION_CACHE_LIMIT_SIZE": "100K",
+                ]
+            )
 
             try await tester.checkBuild(parameters: parameters, runDestination: .macOS, persistent: true) { results in
                 // Normal build, cache persists.
@@ -1695,9 +1830,13 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
             try await tester.checkBuild(runDestination: .macOS, buildCommand: .cleanBuildFolder(style: .regular), body: { _ in })
 
             let arena = ArenaInfo.buildArena(derivedDataRoot: tmpDirPath.join("derived-data"))
-            let parametersWithDerivedData =  BuildParameters(configuration: "Debug", overrides:[
-                "COMPILATION_CACHE_LIMIT_SIZE": "0",
-            ], arena: arena)
+            let parametersWithDerivedData = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    "COMPILATION_CACHE_LIMIT_SIZE": "0"
+                ],
+                arena: arena
+            )
 
             try await tester.checkBuild(parameters: parametersWithDerivedData, runDestination: .macOS, persistent: true) { results in
                 // Normal build, cache persists.
@@ -1731,13 +1870,17 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                             children: [
                                 TestFile("file.c"),
                                 TestFile("generated1.c.fake-customrule"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_COMPILE_CACHE": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_COMPILE_CACHE": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
@@ -1752,17 +1895,19 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                                 buildRules: [
                                     TestBuildRule(filePattern: "*.fake-customrule", script: "cp \"$INPUT_FILE_PATH\" \"${DERIVED_FILE_DIR}/${INPUT_FILE_BASE}\"", outputs: ["$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE)"])
                                 ]
-                            ),
-                        ])])
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int something = 1;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/generated1.c.fake-customrule")) { stream in
                 stream <<< "void foo(void) {}"
@@ -1792,32 +1937,39 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("t.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "CLANG_ENABLE_EXPLICIT_MODULES": "YES",
-                                "CLANG_COMPILE_CACHE_PATH": tmpDirPath.join("CompilationCache").str,
-                            ])],
+                                TestFile("t.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "CLANG_ENABLE_EXPLICIT_MODULES": "YES",
+                                    "CLANG_COMPILE_CACHE_PATH": tmpDirPath.join("CompilationCache").str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Lib",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["t.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["t.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/t.c")) { stream in
-                stream <<<
-                """
-                void foo(void) {}
-                """
+                stream <<< """
+                    void foo(void) {}
+                    """
             }
 
             // Build with explicit modules scanning but without caching.
@@ -1860,27 +2012,34 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: buildSettings)],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: buildSettings
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int something = 1;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
 
             let specificCAS = casPath.join(usePlugin ? "plugin" : "builtin")
@@ -1931,27 +2090,34 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: buildSettings)],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: buildSettings
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int something = 1;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
 
             let specificCAS = casPath.join("builtin")
@@ -1972,9 +2138,11 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
             try await checkBuild("validated successfully\n")
             // Create an error and trigger revalidation by messing with the validation data.
             let dataDir = casPath.join("builtin").join("v1.1")
-            let dataFile = try #require(tester.fs.listdir(dataDir).first {
-                $0.hasSuffix(".data") && $0.hasPrefix("v")
-            })
+            let dataFile = try #require(
+                tester.fs.listdir(dataDir).first {
+                    $0.hasSuffix(".data") && $0.hasPrefix("v")
+                }
+            )
             try tester.fs.move(dataDir.join(dataFile), to: dataDir.join("moved"))
             try await tester.fs.writeFileContents(casPath.join("builtin/v1.validation")) { stream in
                 stream <<< "0"
@@ -2005,38 +2173,49 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: buildSettings)],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: buildSettings
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library1",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "Library2",
                                 type: .staticLibrary,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "VALIDATE_CAS_EXEC": llvmCasExec2.str,
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "VALIDATE_CAS_EXEC": llvmCasExec2.str
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int something = 1;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
 
             let specificCAS = casPath.join("builtin")
diff --git a/Tests/SWBBuildSystemTests/ClangExplicitModulesTests.swift b/Tests/SWBBuildSystemTests/ClangExplicitModulesTests.swift
index 872b0043..e411a0a6 100644
--- a/Tests/SWBBuildSystemTests/ClangExplicitModulesTests.swift
+++ b/Tests/SWBBuildSystemTests/ClangExplicitModulesTests.swift
@@ -35,32 +35,39 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int something = 1;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
 
             try await tester.checkBuild(runDestination: .host, persistent: true) { results in
@@ -82,11 +89,10 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
 
             // Modify the source file to trigger a new scan.
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int something = 2;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 2;
+                    """
             }
 
             try await tester.checkBuild(runDestination: .host, persistent: true) { results in
@@ -117,33 +123,40 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                "CLANG_EXPLICIT_MODULES_LIBCLANG_PATH": Path.null.str,
-                            ])],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    "CLANG_EXPLICIT_MODULES_LIBCLANG_PATH": Path.null.str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int something = 1;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
 
             try await tester.checkBuild(runDestination: .host, persistent: true) { results in
@@ -167,39 +180,45 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                             children: [
                                 TestFile("file.c"),
                                 TestFile("other.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c", "other.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c", "other.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int something = 1;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/other.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int otherthing = 1;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int otherthing = 1;
+                    """
             }
 
             try await tester.checkBuild(runDestination: .host) { results in
@@ -232,39 +251,45 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                             children: [
                                 TestFile("file.c"),
                                 TestFile("other.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c", "other.m"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c", "other.m"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int something = 1;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/other.m")) { stream in
-                stream <<<
-                """
-                #include <Foundation/Foundation.h>
-                int otherthing = 1;
-                """
+                stream <<< """
+                    #include <Foundation/Foundation.h>
+                    int otherthing = 1;
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS) { results in
@@ -299,58 +324,62 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                 TestFile("mod.h"),
                                 TestFile("pch.h"),
                                 TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: ["GCC_PREFIX_HEADER": "pch.h"]),
+                                    TestBuildConfiguration("Debug", buildSettings: ["GCC_PREFIX_HEADER": "pch.h"])
                                 ],
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/module.modulemap")) { stream in
-                stream <<<
-                """
-                module Mod { header "mod.h" }
-                """
+                stream <<< """
+                    module Mod { header "mod.h" }
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/mod.h")) { stream in
-                stream <<<
-                """
-                typedef int mod_int;
-                """
+                stream <<< """
+                    typedef int mod_int;
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/pch.h")) { stream in
-                stream <<<
-                """
-                #include "mod.h"
-                typedef mod_int pch_int;
-                """
+                stream <<< """
+                    #include "mod.h"
+                    typedef mod_int pch_int;
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include "mod.h"
-                mod_int some = 1;
-                pch_int thing = 2;
-                """
+                stream <<< """
+                    #include "mod.h"
+                    mod_int some = 1;
+                    pch_int thing = 2;
+                    """
             }
 
             try await tester.checkBuild(runDestination: .host) { results in
@@ -373,8 +402,11 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
         }
     }
 
-    @Test(.requireSDKs(.macOS), .disabled("setting global environment interferes concurrent tests"),
-          .bug("https://github.com/swiftlang/swift-build/issues/835"))
+    @Test(
+        .requireSDKs(.macOS),
+        .disabled("setting global environment interferes concurrent tests"),
+        .bug("https://github.com/swiftlang/swift-build/issues/835")
+    )
     func explicitModulesEnvironment() async throws {
         try await withTemporaryDirectory { tmpDirPath in
             let testWorkspace = TestWorkspace(
@@ -386,32 +418,39 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                "OTHER_CFLAGS": "-Wmain -Werror",
-                            ])],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    "OTHER_CFLAGS": "-Wmain -Werror",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                int main(int argc) {}
-                """
+                stream <<< """
+                    int main(int argc) {}
+                    """
             }
 
             // FIXME: These two lines shouldn't be necessary. clang directly recognizes the same of this environment variable (coincidentally the same as our build setting). llbuild's shell tool has an `inherit-env` property which is true by default, and causes the _process_ environment of the build service to be propagated to build tasks like clang. Instead we should set `inherit-env` to false and merge `processEnvironment` from UserInfo into the task's environment, so that it is overridable from tests.
@@ -445,40 +484,47 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                     "Includes",
                                     children: [
                                         TestFile("header.h")
-                                    ]),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                "SYSTEM_HEADER_SEARCH_PATHS": "Includes",
-                            ])],
+                                    ]
+                                ),
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    "SYSTEM_HEADER_SEARCH_PATHS": "Includes",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include <header.h>
-                int main() {}
-                """
+                stream <<< """
+                    #include <header.h>
+                    int main() {}
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Includes/header.h")) { stream in
-                stream <<<
-                """
-                typedef int header_int;
-                """
+                stream <<< """
+                    typedef int header_int;
+                    """
             }
 
             try await tester.checkBuild(runDestination: .host) { results in
@@ -505,14 +551,18 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                 TestFile("Framework.h"),
                                 TestFile("Shared.h"),
                                 TestFile("Shared.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
@@ -526,58 +576,61 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                             TestStandardTarget(
                                 "Framework",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "DEFINES_MODULE": "YES",
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "DEFINES_MODULE": "YES"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["Shared.m"]),
                                     TestHeadersBuildPhase([
                                         TestBuildFile("Framework.h", headerVisibility: .public),
                                         TestBuildFile("Shared.h", headerVisibility: .public),
                                     ]),
-                                ]),
-                        ])])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.m")) { stream in
-                stream <<<
-                """
-                #include <Framework/Framework.h>
+                stream <<< """
+                    #include <Framework/Framework.h>
 
-                void test() {
-                    NSLog(@"%@", [[Shared alloc] init]);
-                }
+                    void test() {
+                        NSLog(@"%@", [[Shared alloc] init]);
+                    }
 
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework.h")) { stream in
-                stream <<<
-                """
-                #include <Framework/Shared.h>
-                """
+                stream <<< """
+                    #include <Framework/Shared.h>
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.h")) { stream in
-                stream <<<
-                """
-                #include <Foundation/Foundation.h>
-                @interface Shared: NSObject {}
-                @end
+                stream <<< """
+                    #include <Foundation/Foundation.h>
+                    @interface Shared: NSObject {}
+                    @end
 
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.m")) { stream in
-                stream <<<
-                """
-                #include "Shared.h"
-                @implementation Shared {}
-                @end
-                """
+                stream <<< """
+                    #include "Shared.h"
+                    @implementation Shared {}
+                    @end
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS) { results in
@@ -611,55 +664,61 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                 TestFile("mod.h"),
                                 TestFile("module.modulemap"),
                                 TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                // This makes the Clang driver invocation expand into multiple -cc1 invocations.
-                                "OTHER_CFLAGS": "-save-temps=obj",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    // This makes the Clang driver invocation expand into multiple -cc1 invocations.
+                                    "OTHER_CFLAGS": "-save-temps=obj",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/module.modulemap")) { stream in
-                stream <<<
-                """
-                module mod { header "mod.h" }
-                """
+                stream <<< """
+                    module mod { header "mod.h" }
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/mod.h")) { stream in
-                stream <<<
-                """
-                typedef int int_mod;
-                """
+                stream <<< """
+                    typedef int int_mod;
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include "mod.h"
-                int_mod x = 42;
-                """
+                stream <<< """
+                    #include "mod.h"
+                    int_mod x = 42;
+                    """
             }
 
             try await tester.checkBuild(runDestination: .host, persistent: true) { results in
                 results.checkTask(.matchRuleType("ScanDependencies")) { _ in }
                 results.checkTask(.matchRuleType("PrecompileModule")) { _ in }
-                var outputs = results.checkTask(.matchRuleType("CompileC")) { task in
-                    task.outputPaths
-                } ?? []
+                var outputs =
+                    results.checkTask(.matchRuleType("CompileC")) { task in
+                        task.outputPaths
+                    } ?? []
 
                 results.checkNoDiagnostics()
 
@@ -695,48 +754,53 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                     TestFile("mod.h"),
                                     TestFile("module.modulemap"),
                                     TestFile("file.c"),
-                                ]),
-                            buildConfigurations: [TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "C_COMPILER_LAUNCHER": "/usr/bin/time",
-                                    "CLANG_ENABLE_MODULES": "YES",
-                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                    "CLANG_ENABLE_EXPLICIT_MODULES_WITH_COMPILER_LAUNCHER": allowLauncher ? "YES" : "NO",
-                                ])],
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "C_COMPILER_LAUNCHER": "/usr/bin/time",
+                                        "CLANG_ENABLE_MODULES": "YES",
+                                        "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                        "CLANG_ENABLE_EXPLICIT_MODULES_WITH_COMPILER_LAUNCHER": allowLauncher ? "YES" : "NO",
+                                    ]
+                                )
+                            ],
                             targets: [
                                 TestStandardTarget(
                                     "Library",
                                     type: .staticLibrary,
                                     buildPhases: [
-                                        TestSourcesBuildPhase(["file.c"]),
-                                    ]),
-                            ])])
+                                        TestSourcesBuildPhase(["file.c"])
+                                    ]
+                                )
+                            ]
+                        )
+                    ]
+                )
 
                 let tester = try await BuildOperationTester(self.getCore(), testWorkspace, simulated: false)
                 tester.userPreferences = UserPreferences.defaultForTesting.with(enableDebugActivityLogs: true)
 
                 try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/module.modulemap")) { stream in
-                    stream <<<
-                    """
-                    module mod { header "mod.h" }
-                    """
+                    stream <<< """
+                        module mod { header "mod.h" }
+                        """
                 }
 
                 try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/mod.h")) { stream in
-                    stream <<<
-                    """
-                    typedef int int_mod;
-                    """
+                    stream <<< """
+                        typedef int int_mod;
+                        """
                 }
 
                 try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                    stream <<<
-                    """
-                    #include "mod.h"
-                    int_mod x = 42;
-                    """
+                    stream <<< """
+                        #include "mod.h"
+                        int_mod x = 42;
+                        """
                 }
 
                 return tester
@@ -797,14 +861,18 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                 TestFile("Framework.h"),
                                 TestFile("Shared.h"),
                                 TestFile("Shared.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
@@ -818,62 +886,65 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                             TestStandardTarget(
                                 "Framework",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "DEFINES_MODULE": "YES",
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "DEFINES_MODULE": "YES"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["Shared.m"]),
                                     TestHeadersBuildPhase([
                                         TestBuildFile("Framework.h", headerVisibility: .public),
                                         TestBuildFile("Shared.h", headerVisibility: .public),
                                     ]),
-                                ]),
-                        ])])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.m")) { stream in
-                stream <<<
-                """
-                #include <Framework/Framework.h>
+                stream <<< """
+                    #include <Framework/Framework.h>
 
-                void test() {
-                    NSLog(@"%@", [[Shared alloc] init]);
-                }
+                    void test() {
+                        NSLog(@"%@", [[Shared alloc] init]);
+                    }
 
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework.h")) { stream in
-                stream <<<
-                """
-                #include <Framework/Shared.h>
+                stream <<< """
+                    #include <Framework/Shared.h>
 
-                int foo(void) {
-                    return
-                }
-                """
+                    int foo(void) {
+                        return
+                    }
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.h")) { stream in
-                stream <<<
-                """
-                #include <Foundation/Foundation.h>
-                @interface Shared: NSObject {}
-                @end
+                stream <<< """
+                    #include <Foundation/Foundation.h>
+                    @interface Shared: NSObject {}
+                    @end
 
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.m")) { stream in
-                stream <<<
-                """
-                #include "Shared.h"
-                @implementation Shared {}
-                @end
-                """
+                stream <<< """
+                    #include "Shared.h"
+                    @implementation Shared {}
+                    @end
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS) { results in
@@ -897,14 +968,18 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                            ])],
+                                TestFile("file.m")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
@@ -913,20 +988,22 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                     TestSourcesBuildPhase(["file.m"])
                                 ]
                             )
-                        ])])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.m")) { stream in
-                stream <<<
-                """
-                @import Foundation;
+                stream <<< """
+                    @import Foundation;
 
-                void test() {
-                    int x;
-                    NSLog(@"%d", x);
-                }
-                """
+                    void test() {
+                        int x;
+                        NSLog(@"%d", x);
+                    }
+                    """
             }
 
             try await tester.checkBuild(parameters: BuildParameters(action: .analyze, configuration: "Debug", overrides: ["RUN_CLANG_STATIC_ANALYZER": "YES"]), runDestination: .macOS) { results in
@@ -952,35 +1029,41 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                 TestFile("Framework.h"),
                                 TestFile("Shared.h"),
                                 TestFile("Shared.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.m"]),
+                                    TestSourcesBuildPhase(["file.m"])
                                 ]
                             )
-                        ])])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.m")) { stream in
-                stream <<<
-                """
-                #include <DoesNotExist/DoesNotExist.h>
+                stream <<< """
+                    #include <DoesNotExist/DoesNotExist.h>
 
-                void test() {
-                    NSLog(@"%@", [[Shared alloc] init]);
-                }
-                """
+                    void test() {
+                        NSLog(@"%@", [[Shared alloc] init]);
+                    }
+                    """
             }
 
             // The build should produce structured diagnostics.
@@ -1008,57 +1091,61 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                 TestFile("mod.h"),
                                 TestFile("module.modulemap"),
                                 TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CC": "\(efiClang.str)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CC": "\(efiClang.str)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(self.getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(efiClang) { stream in
                 stream <<< """
-                #!/usr/bin/env sh
-                \(clangCompilerPath.str) -v $@
-                """
+                    #!/usr/bin/env sh
+                    \(clangCompilerPath.str) -v $@
+                    """
             }
             try tester.fs.setFilePermissions(efiClang, permissions: 0o755)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/module.modulemap")) { stream in
-                stream <<<
-                """
-                module mod { header "mod.h" }
-                """
+                stream <<< """
+                    module mod { header "mod.h" }
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/mod.h")) { stream in
-                stream <<<
-                """
-                typedef int int_mod;
-                """
+                stream <<< """
+                    typedef int int_mod;
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include "mod.h"
-                int_mod x = 42;
-                """
+                stream <<< """
+                    #include "mod.h"
+                    int_mod x = 42;
+                    """
             }
 
-
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
                 results.checkNoTask(.matchRuleType("ScanDependencies"))
                 results.checkNoTask(.matchRuleType("PrecompileModule"))
@@ -1078,9 +1165,10 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
     func outputPath() async throws {
         try await withTemporaryDirectory { tmpDir in
             func outputPathTest(given outputPathBuildSetting: String?, expected outputPath: Path, sourceLocation: SourceLocation = #_sourceLocation) async throws {
-                let outputBuildSettings: [String: String] = outputPathBuildSetting.map {
-                    ["CLANG_EXPLICIT_MODULES_OUTPUT_PATH": $0]
-                } ?? [:]
+                let outputBuildSettings: [String: String] =
+                    outputPathBuildSetting.map {
+                        ["CLANG_EXPLICIT_MODULES_OUTPUT_PATH": $0]
+                    } ?? [:]
 
                 let testWorkspace = TestWorkspace(
                     "Test",
@@ -1091,32 +1179,39 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                             groupTree: TestGroup(
                                 "Sources",
                                 children: [
-                                    TestFile("file.c"),
-                                ]),
-                            buildConfigurations: [TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "CLANG_ENABLE_MODULES": "YES",
-                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                ].merging(outputBuildSettings, uniquingKeysWith: { a, b in b }))],
+                                    TestFile("file.c")
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "CLANG_ENABLE_MODULES": "YES",
+                                        "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    ].merging(outputBuildSettings, uniquingKeysWith: { a, b in b })
+                                )
+                            ],
                             targets: [
                                 TestStandardTarget(
                                     "Library",
                                     type: .staticLibrary,
                                     buildPhases: [
-                                        TestSourcesBuildPhase(["file.c"]),
-                                    ]),
-                            ])])
+                                        TestSourcesBuildPhase(["file.c"])
+                                    ]
+                                )
+                            ]
+                        )
+                    ]
+                )
 
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
                 try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                    stream <<<
-            """
-            #include <stdio.h>
-            int something = 1;
-            """
+                    stream <<< """
+                        #include <stdio.h>
+                        int something = 1;
+                        """
                 }
 
                 try await tester.checkBuild(runDestination: .host, persistent: true) { results in
@@ -1166,73 +1261,78 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                 TestFile("module.modulemap"),
                                 TestFile("file_1.c"),
                                 TestFile("file_2.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                "CLANG_EXPLICIT_MODULES_OUTPUT_PATH": "$OBJROOT/ExplicitModules/$TARGET_NAME",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    "CLANG_EXPLICIT_MODULES_OUTPUT_PATH": "$OBJROOT/ExplicitModules/$TARGET_NAME",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library_1",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file_1.c"]),
-                                ]),
+                                    TestSourcesBuildPhase(["file_1.c"])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "Library_2",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file_2.c"]),
-                                ]),
+                                    TestSourcesBuildPhase(["file_2.c"])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "Library_1_2",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file_1.c", "file_2.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file_1.c", "file_2.c"])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/module.modulemap")) { stream in
-                stream <<<
-                """
-                module mod_nested { header "mod_nested.h" }
-                module mod        { header "mod.h"        }
-                """
+                stream <<< """
+                    module mod_nested { header "mod_nested.h" }
+                    module mod        { header "mod.h"        }
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/mod_nested.h")) { stream in
-                stream <<<
-                """
-                """
+                stream <<< """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/mod.h")) { stream in
-                stream <<<
-                """
-                #include "mod_nested.h"
-                """
+                stream <<< """
+                    #include "mod_nested.h"
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file_1.c")) { stream in
-                stream <<<
-                """
-                #include "mod.h"
-                void foo(void) {}
-                """
+                stream <<< """
+                    #include "mod.h"
+                    void foo(void) {}
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file_2.c")) { stream in
-                stream <<<
-                """
-                #include "mod.h"
-                void bar(void) {}
-                """
+                stream <<< """
+                    #include "mod.h"
+                    void bar(void) {}
+                    """
             }
 
             let parameters = BuildParameters(configuration: "Debug")
@@ -1296,66 +1396,70 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                 TestFile("module.modulemap"),
                                 TestFile("file_1.c"),
                                 TestFile("file_2.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library_1",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file_1.c"]),
-                                ]),
+                                    TestSourcesBuildPhase(["file_1.c"])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "Library_2",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file_2.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file_2.c"])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/module.modulemap")) { stream in
-                stream <<<
-            """
-            module mod_nested { header "mod_nested.h" }
-            module mod        { header "mod.h"        }
-            """
+                stream <<< """
+                    module mod_nested { header "mod_nested.h" }
+                    module mod        { header "mod.h"        }
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/mod_nested.h")) { stream in
-                stream <<<
-            """
-            """
+                stream <<< """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/mod.h")) { stream in
-                stream <<<
-            """
-            #include "mod_nested.h"
-            """
+                stream <<< """
+                    #include "mod_nested.h"
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file_1.c")) { stream in
-                stream <<<
-            """
-            #include "mod.h"
-            void foo(void) {}
-            """
+                stream <<< """
+                    #include "mod.h"
+                    void foo(void) {}
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file_2.c")) { stream in
-                stream <<<
-            """
-            #include "mod.h"
-            void bar(void) {}
-            """
+                stream <<< """
+                    #include "mod.h"
+                    void bar(void) {}
+                    """
             }
 
             let parameters = BuildParameters(configuration: "Debug")
@@ -1393,31 +1497,40 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                 TestFile("mod.h"),
                                 TestFile("module.modulemap"),
                                 TestFile("file_1.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "OBJROOT": tmpDir.join("objroot").str,
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                "CLANG_EXPLICIT_MODULES_OUTPUT_PATH": "\(tmpDir.join("clangmodules").str)",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "OBJROOT": tmpDir.join("objroot").str,
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    "CLANG_EXPLICIT_MODULES_OUTPUT_PATH": "\(tmpDir.join("clangmodules").str)",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library_1",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file_1.c"]),
-                                ]),
-                        ]), TestProject(
-                            "aProject2",
-                            groupTree: TestGroup(
-                                "Sources",
-                                children: [
-                                    TestFile("file_2.c"),
-                                ]),
-                            buildConfigurations: [TestBuildConfiguration(
+                                    TestSourcesBuildPhase(["file_1.c"])
+                                ]
+                            )
+                        ]
+                    ),
+                    TestProject(
+                        "aProject2",
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile("file_2.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
                                     "OBJROOT": tmpDir.join("objroot").str,
@@ -1426,44 +1539,46 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                     "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
                                     "HEADER_SEARCH_PATHS": "$(inherited) \(tmpDir.join("Test").join("aProject").strWithPosixSlashes)",
                                     "CLANG_EXPLICIT_MODULES_OUTPUT_PATH": "\(tmpDir.join("clangmodules").strWithPosixSlashes)",
-                                ])],
-                            targets: [
-                                TestStandardTarget(
-                                    "Library_2",
-                                    type: .staticLibrary,
-                                    buildPhases: [
-                                        TestSourcesBuildPhase(["file_2.c"]),
-                                    ]),
-                            ])])
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "Library_2",
+                                type: .staticLibrary,
+                                buildPhases: [
+                                    TestSourcesBuildPhase(["file_2.c"])
+                                ]
+                            )
+                        ]
+                    ),
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/module.modulemap")) { stream in
-                stream <<<
-            """
-            module mod { header "mod.h" }
-            """
+                stream <<< """
+                    module mod { header "mod.h" }
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/mod.h")) { stream in
-                stream <<<
-            """
-            void foo(void) {}
-            """
+                stream <<< """
+                    void foo(void) {}
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file_1.c")) { stream in
-                stream <<<
-            """
-            #include "mod.h"
-            """
+                stream <<< """
+                    #include "mod.h"
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject2/file_2.c")) { stream in
-                stream <<<
-            """
-            #include "mod.h"
-            """
+                stream <<< """
+                    #include "mod.h"
+                    """
             }
 
             let parameters = BuildParameters(configuration: "Debug")
@@ -1498,32 +1613,39 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-            """
-            #include <stdio.h>
-            int something = 1;
-            """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
 
             // Clean build
@@ -1541,11 +1663,10 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
 
             // Touch the source file to trigger a new scan.
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-            """
-            #include <stdio.h>
-            int something = 2;
-            """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 2;
+                    """
             }
 
             try await tester.checkBuild(runDestination: .host, persistent: true) { results in
@@ -1571,32 +1692,39 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-            """
-            #include <stdio.h>
-            int something = 1;
-            """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
 
             // Clean build
@@ -1613,11 +1741,10 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
 
             // Touch the source file to trigger a new scan.
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-            """
-            #include <stdio.h>
-            int something = 2;
-            """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 2;
+                    """
             }
 
             try await tester.checkBuild(runDestination: .host, persistent: true) { results in
@@ -1649,14 +1776,18 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                 TestFile("Framework.h"),
                                 TestFile("Shared.h"),
                                 TestFile("Shared.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
@@ -1670,58 +1801,61 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                             TestStandardTarget(
                                 "Framework",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "DEFINES_MODULE": "YES",
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "DEFINES_MODULE": "YES"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["Shared.m"]),
                                     TestHeadersBuildPhase([
                                         TestBuildFile("Framework.h", headerVisibility: .public),
                                         TestBuildFile("Shared.h", headerVisibility: .public),
                                     ]),
-                                ]),
-                        ])])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.m")) { stream in
-                stream <<<
-                """
-                #include <Framework/Framework.h>
+                stream <<< """
+                    #include <Framework/Framework.h>
 
-                void test() {
-                    NSLog(@"%@", [[Shared alloc] init]);
-                }
+                    void test() {
+                        NSLog(@"%@", [[Shared alloc] init]);
+                    }
 
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework.h")) { stream in
-                stream <<<
-                """
-                #include <Framework/Shared.h>
-                """
+                stream <<< """
+                    #include <Framework/Shared.h>
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.h")) { stream in
-                stream <<<
-                """
-                #include <Foundation/Foundation.h>
-                @interface Shared: NSObject {}
-                @end
+                stream <<< """
+                    #include <Foundation/Foundation.h>
+                    @interface Shared: NSObject {}
+                    @end
 
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.m")) { stream in
-                stream <<<
-                """
-                #include "Shared.h"
-                @implementation Shared {}
-                @end
-                """
+                stream <<< """
+                    #include "Shared.h"
+                    @implementation Shared {}
+                    @end
+                    """
             }
 
             // Build and check that we build the Framework module once, and we build other module dependencies.
@@ -1766,14 +1900,18 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                 TestFile("Framework.h"),
                                 TestFile("Shared.h"),
                                 TestFile("Shared.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
@@ -1787,58 +1925,61 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                             TestStandardTarget(
                                 "Framework",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "DEFINES_MODULE": "YES",
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "DEFINES_MODULE": "YES"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["Shared.m"]),
                                     TestHeadersBuildPhase([
                                         TestBuildFile("Framework.h", headerVisibility: .public),
                                         TestBuildFile("Shared.h", headerVisibility: .public),
                                     ]),
-                                ]),
-                        ])])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.m")) { stream in
-                stream <<<
-                """
-                #include <Framework/Framework.h>
+                stream <<< """
+                    #include <Framework/Framework.h>
 
-                void test() {
-                    NSLog(@"%@", [[Shared alloc] init]);
-                }
+                    void test() {
+                        NSLog(@"%@", [[Shared alloc] init]);
+                    }
 
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework.h")) { stream in
-                stream <<<
-                """
-                #include <Framework/Shared.h>
-                """
+                stream <<< """
+                    #include <Framework/Shared.h>
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.h")) { stream in
-                stream <<<
-                """
-                #include <Foundation/Foundation.h>
-                @interface Shared: NSObject {}
-                @end
+                stream <<< """
+                    #include <Foundation/Foundation.h>
+                    @interface Shared: NSObject {}
+                    @end
 
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.m")) { stream in
-                stream <<<
-                """
-                #include "Shared.h"
-                @implementation Shared {}
-                @end
-                """
+                stream <<< """
+                    #include "Shared.h"
+                    @implementation Shared {}
+                    @end
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
@@ -1850,15 +1991,14 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.h")) { stream in
-                stream <<<
-                """
-                #include <Foundation/Foundation.h>
-                @interface Shared: NSObject {}
-                @end
+                stream <<< """
+                    #include <Foundation/Foundation.h>
+                    @interface Shared: NSObject {}
+                    @end
 
-                @interface SharedTwo: NSObject {}
-                @end
-                """
+                    @interface SharedTwo: NSObject {}
+                    @end
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
@@ -1885,16 +2025,15 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
 
             // Introduce a new module dependency
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.h")) { stream in
-                stream <<<
-                """
-                #include <Foundation/Foundation.h>
-                #include <SceneKit/SceneKit.h>
-                @interface Shared: NSObject {}
-                @end
+                stream <<< """
+                    #include <Foundation/Foundation.h>
+                    #include <SceneKit/SceneKit.h>
+                    @interface Shared: NSObject {}
+                    @end
 
-                @interface SharedTwo: NSObject {}
-                @end
-                """
+                    @interface SharedTwo: NSObject {}
+                    @end
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
@@ -1936,14 +2075,18 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                 TestFile("Framework.h"),
                                 TestFile("Shared.h"),
                                 TestFile("Shared.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
@@ -1957,58 +2100,61 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                             TestStandardTarget(
                                 "Framework",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "DEFINES_MODULE": "YES",
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "DEFINES_MODULE": "YES"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["Shared.m"]),
                                     TestHeadersBuildPhase([
                                         TestBuildFile("Framework.h", headerVisibility: .public),
                                         TestBuildFile("Shared.h", headerVisibility: .public),
                                     ]),
-                                ]),
-                        ])])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.m")) { stream in
-                stream <<<
-                """
-                #include <Framework/Framework.h>
+                stream <<< """
+                    #include <Framework/Framework.h>
 
-                void test() {
-                    NSLog(@"%@", [[Shared alloc] init]);
-                }
+                    void test() {
+                        NSLog(@"%@", [[Shared alloc] init]);
+                    }
 
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework.h")) { stream in
-                stream <<<
-                """
-                #include <Framework/Shared.h>
-                """
+                stream <<< """
+                    #include <Framework/Shared.h>
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.h")) { stream in
-                stream <<<
-                """
-                #include <Foundation/Foundation.h>
-                @interface Shared: NSObject {}
-                @end
+                stream <<< """
+                    #include <Foundation/Foundation.h>
+                    @interface Shared: NSObject {}
+                    @end
 
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.m")) { stream in
-                stream <<<
-                """
-                #include "Shared.h"
-                @implementation Shared {}
-                @end
-                """
+                stream <<< """
+                    #include "Shared.h"
+                    @implementation Shared {}
+                    @end
+                    """
             }
 
             // Build and check that we build the Framework module once.
@@ -2046,14 +2192,18 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                             children: [
                                 TestFile("file.m"),
                                 TestFile("Framework.h"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
@@ -2067,36 +2217,41 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                             TestStandardTarget(
                                 "Framework",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "DEFINES_MODULE": "YES",
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "DEFINES_MODULE": "YES"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
                                     TestHeadersBuildPhase([
-                                        TestBuildFile("Framework.h", headerVisibility: .public),
-                                    ]),
-                                ]),
-                        ])])
+                                        TestBuildFile("Framework.h", headerVisibility: .public)
+                                    ])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.m")) { stream in
-                stream <<<
-                """
-                #import <Framework/Framework.h>
+                stream <<< """
+                    #import <Framework/Framework.h>
 
-                void test() {
-                }
+                    void test() {
+                    }
 
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework.h")) { stream in
-                stream <<<
-                """
-                #import <Foundation/Foundation.h>
-                """
+                stream <<< """
+                    #import <Foundation/Foundation.h>
+                    """
             }
 
             // Build and check that we build the Framework module once.
@@ -2109,11 +2264,10 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
 
             // Update a header in the module to add a new module dependency. We should only build the new copy of the module, as we no longer need the old one.
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework.h")) { stream in
-                stream <<<
-                """
-                #import <Foundation/Foundation.h>
-                #import <CoreData/CoreData.h>
-                """
+                stream <<< """
+                    #import <Foundation/Foundation.h>
+                    #import <CoreData/CoreData.h>
+                    """
             }
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
                 // There be 2 scanning actions.
@@ -2145,14 +2299,18 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                 TestFile("Framework2.h"),
                                 TestFile("Shared2.h"),
                                 TestFile("Shared2.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
@@ -2166,11 +2324,14 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                             TestStandardTarget(
                                 "Framework",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "DEFINES_MODULE": "YES",
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "DEFINES_MODULE": "YES"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["Shared.m"]),
                                     TestHeadersBuildPhase([
@@ -2178,89 +2339,91 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                         TestBuildFile("Shared.h", headerVisibility: .public),
                                     ]),
                                     TestFrameworksBuildPhase(["Framework2.framework"]),
-                                ], dependencies: ["Framework2"]),
+                                ],
+                                dependencies: ["Framework2"]
+                            ),
                             TestStandardTarget(
                                 "Framework2",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "DEFINES_MODULE": "YES",
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "DEFINES_MODULE": "YES"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["Shared2.m"]),
                                     TestHeadersBuildPhase([
                                         TestBuildFile("Framework2.h", headerVisibility: .public),
                                         TestBuildFile("Shared2.h", headerVisibility: .public),
                                     ]),
-                                ]),
-                        ])])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.m")) { stream in
-                stream <<<
-                """
-                #include <Framework/Framework.h>
+                stream <<< """
+                    #include <Framework/Framework.h>
 
-                void test() {
-                    NSLog(@"%@", [[Shared alloc] init]);
-                }
+                    void test() {
+                        NSLog(@"%@", [[Shared alloc] init]);
+                    }
 
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework.h")) { stream in
-                stream <<<
-                """
-                #include <Framework/Shared.h>
-                """
+                stream <<< """
+                    #include <Framework/Shared.h>
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.h")) { stream in
-                stream <<<
-                """
-                #include <Foundation/Foundation.h>
-                #include <Framework2/Framework2.h>
-                @interface Shared: Shared2 {}
-                @end
+                stream <<< """
+                    #include <Foundation/Foundation.h>
+                    #include <Framework2/Framework2.h>
+                    @interface Shared: Shared2 {}
+                    @end
 
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.m")) { stream in
-                stream <<<
-                """
-                #include "Shared.h"
-                @implementation Shared {}
-                @end
-                """
+                stream <<< """
+                    #include "Shared.h"
+                    @implementation Shared {}
+                    @end
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework2.h")) { stream in
-                stream <<<
-                """
-                #include <Framework2/Shared2.h>
-                """
+                stream <<< """
+                    #include <Framework2/Shared2.h>
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared2.h")) { stream in
-                stream <<<
-                """
-                #include <Foundation/Foundation.h>
-                @interface Shared2: NSObject {}
-                @end
+                stream <<< """
+                    #include <Foundation/Foundation.h>
+                    @interface Shared2: NSObject {}
+                    @end
 
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared2.m")) { stream in
-                stream <<<
-                """
-                #include "Shared2.h"
-                @implementation Shared2 {}
-                @end
-                """
+                stream <<< """
+                    #include "Shared2.h"
+                    @implementation Shared2 {}
+                    @end
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
@@ -2317,14 +2480,18 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                 TestFile("Shared.h"),
                                 TestFile("SharedNew.h"),
                                 TestFile("Shared.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
@@ -2338,11 +2505,14 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                             TestStandardTarget(
                                 "Framework",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "DEFINES_MODULE": "YES",
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "DEFINES_MODULE": "YES"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["Shared.m"]),
                                     TestHeadersBuildPhase([
@@ -2350,14 +2520,17 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                         TestBuildFile("Shared.h", headerVisibility: .public),
                                         TestBuildFile("SharedNew.h", headerVisibility: .public),
                                     ]),
-                                ]),
-                        ])])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, temporaryDirectory: tmpDir)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.m")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     #include <Framework/Framework.h>
 
                     void test() {
@@ -2368,15 +2541,13 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework.h")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     #include <Framework/Shared.h>
                     """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.h")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     #include <Foundation/Foundation.h>
                     @interface Shared: NSObject {}
                     @end
@@ -2385,8 +2556,7 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.m")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     #include "Shared.h"
                     @implementation Shared {}
                     @end
@@ -2400,15 +2570,13 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
             try tester.fs.move(testWorkspace.sourceRoot.join("aProject/Shared.h"), to: testWorkspace.sourceRoot.join("aProject/SharedNew.h"))
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework.h")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     #include <Framework/SharedNew.h>
                     """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.m")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     #include "SharedNew.h"
                     @implementation Shared {}
                     @end
@@ -2446,14 +2614,18 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                 TestFile("Shared.h"),
                                 TestFile("Shared2.h"),
                                 TestFile("Shared.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
@@ -2467,11 +2639,14 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                             TestStandardTarget(
                                 "Framework",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "DEFINES_MODULE": "YES",
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "DEFINES_MODULE": "YES"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["Shared.m"]),
                                     TestHeadersBuildPhase([
@@ -2479,14 +2654,17 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                         TestBuildFile("Shared.h", headerVisibility: .public),
                                         TestBuildFile("Shared2.h", headerVisibility: .public),
                                     ]),
-                                ]),
-                        ])])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, temporaryDirectory: tmpDir)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.m")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     #include <Framework/Framework.h>
 
                     void test() {
@@ -2497,16 +2675,14 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework.h")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     #include <Framework/Shared.h>
                     #include <Framework/Shared2.h>
                     """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.h")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     #include <Foundation/Foundation.h>
                     @interface Shared: NSObject {}
                     @end
@@ -2519,8 +2695,7 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Shared.m")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     #include "Shared.h"
                     @implementation Shared {}
                     @end
@@ -2534,8 +2709,7 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
             try tester.fs.remove(testWorkspace.sourceRoot.join("aProject/Shared2.h"))
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework.h")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     #include <Framework/Shared.h>
                     """
             }
@@ -2568,14 +2742,18 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                 TestFile("file2.m"),
                                 TestFile("Framework.h"),
                                 TestFile("Framework.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
@@ -2589,24 +2767,30 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                             TestStandardTarget(
                                 "Framework",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "DEFINES_MODULE": "YES",
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "DEFINES_MODULE": "YES"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["Framework.m"]),
                                     TestHeadersBuildPhase([
-                                        TestBuildFile("Framework.h", headerVisibility: .public),
+                                        TestBuildFile("Framework.h", headerVisibility: .public)
                                     ]),
-                                ]),
-                        ])])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, temporaryDirectory: tmpDir)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.m")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     #include <Framework/Framework.h>
 
                     void test() {
@@ -2617,8 +2801,7 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework.h")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     #include <Foundation/Foundation.h>
                     @interface Shared: NSObject {}
                     @end
@@ -2626,8 +2809,7 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework.m")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     #include "Framework.h"
                     @implementation Shared {}
                     @end
@@ -2639,8 +2821,7 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file2.m")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     #include <Framework/Framework.h>
 
                     void test2() {
@@ -2670,33 +2851,40 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                "CLANG_ENABLE_EXPLICIT_MODULES_OBJECT_FILE_VERIFIER": "YES",
-                            ])],
+                                TestFile("file.m")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    "CLANG_ENABLE_EXPLICIT_MODULES_OBJECT_FILE_VERIFIER": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.m"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.m"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.m")) { stream in
-                stream <<<
-                """
-                #include <Foundation/Foundation.h>
-                int something = 1;
-                """
+                stream <<< """
+                    #include <Foundation/Foundation.h>
+                    int something = 1;
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
@@ -2732,32 +2920,39 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-            """
-            #include <stdio.h>
-            int something = 1;
-            """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
 
             // Clean build
@@ -2797,33 +2992,40 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                "CLANG_USE_RESPONSE_FILE": "YES",
-                            ])],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    "CLANG_USE_RESPONSE_FILE": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int something = 1;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
 
             try await tester.checkBuild(runDestination: .host, persistent: true) { results in
@@ -2849,32 +3051,39 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "CLANG_ENABLE_EXPLICIT_MODULES": "NO",
-                            ])],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "CLANG_ENABLE_EXPLICIT_MODULES": "NO",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-            """
-            #include <stdio.h>
-            int something = 1;
-            """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
 
             try await tester.checkBuild(runDestination: .host, persistent: true) { results in
@@ -2905,17 +3114,21 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                 TestFile("Framework2.h"),
                                 TestFile("file_1.c"),
                                 TestFile("file_2.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                "DEFINES_MODULE": "YES",
-                                "VALID_ARCHS": "arm64",
-                                "DSTROOT": tmpDir.join("dstroot").str,
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    "DEFINES_MODULE": "YES",
+                                    "VALID_ARCHS": "arm64",
+                                    "DSTROOT": tmpDir.join("dstroot").str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Framework1",
@@ -2923,7 +3136,8 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                 buildPhases: [
                                     TestHeadersBuildPhase([TestBuildFile("Framework1.h", headerVisibility: .public)]),
                                     TestSourcesBuildPhase(["file_1.c"]),
-                                ]),
+                                ]
+                            ),
                             TestStandardTarget(
                                 "Framework2",
                                 type: .framework,
@@ -2932,40 +3146,40 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                     TestShellScriptBuildPhase(name: "Sleep", originalObjectID: "A", contents: "sleep 5", alwaysOutOfDate: true),
                                     TestHeadersBuildPhase([TestBuildFile("Framework2.h", headerVisibility: .public)]),
                                     TestSourcesBuildPhase(["file_2.c"]),
-                                ]),
-                        ])])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework1.h")) { stream in
-                stream <<<
-            """
-            void foo(void);
-            """
+                stream <<< """
+                    void foo(void);
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file_1.c")) { stream in
-                stream <<<
-            """
-            #include <Framework1/Framework1.h>
-            void foo(void) {}
-            """
+                stream <<< """
+                    #include <Framework1/Framework1.h>
+                    void foo(void) {}
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework2.h")) { stream in
-                stream <<<
-            """
-            #include <Framework1/Framework1.h>
-            void bar(void);
-            """
+                stream <<< """
+                    #include <Framework1/Framework1.h>
+                    void bar(void);
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file_2.c")) { stream in
-                stream <<<
-            """
-            #include <Framework2/Framework2.h>
-            void bar(void) { foo(); }
-            """
+                stream <<< """
+                    #include <Framework2/Framework2.h>
+                    void bar(void) { foo(); }
+                    """
             }
 
             for (warningLevel, destination) in [(BooleanWarningLevel.yes, RunDestinationInfo.iOS), (BooleanWarningLevel.yes, RunDestinationInfo.macOS), (BooleanWarningLevel.no, RunDestinationInfo.macOS)] {
@@ -3008,77 +3222,88 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                                 TestFile("A.h"),
                                 TestFile("file2.c"),
                                 TestFile("file3.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget("All", dependencies: ["A", "B", "C"]),
                             TestStandardTarget(
                                 "A",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "DEFINES_MODULE": "YES",
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "DEFINES_MODULE": "YES"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
                                     TestHeadersBuildPhase([TestBuildFile("A.h", headerVisibility: .public)]),
                                     TestSourcesBuildPhase(["file.c"]),
-                                ]),
+                                ]
+                            ),
                             TestStandardTarget(
                                 "B",
                                 type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file2.c"]),
-                                ], dependencies: ["A"]),
+                                    TestSourcesBuildPhase(["file2.c"])
+                                ],
+                                dependencies: ["A"]
+                            ),
                             TestStandardTarget(
                                 "C",
                                 type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file3.c"]),
-                                ], dependencies: ["B"]),
-                        ])])
+                                    TestSourcesBuildPhase(["file3.c"])
+                                ],
+                                dependencies: ["B"]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                int foo(void) {
-                    return 42;
-                }
-                """
+                stream <<< """
+                    int foo(void) {
+                        return 42;
+                    }
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/A.h")) { stream in
-                stream <<<
-                """
-                int foo(void);
-                """
+                stream <<< """
+                    int foo(void);
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file2.c")) { stream in
-                stream <<<
-                """
-                #include <A/A.h>
-                void f(void) {
-                    int x = foo();
-                }
-                """
+                stream <<< """
+                    #include <A/A.h>
+                    void f(void) {
+                        int x = foo();
+                    }
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file3.c")) { stream in
-                stream <<<
-                """
-                #include <A/A.h>
-                void f(void) {
-                    int y = foo();
-                }
-                """
+                stream <<< """
+                    #include <A/A.h>
+                    void f(void) {
+                        int y = foo();
+                    }
+                    """
             }
 
             // Run a clean build
@@ -3090,11 +3315,10 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
 
             // Touch A's header
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/A.h")) { stream in
-                stream <<<
-                """
-                // Comment
-                int foo(void);
-                """
+                stream <<< """
+                    // Comment
+                    int foo(void);
+                    """
             }
 
             // Run an incremental build. Both B and C should rescan and recompile.
@@ -3124,32 +3348,39 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                            ])],
+                                TestFile("file.c")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                #include <stdio.h>
-                int something = 1;
-                """
+                stream <<< """
+                    #include <stdio.h>
+                    int something = 1;
+                    """
             }
 
             // The build should succeed if we produced dependency info which can be parsed correctly.
diff --git a/Tests/SWBBuildSystemTests/ClangModuleVerifierTests.swift b/Tests/SWBBuildSystemTests/ClangModuleVerifierTests.swift
index c66338cc..abe45ed7 100644
--- a/Tests/SWBBuildSystemTests/ClangModuleVerifierTests.swift
+++ b/Tests/SWBBuildSystemTests/ClangModuleVerifierTests.swift
@@ -36,19 +36,23 @@ fileprivate struct ClangModuleVerifierTests: CoreBasedTests {
                                 TestFile("Orange2.h"),
                                 TestFile("Orange3.h"),
                                 TestFile("main.m"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "ARCHS": archs.joined(separator: " "),
-                                "DEFINES_MODULE": "YES",
-                                "ENABLE_MODULE_VERIFIER": "YES",
-                                "MODULE_VERIFIER_KIND": "builtin",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS": "gnu11",
-                                "MODULE_VERIFIER_SUPPORTED_LANGUAGES": "objective-c",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "ARCHS": archs.joined(separator: " "),
+                                    "DEFINES_MODULE": "YES",
+                                    "ENABLE_MODULE_VERIFIER": "YES",
+                                    "MODULE_VERIFIER_KIND": "builtin",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS": "gnu11",
+                                    "MODULE_VERIFIER_SUPPORTED_LANGUAGES": "objective-c",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -61,23 +65,33 @@ fileprivate struct ClangModuleVerifierTests: CoreBasedTests {
                                         TestBuildFile("Orange3.h", headerVisibility: .public),
                                     ]),
                                     TestSourcesBuildPhase([
-                                        "main.m",
+                                        "main.m"
                                     ]),
-                                ]),
-                        ])])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
             try tester.fs.createDirectory(SRCROOT.join("Sources"), recursive: true)
-            try tester.fs.write(SRCROOT.join("Orange.h"), contents: """
-                // no include of Orange2.h -> incomplete umbrella
-                #include "Orange3.h"
-                """)
+            try tester.fs.write(
+                SRCROOT.join("Orange.h"),
+                contents: """
+                    // no include of Orange2.h -> incomplete umbrella
+                    #include "Orange3.h"
+                    """
+            )
             try tester.fs.write(SRCROOT.join("Orange2.h"), contents: "")
             try tester.fs.write(SRCROOT.join("Orange3.h"), contents: "")
-            try tester.fs.write(SRCROOT.join("main.m"), contents: """
-                #include <Orange/Orange.h>
-                """)
+            try tester.fs.write(
+                SRCROOT.join("main.m"),
+                contents: """
+                    #include <Orange/Orange.h>
+                    """
+            )
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
                 // Check that the diagnostic has the source directory path.
@@ -117,20 +131,24 @@ fileprivate struct ClangModuleVerifierTests: CoreBasedTests {
                                 TestFile("Orange.h"),
                                 TestFile("Orange.defs"),
                                 TestFile("main.m"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "ARCHS": archs.joined(separator: " "),
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "DEFINES_MODULE": "YES",
-                                "ENABLE_MODULE_VERIFIER": "YES",
-                                "MODULE_VERIFIER_KIND": "builtin",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS": "gnu11",
-                                "MODULE_VERIFIER_SUPPORTED_LANGUAGES": "objective-c",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "ARCHS": archs.joined(separator: " "),
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "DEFINES_MODULE": "YES",
+                                    "ENABLE_MODULE_VERIFIER": "YES",
+                                    "MODULE_VERIFIER_KIND": "builtin",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS": "gnu11",
+                                    "MODULE_VERIFIER_SUPPORTED_LANGUAGES": "objective-c",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -142,21 +160,31 @@ fileprivate struct ClangModuleVerifierTests: CoreBasedTests {
                                         TestBuildFile("Orange.defs", headerVisibility: .public),
                                     ]),
                                     TestSourcesBuildPhase([
-                                        "main.m",
+                                        "main.m"
                                     ]),
-                                ]),
-                        ])])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
             try tester.fs.createDirectory(SRCROOT.join("Sources"), recursive: true)
-            try tester.fs.write(SRCROOT.join("Orange.h"), contents: """
-                #include <Orange/Orange.defs>
-                """)
+            try tester.fs.write(
+                SRCROOT.join("Orange.h"),
+                contents: """
+                    #include <Orange/Orange.defs>
+                    """
+            )
             try tester.fs.write(SRCROOT.join("Orange.defs"), contents: "")
-            try tester.fs.write(SRCROOT.join("main.m"), contents: """
-                #include <Orange/Orange.h>
-                """)
+            try tester.fs.write(
+                SRCROOT.join("main.m"),
+                contents: """
+                    #include <Orange/Orange.h>
+                    """
+            )
 
             // A regular build will just build the correct architecture.
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
@@ -208,25 +236,29 @@ fileprivate struct ClangModuleVerifierTests: CoreBasedTests {
                                 TestFile("Orange.h"),
                                 TestFile("Orange.defs"),
                                 TestFile("main.m"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "ARCHS": archs.joined(separator: " "),
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "DEFINES_MODULE": "YES",
-                                "ENABLE_MODULE_VERIFIER": "YES",
-                                "MODULE_VERIFIER_KIND": "builtin",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS": "gnu11",
-                                "MODULE_VERIFIER_SUPPORTED_LANGUAGES": "objective-c",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "ARCHS": archs.joined(separator: " "),
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "DEFINES_MODULE": "YES",
+                                    "ENABLE_MODULE_VERIFIER": "YES",
+                                    "MODULE_VERIFIER_KIND": "builtin",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS": "gnu11",
+                                    "MODULE_VERIFIER_SUPPORTED_LANGUAGES": "objective-c",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
 
-                                "CLANG_ENABLE_COMPILE_CACHE": "YES",
-                                "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
-                                "OTHER_MODULE_VERIFIER_FLAGS": "-- -Rcompile-job-cache",
-                                "DSTROOT": tmpDirPath.join("dstroot").str,
-                            ]),
+                                    "CLANG_ENABLE_COMPILE_CACHE": "YES",
+                                    "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
+                                    "OTHER_MODULE_VERIFIER_FLAGS": "-- -Rcompile-job-cache",
+                                    "DSTROOT": tmpDirPath.join("dstroot").str,
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -238,21 +270,31 @@ fileprivate struct ClangModuleVerifierTests: CoreBasedTests {
                                         TestBuildFile("Orange.defs", headerVisibility: .public),
                                     ]),
                                     TestSourcesBuildPhase([
-                                        "main.m",
+                                        "main.m"
                                     ]),
-                                ]),
-                        ])])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
             try tester.fs.createDirectory(SRCROOT.join("Sources"), recursive: true)
-            try tester.fs.write(SRCROOT.join("Orange.h"), contents: """
-                #include <Orange/Orange.defs>
-                """)
+            try tester.fs.write(
+                SRCROOT.join("Orange.h"),
+                contents: """
+                    #include <Orange/Orange.defs>
+                    """
+            )
             try tester.fs.write(SRCROOT.join("Orange.defs"), contents: "")
-            try tester.fs.write(SRCROOT.join("main.m"), contents: """
-                #include <Orange/Orange.h>
-                """)
+            try tester.fs.write(
+                SRCROOT.join("main.m"),
+                contents: """
+                    #include <Orange/Orange.h>
+                    """
+            )
 
             // A regular build will just build the correct architecture.
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
diff --git a/Tests/SWBBuildSystemTests/ClangStatCacheTests.swift b/Tests/SWBBuildSystemTests/ClangStatCacheTests.swift
index 8bfcc182..9d94ac87 100644
--- a/Tests/SWBBuildSystemTests/ClangStatCacheTests.swift
+++ b/Tests/SWBBuildSystemTests/ClangStatCacheTests.swift
@@ -31,32 +31,39 @@ fileprivate struct ClangStatCacheTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                            ])],
+                                TestFile("file.m")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Framework",
                                 type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.m"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.m"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.m")) { stream in
-                stream <<<
-                """
-                @import Foundation;
-                int foo() {}
-                """
+                stream <<< """
+                    @import Foundation;
+                    int foo() {}
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
@@ -85,32 +92,39 @@ fileprivate struct ClangStatCacheTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.swift"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_VERSION": swiftVersion,
-                            ])],
+                                TestFile("file.swift")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Framework",
                                 type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.swift"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.swift"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.swift")) { stream in
-                stream <<<
-                """
-                import Foundation;
-                func foo() {}
-                """
+                stream <<< """
+                    import Foundation;
+                    func foo() {}
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
@@ -141,49 +155,57 @@ fileprivate struct ClangStatCacheTests: CoreBasedTests {
                             children: [
                                 TestFile("file.swift"),
                                 TestFile("file2.swift"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_VERSION": swiftVersion,
-                                "CODE_SIGNING_ALLOWED": "NO",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Framework",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT":"iphoneos"])],
+                                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"])],
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.swift"]),
-                                ], dependencies: ["Tool"]),
+                                    TestSourcesBuildPhase(["file.swift"])
+                                ],
+                                dependencies: ["Tool"]
+                            ),
                             TestStandardTarget(
                                 "Tool",
                                 type: .commandLineTool,
-                                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT":"macosx"])],
+                                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"])],
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file2.swift"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file2.swift"])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.swift")) { stream in
-                stream <<<
-                """
-                import Foundation;
-                func foo() {}
-                """
+                stream <<< """
+                    import Foundation;
+                    func foo() {}
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file2.swift")) { stream in
-                stream <<<
-                """
-                import Foundation;
-                @main struct Entry {
-                    static func main() {}
-                }
-                """
+                stream <<< """
+                    import Foundation;
+                    @main struct Entry {
+                        static func main() {}
+                    }
+                    """
             }
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
                 results.checkNoDiagnostics()
@@ -209,4 +231,3 @@ fileprivate struct ClangStatCacheTests: CoreBasedTests {
         }
     }
 }
-
diff --git a/Tests/SWBBuildSystemTests/CleanOperationTests.swift b/Tests/SWBBuildSystemTests/CleanOperationTests.swift
index e81dc4a7..5c32e08e 100644
--- a/Tests/SWBBuildSystemTests/CleanOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/CleanOperationTests.swift
@@ -23,9 +23,11 @@ fileprivate struct CleanOperationTests: CoreBasedTests {
         return ArenaInfo(derivedDataPath: path.dirname, buildProductsPath: path, buildIntermediatesPath: path, pchPath: path, indexRegularBuildProductsPath: nil, indexRegularBuildIntermediatesPath: nil, indexPCHPath: path, indexDataStoreFolderPath: nil, indexEnableDataStore: false)
     }
 
-    private func withTestHarness(install: Bool = false,
-                                 useRootDstroot: Bool = false,
-                                 perform: (BuildOperationTester,  Path, Path) async throws -> Void) async throws {
+    private func withTestHarness(
+        install: Bool = false,
+        useRootDstroot: Bool = false,
+        perform: (BuildOperationTester, Path, Path) async throws -> Void
+    ) async throws {
         try await withTemporaryDirectory { tmpDirPath in
             let dstRoot = useRootDstroot ? tmpDirPath : tmpDirPath.join("dest")
             let testWorkspace = try await TestWorkspace(
@@ -35,37 +37,45 @@ fileprivate struct CleanOperationTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", children: [
+                            "Sources",
+                            children: [
                                 TestFile("CoreFoo.h"),
                                 TestFile("CoreFoo.m"),
                                 TestFile("Thing.swift"),
                                 TestFile("Info.plist"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "VERSIONING_SYSTEM": "apple-generic",
-                                "CURRENT_PROJECT_VERSION": "3.1",
-                                "INFOPLIST_FILE": "Info.plist",
-                                "DEFINES_MODULE": "YES",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "SWIFT_VERSION": swiftVersion,
-                                "DSTROOT": dstRoot.str,
-                                "DEPLOYMENT_LOCATION": install ? "YES" : "NO",
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "VERSIONING_SYSTEM": "apple-generic",
+                                    "CURRENT_PROJECT_VERSION": "3.1",
+                                    "INFOPLIST_FILE": "Info.plist",
+                                    "DEFINES_MODULE": "YES",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "DSTROOT": dstRoot.str,
+                                    "DEPLOYMENT_LOCATION": install ? "YES" : "NO",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase(["CoreFoo.m", "Thing.swift"]),
                                     TestFrameworksBuildPhase([]),
                                     TestHeadersBuildPhase([TestBuildFile("CoreFoo.h", headerVisibility: .public)]),
-                                ])
-                        ])
-                ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -88,13 +98,16 @@ fileprivate struct CleanOperationTests: CoreBasedTests {
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Test without an arena - should fail because no projects and no workspace arena provides no means to get the build intermediates path.
-            await #expect(performing: {
-                try await tester.checkBuild(runDestination: .macOS, buildRequest: BuildRequest(parameters: BuildParameters(configuration: "Debug"), buildTargets: [], continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: false, useDryRun: false, buildCommand: .cleanBuildFolder(style: .regular)), persistent: true) { results in
-                    results.checkNoDiagnostics()
+            await #expect(
+                performing: {
+                    try await tester.checkBuild(runDestination: .macOS, buildRequest: BuildRequest(parameters: BuildParameters(configuration: "Debug"), buildTargets: [], continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: false, useDryRun: false, buildCommand: .cleanBuildFolder(style: .regular)), persistent: true) { results in
+                        results.checkNoDiagnostics()
+                    }
+                },
+                throws: { error in
+                    String(describing: error) == "There is no workspace arena to determine the build cache directory path."
                 }
-            }, throws: { error in
-                String(describing: error) == "There is no workspace arena to determine the build cache directory path."
-            })
+            )
 
             // Test with an arena - should succeed because while there are no projects, we can still get the build intermediates path from the workspace arena.
             try await tester.checkBuild(runDestination: .macOS, buildRequest: BuildRequest(parameters: BuildParameters(configuration: "Debug", arena: arenaInfo(from: tmpDirPath.join("build"))), buildTargets: [], continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: false, useDryRun: false, buildCommand: .cleanBuildFolder(style: .regular)), persistent: true) { results in
@@ -106,7 +119,7 @@ fileprivate struct CleanOperationTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS))
     func cleanFramework() async throws {
         try await withTestHarness { tester, tmpDirPath, _ in
-            let buildFolderPaths = [ tmpDirPath.join("Test/aProject/build"), tmpDirPath.join("Test/aProject/build/Debug"), tmpDirPath.join("Test/aProject/build/EagerLinkingTBDs/Debug"), tmpDirPath.join("Test/aProject/build/ExplicitPrecompiledModules"), tmpDirPath.join("Test/aProject/build/SwiftExplicitPrecompiledModules")]
+            let buildFolderPaths = [tmpDirPath.join("Test/aProject/build"), tmpDirPath.join("Test/aProject/build/Debug"), tmpDirPath.join("Test/aProject/build/EagerLinkingTBDs/Debug"), tmpDirPath.join("Test/aProject/build/ExplicitPrecompiledModules"), tmpDirPath.join("Test/aProject/build/SwiftExplicitPrecompiledModules")]
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
                 // Check if build folder tasks have run as expected.
@@ -136,7 +149,7 @@ fileprivate struct CleanOperationTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS))
     func cleanFrameworkInstall() async throws {
         try await withTestHarness(install: true) { tester, tmpDirPath, dstRoot in
-            let buildFolderPaths = [ dstRoot, tmpDirPath.join("Test/aProject/build"), tmpDirPath.join("Test/aProject/build/Debug"), tmpDirPath.join("Test/aProject/build/EagerLinkingTBDs/Debug"), tmpDirPath.join("Test/aProject/build/ExplicitPrecompiledModules"), tmpDirPath.join("Test/aProject/build/SwiftExplicitPrecompiledModules")]
+            let buildFolderPaths = [dstRoot, tmpDirPath.join("Test/aProject/build"), tmpDirPath.join("Test/aProject/build/Debug"), tmpDirPath.join("Test/aProject/build/EagerLinkingTBDs/Debug"), tmpDirPath.join("Test/aProject/build/ExplicitPrecompiledModules"), tmpDirPath.join("Test/aProject/build/SwiftExplicitPrecompiledModules")]
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
                 // Check if build folder tasks have run as expected.
@@ -166,7 +179,7 @@ fileprivate struct CleanOperationTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS))
     func cleanLegacy() async throws {
         try await withTemporaryDirectory { tmpDirPath in
-            let buildFolderPaths = [ tmpDirPath.join("build/a"), tmpDirPath.join("build/b") ]
+            let buildFolderPaths = [tmpDirPath.join("build/a"), tmpDirPath.join("build/b")]
 
             let testWorkspace = TestWorkspace(
                 "Test",
@@ -174,25 +187,35 @@ fileprivate struct CleanOperationTests: CoreBasedTests {
                 projects: [
                     TestProject(
                         "aProject",
-                        groupTree: TestGroup("Sources", children: [ TestFile("foo.c") ]),
+                        groupTree: TestGroup("Sources", children: [TestFile("foo.c")]),
                         buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])],
                         targets: [
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildConfigurations: [
                                     TestBuildConfiguration(
                                         "Debug",
-                                        buildSettings: ["OBJROOT": buildFolderPaths[0].str, "SYMROOT": buildFolderPaths[0].str, "DSTROOT": buildFolderPaths[0].str])],
-                                buildPhases: [ TestSourcesBuildPhase(["foo.c"]) ]),
+                                        buildSettings: ["OBJROOT": buildFolderPaths[0].str, "SYMROOT": buildFolderPaths[0].str, "DSTROOT": buildFolderPaths[0].str]
+                                    )
+                                ],
+                                buildPhases: [TestSourcesBuildPhase(["foo.c"])]
+                            ),
                             TestStandardTarget(
-                                "OtherFramework", type: .framework,
+                                "OtherFramework",
+                                type: .framework,
                                 buildConfigurations: [
                                     TestBuildConfiguration(
                                         "Debug",
-                                        buildSettings: ["OBJROOT": buildFolderPaths[1].str, "SYMROOT": buildFolderPaths[1].str, "DSTROOT": buildFolderPaths[1].str])],
-                                buildPhases: [ TestSourcesBuildPhase(["foo.c"]) ]),
-                        ])
-                ])
+                                        buildSettings: ["OBJROOT": buildFolderPaths[1].str, "SYMROOT": buildFolderPaths[1].str, "DSTROOT": buildFolderPaths[1].str]
+                                    )
+                                ],
+                                buildPhases: [TestSourcesBuildPhase(["foo.c"])]
+                            ),
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/foo.c")) { _ in }
@@ -234,7 +257,7 @@ fileprivate struct CleanOperationTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS))
     func cleanDoesNotDeleteManuallyCreatedFolders() async throws {
         try await withTestHarness { tester, tmpDirPath, _ in
-            let buildFolderPaths = [ tmpDirPath.join("Test/aProject/build"), tmpDirPath.join("Test/aProject/build/Debug"), tmpDirPath.join("Test/aProject/build/EagerLinkingTBDs/Debug"), tmpDirPath.join("Test/aProject/build/ExplicitPrecompiledModules"), tmpDirPath.join("Test/aProject/build/SwiftExplicitPrecompiledModules")]
+            let buildFolderPaths = [tmpDirPath.join("Test/aProject/build"), tmpDirPath.join("Test/aProject/build/Debug"), tmpDirPath.join("Test/aProject/build/EagerLinkingTBDs/Debug"), tmpDirPath.join("Test/aProject/build/ExplicitPrecompiledModules"), tmpDirPath.join("Test/aProject/build/SwiftExplicitPrecompiledModules")]
 
             for folder in buildFolderPaths {
                 try tester.fs.createDirectory(folder, recursive: true)
@@ -293,8 +316,10 @@ fileprivate struct CleanOperationTests: CoreBasedTests {
                         buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: [:])],
                         targets: [
                             TestExternalTarget("external", toolPath: "\(try await getCore().developerPath.path.str)/usr/bin/make", arguments: "$(ACTION)", workingDirectory: sourceRoot.str, buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: [:])], dependencies: [], passBuildSettingsInEnvironment: true)
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             try await perform(tester, tmpDirPath, sourceRoot)
         }
diff --git a/Tests/SWBBuildSystemTests/CodeGenerationToolTests.swift b/Tests/SWBBuildSystemTests/CodeGenerationToolTests.swift
index 498e276a..01e79d07 100644
--- a/Tests/SWBBuildSystemTests/CodeGenerationToolTests.swift
+++ b/Tests/SWBBuildSystemTests/CodeGenerationToolTests.swift
@@ -36,7 +36,9 @@ fileprivate struct CodeGenerationToolTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
+                            "Sources",
+                            path: "Sources",
+                            children: [
                                 TestFile("CoreFoo.h"),
                                 TestFile("CoreFoo.m"),
                                 TestFile("CoreBaz.h"),
@@ -47,64 +49,77 @@ fileprivate struct CodeGenerationToolTests: CoreBasedTests {
                                 TestFile("CoreBar.xcdatamodel"),
                                 TestFile("CoreBaz.xcdatamodeld"),
                                 TestFile("CoreQux.xcdatamodeld"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "ARCHS[sdk=iphoneos*]": "arm64",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SDKROOT": "iphoneos",
-                                "DEFINES_MODULE": "YES",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "VERSIONING_SYSTEM": "apple-generic",
-                                "CURRENT_PROJECT_VERSION": "3.1",
-                                "INFOPLIST_FILE": "Sources/Info.plist",
-
-                                "INSTALL_OWNER": "",
-                                "INSTALL_GROUP": GetCurrentUserGroupName()!,
-                                "INSTALL_MODE_FLAG": "+w",
-                                "SWIFT_VERSION": "5.0",
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "ARCHS[sdk=iphoneos*]": "arm64",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SDKROOT": "iphoneos",
+                                    "DEFINES_MODULE": "YES",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "VERSIONING_SYSTEM": "apple-generic",
+                                    "CURRENT_PROJECT_VERSION": "3.1",
+                                    "INFOPLIST_FILE": "Sources/Info.plist",
+
+                                    "INSTALL_OWNER": "",
+                                    "INSTALL_GROUP": GetCurrentUserGroupName()!,
+                                    "INSTALL_MODE_FLAG": "+w",
+                                    "SWIFT_VERSION": "5.0",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget("All", dependencies: ["CoreFoo", "CoreBar", "CoreBaz", "CoreQux"]),
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "CoreFoo.m",
                                         "CoreFoo.xcdatamodel",
                                     ]),
                                     TestHeadersBuildPhase([TestBuildFile("CoreFoo.h", headerVisibility: .public)]),
-                                ]),
+                                ]
+                            ),
                             TestStandardTarget(
-                                "CoreBar", type: .framework,
+                                "CoreBar",
+                                type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "CoreFoo.swift",
                                         "CoreBar.xcdatamodel",
-                                    ]),
-                                ]),
+                                    ])
+                                ]
+                            ),
                             TestStandardTarget(
-                                "CoreBaz", type: .framework,
+                                "CoreBaz",
+                                type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "CoreBaz.m",
                                         "CoreBaz.xcdatamodeld",
                                     ]),
                                     TestHeadersBuildPhase([TestBuildFile("CoreBaz.h", headerVisibility: .public)]),
-                                ]),
+                                ]
+                            ),
                             TestStandardTarget(
-                                "CoreQux", type: .framework,
+                                "CoreQux",
+                                type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "CoreFoo.swift",
                                         "CoreQux.xcdatamodeld",
-                                    ]),
-                                ])
-                        ])
-                ])
+                                    ])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             // Create the tester.
             let fs = localFS
@@ -112,10 +127,13 @@ fileprivate struct CodeGenerationToolTests: CoreBasedTests {
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
             // Write the Info.plist file.
-            try await tester.fs.writePlist(SRCROOT.join("Sources/Info.plist"), .plDict([
-                "CFBundleDevelopmentRegion": .plString("en"),
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)")
-            ]))
+            try await tester.fs.writePlist(
+                SRCROOT.join("Sources/Info.plist"),
+                .plDict([
+                    "CFBundleDevelopmentRegion": .plString("en"),
+                    "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                ])
+            )
 
             // Write the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/CoreFoo.h")) { contents in
@@ -142,17 +160,20 @@ fileprivate struct CodeGenerationToolTests: CoreBasedTests {
             try tester.fs.writeCoreDataModelD(testWorkspace.sourceRoot.join("aProject/Sources/CoreQux.xcdatamodeld"), language: .swift, .entity("EntityOne"))
 
             // We enable deployment postprocessing explicitly, to check the full range of basic behaviors.
-            let parameters = BuildParameters(action: .install, configuration: "Debug", overrides: [
-                "DSTROOT": tmpDirPath.join("dst").str,
-            ])
+            let parameters = BuildParameters(
+                action: .install,
+                configuration: "Debug",
+                overrides: [
+                    "DSTROOT": tmpDirPath.join("dst").str
+                ]
+            )
 
             // Check the build.
             try await tester.checkBuild(parameters: parameters, runDestination: .iOS, persistent: true) { results in
                 // Check that the module session validation file was written.
                 if let moduleSessionFilePath = results.buildDescription.moduleSessionFilePath {
                     #expect(tester.fs.exists(moduleSessionFilePath))
-                }
-                else {
+                } else {
                     Issue.record("No module session validation file path was computed")
                 }
 
@@ -300,66 +321,87 @@ fileprivate struct CodeGenerationToolTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
+                            "Sources",
+                            path: "Sources",
+                            children: [
                                 TestFile("CoreFoo.h"),
                                 TestFile("CoreFoo.m"),
                                 TestFile("CoreFoo.swift"),
                                 TestFile("Info.plist"),
                                 TestFile("CoreBaz.mlmodel"),
                                 TestFile("CoreBaz2.mlpackage"),
-                            ].compactMap { $0 }),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "ARCHS[sdk=iphoneos*]": "arm64",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SDKROOT": "iphoneos",
-                                "DEFINES_MODULE": "YES",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "VERSIONING_SYSTEM": "apple-generic",
-                                "CURRENT_PROJECT_VERSION": "3.1",
-                                "INFOPLIST_FILE": "Sources/Info.plist",
-
-                                "INSTALL_OWNER": "",
-                                "INSTALL_GROUP": GetCurrentUserGroupName()!,
-                                "INSTALL_MODE_FLAG": "+w",
-                                "SWIFT_VERSION": "5.0",
-                            ]
-                        )],
+                            ].compactMap { $0 }
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "ARCHS[sdk=iphoneos*]": "arm64",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SDKROOT": "iphoneos",
+                                    "DEFINES_MODULE": "YES",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "VERSIONING_SYSTEM": "apple-generic",
+                                    "CURRENT_PROJECT_VERSION": "3.1",
+                                    "INFOPLIST_FILE": "Sources/Info.plist",
+
+                                    "INSTALL_OWNER": "",
+                                    "INSTALL_GROUP": GetCurrentUserGroupName()!,
+                                    "INSTALL_MODE_FLAG": "+w",
+                                    "SWIFT_VERSION": "5.0",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget("All", dependencies: ["CoreFoo", "CoreBar"]),
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: [
-                                        "COREML_CODEGEN_LANGUAGE": "Objective-C",
-                                    ])
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "COREML_CODEGEN_LANGUAGE": "Objective-C"
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
-                                    TestSourcesBuildPhase([
-                                        "CoreFoo.m",
-                                        TestBuildFile("CoreBaz.mlmodel", intentsCodegenVisibility: .public),
-                                        TestBuildFile("CoreBaz2.mlpackage", intentsCodegenVisibility: .public),
-                                    ].compactMap { $0 }),
+                                    TestSourcesBuildPhase(
+                                        [
+                                            "CoreFoo.m",
+                                            TestBuildFile("CoreBaz.mlmodel", intentsCodegenVisibility: .public),
+                                            TestBuildFile("CoreBaz2.mlpackage", intentsCodegenVisibility: .public),
+                                        ].compactMap { $0 }
+                                    ),
                                     TestHeadersBuildPhase([TestBuildFile("CoreFoo.h", headerVisibility: .public)]),
-                                ]),
+                                ]
+                            ),
                             TestStandardTarget(
-                                "CoreBar", type: .framework,
+                                "CoreBar",
+                                type: .framework,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: [
-                                        "COREML_CODEGEN_LANGUAGE": "Swift",
-                                    ])
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "COREML_CODEGEN_LANGUAGE": "Swift"
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
-                                    TestSourcesBuildPhase([
-                                        "CoreFoo.swift",
-                                        TestBuildFile("CoreBaz.mlmodel", intentsCodegenVisibility: .public),
-                                        TestBuildFile("CoreBaz2.mlpackage", intentsCodegenVisibility: .public),
-                                    ].compactMap { $0 }),
-                                ])
-                        ])
-                ])
+                                    TestSourcesBuildPhase(
+                                        [
+                                            "CoreFoo.swift",
+                                            TestBuildFile("CoreBaz.mlmodel", intentsCodegenVisibility: .public),
+                                            TestBuildFile("CoreBaz2.mlpackage", intentsCodegenVisibility: .public),
+                                        ].compactMap { $0 }
+                                    )
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             // Create the tester.
             let fs = localFS
@@ -367,10 +409,13 @@ fileprivate struct CodeGenerationToolTests: CoreBasedTests {
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
             // Write the Info.plist file.
-            try await tester.fs.writePlist(SRCROOT.join("Sources/Info.plist"), .plDict([
-                "CFBundleDevelopmentRegion": .plString("en"),
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)")
-            ]))
+            try await tester.fs.writePlist(
+                SRCROOT.join("Sources/Info.plist"),
+                .plDict([
+                    "CFBundleDevelopmentRegion": .plString("en"),
+                    "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                ])
+            )
 
             // Write the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/CoreFoo.h")) { contents in
@@ -390,17 +435,20 @@ fileprivate struct CodeGenerationToolTests: CoreBasedTests {
             try tester.fs.copy(Path(mlpackageSourcePath), to: testWorkspace.sourceRoot.join("aProject/Sources/CoreBaz2.mlpackage"))
 
             // We enable deployment postprocessing explicitly, to check the full range of basic behaviors.
-            let parameters = BuildParameters(action: .install, configuration: "Debug", overrides: [
-                "DSTROOT": tmpDirPath.join("dst").str,
-            ])
+            let parameters = BuildParameters(
+                action: .install,
+                configuration: "Debug",
+                overrides: [
+                    "DSTROOT": tmpDirPath.join("dst").str
+                ]
+            )
 
             // Check the build.
             try await tester.checkBuild(parameters: parameters, runDestination: .iOS, persistent: true) { results in
                 // Check that the module session validation file was written.
                 if let moduleSessionFilePath = results.buildDescription.moduleSessionFilePath {
                     #expect(tester.fs.exists(moduleSessionFilePath))
-                }
-                else {
+                } else {
                     Issue.record("No module session validation file path was computed")
                 }
 
@@ -492,12 +540,18 @@ fileprivate struct CodeGenerationToolTests: CoreBasedTests {
                     results.check(event: .taskHadEvent(coreMLCodeGenTaskMLModel, event: .completed), precedes: .taskHadEvent(linkerTask, event: .started))
                     results.check(event: .taskHadEvent(coreMLTaskMLModel, event: .started), precedes: .taskHadEvent(coreMLTaskMLModel, event: .completed))
 
-                    results.check(event: .taskHadEvent(coreMLCodeGenTaskMLPackage, event: .started),
-                                  precedes: .taskHadEvent(coreMLCodeGenTaskMLPackage, event: .completed))
-                    results.check(event: .taskHadEvent(coreMLCodeGenTaskMLPackage, event: .completed),
-                                  precedes: .taskHadEvent(linkerTask, event: .started))
-                    results.check(event: .taskHadEvent(coreMLTaskMLPackage, event: .started),
-                                  precedes: .taskHadEvent(coreMLTaskMLPackage, event: .completed))
+                    results.check(
+                        event: .taskHadEvent(coreMLCodeGenTaskMLPackage, event: .started),
+                        precedes: .taskHadEvent(coreMLCodeGenTaskMLPackage, event: .completed)
+                    )
+                    results.check(
+                        event: .taskHadEvent(coreMLCodeGenTaskMLPackage, event: .completed),
+                        precedes: .taskHadEvent(linkerTask, event: .started)
+                    )
+                    results.check(
+                        event: .taskHadEvent(coreMLTaskMLPackage, event: .started),
+                        precedes: .taskHadEvent(coreMLTaskMLPackage, event: .completed)
+                    )
 
                     // Check that the module map file was created.
                     try results.check(contains: .taskHadEvent(#require(moduleMapWriteTask), event: .started))
@@ -526,63 +580,80 @@ fileprivate struct CodeGenerationToolTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
+                            "Sources",
+                            path: "Sources",
+                            children: [
                                 TestFile("CoreFoo.h"),
                                 TestFile("CoreFoo.m"),
                                 TestFile("CoreFoo.swift"),
                                 TestFile("Info.plist"),
                                 TestFile("Intents.intentdefinition"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "ARCHS[sdk=iphoneos*]": "arm64",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SDKROOT": "iphoneos",
-                                "DEFINES_MODULE": "YES",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "VERSIONING_SYSTEM": "apple-generic",
-                                "CURRENT_PROJECT_VERSION": "3.1",
-                                "INFOPLIST_FILE": "Sources/Info.plist",
-
-                                "INSTALL_OWNER": "",
-                                "INSTALL_GROUP": GetCurrentUserGroupName()!,
-                                "INSTALL_MODE_FLAG": "+w",
-                                "SWIFT_VERSION": "5.0",
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "ARCHS[sdk=iphoneos*]": "arm64",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SDKROOT": "iphoneos",
+                                    "DEFINES_MODULE": "YES",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "VERSIONING_SYSTEM": "apple-generic",
+                                    "CURRENT_PROJECT_VERSION": "3.1",
+                                    "INFOPLIST_FILE": "Sources/Info.plist",
+
+                                    "INSTALL_OWNER": "",
+                                    "INSTALL_GROUP": GetCurrentUserGroupName()!,
+                                    "INSTALL_MODE_FLAG": "+w",
+                                    "SWIFT_VERSION": "5.0",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget("All", dependencies: ["CoreFoo", "CoreBar"]),
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: [
-                                        "INTENTS_CODEGEN_LANGUAGE": "Objective-C",
-                                    ])
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "INTENTS_CODEGEN_LANGUAGE": "Objective-C"
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "CoreFoo.m",
-                                        TestBuildFile("Intents.intentdefinition", intentsCodegenVisibility: .public)
+                                        TestBuildFile("Intents.intentdefinition", intentsCodegenVisibility: .public),
                                     ]),
                                     TestHeadersBuildPhase([TestBuildFile("CoreFoo.h", headerVisibility: .public)]),
-                                ]),
+                                ]
+                            ),
                             TestStandardTarget(
-                                "CoreBar", type: .framework,
+                                "CoreBar",
+                                type: .framework,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: [
-                                        "INTENTS_CODEGEN_LANGUAGE": "Swift",
-                                    ])
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "INTENTS_CODEGEN_LANGUAGE": "Swift"
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "CoreFoo.swift",
-                                        TestBuildFile("Intents.intentdefinition", intentsCodegenVisibility: .public)
-                                    ]),
-                                ])
-                        ])
-                ])
+                                        TestBuildFile("Intents.intentdefinition", intentsCodegenVisibility: .public),
+                                    ])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             // Create the tester.
             let fs = localFS
@@ -590,10 +661,13 @@ fileprivate struct CodeGenerationToolTests: CoreBasedTests {
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
             // Write the Info.plist file.
-            try await tester.fs.writePlist(SRCROOT.join("Sources/Info.plist"), .plDict([
-                "CFBundleDevelopmentRegion": .plString("en"),
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)")
-            ]))
+            try await tester.fs.writePlist(
+                SRCROOT.join("Sources/Info.plist"),
+                .plDict([
+                    "CFBundleDevelopmentRegion": .plString("en"),
+                    "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                ])
+            )
 
             // Write the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/CoreFoo.h")) { contents in
@@ -608,17 +682,20 @@ fileprivate struct CodeGenerationToolTests: CoreBasedTests {
             try await tester.fs.writeIntentDefinition(testWorkspace.sourceRoot.join("aProject/Sources/Intents.intentdefinition"))
 
             // We enable deployment postprocessing explicitly, to check the full range of basic behaviors.
-            let parameters = BuildParameters(action: .install, configuration: "Debug", overrides: [
-                "DSTROOT": tmpDirPath.join("dst").str,
-            ])
+            let parameters = BuildParameters(
+                action: .install,
+                configuration: "Debug",
+                overrides: [
+                    "DSTROOT": tmpDirPath.join("dst").str
+                ]
+            )
 
             // Check the build.
             try await tester.checkBuild(parameters: parameters, runDestination: .iOS, persistent: true) { results in
                 // Check that the module session validation file was written.
                 if let moduleSessionFilePath = results.buildDescription.moduleSessionFilePath {
                     #expect(tester.fs.exists(moduleSessionFilePath))
-                }
-                else {
+                } else {
                     Issue.record("No module session validation file path was computed")
                 }
 
diff --git a/Tests/SWBBuildSystemTests/CodeSigningBuildOperationTests.swift b/Tests/SWBBuildSystemTests/CodeSigningBuildOperationTests.swift
index 66cbb4e0..b0017424 100644
--- a/Tests/SWBBuildSystemTests/CodeSigningBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/CodeSigningBuildOperationTests.swift
@@ -26,21 +26,26 @@ fileprivate struct CodeSigningBuildOperationTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDirPath,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("AppSource.m"),
-                    ]),
+                        TestFile("AppSource.m")
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration( "Debug", buildSettings: [
-                        "COPY_PHASE_STRIP": "NO",
-                        "DEBUG_INFORMATION_FORMAT": "dwarf",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "CODE_SIGN_IDENTITY": "-",
-                        "CODE_SIGN_ENTITLEMENTS": "Entitlements.entitlements",
-                        "SDKROOT": "macosx",
-                        "SUPPORTED_PLATFORMS": "macosx",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "COPY_PHASE_STRIP": "NO",
+                            "DEBUG_INFORMATION_FORMAT": "dwarf",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "CODE_SIGN_IDENTITY": "-",
+                            "CODE_SIGN_ENTITLEMENTS": "Entitlements.entitlements",
+                            "SDKROOT": "macosx",
+                            "SUPPORTED_PLATFORMS": "macosx",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -48,10 +53,10 @@ fileprivate struct CodeSigningBuildOperationTests: CoreBasedTests {
                         type: .application,
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                "AppSource.m",
-                            ]),
+                                "AppSource.m"
+                            ])
                         ],
-                    ),
+                    )
                 ]
             )
 
@@ -83,21 +88,26 @@ fileprivate struct CodeSigningBuildOperationTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDirPath,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("AppSource.m"),
-                    ]),
+                        TestFile("AppSource.m")
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration( "Debug", buildSettings: [
-                        "COPY_PHASE_STRIP": "NO",
-                        "DEBUG_INFORMATION_FORMAT": "dwarf",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "CODE_SIGN_IDENTITY": "-",
-                        "CODE_SIGN_ENTITLEMENTS": "Entitlements.entitlements",
-                        "SDKROOT": "macosx",
-                        "SUPPORTED_PLATFORMS": "macosx",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "COPY_PHASE_STRIP": "NO",
+                            "DEBUG_INFORMATION_FORMAT": "dwarf",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "CODE_SIGN_IDENTITY": "-",
+                            "CODE_SIGN_ENTITLEMENTS": "Entitlements.entitlements",
+                            "SDKROOT": "macosx",
+                            "SUPPORTED_PLATFORMS": "macosx",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -105,10 +115,10 @@ fileprivate struct CodeSigningBuildOperationTests: CoreBasedTests {
                         type: .application,
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                "AppSource.m",
-                            ]),
+                                "AppSource.m"
+                            ])
                         ],
-                    ),
+                    )
                 ]
             )
 
@@ -140,4 +150,3 @@ fileprivate struct CodeSigningBuildOperationTests: CoreBasedTests {
         }
     }
 }
-
diff --git a/Tests/SWBBuildSystemTests/CustomTaskBuildOperationTests.swift b/Tests/SWBBuildSystemTests/CustomTaskBuildOperationTests.swift
index 736b48d2..45e1a28c 100644
--- a/Tests/SWBBuildSystemTests/CustomTaskBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/CustomTaskBuildOperationTests.swift
@@ -35,11 +35,13 @@ fileprivate struct CustomTaskBuildOperationTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("tool.swift"),
                         TestFile("foo.c"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -51,12 +53,14 @@ fileprivate struct CustomTaskBuildOperationTests: CoreBasedTests {
                             "SDKROOT": "$(HOST_PLATFORM)",
                             "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
                             "CODE_SIGNING_ALLOWED": "NO",
-                            "MACOSX_DEPLOYMENT_TARGET": "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"
-                        ]),
+                            "MACOSX_DEPLOYMENT_TARGET": "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
-                        "CoreFoo", type: .dynamicLibrary,
+                        "CoreFoo",
+                        type: .dynamicLibrary,
                         buildPhases: [
                             TestSourcesBuildPhase(["foo.c"])
                         ],
@@ -69,24 +73,26 @@ fileprivate struct CustomTaskBuildOperationTests: CoreBasedTests {
                                 inputs: ["$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/tool\(destination == .windows ? ".exe" : "")"],
                                 outputs: [Path.root.join("output").str],
                                 enableSandboxing: false,
-                                preparesForIndexing: false)
+                                preparesForIndexing: false
+                            )
                         ],
                         dependencies: ["tool"]
                     ),
                     TestStandardTarget(
-                        "tool", type: .hostBuildTool,
+                        "tool",
+                        type: .hostBuildTool,
                         buildPhases: [
                             TestSourcesBuildPhase(["tool.swift"])
                         ]
                     ),
-                ])
+                ]
+            )
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
             let parameters = BuildParameters(action: .build, configuration: "Debug", activeRunDestination: .host)
 
             try await tester.fs.writeFileContents(tmpDir.join("Sources").join("tool.swift")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     @main
                     struct Entry {
                         static func main() {
@@ -97,8 +103,7 @@ fileprivate struct CustomTaskBuildOperationTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(tmpDir.join("Sources").join("foo.c")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     void foo(void) {}
                     """
             }
diff --git a/Tests/SWBBuildSystemTests/DependencyCycleDiagnosticsTests.swift b/Tests/SWBBuildSystemTests/DependencyCycleDiagnosticsTests.swift
index b3bed214..63fffc64 100644
--- a/Tests/SWBBuildSystemTests/DependencyCycleDiagnosticsTests.swift
+++ b/Tests/SWBBuildSystemTests/DependencyCycleDiagnosticsTests.swift
@@ -38,13 +38,26 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                             TestAggregateTarget(
                                 "A",
                                 buildPhases: [
-                                    TestShellScriptBuildPhase(name: "A", originalObjectID: "A", contents: "true",
-                                                              inputs: ["/tmp/B-output"], outputs: ["/tmp/A-output"]),
-                                    TestShellScriptBuildPhase(name: "B", originalObjectID: "B", contents: "true",
-                                                              inputs: ["/tmp/A-output"], outputs: ["/tmp/B-output"]),
-                                ]),
-                        ])
-                ])
+                                    TestShellScriptBuildPhase(
+                                        name: "A",
+                                        originalObjectID: "A",
+                                        contents: "true",
+                                        inputs: ["/tmp/B-output"],
+                                        outputs: ["/tmp/A-output"]
+                                    ),
+                                    TestShellScriptBuildPhase(
+                                        name: "B",
+                                        originalObjectID: "B",
+                                        contents: "true",
+                                        inputs: ["/tmp/A-output"],
+                                        outputs: ["/tmp/B-output"]
+                                    ),
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: true)
 
             try await tester.checkBuild(runDestination: .macOS) { results in
@@ -63,7 +76,8 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "Files", children: [
+                    "Files",
+                    children: [
                         TestFile("A.c"),
                         TestFile("A.swift"),
                         TestFile("A.metal"),
@@ -81,7 +95,8 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                         TestFile("A.xcconfig"),
                         TestFile("A.strings"),
                         TestFile("B.xcconfig"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -101,13 +116,14 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                             "GCC_PREFIX_HEADER": "\(tmpDir.str)/A.pch++",
                             "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
                         ]
-                    )],
+                    ),
+                ],
                 targets: [
                     TestStandardTarget(
                         "A-foo-bar",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: ["DONT_GENERATE_INFOPLIST_FILE": "YES"]),
+                            TestBuildConfiguration("Debug", buildSettings: ["DONT_GENERATE_INFOPLIST_FILE": "YES"])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([TestBuildFile("A.h", headerVisibility: .public)]),
@@ -116,7 +132,9 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                             TestResourcesBuildPhase([TestBuildFile("A.png"), TestBuildFile("A.plist"), TestBuildFile("A.xcassets"), TestBuildFile("A.storyboard"), TestBuildFile("A.xib"), TestBuildFile("A.xcdatamodel"), TestBuildFile("A.tiff"), TestBuildFile("A.xcconfig"), TestBuildFile("A.strings")]),
                             TestCopyFilesBuildPhase([TestBuildFile("B.xcconfig")], destinationSubfolder: .frameworks),
                         ]
-                    )])
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
 
             try await tester.checkBuildDescription(BuildParameters(configuration: "Other"), runDestination: .macOS) { results in
@@ -238,14 +256,16 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "Sources", children: [
+                    "Sources",
+                    children: [
                         TestFile("A.h"),
                         TestFile("B.h"),
                         TestFile("C.h"),
                         TestFile("A.m"),
                         TestFile("B.m"),
                         TestFile("C.m"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -253,13 +273,14 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "EAGER_LINKING": "YES",
                         ]
-                    )],
+                    )
+                ],
                 targets: [
                     TestStandardTarget(
                         "A",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([TestBuildFile("A.h", headerVisibility: .public)]),
@@ -271,7 +292,7 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                         "B",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([TestBuildFile("B.h", headerVisibility: .public)]),
@@ -283,7 +304,7 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                         "C",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([TestBuildFile("C.h", headerVisibility: .public)]),
@@ -291,7 +312,8 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                         ],
                         dependencies: ["A"]
                     ),
-                ])
+                ]
+            )
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
             for f in ["A.h", "B.h", "C.h", "A.m", "B.m", "C.m"] {
@@ -305,11 +327,13 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                     #expect(cycle.header == "Cycle in dependencies between targets 'A' and 'C'; building could produce unreliable results.")
                     #expect(cycle.path == "Cycle path: A → B → C → A")
                     #expect(!cycle.usingManualOrder)
-                    #expect(cycle.lines == [
-                        "→ Target \'A\' has an explicit dependency on Target \'B\'",
-                        "→ Target \'B\' has an explicit dependency on Target \'C\'",
-                        "→ Target \'C\' has an explicit dependency on Target \'A\'",
-                    ])
+                    #expect(
+                        cycle.lines == [
+                            "→ Target \'A\' has an explicit dependency on Target \'B\'",
+                            "→ Target \'B\' has an explicit dependency on Target \'C\'",
+                            "→ Target \'C\' has an explicit dependency on Target \'A\'",
+                        ]
+                    )
                 }
                 results.checkNoDiagnostics()
             }
@@ -327,14 +351,16 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "Sources", children: [
+                    "Sources",
+                    children: [
                         TestFile("A.h"),
                         TestFile("B.h"),
                         TestFile("C.h"),
                         TestFile("A.m"),
                         TestFile("B.m"),
                         TestFile("C.m"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -342,13 +368,14 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "EAGER_LINKING": "YES",
                         ]
-                    )],
+                    )
+                ],
                 targets: [
                     TestStandardTarget(
                         "A",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([TestBuildFile("A.h", headerVisibility: .public)]),
@@ -360,9 +387,12 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                         "B",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "OTHER_LDFLAGS": "-framework C",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "OTHER_LDFLAGS": "-framework C"
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([TestBuildFile("B.h", headerVisibility: .public)]),
@@ -374,16 +404,17 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                         "C",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([TestBuildFile("C.h", headerVisibility: .public)]),
                             TestSourcesBuildPhase([TestBuildFile("C.m")]),
-                            TestFrameworksBuildPhase([TestBuildFile("A.framework")])
+                            TestFrameworksBuildPhase([TestBuildFile("A.framework")]),
                         ],
                         dependencies: []
                     ),
-                ])
+                ]
+            )
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
             for f in ["A.h", "B.h", "C.h", "A.m", "B.m", "C.m"] {
@@ -399,11 +430,13 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                     #expect(cycle.header == "Cycle in dependencies between targets 'A' and 'C'; building could produce unreliable results.")
                     #expect(cycle.path == "Cycle path: A → B → C → A")
                     #expect(!cycle.usingManualOrder)
-                    #expect(cycle.lines == [
-                        "→ Target \'A\' has an explicit dependency on Target \'B\'",
-                        "→ Target \'B\' has an implicit dependency on Target \'C\' because \'B\' defines the option \'-framework C\' in the build setting \'OTHER_LDFLAGS\'",
-                        "→ Target \'C\' has an implicit dependency on Target \'A\' because \'C\' references the file \'A.framework\' in the build phase \'Link Binary\'",
-                    ])
+                    #expect(
+                        cycle.lines == [
+                            "→ Target \'A\' has an explicit dependency on Target \'B\'",
+                            "→ Target \'B\' has an implicit dependency on Target \'C\' because \'B\' defines the option \'-framework C\' in the build setting \'OTHER_LDFLAGS\'",
+                            "→ Target \'C\' has an implicit dependency on Target \'A\' because \'C\' references the file \'A.framework\' in the build phase \'Link Binary\'",
+                        ]
+                    )
                 }
                 results.checkNoDiagnostics()
             }
@@ -421,7 +454,8 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "Sources", children: [
+                    "Sources",
+                    children: [
                         TestFile("A.h"),
                         TestFile("A.m"),
                         TestFile("B.h"),
@@ -430,7 +464,8 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                         TestFile("C.m"),
                         TestFile("D.h"),
                         TestFile("D.m"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -438,13 +473,14 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "EAGER_LINKING": "YES",
                         ]
-                    )],
+                    )
+                ],
                 targets: [
                     TestStandardTarget(
                         "A",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([TestBuildFile("A.h", headerVisibility: .public)]),
@@ -456,7 +492,7 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                         "B",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([TestBuildFile("B.h", headerVisibility: .public)]),
@@ -468,7 +504,7 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                         "C",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([TestBuildFile("C.h", headerVisibility: .public)]),
@@ -480,7 +516,7 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                         "D",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([TestBuildFile("D.h", headerVisibility: .public)]),
@@ -488,7 +524,8 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                         ],
                         dependencies: ["C"]
                     ),
-                ])
+                ]
+            )
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
             for f in ["A.h", "A.m", "B.h", "B.m", "C.h", "C.m", "D.h", "D.m"] {
@@ -502,10 +539,12 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                     #expect(cycle.header == "Cycle in dependencies between targets 'C' and 'D'; building could produce unreliable results.")
                     #expect(cycle.path == "Cycle path: C → D → C")
                     #expect(!cycle.usingManualOrder)
-                    #expect(cycle.lines == [
-                        "→ Target \'C\' has an explicit dependency on Target \'D\'",
-                        "→ Target \'D\' has an explicit dependency on Target \'C\'",
-                    ])
+                    #expect(
+                        cycle.lines == [
+                            "→ Target \'C\' has an explicit dependency on Target \'D\'",
+                            "→ Target \'D\' has an explicit dependency on Target \'C\'",
+                        ]
+                    )
                 }
                 results.checkNoDiagnostics()
             }
@@ -526,12 +565,14 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "Sources", children: [
+                    "Sources",
+                    children: [
                         TestFile("A.h"),
                         TestFile("B.h"),
                         TestFile("A.m"),
                         TestFile("B.m"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -539,33 +580,35 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "EAGER_LINKING": "YES",
                         ]
-                    )],
+                    )
+                ],
                 targets: [
                     TestStandardTarget(
                         "A",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([TestBuildFile("A.h", headerVisibility: .public)]),
                             TestSourcesBuildPhase([TestBuildFile("A.m")]),
                             TestShellScriptBuildPhase(name: "Generate B.m", originalObjectID: "bestID", contents: "touch \(tmpDir.str)/B.m", outputs: ["\(tmpDir.str)/B.m"]),
                         ],
-                        dependencies: [ "B" ]
+                        dependencies: ["B"]
                     ),
                     TestStandardTarget(
                         "B",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([TestBuildFile("B.h", headerVisibility: .public)]),
                             TestSourcesBuildPhase([TestBuildFile("B.m")]),
                         ]
                     ),
-                ])
+                ]
+            )
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
             for f in ["A.h", "B.h", "A.m"] {
@@ -578,11 +621,13 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                     #expect(cycle.header == "Cycle in dependencies between targets 'B' and 'A'; building could produce unreliable results.")
                     #expect(cycle.path == "Cycle path: B → A → B")
                     #expect(!cycle.usingManualOrder)
-                    #expect(cycle.lines == [
-                        "→ Target \'B\' has compile command with input \'\(tmpDir.str)/B.m\'",
-                        "→ That command depends on command in Target \'A\': script phase “Generate B.m”",
-                        "→ Target \'A\' has an explicit dependency on Target \'B\'",
-                    ])
+                    #expect(
+                        cycle.lines == [
+                            "→ Target \'B\' has compile command with input \'\(tmpDir.str)/B.m\'",
+                            "→ That command depends on command in Target \'A\': script phase “Generate B.m”",
+                            "→ Target \'A\' has an explicit dependency on Target \'B\'",
+                        ]
+                    )
                 }
                 results.checkNoDiagnostics()
             }
@@ -603,14 +648,16 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "Sources", children: [
+                    "Sources",
+                    children: [
                         TestFile("A.h"),
                         TestFile("B.h"),
                         TestFile("C.h"),
                         TestFile("A.m"),
                         TestFile("B.m"),
                         TestFile("C.m"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -618,13 +665,14 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING": "YES",
                         ]
-                    )],
+                    )
+                ],
                 targets: [
                     TestStandardTarget(
                         "A",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([TestBuildFile("A.h", headerVisibility: .public)]),
@@ -636,7 +684,7 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                         "B",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([TestBuildFile("B.h", headerVisibility: .public)]),
@@ -647,14 +695,15 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                         "C",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([TestBuildFile("C.h", headerVisibility: .public)]),
                             TestSourcesBuildPhase([TestBuildFile("C.m")]),
                         ]
                     ),
-                ])
+                ]
+            )
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
             for f in ["A.h", "B.h", "C.h", "A.m", "C.m"] {
@@ -666,7 +715,7 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
             let project = tester.workspace.projects.first!
             let targetA = BuildRequest.BuildTargetInfo(parameters: buildParameters, target: project.targets[0])
             let targetB = BuildRequest.BuildTargetInfo(parameters: buildParameters, target: project.targets[1])
-            let targetC  = BuildRequest.BuildTargetInfo(parameters: buildParameters, target: project.targets[2])
+            let targetC = BuildRequest.BuildTargetInfo(parameters: buildParameters, target: project.targets[2])
             let buildRequest = BuildRequest(parameters: buildParameters, buildTargets: [targetC, targetB, targetA], dependencyScope: .workspace, continueBuildingAfterErrors: false, useParallelTargets: false, useImplicitDependencies: true, useDryRun: false)
 
             try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest) { results in
@@ -674,11 +723,13 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                     #expect(cycle.header == "Cycle in dependencies between targets 'A' and 'B'; building could produce unreliable results.")
                     #expect(cycle.path == "Cycle path: A → B → A")
                     #expect(cycle.usingManualOrder)
-                    #expect(cycle.lines == [
-                        "→ Target \'A\' is ordered after Target \'B\' in a “Target Dependencies” build phase or in the scheme",
-                        "○ Target \'B\' has compile command with input \'\(tmpDir.str)/B.m\'",
-                        "→ That command depends on command in Target \'A\': script phase “Generate B.m”",
-                    ])
+                    #expect(
+                        cycle.lines == [
+                            "→ Target \'A\' is ordered after Target \'B\' in a “Target Dependencies” build phase or in the scheme",
+                            "○ Target \'B\' has compile command with input \'\(tmpDir.str)/B.m\'",
+                            "→ That command depends on command in Target \'A\': script phase “Generate B.m”",
+                        ]
+                    )
                 }
                 results.checkNoDiagnostics()
             }
@@ -698,49 +749,74 @@ fileprivate struct DependencyCycleDiagnosticsTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
-                                TestGroup("BaseFoo", path: "BaseFoo", children: [
-                                    TestFile("BaseFoo.m"),
-                                ]),
-                                TestGroup("CoreFoo", path: "CoreFoo", children: [
-                                    TestFile("CoreFoo.h"),
-                                    TestFile("CoreFoo.m"),
-                                ]),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                // Autolinking introduces a nondeterministic timing-based dependency cycle in this test.
-                                "CLANG_MODULES_AUTOLINK": "NO",
-
-                                // Eager parallel compilation prevents this cycle by removing dependencies between compiling tasks.
-                                // BaseFoo only depends on the header map creation, not the compilation.
-                                "EAGER_PARALLEL_COMPILATION_DISABLE": "\(!eagerParallelCompilation)",
-                                "DIAGNOSE_MISSING_TARGET_DEPENDENCIES": "NO"
+                            "Sources",
+                            path: "Sources",
+                            children: [
+                                TestGroup(
+                                    "BaseFoo",
+                                    path: "BaseFoo",
+                                    children: [
+                                        TestFile("BaseFoo.m")
+                                    ]
+                                ),
+                                TestGroup(
+                                    "CoreFoo",
+                                    path: "CoreFoo",
+                                    children: [
+                                        TestFile("CoreFoo.h"),
+                                        TestFile("CoreFoo.m"),
+                                    ]
+                                ),
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    // Autolinking introduces a nondeterministic timing-based dependency cycle in this test.
+                                    "CLANG_MODULES_AUTOLINK": "NO",
+
+                                    // Eager parallel compilation prevents this cycle by removing dependencies between compiling tasks.
+                                    // BaseFoo only depends on the header map creation, not the compilation.
+                                    "EAGER_PARALLEL_COMPILATION_DISABLE": "\(!eagerParallelCompilation)",
+                                    "DIAGNOSE_MISSING_TARGET_DEPENDENCIES": "NO",
+                                ]
+                            )
+                        ],
                         targets: [
                             // Main app, which depends on a framework, and the framework depends on a static library.
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug",
-                                                           buildSettings: [
-                                                            "DEFINES_MODULE": "YES"])],
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "DEFINES_MODULE": "YES"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["CoreFoo.m"]),
                                     TestHeadersBuildPhase([
-                                        TestBuildFile("CoreFoo.h", headerVisibility: .public)])],
-                                dependencies: ["BaseFoo"]),
+                                        TestBuildFile("CoreFoo.h", headerVisibility: .public)
+                                    ]),
+                                ],
+                                dependencies: ["BaseFoo"]
+                            ),
                             TestStandardTarget(
-                                "BaseFoo", type: .framework,
-                                buildPhases: [TestSourcesBuildPhase(["BaseFoo.m"])]),
-                        ])
-                ])
+                                "BaseFoo",
+                                type: .framework,
+                                buildPhases: [TestSourcesBuildPhase(["BaseFoo.m"])]
+                            ),
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Write the source files.
diff --git a/Tests/SWBBuildSystemTests/DependencyValidationTests.swift b/Tests/SWBBuildSystemTests/DependencyValidationTests.swift
index 116c0329..9d2b2c91 100644
--- a/Tests/SWBBuildSystemTests/DependencyValidationTests.swift
+++ b/Tests/SWBBuildSystemTests/DependencyValidationTests.swift
@@ -67,16 +67,19 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
                         TestGroup(
                             "Sources",
                             children: [
-                                TestFile("test.c"),
+                                TestFile("test.c")
                             ]
                         )
                     ]
                 ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)"
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -86,7 +89,7 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
-                                    "HEADER_SEARCH_PATHS": "$(DERIVED_SOURCES_DIR)",
+                                    "HEADER_SEARCH_PATHS": "$(DERIVED_SOURCES_DIR)"
                                 ]
                             )
                         ],
@@ -105,15 +108,15 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
                                 contents: "touch \"$DERIVED_SOURCES_DIR/header.h\" && touch \"$SCRIPT_OUTPUT_FILE_0\"",
                                 inputs: [
                                     "$(DERIVED_SOURCES_DIR)/order",
-                                    "$(DERIVED_SOURCES_DIR)/other.c"
+                                    "$(DERIVED_SOURCES_DIR)/other.c",
                                 ],
                                 outputs: [
-                                    "$(DERIVED_SOURCES_DIR)/order.h",
+                                    "$(DERIVED_SOURCES_DIR)/order.h"
                                 ]
                             ),
                             TestSourcesBuildPhase([
                                 "test.c"
-                            ])
+                            ]),
                         ]
                     )
                 ]
@@ -193,14 +196,17 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
                     ]
                 ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "DEPLOYMENT_POSTPROCESSING": "NO",
-                        "INSTALL_OWNER": "",
-                        "INSTALL_GROUP": "",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "USE_HEADERMAP": "NO",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "DEPLOYMENT_POSTPROCESSING": "NO",
+                            "INSTALL_OWNER": "",
+                            "INSTALL_GROUP": "",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "USE_HEADERMAP": "NO",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -212,7 +218,7 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
                             ]),
                             TestFrameworksBuildPhase([
                                 "Framework.framework"
-                            ])
+                            ]),
                         ],
                         dependencies: ["Framework"]
                     ),
@@ -222,23 +228,27 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
                         buildPhases: [
                             TestHeadersBuildPhase([
                                 TestBuildFile("Framework.h", headerVisibility: .public),
-                                TestBuildFile("test.h", headerVisibility: .public)
+                                TestBuildFile("test.h", headerVisibility: .public),
                             ]),
                             TestSourcesBuildPhase([
                                 "test.c"
-                            ])
+                            ]),
                         ]
-                    )
+                    ),
                 ]
             )
 
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDir, projects: [testProject])
-            let parameters = BuildParameters(action: .install, configuration: "Debug", overrides: [
-                "DSTROOT": tmpDir.join("DSTROOT").str,
-                "OBJROOT": tmpDir.join("OBJROOT").str,
-                "SYMROOT": tmpDir.join("SYMROOT").str,
-                "VALIDATE_DEPENDENCIES": "YES_ERROR",
-            ])
+            let parameters = BuildParameters(
+                action: .install,
+                configuration: "Debug",
+                overrides: [
+                    "DSTROOT": tmpDir.join("DSTROOT").str,
+                    "OBJROOT": tmpDir.join("OBJROOT").str,
+                    "SYMROOT": tmpDir.join("SYMROOT").str,
+                    "VALIDATE_DEPENDENCIES": "YES_ERROR",
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try tester.fs.createDirectory(tmpDir.join("aProject/Sources"), recursive: true)
@@ -257,12 +267,14 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
                 #expect(exists)
 
                 let testDependencies = try tester.fs.read(tmpDir.join("OBJROOT").join("aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/test.d"))
-                #expect(testDependencies.unsafeStringValue.split(separator: "\n") == [
-                    "dependencies: \\",
-                    "  \(tmpDir.str)/aProject/Sources/test.c \\",
-                    "  \(tmpDir.str)/SYMROOT/Debug/Framework.framework/Headers/Framework.h \\",
-                    "  \(tmpDir.str)/SYMROOT/Debug/Framework.framework/Headers/test.h"
-                ])
+                #expect(
+                    testDependencies.unsafeStringValue.split(separator: "\n") == [
+                        "dependencies: \\",
+                        "  \(tmpDir.str)/aProject/Sources/test.c \\",
+                        "  \(tmpDir.str)/SYMROOT/Debug/Framework.framework/Headers/Framework.h \\",
+                        "  \(tmpDir.str)/SYMROOT/Debug/Framework.framework/Headers/test.h",
+                    ]
+                )
 
                 // Even though the Makefile dependencies point to symlinks for the headers, we should resolve them and still find the producer tasks.
                 results.checkNoDiagnostics()
@@ -282,21 +294,24 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
                         TestGroup(
                             "Sources",
                             children: [
-                                TestFile("test.c"),
+                                TestFile("test.c")
                             ]
                         )
                     ]
                 ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "DEPLOYMENT_POSTPROCESSING": "NO",
-                        "INSTALL_OWNER": "",
-                        "INSTALL_GROUP": "",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "USE_HEADERMAP": "NO",
-                        "DSTROOT": tmpDir.join("dstroot").str,
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "DEPLOYMENT_POSTPROCESSING": "NO",
+                            "INSTALL_OWNER": "",
+                            "INSTALL_GROUP": "",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "USE_HEADERMAP": "NO",
+                            "DSTROOT": tmpDir.join("dstroot").str,
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -311,16 +326,22 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
                                 originalObjectID: "Foo",
                                 contents: "touch $SCRIPT_OUTPUT_FILE_0",
                                 outputs: ["$(TARGET_TEMP_DIR)/foo"],
-                                dependencyInfo: .dependencyInfo(.string(tmpDir.join("dd").join("foo.d").str)))
+                                dependencyInfo: .dependencyInfo(.string(tmpDir.join("dd").join("foo.d").str))
+                            ),
                         ]
                     )
                 ]
             )
 
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDir, projects: [testProject])
-            let parameters = BuildParameters(action: .install, configuration: "Debug", overrides: [
-                "VALIDATE_DEPENDENCIES": "YES_ERROR",
-            ], arena: .init(derivedDataPath: tmpDir.join("dd"), buildProductsPath: tmpDir.join("dd").join("Products"), buildIntermediatesPath: tmpDir.join("dd"), pchPath: tmpDir.join("dd"), indexRegularBuildProductsPath: nil, indexRegularBuildIntermediatesPath: nil, indexPCHPath: tmpDir.join("dd"), indexDataStoreFolderPath: nil, indexEnableDataStore: false))
+            let parameters = BuildParameters(
+                action: .install,
+                configuration: "Debug",
+                overrides: [
+                    "VALIDATE_DEPENDENCIES": "YES_ERROR"
+                ],
+                arena: .init(derivedDataPath: tmpDir.join("dd"), buildProductsPath: tmpDir.join("dd").join("Products"), buildIntermediatesPath: tmpDir.join("dd"), pchPath: tmpDir.join("dd"), indexRegularBuildProductsPath: nil, indexRegularBuildIntermediatesPath: nil, indexPCHPath: tmpDir.join("dd"), indexDataStoreFolderPath: nil, indexEnableDataStore: false)
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try tester.fs.createDirectory(tmpDir.join("aProject/Sources"), recursive: true)
@@ -358,66 +379,71 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
                             children: [
                                 TestFile("Swift.swift"),
                                 TestFile("Project.xcconfig"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            baseConfig: "Project.xcconfig",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "CLANG_ENABLE_EXPLICIT_MODULES": explicitModules ? "YES" : "NO",
-                                "SWIFT_ENABLE_EXPLICIT_MODULES": explicitModules ? "YES" : "NO",
-                                "SWIFT_UPCOMING_FEATURE_INTERNAL_IMPORTS_BY_DEFAULT": "YES",
-                                "SWIFT_VERSION": swiftVersion,
-                                "DEFINES_MODULE": "YES",
-                                "DSTROOT": tmpDir.join("dstroot").str,
-                                "DUMP_DEPENDENCIES": dumpDependencies ? "YES" : "NO",
-                                "VALIDATE_MODULE_DEPENDENCIES": "YES_ERROR",
-                                "SDKROOT": "$(HOST_PLATFORM)",
-                                "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
-
-                                // Temporarily override to use the latest toolchain in CI because we depend on swift and swift-driver changes which aren't in the baseline tools yet
-                                "TOOLCHAINS": "swift",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                baseConfig: "Project.xcconfig",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "CLANG_ENABLE_EXPLICIT_MODULES": explicitModules ? "YES" : "NO",
+                                    "SWIFT_ENABLE_EXPLICIT_MODULES": explicitModules ? "YES" : "NO",
+                                    "SWIFT_UPCOMING_FEATURE_INTERNAL_IMPORTS_BY_DEFAULT": "YES",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "DEFINES_MODULE": "YES",
+                                    "DSTROOT": tmpDir.join("dstroot").str,
+                                    "DUMP_DEPENDENCIES": dumpDependencies ? "YES" : "NO",
+                                    "VALIDATE_MODULE_DEPENDENCIES": "YES_ERROR",
+                                    "SDKROOT": "$(HOST_PLATFORM)",
+                                    "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
+
+                                    // Temporarily override to use the latest toolchain in CI because we depend on swift and swift-driver changes which aren't in the baseline tools yet
+                                    "TOOLCHAINS": "swift",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "TargetA",
                                 type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["Swift.swift"]),
-                                ]),
+                                    TestSourcesBuildPhase(["Swift.swift"])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "TargetB",
                                 type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["Swift.swift"]),
-                                ]),
-                        ]),
-                ])
+                                    TestSourcesBuildPhase(["Swift.swift"])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             let swiftSourcePath = testWorkspace.sourceRoot.join("Project/Swift.swift")
             try await tester.fs.writeFileContents(swiftSourcePath) { stream in
-                stream <<<
-            """
-            import Foundation
-            """
+                stream <<< """
+                    import Foundation
+                    """
             }
 
             let projectXCConfigPath = testWorkspace.sourceRoot.join("Project/Project.xcconfig")
             try await tester.fs.writeFileContents(projectXCConfigPath) { stream in
                 if testFixIts {
-                    stream <<<
-                """
-                MODULE_DEPENDENCIES[target=TargetA] = Dispatch
-                """
+                    stream <<< """
+                        MODULE_DEPENDENCIES[target=TargetA] = Dispatch
+                        """
                 } else {
-                    stream <<<
-                """
-                MODULE_DEPENDENCIES[target=TargetA] = Dispatch Foundation
-                MODULE_DEPENDENCIES[target=TargetB] = Foundation
-                """
+                    stream <<< """
+                        MODULE_DEPENDENCIES[target=TargetA] = Dispatch Foundation
+                        MODULE_DEPENDENCIES[target=TargetB] = Foundation
+                        """
                 }
             }
 
@@ -437,18 +463,23 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
                             fixIts: [
                                 Diagnostic.FixIt(
                                     sourceRange: Diagnostic.SourceRange(path: projectXCConfigPath, startLine: 1, startColumn: 47, endLine: 1, endColumn: 47),
-                                    newText: " \\\n    Foundation"),
+                                    newText: " \\\n    Foundation"
+                                )
                             ],
                             childDiagnostics: [
                                 Diagnostic(
                                     behavior: .error,
                                     location: Diagnostic.Location.path(swiftSourcePath, line: 1, column: 8),
                                     data: DiagnosticData("Missing entry in MODULE_DEPENDENCIES: Foundation"),
-                                    fixIts: [Diagnostic.FixIt(
-                                        sourceRange: Diagnostic.SourceRange(path: projectXCConfigPath, startLine: 1, startColumn: 47, endLine: 1, endColumn: 47),
-                                        newText: " \\\n    Foundation")],
-                                ),
-                            ]),
+                                    fixIts: [
+                                        Diagnostic.FixIt(
+                                            sourceRange: Diagnostic.SourceRange(path: projectXCConfigPath, startLine: 1, startColumn: 47, endLine: 1, endColumn: 47),
+                                            newText: " \\\n    Foundation"
+                                        )
+                                    ],
+                                )
+                            ]
+                        )
                     ],
                     "TargetB": [
                         Diagnostic(
@@ -458,18 +489,23 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
                             fixIts: [
                                 Diagnostic.FixIt(
                                     sourceRange: Diagnostic.SourceRange(path: projectXCConfigPath, startLine: projectXCConfigFinalLineNumber, startColumn: projectXCConfigFinalColumnNumber, endLine: projectXCConfigFinalLineNumber, endColumn: projectXCConfigFinalColumnNumber),
-                                    newText: "\nMODULE_DEPENDENCIES[target=TargetB] = $(inherited) \\\n    Foundation\n"),
+                                    newText: "\nMODULE_DEPENDENCIES[target=TargetB] = $(inherited) \\\n    Foundation\n"
+                                )
                             ],
                             childDiagnostics: [
                                 Diagnostic(
                                     behavior: .error,
                                     location: Diagnostic.Location.path(swiftSourcePath, line: 1, column: 8),
                                     data: DiagnosticData("Missing entry in MODULE_DEPENDENCIES: Foundation"),
-                                    fixIts: [Diagnostic.FixIt(
-                                        sourceRange: Diagnostic.SourceRange(path: projectXCConfigPath, startLine: projectXCConfigFinalLineNumber, startColumn: projectXCConfigFinalColumnNumber, endLine: projectXCConfigFinalLineNumber, endColumn: projectXCConfigFinalColumnNumber),
-                                        newText: "\nMODULE_DEPENDENCIES[target=TargetB] = $(inherited) \\\n    Foundation\n")],
-                                ),
-                            ]),
+                                    fixIts: [
+                                        Diagnostic.FixIt(
+                                            sourceRange: Diagnostic.SourceRange(path: projectXCConfigPath, startLine: projectXCConfigFinalLineNumber, startColumn: projectXCConfigFinalColumnNumber, endLine: projectXCConfigFinalLineNumber, endColumn: projectXCConfigFinalColumnNumber),
+                                            newText: "\nMODULE_DEPENDENCIES[target=TargetB] = $(inherited) \\\n    Foundation\n"
+                                        )
+                                    ],
+                                )
+                            ]
+                        )
                     ],
                 ]
             } else {
@@ -522,11 +558,13 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources",
+                            "Sources",
+                            path: "Sources",
                             children: [
                                 TestFile("CoreFoo.m"),
                                 TestFile("CoreBar.m"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -545,12 +583,15 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
                         ],
                         targets: [
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase(["CoreFoo.m", "CoreBar.m"]),
-                                    TestFrameworksBuildPhase()
-                                ])
-                        ])
+                                    TestFrameworksBuildPhase(),
+                                ]
+                            )
+                        ]
+                    )
                 ]
             )
 
@@ -561,12 +602,12 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
             for stem in ["Foo", "Bar"] {
                 try await tester.fs.writeFileContents(SRCROOT.join("Sources/Core\(stem).m")) { contents in
                     contents <<< """
-                        #include <Foundation/Foundation.h>
-                        #include <Foundation/NSObject.h>
-                        #include <Accelerate/Accelerate.h>
+                            #include <Foundation/Foundation.h>
+                            #include <Foundation/NSObject.h>
+                            #include <Accelerate/Accelerate.h>
 
-                        void f\(stem)(void) { };
-                    """
+                            void f\(stem)(void) { };
+                        """
                 }
             }
 
@@ -592,11 +633,13 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources",
+                            "Sources",
+                            path: "Sources",
                             children: [
                                 TestFile("CoreFoo.m"),
                                 TestFile("Swift.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -623,12 +666,15 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
                         ],
                         targets: [
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase(["CoreFoo.m", "Swift.swift"]),
-                                    TestFrameworksBuildPhase()
-                                ])
-                        ])
+                                    TestFrameworksBuildPhase(),
+                                ]
+                            )
+                        ]
+                    )
                 ]
             )
 
@@ -637,18 +683,18 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/Swift.swift")) { stream in
                 stream <<< """
-                    import Foundation
-                    import AppKit
-                """
+                        import Foundation
+                        import AppKit
+                    """
             }
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/CoreFoo.m")) { contents in
                 contents <<< """
-                    #include <Foundation/Foundation.h>
-                    #include <Accelerate/Accelerate.h>
+                        #include <Foundation/Foundation.h>
+                        #include <Accelerate/Accelerate.h>
 
-                    void f(void) { };
-                """
+                        void f(void) { };
+                    """
             }
 
             try await tester.checkBuild(parameters: BuildParameters(configuration: "Debug"), runDestination: .host, persistent: true) { results in
@@ -671,10 +717,12 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources",
+                            "Sources",
+                            path: "Sources",
                             children: [
                                 TestFile("CoreFoo.c")
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -693,12 +741,15 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
                         ],
                         targets: [
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase(["CoreFoo.c"]),
-                                    TestFrameworksBuildPhase()
-                                ])
-                        ])
+                                    TestFrameworksBuildPhase(),
+                                ]
+                            )
+                        ]
+                    )
                 ]
             )
 
@@ -708,11 +759,11 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
             // Write the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/CoreFoo.c")) { contents in
                 contents <<< """
-                    #include <stdio.h>
-                    #include <stdlib.h>
+                        #include <stdio.h>
+                        #include <stdlib.h>
 
-                    void f0(void) { };
-                """
+                        void f0(void) { };
+                    """
             }
 
             // Expect complaint about undeclared dependency
@@ -742,65 +793,69 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
                                 TestFile("Swift.swift"),
                                 TestFile("ObjC.m"),
                                 TestFile("Project.xcconfig"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            baseConfig: "Project.xcconfig",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "CLANG_ENABLE_EXPLICIT_MODULES": "YES",
-                                "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                                "SWIFT_UPCOMING_FEATURE_INTERNAL_IMPORTS_BY_DEFAULT": "YES",
-                                "SWIFT_VERSION": swiftVersion,
-                                "DEFINES_MODULE": "YES",
-                                "DSTROOT": tmpDir.join("dstroot").str,
-                                "VALIDATE_MODULE_DEPENDENCIES": "YES_ERROR",
-                                "VALIDATE_UNUSED_MODULE_DEPENDENCIES": "YES",
-                                "SDKROOT": "$(HOST_PLATFORM)",
-                                "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
-
-                                // Temporarily override to use the latest toolchain in CI because we depend on swift and swift-driver changes which aren't in the baseline tools yet
-                                "TOOLCHAINS": "swift",
-                                // We still want to use the default clang since that is used to gate the test
-                                "CC": defaultClangPath.str,
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                baseConfig: "Project.xcconfig",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "CLANG_ENABLE_EXPLICIT_MODULES": "YES",
+                                    "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
+                                    "SWIFT_UPCOMING_FEATURE_INTERNAL_IMPORTS_BY_DEFAULT": "YES",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "DEFINES_MODULE": "YES",
+                                    "DSTROOT": tmpDir.join("dstroot").str,
+                                    "VALIDATE_MODULE_DEPENDENCIES": "YES_ERROR",
+                                    "VALIDATE_UNUSED_MODULE_DEPENDENCIES": "YES",
+                                    "SDKROOT": "$(HOST_PLATFORM)",
+                                    "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
+
+                                    // Temporarily override to use the latest toolchain in CI because we depend on swift and swift-driver changes which aren't in the baseline tools yet
+                                    "TOOLCHAINS": "swift",
+                                    // We still want to use the default clang since that is used to gate the test
+                                    "CC": defaultClangPath.str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "TargetA",
                                 type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["Swift.swift", "ObjC.m"]),
-                                ]),
-                        ]),
-                ])
+                                    TestSourcesBuildPhase(["Swift.swift", "ObjC.m"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             let swiftSourcePath = testWorkspace.sourceRoot.join("Project/Swift.swift")
             try await tester.fs.writeFileContents(swiftSourcePath) { stream in
-                stream <<<
-            """
-            import Foundation
-            """
+                stream <<< """
+                    import Foundation
+                    """
             }
 
             let objcSourcePath = testWorkspace.sourceRoot.join("Project/ObjC.m")
             try await tester.fs.writeFileContents(objcSourcePath) { stream in
-                stream <<<
-            """
-            #include <CoreFoundation/CoreFoundation.h>
+                stream <<< """
+                    #include <CoreFoundation/CoreFoundation.h>
 
-            void objcFunction(void) { }
-            """
+                    void objcFunction(void) { }
+                    """
             }
 
             let projectXCConfigPath = testWorkspace.sourceRoot.join("Project/Project.xcconfig")
             try await tester.fs.writeFileContents(projectXCConfigPath) { stream in
-                stream <<<
-            """
-            MODULE_DEPENDENCIES[target=TargetA] = CoreFoundation Foundation AppKit UIKit?
-            """
+                stream <<< """
+                    MODULE_DEPENDENCIES[target=TargetA] = CoreFoundation Foundation AppKit UIKit?
+                    """
             }
 
             let target = try #require(tester.workspace.projects.only?.targets.first { $0.name == "TargetA" })
diff --git a/Tests/SWBBuildSystemTests/DevelopmentAssetsDiagnosticTests.swift b/Tests/SWBBuildSystemTests/DevelopmentAssetsDiagnosticTests.swift
index 5f97c1e4..ff65dcbb 100644
--- a/Tests/SWBBuildSystemTests/DevelopmentAssetsDiagnosticTests.swift
+++ b/Tests/SWBBuildSystemTests/DevelopmentAssetsDiagnosticTests.swift
@@ -27,25 +27,36 @@ fileprivate struct DevelopmentAssetsDiagnosticTests: CoreBasedTests {
             let testProject = TestProject(
                 "aProject",
                 sourceRoot: tmpDirPath,
-                groupTree: TestGroup("AppTarget",
-                                     children: [
-                                        TestGroup("Preview Assets",
-                                                  children: [
-                                                    TestFile("ExampleImage1.jpg"),
-                                                    TestFile("ExampleImage2.png")
-                                                  ])
-                                     ]),
+                groupTree: TestGroup(
+                    "AppTarget",
+                    children: [
+                        TestGroup(
+                            "Preview Assets",
+                            children: [
+                                TestFile("ExampleImage1.jpg"),
+                                TestFile("ExampleImage2.png"),
+                            ]
+                        )
+                    ]
+                ),
                 buildConfigurations: [TestBuildConfiguration("Release")],
                 targets: [
-                    TestStandardTarget("AppTarget",
-                                       type: .commandLineTool,
-                                       buildConfigurations: [TestBuildConfiguration("Release",
-                                                                                    buildSettings: [
-                                                                                        "CODE_SIGNING_ALLOWED": "NO",
-                                                                                        "DEVELOPMENT_ASSET_PATHS": "'Preview Assets'"
-                                                                                    ])],
-                                       buildPhases: [])
-                ])
+                    TestStandardTarget(
+                        "AppTarget",
+                        type: .commandLineTool,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Release",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "DEVELOPMENT_ASSET_PATHS": "'Preview Assets'",
+                                ]
+                            )
+                        ],
+                        buildPhases: []
+                    )
+                ]
+            )
 
             let parameters = BuildParameters(action: .install, configuration: "Release")
             try await BuildOperationTester(getCore(), testProject, simulated: false).checkBuild(parameters: parameters, runDestination: .macOS) { results in
@@ -68,25 +79,36 @@ fileprivate struct DevelopmentAssetsDiagnosticTests: CoreBasedTests {
             let testProject = TestProject(
                 "aProject",
                 sourceRoot: tmpDirPath,
-                groupTree: TestGroup("AppTarget",
-                                     children: [
-                                        TestGroup("Preview Assets",
-                                                  children: [
-                                                    TestFile("ExampleImage1.jpg", path: "ExampleImage1.jpg"),
-                                                    TestFile("ExampleImage2.png", path: "ExampleImage2.jpg")
-                                                  ])
-                                     ]),
+                groupTree: TestGroup(
+                    "AppTarget",
+                    children: [
+                        TestGroup(
+                            "Preview Assets",
+                            children: [
+                                TestFile("ExampleImage1.jpg", path: "ExampleImage1.jpg"),
+                                TestFile("ExampleImage2.png", path: "ExampleImage2.jpg"),
+                            ]
+                        )
+                    ]
+                ),
                 buildConfigurations: [TestBuildConfiguration("Release")],
                 targets: [
-                    TestStandardTarget("AppTarget",
-                                       type: .commandLineTool,
-                                       buildConfigurations: [TestBuildConfiguration("Release",
-                                                                                    buildSettings: [
-                                                                                        "CODE_SIGNING_ALLOWED": "NO",
-                                                                                        "DEVELOPMENT_ASSET_PATHS": "'Preview Assets'"
-                                                                                    ])],
-                                       buildPhases: [TestCopyFilesBuildPhase(["ExampleImage1.jpg", "ExampleImage2.png"], destinationSubfolder: .frameworks, onlyForDeployment: false)])
-                ])
+                    TestStandardTarget(
+                        "AppTarget",
+                        type: .commandLineTool,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Release",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "DEVELOPMENT_ASSET_PATHS": "'Preview Assets'",
+                                ]
+                            )
+                        ],
+                        buildPhases: [TestCopyFilesBuildPhase(["ExampleImage1.jpg", "ExampleImage2.png"], destinationSubfolder: .frameworks, onlyForDeployment: false)]
+                    )
+                ]
+            )
 
             let fs = localFS
             try fs.createDirectory(Path("\(tmpDirPath.str)/Preview Assets"), recursive: true)
@@ -111,25 +133,36 @@ fileprivate struct DevelopmentAssetsDiagnosticTests: CoreBasedTests {
             let testProject = TestProject(
                 "aProject",
                 sourceRoot: tmpDirPath,
-                groupTree: TestGroup("AppTarget",
-                                     children: [
-                                        TestGroup("Preview Assets",
-                                                  children: [
-                                                    TestFile("ExampleImage1.jpg", path: "ExampleImage1.jpg"),
-                                                    TestFile("ExampleImage2.png", path: "ExampleImage2.jpg")
-                                                  ])
-                                     ]),
+                groupTree: TestGroup(
+                    "AppTarget",
+                    children: [
+                        TestGroup(
+                            "Preview Assets",
+                            children: [
+                                TestFile("ExampleImage1.jpg", path: "ExampleImage1.jpg"),
+                                TestFile("ExampleImage2.png", path: "ExampleImage2.jpg"),
+                            ]
+                        )
+                    ]
+                ),
                 buildConfigurations: [TestBuildConfiguration("Debug")],
                 targets: [
-                    TestStandardTarget("AppTarget",
-                                       type: .commandLineTool,
-                                       buildConfigurations: [TestBuildConfiguration("Debug",
-                                                                                    buildSettings: [
-                                                                                        "CODE_SIGNING_ALLOWED": "NO",
-                                                                                        "DEVELOPMENT_ASSET_PATHS": "'Preview Assets'"
-                                                                                    ])],
-                                       buildPhases: [TestCopyFilesBuildPhase(["ExampleImage1.jpg", "ExampleImage2.png"], destinationSubfolder: .frameworks, onlyForDeployment: false)])
-                ])
+                    TestStandardTarget(
+                        "AppTarget",
+                        type: .commandLineTool,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "DEVELOPMENT_ASSET_PATHS": "'Preview Assets'",
+                                ]
+                            )
+                        ],
+                        buildPhases: [TestCopyFilesBuildPhase(["ExampleImage1.jpg", "ExampleImage2.png"], destinationSubfolder: .frameworks, onlyForDeployment: false)]
+                    )
+                ]
+            )
 
             let fs = localFS
             try fs.createDirectory(Path("\(tmpDirPath.str)/Preview Assets"), recursive: true)
@@ -154,26 +187,38 @@ fileprivate struct DevelopmentAssetsDiagnosticTests: CoreBasedTests {
             let testProject = TestProject(
                 "aProject",
                 sourceRoot: tmpDirPath,
-                groupTree: TestGroup("AppTarget",
-                                     children: [
-                                        TestGroup("Preview Assets",
-                                                  children: [
-                                                    TestFile("ExampleImage1.jpg", path: "ExampleImage1.jpg"),
-                                                    TestFile("ExampleImage2.png", path: "ExampleImage2.jpg")
-                                                  ])
-                                     ]),
-                buildConfigurations: [TestBuildConfiguration("Release", buildSettings: [
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "DSTROOT": tmpDirPath.join("dstroot").str,
-                ])],
+                groupTree: TestGroup(
+                    "AppTarget",
+                    children: [
+                        TestGroup(
+                            "Preview Assets",
+                            children: [
+                                TestFile("ExampleImage1.jpg", path: "ExampleImage1.jpg"),
+                                TestFile("ExampleImage2.png", path: "ExampleImage2.jpg"),
+                            ]
+                        )
+                    ]
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Release",
+                        buildSettings: [
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "DSTROOT": tmpDirPath.join("dstroot").str,
+                        ]
+                    )
+                ],
                 targets: [
-                    TestStandardTarget("AppTarget",
-                                       type: .commandLineTool,
-                                       buildConfigurations: [TestBuildConfiguration("Release")],
-                                       buildPhases: [
-                                        TestCopyFilesBuildPhase(["ExampleImage1.jpg", "ExampleImage2.png"], destinationSubfolder: .frameworks, onlyForDeployment: false)
-                                       ])
-                ])
+                    TestStandardTarget(
+                        "AppTarget",
+                        type: .commandLineTool,
+                        buildConfigurations: [TestBuildConfiguration("Release")],
+                        buildPhases: [
+                            TestCopyFilesBuildPhase(["ExampleImage1.jpg", "ExampleImage2.png"], destinationSubfolder: .frameworks, onlyForDeployment: false)
+                        ]
+                    )
+                ]
+            )
 
             let parameters = BuildParameters(action: .install, configuration: "Release")
 
@@ -202,27 +247,38 @@ fileprivate struct DevelopmentAssetsDiagnosticTests: CoreBasedTests {
             let testProject = TestProject(
                 "aProject",
                 sourceRoot: tmpDirPath,
-                groupTree: TestGroup("AppTarget",
-                                     children: [
-                                        TestGroup("Preview Assets",
-                                                  children: [
-                                                    TestFile("ExampleImage1.jpg", path: "ExampleImage1.jpg"),
-                                                    TestFile("ExampleImage2.png", path: "ExampleImage2.jpg")
-                                                  ])
-                                     ]),
+                groupTree: TestGroup(
+                    "AppTarget",
+                    children: [
+                        TestGroup(
+                            "Preview Assets",
+                            children: [
+                                TestFile("ExampleImage1.jpg", path: "ExampleImage1.jpg"),
+                                TestFile("ExampleImage2.png", path: "ExampleImage2.jpg"),
+                            ]
+                        )
+                    ]
+                ),
                 buildConfigurations: [TestBuildConfiguration("Debug")],
                 targets: [
-                    TestStandardTarget("AppTarget",
-                                       type: .commandLineTool,
-                                       buildConfigurations: [TestBuildConfiguration("Debug",
-                                                                                    buildSettings: [
-                                                                                        "CODE_SIGNING_ALLOWED": "NO",
-                                                                                        "DEVELOPMENT_ASSET_PATHS": "'Preview Assets'"
-                                                                                    ])],
-                                       buildPhases: [
-                                        TestCopyFilesBuildPhase(["ExampleImage1.jpg", "ExampleImage2.png"], destinationSubfolder: .frameworks, onlyForDeployment: false)
-                                       ])
-                ])
+                    TestStandardTarget(
+                        "AppTarget",
+                        type: .commandLineTool,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "DEVELOPMENT_ASSET_PATHS": "'Preview Assets'",
+                                ]
+                            )
+                        ],
+                        buildPhases: [
+                            TestCopyFilesBuildPhase(["ExampleImage1.jpg", "ExampleImage2.png"], destinationSubfolder: .frameworks, onlyForDeployment: false)
+                        ]
+                    )
+                ]
+            )
 
             let parameters = BuildParameters(action: .build, configuration: "Debug")
 
@@ -251,18 +307,27 @@ fileprivate struct DevelopmentAssetsDiagnosticTests: CoreBasedTests {
             let testProject = TestProject(
                 "aProject",
                 sourceRoot: tmpDirPath,
-                groupTree: TestGroup("AppTarget",
-                                     children: [ TestGroup("Preview Assets") ]),
+                groupTree: TestGroup(
+                    "AppTarget",
+                    children: [TestGroup("Preview Assets")]
+                ),
                 buildConfigurations: [TestBuildConfiguration("Debug")],
                 targets: [
-                    TestStandardTarget("AppTarget",
-                                       type: .commandLineTool,
-                                       buildConfigurations: [TestBuildConfiguration("Debug",
-                                                                                    buildSettings: [
-                                                                                        "CODE_SIGNING_ALLOWED": "NO",
-                                                                                        "DEVELOPMENT_ASSET_PATHS": "'Preview Assets'"
-                                                                                    ])])
-                ])
+                    TestStandardTarget(
+                        "AppTarget",
+                        type: .commandLineTool,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "DEVELOPMENT_ASSET_PATHS": "'Preview Assets'",
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let parameters = BuildParameters(action: .install, configuration: "Debug")
 
@@ -291,46 +356,68 @@ fileprivate struct DevelopmentAssetsDiagnosticTests: CoreBasedTests {
         try await withTemporaryDirectory { tmpDirPath in
             let testProject = TestProject(
                 "aProject",
-                groupTree: TestGroup("AppTarget",
-                                     children: [
-                                        TestGroup("Preview Assets",
-                                                  children: [
-                                                    TestFile("ExampleImage1.jpg"),
-                                                    TestFile("ExampleImage2.png")
-                                                  ])
-                                     ]),
+                groupTree: TestGroup(
+                    "AppTarget",
+                    children: [
+                        TestGroup(
+                            "Preview Assets",
+                            children: [
+                                TestFile("ExampleImage1.jpg"),
+                                TestFile("ExampleImage2.png"),
+                            ]
+                        )
+                    ]
+                ),
                 buildConfigurations: [TestBuildConfiguration("Release")],
                 targets: [
-                    TestStandardTarget("AppTarget",
-                                       type: .commandLineTool,
-                                       buildConfigurations: [TestBuildConfiguration("Release",
-                                                                                    buildSettings: [
-                                                                                        "CODE_SIGNING_ALLOWED": "NO",
-                                                                                        "DEVELOPMENT_ASSET_PATHS": "'Preview Assets'"
-                                                                                    ])],
-                                       buildPhases: [])
-                ])
+                    TestStandardTarget(
+                        "AppTarget",
+                        type: .commandLineTool,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Release",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "DEVELOPMENT_ASSET_PATHS": "'Preview Assets'",
+                                ]
+                            )
+                        ],
+                        buildPhases: []
+                    )
+                ]
+            )
 
             let testProject2 = TestProject(
                 "aProject",
-                groupTree: TestGroup("AppTarget",
-                                     children: [
-                                        TestGroup("Preview Assets",
-                                                  children: [
-                                                    TestFile("ExampleImage3.jpg"),
-                                                    TestFile("ExampleImage4.png")
-                                                  ])
-                                     ]),
+                groupTree: TestGroup(
+                    "AppTarget",
+                    children: [
+                        TestGroup(
+                            "Preview Assets",
+                            children: [
+                                TestFile("ExampleImage3.jpg"),
+                                TestFile("ExampleImage4.png"),
+                            ]
+                        )
+                    ]
+                ),
                 buildConfigurations: [TestBuildConfiguration("Release")],
                 targets: [
-                    TestStandardTarget("AppTarget",
-                                       type: .commandLineTool,
-                                       buildConfigurations: [TestBuildConfiguration("Release",
-                                                                                    buildSettings: [
-                                                                                        "DEVELOPMENT_ASSET_PATHS": "'Preview Assets'"
-                                                                                    ])],
-                                       buildPhases: [])
-                ])
+                    TestStandardTarget(
+                        "AppTarget",
+                        type: .commandLineTool,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Release",
+                                buildSettings: [
+                                    "DEVELOPMENT_ASSET_PATHS": "'Preview Assets'"
+                                ]
+                            )
+                        ],
+                        buildPhases: []
+                    )
+                ]
+            )
 
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath, projects: [testProject, testProject2])
             let parameters = BuildParameters(action: .install, configuration: "Release")
@@ -350,26 +437,37 @@ fileprivate struct DevelopmentAssetsDiagnosticTests: CoreBasedTests {
             let testProject = TestProject(
                 "aProject",
                 sourceRoot: tmpDirPath,
-                groupTree: TestGroup("AppTarget",
-                                     children: [
-                                        TestGroup("Preview Assets",
-                                                  children: [
-                                                    TestFile("ExampleImage1.jpg", path: "ExampleImage1.jpg"),
-                                                    TestFile("ExampleImage2.png", path: "ExampleImage2.jpg")
-                                                  ])
-                                     ]),
+                groupTree: TestGroup(
+                    "AppTarget",
+                    children: [
+                        TestGroup(
+                            "Preview Assets",
+                            children: [
+                                TestFile("ExampleImage1.jpg", path: "ExampleImage1.jpg"),
+                                TestFile("ExampleImage2.png", path: "ExampleImage2.jpg"),
+                            ]
+                        )
+                    ]
+                ),
                 buildConfigurations: [TestBuildConfiguration("Release")],
                 targets: [
-                    TestStandardTarget("AppTarget",
-                                       type: .commandLineTool,
-                                       buildConfigurations: [TestBuildConfiguration("Release",
-                                                                                    buildSettings: [
-                                                                                        "CODE_SIGNING_ALLOWED": "NO",
-                                                                                        "DEVELOPMENT_ASSET_PATHS": "'Preview Assets'",
-                                                                                        "SRCROOT": "Sources"
-                                                                                    ])],
-                                       buildPhases: [TestCopyFilesBuildPhase(["ExampleImage1.jpg", "ExampleImage2.png"], destinationSubfolder: .frameworks, onlyForDeployment: false)])
-                ])
+                    TestStandardTarget(
+                        "AppTarget",
+                        type: .commandLineTool,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Release",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "DEVELOPMENT_ASSET_PATHS": "'Preview Assets'",
+                                    "SRCROOT": "Sources",
+                                ]
+                            )
+                        ],
+                        buildPhases: [TestCopyFilesBuildPhase(["ExampleImage1.jpg", "ExampleImage2.png"], destinationSubfolder: .frameworks, onlyForDeployment: false)]
+                    )
+                ]
+            )
 
             let fs = localFS
             try fs.createDirectory(Path("\(tmpDirPath.str)/Preview Assets"), recursive: true)
diff --git a/Tests/SWBBuildSystemTests/DeviceFamilyBuildOperationTests.swift b/Tests/SWBBuildSystemTests/DeviceFamilyBuildOperationTests.swift
index 2df3f4b9..1910e77f 100644
--- a/Tests/SWBBuildSystemTests/DeviceFamilyBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/DeviceFamilyBuildOperationTests.swift
@@ -123,7 +123,7 @@ fileprivate struct DeviceFamilyBuildOperationTests: CoreBasedTests {
     }
 
     /// Tests `TARGETED_DEVICE_FAMILY` filtering in conjunction with some Mac Catalyst specifics such as deployment target and variance between product types.
-    @Test(.requireSDKs(.iOS, .macOS)) // rdar://94648014 (Mac Catalyst builds may still attempt to use the iOS SDK)
+    @Test(.requireSDKs(.iOS, .macOS))  // rdar://94648014 (Mac Catalyst builds may still attempt to use the iOS SDK)
     func targetedDeviceFamilyFilteringMacCatalyst() async throws {
         try await withTemporaryDirectory { tmpDirPath async throws -> Void in
             let testProject = TestProject(
@@ -134,7 +134,7 @@ fileprivate struct DeviceFamilyBuildOperationTests: CoreBasedTests {
                     path: "",
                     children: [
                         TestFile("Assets.xcassets"),
-                        TestFile("Info.plist")
+                        TestFile("Info.plist"),
                     ]
                 ),
                 buildConfigurations: [
@@ -147,7 +147,7 @@ fileprivate struct DeviceFamilyBuildOperationTests: CoreBasedTests {
                             "SDKROOT": "iphoneos",
                             "SUPPORTS_MACCATALYST": "YES",
                             "TARGETED_DEVICE_FAMILY": "2,6",
-                            "VERSIONING_SYSTEM": "apple-generic"
+                            "VERSIONING_SYSTEM": "apple-generic",
                         ]
                     )
                 ],
@@ -159,7 +159,7 @@ fileprivate struct DeviceFamilyBuildOperationTests: CoreBasedTests {
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
-                                    "INFOPLIST_FILE": "$(SRCROOT)/Info.plist",
+                                    "INFOPLIST_FILE": "$(SRCROOT)/Info.plist"
                                 ]
                             )
                         ],
@@ -175,7 +175,7 @@ fileprivate struct DeviceFamilyBuildOperationTests: CoreBasedTests {
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
-                                    "INFOPLIST_FILE": "$(SRCROOT)/Info.plist",
+                                    "INFOPLIST_FILE": "$(SRCROOT)/Info.plist"
                                 ]
                             )
                         ],
@@ -190,24 +190,27 @@ fileprivate struct DeviceFamilyBuildOperationTests: CoreBasedTests {
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
-                                    "INFOPLIST_FILE": "$(SRCROOT)/Info.plist",
+                                    "INFOPLIST_FILE": "$(SRCROOT)/Info.plist"
                                 ]
                             )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase(["Assets.xcassets"])
                         ]
-                    )
+                    ),
                 ]
             )
 
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             let SRCROOT = tmpDirPath
 
-            try await tester.fs.writePlist(SRCROOT.join("Info.plist"), .plDict([
-                "CFBundleDevelopmentRegion": .plString("en"),
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)")
-            ]))
+            try await tester.fs.writePlist(
+                SRCROOT.join("Info.plist"),
+                .plDict([
+                    "CFBundleDevelopmentRegion": .plString("en"),
+                    "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                ])
+            )
 
             try await tester.fs.writeAssetCatalog(SRCROOT.join("Assets.xcassets"), .root, .appIcon("AppIcon"))
 
diff --git a/Tests/SWBBuildSystemTests/DiscoveredDependenciesBuildOperationTests.swift b/Tests/SWBBuildSystemTests/DiscoveredDependenciesBuildOperationTests.swift
index 7b471256..9640f04c 100644
--- a/Tests/SWBBuildSystemTests/DiscoveredDependenciesBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/DiscoveredDependenciesBuildOperationTests.swift
@@ -30,24 +30,33 @@ fileprivate struct DiscoveredDependenciesBuildOperationTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
-                                TestFile("proc.c"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "CC": "/usr/bin/true", // use `true` so the process succeeds but won't write any dependency file
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "Sources",
+                            path: "Sources",
+                            children: [
+                                TestFile("proc.c")
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CC": "/usr/bin/true",  // use `true` so the process succeeds but won't write any dependency file
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Client", type: .framework,
+                                "Client",
+                                type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["proc.c"]),
-                                ]),
-                        ])
-                ])
+                                    TestSourcesBuildPhase(["proc.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
@@ -80,32 +89,43 @@ fileprivate struct DiscoveredDependenciesBuildOperationTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
+                            "Sources",
+                            path: "Sources",
+                            children: [
                                 TestFile("Client.swift"),
                                 TestFile("Dep.swift"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_VERSION": swiftVersion,
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Client", type: .framework,
+                                "Client",
+                                type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase(["Client.swift"]),
-                                    TestFrameworksBuildPhase(["Dep.framework"])
+                                    TestFrameworksBuildPhase(["Dep.framework"]),
                                 ],
-                                dependencies: ["Dep"]),
+                                dependencies: ["Dep"]
+                            ),
                             TestStandardTarget(
-                                "Dep", type: .framework,
+                                "Dep",
+                                type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["Dep.swift"]),
-                                ]),
-                        ])
-                ])
+                                    TestSourcesBuildPhase(["Dep.swift"])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
@@ -220,7 +240,6 @@ fileprivate struct DiscoveredDependenciesBuildOperationTests: CoreBasedTests {
                 results.checkNoTask()
             }
 
-
             try await tester.checkNullBuild(runDestination: .macOS, persistent: true)
 
             // Change the public API of the dep, and rebuild.
@@ -300,25 +319,33 @@ fileprivate struct DiscoveredDependenciesBuildOperationTests: CoreBasedTests {
                         TestFile("Fmwk_something_private.h"),
                         TestFile("Fmwk.h"),
                         TestFile("Fmwk_Private.h"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "DEFINES_MODULE": "YES",
-                        "CLANG_ENABLE_MODULES": "YES",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "DEFINES_MODULE": "YES",
+                            "CLANG_ENABLE_MODULES": "YES",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Fmwk",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "INFOPLIST_FILE": "Info.plist",
-                                "MODULEMAP_PRIVATE_FILE": "module.private.modulemap",
-                                "GENERATE_TEXT_BASED_STUBS": "YES",
-                                "PRODUCT_MODULE_NAME": "$(PRODUCT_NAME)"
-                            ])],
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "INFOPLIST_FILE": "Info.plist",
+                                    "MODULEMAP_PRIVATE_FILE": "module.private.modulemap",
+                                    "GENERATE_TEXT_BASED_STUBS": "YES",
+                                    "PRODUCT_MODULE_NAME": "$(PRODUCT_NAME)",
+                                ]
+                            )
+                        ],
                         buildPhases: [
                             TestSourcesBuildPhase(["Fmwk.m"]),
                             TestHeadersBuildPhase([
@@ -326,10 +353,11 @@ fileprivate struct DiscoveredDependenciesBuildOperationTests: CoreBasedTests {
                                 TestBuildFile("Fmwk_something_private.h", headerVisibility: .private),
                                 TestBuildFile("Fmwk.h", headerVisibility: .public),
                                 TestBuildFile("Fmwk_Private.h", headerVisibility: .private),
-                            ])
+                            ]),
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             let fmwkSource = SRCROOT.join("Fmwk.m")
@@ -341,21 +369,27 @@ fileprivate struct DiscoveredDependenciesBuildOperationTests: CoreBasedTests {
             let infoPlist = SRCROOT.join("Info.plist")
 
             try tester.fs.createDirectory(SRCROOT)
-            try tester.fs.write(fmwkSource, contents: """
-    #import <Fmwk/Fmwk_something_private.h>
-    int shared = 1;
-    """)
+            try tester.fs.write(
+                fmwkSource,
+                contents: """
+                    #import <Fmwk/Fmwk_something_private.h>
+                    int shared = 1;
+                    """
+            )
             try tester.fs.write(somethingPublicHeader, contents: "// Empty")
             try tester.fs.write(somethingPrivateHeader, contents: "#import <Fmwk/Fmwk_something_public.h>")
             try tester.fs.write(publicFmwkHeader, contents: "#import <Fmwk/Fmwk_something_public.h>")
             try tester.fs.write(privateFmwkHeader, contents: "#import <Fmwk/Fmwk_something_private.h>")
-            try tester.fs.write(privateModuleMap, contents: """
-    framework module Fmwk_Private {
-        umbrella header "Fmwk_Private.h"
-        module * { export * }
-        export *
-    }
-    """)
+            try tester.fs.write(
+                privateModuleMap,
+                contents: """
+                    framework module Fmwk_Private {
+                        umbrella header "Fmwk_Private.h"
+                        module * { export * }
+                        export *
+                    }
+                    """
+            )
             try await tester.fs.writePlist(infoPlist, .plDict([:]))
 
             // Do a first build where everything should be ok.
@@ -364,10 +398,13 @@ fileprivate struct DiscoveredDependenciesBuildOperationTests: CoreBasedTests {
             }
 
             // Modify the source to trigger compilation and linking.
-            try tester.fs.write(fmwkSource, contents: """
-    #import <Fmwk/Fmwk_something_private.h>
-    int shared = 2;
-    """)
+            try tester.fs.write(
+                fmwkSource,
+                contents: """
+                    #import <Fmwk/Fmwk_something_private.h>
+                    int shared = 2;
+                    """
+            )
             // We're not expecting this build to fail.
             try await tester.checkBuild(parameters: BuildParameters(configuration: "Debug"), runDestination: .macOS, persistent: true) { results in
                 results.checkNoDiagnostics()
@@ -397,12 +434,16 @@ fileprivate struct DiscoveredDependenciesBuildOperationTests: CoreBasedTests {
                         TestFile("Fmwk.m"),
                         TestFile("Fmwk.h"),
                         TestFile("App.m"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -420,11 +461,12 @@ fileprivate struct DiscoveredDependenciesBuildOperationTests: CoreBasedTests {
                         buildPhases: [
                             TestSourcesBuildPhase(["Fmwk.m"]),
                             TestHeadersBuildPhase([
-                                TestBuildFile("Fmwk.h", headerVisibility: .public),
-                            ])
+                                TestBuildFile("Fmwk.h", headerVisibility: .public)
+                            ]),
                         ]
-                    )
-                ])
+                    ),
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             let frameworkSource = SRCROOT.join("Fmwk.m")
@@ -432,23 +474,29 @@ fileprivate struct DiscoveredDependenciesBuildOperationTests: CoreBasedTests {
             let appSource = SRCROOT.join("App.m")
 
             try tester.fs.createDirectory(SRCROOT)
-            try tester.fs.write(frameworkSource, contents: """
-                int foo(void) {
-                    return 42;
-                }
-            """)
+            try tester.fs.write(
+                frameworkSource,
+                contents: """
+                        int foo(void) {
+                            return 42;
+                        }
+                    """
+            )
             try tester.fs.write(frameworkHeader, contents: "int foo(void);")
-            try tester.fs.write(appSource, contents: """
-                #import <Foundation/Foundation.h>
-                #import <Fmwk/Fmwk.h>
-
-                int main(int argc, const char * argv[]) {
-                    @autoreleasepool {
-                        printf("%d", foo());
-                    }
-                    return 0;
-                }
-            """)
+            try tester.fs.write(
+                appSource,
+                contents: """
+                        #import <Foundation/Foundation.h>
+                        #import <Fmwk/Fmwk.h>
+
+                        int main(int argc, const char * argv[]) {
+                            @autoreleasepool {
+                                printf("%d", foo());
+                            }
+                            return 0;
+                        }
+                    """
+            )
 
             // Do a first build where everything should be ok.
             try await tester.checkBuild(parameters: BuildParameters(configuration: "Debug"), runDestination: .macOS, persistent: true) { results in
diff --git a/Tests/SWBBuildSystemTests/DriverKitBuildOperationTests.swift b/Tests/SWBBuildSystemTests/DriverKitBuildOperationTests.swift
index 72c897e8..39e1f615 100644
--- a/Tests/SWBBuildSystemTests/DriverKitBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/DriverKitBuildOperationTests.swift
@@ -31,8 +31,9 @@ fileprivate struct DriverKitBuildOperationTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("foo.c"),
-                            ]),
+                                TestFile("foo.c")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -41,25 +42,34 @@ fileprivate struct DriverKitBuildOperationTests: CoreBasedTests {
                                     "DEBUG_INFORMATION_FORMAT": "dwarf",
                                     "GENERATE_INFOPLIST_FILE": "YES",
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
                                 "App",
                                 type: .application,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: [
-                                        "PRODUCT_BUNDLE_IDENTIFIER": "com.mycompany.app",
-                                        "SUPPORTED_PLATFORMS": "macosx iphoneos",
-                                    ])
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "PRODUCT_BUNDLE_IDENTIFIER": "com.mycompany.app",
+                                            "SUPPORTED_PLATFORMS": "macosx iphoneos",
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "foo.c",
+                                        "foo.c"
                                     ]),
-                                    TestCopyFilesBuildPhase([
-                                        "Driver.dext"
-                                    ], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(SYSTEM_EXTENSIONS_FOLDER_PATH)", onlyForDeployment: false)
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            "Driver.dext"
+                                        ],
+                                        destinationSubfolder: .builtProductsDir,
+                                        destinationSubpath: "$(SYSTEM_EXTENSIONS_FOLDER_PATH)",
+                                        onlyForDeployment: false
+                                    ),
                                 ],
                                 dependencies: ["Driver"]
                             ),
@@ -67,20 +77,25 @@ fileprivate struct DriverKitBuildOperationTests: CoreBasedTests {
                                 "Driver",
                                 type: .driverExtension,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: [
-                                        "PRODUCT_BUNDLE_IDENTIFIER": "com.mycompany.app.driver",
-                                        "SDKROOT": "driverkit",
-                                        "SUPPORTED_PLATFORMS": "driverkit",
-                                    ])
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "PRODUCT_BUNDLE_IDENTIFIER": "com.mycompany.app.driver",
+                                            "SDKROOT": "driverkit",
+                                            "SUPPORTED_PLATFORMS": "driverkit",
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "foo.c",
-                                    ]),
+                                        "foo.c"
+                                    ])
                                 ]
-                            )
-                        ])
-                ])
+                            ),
+                        ]
+                    )
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testWorkspace, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot
@@ -115,8 +130,9 @@ fileprivate struct DriverKitBuildOperationTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("foo.c"),
-                            ]),
+                                TestFile("foo.c")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -125,7 +141,8 @@ fileprivate struct DriverKitBuildOperationTests: CoreBasedTests {
                                     "GENERATE_INFOPLIST_FILE": "YES",
                                     "INFOPLIST_FILE": "Info.plist",
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -133,8 +150,8 @@ fileprivate struct DriverKitBuildOperationTests: CoreBasedTests {
                                 type: .driverExtension,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "foo.c",
-                                    ]),
+                                        "foo.c"
+                                    ])
                                 ],
                                 dependencies: ["Framework"]
                             ),
@@ -143,21 +160,26 @@ fileprivate struct DriverKitBuildOperationTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "foo.c",
-                                    ]),
+                                        "foo.c"
+                                    ])
                                 ]
-                            )
-                        ])
-                ])
+                            ),
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(core, testWorkspace, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot
 
             let driverkitSDK = core.loadSDK(.driverKit)
 
-            try await tester.fs.writePlist(SRCROOT.join("Info.plist"), .plDict([
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
-                "CFBundleName": .plString("$(PRODUCT_NAME)"),
-            ]))
+            try await tester.fs.writePlist(
+                SRCROOT.join("Info.plist"),
+                .plDict([
+                    "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                    "CFBundleName": .plString("$(PRODUCT_NAME)"),
+                ])
+            )
 
             // Write the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("foo.c")) { contents in
@@ -167,45 +189,51 @@ fileprivate struct DriverKitBuildOperationTests: CoreBasedTests {
             try await tester.checkBuild(parameters: BuildParameters(configuration: "Debug", commandLineOverrides: ["SDKROOT": "driverkit"]), runDestination: .macOS, persistent: true) { results in
                 let xcodeActualStr = (core.xcodeVersion[0] * 100 + core.xcodeVersion[1] * 10 + core.xcodeVersion[2]).toString(format: "%04d")
 
-                try XCTAssertEqualPropertyListItems(try PropertyList.fromPath(SRCROOT.join("build/Debug-driverkit/Driver.dext/Info.plist"), fs: tester.fs), PropertyListItem.plDict([
-                    "BuildMachineOSBuild": .plString("99A98"),
-                    "CFBundleDevelopmentRegion": .plString("English"),
-                    "CFBundleExecutable": .plString("Driver"),
-                    "CFBundleInfoDictionaryVersion": .plString("6.0"),
-                    "CFBundleName": .plString("Driver"),
-                    "CFBundlePackageType": .plString("DEXT"),
-                    "CFBundleSupportedPlatforms": .plArray([.plString("DriverKit")]),
-                    "DTCompiler": .plString("com.apple.compilers.llvm.clang.1_0"),
-                    "DTPlatformBuild": .plString(#require(core.platformRegistry.lookup(name: "driverkit")?.productBuildVersion)),
-                    "DTPlatformName": .plString("driverkit"),
-                    // The DTPlatformVersion key is using SDK_MARKETING_FULL_VERSION.
-                    "DTPlatformVersion": .plString(driverkitSDK.version),
-                    "DTSDKBuild": .plString(""),
-                    "DTSDKName": .plString("driverkit\(driverkitSDK.version)"),
-                    "DTXcode": .plString(xcodeActualStr),
-                    "DTXcodeBuild": .plString(core.xcodeProductBuildVersionString),
-                    "OSMinimumDriverKitVersion": .plString(driverkitSDK.defaultDeploymentTarget),
-                ]))
+                try XCTAssertEqualPropertyListItems(
+                    try PropertyList.fromPath(SRCROOT.join("build/Debug-driverkit/Driver.dext/Info.plist"), fs: tester.fs),
+                    PropertyListItem.plDict([
+                        "BuildMachineOSBuild": .plString("99A98"),
+                        "CFBundleDevelopmentRegion": .plString("English"),
+                        "CFBundleExecutable": .plString("Driver"),
+                        "CFBundleInfoDictionaryVersion": .plString("6.0"),
+                        "CFBundleName": .plString("Driver"),
+                        "CFBundlePackageType": .plString("DEXT"),
+                        "CFBundleSupportedPlatforms": .plArray([.plString("DriverKit")]),
+                        "DTCompiler": .plString("com.apple.compilers.llvm.clang.1_0"),
+                        "DTPlatformBuild": .plString(#require(core.platformRegistry.lookup(name: "driverkit")?.productBuildVersion)),
+                        "DTPlatformName": .plString("driverkit"),
+                        // The DTPlatformVersion key is using SDK_MARKETING_FULL_VERSION.
+                        "DTPlatformVersion": .plString(driverkitSDK.version),
+                        "DTSDKBuild": .plString(""),
+                        "DTSDKName": .plString("driverkit\(driverkitSDK.version)"),
+                        "DTXcode": .plString(xcodeActualStr),
+                        "DTXcodeBuild": .plString(core.xcodeProductBuildVersionString),
+                        "OSMinimumDriverKitVersion": .plString(driverkitSDK.defaultDeploymentTarget),
+                    ])
+                )
 
-                try XCTAssertEqualPropertyListItems(try PropertyList.fromPath(SRCROOT.join("build/Debug-driverkit/Framework.framework/Info.plist"), fs: tester.fs), PropertyListItem.plDict([
-                    "BuildMachineOSBuild": .plString("99A98"),
-                    "CFBundleDevelopmentRegion": .plString("English"),
-                    "CFBundleExecutable": .plString("Framework"),
-                    "CFBundleInfoDictionaryVersion": .plString("6.0"),
-                    "CFBundleName": .plString("Framework"),
-                    "CFBundlePackageType": .plString("FMWK"),
-                    "CFBundleSupportedPlatforms": .plArray([.plString("DriverKit")]),
-                    "DTCompiler": .plString("com.apple.compilers.llvm.clang.1_0"),
-                    "DTPlatformBuild": .plString(#require(core.platformRegistry.lookup(name: "driverkit")?.productBuildVersion)),
-                    "DTPlatformName": .plString("driverkit"),
-                    // The DTPlatformVersion key is using SDK_MARKETING_FULL_VERSION.
-                    "DTPlatformVersion": .plString(driverkitSDK.version),
-                    "DTSDKBuild": .plString(""),
-                    "DTSDKName": .plString("driverkit\(driverkitSDK.version)"),
-                    "DTXcode": .plString(xcodeActualStr),
-                    "DTXcodeBuild": .plString(core.xcodeProductBuildVersionString),
-                    "OSMinimumDriverKitVersion": .plString(driverkitSDK.defaultDeploymentTarget),
-                ]))
+                try XCTAssertEqualPropertyListItems(
+                    try PropertyList.fromPath(SRCROOT.join("build/Debug-driverkit/Framework.framework/Info.plist"), fs: tester.fs),
+                    PropertyListItem.plDict([
+                        "BuildMachineOSBuild": .plString("99A98"),
+                        "CFBundleDevelopmentRegion": .plString("English"),
+                        "CFBundleExecutable": .plString("Framework"),
+                        "CFBundleInfoDictionaryVersion": .plString("6.0"),
+                        "CFBundleName": .plString("Framework"),
+                        "CFBundlePackageType": .plString("FMWK"),
+                        "CFBundleSupportedPlatforms": .plArray([.plString("DriverKit")]),
+                        "DTCompiler": .plString("com.apple.compilers.llvm.clang.1_0"),
+                        "DTPlatformBuild": .plString(#require(core.platformRegistry.lookup(name: "driverkit")?.productBuildVersion)),
+                        "DTPlatformName": .plString("driverkit"),
+                        // The DTPlatformVersion key is using SDK_MARKETING_FULL_VERSION.
+                        "DTPlatformVersion": .plString(driverkitSDK.version),
+                        "DTSDKBuild": .plString(""),
+                        "DTSDKName": .plString("driverkit\(driverkitSDK.version)"),
+                        "DTXcode": .plString(xcodeActualStr),
+                        "DTXcodeBuild": .plString(core.xcodeProductBuildVersionString),
+                        "OSMinimumDriverKitVersion": .plString(driverkitSDK.defaultDeploymentTarget),
+                    ])
+                )
             }
         }
     }
@@ -223,8 +251,9 @@ fileprivate struct DriverKitBuildOperationTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("foo.c"),
-                            ]),
+                                TestFile("foo.c")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -233,7 +262,8 @@ fileprivate struct DriverKitBuildOperationTests: CoreBasedTests {
                                     "GENERATE_INFOPLIST_FILE": "YES",
                                     "INFOPLIST_FILE": "Info.plist",
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -241,19 +271,24 @@ fileprivate struct DriverKitBuildOperationTests: CoreBasedTests {
                                 type: .driverExtension,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "foo.c",
-                                    ]),
+                                        "foo.c"
+                                    ])
                                 ]
-                            ),
-                        ])
-                ])
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(core, testWorkspace, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot
 
-            try await tester.fs.writePlist(SRCROOT.join("Info.plist"), .plDict([
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
-                "CFBundleName": .plString("$(PRODUCT_NAME)"),
-            ]))
+            try await tester.fs.writePlist(
+                SRCROOT.join("Info.plist"),
+                .plDict([
+                    "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                    "CFBundleName": .plString("$(PRODUCT_NAME)"),
+                ])
+            )
 
             // Write the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("foo.c")) { contents in
diff --git a/Tests/SWBBuildSystemTests/DsymGenerationBuildOperationTests.swift b/Tests/SWBBuildSystemTests/DsymGenerationBuildOperationTests.swift
index 5fcc6114..ec0dd395 100644
--- a/Tests/SWBBuildSystemTests/DsymGenerationBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/DsymGenerationBuildOperationTests.swift
@@ -32,25 +32,34 @@ fileprivate struct DsymGenerationBuildOperationTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "SomeFiles", path: "Sources",
+                            "SomeFiles",
+                            path: "Sources",
                             children: [
-                                TestFile("main.c"),
-                            ]),
+                                TestFile("main.c")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "DEBUG_INFORMATION_FORMAT" : "dwarf-with-dsym",
+                                    "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
                                     "DEPLOYMENT_POSTPROCESSING": "YES",
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["main.c"])]),
-                        ])])
+                                    TestSourcesBuildPhase(["main.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Create the input files.
@@ -107,30 +116,39 @@ fileprivate struct DsymGenerationBuildOperationTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "SomeFiles", path: "Sources",
+                            "SomeFiles",
+                            path: "Sources",
                             children: [
-                                TestFile("main.c"),
-                            ]),
+                                TestFile("main.c")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "DEBUG_INFORMATION_FORMAT" : "dwarf-with-dsym",
+                                    "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
                                     "DWARF_DSYM_FILE_SHOULD_ACCOMPANY_PRODUCT": "YES",
                                     "DEPLOYMENT_POSTPROCESSING": "YES",
                                     // Disable the SetOwnerAndGroup action by setting them to empty values.
                                     "INSTALL_GROUP": "",
                                     "INSTALL_OWNER": "",
                                     "DSTROOT": tmpDirPath.join("dstroot").str,
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["main.c"])]),
-                        ])])
+                                    TestSourcesBuildPhase(["main.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Create the input files.
@@ -179,16 +197,18 @@ fileprivate struct DsymGenerationBuildOperationTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "SomeFiles", path: "Sources",
+                            "SomeFiles",
+                            path: "Sources",
                             children: [
-                                TestFile("foo.swift"),
-                            ]),
+                                TestFile("foo.swift")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "DEBUG_INFORMATION_FORMAT" : "dwarf-with-dsym",
+                                    "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
                                     "DWARF_DSYM_FILE_SHOULD_ACCOMPANY_PRODUCT": "YES",
                                     "DEPLOYMENT_POSTPROCESSING": "YES",
                                     "SWIFT_VERSION": swiftVersion,
@@ -198,14 +218,21 @@ fileprivate struct DsymGenerationBuildOperationTests: CoreBasedTests {
                                     "INSTALL_GROUP": "",
                                     "INSTALL_OWNER": "",
                                     "DSTROOT": tmpDirPath.join("dstroot").str,
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["foo.swift"])]),
-                        ])])
+                                    TestSourcesBuildPhase(["foo.swift"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Create the input files.
diff --git a/Tests/SWBBuildSystemTests/EmbeddedBinaryValidationTests.swift b/Tests/SWBBuildSystemTests/EmbeddedBinaryValidationTests.swift
index 93587540..c8d3fa30 100644
--- a/Tests/SWBBuildSystemTests/EmbeddedBinaryValidationTests.swift
+++ b/Tests/SWBBuildSystemTests/EmbeddedBinaryValidationTests.swift
@@ -26,23 +26,28 @@ fileprivate struct EmbeddedBinaryValidationTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDirPath,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("AppSource.m"),
                         TestFile("AppExSource.m"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration( "Debug", buildSettings: [
-                        "COPY_PHASE_STRIP": "NO",
-                        "DEBUG_INFORMATION_FORMAT": "dwarf",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "CODE_SIGN_IDENTITY": "-",
-                        "CODE_SIGN_ENTITLEMENTS": "Entitlements.entitlements",
-                        "SDKROOT": "iphoneos",
-                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                        "SUPPORTS_MACCATALYST": "YES",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "COPY_PHASE_STRIP": "NO",
+                            "DEBUG_INFORMATION_FORMAT": "dwarf",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "CODE_SIGN_IDENTITY": "-",
+                            "CODE_SIGN_ENTITLEMENTS": "Entitlements.entitlements",
+                            "SDKROOT": "iphoneos",
+                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                            "SUPPORTS_MACCATALYST": "YES",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -50,11 +55,15 @@ fileprivate struct EmbeddedBinaryValidationTests: CoreBasedTests {
                         type: .application,
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                "AppSource.m",
+                                "AppSource.m"
                             ]),
-                            TestCopyFilesBuildPhase([
-                                TestBuildFile("Extending.appex", codeSignOnCopy: true),
-                            ], destinationSubfolder: .plugins, onlyForDeployment: false),
+                            TestCopyFilesBuildPhase(
+                                [
+                                    TestBuildFile("Extending.appex", codeSignOnCopy: true)
+                                ],
+                                destinationSubfolder: .plugins,
+                                onlyForDeployment: false
+                            ),
                         ],
                         dependencies: ["Extending"]
                     ),
@@ -63,8 +72,8 @@ fileprivate struct EmbeddedBinaryValidationTests: CoreBasedTests {
                         type: .applicationExtension,
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                "AppExSource.m",
-                            ]),
+                                "AppExSource.m"
+                            ])
                         ]
                     ),
                 ]
diff --git a/Tests/SWBBuildSystemTests/EntitlementsBuildOperationTests.swift b/Tests/SWBBuildSystemTests/EntitlementsBuildOperationTests.swift
index cd49e8c0..3b8b73e3 100644
--- a/Tests/SWBBuildSystemTests/EntitlementsBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/EntitlementsBuildOperationTests.swift
@@ -35,13 +35,16 @@ fileprivate struct EntitlementsBuildOperationTests: CoreBasedTests {
                     "INFOPLIST_FILE": "Info.plist",
                     "CODE_SIGN_IDENTITY": "-",
                     "ENABLE_APP_SANDBOX": "YES",
-                    "SDKROOT": "macosx"
+                    "SDKROOT": "macosx",
+                ]
+            )
+            try await buildTestBinaryAndValidateEntitlements(
+                testWorkspace: testWorkspace,
+                expectedEntitlements: [
+                    "com.apple.application-identifier": "$(AppIdentifierPrefix)$(CFBundleIdentifier)",
+                    "com.apple.security.app-sandbox": "1",
                 ]
             )
-            try await buildTestBinaryAndValidateEntitlements(testWorkspace: testWorkspace, expectedEntitlements: [
-                "com.apple.application-identifier": "$(AppIdentifierPrefix)$(CFBundleIdentifier)",
-                "com.apple.security.app-sandbox": "1",
-            ])
         }
     }
 
@@ -56,12 +59,15 @@ fileprivate struct EntitlementsBuildOperationTests: CoreBasedTests {
                     "INFOPLIST_FILE": "Info.plist",
                     "CODE_SIGN_IDENTITY": "-",
                     "ENABLE_APP_SANDBOX": "NO",
-                    "SDKROOT": "macosx"
+                    "SDKROOT": "macosx",
+                ]
+            )
+            try await buildTestBinaryAndValidateEntitlements(
+                testWorkspace: testWorkspace,
+                expectedEntitlements: [
+                    "com.apple.application-identifier": "$(AppIdentifierPrefix)$(CFBundleIdentifier)"
                 ]
             )
-            try await buildTestBinaryAndValidateEntitlements(testWorkspace: testWorkspace, expectedEntitlements: [
-                "com.apple.application-identifier": "$(AppIdentifierPrefix)$(CFBundleIdentifier)",
-            ])
         }
     }
 
@@ -81,18 +87,21 @@ fileprivate struct EntitlementsBuildOperationTests: CoreBasedTests {
                     "ENABLE_FILE_ACCESS_MUSIC_FOLDER": "readonly",
                     "ENABLE_FILE_ACCESS_PICTURE_FOLDER": "readonly",
                     "ENABLE_FILE_ACCESS_DOWNLOADS_FOLDER": "readonly",
-                    "SDKROOT": "macosx"
+                    "SDKROOT": "macosx",
+                ]
+            )
+            try await buildTestBinaryAndValidateEntitlements(
+                testWorkspace: testWorkspace,
+                expectedEntitlements: [
+                    "com.apple.application-identifier": "$(AppIdentifierPrefix)$(CFBundleIdentifier)",
+                    "com.apple.security.app-sandbox": "1",
+                    "com.apple.security.files.user-selected.read-only": "1",
+                    "com.apple.security.assets.movies.read-only": "1",
+                    "com.apple.security.assets.music.read-only": "1",
+                    "com.apple.security.assets.pictures.read-only": "1",
+                    "com.apple.security.files.downloads.read-only": "1",
                 ]
             )
-            try await buildTestBinaryAndValidateEntitlements(testWorkspace: testWorkspace, expectedEntitlements: [
-                "com.apple.application-identifier": "$(AppIdentifierPrefix)$(CFBundleIdentifier)",
-                "com.apple.security.app-sandbox": "1",
-                "com.apple.security.files.user-selected.read-only": "1",
-                "com.apple.security.assets.movies.read-only": "1",
-                "com.apple.security.assets.music.read-only": "1",
-                "com.apple.security.assets.pictures.read-only": "1",
-                "com.apple.security.files.downloads.read-only": "1",
-            ])
         }
     }
 
@@ -112,18 +121,21 @@ fileprivate struct EntitlementsBuildOperationTests: CoreBasedTests {
                     "ENABLE_FILE_ACCESS_MUSIC_FOLDER": "readwrite",
                     "ENABLE_FILE_ACCESS_PICTURE_FOLDER": "readwrite",
                     "ENABLE_FILE_ACCESS_DOWNLOADS_FOLDER": "readwrite",
-                    "SDKROOT": "macosx"
+                    "SDKROOT": "macosx",
+                ]
+            )
+            try await buildTestBinaryAndValidateEntitlements(
+                testWorkspace: testWorkspace,
+                expectedEntitlements: [
+                    "com.apple.application-identifier": "$(AppIdentifierPrefix)$(CFBundleIdentifier)",
+                    "com.apple.security.app-sandbox": "1",
+                    "com.apple.security.files.user-selected.read-write": "1",
+                    "com.apple.security.assets.movies.read-write": "1",
+                    "com.apple.security.assets.music.read-write": "1",
+                    "com.apple.security.assets.pictures.read-write": "1",
+                    "com.apple.security.files.downloads.read-write": "1",
                 ]
             )
-            try await buildTestBinaryAndValidateEntitlements(testWorkspace: testWorkspace, expectedEntitlements: [
-                "com.apple.application-identifier": "$(AppIdentifierPrefix)$(CFBundleIdentifier)",
-                "com.apple.security.app-sandbox": "1",
-                "com.apple.security.files.user-selected.read-write": "1",
-                "com.apple.security.assets.movies.read-write": "1",
-                "com.apple.security.assets.music.read-write": "1",
-                "com.apple.security.assets.pictures.read-write": "1",
-                "com.apple.security.files.downloads.read-write": "1",
-            ])
         }
     }
 
@@ -161,14 +173,17 @@ fileprivate struct EntitlementsBuildOperationTests: CoreBasedTests {
                     "ENABLE_RESOURCE_ACCESS_PHOTO_LIBRARY": "",
                     "ENABLE_RESOURCE_ACCESS_USB": "",
                     "ENABLE_RESOURCE_ACCESS_PRINTING": "",
-                    "SDKROOT": "macosx"
+                    "SDKROOT": "macosx",
                 ]
             )
 
-            try await buildTestBinaryAndValidateEntitlements(testWorkspace: testWorkspace, expectedEntitlements: [
-                "com.apple.application-identifier": "$(AppIdentifierPrefix)$(CFBundleIdentifier)",
-                "com.apple.security.app-sandbox": "1",
-            ])
+            try await buildTestBinaryAndValidateEntitlements(
+                testWorkspace: testWorkspace,
+                expectedEntitlements: [
+                    "com.apple.application-identifier": "$(AppIdentifierPrefix)$(CFBundleIdentifier)",
+                    "com.apple.security.app-sandbox": "1",
+                ]
+            )
         }
     }
 
@@ -205,36 +220,39 @@ fileprivate struct EntitlementsBuildOperationTests: CoreBasedTests {
                     "ENABLE_RESOURCE_ACCESS_PHOTO_LIBRARY": "YES",
                     "ENABLE_RESOURCE_ACCESS_USB": "YES",
                     "ENABLE_RESOURCE_ACCESS_PRINTING": "YES",
-                    "SDKROOT": "macosx"
+                    "SDKROOT": "macosx",
                 ]
             )
 
-            try await buildTestBinaryAndValidateEntitlements(testWorkspace: testWorkspace, expectedEntitlements: [
-                "com.apple.application-identifier": "$(AppIdentifierPrefix)$(CFBundleIdentifier)",
-                "com.apple.security.app-sandbox": "1",
-                "com.apple.security.automation.apple-events": "1",
-                "com.apple.security.cs.allow-dyld-environment-variables": "1",
-                "com.apple.security.cs.allow-jit": "1",
-                "com.apple.security.cs.allow-unsigned-executable-memory": "1",
-                "com.apple.security.cs.debugger": "1",
-                "com.apple.security.cs.disable-executable-page-protection": "1",
-                "com.apple.security.cs.disable-library-validation": "1",
-                "com.apple.security.device.audio-input": "1",
-                "com.apple.security.device.bluetooth": "1",
-                "com.apple.security.personal-information.calendars": "1",
-                "com.apple.security.device.camera": "1",
-                "com.apple.security.personal-information.addressbook": "1",
-                "com.apple.security.personal-information.location": "1",
-                "com.apple.security.personal-information.photos-library": "1",
-                "com.apple.security.files.downloads.read-write": "1",
-                "com.apple.security.assets.pictures.read-only": "1",
-                "com.apple.security.assets.music.read-write": "1",
-                "com.apple.security.assets.movies.read-only": "1",
-                "com.apple.security.network.client": "1",
-                "com.apple.security.network.server": "1",
-                "com.apple.security.print": "1",
-                "com.apple.security.device.usb": "1"
-            ])
+            try await buildTestBinaryAndValidateEntitlements(
+                testWorkspace: testWorkspace,
+                expectedEntitlements: [
+                    "com.apple.application-identifier": "$(AppIdentifierPrefix)$(CFBundleIdentifier)",
+                    "com.apple.security.app-sandbox": "1",
+                    "com.apple.security.automation.apple-events": "1",
+                    "com.apple.security.cs.allow-dyld-environment-variables": "1",
+                    "com.apple.security.cs.allow-jit": "1",
+                    "com.apple.security.cs.allow-unsigned-executable-memory": "1",
+                    "com.apple.security.cs.debugger": "1",
+                    "com.apple.security.cs.disable-executable-page-protection": "1",
+                    "com.apple.security.cs.disable-library-validation": "1",
+                    "com.apple.security.device.audio-input": "1",
+                    "com.apple.security.device.bluetooth": "1",
+                    "com.apple.security.personal-information.calendars": "1",
+                    "com.apple.security.device.camera": "1",
+                    "com.apple.security.personal-information.addressbook": "1",
+                    "com.apple.security.personal-information.location": "1",
+                    "com.apple.security.personal-information.photos-library": "1",
+                    "com.apple.security.files.downloads.read-write": "1",
+                    "com.apple.security.assets.pictures.read-only": "1",
+                    "com.apple.security.assets.music.read-write": "1",
+                    "com.apple.security.assets.movies.read-only": "1",
+                    "com.apple.security.network.client": "1",
+                    "com.apple.security.network.server": "1",
+                    "com.apple.security.print": "1",
+                    "com.apple.security.device.usb": "1",
+                ]
+            )
         }
     }
 
@@ -271,13 +289,16 @@ fileprivate struct EntitlementsBuildOperationTests: CoreBasedTests {
                     "ENABLE_RESOURCE_ACCESS_PHOTO_LIBRARY": "YES",
                     "ENABLE_RESOURCE_ACCESS_USB": "YES",
                     "ENABLE_RESOURCE_ACCESS_PRINTING": "YES",
-                    "SDKROOT": "iphoneos"
+                    "SDKROOT": "iphoneos",
                 ]
             )
 
-            try await buildTestBinaryAndValidateEntitlements(testWorkspace: testWorkspace, expectedEntitlements: [
-                "com.apple.application-identifier": "$(AppIdentifierPrefix)$(CFBundleIdentifier)",
-            ])
+            try await buildTestBinaryAndValidateEntitlements(
+                testWorkspace: testWorkspace,
+                expectedEntitlements: [
+                    "com.apple.application-identifier": "$(AppIdentifierPrefix)$(CFBundleIdentifier)"
+                ]
+            )
         }
     }
 
@@ -312,33 +333,36 @@ fileprivate struct EntitlementsBuildOperationTests: CoreBasedTests {
                     "ENABLE_RESOURCE_ACCESS_CONTACTS": "YES",
                     "ENABLE_RESOURCE_ACCESS_LOCATION": "YES",
                     "ENABLE_RESOURCE_ACCESS_PHOTO_LIBRARY": "YES",
-                    "SDKROOT": "macosx"
+                    "SDKROOT": "macosx",
                 ]
             )
 
-            try await buildTestBinaryAndValidateEntitlements(testWorkspace: testWorkspace, expectedEntitlements: [
-                "com.apple.application-identifier": "$(AppIdentifierPrefix)$(CFBundleIdentifier)",
-                "com.apple.security.automation.apple-events": "1",
-                "com.apple.security.cs.allow-dyld-environment-variables": "1",
-                "com.apple.security.cs.allow-jit": "1",
-                "com.apple.security.cs.allow-unsigned-executable-memory": "1",
-                "com.apple.security.cs.debugger": "1",
-                "com.apple.security.cs.disable-executable-page-protection": "1",
-                "com.apple.security.cs.disable-library-validation": "1",
-                "com.apple.security.device.audio-input": "1",
-                "com.apple.security.device.bluetooth": "1",
-                "com.apple.security.personal-information.calendars": "1",
-                "com.apple.security.device.camera": "1",
-                "com.apple.security.personal-information.addressbook": "1",
-                "com.apple.security.personal-information.location": "1",
-                "com.apple.security.personal-information.photos-library": "1",
-                "com.apple.security.files.downloads.read-write": "1",
-                "com.apple.security.assets.pictures.read-only": "1",
-                "com.apple.security.assets.music.read-write": "1",
-                "com.apple.security.assets.movies.read-only": "1",
-                "com.apple.security.network.client": "1",
-                "com.apple.security.network.server": "1",
-            ])
+            try await buildTestBinaryAndValidateEntitlements(
+                testWorkspace: testWorkspace,
+                expectedEntitlements: [
+                    "com.apple.application-identifier": "$(AppIdentifierPrefix)$(CFBundleIdentifier)",
+                    "com.apple.security.automation.apple-events": "1",
+                    "com.apple.security.cs.allow-dyld-environment-variables": "1",
+                    "com.apple.security.cs.allow-jit": "1",
+                    "com.apple.security.cs.allow-unsigned-executable-memory": "1",
+                    "com.apple.security.cs.debugger": "1",
+                    "com.apple.security.cs.disable-executable-page-protection": "1",
+                    "com.apple.security.cs.disable-library-validation": "1",
+                    "com.apple.security.device.audio-input": "1",
+                    "com.apple.security.device.bluetooth": "1",
+                    "com.apple.security.personal-information.calendars": "1",
+                    "com.apple.security.device.camera": "1",
+                    "com.apple.security.personal-information.addressbook": "1",
+                    "com.apple.security.personal-information.location": "1",
+                    "com.apple.security.personal-information.photos-library": "1",
+                    "com.apple.security.files.downloads.read-write": "1",
+                    "com.apple.security.assets.pictures.read-only": "1",
+                    "com.apple.security.assets.music.read-write": "1",
+                    "com.apple.security.assets.movies.read-only": "1",
+                    "com.apple.security.network.client": "1",
+                    "com.apple.security.network.server": "1",
+                ]
+            )
         }
     }
 
@@ -373,7 +397,7 @@ fileprivate struct EntitlementsBuildOperationTests: CoreBasedTests {
                     "ENABLE_RESOURCE_ACCESS_CONTACTS": "YES",
                     "ENABLE_RESOURCE_ACCESS_LOCATION": "YES",
                     "ENABLE_RESOURCE_ACCESS_PHOTO_LIBRARY": "YES",
-                    "SDKROOT": "macosx"
+                    "SDKROOT": "macosx",
                 ]
             )
 
@@ -424,10 +448,12 @@ fileprivate struct EntitlementsBuildOperationTests: CoreBasedTests {
                     "com.apple.security.assets.movies.read-only": .plBool(false),
                     "com.apple.security.network.client": .plBool(true),
                     "com.apple.security.network.server": .plBool(true),
-                ], expectedWarnings: SWBFeatureFlag.enableAppSandboxConflictingValuesEmitsWarning.value ? [
-                    "The \'ENABLE_RESOURCE_ACCESS_AUDIO_INPUT\' build setting is set to \'YES\', but entitlement \'com.apple.security.device.audio-input\' is set to \'NO\' in your entitlements file.\nTo enable \'ENABLE_RESOURCE_ACCESS_AUDIO_INPUT\', remove the entitlement from your entitlements file.\nTo disable \'ENABLE_RESOURCE_ACCESS_AUDIO_INPUT\', remove the entitlement from your entitlements file and disable \'ENABLE_RESOURCE_ACCESS_AUDIO_INPUT\' in  build settings. (in target \'App\' from project \'aProject\')",
-                    "The \'ENABLE_FILE_ACCESS_MOVIES_FOLDER\' build setting is set to \'readOnly\', but entitlement \'com.apple.security.assets.movies.read-only\' is set to \'NO\' in your entitlements file.\nTo enable \'ENABLE_FILE_ACCESS_MOVIES_FOLDER\', remove the entitlement from your entitlements file.\nTo disable \'ENABLE_FILE_ACCESS_MOVIES_FOLDER\', remove the entitlement from your entitlements file and disable \'ENABLE_FILE_ACCESS_MOVIES_FOLDER\' in  build settings. (in target \'App\' from project \'aProject\')",
-                ] : nil
+                ],
+                expectedWarnings: SWBFeatureFlag.enableAppSandboxConflictingValuesEmitsWarning.value
+                    ? [
+                        "The \'ENABLE_RESOURCE_ACCESS_AUDIO_INPUT\' build setting is set to \'YES\', but entitlement \'com.apple.security.device.audio-input\' is set to \'NO\' in your entitlements file.\nTo enable \'ENABLE_RESOURCE_ACCESS_AUDIO_INPUT\', remove the entitlement from your entitlements file.\nTo disable \'ENABLE_RESOURCE_ACCESS_AUDIO_INPUT\', remove the entitlement from your entitlements file and disable \'ENABLE_RESOURCE_ACCESS_AUDIO_INPUT\' in  build settings. (in target \'App\' from project \'aProject\')",
+                        "The \'ENABLE_FILE_ACCESS_MOVIES_FOLDER\' build setting is set to \'readOnly\', but entitlement \'com.apple.security.assets.movies.read-only\' is set to \'NO\' in your entitlements file.\nTo enable \'ENABLE_FILE_ACCESS_MOVIES_FOLDER\', remove the entitlement from your entitlements file.\nTo disable \'ENABLE_FILE_ACCESS_MOVIES_FOLDER\', remove the entitlement from your entitlements file and disable \'ENABLE_FILE_ACCESS_MOVIES_FOLDER\' in  build settings. (in target \'App\' from project \'aProject\')",
+                    ] : nil
             )
 
             try await buildTestBinaryAndValidateEntitlements(
@@ -483,36 +509,40 @@ fileprivate struct EntitlementsBuildOperationTests: CoreBasedTests {
     @Test(.requireSDKs(.iOS))
     func simulatorEntitlementsSections() async throws {
         try await withTemporaryDirectory { tmpDirPath in
-            let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath, projects: [
-                TestProject(
-                    "aProject",
-                    groupTree: TestGroup(
-                        "Sources",
-                        children: [
-                            TestFile("main.c")
-                        ]
-                    ),
-                    buildConfigurations: [
-                        TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SDKROOT": "iphonesimulator",
-                            ]
-                        )
-                    ],
-                    targets: [
-                        TestStandardTarget(
-                            "App",
-                            type: .application,
-                            buildPhases: [
-                                TestSourcesBuildPhase(["main.c"])
+            let testWorkspace = TestWorkspace(
+                "aWorkspace",
+                sourceRoot: tmpDirPath,
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile("main.c")
                             ]
-                        )
-                    ]
-                )
-            ])
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SDKROOT": "iphonesimulator",
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "App",
+                                type: .application,
+                                buildPhases: [
+                                    TestSourcesBuildPhase(["main.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/main.c")) { stream in
@@ -522,7 +552,7 @@ fileprivate struct EntitlementsBuildOperationTests: CoreBasedTests {
             let parameters = BuildParameters(action: .build, configuration: "Debug")
             let entitlements: PropertyListItem = [
                 // Specify just the baseline entitlements, since other entitlements should be added via build settings.
-                "com.apple.application-identifier": "$(AppIdentifierPrefix)$(CFBundleIdentifier)",
+                "com.apple.application-identifier": "$(AppIdentifierPrefix)$(CFBundleIdentifier)"
             ]
             let provisioningInputs = ["App": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: entitlements, simulatedEntitlements: entitlements)]
 
@@ -549,22 +579,24 @@ fileprivate struct EntitlementsBuildOperationTests: CoreBasedTests {
                         "SomeFiles",
                         children: [
                             // App sources
-                            TestFile("main.c"),
-                        ]),
-                    buildConfigurations: [TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: buildSettings
-                    )],
+                            TestFile("main.c")
+                        ]
+                    ),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: buildSettings
+                        )
+                    ],
                     targets: [
                         TestStandardTarget(
                             "App",
                             type: .application,
                             buildPhases: [
                                 TestSourcesBuildPhase([
-                                    "main.c",
-                                ]),
-                                TestFrameworksBuildPhase([
+                                    "main.c"
                                 ]),
+                                TestFrameworksBuildPhase([]),
                             ]
                         )
                     ]
diff --git a/Tests/SWBBuildSystemTests/ExportLocBuildOperationTests.swift b/Tests/SWBBuildSystemTests/ExportLocBuildOperationTests.swift
index 2f9b9e5a..9615744b 100644
--- a/Tests/SWBBuildSystemTests/ExportLocBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/ExportLocBuildOperationTests.swift
@@ -36,60 +36,70 @@ fileprivate struct ExportLocBuildOperationTests: CoreBasedTests {
                                 TestFile("file.h"),
                                 TestFile("file.c"),
                                 TestFile("file.swift"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_VERSION": swiftVersion,
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "DependentFramework",
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase(["file.swift"]),
-                                    TestFrameworksBuildPhase(["Framework.framework"])
-                                ], dependencies: ["Framework"]),
+                                    TestFrameworksBuildPhase(["Framework.framework"]),
+                                ],
+                                dependencies: ["Framework"]
+                            ),
                             TestStandardTarget(
                                 "Framework",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "DEFINES_MODULE": "YES",
-                                        "MODULEMAP_FILE_CONTENTS": "framework module Framework { header \"file.h\" }"
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "DEFINES_MODULE": "YES",
+                                            "MODULEMAP_FILE_CONTENTS": "framework module Framework { header \"file.h\" }",
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["file.c"]),
-                                    TestHeadersBuildPhase([TestBuildFile("file.h", headerVisibility: .public)])
-                                ]),
-                        ])])
+                                    TestHeadersBuildPhase([TestBuildFile("file.h", headerVisibility: .public)]),
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                void foo(void) {};
-                """
+                stream <<< """
+                    void foo(void) {};
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.h")) { stream in
-                stream <<<
-                """
-                void foo(void);
-                """
+                stream <<< """
+                    void foo(void);
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.swift")) { stream in
-                stream <<<
-                """
-                import Framework
-                func bar() {
-                    foo()
-                }
-                """
+                stream <<< """
+                    import Framework
+                    func bar() {
+                        foo()
+                    }
+                    """
             }
 
             let stringsDir = tmpDirPath.join("strings")
@@ -118,46 +128,54 @@ fileprivate struct ExportLocBuildOperationTests: CoreBasedTests {
                             children: [
                                 TestFile("file.swift"),
                                 TestFile("file2.swift"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_VERSION": swiftVersion,
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "DependentFramework",
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase(["file.swift"]),
-                                    TestFrameworksBuildPhase(["Framework.framework"])
-                                ], dependencies: ["Framework"]),
+                                    TestFrameworksBuildPhase(["Framework.framework"]),
+                                ],
+                                dependencies: ["Framework"]
+                            ),
                             TestStandardTarget(
                                 "Framework",
                                 type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file2.swift"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file2.swift"])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file2.swift")) { stream in
-                stream <<<
-                """
-                public func foo() {}
-                """
+                stream <<< """
+                    public func foo() {}
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.swift")) { stream in
-                stream <<<
-                """
-                import Framework
-                func bar() {
-                    foo()
-                }
-                """
+                stream <<< """
+                    import Framework
+                    func bar() {
+                        foo()
+                    }
+                    """
             }
 
             let stringsDir = tmpDirPath.join("strings")
diff --git a/Tests/SWBBuildSystemTests/GenericTaskCachingTests.swift b/Tests/SWBBuildSystemTests/GenericTaskCachingTests.swift
index bdf075a8..506dfcf6 100644
--- a/Tests/SWBBuildSystemTests/GenericTaskCachingTests.swift
+++ b/Tests/SWBBuildSystemTests/GenericTaskCachingTests.swift
@@ -29,8 +29,9 @@ fileprivate struct GenericTaskCachingTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("Reality.rkassets"),
-                    ]),
+                        TestFile("Reality.rkassets")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -43,7 +44,8 @@ fileprivate struct GenericTaskCachingTests: CoreBasedTests {
                             "DSTROOT": tmpDir.join("dstroot").str,
                             "ENABLE_GENERIC_TASK_CACHING": "YES",
                             "GENERIC_TASK_CACHE_ENABLE_DIAGNOSTIC_REMARKS": "YES",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -51,11 +53,12 @@ fileprivate struct GenericTaskCachingTests: CoreBasedTests {
                         type: .framework,
                         buildPhases: [
                             TestResourcesBuildPhase([
-                                TestBuildFile("Reality.rkassets"),
-                            ]),
+                                TestBuildFile("Reality.rkassets")
+                            ])
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
 
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
@@ -119,8 +122,9 @@ fileprivate struct GenericTaskCachingTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("Main.storyboard"),
-                    ]),
+                        TestFile("Main.storyboard")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -133,7 +137,8 @@ fileprivate struct GenericTaskCachingTests: CoreBasedTests {
                             "DSTROOT": tmpDir.join("dstroot").str,
                             "ENABLE_GENERIC_TASK_CACHING": "YES",
                             "GENERIC_TASK_CACHE_ENABLE_DIAGNOSTIC_REMARKS": "YES",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -141,11 +146,12 @@ fileprivate struct GenericTaskCachingTests: CoreBasedTests {
                         type: .framework,
                         buildPhases: [
                             TestResourcesBuildPhase([
-                                TestBuildFile("Main.storyboard"),
-                            ]),
+                                TestBuildFile("Main.storyboard")
+                            ])
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
 
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
@@ -198,8 +204,9 @@ fileprivate struct GenericTaskCachingTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("Assets.xcassets"),
-                    ]),
+                        TestFile("Assets.xcassets")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -212,7 +219,8 @@ fileprivate struct GenericTaskCachingTests: CoreBasedTests {
                             "DSTROOT": tmpDir.join("dstroot").str,
                             "ENABLE_GENERIC_TASK_CACHING": "YES",
                             "GENERIC_TASK_CACHE_ENABLE_DIAGNOSTIC_REMARKS": "YES",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -220,11 +228,12 @@ fileprivate struct GenericTaskCachingTests: CoreBasedTests {
                         type: .framework,
                         buildPhases: [
                             TestResourcesBuildPhase([
-                                TestBuildFile("Assets.xcassets"),
-                            ]),
+                                TestBuildFile("Assets.xcassets")
+                            ])
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
 
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
@@ -276,8 +285,9 @@ fileprivate struct GenericTaskCachingTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("Assets.xcassets"),
-                    ]),
+                        TestFile("Assets.xcassets")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -290,8 +300,9 @@ fileprivate struct GenericTaskCachingTests: CoreBasedTests {
                             "DSTROOT": tmpDir.join("dstroot").str,
                             "ENABLE_GENERIC_TASK_CACHING": "YES",
                             "GENERIC_TASK_CACHE_ENABLE_DIAGNOSTIC_REMARKS": "YES",
-                            "COMPILATION_CACHE_LIMIT_SIZE": "1"
-                        ]),
+                            "COMPILATION_CACHE_LIMIT_SIZE": "1",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -299,11 +310,12 @@ fileprivate struct GenericTaskCachingTests: CoreBasedTests {
                         type: .framework,
                         buildPhases: [
                             TestResourcesBuildPhase([
-                                TestBuildFile("Assets.xcassets"),
-                            ]),
+                                TestBuildFile("Assets.xcassets")
+                            ])
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
 
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
diff --git a/Tests/SWBBuildSystemTests/HeadermapModuleCompatibilityTests.swift b/Tests/SWBBuildSystemTests/HeadermapModuleCompatibilityTests.swift
index 02c03726..31515b49 100644
--- a/Tests/SWBBuildSystemTests/HeadermapModuleCompatibilityTests.swift
+++ b/Tests/SWBBuildSystemTests/HeadermapModuleCompatibilityTests.swift
@@ -37,8 +37,9 @@ fileprivate struct HeadermapModuleCompatibilityTests: CoreBasedTests {
                             "Client",
                             path: "Client",
                             children: [
-                                TestFile("main.m"),
-                            ]),
+                                TestFile("main.m")
+                            ]
+                        ),
                         TestGroup(
                             "Framework",
                             path: "Framework",
@@ -46,25 +47,31 @@ fileprivate struct HeadermapModuleCompatibilityTests: CoreBasedTests {
                                 TestFile("Framework.modulemap"),
                                 TestFile("Framework.h"),
                                 TestFile("Object.h"),
-                            ]),
-                    ]),
+                            ]
+                        ),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "Client-Default",
                         type: .application,
                         buildConfigurations: [
                             // The default all-target-headers.hmap will make this setup fail.
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                "main.m",
-                            ]),
-                        ]),
+                                "main.m"
+                            ])
+                        ]
+                    ),
                     TestStandardTarget(
                         "Client-UseVFS",
                         type: .application,
@@ -72,18 +79,22 @@ fileprivate struct HeadermapModuleCompatibilityTests: CoreBasedTests {
                             // Forcing HEADERMAP_USES_VFS will turn off all-target-headers.hmap,
                             // but its replacement all-non-framework-target-headers.hmap will
                             // cause the same failure.
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "HEADERMAP_USES_VFS": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "HEADERMAP_USES_VFS": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                "main.m",
-                            ]),
-                        ]),
+                                "main.m"
+                            ])
+                        ]
+                    ),
                     TestStandardTarget(
                         "Client-NoFrameworkEntries",
                         type: .application,
@@ -91,36 +102,45 @@ fileprivate struct HeadermapModuleCompatibilityTests: CoreBasedTests {
                             // HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_TARGETS_NOT_BEING_BUILT
                             // will neuter all-non-framework-target-headers.hmap enough that this
                             // setup will work.
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_TARGETS_NOT_BEING_BUILT": "NO",
-                                "HEADERMAP_USES_VFS": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_TARGETS_NOT_BEING_BUILT": "NO",
+                                    "HEADERMAP_USES_VFS": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                "main.m",
-                            ]),
-                        ]),
+                                "main.m"
+                            ])
+                        ]
+                    ),
                     TestStandardTarget(
                         "Framework",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "DEFINES_MODULE": "YES",
-                                "MODULEMAP_FILE": "Framework/Framework.modulemap",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "DEFINES_MODULE": "YES",
+                                    "MODULEMAP_FILE": "Framework/Framework.modulemap",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([
                                 TestBuildFile("Framework.h", headerVisibility: .public),
                                 TestBuildFile("Object.h", headerVisibility: .public),
-                            ]),
-                        ]),
-                ])
+                            ])
+                        ]
+                    ),
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
 
             // A common interoperability issue with header maps and clang modules is that the same
@@ -132,29 +152,33 @@ fileprivate struct HeadermapModuleCompatibilityTests: CoreBasedTests {
                 // to Project/Framework.h which isn't in any kind of module structure on disk.
                 // However, @import does a module lookup and build.
                 // Also make sure that quoted includes still resolve via header maps.
-                $0.write("""
-                    @import Framework;
-                    #import "Object.h"
+                $0.write(
+                    """
+                        @import Framework;
+                        #import "Object.h"
 
-                    int main(int argc, const char *argv[]) {
-                        return 0;
-                    }
-                """)
+                        int main(int argc, const char *argv[]) {
+                            return 0;
+                        }
+                    """
+                )
             }
             try await tester.fs.writeFileContents(temporaryDirectory.join("Project/Framework/Framework.modulemap")) {
                 // Force seeing Object.h outside of the influence of header maps by explicitly
                 // accessing it in a `header` declaration, which is resolved relative to the
                 // module map file. [system] is so -Wnon-modular-include-in-framework-module
                 // doesn't hide the redeclaration error (and to better simulate real modules).
-                $0.write("""
-                    framework module Framework [system] {
-                      umbrella header "Framework.h"
+                $0.write(
+                    """
+                        framework module Framework [system] {
+                          umbrella header "Framework.h"
 
-                      module Object {
-                        header "Object.h"
-                      }
-                    }
-                """)
+                          module Object {
+                            header "Object.h"
+                          }
+                        }
+                    """
+                )
             }
             try await tester.fs.writeFileContents(temporaryDirectory.join("Project/Framework/Framework.h")) {
                 // Force seeing Object.h under the influence of header maps by including it
@@ -163,10 +187,12 @@ fileprivate struct HeadermapModuleCompatibilityTests: CoreBasedTests {
             }
             try await tester.fs.writeFileContents(temporaryDirectory.join("Project/Framework/Object.h")) {
                 // Add a declaration to the header file that will cause a conflict when seen twice.
-                $0.write("""
-                    @interface Object
-                    @end
-                """)
+                $0.write(
+                    """
+                        @interface Object
+                        @end
+                    """
+                )
             }
 
             let buildParameters = BuildParameters(configuration: "Debug")
@@ -174,7 +200,7 @@ fileprivate struct HeadermapModuleCompatibilityTests: CoreBasedTests {
                 return BuildRequest(
                     parameters: buildParameters,
                     buildTargets: [
-                        BuildRequest.BuildTargetInfo(parameters: buildParameters, target: tester.workspace.projects[0].targets[targetIndex]),
+                        BuildRequest.BuildTargetInfo(parameters: buildParameters, target: tester.workspace.projects[0].targets[targetIndex])
                     ],
                     continueBuildingAfterErrors: false,
                     useParallelTargets: false,
diff --git a/Tests/SWBBuildSystemTests/HostBuildToolBuildOperationTests.swift b/Tests/SWBBuildSystemTests/HostBuildToolBuildOperationTests.swift
index 689bf872..0b7957d3 100644
--- a/Tests/SWBBuildSystemTests/HostBuildToolBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/HostBuildToolBuildOperationTests.swift
@@ -28,11 +28,15 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
         try await withTemporaryDirectory { tmpDirPath async throws -> Void in
             let testProject = try await TestProject(
                 "aProject",
-                groupTree: TestGroup("Foo", children: [
-                    TestFile("dep.swift"),
-                    TestFile("tool.swift"),
-                    TestFile("frame.swift"),
-                ]), buildConfigurations: [
+                groupTree: TestGroup(
+                    "Foo",
+                    children: [
+                        TestFile("dep.swift"),
+                        TestFile("tool.swift"),
+                        TestFile("frame.swift"),
+                    ]
+                ),
+                buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
@@ -41,80 +45,106 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
                             "GENERATE_INFOPLIST_FILE": "YES",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "CODE_SIGNING_ALLOWED": "NO",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
-                    TestStandardTarget("HostToolDependency", type: .staticLibrary, buildConfigurations: [
-                        TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "SDKROOT": "auto",
-                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
-                                "MACOSX_DEPLOYMENT_TARGET": "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"
-                            ]),
-                    ], buildPhases: [
-                        TestSourcesBuildPhase(["dep.swift"])
-                    ]),
-                    TestStandardTarget("HostTool", type: .hostBuildTool, buildConfigurations: [
-                        TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "SDKROOT": "auto",
-                                "MACOSX_DEPLOYMENT_TARGET": "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"
-                            ])], buildPhases: [
-                                TestSourcesBuildPhase(["tool.swift"]),
-                                TestFrameworksBuildPhase(["libHostToolDependency.a"])
-                            ], dependencies: [
-                                "HostToolDependency"
-                            ]),
-                    TestStandardTarget("Framework", type: .framework, buildConfigurations: [
-                        TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "SDKROOT": "auto",
-                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
-                                "SUPPORTS_MACCATALYST": "YES",
-                            ]),
-                    ], buildPhases: [
-                        TestSourcesBuildPhase(["frame.swift"]),
-                        TestShellScriptBuildPhase(name: "Script", shellPath: "/bin/bash", originalObjectID: "Script", contents: "${SCRIPT_INPUT_FILE_0} > ${SCRIPT_OUTPUT_FILE_0}",
-                                                  inputs: ["$(BUILD_DIR)/$(CONFIGURATION)/HostTool"], outputs: ["$(TARGET_BUILD_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/HostToolGeneratedResource.txt"], alwaysOutOfDate: false),
-                    ], dependencies: [
-                        "HostTool"
-                    ]),
+                    TestStandardTarget(
+                        "HostToolDependency",
+                        type: .staticLibrary,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "auto",
+                                    "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                                    "MACOSX_DEPLOYMENT_TARGET": "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)",
+                                ]
+                            )
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["dep.swift"])
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "HostTool",
+                        type: .hostBuildTool,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "auto",
+                                    "MACOSX_DEPLOYMENT_TARGET": "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)",
+                                ]
+                            )
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["tool.swift"]),
+                            TestFrameworksBuildPhase(["libHostToolDependency.a"]),
+                        ],
+                        dependencies: [
+                            "HostToolDependency"
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "Framework",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "auto",
+                                    "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                                    "SUPPORTS_MACCATALYST": "YES",
+                                ]
+                            )
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["frame.swift"]),
+                            TestShellScriptBuildPhase(
+                                name: "Script",
+                                shellPath: "/bin/bash",
+                                originalObjectID: "Script",
+                                contents: "${SCRIPT_INPUT_FILE_0} > ${SCRIPT_OUTPUT_FILE_0}",
+                                inputs: ["$(BUILD_DIR)/$(CONFIGURATION)/HostTool"],
+                                outputs: ["$(TARGET_BUILD_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/HostToolGeneratedResource.txt"],
+                                alwaysOutOfDate: false
+                            ),
+                        ],
+                        dependencies: [
+                            "HostTool"
+                        ]
+                    ),
                 ]
             )
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath.join("Test"), projects: [testProject])
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/dep.swift")) { stream in
-                stream <<<
-                """
-                public let frameworkMessage = "Hello from host lib!"
-                """
+                stream <<< """
+                    public let frameworkMessage = "Hello from host lib!"
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/tool.swift")) { stream in
-                stream <<<
-                """
-                import HostToolDependency
-
-                @main struct Foo {
-                    static func main() {
-                        print("Hello from host tool!")
-                        print(frameworkMessage)
+                stream <<< """
+                    import HostToolDependency
+
+                    @main struct Foo {
+                        static func main() {
+                            print("Hello from host tool!")
+                            print(frameworkMessage)
+                        }
                     }
-                }
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/frame.swift")) { stream in
-                stream <<<
-                """
-                public class MyClass {
+                stream <<< """
+                    public class MyClass {
 
-                }
-                """
+                    }
+                    """
             }
 
             let parameters = BuildParameters(action: .build, configuration: "Debug")
@@ -164,10 +194,13 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
     ) async throws {
         let depPackage = try await TestPackageProject(
             "DepPackage",
-            groupTree: TestGroup("Foo", children: [
-                TestFile("transitivedep.swift"),
-                TestFile("dep.swift"),
-            ]),
+            groupTree: TestGroup(
+                "Foo",
+                children: [
+                    TestFile("transitivedep.swift"),
+                    TestFile("dep.swift"),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -178,46 +211,65 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
                         "CODE_SIGNING_ALLOWED": "NO",
                         "SDKROOT": "auto",
                         "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
-                TestStandardTarget("TransitivePackageDep", type: .objectFile, buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [:],
-                        impartedBuildProperties:
-                            TestImpartedBuildProperties(
-                                buildSettings: [
-                                    "SWIFT_ACTIVE_COMPILATION_CONDITIONS": "IMPARTED_SETTINGS"
-                                ])
-                    ),
-                ], buildPhases: [
-                    TestSourcesBuildPhase(["transitivedep.swift"])
-                ]),
-                TestStandardTarget("PackageDep", type: .staticLibrary, buildPhases: [
-                    TestSourcesBuildPhase(["dep.swift"]),
-                    TestFrameworksBuildPhase([
-                        TestBuildFile(.target("TransitivePackageDep"))
-                    ])
-                ], dependencies: [
-                    "TransitivePackageDep"
-                ]),
-                TestPackageProductTarget("PackageDepProduct", frameworksBuildPhase:
-                    TestFrameworksBuildPhase([
-                        TestBuildFile(.target("PackageDep")),
+                TestStandardTarget(
+                    "TransitivePackageDep",
+                    type: .objectFile,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [:],
+                            impartedBuildProperties:
+                                TestImpartedBuildProperties(
+                                    buildSettings: [
+                                        "SWIFT_ACTIVE_COMPILATION_CONDITIONS": "IMPARTED_SETTINGS"
+                                    ])
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase(["transitivedep.swift"])
+                    ]
+                ),
+                TestStandardTarget(
+                    "PackageDep",
+                    type: .staticLibrary,
+                    buildPhases: [
+                        TestSourcesBuildPhase(["dep.swift"]),
+                        TestFrameworksBuildPhase([
+                            TestBuildFile(.target("TransitivePackageDep"))
+                        ]),
+                    ],
+                    dependencies: [
+                        "TransitivePackageDep"
                     ]
-                ), dependencies: [
-                    "PackageDep"
-                ]),
-        ])
+                ),
+                TestPackageProductTarget(
+                    "PackageDepProduct",
+                    frameworksBuildPhase:
+                        TestFrameworksBuildPhase([
+                            TestBuildFile(.target("PackageDep"))
+                        ]
+                        ),
+                    dependencies: [
+                        "PackageDep"
+                    ]
+                ),
+            ]
+        )
 
         let hostToolsPackage = try await TestPackageProject(
             "HostToolsPackage",
-            groupTree: TestGroup("Foo", children: [
-                TestFile("tooldep.swift"),
-                TestFile("tool.swift"),
-                TestFile("lib.swift"),
-            ]),
+            groupTree: TestGroup(
+                "Foo",
+                children: [
+                    TestFile("tooldep.swift"),
+                    TestFile("tool.swift"),
+                    TestFile("lib.swift"),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -228,33 +280,53 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
                         "CODE_SIGNING_ALLOWED": "NO",
                         "SDKROOT": "auto",
                         "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
-                TestStandardTarget("HostToolDep", type: .objectFile, buildPhases: [
-                    TestSourcesBuildPhase(["tooldep.swift"]),
-                ]),
-                TestStandardTarget("HostTool", type: .hostBuildTool, buildPhases: [
-                    TestSourcesBuildPhase(["tool.swift"]),
-                    TestFrameworksBuildPhase([
-                        TestBuildFile(.target("PackageDepProduct")),
-                        TestBuildFile(.target("HostToolDep")),
-                    ]),
-                ], dependencies: [
-                    "PackageDepProduct",
+                TestStandardTarget(
                     "HostToolDep",
-                ]),
-                TestStandardTarget("HostToolClientLib", type: .objectFile, buildPhases: [
-                    TestSourcesBuildPhase(["lib.swift"]),
-                ], dependencies: [
-                    "HostTool"
-                ]),
-                TestPackageProductTarget("HostToolClientLibProduct", frameworksBuildPhase:
-                    TestFrameworksBuildPhase([TestBuildFile(.target("HostToolClientLib"))]
-                ), dependencies: [
-                    "HostToolClientLib"
-                ]),
-        ])
+                    type: .objectFile,
+                    buildPhases: [
+                        TestSourcesBuildPhase(["tooldep.swift"])
+                    ]
+                ),
+                TestStandardTarget(
+                    "HostTool",
+                    type: .hostBuildTool,
+                    buildPhases: [
+                        TestSourcesBuildPhase(["tool.swift"]),
+                        TestFrameworksBuildPhase([
+                            TestBuildFile(.target("PackageDepProduct")),
+                            TestBuildFile(.target("HostToolDep")),
+                        ]),
+                    ],
+                    dependencies: [
+                        "PackageDepProduct",
+                        "HostToolDep",
+                    ]
+                ),
+                TestStandardTarget(
+                    "HostToolClientLib",
+                    type: .objectFile,
+                    buildPhases: [
+                        TestSourcesBuildPhase(["lib.swift"])
+                    ],
+                    dependencies: [
+                        "HostTool"
+                    ]
+                ),
+                TestPackageProductTarget(
+                    "HostToolClientLibProduct",
+                    frameworksBuildPhase:
+                        TestFrameworksBuildPhase([TestBuildFile(.target("HostToolClientLib"))]
+                        ),
+                    dependencies: [
+                        "HostToolClientLib"
+                    ]
+                ),
+            ]
+        )
 
         try await withTemporaryDirectory { tmpDirPath in
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath.join("Test"), projects: [depPackage, hostToolsPackage] + clients)
@@ -264,50 +336,45 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
             let root = testWorkspace.sourceRoot
 
             try await fs.writeFileContents(root.join("DepPackage/transitivedep.swift")) { stream in
-                stream <<<
-                """
-                public let transitiveDependencyMessage = "Hello from host tool transitive dependency!"
-                """
+                stream <<< """
+                    public let transitiveDependencyMessage = "Hello from host tool transitive dependency!"
+                    """
             }
 
             try await fs.writeFileContents(root.join("DepPackage/dep.swift")) { stream in
-                stream <<<
-                """
-                import TransitivePackageDep
-
-                public let dependencyMessage = "Hello from host tool dependency! " + transitiveDependencyMessage
-                #if !IMPARTED_SETTINGS
-                #error("settings not imparted")
-                #endif
-                """
+                stream <<< """
+                    import TransitivePackageDep
+
+                    public let dependencyMessage = "Hello from host tool dependency! " + transitiveDependencyMessage
+                    #if !IMPARTED_SETTINGS
+                    #error("settings not imparted")
+                    #endif
+                    """
             }
 
             try await fs.writeFileContents(root.join("HostToolsPackage/tooldep.swift")) { stream in
-                stream <<<
-                """
-                public let samePackageMsg = "Hello from host tool same-package dependency!"
-                """
+                stream <<< """
+                    public let samePackageMsg = "Hello from host tool same-package dependency!"
+                    """
             }
 
             try await fs.writeFileContents(root.join("HostToolsPackage/tool.swift")) { stream in
-                stream <<<
-                """
-                import PackageDep
-                import HostToolDep
-
-                @main struct Foo {
-                    static func main() {
-                        print("Hello from host tool! " + dependencyMessage + samePackageMsg)
+                stream <<< """
+                    import PackageDep
+                    import HostToolDep
+
+                    @main struct Foo {
+                        static func main() {
+                            print("Hello from host tool! " + dependencyMessage + samePackageMsg)
+                        }
                     }
-                }
-                """
+                    """
             }
 
             try await fs.writeFileContents(root.join("HostToolsPackage/lib.swift")) { stream in
-                stream <<<
-                """
-                public class MyClass {}
-                """
+                stream <<< """
+                    public class MyClass {}
+                    """
             }
 
             try await body(tester, testWorkspace)
@@ -318,10 +385,14 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
     func testHostToolsAndDependenciesAreBuiltDuringIndexingPreparation(destination: RunDestinationInfo) async throws {
         let testProject = try await TestProject(
             "aProject",
-            groupTree: TestGroup("Foo", children: [
-                TestFile("frame.swift"),
-                TestFile("app.swift")
-            ]), buildConfigurations: [
+            groupTree: TestGroup(
+                "Foo",
+                children: [
+                    TestFile("frame.swift"),
+                    TestFile("app.swift"),
+                ]
+            ),
+            buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
@@ -329,54 +400,67 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "CODE_SIGNING_ALLOWED": "NO",
-                    ]),
+                    ]
+                )
             ],
             targets: [
-                TestStandardTarget("Framework", type: .framework, buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
-                        ]),
-                ], buildPhases: [
-                    TestSourcesBuildPhase(["frame.swift"]),
-                    TestFrameworksBuildPhase([
-                        TestBuildFile(.target("HostToolClientLibProduct"))
-                    ]),
-                ], dependencies: [
-                    "HostToolClientLibProduct"
-                ]),
-                TestStandardTarget("App", type: .application, buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                TestStandardTarget(
+                    "Framework",
+                    type: .framework,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase(["frame.swift"]),
+                        TestFrameworksBuildPhase([
+                            TestBuildFile(.target("HostToolClientLibProduct"))
                         ]),
-                ], buildPhases: [
-                    TestSourcesBuildPhase(["app.swift"]),
-                ], dependencies: [
-                    "Framework"
-                ]),
+                    ],
+                    dependencies: [
+                        "HostToolClientLibProduct"
+                    ]
+                ),
+                TestStandardTarget(
+                    "App",
+                    type: .application,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase(["app.swift"])
+                    ],
+                    dependencies: [
+                        "Framework"
+                    ]
+                ),
             ]
         )
 
         try await withHostToolsPackages(clients: testProject) { tester, testWorkspace in
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/frame.swift")) { stream in
-                stream <<<
-                """
-                import HostToolClientLib
+                stream <<< """
+                    import HostToolClientLib
 
-                public class MyClass2 {}
-                """
+                    public class MyClass2 {}
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/app.swift")) { stream in
-                stream <<<
-                """
-                print("Hello, world!")
-                """
+                stream <<< """
+                    print("Hello, world!")
+                    """
             }
 
             try await tester.checkIndexBuild(prepareTargets: testProject.targets.map(\.guid), runDestination: destination, persistent: true) { results in
@@ -423,13 +507,17 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
 
     @Test(.requireSDKs(.macOS, .iOS), arguments: [RunDestinationInfo.anyMac, .anyMacCatalyst, .anyiOSDevice], [true, false])
     func testHostToolsAndDependenciesAreBuiltDuringIndexingPreparationForPackage(
-        destination: RunDestinationInfo, targetBuild: Bool
+        destination: RunDestinationInfo,
+        targetBuild: Bool
     ) async throws {
         let clientPackage = try await TestPackageProject(
             "ClientPackage",
-            groupTree: TestGroup("Client", children: [
-                TestFile("main.swift"),
-            ]),
+            groupTree: TestGroup(
+                "Client",
+                children: [
+                    TestFile("main.swift")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -440,30 +528,37 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
                         "CODE_SIGNING_ALLOWED": "NO",
                         "SDKROOT": "auto",
                         "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
-                TestStandardTarget("HostToolClient", type: .objectFile, buildPhases: [
-                    TestSourcesBuildPhase(["main.swift"]),
-                    TestFrameworksBuildPhase([TestBuildFile(.target("HostToolClientLibProduct"))]),
-                ], dependencies: [
-                    "HostToolClientLibProduct"
-                ]),
-        ])
+                TestStandardTarget(
+                    "HostToolClient",
+                    type: .objectFile,
+                    buildPhases: [
+                        TestSourcesBuildPhase(["main.swift"]),
+                        TestFrameworksBuildPhase([TestBuildFile(.target("HostToolClientLibProduct"))]),
+                    ],
+                    dependencies: [
+                        "HostToolClientLibProduct"
+                    ]
+                )
+            ]
+        )
 
         try await withHostToolsPackages(clients: clientPackage) { tester, testWorkspace in
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("ClientPackage/main.swift")) { stream in
-                stream <<<
-                """
-                print("Hello, world!")
-                """
+                stream <<< """
+                    print("Hello, world!")
+                    """
             }
 
             let clientTarget = try #require(clientPackage.targets.first)
             try await tester.checkIndexBuild(
                 prepareTargets: [clientTarget.guid],
                 buildTargets: targetBuild ? [clientTarget] : nil,
-                workspaceOperation: false, runDestination: destination,
+                workspaceOperation: false,
+                runDestination: destination,
                 persistent: true
             ) { results in
                 results.checkNoDiagnostics()
@@ -482,12 +577,16 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
         try await withTemporaryDirectory { tmpDirPath async throws -> Void in
             let testProject = try await TestProject(
                 "aProject",
-                groupTree: TestGroup("Foo", children: [
-                    TestFile("tool.swift"),
-                    TestFile("frame.swift"),
-                    TestFile("otherframe.swift"),
-                    TestFile("app.swift")
-                ]), buildConfigurations: [
+                groupTree: TestGroup(
+                    "Foo",
+                    children: [
+                        TestFile("tool.swift"),
+                        TestFile("frame.swift"),
+                        TestFile("otherframe.swift"),
+                        TestFile("app.swift"),
+                    ]
+                ),
+                buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
@@ -495,90 +594,116 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
                             "GENERATE_INFOPLIST_FILE": "YES",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "CODE_SIGNING_ALLOWED": "NO",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
-                    TestStandardTarget("HostTool", type: .hostBuildTool, buildConfigurations: [
-                        TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "SDKROOT": "auto",
-                            ])], buildPhases: [
-                                TestSourcesBuildPhase(["tool.swift"]),
-                            ], approvedByUser: false),
-                    TestStandardTarget("Framework", type: .framework, buildConfigurations: [
-                        TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "SDKROOT": "auto",
-                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
-                            ]),
-                    ], buildPhases: [
-                        TestSourcesBuildPhase(["frame.swift"]),
-                    ], dependencies: [
-                        "HostTool"
-                    ]),
-                    TestStandardTarget("OtherFramework", type: .framework, buildConfigurations: [
-                        TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "SDKROOT": "auto",
-                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
-                            ]),
-                    ], buildPhases: [
-                        TestSourcesBuildPhase(["otherframe.swift"]),
-                    ], dependencies: []),
-                    TestStandardTarget("App", type: .application, buildConfigurations: [
-                        TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "SDKROOT": "auto",
-                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
-                            ]),
-                    ], buildPhases: [
-                        TestSourcesBuildPhase(["app.swift"]),
-                    ], dependencies: [
-                        "Framework", "OtherFramework"
-                    ]),
+                    TestStandardTarget(
+                        "HostTool",
+                        type: .hostBuildTool,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "auto"
+                                ]
+                            )
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["tool.swift"])
+                        ],
+                        approvedByUser: false
+                    ),
+                    TestStandardTarget(
+                        "Framework",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "auto",
+                                    "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                                ]
+                            )
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["frame.swift"])
+                        ],
+                        dependencies: [
+                            "HostTool"
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "OtherFramework",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "auto",
+                                    "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                                ]
+                            )
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["otherframe.swift"])
+                        ],
+                        dependencies: []
+                    ),
+                    TestStandardTarget(
+                        "App",
+                        type: .application,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "auto",
+                                    "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                                ]
+                            )
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["app.swift"])
+                        ],
+                        dependencies: [
+                            "Framework", "OtherFramework",
+                        ]
+                    ),
                 ]
             )
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath.join("Test"), projects: [testProject])
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, systemInfo: .init(operatingSystemVersion: Version(99, 98, 97), productBuildVersion: "99A98", nativeArchitecture: Architecture.host.stringValue ?? "undefined_arch"))
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/tool.swift")) { stream in
-                stream <<<
-                """
-                @main struct Foo {
-                    static func main() {
-                        print("Hello from host tool!")
+                stream <<< """
+                    @main struct Foo {
+                        static func main() {
+                            print("Hello from host tool!")
+                        }
                     }
-                }
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/frame.swift")) { stream in
-                stream <<<
-                """
-                public class MyClass {
+                stream <<< """
+                    public class MyClass {
 
-                }
-                """
+                    }
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/otherframe.swift")) { stream in
-                stream <<<
-                """
-                public class MyClass2 {
+                stream <<< """
+                    public class MyClass2 {
 
-                }
-                """
+                    }
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/app.swift")) { stream in
-                stream <<<
-                """
-                print("Hello, world!")
-                """
+                stream <<< """
+                    print("Hello, world!")
+                    """
             }
 
             try await tester.checkIndexBuildGraph(targets: testProject.targets) { results in
@@ -611,10 +736,14 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
         try await withTemporaryDirectory { tmpDirPath async throws -> Void in
             let testProject = try await TestProject(
                 "aProject",
-                groupTree: TestGroup("Foo", children: [
-                    TestFile("tool.swift"),
-                    TestFile("frame.swift"),
-                ]), buildConfigurations: [
+                groupTree: TestGroup(
+                    "Foo",
+                    children: [
+                        TestFile("tool.swift"),
+                        TestFile("frame.swift"),
+                    ]
+                ),
+                buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
@@ -622,52 +751,66 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
                             "GENERATE_INFOPLIST_FILE": "YES",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "CODE_SIGNING_ALLOWED": "NO",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
-                    TestStandardTarget("HostTool", type: .hostBuildTool, buildConfigurations: [
-                        TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "SDKROOT": "auto",
-                            ])], buildPhases: [
-                                TestSourcesBuildPhase(["tool.swift"]),
-                            ], dependencies: []),
-                    TestStandardTarget("Framework", type: .framework, buildConfigurations: [
-                        TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "SDKROOT": "auto",
-                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
-                            ]),
-                    ], buildPhases: [
-                        TestSourcesBuildPhase(["frame.swift"]),
-                    ], dependencies: [
-                        "HostTool"
-                    ]),
+                    TestStandardTarget(
+                        "HostTool",
+                        type: .hostBuildTool,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "auto"
+                                ]
+                            )
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["tool.swift"])
+                        ],
+                        dependencies: []
+                    ),
+                    TestStandardTarget(
+                        "Framework",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "auto",
+                                    "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                                ]
+                            )
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["frame.swift"])
+                        ],
+                        dependencies: [
+                            "HostTool"
+                        ]
+                    ),
                 ]
             )
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath.join("Test"), projects: [testProject])
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, systemInfo: BuildOperationTester.defaultSystemInfo)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/tool.swift")) { stream in
-                stream <<<
-                """
-                @main struct Foo {
-                    static func main() {
-                        print("Hello from host tool!")
+                stream <<< """
+                    @main struct Foo {
+                        static func main() {
+                            print("Hello from host tool!")
+                        }
                     }
-                }
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/frame.swift")) { stream in
-                stream <<<
-                """
-                public class MyClass {
+                stream <<< """
+                    public class MyClass {
 
-                }
-                """
+                    }
+                    """
             }
 
             try await tester.checkIndexBuild(prepareTargets: tester.workspace.targets(named: "HostTool").map(\.guid), runDestination: .anyMac, persistent: true) { results in
@@ -689,11 +832,15 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
         try await withTemporaryDirectory { tmpDirPath async throws -> Void in
             let testProject = try await TestProject(
                 "aProject",
-                groupTree: TestGroup("Foo", children: [
-                    TestFile("tool.swift"),
-                    TestFile("toolinterface.swift"),
-                    TestFile("client.swift"),
-                ]), buildConfigurations: [
+                groupTree: TestGroup(
+                    "Foo",
+                    children: [
+                        TestFile("tool.swift"),
+                        TestFile("toolinterface.swift"),
+                        TestFile("client.swift"),
+                    ]
+                ),
+                buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
@@ -701,70 +848,89 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
                             "GENERATE_INFOPLIST_FILE": "YES",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "CODE_SIGNING_ALLOWED": "NO",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
-                    TestStandardTarget("HostTool", type: .hostBuildTool, buildConfigurations: [
-                        TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "SDKROOT": "auto",
-                                "SWIFT_IMPLEMENTS_MACROS_FOR_MODULE_NAMES": "HostToolInterface",
-                            ])], buildPhases: [
-                                TestSourcesBuildPhase(["tool.swift"]),
-                            ]),
-                    TestStandardTarget("HostToolInterface", type: .framework, buildConfigurations: [
-                        TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "SDKROOT": "auto",
-                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
-                            ]),
-                    ], buildPhases: [
-                        TestSourcesBuildPhase(["toolinterface.swift"]),
-                    ], dependencies: [
-                        "HostTool"
-                    ]),
-                    TestStandardTarget("Client", type: .framework, buildConfigurations: [
-                        TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "SDKROOT": "auto",
-                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
-                            ]),
-                    ], buildPhases: [
-                        TestSourcesBuildPhase(["client.swift"]),
-                        TestFrameworksBuildPhase(["HostToolInterface.framework"])
-                    ], dependencies: [
-                        "HostToolInterface"
-                    ]),
+                    TestStandardTarget(
+                        "HostTool",
+                        type: .hostBuildTool,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "auto",
+                                    "SWIFT_IMPLEMENTS_MACROS_FOR_MODULE_NAMES": "HostToolInterface",
+                                ]
+                            )
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["tool.swift"])
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "HostToolInterface",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "auto",
+                                    "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                                ]
+                            )
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["toolinterface.swift"])
+                        ],
+                        dependencies: [
+                            "HostTool"
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "Client",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "auto",
+                                    "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                                ]
+                            )
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["client.swift"]),
+                            TestFrameworksBuildPhase(["HostToolInterface.framework"]),
+                        ],
+                        dependencies: [
+                            "HostToolInterface"
+                        ]
+                    ),
                 ]
             )
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath.join("Test"), projects: [testProject])
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, systemInfo: .init(operatingSystemVersion: Version(99, 98, 97), productBuildVersion: "99A98", nativeArchitecture: Architecture.host.stringValue ?? "undefined_arch"))
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/tool.swift")) { stream in
-                stream <<<
-                """
-                not a valid program!
-                """
+                stream <<< """
+                    not a valid program!
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/toolinterface.swift")) { stream in
-                stream <<<
-                """
-                public let x = 42
-                """
+                stream <<< """
+                    public let x = 42
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/client.swift")) { stream in
-                stream <<<
-                """
-                import HostToolInterface
-                func f() {
-                    print(x)
-                }
-                """
+                stream <<< """
+                    import HostToolInterface
+                    func f() {
+                        print(x)
+                    }
+                    """
             }
 
             try await tester.checkIndexBuild(prepareTargets: tester.workspace.targets(named: "Client").map(\.guid), runDestination: .macOS, persistent: true) { results in
@@ -782,10 +948,14 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
         try await withTemporaryDirectory { tmpDirPath async throws -> Void in
             let testProject = try await TestProject(
                 "aProject",
-                groupTree: TestGroup("Foo", children: [
-                    TestFile("tool.swift"),
-                    TestFile("frame.swift"),
-                ]), buildConfigurations: [
+                groupTree: TestGroup(
+                    "Foo",
+                    children: [
+                        TestFile("tool.swift"),
+                        TestFile("frame.swift"),
+                    ]
+                ),
+                buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
@@ -793,51 +963,62 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
                             "GENERATE_INFOPLIST_FILE": "YES",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "CODE_SIGNING_ALLOWED": "NO",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
-                    TestStandardTarget("Tool", type: .commandLineTool, buildConfigurations: [
-                        TestBuildConfiguration("Debug")
-                    ],
-                    buildPhases: [
-                        TestSourcesBuildPhase(["tool.swift"]),
-                    ]),
-                    TestStandardTarget("Framework", type: .framework, buildConfigurations: [
-                        TestBuildConfiguration("Debug")
-                    ], buildPhases: [
-                        TestShellScriptBuildPhase(name: "UsesTool",
-                                                  shellPath: "/bin/zsh",
-                                                  originalObjectID: "UsesTool",
-                                                  contents: "${SCRIPT_INPUT_FILE_0} > ${SCRIPT_INPUT_FILE_0}",
-                                                  inputs: [tmpDirPath.join("Test/Index.noindex/Build/Products/Debug/Tool").str],
-                                                  outputs: [tmpDirPath.join("scriptoutput").str]),
-                        TestSourcesBuildPhase(["frame.swift"]),
-                    ], dependencies: [
-                        "Tool"
-                    ]),
+                    TestStandardTarget(
+                        "Tool",
+                        type: .commandLineTool,
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug")
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["tool.swift"])
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "Framework",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug")
+                        ],
+                        buildPhases: [
+                            TestShellScriptBuildPhase(
+                                name: "UsesTool",
+                                shellPath: "/bin/zsh",
+                                originalObjectID: "UsesTool",
+                                contents: "${SCRIPT_INPUT_FILE_0} > ${SCRIPT_INPUT_FILE_0}",
+                                inputs: [tmpDirPath.join("Test/Index.noindex/Build/Products/Debug/Tool").str],
+                                outputs: [tmpDirPath.join("scriptoutput").str]
+                            ),
+                            TestSourcesBuildPhase(["frame.swift"]),
+                        ],
+                        dependencies: [
+                            "Tool"
+                        ]
+                    ),
                 ]
             )
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath.join("Test"), projects: [testProject])
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, systemInfo: .init(operatingSystemVersion: Version(99, 98, 97), productBuildVersion: "99A98", nativeArchitecture: Architecture.host.stringValue ?? "undefined_arch"))
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/tool.swift")) { stream in
-                stream <<<
-                """
-                @main struct Foo {
-                    static func main() {
-                        print("Hello from tool!")
+                stream <<< """
+                    @main struct Foo {
+                        static func main() {
+                            print("Hello from tool!")
+                        }
                     }
-                }
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/frame.swift")) { stream in
-                stream <<<
-                """
-                public class MyClass {
+                stream <<< """
+                    public class MyClass {
 
-                }
-                """
+                    }
+                    """
             }
 
             try await tester.checkIndexBuild(prepareTargets: tester.workspace.targets(named: "Framework").map(\.guid), runDestination: .host, persistent: true) { results in
@@ -861,10 +1042,14 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
         try await withTemporaryDirectory { tmpDirPath async throws -> Void in
             let testProject = try await TestProject(
                 "aProject",
-                groupTree: TestGroup("Foo", children: [
-                    TestFile("tool.swift"),
-                    TestFile("frame.swift"),
-                ]), buildConfigurations: [
+                groupTree: TestGroup(
+                    "Foo",
+                    children: [
+                        TestFile("tool.swift"),
+                        TestFile("frame.swift"),
+                    ]
+                ),
+                buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
@@ -872,32 +1057,45 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
                             "GENERATE_INFOPLIST_FILE": "YES",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "CODE_SIGNING_ALLOWED": "NO",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
-                    TestStandardTarget("Tool", type: .commandLineTool, buildConfigurations: [
-                        TestBuildConfiguration("Debug")
-                    ],
-                    buildPhases: [
-                        TestSourcesBuildPhase(["tool.swift"]),
-                    ]),
-                    TestStandardTarget("Framework", type: .framework, buildConfigurations: [
-                        TestBuildConfiguration("Debug")
-                    ], buildPhases: [
-                        TestSourcesBuildPhase(["frame.swift"]),
-                    ], customTasks: [
-                        TestCustomTask(commandLine: [tmpDirPath.join("Test/Index.noindex/Build/Products/Debug/Tool").str, tmpDirPath.join("scriptoutput").str],
-                                       environment: [:],
-                                       workingDirectory: tmpDirPath.str,
-                                       executionDescription: "Running Tool",
-                                       inputs: [tmpDirPath.join("Test/Index.noindex/Build/Products/Debug/Tool").str],
-                                       outputs: [tmpDirPath.join("output").str],
-                                       enableSandboxing: false,
-                                       preparesForIndexing: true)
-                    ],
-                    dependencies: [
-                        "Tool"
-                    ]),
+                    TestStandardTarget(
+                        "Tool",
+                        type: .commandLineTool,
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug")
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["tool.swift"])
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "Framework",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug")
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["frame.swift"])
+                        ],
+                        customTasks: [
+                            TestCustomTask(
+                                commandLine: [tmpDirPath.join("Test/Index.noindex/Build/Products/Debug/Tool").str, tmpDirPath.join("scriptoutput").str],
+                                environment: [:],
+                                workingDirectory: tmpDirPath.str,
+                                executionDescription: "Running Tool",
+                                inputs: [tmpDirPath.join("Test/Index.noindex/Build/Products/Debug/Tool").str],
+                                outputs: [tmpDirPath.join("output").str],
+                                enableSandboxing: false,
+                                preparesForIndexing: true
+                            )
+                        ],
+                        dependencies: [
+                            "Tool"
+                        ]
+                    ),
                 ]
             )
 
@@ -905,24 +1103,22 @@ fileprivate struct HostBuildToolBuildOperationTests: CoreBasedTests {
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, systemInfo: .init(operatingSystemVersion: Version(99, 98, 97), productBuildVersion: "99A98", nativeArchitecture: Architecture.host.stringValue ?? "undefined_arch"))
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/tool.swift")) { stream in
-                stream <<<
-                """
-                import Foundation
-                @main struct Foo {
-                    static func main() throws {
-                        try "hello, world!".write(toFile: CommandLine.arguments[1], atomically: true, encoding: .utf8)
+                stream <<< """
+                    import Foundation
+                    @main struct Foo {
+                        static func main() throws {
+                            try "hello, world!".write(toFile: CommandLine.arguments[1], atomically: true, encoding: .utf8)
+                        }
                     }
-                }
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/frame.swift")) { stream in
-                stream <<<
-                """
-                public class MyClass {
+                stream <<< """
+                    public class MyClass {
 
-                }
-                """
+                    }
+                    """
             }
 
             try await tester.checkIndexBuild(prepareTargets: tester.workspace.targets(named: "Framework").map(\.guid), runDestination: .host, persistent: true) { results in
diff --git a/Tests/SWBBuildSystemTests/IndexBuildOperationTests.swift b/Tests/SWBBuildSystemTests/IndexBuildOperationTests.swift
index 3111a3f2..ec45fb1c 100644
--- a/Tests/SWBBuildSystemTests/IndexBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/IndexBuildOperationTests.swift
@@ -43,19 +43,22 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                                 TestFile("main.m"),
                                 TestFile("fwk.swift"),
                                 TestFile("AppTarget.xcdatamodel"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                ])],
+                                    "PRODUCT_NAME": "$(TARGET_NAME)"
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "AppTarget",
                                 type: .application,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug"),
+                                    TestBuildConfiguration("Debug")
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
@@ -63,25 +66,33 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                                         "AppTarget.xcdatamodel",
                                     ]),
                                     TestFrameworksBuildPhase([
-                                        "FwkTarget.framework"])
+                                        "FwkTarget.framework"
+                                    ]),
                                 ],
-                                dependencies: ["FwkTarget"]),
+                                dependencies: ["FwkTarget"]
+                            ),
                             TestStandardTarget(
                                 "FwkTarget",
                                 type: .framework,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug",
-                                                           buildSettings: [
-                                                            "VERSIONING_SYSTEM": "apple-generic",
-                                                            "SWIFT_VERSION": swiftVersion,
-                                                           ]),
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "VERSIONING_SYSTEM": "apple-generic",
+                                            "SWIFT_VERSION": swiftVersion,
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "fwk.swift",
-                                    ])]
+                                        "fwk.swift"
+                                    ])
+                                ]
                             ),
-                        ])])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -95,7 +106,7 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
             try tester.fs.writeCoreDataModel(testWorkspace.sourceRoot.join("aProject/AppTarget.xcdatamodel"), language: .objectiveC, .entity("AppTarget"))
 
             let parameters = BuildParameters(action: .build, configuration: "Debug")
-            let buildTargets = tester.workspace.allTargets.map{ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }
+            let buildTargets = tester.workspace.allTargets.map { BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }
             let request = BuildRequest(parameters: parameters, buildTargets: buildTargets, continueBuildingAfterErrors: true, useParallelTargets: true, useImplicitDependencies: false, useDryRun: false, buildCommand: .prepareForIndexing(buildOnlyTheseTargets: nil, enableIndexBuildArena: false))
             try await tester.checkBuild(parameters: parameters, runDestination: .macOS, buildRequest: request, persistent: true) { results in
                 results.consumeTasksMatchingRuleTypes(Self.excludedStartTaskTypes)
@@ -143,7 +154,6 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                 results.checkTaskExists(.matchRule(["WriteAuxiliaryFile", "\(tmpDirPath.str)/Test/aProject/build/aProject.build/Debug/FwkTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/7187679823f38a2a940e0043cdf9d637-common-args.resp"]))
                 results.checkTaskExists(.matchRule(["WriteAuxiliaryFile", "\(tmpDirPath.str)/Test/aProject/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/e6072d4f65d7061329687fe24e3d63a7-common-args.resp"]))
 
-
                 // Mkdir
                 results.checkTask(.matchRule(["MkDir", "\(tmpDirPath.str)/Test/aProject/build/Debug/AppTarget.app"])) { _ in }
                 results.checkTask(.matchRule(["MkDir", "\(tmpDirPath.str)/Test/aProject/build/Debug/AppTarget.app/Contents"])) { _ in }
@@ -194,7 +204,8 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                                 TestFile("base.c"),
                                 TestFile("foo.swift"),
                                 TestFile("bar.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -204,7 +215,9 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                                     "CLANG_ENABLE_MODULES": "YES",
                                     "DEFINES_MODULE": "YES",
                                     "USE_HEADERMAP": "NO",
-                                ])],
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "base",
@@ -212,27 +225,33 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                                 buildConfigurations: [TestBuildConfiguration("Debug")],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["base.c"]),
-                                    TestHeadersBuildPhase([TestBuildFile("base.h", headerVisibility: .public)])
-                                ]),
+                                    TestHeadersBuildPhase([TestBuildFile("base.h", headerVisibility: .public)]),
+                                ]
+                            ),
                             TestStandardTarget(
                                 "bar",
                                 type: .framework,
                                 buildConfigurations: [TestBuildConfiguration("Debug")],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["bar.swift"]),
-                                    TestFrameworksBuildPhase(["base.framework"])
+                                    TestFrameworksBuildPhase(["base.framework"]),
                                 ],
-                                dependencies: ["base"]),
+                                dependencies: ["base"]
+                            ),
                             TestStandardTarget(
                                 "foo",
                                 type: .framework,
                                 buildConfigurations: [TestBuildConfiguration("Debug")],
                                 buildPhases: [
                                     TestSourcesBuildPhase(["foo.swift"]),
-                                    TestFrameworksBuildPhase(["bar.framework"])
+                                    TestFrameworksBuildPhase(["bar.framework"]),
                                 ],
-                                dependencies: ["bar"]),
-                        ])])
+                                dependencies: ["bar"]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -253,7 +272,7 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
             }
 
             let parameters = BuildParameters(action: .build, configuration: "Debug")
-            let buildTargets = tester.workspace.allTargets.map{ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }
+            let buildTargets = tester.workspace.allTargets.map { BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }
             let request = BuildRequest(parameters: parameters, buildTargets: buildTargets, continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: false, useDryRun: false, buildCommand: .prepareForIndexing(buildOnlyTheseTargets: nil, enableIndexBuildArena: false))
             try await tester.checkBuild(parameters: parameters, runDestination: .macOS, buildRequest: request, persistent: true) { results in
                 results.check(contains: .buildCompleted)
@@ -261,14 +280,14 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
         }
     }
 
-    @Test(.requireSDKs(.macOS), .skipDeveloperDirectoryWithEqualSign) // mig will fail on CAS mounts due to rdar://137363780 (env can't handle commands with = signs in the filename)
+    @Test(.requireSDKs(.macOS), .skipDeveloperDirectoryWithEqualSign)  // mig will fail on CAS mounts due to rdar://137363780 (env can't handle commands with = signs in the filename)
     func preparingForIndexingOnlyTheseTargets() async throws {
         try await withTemporaryDirectory { tmpDirPath in
             let appTarget = TestStandardTarget(
                 "AppTarget",
                 type: .application,
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug"),
+                    TestBuildConfiguration("Debug")
                 ],
                 buildPhases: [
                     TestSourcesBuildPhase([
@@ -277,27 +296,36 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                         "mig.defs",
                     ]),
                     TestFrameworksBuildPhase([
-                        "FwkTarget.framework"])
+                        "FwkTarget.framework"
+                    ]),
                 ],
-                dependencies: ["FwkTarget"])
+                dependencies: ["FwkTarget"]
+            )
 
             let fwkTarget = try await TestStandardTarget(
                 "FwkTarget",
                 type: .framework,
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug",
-                                           buildSettings: [
-                                            "VERSIONING_SYSTEM": "apple-generic",
-                                            "SWIFT_VERSION": swiftVersion,
-                                           ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "VERSIONING_SYSTEM": "apple-generic",
+                            "SWIFT_VERSION": swiftVersion,
+                        ]
+                    )
                 ],
                 buildPhases: [
                     TestSourcesBuildPhase([
-                        "fwk.swift",
+                        "fwk.swift"
                     ]),
-                    TestCopyFilesBuildPhase([
-                        TestBuildFile("head.h"),
-                    ], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(PRIVATE_HEADERS_FOLDER_PATH)/Internal", onlyForDeployment: false),
+                    TestCopyFilesBuildPhase(
+                        [
+                            TestBuildFile("head.h")
+                        ],
+                        destinationSubfolder: .builtProductsDir,
+                        destinationSubpath: "$(PRIVATE_HEADERS_FOLDER_PATH)/Internal",
+                        onlyForDeployment: false
+                    ),
                 ]
             )
 
@@ -315,7 +343,8 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                                 TestFile("fwk.swift"),
                                 TestFile("AppTarget.xcdatamodel"),
                                 TestFile("mig.defs"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -323,11 +352,16 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "CLANG_ENABLE_MODULES": "YES",
                                     "DEFINES_MODULE": "YES",
-                                ])],
+                                ]
+                            )
+                        ],
                         targets: [
                             appTarget,
                             fwkTarget,
-                        ])])
+                        ]
+                    )
+                ]
+            )
 
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
@@ -422,7 +456,6 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                         results.checkTaskExists(.matchRule(["WriteAuxiliaryFile", "\(intermediatesRoot)/aProject.build/Debug/AppTarget.build/Objects-normal/x86_64/e6072d4f65d7061329687fe24e3d63a7-common-args.resp"]))
                     }
 
-
                     // SymLink
                     results.checkTaskExists(.matchRule(["SymLink", "\(productsRoot)/Debug/FwkTarget.framework/Headers", "Versions/Current/Headers"]))
                     results.checkTaskExists(.matchRule(["SymLink", "\(productsRoot)/Debug/FwkTarget.framework/PrivateHeaders", "Versions/Current/PrivateHeaders"]))
@@ -466,17 +499,21 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                 "AppTarget",
                 type: .application,
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "iphonesimulator",
-                        "SUPPORTED_PLATFORMS": "iphonesimulator",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "SDKROOT": "iphonesimulator",
+                            "SUPPORTED_PLATFORMS": "iphonesimulator",
+                        ]
+                    )
                 ],
                 buildPhases: [
                     TestSourcesBuildPhase([
-                        "main.m",
-                    ]),
+                        "main.m"
+                    ])
                 ],
-                dependencies: ["FwkTarget"])
+                dependencies: ["FwkTarget"]
+            )
 
             let testWorkspace = TestWorkspace(
                 "Test",
@@ -487,17 +524,23 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "SomeFiles",
                             children: [
-                                TestFile("main.m"),
-                            ]),
+                                TestFile("main.m")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                ])],
+                                    "PRODUCT_NAME": "$(TARGET_NAME)"
+                                ]
+                            )
+                        ],
                         targets: [
-                            appTarget,
-                        ])])
+                            appTarget
+                        ]
+                    )
+                ]
+            )
 
             func checkBuild(prepareTargets: [String], runDestination: RunDestinationInfo) async throws {
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
@@ -554,10 +597,11 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                 ],
                 buildPhases: [
                     TestSourcesBuildPhase([
-                        "Metal.metal",
-                    ]),
+                        "Metal.metal"
+                    ])
                 ],
-                dependencies: [])
+                dependencies: []
+            )
 
             let testWorkspace = TestWorkspace(
                 "Test",
@@ -568,17 +612,23 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "SomeFiles",
                             children: [
-                                TestFile("Metal.metal"),
-                            ]),
+                                TestFile("Metal.metal")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                ])],
+                                    "PRODUCT_NAME": "$(TARGET_NAME)"
+                                ]
+                            )
+                        ],
                         targets: [
-                            appTarget,
-                        ])])
+                            appTarget
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
@@ -616,71 +666,95 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
     func preparingForIndexingPackages() async throws {
 
         try await withTemporaryDirectory { tmpDirPath in
-            let packageLib = try await TestStandardTarget("PackageLib", type: .objectFile, buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "PackageLib",
-                    "SDKROOT": "auto",
-                    "SDK_VARIANT": "auto",
-                    "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                    "SWIFT_VERSION": swiftVersion,
-                ])
-            ], buildPhases: [TestSourcesBuildPhase(["test.swift"])])
-
-            let package = try await TestPackageProject("aPackage", groupTree: TestGroup("Package", children: [TestFile("test.swift")]), targets: [
-                TestPackageProductTarget(
-                    "PackageLibProduct",
-                    frameworksBuildPhase: TestFrameworksBuildPhase([
-                        TestBuildFile(.target("PackageLib"))]),
-                    buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
+            let packageLib = try await TestStandardTarget(
+                "PackageLib",
+                type: .objectFile,
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "PackageLib",
                             "SDKROOT": "auto",
                             "SDK_VARIANT": "auto",
                             "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
                             "SWIFT_VERSION": swiftVersion,
+                        ]
+                    )
+                ],
+                buildPhases: [TestSourcesBuildPhase(["test.swift"])]
+            )
+
+            let package = try await TestPackageProject(
+                "aPackage",
+                groupTree: TestGroup("Package", children: [TestFile("test.swift")]),
+                targets: [
+                    TestPackageProductTarget(
+                        "PackageLibProduct",
+                        frameworksBuildPhase: TestFrameworksBuildPhase([
+                            TestBuildFile(.target("PackageLib"))
                         ]),
-                    ],
-                    dependencies: ["PackageLib"]
-                ),
-                packageLib,
-            ])
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "auto",
+                                    "SDK_VARIANT": "auto",
+                                    "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
+                        ],
+                        dependencies: ["PackageLib"]
+                    ),
+                    packageLib,
+                ]
+            )
 
             let macAppTarget = TestStandardTarget(
                 "macAppTarget",
                 type: .application,
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "macosx",
-                        "SUPPORTED_PLATFORMS": "macosx",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "SDKROOT": "macosx",
+                            "SUPPORTED_PLATFORMS": "macosx",
+                        ]
+                    )
                 ],
                 buildPhases: [
                     TestSourcesBuildPhase([
-                        "mac-main.swift",
+                        "mac-main.swift"
                     ]),
                     TestFrameworksBuildPhase([
                         TestBuildFile(.target("PackageLibProduct"))
                     ]),
                 ],
-                dependencies: ["PackageLibProduct"])
+                dependencies: ["PackageLibProduct"]
+            )
 
             let iosAppTarget = TestStandardTarget(
                 "iOSAppTarget",
                 type: .application,
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "iphonesimulator",
-                        "SUPPORTED_PLATFORMS": "iphonesimulator",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "SDKROOT": "iphonesimulator",
+                            "SUPPORTED_PLATFORMS": "iphonesimulator",
+                        ]
+                    )
                 ],
                 buildPhases: [
                     TestSourcesBuildPhase([
-                        "ios-main.swift",
+                        "ios-main.swift"
                     ]),
                     TestFrameworksBuildPhase([
                         TestBuildFile(.target("PackageLibProduct"))
                     ]),
                 ],
-                dependencies: ["PackageLibProduct"])
+                dependencies: ["PackageLibProduct"]
+            )
 
             let testWorkspace = try await TestWorkspace(
                 "Test",
@@ -693,18 +767,24 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                             children: [
                                 TestFile("mac-main.swift"),
                                 TestFile("ios-main.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "SWIFT_VERSION": swiftVersion,
-                                ])],
+                                ]
+                            )
+                        ],
                         targets: [
                             macAppTarget,
                             iosAppTarget,
-                        ]), package])
+                        ]
+                    ), package,
+                ]
+            )
 
             func getTargetRuleInfosForBuildDir(intermediatesRoot: String, configurationName: String) -> [[String]] {
                 // accumulating because a big list literal hurts compile time.
@@ -746,7 +826,7 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                 for ruleInfo in osxTargetRuleInfos {
                     results.checkTask(.matchRule(ruleInfo)) { _ in }
                 }
-                results.checkTasks(.matchRulePattern(["WriteAuxiliaryFile", .suffix("all-product-headers.yaml")])) { _ in}
+                results.checkTasks(.matchRulePattern(["WriteAuxiliaryFile", .suffix("all-product-headers.yaml")])) { _ in }
                 results.checkNoTask()
             }
 
@@ -757,7 +837,7 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                 for ruleInfo in iosTargetRuleInfos {
                     results.checkTask(.matchRule(ruleInfo)) { _ in }
                 }
-                results.checkTasks(.matchRulePattern(["WriteAuxiliaryFile", .suffix("all-product-headers.yaml")])) { _ in}
+                results.checkTasks(.matchRulePattern(["WriteAuxiliaryFile", .suffix("all-product-headers.yaml")])) { _ in }
                 results.checkNoTask()
             }
         }
@@ -770,15 +850,18 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                 "AppTarget1",
                 type: .application,
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "macosx",
-                        "SUPPORTED_PLATFORMS": "macosx",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "SDKROOT": "macosx",
+                            "SUPPORTED_PLATFORMS": "macosx",
+                        ]
+                    )
                 ],
                 buildPhases: [
                     TestSourcesBuildPhase([
-                        "main.m",
-                    ]),
+                        "main.m"
+                    ])
                 ],
                 dependencies: [
                     "FwkTarget1",
@@ -786,38 +869,46 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                     "script3",
                     "scriptNoOutForced",
                     "scriptSrcOutForced",
-                ])
+                ]
+            )
 
             let appTarget2 = TestStandardTarget(
                 "AppTarget2",
                 type: .application,
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "macosx",
-                        "SUPPORTED_PLATFORMS": "macosx",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "SDKROOT": "macosx",
+                            "SUPPORTED_PLATFORMS": "macosx",
+                        ]
+                    )
                 ],
                 buildPhases: [
                     TestSourcesBuildPhase([
-                        "main.m",
-                    ]),
+                        "main.m"
+                    ])
                 ],
                 dependencies: [
                     "FwkTarget2",
                     "script2",
                     "scriptNoOut",
                     "scriptSrcOut",
-                ])
+                ]
+            )
 
             let fwkTarget1 = try await TestStandardTarget(
                 "FwkTarget1",
                 type: .framework,
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "macosx",
-                        "SUPPORTED_PLATFORMS": "macosx",
-                        "SWIFT_VERSION": swiftVersion,
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "SDKROOT": "macosx",
+                            "SUPPORTED_PLATFORMS": "macosx",
+                            "SWIFT_VERSION": swiftVersion,
+                        ]
+                    )
                 ],
                 buildPhases: [
                     TestSourcesBuildPhase([
@@ -835,12 +926,15 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                 "FwkTarget2",
                 type: .framework,
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "macosx",
-                        "SUPPORTED_PLATFORMS": "macosx",
-                        "SWIFT_VERSION": swiftVersion,
-                        "INDEX_DISABLE_SCRIPT_EXECUTION": "YES",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "SDKROOT": "macosx",
+                            "SUPPORTED_PLATFORMS": "macosx",
+                            "SWIFT_VERSION": swiftVersion,
+                            "INDEX_DISABLE_SCRIPT_EXECUTION": "YES",
+                        ]
+                    )
                 ],
                 buildPhases: [
                     TestSourcesBuildPhase([
@@ -856,24 +950,28 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
             let scriptTarget1 = TestAggregateTarget(
                 "script1",
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "OBJROOT": tmpDirPath.join("objs").str,
-                        "SYMROOT": tmpDirPath.join("syms").str,
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "OBJROOT": tmpDirPath.join("objs").str,
+                            "SYMROOT": tmpDirPath.join("syms").str,
+                        ]
+                    )
                 ],
                 buildPhases: [
                     TestShellScriptBuildPhase(
                         name: "Script1",
                         originalObjectID: "Script1",
                         contents: """
-                                  echo Script1Derived > \"${DERIVED_FILE_DIR}/script1-derived\"
-                                  echo Script1Temp > \"${TARGET_TEMP_DIR}/script1-temp\"
-                                  """,
+                            echo Script1Derived > \"${DERIVED_FILE_DIR}/script1-derived\"
+                            echo Script1Temp > \"${TARGET_TEMP_DIR}/script1-temp\"
+                            """,
                         inputs: [],
                         outputs: [
                             "$(DERIVED_FILE_DIR)/script1-derived",
                             "$(TARGET_TEMP_DIR)/script1-temp",
-                        ])
+                        ]
+                    )
                 ]
             )
 
@@ -881,15 +979,23 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
             let scriptTarget2 = TestAggregateTarget(
                 "script2",
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "INDEX_DISABLE_SCRIPT_EXECUTION": "YES",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "INDEX_DISABLE_SCRIPT_EXECUTION": "YES"
+                        ]
+                    )
                 ],
                 buildPhases: [
                     TestShellScriptBuildPhase(
-                        name: "Script2", originalObjectID: "Script2", contents: "echo Script2 > \"${DERIVED_FILE_DIR}/script2-output\"", inputs: [], outputs: [
+                        name: "Script2",
+                        originalObjectID: "Script2",
+                        contents: "echo Script2 > \"${DERIVED_FILE_DIR}/script2-output\"",
+                        inputs: [],
+                        outputs: [
                             "$(DERIVED_FILE_DIR)/script2-output"
-                        ])
+                        ]
+                    )
                 ]
             )
 
@@ -898,7 +1004,13 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                 "script3",
                 buildPhases: [
                     TestShellScriptBuildPhase(
-                        name: "Script3", originalObjectID: "Script3", contents: "set -e\ncat \"$SCRIPT_INPUT_FILE_LIST_0\"\ncat \"$SCRIPT_OUTPUT_FILE_LIST_0\"\ntouch $TARGET_BUILD_DIR/Tool.app/out3.txt", inputs: [], inputFileLists: ["$(SRCROOT)/in3.xcfilelist"], outputs: [], outputFileLists: ["$(SRCROOT)/out3.xcfilelist"]
+                        name: "Script3",
+                        originalObjectID: "Script3",
+                        contents: "set -e\ncat \"$SCRIPT_INPUT_FILE_LIST_0\"\ncat \"$SCRIPT_OUTPUT_FILE_LIST_0\"\ntouch $TARGET_BUILD_DIR/Tool.app/out3.txt",
+                        inputs: [],
+                        inputFileLists: ["$(SRCROOT)/in3.xcfilelist"],
+                        outputs: [],
+                        outputFileLists: ["$(SRCROOT)/out3.xcfilelist"]
                     )
                 ]
             )
@@ -908,7 +1020,12 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                 "scriptNoOut",
                 buildPhases: [
                     TestShellScriptBuildPhase(
-                        name: "ScriptNoOut", originalObjectID: "ScriptNoOut", contents: "echo hello", inputs: [], outputs: [])
+                        name: "ScriptNoOut",
+                        originalObjectID: "ScriptNoOut",
+                        contents: "echo hello",
+                        inputs: [],
+                        outputs: []
+                    )
                 ]
             )
 
@@ -916,13 +1033,21 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
             let scriptTargetNoOutForced = TestAggregateTarget(
                 "scriptNoOutForced",
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "INDEX_FORCE_SCRIPT_EXECUTION": "YES",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "INDEX_FORCE_SCRIPT_EXECUTION": "YES"
+                        ]
+                    )
                 ],
                 buildPhases: [
                     TestShellScriptBuildPhase(
-                        name: "ScriptNoOutForced", originalObjectID: "ScriptNoOutForced", contents: "echo hello", inputs: [], outputs: [])
+                        name: "ScriptNoOutForced",
+                        originalObjectID: "ScriptNoOutForced",
+                        contents: "echo hello",
+                        inputs: [],
+                        outputs: []
+                    )
                 ]
             )
 
@@ -931,7 +1056,12 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                 "scriptSrcOut",
                 buildPhases: [
                     TestShellScriptBuildPhase(
-                        name: "ScriptSrcOut", originalObjectID: "ScriptSrcOut", contents: "touch $SRCROOT/srcOut", inputs: [], outputs: ["$(SRCROOT)/srcOut"])
+                        name: "ScriptSrcOut",
+                        originalObjectID: "ScriptSrcOut",
+                        contents: "touch $SRCROOT/srcOut",
+                        inputs: [],
+                        outputs: ["$(SRCROOT)/srcOut"]
+                    )
                 ]
             )
 
@@ -939,13 +1069,21 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
             let scriptTargetSrcOutForced = TestAggregateTarget(
                 "scriptSrcOutForced",
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "INDEX_FORCE_SCRIPT_EXECUTION": "YES",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "INDEX_FORCE_SCRIPT_EXECUTION": "YES"
+                        ]
+                    )
                 ],
                 buildPhases: [
                     TestShellScriptBuildPhase(
-                        name: "ScriptSrcOutForced", originalObjectID: "ScriptSrcOutForced", contents: "touch $SRCROOT/srcOutForced", inputs: [], outputs: ["$(SRCROOT)/srcOutForced"])
+                        name: "ScriptSrcOutForced",
+                        originalObjectID: "ScriptSrcOutForced",
+                        contents: "touch $SRCROOT/srcOutForced",
+                        inputs: [],
+                        outputs: ["$(SRCROOT)/srcOutForced"]
+                    )
                 ]
             )
 
@@ -964,12 +1102,17 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                                 TestFile("generated2.swift.fake-customrule"),
                                 TestFile("in3.xcfilelist"),
                                 TestFile("out3.xcfilelist"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "OTHER_SWIFT_FLAGS": "$(inherited) -disallow-use-new-driver", // FIXME: remove when rdar://75754282 is fixed.
-                            ])],
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "OTHER_SWIFT_FLAGS": "$(inherited) -disallow-use-new-driver",  // FIXME: remove when rdar://75754282 is fixed.
+                                ]
+                            )
+                        ],
                         targets: [
                             appTarget1,
                             appTarget2,
@@ -982,7 +1125,10 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                             scriptTargetNoOutForced,
                             scriptTargetSrcOut,
                             scriptTargetSrcOutForced,
-                        ])])
+                        ]
+                    )
+                ]
+            )
 
             func checkBuild(prepareTargets: [String], runDestination: RunDestinationInfo = .macOS, body: (BuildOperationTester.BuildResults) throws -> Void) async throws {
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
@@ -1026,41 +1172,57 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
     func prepareForIndexResultInfo() async throws {
         try await withTemporaryDirectory { tmpDirPath async throws -> Void in
             let superframeTarget = TestStandardTarget(
-                "SuperFrame", type: .framework,
+                "SuperFrame",
+                type: .framework,
                 buildPhases: [
                     TestSourcesBuildPhase([TestBuildFile("superframe.swift")]),
                     TestShellScriptBuildPhase(
-                        name: "Script1", originalObjectID: "Script1", contents: "exit 1", inputs: [], outputs: [
+                        name: "Script1",
+                        originalObjectID: "Script1",
+                        contents: "exit 1",
+                        inputs: [],
+                        outputs: [
                             "$(DERIVED_FILE_DIR)/script1-output"
-                        ])
-                ])
+                        ]
+                    ),
+                ]
+            )
             let frameTarget = TestStandardTarget(
-                "Frame", type: .framework,
+                "Frame",
+                type: .framework,
                 buildPhases: [
                     TestSourcesBuildPhase([TestBuildFile("frame.swift")]),
                     TestFrameworksBuildPhase(["SuperFrame.framework"]),
-                ])
+                ]
+            )
             let headerFrame = TestStandardTarget(
-                "HeaderFrame", type: .framework,
+                "HeaderFrame",
+                type: .framework,
                 buildPhases: [
                     TestSourcesBuildPhase(["header.c"]),
-                    TestHeadersBuildPhase([TestBuildFile("header.h", headerVisibility: .public)])
-                ])
+                    TestHeadersBuildPhase([TestBuildFile("header.h", headerVisibility: .public)]),
+                ]
+            )
             let toolTarget = TestStandardTarget(
-                "Tool", type: .commandLineTool,
+                "Tool",
+                type: .commandLineTool,
                 buildPhases: [
                     TestSourcesBuildPhase([TestBuildFile("tool.swift")]),
                     TestFrameworksBuildPhase(["Frame.framework", "HeaderFrame.framework"]),
-                ])
+                ]
+            )
             let testProject = TestProject(
                 "aProject",
-                groupTree: TestGroup("Files", children: [
-                    TestFile("superframe.swift"),
-                    TestFile("frame.swift"),
-                    TestFile("header.c"),
-                    TestFile("header.h"),
-                    TestFile("tool.swift")
-                ]),
+                groupTree: TestGroup(
+                    "Files",
+                    children: [
+                        TestFile("superframe.swift"),
+                        TestFile("frame.swift"),
+                        TestFile("header.c"),
+                        TestFile("header.h"),
+                        TestFile("tool.swift"),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -1069,12 +1231,16 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "SWIFT_VERSION": "5",
                             "ALWAYS_SEARCH_USER_PATHS": "NO",
-                        ])],
-                targets: [superframeTarget, frameTarget, headerFrame, toolTarget])
+                        ]
+                    )
+                ],
+                targets: [superframeTarget, frameTarget, headerFrame, toolTarget]
+            )
             let testWorkspace = TestWorkspace(
                 "aWorkspace",
                 sourceRoot: tmpDirPath.join("Test"),
-                projects: [testProject])
+                projects: [testProject]
+            )
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
@@ -1180,63 +1346,79 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                 "conflictApp",
                 type: .application,
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "macosx",
-                        "SUPPORTED_PLATFORMS": "macosx",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "SDKROOT": "macosx",
+                            "SUPPORTED_PLATFORMS": "macosx",
+                        ]
+                    )
                 ],
                 buildPhases: [
-                    TestSourcesBuildPhase(["main.m"]),
+                    TestSourcesBuildPhase(["main.m"])
                 ],
                 dependencies: [
-                    "FwkTarget",
-                ])
+                    "FwkTarget"
+                ]
+            )
 
             let conflictTarget2 = TestStandardTarget(
                 "conflictApp",
                 type: .application,
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "macosx",
-                        "SUPPORTED_PLATFORMS": "macosx",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "SDKROOT": "macosx",
+                            "SUPPORTED_PLATFORMS": "macosx",
+                        ]
+                    )
                 ],
                 buildPhases: [
-                    TestSourcesBuildPhase(["main.m"]),
+                    TestSourcesBuildPhase(["main.m"])
                 ],
                 dependencies: [
-                    "FwkTarget",
-                ])
+                    "FwkTarget"
+                ]
+            )
 
             let fwkTarget = try await TestStandardTarget(
                 "FwkTarget",
                 type: .framework,
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "macosx",
-                        "SUPPORTED_PLATFORMS": "macosx",
-                        "SWIFT_VERSION": swiftVersion,
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "SDKROOT": "macosx",
+                            "SUPPORTED_PLATFORMS": "macosx",
+                            "SWIFT_VERSION": swiftVersion,
+                        ]
+                    )
                 ],
                 buildPhases: [
                     TestSourcesBuildPhase(["fwk.swift"])
-                ])
+                ]
+            )
 
             let toolTarget = TestStandardTarget(
                 "ToolTarget",
                 type: .commandLineTool,
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "macosx",
-                        "SUPPORTED_PLATFORMS": "macosx",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "SDKROOT": "macosx",
+                            "SUPPORTED_PLATFORMS": "macosx",
+                        ]
+                    )
                 ],
                 buildPhases: [
-                    TestSourcesBuildPhase(["main.m"]),
+                    TestSourcesBuildPhase(["main.m"])
                 ],
                 dependencies: [
-                    "FwkTarget",
-                ])
+                    "FwkTarget"
+                ]
+            )
 
             let testWorkspace = TestWorkspace(
                 "Test",
@@ -1246,28 +1428,36 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                         "aProject1",
                         groupTree: TestGroup(
                             "SomeFiles",
-                            children: [
-                            ]),
+                            children: []
+                        ),
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])],
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)"
+                                ]
+                            )
+                        ],
                         targets: [
-                            conflictTarget1,
+                            conflictTarget1
                         ]
                     ),
                     TestProject(
                         "aProject2",
                         groupTree: TestGroup(
                             "SomeFiles",
-                            children: [
-                            ]),
+                            children: []
+                        ),
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])],
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)"
+                                ]
+                            )
+                        ],
                         targets: [
-                            conflictTarget2,
+                            conflictTarget2
                         ]
                     ),
                     TestProject(
@@ -1277,11 +1467,16 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                             children: [
                                 TestFile("main.m"),
                                 TestFile("fwk.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])],
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)"
+                                ]
+                            )
+                        ],
                         targets: [
                             fwkTarget,
                             toolTarget,
@@ -1313,23 +1508,32 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                 "leafTarget",
                 type: .framework,
                 buildPhases: [
-                    TestSourcesBuildPhase(["leaf.swift"]),
+                    TestSourcesBuildPhase(["leaf.swift"])
                 ],
                 dependencies: [
-                    "FwkTarget",
-                ])
+                    "FwkTarget"
+                ]
+            )
             let fwkTarget = TestStandardTarget(
                 "FwkTarget",
                 type: .framework,
                 buildConfigurations: [
                     // Explicitly testing tasks from different platforms producing the same output file, force script execution since otherwise these tasks won't be run.
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "INDEX_FORCE_SCRIPT_EXECUTION": "YES",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "INDEX_FORCE_SCRIPT_EXECUTION": "YES"
+                        ]
+                    )
                 ],
                 buildPhases: [
                     TestShellScriptBuildPhase(
-                        name: "Script1", originalObjectID: "Script1", contents: "echo let foo = 0 > \"${SRCROOT}/gen.swift\"", inputs: [], outputs: ["$(SRCROOT)/gen.swift"]),
+                        name: "Script1",
+                        originalObjectID: "Script1",
+                        contents: "echo let foo = 0 > \"${SRCROOT}/gen.swift\"",
+                        inputs: [],
+                        outputs: ["$(SRCROOT)/gen.swift"]
+                    ),
                     TestSourcesBuildPhase([
                         "gen.swift",
                         "gen2.swift.fake-customrule",
@@ -1342,13 +1546,16 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
             )
             let testProject = try await TestProject(
                 "aProject",
-                groupTree: TestGroup("Files", children: [
-                    TestFile("leaf.swift"),
-                    TestFile("gen.swift"),
-                    TestFile("gen2.swift"),
-                    TestFile("fwk.swift"),
-                    TestFile("gen2.swift.fake-customrule"),
-                ]),
+                groupTree: TestGroup(
+                    "Files",
+                    children: [
+                        TestFile("leaf.swift"),
+                        TestFile("gen.swift"),
+                        TestFile("gen2.swift"),
+                        TestFile("fwk.swift"),
+                        TestFile("gen2.swift.fake-customrule"),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -1359,12 +1566,16 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "ALWAYS_SEARCH_USER_PATHS": "NO",
-                        ])],
-                targets: [leafTarget, fwkTarget])
+                        ]
+                    )
+                ],
+                targets: [leafTarget, fwkTarget]
+            )
             let testWorkspace = TestWorkspace(
                 "aWorkspace",
                 sourceRoot: tmpDirPath.join("Test"),
-                projects: [testProject])
+                projects: [testProject]
+            )
 
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
@@ -1409,65 +1620,79 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
             let leafA = TestAggregateTarget(
                 "LeafA",
                 dependencies: [
-                    "FirstFrameworkA",
+                    "FirstFrameworkA"
                 ]
             )
             let leafB = TestAggregateTarget(
                 "LeafB",
                 dependencies: [
-                    "FirstFrameworkB",
+                    "FirstFrameworkB"
                 ]
             )
             let macosFramework = TestStandardTarget(
                 "FirstFrameworkA",
                 type: .framework,
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "RenamedFramework",
-                        "SDKROOT": "macosx",
-                        "SUPPORTED_PLATFORMS": "macosx",
-                        "DEFINES_MODULE": "Yes",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "RenamedFramework",
+                            "SDKROOT": "macosx",
+                            "SUPPORTED_PLATFORMS": "macosx",
+                            "DEFINES_MODULE": "Yes",
+                        ]
+                    )
                 ],
                 buildPhases: [
                     TestSourcesBuildPhase([
-                        "fwk.swift",
-                    ]),
+                        "fwk.swift"
+                    ])
                 ]
             )
             let iosFramework = TestStandardTarget(
                 "FirstFrameworkB",
                 type: .framework,
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "RenamedFramework",
-                        "SDKROOT": "iphoneos",
-                        "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
-                        "DEFINES_MODULE": "Yes",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "RenamedFramework",
+                            "SDKROOT": "iphoneos",
+                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                            "DEFINES_MODULE": "Yes",
+                        ]
+                    )
                 ],
                 buildPhases: [
                     TestSourcesBuildPhase([
-                        "fwk.swift",
-                    ]),
+                        "fwk.swift"
+                    ])
                 ]
             )
-            let testWorkspace = try await TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                TestProject(
-                    "aProject",
-                    groupTree: TestGroup("Files", children: [
-                        TestFile("fwk.swift"),
-                    ]),
-                    buildConfigurations: [
-                        TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_VERSION": swiftVersion,
-                            ])
-                    ],
-                    targets: [leafA, leafB, macosFramework, iosFramework]
-                )]
+            let testWorkspace = try await TestWorkspace(
+                "Test",
+                sourceRoot: tmpDir,
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup(
+                            "Files",
+                            children: [
+                                TestFile("fwk.swift")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
+                        ],
+                        targets: [leafA, leafB, macosFramework, iosFramework]
+                    )
+                ]
             )
 
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
@@ -1506,60 +1731,74 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
             let core = try await getCore()
 
             let precompiledPCHTarget = TestStandardTarget(
-                "Foo", guid: "Foo", type: .staticLibrary,
+                "Foo",
+                guid: "Foo",
+                type: .staticLibrary,
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
                             "GCC_PREFIX_HEADER": "prefix.h",
-                            "GCC_PRECOMPILE_PREFIX_HEADER": "YES"
-                        ])
+                            "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
+                        ]
+                    )
                 ],
                 buildPhases: [
                     TestSourcesBuildPhase([
-                        "foo.c",
+                        "foo.c"
                     ])
-                ])
+                ]
+            )
 
             let regularTarget = TestStandardTarget(
-                "Bar", guid: "Bar", type: .staticLibrary,
+                "Bar",
+                guid: "Bar",
+                type: .staticLibrary,
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
                             "GCC_PREFIX_HEADER": "prefix.h"
-                        ])
+                        ]
+                    )
                 ],
                 buildPhases: [
                     TestSourcesBuildPhase([
-                        "foo.c",
+                        "foo.c"
                     ])
-                ])
-
-            let testWorkspace = TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                TestProject(
-                    "aProject",
-                    groupTree: TestGroup(
-                        "Files",
-                        children: [
-                            TestFile("foo.c"),
-                            TestFile("prefix.h"),
+                ]
+            )
+
+            let testWorkspace = TestWorkspace(
+                "Test",
+                sourceRoot: tmpDir,
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup(
+                            "Files",
+                            children: [
+                                TestFile("foo.c"),
+                                TestFile("prefix.h"),
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "COMPILER_INDEX_STORE_ENABLE": "YES",
+                                    "INDEX_ENABLE_DATA_STORE": "YES",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                ]
+                            )
+                        ],
+                        targets: [
+                            precompiledPCHTarget, regularTarget,
                         ]
-                    ),
-                    buildConfigurations: [
-                        TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "COMPILER_INDEX_STORE_ENABLE": "YES",
-                                "INDEX_ENABLE_DATA_STORE": "YES",
-                                "CLANG_ENABLE_MODULES": "YES",
-                            ])
-                    ],
-                    targets: [
-                        precompiledPCHTarget, regularTarget
-                    ])
-            ])
+                    )
+                ]
+            )
 
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
             let tester = try await BuildOperationTester(core, testWorkspace, simulated: false)
@@ -1590,7 +1829,7 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                 "App",
                 type: .application,
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug"),
+                    TestBuildConfiguration("Debug")
                 ],
                 buildPhases: [
                     TestSourcesBuildPhase(["test.swift"]),
@@ -1600,34 +1839,46 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                 dependencies: []
             )
 
-            let testWorkspace = try await TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                TestProject(
-                    "aProject",
-                    groupTree: TestGroup(
-                        "SomeFiles",
-                        children: [
-                            TestFile("test.swift"),
-                            TestFile("Support.xcframework"),
-                        ]),
-                    buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "SDKROOT": "iphoneos",
-                            "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
-                            "SWIFT_VERSION": swiftVersion,
-                        ]),
-                    ],
-                    targets: [app])
-            ])
+            let testWorkspace = try await TestWorkspace(
+                "Test",
+                sourceRoot: tmpDir,
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup(
+                            "SomeFiles",
+                            children: [
+                                TestFile("test.swift"),
+                                TestFile("Support.xcframework"),
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SDKROOT": "iphoneos",
+                                    "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
+                        ],
+                        targets: [app]
+                    )
+                ]
+            )
 
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
             let tester = try await BuildOperationTester(core, testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(SRCROOT.join("test.swift")) { $0 <<< "// test.swift" }
-            let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
-                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)-simulator", supportedPlatform: "ios", supportedArchitectures: ["arm64"], platformVariant: "simulator", libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
-            ])
+            let supportXCFramework = try XCFramework(
+                version: Version(1, 0),
+                libraries: [
+                    XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
+                    XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)-simulator", supportedPlatform: "ios", supportedArchitectures: ["arm64"], platformVariant: "simulator", libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
+                ]
+            )
             let supportXCFrameworkPath = SRCROOT.join("Support.xcframework")
             try tester.fs.createDirectory(supportXCFrameworkPath, recursive: true)
             try await XCFrameworkTestSupport.writeXCFramework(supportXCFramework, fs: tester.fs, path: supportXCFrameworkPath, infoLookup: core)
@@ -1658,32 +1909,41 @@ fileprivate struct IndexBuildOperationTests: CoreBasedTests {
                 "App",
                 type: .commandLineTool,
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug"),
+                    TestBuildConfiguration("Debug")
                 ],
                 buildPhases: [
-                    TestSourcesBuildPhase(["test.swift"]),
+                    TestSourcesBuildPhase(["test.swift"])
                 ],
                 dependencies: []
             )
 
-            let testWorkspace = try await TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                TestProject(
-                    "aProject",
-                    groupTree: TestGroup(
-                        "SomeFiles",
-                        children: [
-                            TestFile("test.swift"),
-                        ]),
-                    buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "SDKROOT": "macosx",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                            "SWIFT_VERSION": swiftVersion,
-                        ]),
-                    ],
-                    targets: [app])
-            ])
+            let testWorkspace = try await TestWorkspace(
+                "Test",
+                sourceRoot: tmpDir,
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup(
+                            "SomeFiles",
+                            children: [
+                                TestFile("test.swift")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SDKROOT": "macosx",
+                                    "SUPPORTED_PLATFORMS": "macosx",
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
+                        ],
+                        targets: [app]
+                    )
+                ]
+            )
 
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
             let tester = try await BuildOperationTester(core, testWorkspace, simulated: false)
diff --git a/Tests/SWBBuildSystemTests/InfoPlistBuildOperationTests.swift b/Tests/SWBBuildSystemTests/InfoPlistBuildOperationTests.swift
index 64720f25..77296940 100644
--- a/Tests/SWBBuildSystemTests/InfoPlistBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/InfoPlistBuildOperationTests.swift
@@ -31,32 +31,39 @@ fileprivate struct InfoPlistBuildOperationTests: CoreBasedTests {
                         TestFile("infoplist-prefix.h"),
                         TestFile("SourceFile.m"),
                         TestFile("Tool.plist"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "CODE_SIGNING_ALLOWED": "NO",
-                        "CREATE_INFOPLIST_SECTION_IN_BINARY": "YES",
-                        "INFOPLIST_FILE": "Tool.plist",
-                        "INFOPLIST_PREPROCESS": "YES",
-                        "DSTROOT": tmpDir.path.join("dstroot").str,
-
-                        // Disable the SetOwnerAndGroup action by setting them to empty values.
-                        "INSTALL_GROUP": "",
-                        "INSTALL_OWNER": "",
-                    ]),
-                    TestBuildConfiguration("Release", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "CODE_SIGNING_ALLOWED": "NO",
-                        "CREATE_INFOPLIST_SECTION_IN_BINARY": "YES",
-                        "INFOPLIST_FILE": "Tool.plist",
-                        "INFOPLIST_PREPROCESS": "YES",
-                        "DSTROOT": tmpDir.path.join("dstroot").str,
-
-                        // Disable the SetOwnerAndGroup action by setting them to empty values.
-                        "INSTALL_GROUP": "",
-                        "INSTALL_OWNER": "",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "CREATE_INFOPLIST_SECTION_IN_BINARY": "YES",
+                            "INFOPLIST_FILE": "Tool.plist",
+                            "INFOPLIST_PREPROCESS": "YES",
+                            "DSTROOT": tmpDir.path.join("dstroot").str,
+
+                            // Disable the SetOwnerAndGroup action by setting them to empty values.
+                            "INSTALL_GROUP": "",
+                            "INSTALL_OWNER": "",
+                        ]
+                    ),
+                    TestBuildConfiguration(
+                        "Release",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "CREATE_INFOPLIST_SECTION_IN_BINARY": "YES",
+                            "INFOPLIST_FILE": "Tool.plist",
+                            "INFOPLIST_PREPROCESS": "YES",
+                            "DSTROOT": tmpDir.path.join("dstroot").str,
+
+                            // Disable the SetOwnerAndGroup action by setting them to empty values.
+                            "INSTALL_GROUP": "",
+                            "INSTALL_OWNER": "",
+                        ]
+                    ),
                 ],
                 targets: [
                     TestAggregateTarget("All", dependencies: ["Tool", "App"]),
@@ -69,8 +76,8 @@ fileprivate struct InfoPlistBuildOperationTests: CoreBasedTests {
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                "SourceFile.m",
-                            ]),
+                                "SourceFile.m"
+                            ])
                         ]
                     ),
                     TestStandardTarget(
@@ -82,11 +89,12 @@ fileprivate struct InfoPlistBuildOperationTests: CoreBasedTests {
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                "SourceFile.m",
-                            ]),
+                                "SourceFile.m"
+                            ])
                         ]
                     ),
-                ])
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -94,14 +102,13 @@ fileprivate struct InfoPlistBuildOperationTests: CoreBasedTests {
             try tester.fs.write(tmpDir.path.join("SourceFile.m"), contents: ByteString("int main() { return 0; }"))
             func writeToolPlist(different: Bool) async throws {
                 try await tester.fs.writeFileContents(tmpDir.path.join("Tool.plist")) { contents in
-                    contents <<<
-                    """
-                    <?xml version="1.0" encoding="UTF-8"?>
-                    <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-                    <plist version="1.0">
-                    <dict>
+                    contents <<< """
+                        <?xml version="1.0" encoding="UTF-8"?>
+                        <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+                        <plist version="1.0">
+                        <dict>
 
-                    """
+                        """
                     for arch in ["arm64", "x86_64"] {
                         contents <<< "#if __is_target_arch(\(arch))\n"
                         contents <<< "<key>arch</key>\n"
@@ -134,7 +141,8 @@ fileprivate struct InfoPlistBuildOperationTests: CoreBasedTests {
                         "builtin-mergeInfoPlist",
                         "\(SRCROOT)/build/aProject.build/Release/App.build/Preprocessed-Info.plist",
                         "\(SRCROOT)/build/aProject.build/Release/App.build/normal/arm64/Preprocessed-Info.plist",
-                        "\(SRCROOT)/build/aProject.build/Release/App.build/normal/x86_64/Preprocessed-Info.plist"])
+                        "\(SRCROOT)/build/aProject.build/Release/App.build/normal/x86_64/Preprocessed-Info.plist",
+                    ])
                 }
             }
 
@@ -174,41 +182,45 @@ fileprivate struct InfoPlistBuildOperationTests: CoreBasedTests {
                     children: [
                         TestFile("SourceFile.m"),
                         TestFile("Tool.plist"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "CODE_SIGNING_ALLOWED": "NO",
-                        "INFOPLIST_FILE": "Tool.plist",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "INFOPLIST_FILE": "Tool.plist",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "App",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug"),
+                            TestBuildConfiguration("Debug")
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                "SourceFile.m",
-                            ]),
+                                "SourceFile.m"
+                            ])
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
             try tester.fs.write(tmpDir.path.join("SourceFile.m"), contents: ByteString("int main() { return 0; }"))
             try await tester.fs.writeFileContents(tmpDir.path.join("Tool.plist")) { contents in
-                contents <<<
-                """
-                <?xml version="1.0" encoding="UTF-8"?>
-                <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-                <plist version="1.0">
-                <dict>
-                </dict></plist>
-                """
+                contents <<< """
+                    <?xml version="1.0" encoding="UTF-8"?>
+                    <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+                    <plist version="1.0">
+                    <dict>
+                    </dict></plist>
+                    """
             }
             try await tester.checkBuild(parameters: BuildParameters(configuration: "Debug"), runDestination: .anyMac, persistent: true) { results in
                 results.checkNoDiagnostics()
diff --git a/Tests/SWBBuildSystemTests/InstallAPIBuildOperationTests.swift b/Tests/SWBBuildSystemTests/InstallAPIBuildOperationTests.swift
index ef0442b4..d1661c79 100644
--- a/Tests/SWBBuildSystemTests/InstallAPIBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/InstallAPIBuildOperationTests.swift
@@ -35,35 +35,46 @@ fileprivate struct InstallAPIBuildOperationTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup("Sources", children: [TestFile("main.c"), TestFile("Public.h"), TestFile("Private.h")]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "CODE_SIGNING_ALLOWED": "NO",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SUPPORTS_TEXT_BASED_API": "YES",
-                                "INSTALL_GROUP": "",
-                                "INSTALL_OWNER": "",
-                                "DSTROOT": tmpDirPath.join("DSTROOT").str
-                            ]
-                        )],
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SUPPORTS_TEXT_BASED_API": "YES",
+                                    "INSTALL_GROUP": "",
+                                    "INSTALL_OWNER": "",
+                                    "DSTROOT": tmpDirPath.join("DSTROOT").str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Dylib", type: .dynamicLibrary,
+                                "Dylib",
+                                type: .dynamicLibrary,
                                 buildPhases: [
                                     TestHeadersBuildPhase([
                                         TestBuildFile("Public.h", headerVisibility: .public),
-                                        TestBuildFile("Private.h", headerVisibility: .private)
+                                        TestBuildFile("Private.h", headerVisibility: .private),
                                     ]),
-                                    TestSourcesBuildPhase(["main.c"])
-                                ])])])
+                                    TestSourcesBuildPhase(["main.c"]),
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
-            try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/main.c"), body: {
-                $0 <<< """
-                    void f(void) {}
-                    void g(void) {}
-                    """
-            })
+            try await tester.fs.writeFileContents(
+                testWorkspace.sourceRoot.join("aProject/main.c"),
+                body: {
+                    $0 <<< """
+                        void f(void) {}
+                        void g(void) {}
+                        """
+                }
+            )
 
             for action in [BuildAction.build, BuildAction.install] {
                 try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Public.h"), body: { $0 <<< "void f(void);" })
@@ -112,35 +123,46 @@ fileprivate struct InstallAPIBuildOperationTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup("Sources", children: [TestFile("main.c"), TestFile("Public.h"), TestFile("Private.h")]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "CODE_SIGNING_ALLOWED": "NO",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SUPPORTS_TEXT_BASED_API": "YES",
-                                "INSTALL_GROUP": "",
-                                "INSTALL_OWNER": "",
-                                "DSTROOT": tmpDirPath.join("DSTROOT").str
-                            ]
-                        )],
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SUPPORTS_TEXT_BASED_API": "YES",
+                                    "INSTALL_GROUP": "",
+                                    "INSTALL_OWNER": "",
+                                    "DSTROOT": tmpDirPath.join("DSTROOT").str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Framework", type: .framework,
+                                "Framework",
+                                type: .framework,
                                 buildPhases: [
                                     TestHeadersBuildPhase([
                                         TestBuildFile("Public.h", headerVisibility: .public),
-                                        TestBuildFile("Private.h", headerVisibility: .private)
+                                        TestBuildFile("Private.h", headerVisibility: .private),
                                     ]),
-                                    TestSourcesBuildPhase(["main.c"])
-                                ])])])
+                                    TestSourcesBuildPhase(["main.c"]),
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
-            try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/main.c"), body: {
-                $0 <<< """
-                    void f(void) {}
-                    void g(void) {}
-                    """
-            })
+            try await tester.fs.writeFileContents(
+                testWorkspace.sourceRoot.join("aProject/main.c"),
+                body: {
+                    $0 <<< """
+                        void f(void) {}
+                        void g(void) {}
+                        """
+                }
+            )
 
             for action in [BuildAction.build, BuildAction.install] {
                 try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Public.h"), body: { $0 <<< "void f(void);" })
@@ -187,36 +209,47 @@ fileprivate struct InstallAPIBuildOperationTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup("Sources", children: [TestFile("main.c"), TestFile("Public.h"), TestFile("Private.h")]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "CODE_SIGNING_ALLOWED": "NO",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SUPPORTS_TEXT_BASED_API": "YES",
-                                "INSTALL_GROUP": "",
-                                "INSTALL_OWNER": "",
-                                "DSTROOT": tmpDirPath.join("DSTROOT").str,
-                                "TAPI_VERIFY_MODE": "ErrorsOnly",
-                            ]
-                        )],
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SUPPORTS_TEXT_BASED_API": "YES",
+                                    "INSTALL_GROUP": "",
+                                    "INSTALL_OWNER": "",
+                                    "DSTROOT": tmpDirPath.join("DSTROOT").str,
+                                    "TAPI_VERIFY_MODE": "ErrorsOnly",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Framework", type: .framework,
+                                "Framework",
+                                type: .framework,
                                 buildPhases: [
                                     TestHeadersBuildPhase([
                                         TestBuildFile("Public.h", headerVisibility: .public),
-                                        TestBuildFile("Private.h", headerVisibility: .private)
+                                        TestBuildFile("Private.h", headerVisibility: .private),
                                     ]),
-                                    TestSourcesBuildPhase(["main.c"])
-                                ])])])
+                                    TestSourcesBuildPhase(["main.c"]),
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
-            try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/main.c"), body: {
-                $0 <<< """
-                    void f(void) {}
-                    void g(void) {}
-                    """
-            })
+            try await tester.fs.writeFileContents(
+                testWorkspace.sourceRoot.join("aProject/main.c"),
+                body: {
+                    $0 <<< """
+                        void f(void) {}
+                        void g(void) {}
+                        """
+                }
+            )
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Public.h"), body: { $0 <<< "void f(void);" })
 
@@ -281,35 +314,46 @@ fileprivate struct InstallAPIBuildOperationTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup("Sources", children: [TestFile("main.c"), TestFile("Public.h"), TestFile("Private.h")]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "CODE_SIGNING_ALLOWED": "NO",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SUPPORTS_TEXT_BASED_API": "YES",
-                                "INSTALL_GROUP": "",
-                                "INSTALL_OWNER": "",
-                                "DSTROOT": tmpDirPath.join("DSTROOT").str
-                            ]
-                        )],
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SUPPORTS_TEXT_BASED_API": "YES",
+                                    "INSTALL_GROUP": "",
+                                    "INSTALL_OWNER": "",
+                                    "DSTROOT": tmpDirPath.join("DSTROOT").str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Framework", type: .framework,
+                                "Framework",
+                                type: .framework,
                                 buildPhases: [
                                     TestHeadersBuildPhase([
                                         TestBuildFile("Public.h", headerVisibility: .public),
-                                        TestBuildFile("Private.h", headerVisibility: .private, platformFilters: PlatformFilter.iOSFilters)
+                                        TestBuildFile("Private.h", headerVisibility: .private, platformFilters: PlatformFilter.iOSFilters),
                                     ]),
-                                    TestSourcesBuildPhase(["main.c"])
-                                ])])])
+                                    TestSourcesBuildPhase(["main.c"]),
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
-            try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/main.c"), body: {
-                $0 <<< """
-                    void f(void) {}
-                    void g(void) {}
-                    """
-            })
+            try await tester.fs.writeFileContents(
+                testWorkspace.sourceRoot.join("aProject/main.c"),
+                body: {
+                    $0 <<< """
+                        void f(void) {}
+                        void g(void) {}
+                        """
+                }
+            )
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Public.h"), body: { $0 <<< "void f(void); void g(void);" })
 
@@ -343,56 +387,75 @@ fileprivate struct InstallAPIBuildOperationTests: CoreBasedTests {
                         TestProject(
                             "aProject",
                             groupTree: TestGroup("Sources", children: [TestFile("main.c"), TestFile("dep.c"), TestFile("Public.h")]),
-                            buildConfigurations: [TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "CODE_SIGNING_ALLOWED": "NO",
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "SUPPORTS_TEXT_BASED_API": supportsInstallAPI,
-                                    "INSTALL_GROUP": "",
-                                    "INSTALL_OWNER": "",
-                                ]
-                            )],
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "CODE_SIGNING_ALLOWED": "NO",
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "SUPPORTS_TEXT_BASED_API": supportsInstallAPI,
+                                        "INSTALL_GROUP": "",
+                                        "INSTALL_OWNER": "",
+                                    ]
+                                )
+                            ],
                             targets: [
                                 TestStandardTarget(
-                                    "Framework", type: .framework,
+                                    "Framework",
+                                    type: .framework,
                                     buildPhases: [
                                         TestSourcesBuildPhase(["main.c"]),
-                                        TestFrameworksBuildPhase(["Framework2.framework"])
-                                    ], dependencies: ["Framework2"]),
+                                        TestFrameworksBuildPhase(["Framework2.framework"]),
+                                    ],
+                                    dependencies: ["Framework2"]
+                                ),
                                 TestStandardTarget(
-                                    "Framework2", type: .framework,
+                                    "Framework2",
+                                    type: .framework,
                                     buildPhases: [
                                         TestHeadersBuildPhase([
-                                            TestBuildFile("Public.h", headerVisibility: .public),
+                                            TestBuildFile("Public.h", headerVisibility: .public)
                                         ]),
-                                        TestSourcesBuildPhase(["dep.c"])
-                                    ]),
-                            ])])
+                                        TestSourcesBuildPhase(["dep.c"]),
+                                    ]
+                                ),
+                            ]
+                        )
+                    ]
+                )
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
-                try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/main.c"), body: {
-                    $0 <<< """
-                        static void f(void) {
-
-                        }
-                        """
-                })
+                try await tester.fs.writeFileContents(
+                    testWorkspace.sourceRoot.join("aProject/main.c"),
+                    body: {
+                        $0 <<< """
+                            static void f(void) {
 
-                try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Public.h"), body: {
-                    $0 <<< """
-                        void g(void);
-                        """
-                })
+                            }
+                            """
+                    }
+                )
+
+                try await tester.fs.writeFileContents(
+                    testWorkspace.sourceRoot.join("aProject/Public.h"),
+                    body: {
+                        $0 <<< """
+                            void g(void);
+                            """
+                    }
+                )
 
-                try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/dep.c"), body: {
-                    $0 <<< """
-                        #include <stdio.h>
-                        void g(void) {
+                try await tester.fs.writeFileContents(
+                    testWorkspace.sourceRoot.join("aProject/dep.c"),
+                    body: {
+                        $0 <<< """
+                            #include <stdio.h>
+                            void g(void) {
 
-                        }
-                        """
-                })
+                            }
+                            """
+                    }
+                )
 
                 let parameters = BuildParameters(action: .build, configuration: "Debug")
                 try await tester.checkBuild(parameters: parameters, runDestination: .macOS, persistent: true) { results in
@@ -406,14 +469,17 @@ fileprivate struct InstallAPIBuildOperationTests: CoreBasedTests {
                 }
 
                 // Change the dependency without changing the list of exported symbols - the dependent should not relink.
-                try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/dep.c"), body: {
-                    $0 <<< """
-                        #include <stdio.h>
-                        void g(void) {
-                        printf("foo");
-                        }
-                        """
-                })
+                try await tester.fs.writeFileContents(
+                    testWorkspace.sourceRoot.join("aProject/dep.c"),
+                    body: {
+                        $0 <<< """
+                            #include <stdio.h>
+                            void g(void) {
+                            printf("foo");
+                            }
+                            """
+                    }
+                )
 
                 try await tester.checkBuild(parameters: parameters, runDestination: .macOS, persistent: true) { results in
                     results.checkNoTask(.matchTargetName("Framework"), .matchRuleType("CompileC"))
@@ -426,20 +492,26 @@ fileprivate struct InstallAPIBuildOperationTests: CoreBasedTests {
                 }
 
                 // Change exported symbols in the dependency, the dependency should relink (but the dependency does not need to recompile).
-                try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/dep.c"), body: {
-                    $0 <<< """
-                        #include <stdio.h>
-                        void h(void) {
-                        printf("foo");
-                        }
-                        """
-                })
-
-                try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Public.h"), body: {
-                    $0 <<< """
-                        void h(void);
-                        """
-                })
+                try await tester.fs.writeFileContents(
+                    testWorkspace.sourceRoot.join("aProject/dep.c"),
+                    body: {
+                        $0 <<< """
+                            #include <stdio.h>
+                            void h(void) {
+                            printf("foo");
+                            }
+                            """
+                    }
+                )
+
+                try await tester.fs.writeFileContents(
+                    testWorkspace.sourceRoot.join("aProject/Public.h"),
+                    body: {
+                        $0 <<< """
+                            void h(void);
+                            """
+                    }
+                )
 
                 try await tester.checkBuild(parameters: parameters, runDestination: .macOS, persistent: true) { results in
                     results.checkNoTask(.matchTargetName("Framework"), .matchRuleType("CompileC"))
diff --git a/Tests/SWBBuildSystemTests/InstrumentsPackageBuildOperationTests.swift b/Tests/SWBBuildSystemTests/InstrumentsPackageBuildOperationTests.swift
index 1dc85f60..87a18adb 100644
--- a/Tests/SWBBuildSystemTests/InstrumentsPackageBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/InstrumentsPackageBuildOperationTests.swift
@@ -28,9 +28,11 @@ fileprivate struct InstrumentsPackageBuildOperationTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "Sources", children: [
-                        TestFile("PackageDefinition.instrpkg"),
-                    ]),
+                    "Sources",
+                    children: [
+                        TestFile("PackageDefinition.instrpkg")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -40,33 +42,38 @@ fileprivate struct InstrumentsPackageBuildOperationTests: CoreBasedTests {
                             "INSTALL_OWNER": "",
                             "INSTALL_GROUP": "staff",
                         ]
-                    )],
+                    )
+                ],
                 targets: [
                     TestStandardTarget(
                         "Measure",
                         type: .instrumentsPackage,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [:]),
+                            TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["PackageDefinition.instrpkg"]),
+                            TestSourcesBuildPhase(["PackageDefinition.instrpkg"])
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot
 
-            try tester.fs.write(SRCROOT.join("PackageDefinition.instrpkg"), contents:
-                """
-                <?xml version="1.0" encoding="UTF-8" ?>
-                <package>
-                    <id>com.foo.bar</id>
-                    <title>Foo</title>
-                    <owner>
-                        <name>Foo</name>
-                    </owner>
-                </package>
-                """)
+            try tester.fs.write(
+                SRCROOT.join("PackageDefinition.instrpkg"),
+                contents:
+                    """
+                    <?xml version="1.0" encoding="UTF-8" ?>
+                    <package>
+                        <id>com.foo.bar</id>
+                        <title>Foo</title>
+                        <owner>
+                            <name>Foo</name>
+                        </owner>
+                    </package>
+                    """
+            )
 
             try await tester.checkBuild(parameters: BuildParameters(action: .install, configuration: "Debug"), runDestination: .macOS) { results in
                 // Check that there are no warnings or errors.  If the Instruments package processing tool doesn't declare a virtual output then the post-processing tasks will not be able to be ordered with respect to it.
@@ -75,7 +82,7 @@ fileprivate struct InstrumentsPackageBuildOperationTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("BuildInstrumentsPackage")) { task in
                     task.checkCommandLineMatches([
                         .equal("--emit-dependency-info"),
-                        .suffix("instruments-package-builder.dependencies")
+                        .suffix("instruments-package-builder.dependencies"),
                     ])
                 }
 
diff --git a/Tests/SWBBuildSystemTests/LinkerTests.swift b/Tests/SWBBuildSystemTests/LinkerTests.swift
index 8991b51e..4e81de82 100644
--- a/Tests/SWBBuildSystemTests/LinkerTests.swift
+++ b/Tests/SWBBuildSystemTests/LinkerTests.swift
@@ -33,10 +33,12 @@ fileprivate struct LinkerTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift")
-                    ]),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
-                        "testTarget", type: .framework,
+                        "testTarget",
+                        type: .framework,
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -45,14 +47,16 @@ fileprivate struct LinkerTests: CoreBasedTests {
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "SWIFT_VERSION": swiftVersion,
                                     "OTHER_LDFLAGS": "-not-a-real-flag",
-                                    "ARCHS" : "x86_64 aarch64"
-                                ])
+                                    "ARCHS": "x86_64 aarch64",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["source.swift"])
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
 
             let projectDir = tester.workspace.projects[0].sourceRoot
@@ -81,10 +85,12 @@ fileprivate struct LinkerTests: CoreBasedTests {
                     children: [
                         TestFile("source.swift"),
                         TestFile("source.mm"),
-                    ]),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
-                        "testTarget", type: .application,
+                        "testTarget",
+                        type: .application,
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -92,7 +98,8 @@ fileprivate struct LinkerTests: CoreBasedTests {
                                     "GENERATE_INFOPLIST_FILE": "YES",
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "SWIFT_VERSION": swiftVersion,
-                                ])
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["source.mm"])
@@ -100,7 +107,8 @@ fileprivate struct LinkerTests: CoreBasedTests {
                         dependencies: [TestTargetDependency("testFramework")]
                     ),
                     TestStandardTarget(
-                        "testFramework", type: .framework,
+                        "testFramework",
+                        type: .framework,
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -109,13 +117,15 @@ fileprivate struct LinkerTests: CoreBasedTests {
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "SWIFT_VERSION": swiftVersion,
                                     "SWIFT_OBJC_INTEROP_MODE": enableInterop ? "objcxx" : "objc",
-                                ])
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["source.swift"])
                         ]
                     ),
-                ])
+                ]
+            )
         }
 
         try await withTemporaryDirectory { tmpDir in
@@ -195,7 +205,8 @@ fileprivate struct LinkerTests: CoreBasedTests {
                     children: [
                         TestFile("main.swift"),
                         TestFile("library.swift"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -204,7 +215,8 @@ fileprivate struct LinkerTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "CODE_SIGNING_ALLOWED": "NO",
                             "OTHER_LDFLAGS": "-v",  // This will add the -v to the clang linking invocation so we can see what linker will be called.
-                        ])
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -225,7 +237,8 @@ fileprivate struct LinkerTests: CoreBasedTests {
                             ])
                         ]
                     ),
-                ])
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             let projectDir = tester.workspace.projects[0].sourceRoot
             try await tester.fs.writeFileContents(projectDir.join("main.swift")) { stream in
@@ -344,7 +357,7 @@ fileprivate struct LinkerTests: CoreBasedTests {
                 try await tester.checkBuild(parameters: parameters, runDestination: .host) { results in
                     results.checkTask(.matchRuleType("Ld")) { task in
                         task.checkCommandLineContains(["-fuse-ld=link"])
-                         results.checkTaskOutput(task) { output in
+                        results.checkTaskOutput(task) { output in
                             // Expect that the 'link' linker is called by clang
                             if runDestination == .windows && Architecture.hostStringValue == "aarch64" {
                                 // rdar://145868953 - On windows aarch64 'clang' picks the wrong host architecture for link.exe, choosing "MSVC\14.41.34120\bin\Hostx86\x64\link.exe"
@@ -354,7 +367,7 @@ fileprivate struct LinkerTests: CoreBasedTests {
                             } else {
                                 #expect(output.asString.replacingOccurrences(of: "\\\\", with: "\\").contains(linkLinkerPathAarch64.str))
                             }
-                         }
+                        }
                     }
                     results.checkNoDiagnostics()
                 }
@@ -373,10 +386,12 @@ fileprivate struct LinkerTests: CoreBasedTests {
                     children: [
                         TestFile("main.c"),
                         TestFile("lib.c"),
-                    ]),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
-                        "cli", type: .commandLineTool,
+                        "cli",
+                        type: .commandLineTool,
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -386,29 +401,33 @@ fileprivate struct LinkerTests: CoreBasedTests {
                                     "GENERATE_PRELINK_OBJECT_FILE": "YES",
                                     "GCC_SYMBOLS_PRIVATE_EXTERN": "NO",
                                     "MACOSX_DEPLOYMENT_TARGET": "13.0",
-                                ])
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["main.c"]),
-                            TestFrameworksBuildPhase([TestBuildFile(.target("lib"))])
+                            TestFrameworksBuildPhase([TestBuildFile(.target("lib"))]),
                         ],
                         dependencies: [TestTargetDependency("lib")]
                     ),
                     TestStandardTarget(
-                        "lib", type: .staticLibrary,
+                        "lib",
+                        type: .staticLibrary,
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "MACOSX_DEPLOYMENT_TARGET": "13.0",
-                                ])
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["lib.c"])
                         ]
                     ),
-                ])
+                ]
+            )
         }
 
         try await withTemporaryDirectory { tmpDir in
diff --git a/Tests/SWBBuildSystemTests/MergeableLibrariesBuildOperationTests.swift b/Tests/SWBBuildSystemTests/MergeableLibrariesBuildOperationTests.swift
index 27f82293..76919f44 100644
--- a/Tests/SWBBuildSystemTests/MergeableLibrariesBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/MergeableLibrariesBuildOperationTests.swift
@@ -21,7 +21,7 @@ import class SwiftBuild.SWBBuildService
 import SWBTaskExecution
 
 #if canImport(Darwin)
-import MachO
+    import MachO
 #endif
 
 @Suite(.requireXcode16())
@@ -54,42 +54,47 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
+                            "Sources",
+                            path: "Sources",
+                            children: [
                                 // App sources
                                 TestFile("Application.swift"),
 
                                 // Mergeable framework and library sources
                                 TestFile("ClassOne.swift"),
                                 TestFile("ClassTwo.swift"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "COPY_PHASE_STRIP": "NO",
-                                "CODE_SIGN_IDENTITY": "-",
-                                "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES",
-                                "GCC_OPTIMIZATION_LEVEL": "0",
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "INSTALL_PATH": "",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SDKROOT": "iphoneos",
-                                "SWIFT_INSTALL_OBJC_HEADER": "NO",
-                                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                                "SWIFT_VERSION": swiftVersion,
-                                "TAPI_EXEC": tapiToolPath.str,
-                                "LIBTOOL": libtoolPath.str,
-
-                                // Force file attribute changes off by default.
-                                "INSTALL_OWNER": "",
-                                "INSTALL_GROUP": "",
-                                "INSTALL_MODE_FLAG": "",
-                                "SDK_STAT_CACHE_ENABLE": "NO",
-
-                                "ASSETCATALOG_COMPILER_SKIP_APP_STORE_DEPLOYMENT": useAppStoreCodelessFrameworksWorkaround ? "NO" : "YES"
-                            ])
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "COPY_PHASE_STRIP": "NO",
+                                    "CODE_SIGN_IDENTITY": "-",
+                                    "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES",
+                                    "GCC_OPTIMIZATION_LEVEL": "0",
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "INSTALL_PATH": "",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SDKROOT": "iphoneos",
+                                    "SWIFT_INSTALL_OBJC_HEADER": "NO",
+                                    "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "TAPI_EXEC": tapiToolPath.str,
+                                    "LIBTOOL": libtoolPath.str,
+
+                                    // Force file attribute changes off by default.
+                                    "INSTALL_OWNER": "",
+                                    "INSTALL_GROUP": "",
+                                    "INSTALL_MODE_FLAG": "",
+                                    "SDK_STAT_CACHE_ENABLE": "NO",
+
+                                    "ASSETCATALOG_COMPILER_SKIP_APP_STORE_DEPLOYMENT": useAppStoreCodelessFrameworksWorkaround ? "NO" : "YES",
+                                ]
+                            )
                         ],
                         targets: [
                             // App target
@@ -97,25 +102,31 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                                 "AppTarget",
                                 type: .application,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug",
-                                                           buildSettings: [
-                                                            "INSTALL_PATH": "/Applications",
-                                                            "SKIP_EMBEDDED_FRAMEWORKS_VALIDATION": "YES",
-                                                           ]),
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "INSTALL_PATH": "/Applications",
+                                            "SKIP_EMBEDDED_FRAMEWORKS_VALIDATION": "YES",
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "Application.swift",
+                                        "Application.swift"
                                     ]),
                                     TestFrameworksBuildPhase([
-                                        "MergedFwkTarget.framework",
+                                        "MergedFwkTarget.framework"
                                     ]),
                                     // Embed
-                                    TestCopyFilesBuildPhase([
-                                        TestBuildFile("MergedFwkTarget.framework", codeSignOnCopy: true),
-                                        TestBuildFile("FwkTarget1.framework", codeSignOnCopy: true),
-                                        TestBuildFile("FwkTarget2.framework", codeSignOnCopy: true),
-                                    ], destinationSubfolder: .frameworks, onlyForDeployment: false)
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            TestBuildFile("MergedFwkTarget.framework", codeSignOnCopy: true),
+                                            TestBuildFile("FwkTarget1.framework", codeSignOnCopy: true),
+                                            TestBuildFile("FwkTarget2.framework", codeSignOnCopy: true),
+                                        ],
+                                        destinationSubfolder: .frameworks,
+                                        onlyForDeployment: false
+                                    ),
                                 ],
                                 dependencies: ["MergedFwkTarget"]
                             ),
@@ -124,10 +135,12 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                                 "MergedFwkTarget",
                                 type: .framework,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug",
-                                                           buildSettings: [
-                                                            "MERGED_BINARY_TYPE": "automatic",
-                                                           ]),
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "MERGED_BINARY_TYPE": "automatic"
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
@@ -146,33 +159,32 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                                 "FwkTarget1",
                                 type: .framework,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug"),
+                                    TestBuildConfiguration("Debug")
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "ClassOne.swift",
-                                    ]),
-                                    TestFrameworksBuildPhase([
+                                        "ClassOne.swift"
                                     ]),
+                                    TestFrameworksBuildPhase([]),
                                 ]
                             ),
                             TestStandardTarget(
                                 "FwkTarget2",
                                 type: .framework,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug"),
+                                    TestBuildConfiguration("Debug")
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "ClassTwo.swift",
-                                    ]),
-                                    TestFrameworksBuildPhase([
+                                        "ClassTwo.swift"
                                     ]),
+                                    TestFrameworksBuildPhase([]),
                                 ]
                             ),
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
             let signableTargets: Set<String> = Set(tester.workspace.projects[0].targets.map({ $0.name }))
@@ -198,7 +210,7 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                 "Gate", "WriteAuxiliaryFile", "CreateBuildDirectory", "SymLink", "MkDir", "ProcessInfoPlistFile",
                 "ClangStatCache", "ExtractAppIntentsMetadata", "AppIntentsSSUTraining",
                 "SwiftDriver", "SwiftEmitModule", "SwiftDriver Compilation", "SwiftDriver Compilation Requirements", "SwiftMergeGeneratedHeaders",
-                "CopySwiftLibs","RegisterExecutionPolicyException", "RegisterWithLaunchServices", "Validate", "Touch",
+                "CopySwiftLibs", "RegisterExecutionPolicyException", "RegisterWithLaunchServices", "Validate", "Touch",
                 "SwiftExplicitDependencyCompileModuleFromInterface", "SwiftExplicitDependencyGeneratePcm", "ProcessSDKImports",
             ])
 
@@ -206,14 +218,17 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
             do {
                 let buildType = "Debug"
                 let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: tmpDirPath, for: buildType)
-                let parameters = BuildParameters(configuration: "Debug", overrides: [
-                    "SYMROOT": SYMROOT,
-                    "OBJROOT": OBJROOT,
-                    "DSTROOT": DSTROOT,
-                    "DEBUG_INFORMATION_FORMAT": "dwarf",        // No dSYM for debug builds
-                    "GCC_OPTIMIZATION_LEVEL": "0",
-                    "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                ])
+                let parameters = BuildParameters(
+                    configuration: "Debug",
+                    overrides: [
+                        "SYMROOT": SYMROOT,
+                        "OBJROOT": OBJROOT,
+                        "DSTROOT": DSTROOT,
+                        "DEBUG_INFORMATION_FORMAT": "dwarf",  // No dSYM for debug builds
+                        "GCC_OPTIMIZATION_LEVEL": "0",
+                        "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                    ]
+                )
                 let targets = tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
                 let request = BuildRequest(parameters: parameters, buildTargets: targets, continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
                 try await tester.checkBuild(buildType, parameters: parameters, runDestination: .iOS, buildRequest: request, persistent: true, signableTargets: signableTargets) { results in
@@ -301,87 +316,86 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                     results.checkNoTask(.matchRuleType("Strip"))
                     results.checkNoTask()
 
-#if canImport(Darwin)
-                    // Examine that the contents on disk have the expected properties.
-                    // First, check that the mergeable frameworks in the SYMROOT were *not* built as mergeable.
-                    // Second, check that the mergeable frameworks embedded in the app don't contain their binaries.
-                    // Third, check that the mergeable frameworks embedded in the merged framework do contain their binaries.
-                    for fwkTargetName in ["FwkTarget1", "FwkTarget2"] {
-                        // Reexported
-                        do {
-                            let fwkPath = Path("\(SYMROOT)/Debug-iphoneos/\(fwkTargetName).framework")
-                            #expect(tester.fs.exists(fwkPath), "Could not find framework '\(fwkPath.str)'")
-                            let machoPath = fwkPath.join(fwkTargetName)
-                            #expect(tester.fs.exists(machoPath), "Could not find framework binary '\(machoPath.str)'")
-
-                            try checkForMergeableMetadata(in: machoPath, fs: tester.fs, expected: false, reason: "it should not have been built mergeable")
-                        }
+                    #if canImport(Darwin)
+                        // Examine that the contents on disk have the expected properties.
+                        // First, check that the mergeable frameworks in the SYMROOT were *not* built as mergeable.
+                        // Second, check that the mergeable frameworks embedded in the app don't contain their binaries.
+                        // Third, check that the mergeable frameworks embedded in the merged framework do contain their binaries.
+                        for fwkTargetName in ["FwkTarget1", "FwkTarget2"] {
+                            // Reexported
+                            do {
+                                let fwkPath = Path("\(SYMROOT)/Debug-iphoneos/\(fwkTargetName).framework")
+                                #expect(tester.fs.exists(fwkPath), "Could not find framework '\(fwkPath.str)'")
+                                let machoPath = fwkPath.join(fwkTargetName)
+                                #expect(tester.fs.exists(machoPath), "Could not find framework binary '\(machoPath.str)'")
+
+                                try checkForMergeableMetadata(in: machoPath, fs: tester.fs, expected: false, reason: "it should not have been built mergeable")
+                            }
 
-                        // Lacking binary in app
-                        do {
-                            let fwkPath = Path("\(SYMROOT)/Debug-iphoneos/AppTarget.app/Frameworks/\(fwkTargetName).framework")
-                            #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
-                            let machoPath = fwkPath.join(fwkTargetName)
-                            if useAppStoreCodelessFrameworksWorkaround {
-                                #expect(tester.fs.exists(machoPath), "Missing framework binary '\(machoPath.str)'")
+                            // Lacking binary in app
+                            do {
+                                let fwkPath = Path("\(SYMROOT)/Debug-iphoneos/AppTarget.app/Frameworks/\(fwkTargetName).framework")
+                                #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
+                                let machoPath = fwkPath.join(fwkTargetName)
+                                if useAppStoreCodelessFrameworksWorkaround {
+                                    #expect(tester.fs.exists(machoPath), "Missing framework binary '\(machoPath.str)'")
+
+                                    // The binary should be an iOS dylib
+                                    let macho = try MachO(reader: BinaryReader(data: tester.fs.read(machoPath)))
+                                    let (slices, linkage) = try macho.slicesIncludingLinkage()
+                                    #expect(try slices.flatMap { try $0.buildVersions().map(\.platform) }.only == .iOS)
+                                    #expect(linkage == .macho(.dylib))
+                                } else {
+                                    #expect(!tester.fs.exists(machoPath), "Found unexpected framework binary '\(machoPath.str)'")
+                                }
+                            }
 
-                                // The binary should be an iOS dylib
-                                let macho = try MachO(reader: BinaryReader(data: tester.fs.read(machoPath)))
-                                let (slices, linkage) = try macho.slicesIncludingLinkage()
-                                #expect(try slices.flatMap { try $0.buildVersions().map(\.platform) }.only == .iOS)
-                                #expect(linkage == .macho(.dylib))
-                            } else {
-                                #expect(!tester.fs.exists(machoPath), "Found unexpected framework binary '\(machoPath.str)'")
+                            // Including binary in merged framework
+                            do {
+                                let fwkPath = Path("\(SYMROOT)/Debug-iphoneos/MergedFwkTarget.framework/\(reexportedBinariesDirectoryName)/\(fwkTargetName).framework")
+                                #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
+                                let machoPath = fwkPath.join(fwkTargetName)
+                                #expect(tester.fs.exists(machoPath), "Could not find binary '\(machoPath.str)'")
                             }
                         }
 
-                        // Including binary in merged framework
+                        // Second, check the contents of the merged binary for expected characteristics.
                         do {
-                            let fwkPath = Path("\(SYMROOT)/Debug-iphoneos/MergedFwkTarget.framework/\(reexportedBinariesDirectoryName)/\(fwkTargetName).framework")
+                            let targetName = "MergedFwkTarget"
+                            let fwkPath = Path("\(SYMROOT)/Debug-iphoneos/\(targetName).framework")
                             #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
-                            let machoPath = fwkPath.join(fwkTargetName)
-                            #expect(tester.fs.exists(machoPath), "Could not find binary '\(machoPath.str)'")
-                        }
-                    }
+                            let machoPath = fwkPath.join(targetName)
+                            #expect(tester.fs.exists(machoPath), "Could not find framework binary '\(machoPath.str)'")
 
-                    // Second, check the contents of the merged binary for expected characteristics.
-                    do {
-                        let targetName = "MergedFwkTarget"
-                        let fwkPath = Path("\(SYMROOT)/Debug-iphoneos/\(targetName).framework")
-                        #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
-                        let machoPath = fwkPath.join(targetName)
-                        #expect(tester.fs.exists(machoPath), "Could not find framework binary '\(machoPath.str)'")
-
-                        // Check the merged binary.
-                        let reader = try BinaryReader(data: tester.fs.read(machoPath))
-                        let machO = try MachO(reader: reader)
-                        let slices = try machO.slices()
-                        #expect(slices.count > 0, "Framework binary contains no slices '\(machoPath.str)'")
-                        for slice in slices {
-                            // Check that the merged binary is reexporting the mergeable frameworks.
-                            let linkedLibraries = try slice.linkedLibraries()
-                            for libraryName in ["FwkTarget1", "FwkTarget2"] {
-                                let foundLibraries = linkedLibraries.filter { (pathStr: String, linkageType: MachO.Slice.LinkageType) in
-                                    Path(pathStr).basename == libraryName
-                                }
-                                if let library = foundLibraries.first {
-                                    #expect(library.linkageType == .reexport)
-                                }
-                                else {
-                                    Issue.record("Could not find load command for reexported framework '\(libraryName)")
+                            // Check the merged binary.
+                            let reader = try BinaryReader(data: tester.fs.read(machoPath))
+                            let machO = try MachO(reader: reader)
+                            let slices = try machO.slices()
+                            #expect(slices.count > 0, "Framework binary contains no slices '\(machoPath.str)'")
+                            for slice in slices {
+                                // Check that the merged binary is reexporting the mergeable frameworks.
+                                let linkedLibraries = try slice.linkedLibraries()
+                                for libraryName in ["FwkTarget1", "FwkTarget2"] {
+                                    let foundLibraries = linkedLibraries.filter { (pathStr: String, linkageType: MachO.Slice.LinkageType) in
+                                        Path(pathStr).basename == libraryName
+                                    }
+                                    if let library = foundLibraries.first {
+                                        #expect(library.linkageType == .reexport)
+                                    } else {
+                                        Issue.record("Could not find load command for reexported framework '\(libraryName)")
+                                    }
                                 }
+
+                                // Check that the merged binary has an rpath into ReexportedBinaries.
+                                let expectedRpath = "@loader_path/\(reexportedBinariesDirectoryName)"
+                                let foundRpath = (try slice.rpaths().first(where: { $0 == expectedRpath }) != nil)
+                                #expect(foundRpath, "Could not find rpath '\(expectedRpath)'")
                             }
 
-                            // Check that the merged binary has an rpath into ReexportedBinaries.
-                            let expectedRpath = "@loader_path/\(reexportedBinariesDirectoryName)"
-                            let foundRpath = (try slice.rpaths().first(where: { $0 == expectedRpath }) != nil)
-                            #expect(foundRpath, "Could not find rpath '\(expectedRpath)'")
+                            // Check that the symbols from the mergeable frameworks are *not* present.
+                            try await checkForSymbols(in: machoPath, symbolPatterns: ["FwkTarget1.+ClassOne.+label.+UILabel", "FwkTarget2.+ClassTwo.+label.+UILabel"], expected: false)
                         }
-
-                        // Check that the symbols from the mergeable frameworks are *not* present.
-                        try await checkForSymbols(in: machoPath, symbolPatterns: ["FwkTarget1.+ClassOne.+label.+UILabel", "FwkTarget2.+ClassTwo.+label.+UILabel"], expected: false)
-                    }
-#endif
+                    #endif
                 }
             }
 
@@ -389,16 +403,19 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
             do {
                 let buildType = "Release"
                 let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: tmpDirPath, for: buildType)
-                let parameters = BuildParameters(configuration: "Debug", overrides: [
-                    "SYMROOT": SYMROOT,
-                    "OBJROOT": OBJROOT,
-                    "DSTROOT": DSTROOT,
-                    "DEPLOYMENT_POSTPROCESSING": "YES",
-                    "DEPLOYMENT_LOCATION": "YES",
-                    "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
-                    "GCC_OPTIMIZATION_LEVEL": "s",
-                    "SWIFT_OPTIMIZATION_LEVEL": "-O",
-                ])
+                let parameters = BuildParameters(
+                    configuration: "Debug",
+                    overrides: [
+                        "SYMROOT": SYMROOT,
+                        "OBJROOT": OBJROOT,
+                        "DSTROOT": DSTROOT,
+                        "DEPLOYMENT_POSTPROCESSING": "YES",
+                        "DEPLOYMENT_LOCATION": "YES",
+                        "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
+                        "GCC_OPTIMIZATION_LEVEL": "s",
+                        "SWIFT_OPTIMIZATION_LEVEL": "-O",
+                    ]
+                )
                 let targets = tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
                 let request = BuildRequest(parameters: parameters, buildTargets: targets, continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
                 try await tester.checkBuild(buildType, parameters: parameters, runDestination: .iOS, buildRequest: request, persistent: true, signableTargets: signableTargets) { results in
@@ -483,54 +500,54 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
 
                     results.checkNoTask()
 
-#if canImport(Darwin)
-                    // Examine that the contents on disk have the expected properties.
-                    // First, check that the mergeable frameworks in the SYMROOT were built as mergeable.
-                    // Second, check that the mergeable frameworks in the product don't contain their binaries.
-                    for fwkTargetName in ["FwkTarget1", "FwkTarget2"] {
-                        // Mergeable
-                        do {
-                            let fwkPath = Path("\(OBJROOT)/UninstalledProducts/iphoneos/\(fwkTargetName).framework")
-                            #expect(tester.fs.exists(fwkPath), "Could not find framework '\(fwkPath.str)'")
-                            let machoPath = fwkPath.join(fwkTargetName)
-
-                            try checkForMergeableMetadata(in: machoPath, fs: tester.fs, expected: true, reason: "it should have been built mergeable")
-                        }
+                    #if canImport(Darwin)
+                        // Examine that the contents on disk have the expected properties.
+                        // First, check that the mergeable frameworks in the SYMROOT were built as mergeable.
+                        // Second, check that the mergeable frameworks in the product don't contain their binaries.
+                        for fwkTargetName in ["FwkTarget1", "FwkTarget2"] {
+                            // Mergeable
+                            do {
+                                let fwkPath = Path("\(OBJROOT)/UninstalledProducts/iphoneos/\(fwkTargetName).framework")
+                                #expect(tester.fs.exists(fwkPath), "Could not find framework '\(fwkPath.str)'")
+                                let machoPath = fwkPath.join(fwkTargetName)
 
-                        // Lacking binary
-                        do {
-                            let fwkPath = Path("\(DSTROOT)/Applications/AppTarget.app/Frameworks/\(fwkTargetName).framework")
-                            #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
-                            let machoPath = fwkPath.join(fwkTargetName)
-                            if useAppStoreCodelessFrameworksWorkaround {
-                                #expect(tester.fs.exists(machoPath), "Missing framework binary '\(machoPath.str)'")
+                                try checkForMergeableMetadata(in: machoPath, fs: tester.fs, expected: true, reason: "it should have been built mergeable")
+                            }
 
-                                // The binary should be an iOS dylib
-                                let macho = try MachO(reader: BinaryReader(data: tester.fs.read(machoPath)))
-                                let (slices, linkage) = try macho.slicesIncludingLinkage()
-                                #expect(try slices.flatMap { try $0.buildVersions().map(\.platform) }.only == .iOS)
-                                #expect(linkage == .macho(.dylib))
-                            } else {
-                                #expect(!tester.fs.exists(machoPath), "Found unexpected framework binary '\(machoPath.str)'")
+                            // Lacking binary
+                            do {
+                                let fwkPath = Path("\(DSTROOT)/Applications/AppTarget.app/Frameworks/\(fwkTargetName).framework")
+                                #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
+                                let machoPath = fwkPath.join(fwkTargetName)
+                                if useAppStoreCodelessFrameworksWorkaround {
+                                    #expect(tester.fs.exists(machoPath), "Missing framework binary '\(machoPath.str)'")
+
+                                    // The binary should be an iOS dylib
+                                    let macho = try MachO(reader: BinaryReader(data: tester.fs.read(machoPath)))
+                                    let (slices, linkage) = try macho.slicesIncludingLinkage()
+                                    #expect(try slices.flatMap { try $0.buildVersions().map(\.platform) }.only == .iOS)
+                                    #expect(linkage == .macho(.dylib))
+                                } else {
+                                    #expect(!tester.fs.exists(machoPath), "Found unexpected framework binary '\(machoPath.str)'")
+                                }
                             }
                         }
-                    }
 
-                    // Finally, check that the merged library contains the symbols from the mergeable libraries.
-                    do {
-                        let targetName = "MergedFwkTarget"
-                        let fwkPath = Path("\(OBJROOT)/UninstalledProducts/iphoneos/\(targetName).framework")
-                        #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
-                        let machoPath = fwkPath.join(targetName)
-                        #expect(tester.fs.exists(machoPath), "Could not find framework binary '\(machoPath.str)'")
+                        // Finally, check that the merged library contains the symbols from the mergeable libraries.
+                        do {
+                            let targetName = "MergedFwkTarget"
+                            let fwkPath = Path("\(OBJROOT)/UninstalledProducts/iphoneos/\(targetName).framework")
+                            #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
+                            let machoPath = fwkPath.join(targetName)
+                            #expect(tester.fs.exists(machoPath), "Could not find framework binary '\(machoPath.str)'")
 
-                        // Check that the merged framework is *not* linking the mergeable frameworks.
-                        try checkForLinkedLibraries(in: machoPath, libraryNames: ["FwkTarget1", "FwkTarget2"], fs: tester.fs, expected: false)
+                            // Check that the merged framework is *not* linking the mergeable frameworks.
+                            try checkForLinkedLibraries(in: machoPath, libraryNames: ["FwkTarget1", "FwkTarget2"], fs: tester.fs, expected: false)
 
-                        // Check that the symbols from the mergeable frameworks are present, meaning that they were merged in.
-                        try await checkForSymbols(in: machoPath, symbolPatterns: ["T.+FwkTarget1.+ClassOne.+label.+UILabel.+", "T.+FwkTarget2.+ClassTwo.+label.+UILabel.+"], expected: true)
-                    }
-#endif
+                            // Check that the symbols from the mergeable frameworks are present, meaning that they were merged in.
+                            try await checkForSymbols(in: machoPath, symbolPatterns: ["T.+FwkTarget1.+ClassOne.+label.+UILabel.+", "T.+FwkTarget2.+ClassTwo.+label.+UILabel.+"], expected: true)
+                        }
+                    #endif
                 }
             }
         }
@@ -552,37 +569,42 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                     TestProject(
                         "AppProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
-                                TestFile("Application.swift"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Config",
-                            buildSettings: [
-                                "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "COPY_PHASE_STRIP": "NO",
-                                "CODE_SIGN_IDENTITY": "-",
-                                "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES",
-                                "GCC_OPTIMIZATION_LEVEL": "0",
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "INSTALL_PATH": "",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SDKROOT": "iphoneos",
-                                "SWIFT_INSTALL_OBJC_HEADER": "NO",
-                                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                                "SWIFT_VERSION": swiftVersion,
-                                "TAPI_EXEC": tapiToolPath.str,
-                                "LIBTOOL": libtoolPath.str,
-
-                                // Force file attribute changes off by default.
-                                "INSTALL_OWNER": "",
-                                "INSTALL_GROUP": "",
-                                "INSTALL_MODE_FLAG": "",
-                                "SDK_STAT_CACHE_ENABLE": "NO",
-                                "ASSETCATALOG_COMPILER_SKIP_APP_STORE_DEPLOYMENT": useAppStoreCodelessFrameworksWorkaround ? "NO" : "YES",
-                                "SKIP_EMBEDDED_FRAMEWORKS_VALIDATION": "YES",
-                            ])
+                            "Sources",
+                            path: "Sources",
+                            children: [
+                                TestFile("Application.swift")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Config",
+                                buildSettings: [
+                                    "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "COPY_PHASE_STRIP": "NO",
+                                    "CODE_SIGN_IDENTITY": "-",
+                                    "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES",
+                                    "GCC_OPTIMIZATION_LEVEL": "0",
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "INSTALL_PATH": "",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SDKROOT": "iphoneos",
+                                    "SWIFT_INSTALL_OBJC_HEADER": "NO",
+                                    "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "TAPI_EXEC": tapiToolPath.str,
+                                    "LIBTOOL": libtoolPath.str,
+
+                                    // Force file attribute changes off by default.
+                                    "INSTALL_OWNER": "",
+                                    "INSTALL_GROUP": "",
+                                    "INSTALL_MODE_FLAG": "",
+                                    "SDK_STAT_CACHE_ENABLE": "NO",
+                                    "ASSETCATALOG_COMPILER_SKIP_APP_STORE_DEPLOYMENT": useAppStoreCodelessFrameworksWorkaround ? "NO" : "YES",
+                                    "SKIP_EMBEDDED_FRAMEWORKS_VALIDATION": "YES",
+                                ]
+                            )
                         ],
                         targets: [
                             // App target
@@ -590,86 +612,99 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                                 "AppTarget",
                                 type: .application,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Config",
-                                                           buildSettings: [
-                                                            "INSTALL_PATH": "/Applications",
-                                                            "MERGED_BINARY_TYPE": "manual",
-                                                           ]),
+                                    TestBuildConfiguration(
+                                        "Config",
+                                        buildSettings: [
+                                            "INSTALL_PATH": "/Applications",
+                                            "MERGED_BINARY_TYPE": "manual",
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "Application.swift",
+                                        "Application.swift"
                                     ]),
                                     // FIXME: rdar://119275052 This is not quite right: These references should go through a project reference, but the test infrastructure doesn't support project references. Instead we take advantage of rdar://119010301 which will create a product reference even though the producing target is in another project.
                                     TestFrameworksBuildPhase([
-                                        "FwkTarget.framework",
+                                        "FwkTarget.framework"
                                     ]),
                                     // Embed
-                                    TestCopyFilesBuildPhase([
-                                        TestBuildFile("FwkTarget.framework", codeSignOnCopy: true),
-                                    ], destinationSubfolder: .frameworks, onlyForDeployment: false)
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            TestBuildFile("FwkTarget.framework", codeSignOnCopy: true)
+                                        ],
+                                        destinationSubfolder: .frameworks,
+                                        onlyForDeployment: false
+                                    ),
                                 ]
-                            ),
+                            )
                         ]
                     ),
                     TestProject(
                         "FwkProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
-                                TestFile("ClassOne.swift"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Config",
-                            buildSettings: [
-                                "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "COPY_PHASE_STRIP": "NO",
-                                "CODE_SIGN_IDENTITY": "-",
-                                "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES",
-                                "GCC_OPTIMIZATION_LEVEL": "0",
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "INSTALL_PATH": "",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SDKROOT": "iphoneos",
-                                "SWIFT_INSTALL_OBJC_HEADER": "NO",
-                                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                                "SWIFT_VERSION": swiftVersion,
-                                "TAPI_EXEC": tapiToolPath.str,
-                                "LIBTOOL": libtoolPath.str,
-
-                                // Force file attribute changes off by default.
-                                "INSTALL_OWNER": "",
-                                "INSTALL_GROUP": "",
-                                "INSTALL_MODE_FLAG": "",
-                                "SDK_STAT_CACHE_ENABLE": "NO",
-                            ])
+                            "Sources",
+                            path: "Sources",
+                            children: [
+                                TestFile("ClassOne.swift")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Config",
+                                buildSettings: [
+                                    "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "COPY_PHASE_STRIP": "NO",
+                                    "CODE_SIGN_IDENTITY": "-",
+                                    "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES",
+                                    "GCC_OPTIMIZATION_LEVEL": "0",
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "INSTALL_PATH": "",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SDKROOT": "iphoneos",
+                                    "SWIFT_INSTALL_OBJC_HEADER": "NO",
+                                    "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "TAPI_EXEC": tapiToolPath.str,
+                                    "LIBTOOL": libtoolPath.str,
+
+                                    // Force file attribute changes off by default.
+                                    "INSTALL_OWNER": "",
+                                    "INSTALL_GROUP": "",
+                                    "INSTALL_MODE_FLAG": "",
+                                    "SDK_STAT_CACHE_ENABLE": "NO",
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
                                 "FwkTarget",
                                 type: .framework,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Config",
-                                                           buildSettings: [
-                                                            "MERGEABLE_LIBRARY": "YES",
-                                                           ]),
+                                    TestBuildConfiguration(
+                                        "Config",
+                                        buildSettings: [
+                                            "MERGEABLE_LIBRARY": "YES"
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "ClassOne.swift",
-                                    ]),
-                                    TestFrameworksBuildPhase([
+                                        "ClassOne.swift"
                                     ]),
+                                    TestFrameworksBuildPhase([]),
                                 ]
-                            ),
+                            )
                         ]
                     ),
-                ])
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT_App = testWorkspace.sourceRoot.join("AppProject")
             let SRCROOT_Fwk = testWorkspace.sourceRoot.join("FwkProject")
-            let signableTargets: Set<String> = Set(tester.workspace.projects.flatMap({$0.targets}).map({ $0.name }))
+            let signableTargets: Set<String> = Set(tester.workspace.projects.flatMap({ $0.targets }).map({ $0.name }))
             let supportsMergeableDebugHook = try await linkerSupportsMergeableDebugHook()
 
             // Write the source files.
@@ -688,7 +723,7 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                 "Gate", "WriteAuxiliaryFile", "CreateBuildDirectory", "SymLink", "MkDir", "ProcessInfoPlistFile",
                 "ClangStatCache", "ExtractAppIntentsMetadata", "AppIntentsSSUTraining",
                 "SwiftDriver", "SwiftEmitModule", "SwiftDriver Compilation", "SwiftDriver Compilation Requirements", "SwiftMergeGeneratedHeaders",
-                "CopySwiftLibs","RegisterExecutionPolicyException", "RegisterWithLaunchServices", "Validate", "Touch",
+                "CopySwiftLibs", "RegisterExecutionPolicyException", "RegisterWithLaunchServices", "Validate", "Touch",
                 "SwiftExplicitDependencyCompileModuleFromInterface", "SwiftExplicitDependencyGeneratePcm", "ProcessSDKImports",
             ])
 
@@ -696,14 +731,17 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
             do {
                 let buildType = "Debug"
                 let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: tmpDirPath, for: buildType)
-                let parameters = BuildParameters(configuration: "Debug", overrides: [
-                    "SYMROOT": SYMROOT,
-                    "OBJROOT": OBJROOT,
-                    "DSTROOT": DSTROOT,
-                    "DEBUG_INFORMATION_FORMAT": "dwarf",        // No dSYM for debug builds
-                    "GCC_OPTIMIZATION_LEVEL": "0",
-                    "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                ])
+                let parameters = BuildParameters(
+                    configuration: "Debug",
+                    overrides: [
+                        "SYMROOT": SYMROOT,
+                        "OBJROOT": OBJROOT,
+                        "DSTROOT": DSTROOT,
+                        "DEBUG_INFORMATION_FORMAT": "dwarf",  // No dSYM for debug builds
+                        "GCC_OPTIMIZATION_LEVEL": "0",
+                        "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                    ]
+                )
                 let targets = tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
                 let request = BuildRequest(parameters: parameters, buildTargets: targets, continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
                 try await tester.checkBuild(buildType, parameters: parameters, runDestination: .iOS, buildRequest: request, persistent: true, signableTargets: signableTargets) { results in
@@ -765,88 +803,87 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                     results.checkNoTask(.matchRuleType("Strip"))
                     results.checkNoTask()
 
-#if canImport(Darwin)
-                    // Examine that the contents on disk have the expected properties.
-                    // First, check that the mergeable frameworks in the SYMROOT were *not* built as mergeable.
-                    // Second, check that the mergeable frameworks embedded in the app's Framework folder don't contain their binaries.
-                    // Third, check that the mergeable frameworks embedded in the app's ReexportedBinaries folder do contain their binaries.
-                    do {
-                        let fwkTargetName = "FwkTarget"
-                        // Reexported
+                    #if canImport(Darwin)
+                        // Examine that the contents on disk have the expected properties.
+                        // First, check that the mergeable frameworks in the SYMROOT were *not* built as mergeable.
+                        // Second, check that the mergeable frameworks embedded in the app's Framework folder don't contain their binaries.
+                        // Third, check that the mergeable frameworks embedded in the app's ReexportedBinaries folder do contain their binaries.
                         do {
-                            let fwkPath = Path("\(SYMROOT)/Config-iphoneos/\(fwkTargetName).framework")
-                            #expect(tester.fs.exists(fwkPath), "Could not find framework '\(fwkPath.str)'")
-                            let machoPath = fwkPath.join(fwkTargetName)
-                            #expect(tester.fs.exists(machoPath), "Could not find framework binary '\(machoPath.str)'")
-
-                            try checkForMergeableMetadata(in: machoPath, fs: tester.fs, expected: false, reason: "it should not have been built mergeable")
-                        }
+                            let fwkTargetName = "FwkTarget"
+                            // Reexported
+                            do {
+                                let fwkPath = Path("\(SYMROOT)/Config-iphoneos/\(fwkTargetName).framework")
+                                #expect(tester.fs.exists(fwkPath), "Could not find framework '\(fwkPath.str)'")
+                                let machoPath = fwkPath.join(fwkTargetName)
+                                #expect(tester.fs.exists(machoPath), "Could not find framework binary '\(machoPath.str)'")
+
+                                try checkForMergeableMetadata(in: machoPath, fs: tester.fs, expected: false, reason: "it should not have been built mergeable")
+                            }
 
-                        // Lacking binary in app's Frameworks folder.
-                        do {
-                            let fwkPath = Path("\(SYMROOT)/Config-iphoneos/AppTarget.app/Frameworks/\(fwkTargetName).framework")
-                            #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
-                            let machoPath = fwkPath.join(fwkTargetName)
-                            if useAppStoreCodelessFrameworksWorkaround {
-                                #expect(tester.fs.exists(machoPath), "Missing framework binary '\(machoPath.str)'")
+                            // Lacking binary in app's Frameworks folder.
+                            do {
+                                let fwkPath = Path("\(SYMROOT)/Config-iphoneos/AppTarget.app/Frameworks/\(fwkTargetName).framework")
+                                #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
+                                let machoPath = fwkPath.join(fwkTargetName)
+                                if useAppStoreCodelessFrameworksWorkaround {
+                                    #expect(tester.fs.exists(machoPath), "Missing framework binary '\(machoPath.str)'")
+
+                                    // The binary should be an iOS dylib
+                                    let macho = try MachO(reader: BinaryReader(data: tester.fs.read(machoPath)))
+                                    let (slices, linkage) = try macho.slicesIncludingLinkage()
+                                    #expect(try slices.flatMap { try $0.buildVersions().map(\.platform) }.only == .iOS)
+                                    #expect(linkage == .macho(.dylib))
+                                } else {
+                                    #expect(!tester.fs.exists(machoPath), "Found unexpected framework binary '\(machoPath.str)'")
+                                }
+                            }
 
-                                // The binary should be an iOS dylib
-                                let macho = try MachO(reader: BinaryReader(data: tester.fs.read(machoPath)))
-                                let (slices, linkage) = try macho.slicesIncludingLinkage()
-                                #expect(try slices.flatMap { try $0.buildVersions().map(\.platform) }.only == .iOS)
-                                #expect(linkage == .macho(.dylib))
-                            } else {
-                                #expect(!tester.fs.exists(machoPath), "Found unexpected framework binary '\(machoPath.str)'")
+                            // Including binary in app's ReexportedBinaries folder.
+                            do {
+                                let fwkPath = Path("\(SYMROOT)/Config-iphoneos/AppTarget.app/\(reexportedBinariesDirectoryName)/\(fwkTargetName).framework")
+                                #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
+                                let machoPath = fwkPath.join(fwkTargetName)
+                                #expect(tester.fs.exists(machoPath), "Could not find binary '\(machoPath.str)'")
                             }
                         }
 
-                        // Including binary in app's ReexportedBinaries folder.
+                        // Second, check the contents of the app binary for expected characteristics.
+                        // Check that the merged app binary contains the symbols from the mergeable libraries.
                         do {
-                            let fwkPath = Path("\(SYMROOT)/Config-iphoneos/AppTarget.app/\(reexportedBinariesDirectoryName)/\(fwkTargetName).framework")
-                            #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
-                            let machoPath = fwkPath.join(fwkTargetName)
-                            #expect(tester.fs.exists(machoPath), "Could not find binary '\(machoPath.str)'")
-                        }
-                    }
+                            let targetName = "AppTarget"
+                            let fwkTargetName = "FwkTarget"
+                            let appPath = Path("\(SYMROOT)/Config-iphoneos/\(targetName).app")
+                            #expect(tester.fs.isDirectory(appPath), "Could not find app '\(appPath.str)'")
+                            let machoPath = appPath.join(targetName)
+                            #expect(tester.fs.exists(machoPath), "Could not find app binary '\(machoPath.str)'")
+
+                            // Check the app binary.
+                            let reader = try BinaryReader(data: tester.fs.read(machoPath))
+                            let machO = try MachO(reader: reader)
+                            let slices = try machO.slices()
+                            #expect(slices.count > 0, "Framework binary contains no slices '\(machoPath.str)'")
+                            for slice in slices {
+                                // Check that the app binary is reexporting the mergeable frameworks.
+                                let linkedLibraries = try slice.linkedLibraries()
+                                let foundLibraries = linkedLibraries.filter { (pathStr: String, linkageType: MachO.Slice.LinkageType) in
+                                    Path(pathStr).basename == fwkTargetName
+                                }
+                                if let library = foundLibraries.first {
+                                    #expect(library.linkageType == .reexport)
+                                } else {
+                                    Issue.record("Could not find load command for reexported framework '\(fwkTargetName)")
+                                }
 
-                    // Second, check the contents of the app binary for expected characteristics.
-                    // Check that the merged app binary contains the symbols from the mergeable libraries.
-                    do {
-                        let targetName = "AppTarget"
-                        let fwkTargetName = "FwkTarget"
-                        let appPath = Path("\(SYMROOT)/Config-iphoneos/\(targetName).app")
-                        #expect(tester.fs.isDirectory(appPath), "Could not find app '\(appPath.str)'")
-                        let machoPath = appPath.join(targetName)
-                        #expect(tester.fs.exists(machoPath), "Could not find app binary '\(machoPath.str)'")
-
-                        // Check the app binary.
-                        let reader = try BinaryReader(data: tester.fs.read(machoPath))
-                        let machO = try MachO(reader: reader)
-                        let slices = try machO.slices()
-                        #expect(slices.count > 0, "Framework binary contains no slices '\(machoPath.str)'")
-                        for slice in slices {
-                            // Check that the app binary is reexporting the mergeable frameworks.
-                            let linkedLibraries = try slice.linkedLibraries()
-                            let foundLibraries = linkedLibraries.filter { (pathStr: String, linkageType: MachO.Slice.LinkageType) in
-                                Path(pathStr).basename == fwkTargetName
-                            }
-                            if let library = foundLibraries.first {
-                                #expect(library.linkageType == .reexport)
-                            }
-                            else {
-                                Issue.record("Could not find load command for reexported framework '\(fwkTargetName)")
+                                // Check that the merged binary has an rpath into ReexportedBinaries.
+                                let expectedRpath = "@loader_path/\(reexportedBinariesDirectoryName)"
+                                let foundRpath = (try slice.rpaths().first(where: { $0 == expectedRpath }) != nil)
+                                #expect(foundRpath, "Could not find rpath '\(expectedRpath)'")
                             }
 
-                            // Check that the merged binary has an rpath into ReexportedBinaries.
-                            let expectedRpath = "@loader_path/\(reexportedBinariesDirectoryName)"
-                            let foundRpath = (try slice.rpaths().first(where: { $0 == expectedRpath }) != nil)
-                            #expect(foundRpath, "Could not find rpath '\(expectedRpath)'")
+                            // Check that the symbols from the mergeable frameworks are *not* present.
+                            try await checkForSymbols(in: machoPath, symbolPatterns: ["FwkTarget.+ClassOne.+label.+UILabel"], expected: false)
                         }
-
-                        // Check that the symbols from the mergeable frameworks are *not* present.
-                        try await checkForSymbols(in: machoPath, symbolPatterns: ["FwkTarget.+ClassOne.+label.+UILabel"], expected: false)
-                    }
-#endif
+                    #endif
                 }
             }
 
@@ -854,17 +891,20 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
             do {
                 let buildType = "Release"
                 let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: tmpDirPath, for: buildType)
-                let parameters = BuildParameters(configuration: "Config", overrides: [
-                    "SYMROOT": SYMROOT,
-                    "OBJROOT": OBJROOT,
-                    "DSTROOT": DSTROOT,
-                    "DEPLOYMENT_POSTPROCESSING": "YES",
-                    "DEPLOYMENT_LOCATION": "YES",
-                    "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
-                    "GCC_OPTIMIZATION_LEVEL": "s",
-                    "SWIFT_OPTIMIZATION_LEVEL": "-O",
-                    "STRIP_STYLE": "debugging",                    // So we can examine the merged binary to confirm that merging happened
-                ])
+                let parameters = BuildParameters(
+                    configuration: "Config",
+                    overrides: [
+                        "SYMROOT": SYMROOT,
+                        "OBJROOT": OBJROOT,
+                        "DSTROOT": DSTROOT,
+                        "DEPLOYMENT_POSTPROCESSING": "YES",
+                        "DEPLOYMENT_LOCATION": "YES",
+                        "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
+                        "GCC_OPTIMIZATION_LEVEL": "s",
+                        "SWIFT_OPTIMIZATION_LEVEL": "-O",
+                        "STRIP_STYLE": "debugging",  // So we can examine the merged binary to confirm that merging happened
+                    ]
+                )
                 let targets = tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
                 let request = BuildRequest(parameters: parameters, buildTargets: targets, continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
                 try await tester.checkBuild(buildType, parameters: parameters, runDestination: .iOS, buildRequest: request, persistent: true, signableTargets: signableTargets) { results in
@@ -925,42 +965,42 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
 
                     results.checkNoTask()
 
-#if canImport(Darwin)
-                    // Check that the mergeable framework in the product doesn't contain its binary.
-                    do {
-                        let fwkTargetName = "FwkTarget"
-                        let fwkPath = Path("\(DSTROOT)/Applications/AppTarget.app/Frameworks/\(fwkTargetName).framework")
-                        #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
-                        let machoPath = fwkPath.join(fwkTargetName)
-                        if useAppStoreCodelessFrameworksWorkaround {
-                            #expect(tester.fs.exists(machoPath), "Missing framework binary '\(machoPath.str)'")
+                    #if canImport(Darwin)
+                        // Check that the mergeable framework in the product doesn't contain its binary.
+                        do {
+                            let fwkTargetName = "FwkTarget"
+                            let fwkPath = Path("\(DSTROOT)/Applications/AppTarget.app/Frameworks/\(fwkTargetName).framework")
+                            #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
+                            let machoPath = fwkPath.join(fwkTargetName)
+                            if useAppStoreCodelessFrameworksWorkaround {
+                                #expect(tester.fs.exists(machoPath), "Missing framework binary '\(machoPath.str)'")
 
-                            // The binary should be an iOS dylib
-                            let macho = try MachO(reader: BinaryReader(data: tester.fs.read(machoPath)))
-                            let (slices, linkage) = try macho.slicesIncludingLinkage()
-                            #expect(try slices.flatMap { try $0.buildVersions().map(\.platform) }.only == .iOS)
-                            #expect(linkage == .macho(.dylib))
-                        } else {
-                            #expect(!tester.fs.exists(machoPath), "Found unexpected framework binary '\(machoPath.str)'")
+                                // The binary should be an iOS dylib
+                                let macho = try MachO(reader: BinaryReader(data: tester.fs.read(machoPath)))
+                                let (slices, linkage) = try macho.slicesIncludingLinkage()
+                                #expect(try slices.flatMap { try $0.buildVersions().map(\.platform) }.only == .iOS)
+                                #expect(linkage == .macho(.dylib))
+                            } else {
+                                #expect(!tester.fs.exists(machoPath), "Found unexpected framework binary '\(machoPath.str)'")
+                            }
                         }
-                    }
-
-                    // Check that the merged app binary contains the symbols from the mergeable libraries.
-                    do {
-                        let targetName = "AppTarget"
-                        let fwkTargetName = "FwkTarget"
-                        let appPath = Path("\(DSTROOT)/Applications/\(targetName).app")
-                        #expect(tester.fs.isDirectory(appPath), "Could not find app '\(appPath.str)'")
-                        let machoPath = appPath.join(targetName)
-                        #expect(tester.fs.exists(machoPath), "Could not find app binary '\(machoPath.str)'")
-
-                        // Check that the merged framework is *not* linking the mergeable framework.
-                        try checkForLinkedLibraries(in: machoPath, libraryNames: [fwkTargetName], fs: tester.fs, expected: false)
 
-                        // Check that the symbols from the mergeable framework are present, meaning that they were merged in.
-                        try await checkForSymbols(in: machoPath, symbolPatterns: ["T.+FwkTarget.+ClassOne.+label.+UILabel.+"], expected: true)
-                    }
-#endif
+                        // Check that the merged app binary contains the symbols from the mergeable libraries.
+                        do {
+                            let targetName = "AppTarget"
+                            let fwkTargetName = "FwkTarget"
+                            let appPath = Path("\(DSTROOT)/Applications/\(targetName).app")
+                            #expect(tester.fs.isDirectory(appPath), "Could not find app '\(appPath.str)'")
+                            let machoPath = appPath.join(targetName)
+                            #expect(tester.fs.exists(machoPath), "Could not find app binary '\(machoPath.str)'")
+
+                            // Check that the merged framework is *not* linking the mergeable framework.
+                            try checkForLinkedLibraries(in: machoPath, libraryNames: [fwkTargetName], fs: tester.fs, expected: false)
+
+                            // Check that the symbols from the mergeable framework are present, meaning that they were merged in.
+                            try await checkForSymbols(in: machoPath, symbolPatterns: ["T.+FwkTarget.+ClassOne.+label.+UILabel.+"], expected: true)
+                        }
+                    #endif
                 }
             }
         }
@@ -1015,44 +1055,49 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
+                            "Sources",
+                            path: "Sources",
+                            children: [
                                 // App sources
                                 TestFile("Application.swift"),
 
                                 // XCFrameworks
                                 TestFile("Framework.xcframework"),
                                 TestFile("Library.xcframework"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            CONFIGURATION,
-                            buildSettings: [
-                                "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "COPY_PHASE_STRIP": "NO",
-                                "CODE_SIGN_IDENTITY": "-",
-                                "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES",
-                                "GCC_OPTIMIZATION_LEVEL": "0",
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "INSTALL_PATH": "",
-                                "APP_MERGE_LINKED_LIBRARIES": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SDKROOT": "iphoneos",
-                                "STRIP_STYLE": "debugging",                                     // So we can examine whether the app ends up with symbols from the merged libraries
-                                "SWIFT_INSTALL_OBJC_HEADER": "NO",
-                                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                                "SWIFT_VERSION": swiftVersion,
-                                "TAPI_EXEC": tapiToolPath.str,
-                                "LIBTOOL": libtoolPath.str,
-
-                                // Force file attribute changes off by default.
-                                "INSTALL_OWNER": "",
-                                "INSTALL_GROUP": "",
-                                "INSTALL_MODE_FLAG": "",
-                                "SDK_STAT_CACHE_ENABLE": "NO",
-
-                                "ASSETCATALOG_COMPILER_SKIP_APP_STORE_DEPLOYMENT": useAppStoreCodelessFrameworksWorkaround ? "NO" : "YES",
-                            ])
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                CONFIGURATION,
+                                buildSettings: [
+                                    "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "COPY_PHASE_STRIP": "NO",
+                                    "CODE_SIGN_IDENTITY": "-",
+                                    "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES",
+                                    "GCC_OPTIMIZATION_LEVEL": "0",
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "INSTALL_PATH": "",
+                                    "APP_MERGE_LINKED_LIBRARIES": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SDKROOT": "iphoneos",
+                                    "STRIP_STYLE": "debugging",  // So we can examine whether the app ends up with symbols from the merged libraries
+                                    "SWIFT_INSTALL_OBJC_HEADER": "NO",
+                                    "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "TAPI_EXEC": tapiToolPath.str,
+                                    "LIBTOOL": libtoolPath.str,
+
+                                    // Force file attribute changes off by default.
+                                    "INSTALL_OWNER": "",
+                                    "INSTALL_GROUP": "",
+                                    "INSTALL_MODE_FLAG": "",
+                                    "SDK_STAT_CACHE_ENABLE": "NO",
+
+                                    "ASSETCATALOG_COMPILER_SKIP_APP_STORE_DEPLOYMENT": useAppStoreCodelessFrameworksWorkaround ? "NO" : "YES",
+                                ]
+                            )
                         ],
                         targets: [
                             // App target
@@ -1060,31 +1105,38 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                                 "AppTarget",
                                 type: .application,
                                 buildConfigurations: [
-                                    TestBuildConfiguration(CONFIGURATION,
-                                                           buildSettings: [
-                                                            "INSTALL_PATH": "/Applications",
-                                                            "MERGE_LINKED_LIBRARIES": "$(APP_MERGE_LINKED_LIBRARIES)",      // Builds below can override APP_MERGE_LINKED_LIBRARIES to NO to disable merging.
-                                                            "SKIP_EMBEDDED_FRAMEWORKS_VALIDATION": "YES",
-                                                           ]),
+                                    TestBuildConfiguration(
+                                        CONFIGURATION,
+                                        buildSettings: [
+                                            "INSTALL_PATH": "/Applications",
+                                            "MERGE_LINKED_LIBRARIES": "$(APP_MERGE_LINKED_LIBRARIES)",  // Builds below can override APP_MERGE_LINKED_LIBRARIES to NO to disable merging.
+                                            "SKIP_EMBEDDED_FRAMEWORKS_VALIDATION": "YES",
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "Application.swift",
+                                        "Application.swift"
                                     ]),
                                     TestFrameworksBuildPhase([
                                         "Framework.xcframework",
                                         "Library.xcframework",
                                     ]),
                                     // Embed
-                                    TestCopyFilesBuildPhase([
-                                        TestBuildFile("Framework.xcframework", codeSignOnCopy: true),
-                                        TestBuildFile("Library.xcframework", codeSignOnCopy: true),
-                                    ], destinationSubfolder: .frameworks, onlyForDeployment: false)
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            TestBuildFile("Framework.xcframework", codeSignOnCopy: true),
+                                            TestBuildFile("Library.xcframework", codeSignOnCopy: true),
+                                        ],
+                                        destinationSubfolder: .frameworks,
+                                        onlyForDeployment: false
+                                    ),
                                 ]
-                            ),
+                            )
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOTpath = testWorkspace.sourceRoot.join("aProject")
             let SRCROOT = SRCROOTpath.str
@@ -1104,7 +1156,7 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                 "Gate", "WriteAuxiliaryFile", "CreateBuildDirectory", "SymLink", "MkDir", "ProcessInfoPlistFile",
                 "ClangStatCache", "ExtractAppIntentsMetadata", "AppIntentsSSUTraining",
                 "SwiftDriver", "SwiftEmitModule", "SwiftDriver Compilation", "SwiftDriver Compilation Requirements", "SwiftMergeGeneratedHeaders",
-                "CopySwiftLibs","RegisterExecutionPolicyException", "RegisterWithLaunchServices", "Validate", "Touch",
+                "CopySwiftLibs", "RegisterExecutionPolicyException", "RegisterWithLaunchServices", "Validate", "Touch",
                 "SwiftExplicitDependencyCompileModuleFromInterface", "SwiftExplicitDependencyGeneratePcm", "ProcessSDKImports",
             ])
 
@@ -1113,16 +1165,19 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                 let buildType = "Merge"
                 let runDestination = RunDestinationInfo.iOS
                 let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: tmpDirPath, for: buildType)
-                let parameters = BuildParameters(configuration: CONFIGURATION, overrides: [
-                    "SYMROOT": SYMROOT,
-                    "OBJROOT": OBJROOT,
-                    "DSTROOT": DSTROOT,
-                    "DEPLOYMENT_POSTPROCESSING": "YES",
-                    "DEPLOYMENT_LOCATION": "YES",
-                    "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
-                    "GCC_OPTIMIZATION_LEVEL": "s",
-                    "SWIFT_OPTIMIZATION_LEVEL": "-O",
-                ])
+                let parameters = BuildParameters(
+                    configuration: CONFIGURATION,
+                    overrides: [
+                        "SYMROOT": SYMROOT,
+                        "OBJROOT": OBJROOT,
+                        "DSTROOT": DSTROOT,
+                        "DEPLOYMENT_POSTPROCESSING": "YES",
+                        "DEPLOYMENT_LOCATION": "YES",
+                        "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
+                        "GCC_OPTIMIZATION_LEVEL": "s",
+                        "SWIFT_OPTIMIZATION_LEVEL": "-O",
+                    ]
+                )
                 let BUILT_PRODUCTS_DIR = "\(SYMROOT)/\(CONFIGURATION)" + (runDestination != .macOS ? "-\(runDestination.platform)" : "")
                 let targets = tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
                 let request = BuildRequest(parameters: parameters, buildTargets: targets, continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
@@ -1148,12 +1203,14 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
 
                         // Check that we're merging the XCFrameworks.
                         results.checkTask(.matchTargetName(targetName), .matchRuleType("Ld")) { task in
-                            task.checkCommandLineContains([
-                                ["\(toolchain.path.str)/usr/bin/clang"],
-                                ["-Xlinker", "-merge_framework", "-Xlinker", "\(fwkBaseName)"],
-                                ["-Xlinker", "-merge-l\(libBaseName)"],
-                                ["-o", "\(DSTROOT)/Applications/\(targetName).app/\(targetName)"],
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["\(toolchain.path.str)/usr/bin/clang"],
+                                    ["-Xlinker", "-merge_framework", "-Xlinker", "\(fwkBaseName)"],
+                                    ["-Xlinker", "-merge-l\(libBaseName)"],
+                                    ["-o", "\(DSTROOT)/Applications/\(targetName).app/\(targetName)"],
+                                ].reduce([], +)
+                            )
                         }
 
                         // Check that we're excluding the binary when embedding the framework, and not embedding the library at all.
@@ -1183,40 +1240,40 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
 
                     results.checkNoTask()
 
-#if canImport(Darwin)
-                    // Check that the mergeable framework in the product doesn't contain its binary.
-                    do {
-                        let fwkPath = Path("\(DSTROOT)/Applications/AppTarget.app/Frameworks/\(fwkBaseName).framework")
-                        #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
-                        let machoPath = fwkPath.join(fwkBaseName)
-                        if useAppStoreCodelessFrameworksWorkaround {
-                            #expect(tester.fs.exists(machoPath), "Missing framework binary '\(machoPath.str)'")
+                    #if canImport(Darwin)
+                        // Check that the mergeable framework in the product doesn't contain its binary.
+                        do {
+                            let fwkPath = Path("\(DSTROOT)/Applications/AppTarget.app/Frameworks/\(fwkBaseName).framework")
+                            #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
+                            let machoPath = fwkPath.join(fwkBaseName)
+                            if useAppStoreCodelessFrameworksWorkaround {
+                                #expect(tester.fs.exists(machoPath), "Missing framework binary '\(machoPath.str)'")
 
-                            // The binary should be an iOS dylib
-                            let macho = try MachO(reader: BinaryReader(data: tester.fs.read(machoPath)))
-                            let (slices, linkage) = try macho.slicesIncludingLinkage()
-                            #expect(try slices.flatMap { try $0.buildVersions().map(\.platform) }.only == .iOS)
-                            #expect(linkage == .macho(.dylib))
-                        } else {
-                            #expect(!tester.fs.exists(machoPath), "Found unexpected framework binary '\(machoPath.str)'")
+                                // The binary should be an iOS dylib
+                                let macho = try MachO(reader: BinaryReader(data: tester.fs.read(machoPath)))
+                                let (slices, linkage) = try macho.slicesIncludingLinkage()
+                                #expect(try slices.flatMap { try $0.buildVersions().map(\.platform) }.only == .iOS)
+                                #expect(linkage == .macho(.dylib))
+                            } else {
+                                #expect(!tester.fs.exists(machoPath), "Found unexpected framework binary '\(machoPath.str)'")
+                            }
                         }
-                    }
 
-                    // Check that the merged app binary contains the symbols from the mergeable libraries.
-                    do {
-                        let targetName = "AppTarget"
-                        let appPath = Path("\(DSTROOT)/Applications/\(targetName).app")
-                        #expect(tester.fs.isDirectory(appPath), "Could not find app '\(appPath.str)'")
-                        let machoPath = appPath.join(targetName)
-                        #expect(tester.fs.exists(machoPath), "Could not find app binary '\(machoPath.str)'")
+                        // Check that the merged app binary contains the symbols from the mergeable libraries.
+                        do {
+                            let targetName = "AppTarget"
+                            let appPath = Path("\(DSTROOT)/Applications/\(targetName).app")
+                            #expect(tester.fs.isDirectory(appPath), "Could not find app '\(appPath.str)'")
+                            let machoPath = appPath.join(targetName)
+                            #expect(tester.fs.exists(machoPath), "Could not find app binary '\(machoPath.str)'")
 
-                        // Check that the merged framework is *not* linking the mergeable libraries.
-                        try checkForLinkedLibraries(in: machoPath, libraryNames: [fwkBaseName, libBaseName], fs: tester.fs, expected: false)
+                            // Check that the merged framework is *not* linking the mergeable libraries.
+                            try checkForLinkedLibraries(in: machoPath, libraryNames: [fwkBaseName, libBaseName], fs: tester.fs, expected: false)
 
-                        // Check that the symbols from the mergeable frameworks are present, meaning that they were merged in.
-                        try await checkForSymbols(in: machoPath, symbolPatterns: ["Framework.+ClassOne.+value", "Library.+ClassTwo.+value"], expected: true)
-                    }
-#endif
+                            // Check that the symbols from the mergeable frameworks are present, meaning that they were merged in.
+                            try await checkForSymbols(in: machoPath, symbolPatterns: ["Framework.+ClassOne.+value", "Library.+ClassTwo.+value"], expected: true)
+                        }
+                    #endif
                 }
             }
 
@@ -1225,17 +1282,20 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                 let buildType = "Link"
                 let runDestination = RunDestinationInfo.iOS
                 let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: tmpDirPath, for: buildType)
-                let parameters = BuildParameters(configuration: CONFIGURATION, overrides: [
-                    "SYMROOT": SYMROOT,
-                    "OBJROOT": OBJROOT,
-                    "DSTROOT": DSTROOT,
-                    "DEPLOYMENT_POSTPROCESSING": "YES",
-                    "DEPLOYMENT_LOCATION": "YES",
-                    "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
-                    "GCC_OPTIMIZATION_LEVEL": "s",
-                    "SWIFT_OPTIMIZATION_LEVEL": "-O",
-                    "APP_MERGE_LINKED_LIBRARIES": "NO",
-                ])
+                let parameters = BuildParameters(
+                    configuration: CONFIGURATION,
+                    overrides: [
+                        "SYMROOT": SYMROOT,
+                        "OBJROOT": OBJROOT,
+                        "DSTROOT": DSTROOT,
+                        "DEPLOYMENT_POSTPROCESSING": "YES",
+                        "DEPLOYMENT_LOCATION": "YES",
+                        "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
+                        "GCC_OPTIMIZATION_LEVEL": "s",
+                        "SWIFT_OPTIMIZATION_LEVEL": "-O",
+                        "APP_MERGE_LINKED_LIBRARIES": "NO",
+                    ]
+                )
                 let BUILT_PRODUCTS_DIR = "\(SYMROOT)/\(CONFIGURATION)" + (runDestination != .macOS ? "-\(runDestination.platform)" : "")
                 let targets = tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
                 let request = BuildRequest(parameters: parameters, buildTargets: targets, continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
@@ -1261,12 +1321,14 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
 
                         // Check that we're merging the XCFrameworks.
                         results.checkTask(.matchTargetName(targetName), .matchRuleType("Ld")) { task in
-                            task.checkCommandLineContains([
-                                ["\(toolchain.path.str)/usr/bin/clang"],
-                                ["-framework", "\(fwkBaseName)"],
-                                ["-l\(libBaseName)"],
-                                ["-o", "\(DSTROOT)/Applications/\(targetName).app/\(targetName)"],
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["\(toolchain.path.str)/usr/bin/clang"],
+                                    ["-framework", "\(fwkBaseName)"],
+                                    ["-l\(libBaseName)"],
+                                    ["-o", "\(DSTROOT)/Applications/\(targetName).app/\(targetName)"],
+                                ].reduce([], +)
+                            )
                             task.checkCommandLineDoesNotContain("-merge_framework")
                             task.checkCommandLineDoesNotContain("-merge-l\(libBaseName)")
                         }
@@ -1292,48 +1354,47 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
 
                     results.checkNoTask()
 
-#if canImport(Darwin)
-                    // Check that the mergeable framework in the app *does* contain its binary.
-                    do {
-                        let fwkPath = Path("\(DSTROOT)/Applications/AppTarget.app/Frameworks/\(fwkBaseName).framework")
-                        #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
-                        let machoPath = fwkPath.join(fwkBaseName)
-                        #expect(tester.fs.exists(machoPath), "Missing framework binary '\(machoPath.str)'")
+                    #if canImport(Darwin)
+                        // Check that the mergeable framework in the app *does* contain its binary.
+                        do {
+                            let fwkPath = Path("\(DSTROOT)/Applications/AppTarget.app/Frameworks/\(fwkBaseName).framework")
+                            #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
+                            let machoPath = fwkPath.join(fwkBaseName)
+                            #expect(tester.fs.exists(machoPath), "Missing framework binary '\(machoPath.str)'")
 
-                        // Check that its binary does not contain an LC_ATOM_INFO action as that should have been removed during embedding.
-                        try checkForMergeableMetadata(in: machoPath, fs: tester.fs, expected: false, reason: "it should have been removed during embedding")
-                    }
+                            // Check that its binary does not contain an LC_ATOM_INFO action as that should have been removed during embedding.
+                            try checkForMergeableMetadata(in: machoPath, fs: tester.fs, expected: false, reason: "it should have been removed during embedding")
+                        }
 
-                    // Check that the app does contain the library.
-                    do {
-                        let machoPath = Path("\(DSTROOT)/Applications/AppTarget.app/Frameworks/lib\(libBaseName).dylib")
-                        #expect(tester.fs.exists(machoPath), "Missing library '\(machoPath.str)'")
+                        // Check that the app does contain the library.
+                        do {
+                            let machoPath = Path("\(DSTROOT)/Applications/AppTarget.app/Frameworks/lib\(libBaseName).dylib")
+                            #expect(tester.fs.exists(machoPath), "Missing library '\(machoPath.str)'")
 
-                        // Check that it does not contain an LC_ATOM_INFO action as that should have been removed during embedding.
-                        try checkForMergeableMetadata(in: machoPath, fs: tester.fs, expected: false, reason: "it should have been removed during embedding")
-                    }
+                            // Check that it does not contain an LC_ATOM_INFO action as that should have been removed during embedding.
+                            try checkForMergeableMetadata(in: machoPath, fs: tester.fs, expected: false, reason: "it should have been removed during embedding")
+                        }
 
-                    // Check that the merged app binary does not contain the symbols from the mergeable libraries.
-                    do {
-                        let targetName = "AppTarget"
-                        let appPath = Path("\(DSTROOT)/Applications/\(targetName).app")
-                        #expect(tester.fs.isDirectory(appPath), "Could not find app '\(appPath.str)'")
-                        let machoPath = appPath.join(targetName)
-                        #expect(tester.fs.exists(machoPath), "Could not find app binary '\(machoPath.str)'")
+                        // Check that the merged app binary does not contain the symbols from the mergeable libraries.
+                        do {
+                            let targetName = "AppTarget"
+                            let appPath = Path("\(DSTROOT)/Applications/\(targetName).app")
+                            #expect(tester.fs.isDirectory(appPath), "Could not find app '\(appPath.str)'")
+                            let machoPath = appPath.join(targetName)
+                            #expect(tester.fs.exists(machoPath), "Could not find app binary '\(machoPath.str)'")
 
-                        // Check that the merged framework *is* linking the mergeable libraries.
-                        try checkForLinkedLibraries(in: machoPath, libraryNames: [fwkBaseName, libBaseName], fs: tester.fs, expected: true)
+                            // Check that the merged framework *is* linking the mergeable libraries.
+                            try checkForLinkedLibraries(in: machoPath, libraryNames: [fwkBaseName, libBaseName], fs: tester.fs, expected: true)
 
-                        // Check that the symbols from the mergeable frameworks are absent, because we didn't merge them.
-                        try await checkForSymbols(in: machoPath, symbolPatterns: ["Framework.+ClassOne.+value", "Library.+ClassTwo.+value"], expected: false)
-                    }
-#endif
+                            // Check that the symbols from the mergeable frameworks are absent, because we didn't merge them.
+                            try await checkForSymbols(in: machoPath, symbolPatterns: ["Framework.+ClassOne.+value", "Library.+ClassTwo.+value"], expected: false)
+                        }
+                    #endif
                 }
             }
         }
     }
 
-
     /// Test building an app with an intervening framework which is merging an XCFramework.
     @Test(.requireSDKs(.iOS))
     func usingMergeableXCFrameworkWithInterveningFramework() async throws {
@@ -1381,7 +1442,9 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
+                            "Sources",
+                            path: "Sources",
+                            children: [
                                 // App sources
                                 TestFile("Application.swift"),
 
@@ -1391,37 +1454,40 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                                 // XCFrameworks
                                 TestFile("Framework.xcframework"),
                                 TestFile("Library.xcframework"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            CONFIGURATION,
-                            buildSettings: [
-                                "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "COPY_PHASE_STRIP": "NO",
-                                "CODE_SIGN_IDENTITY": "-",
-                                "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES",
-                                "GCC_OPTIMIZATION_LEVEL": "0",
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "INSTALL_PATH": "",
-                                "APP_MERGE_LINKED_LIBRARIES": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SDKROOT": "iphoneos",
-                                "STRIP_STYLE": "debugging",                                     // So we can examine whether the app ends up with symbols from the merged libraries
-                                "SWIFT_INSTALL_OBJC_HEADER": "NO",
-                                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                                "SWIFT_VERSION": swiftVersion,
-                                "TAPI_EXEC": tapiToolPath.str,
-                                "LIBTOOL": libtoolPath.str,
-
-                                // Force file attribute changes off by default.
-                                "INSTALL_OWNER": "",
-                                "INSTALL_GROUP": "",
-                                "INSTALL_MODE_FLAG": "",
-                                "SDK_STAT_CACHE_ENABLE": "NO",
-
-                                "ASSETCATALOG_COMPILER_SKIP_APP_STORE_DEPLOYMENT": useAppStoreCodelessFrameworksWorkaround ? "NO" : "YES",
-                            ])
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                CONFIGURATION,
+                                buildSettings: [
+                                    "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "COPY_PHASE_STRIP": "NO",
+                                    "CODE_SIGN_IDENTITY": "-",
+                                    "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES",
+                                    "GCC_OPTIMIZATION_LEVEL": "0",
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "INSTALL_PATH": "",
+                                    "APP_MERGE_LINKED_LIBRARIES": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SDKROOT": "iphoneos",
+                                    "STRIP_STYLE": "debugging",  // So we can examine whether the app ends up with symbols from the merged libraries
+                                    "SWIFT_INSTALL_OBJC_HEADER": "NO",
+                                    "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "TAPI_EXEC": tapiToolPath.str,
+                                    "LIBTOOL": libtoolPath.str,
+
+                                    // Force file attribute changes off by default.
+                                    "INSTALL_OWNER": "",
+                                    "INSTALL_GROUP": "",
+                                    "INSTALL_MODE_FLAG": "",
+                                    "SDK_STAT_CACHE_ENABLE": "NO",
+
+                                    "ASSETCATALOG_COMPILER_SKIP_APP_STORE_DEPLOYMENT": useAppStoreCodelessFrameworksWorkaround ? "NO" : "YES",
+                                ]
+                            )
                         ],
                         targets: [
                             // App target
@@ -1429,25 +1495,31 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                                 "AppTarget",
                                 type: .application,
                                 buildConfigurations: [
-                                    TestBuildConfiguration(CONFIGURATION,
-                                                           buildSettings: [
-                                                            "INSTALL_PATH": "/Applications",
-                                                            "SKIP_EMBEDDED_FRAMEWORKS_VALIDATION": "YES",
-                                                           ]),
+                                    TestBuildConfiguration(
+                                        CONFIGURATION,
+                                        buildSettings: [
+                                            "INSTALL_PATH": "/Applications",
+                                            "SKIP_EMBEDDED_FRAMEWORKS_VALIDATION": "YES",
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "Application.swift",
+                                        "Application.swift"
                                     ]),
                                     TestFrameworksBuildPhase([
-                                        "MergedFwkTarget.framework",
+                                        "MergedFwkTarget.framework"
                                     ]),
                                     // Embed
-                                    TestCopyFilesBuildPhase([
-                                        TestBuildFile("MergedFwkTarget.framework", codeSignOnCopy: true),
-                                        TestBuildFile("Framework.xcframework", codeSignOnCopy: true),
-                                        TestBuildFile("Library.xcframework", codeSignOnCopy: true),
-                                    ], destinationSubfolder: .frameworks, onlyForDeployment: false)
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            TestBuildFile("MergedFwkTarget.framework", codeSignOnCopy: true),
+                                            TestBuildFile("Framework.xcframework", codeSignOnCopy: true),
+                                            TestBuildFile("Library.xcframework", codeSignOnCopy: true),
+                                        ],
+                                        destinationSubfolder: .frameworks,
+                                        onlyForDeployment: false
+                                    ),
                                 ]
                             ),
                             // Framework target
@@ -1455,15 +1527,17 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                                 "MergedFwkTarget",
                                 type: .framework,
                                 buildConfigurations: [
-                                    TestBuildConfiguration(CONFIGURATION,
-                                                           buildSettings: [
-                                                            "INSTALL_PATH": "",
-                                                            "MERGE_LINKED_LIBRARIES": "$(APP_MERGE_LINKED_LIBRARIES)",      // Builds below can override APP_MERGE_LINKED_LIBRARIES to NO to disable merging.
-                                                           ]),
+                                    TestBuildConfiguration(
+                                        CONFIGURATION,
+                                        buildSettings: [
+                                            "INSTALL_PATH": "",
+                                            "MERGE_LINKED_LIBRARIES": "$(APP_MERGE_LINKED_LIBRARIES)",  // Builds below can override APP_MERGE_LINKED_LIBRARIES to NO to disable merging.
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "ClassOne.swift",
+                                        "ClassOne.swift"
                                     ]),
                                     TestFrameworksBuildPhase([
                                         "Framework.xcframework",
@@ -1473,7 +1547,8 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                             ),
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOTpath = testWorkspace.sourceRoot.join("aProject")
             let SRCROOT = SRCROOTpath.str
@@ -1495,7 +1570,7 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                 "Gate", "WriteAuxiliaryFile", "CreateBuildDirectory", "SymLink", "MkDir", "ProcessInfoPlistFile",
                 "ClangStatCache", "ExtractAppIntentsMetadata", "AppIntentsSSUTraining",
                 "SwiftDriver", "SwiftEmitModule", "SwiftDriver Compilation", "SwiftDriver Compilation Requirements", "SwiftMergeGeneratedHeaders",
-                "CopySwiftLibs","RegisterExecutionPolicyException", "RegisterWithLaunchServices", "Validate", "Touch",
+                "CopySwiftLibs", "RegisterExecutionPolicyException", "RegisterWithLaunchServices", "Validate", "Touch",
                 "SwiftExplicitDependencyCompileModuleFromInterface", "SwiftExplicitDependencyGeneratePcm", "ProcessSDKImports",
             ])
 
@@ -1504,16 +1579,19 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
                 let buildType = "Merge"
                 let runDestination = RunDestinationInfo.iOS
                 let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: tmpDirPath, for: buildType)
-                let parameters = BuildParameters(configuration: CONFIGURATION, overrides: [
-                    "SYMROOT": SYMROOT,
-                    "OBJROOT": OBJROOT,
-                    "DSTROOT": DSTROOT,
-                    "DEPLOYMENT_POSTPROCESSING": "YES",
-                    "DEPLOYMENT_LOCATION": "YES",
-                    "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
-                    "GCC_OPTIMIZATION_LEVEL": "s",
-                    "SWIFT_OPTIMIZATION_LEVEL": "-O",
-                ])
+                let parameters = BuildParameters(
+                    configuration: CONFIGURATION,
+                    overrides: [
+                        "SYMROOT": SYMROOT,
+                        "OBJROOT": OBJROOT,
+                        "DSTROOT": DSTROOT,
+                        "DEPLOYMENT_POSTPROCESSING": "YES",
+                        "DEPLOYMENT_LOCATION": "YES",
+                        "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
+                        "GCC_OPTIMIZATION_LEVEL": "s",
+                        "SWIFT_OPTIMIZATION_LEVEL": "-O",
+                    ]
+                )
                 let BUILT_PRODUCTS_DIR = "\(SYMROOT)/\(CONFIGURATION)" + (runDestination != .macOS ? "-\(runDestination.platform)" : "")
                 let targets = tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
                 let request = BuildRequest(parameters: parameters, buildTargets: targets, continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
@@ -1595,49 +1673,47 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
 
                     results.checkNoTask()
 
-#if canImport(Darwin)
-                    // Check that the mergeable framework in the product doesn't contain its binary.
-                    do {
-                        let fwkPath = Path("\(DSTROOT)/Applications/AppTarget.app/Frameworks/\(fwkBaseName).framework")
-                        #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
-                        let machoPath = fwkPath.join(fwkBaseName)
-                        if useAppStoreCodelessFrameworksWorkaround {
-                            #expect(tester.fs.exists(machoPath), "Missing framework binary '\(machoPath.str)'")
+                    #if canImport(Darwin)
+                        // Check that the mergeable framework in the product doesn't contain its binary.
+                        do {
+                            let fwkPath = Path("\(DSTROOT)/Applications/AppTarget.app/Frameworks/\(fwkBaseName).framework")
+                            #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
+                            let machoPath = fwkPath.join(fwkBaseName)
+                            if useAppStoreCodelessFrameworksWorkaround {
+                                #expect(tester.fs.exists(machoPath), "Missing framework binary '\(machoPath.str)'")
 
-                            // The binary should be an iOS dylib
-                            let macho = try MachO(reader: BinaryReader(data: tester.fs.read(machoPath)))
-                            let (slices, linkage) = try macho.slicesIncludingLinkage()
-                            #expect(try slices.flatMap { try $0.buildVersions().map(\.platform) }.only == .iOS)
-                            #expect(linkage == .macho(.dylib))
-                        } else {
-                            #expect(!tester.fs.exists(machoPath), "Found unexpected framework binary '\(machoPath.str)'")
+                                // The binary should be an iOS dylib
+                                let macho = try MachO(reader: BinaryReader(data: tester.fs.read(machoPath)))
+                                let (slices, linkage) = try macho.slicesIncludingLinkage()
+                                #expect(try slices.flatMap { try $0.buildVersions().map(\.platform) }.only == .iOS)
+                                #expect(linkage == .macho(.dylib))
+                            } else {
+                                #expect(!tester.fs.exists(machoPath), "Found unexpected framework binary '\(machoPath.str)'")
+                            }
                         }
-                    }
 
-                    // Check that the merged framework binary contains the symbols from the mergeable libraries.
-                    do {
-                        let targetName = "MergedFwkTarget"
-                        let fwkPath = Path("\(OBJROOT)/UninstalledProducts/iphoneos/\(targetName).framework")
-                        #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
-                        let machoPath = fwkPath.join(targetName)
-                        #expect(tester.fs.exists(machoPath), "Could not find framework binary '\(machoPath.str)'")
+                        // Check that the merged framework binary contains the symbols from the mergeable libraries.
+                        do {
+                            let targetName = "MergedFwkTarget"
+                            let fwkPath = Path("\(OBJROOT)/UninstalledProducts/iphoneos/\(targetName).framework")
+                            #expect(tester.fs.isDirectory(fwkPath), "Could not find framework '\(fwkPath.str)'")
+                            let machoPath = fwkPath.join(targetName)
+                            #expect(tester.fs.exists(machoPath), "Could not find framework binary '\(machoPath.str)'")
 
-                        // Check that the merged framework is *not* linking the mergeable libraries.
-                        try checkForLinkedLibraries(in: machoPath, libraryNames: [fwkBaseName, libBaseName], fs: tester.fs, expected: false)
+                            // Check that the merged framework is *not* linking the mergeable libraries.
+                            try checkForLinkedLibraries(in: machoPath, libraryNames: [fwkBaseName, libBaseName], fs: tester.fs, expected: false)
 
-                        // Check that the symbols from the mergeable frameworks are present, meaning that they were merged in.
-                        try await checkForSymbols(in: machoPath, symbolPatterns: ["Framework.+ClassOne.+value", "Library.+ClassTwo.+value"], expected: true)
-                    }
-#endif
+                            // Check that the symbols from the mergeable frameworks are present, meaning that they were merged in.
+                            try await checkForSymbols(in: machoPath, symbolPatterns: ["Framework.+ClassOne.+value", "Library.+ClassTwo.+value"], expected: true)
+                        }
+                    #endif
                 }
             }
         }
     }
 
-
     // MARK: - Utility methods
 
-
     /// Utility method to try to be tolerant of Swift symbol mangling in the output of `nm`.
     /// - parameter symbolPatterns: A list of regular expression static strings to search for in the output.
     fileprivate func checkForSymbols(in machoPath: Path, symbolPatterns: [StaticString], expected: Bool, sourceLocation: SourceLocation = #_sourceLocation) async throws {
@@ -1647,8 +1723,7 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
             let foundLines = symbols.filter({ regex.firstMatch(in: String($0)) != nil })
             if expected {
                 #expect(foundLines.count == 1, "Couldn't find symbol matching /\(pattern)/ in '\(machoPath.str)'", sourceLocation: sourceLocation)
-            }
-            else {
+            } else {
                 #expect(foundLines.isEmpty, "Unexpectedly found symbol matching /\(pattern)/ in '\(machoPath.str)'", sourceLocation: sourceLocation)
             }
         }
@@ -1657,47 +1732,45 @@ fileprivate struct MergeableLibrariesBuildOperationTests: CoreBasedTests {
     /// Utility method to check whether a binary is or is not linking libraries of the given name. It does this by checking the slices of the binary to see if they are each linking all of the libraries.
     /// - parameter expected: If `true`, then emits a test failure if the library is not linked. If `false`, then emits a test failure if it is linked.
     fileprivate func checkForLinkedLibraries(in machoPath: Path, libraryNames: [String], fs: any FSProxy, expected: Bool, sourceLocation: SourceLocation = #_sourceLocation) throws {
-#if canImport(Darwin)
-        let reader = try BinaryReader(data: fs.read(machoPath))
-        let machO = try MachO(reader: reader)
-        let slices = try machO.slices()
-        #expect(slices.count > 0, "Binary contains no slices", sourceLocation: sourceLocation)
-        for slice in slices {
-            let linkedLibraries = Set(try slice.linkedLibraryPaths().map({ Path($0).basename }))
-            for libraryName in libraryNames {
-                if expected {
-                    #expect(linkedLibraries.contains(libraryName), "Could not find expected linkage of '\(libraryName)'", sourceLocation: sourceLocation)
-                }
-                else {
-                    #expect(!linkedLibraries.contains(libraryName), "Found unexpected linkage of '\(libraryName)'", sourceLocation: sourceLocation)
+        #if canImport(Darwin)
+            let reader = try BinaryReader(data: fs.read(machoPath))
+            let machO = try MachO(reader: reader)
+            let slices = try machO.slices()
+            #expect(slices.count > 0, "Binary contains no slices", sourceLocation: sourceLocation)
+            for slice in slices {
+                let linkedLibraries = Set(try slice.linkedLibraryPaths().map({ Path($0).basename }))
+                for libraryName in libraryNames {
+                    if expected {
+                        #expect(linkedLibraries.contains(libraryName), "Could not find expected linkage of '\(libraryName)'", sourceLocation: sourceLocation)
+                    } else {
+                        #expect(!linkedLibraries.contains(libraryName), "Found unexpected linkage of '\(libraryName)'", sourceLocation: sourceLocation)
+                    }
                 }
             }
-        }
-#endif
+        #endif
     }
 
     /// Utility method to check whether a binary contains `LC_ATOM_INFO` in any of its slices.
     /// - parameter expected: If `true`, then emits a test failure if `LC_ATOM_INFO` is absent. If `false`, then emits a test failure if it is present.
     /// - parameter reason: A string describing the reason the `LC_ATOM_INFO` is expected to be present or absent, to be emitted in the test failure.
     fileprivate func checkForMergeableMetadata(in machoPath: Path, fs: any FSProxy, expected: Bool, reason: String? = nil, sourceLocation: SourceLocation = #_sourceLocation) throws {
-#if canImport(Darwin)
-        let reader = try BinaryReader(data: fs.read(machoPath))
-        let machO = try MachO(reader: reader)
-        let slices = try machO.slices()
-        #expect(slices.count > 0, "Binary contains no slices", sourceLocation: sourceLocation)
-        for slice in slices {
-            let loadCommands = try slice.loadCommands()
-            let atomInfoCmds = loadCommands.filter({ $0.base.cmd == 0x36 /* LC_ATOM_INFO */ })
-            if expected {
-                let string = "Could not find LC_ATOM_INFO load command in binary" + (reason.flatMap({ " (\($0))" }) ?? "") + "."
-                #expect(!atomInfoCmds.isEmpty, Comment(rawValue: string), sourceLocation: sourceLocation)
-            }
-            else {
-                let string = "Found unexpected LC_ATOM_INFO load command in binary" + (reason.flatMap({ " (\($0))" }) ?? "") + "."
-                #expect(atomInfoCmds.isEmpty, Comment(rawValue: string), sourceLocation: sourceLocation)
+        #if canImport(Darwin)
+            let reader = try BinaryReader(data: fs.read(machoPath))
+            let machO = try MachO(reader: reader)
+            let slices = try machO.slices()
+            #expect(slices.count > 0, "Binary contains no slices", sourceLocation: sourceLocation)
+            for slice in slices {
+                let loadCommands = try slice.loadCommands()
+                let atomInfoCmds = loadCommands.filter({ $0.base.cmd == 0x36 /* LC_ATOM_INFO */ })
+                if expected {
+                    let string = "Could not find LC_ATOM_INFO load command in binary" + (reason.flatMap({ " (\($0))" }) ?? "") + "."
+                    #expect(!atomInfoCmds.isEmpty, Comment(rawValue: string), sourceLocation: sourceLocation)
+                } else {
+                    let string = "Found unexpected LC_ATOM_INFO load command in binary" + (reason.flatMap({ " (\($0))" }) ?? "") + "."
+                    #expect(atomInfoCmds.isEmpty, Comment(rawValue: string), sourceLocation: sourceLocation)
+                }
             }
-        }
-#endif
+        #endif
     }
 
 }
diff --git a/Tests/SWBBuildSystemTests/ObjectLibraryBuildOperationTests.swift b/Tests/SWBBuildSystemTests/ObjectLibraryBuildOperationTests.swift
index 37228924..7826624c 100644
--- a/Tests/SWBBuildSystemTests/ObjectLibraryBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/ObjectLibraryBuildOperationTests.swift
@@ -35,14 +35,16 @@ fileprivate struct ObjectLibraryBuildOperationTests: CoreBasedTests {
                             children: [
                                 TestFile("a.c"),
                                 TestFile("b.c"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
                                     "CODE_SIGNING_ALLOWED": "NO",
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -52,11 +54,13 @@ fileprivate struct ObjectLibraryBuildOperationTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "a.c",
                                         "b.c",
-                                    ]),
+                                    ])
                                 ]
-                            ),
-                        ])
-                ])
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/a.c")) {
@@ -90,7 +94,8 @@ fileprivate struct ObjectLibraryBuildOperationTests: CoreBasedTests {
                             children: [
                                 TestFile("a.swift"),
                                 TestFile("b.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -98,7 +103,8 @@ fileprivate struct ObjectLibraryBuildOperationTests: CoreBasedTests {
                                     "CODE_SIGNING_ALLOWED": "NO",
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "SWIFT_VERSION": try await swiftVersion,
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -106,14 +112,14 @@ fileprivate struct ObjectLibraryBuildOperationTests: CoreBasedTests {
                                 type: .commandLineTool,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "b.swift",
+                                        "b.swift"
                                     ]),
                                     TestFrameworksBuildPhase([
                                         "Library.objlib"
-                                    ])
+                                    ]),
                                 ],
                                 dependencies: [
-                                    "Library",
+                                    "Library"
                                 ]
                             ),
                             TestStandardTarget(
@@ -121,39 +127,41 @@ fileprivate struct ObjectLibraryBuildOperationTests: CoreBasedTests {
                                 type: .objectLibrary,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "a.swift",
-                                    ]),
+                                        "a.swift"
+                                    ])
                                 ]
                             ),
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/a.swift")) {
                 $0 <<< """
-                    public struct Foo {
-                        public var x: Int
+                        public struct Foo {
+                            public var x: Int
 
-                        public init(x: Int) {
-                            self.x = x
+                            public init(x: Int) {
+                                self.x = x
+                            }
                         }
-                    }
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/b.swift")) {
                 $0 <<< """
-                    import Library
-
-                    @main
-                    struct Entry {
-                        static func main() {
-                            let f = Foo(x: 42)
-                            print(f)
+                        import Library
+
+                        @main
+                        struct Entry {
+                            static func main() {
+                                let f = Foo(x: 42)
+                                print(f)
+                            }
                         }
-                    }
 
-                """
+                    """
             }
 
             try await tester.checkBuild(runDestination: .host) { results in
@@ -177,7 +185,8 @@ fileprivate struct ObjectLibraryBuildOperationTests: CoreBasedTests {
                             children: [
                                 TestFile("a.swift"),
                                 TestFile("b.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -186,7 +195,8 @@ fileprivate struct ObjectLibraryBuildOperationTests: CoreBasedTests {
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "SWIFT_VERSION": try await swiftVersion,
                                     "LIBTOOL_USE_RESPONSE_FILE": "NO",
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -194,14 +204,14 @@ fileprivate struct ObjectLibraryBuildOperationTests: CoreBasedTests {
                                 type: .staticLibrary,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "b.swift",
+                                        "b.swift"
                                     ]),
                                     TestFrameworksBuildPhase([
                                         "Library.objlib"
-                                    ])
+                                    ]),
                                 ],
                                 dependencies: [
-                                    "Library",
+                                    "Library"
                                 ]
                             ),
                             TestStandardTarget(
@@ -209,39 +219,41 @@ fileprivate struct ObjectLibraryBuildOperationTests: CoreBasedTests {
                                 type: .objectLibrary,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "a.swift",
-                                    ]),
+                                        "a.swift"
+                                    ])
                                 ]
                             ),
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/a.swift")) {
                 $0 <<< """
-                    public struct Foo {
-                        public var x: Int
+                        public struct Foo {
+                            public var x: Int
 
-                        public init(x: Int) {
-                            self.x = x
+                            public init(x: Int) {
+                                self.x = x
+                            }
                         }
-                    }
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/b.swift")) {
                 $0 <<< """
-                    import Library
-
-                    @main
-                    struct Entry {
-                        static func main() {
-                            let f = Foo(x: 42)
-                            print(f)
+                        import Library
+
+                        @main
+                        struct Entry {
+                            static func main() {
+                                let f = Foo(x: 42)
+                                print(f)
+                            }
                         }
-                    }
 
-                """
+                    """
             }
 
             try await tester.checkBuild(runDestination: .host) { results in
@@ -265,7 +277,8 @@ fileprivate struct ObjectLibraryBuildOperationTests: CoreBasedTests {
                             children: [
                                 TestFile("a.swift"),
                                 TestFile("b.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -273,7 +286,8 @@ fileprivate struct ObjectLibraryBuildOperationTests: CoreBasedTests {
                                     "CODE_SIGNING_ALLOWED": "NO",
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "SWIFT_VERSION": try await swiftVersion,
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -281,14 +295,14 @@ fileprivate struct ObjectLibraryBuildOperationTests: CoreBasedTests {
                                 type: .commandLineTool,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "b.swift",
+                                        "b.swift"
                                     ]),
                                     TestFrameworksBuildPhase([
                                         "Library.objlib"
-                                    ])
+                                    ]),
                                 ],
                                 dependencies: [
-                                    "Library",
+                                    "Library"
                                 ]
                             ),
                             TestStandardTarget(
@@ -296,39 +310,41 @@ fileprivate struct ObjectLibraryBuildOperationTests: CoreBasedTests {
                                 type: .objectLibrary,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "a.swift",
-                                    ]),
+                                        "a.swift"
+                                    ])
                                 ]
                             ),
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/a.swift")) {
                 $0 <<< """
-                    public struct Foo {
-                        public var x: Int
+                        public struct Foo {
+                            public var x: Int
 
-                        public init(x: Int) {
-                            self.x = x
+                            public init(x: Int) {
+                                self.x = x
+                            }
                         }
-                    }
-                """
+                    """
             }
 
             try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/b.swift")) {
                 $0 <<< """
-                    import Library
-
-                    @main
-                    struct Entry {
-                        static func main() {
-                            let f = Foo(x: 42)
-                            print(f)
+                        import Library
+
+                        @main
+                        struct Entry {
+                            static func main() {
+                                let f = Foo(x: 42)
+                                print(f)
+                            }
                         }
-                    }
 
-                """
+                    """
             }
 
             try await tester.checkBuild(runDestination: .host, persistent: true) { results in
@@ -339,15 +355,15 @@ fileprivate struct ObjectLibraryBuildOperationTests: CoreBasedTests {
 
             try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/a.swift")) {
                 $0 <<< """
-                    public struct Foo {
-                        public var x: Int
+                        public struct Foo {
+                            public var x: Int
 
-                        public init(x: Int) {
-                            print("hello, world!")
-                            self.x = x
+                            public init(x: Int) {
+                                print("hello, world!")
+                                self.x = x
+                            }
                         }
-                    }
-                """
+                    """
             }
 
             try await tester.checkBuild(runDestination: .host, persistent: true) { results in
diff --git a/Tests/SWBBuildSystemTests/OnDemandResourcesTests.swift b/Tests/SWBBuildSystemTests/OnDemandResourcesTests.swift
index dc64fe0b..63b9b6d9 100644
--- a/Tests/SWBBuildSystemTests/OnDemandResourcesTests.swift
+++ b/Tests/SWBBuildSystemTests/OnDemandResourcesTests.swift
@@ -41,19 +41,22 @@ private struct TestAssetCatalog {
             if fs.exists(path) { try fs.removeDirectory(path) }
             try fs.createDirectory(path)
 
-            try await fs.writeJSON(path.join("Contents.json"), [
-                "info": ["version": 1, "author": "xcode"] as PropertyListItem,
-                "data": [
-                    [
-                        "idiom": "universal",
-                        "filename": "x",
-                        "universal-type-identifier": "public.data",
+            try await fs.writeJSON(
+                path.join("Contents.json"),
+                [
+                    "info": ["version": 1, "author": "xcode"] as PropertyListItem,
+                    "data": [
+                        [
+                            "idiom": "universal",
+                            "filename": "x",
+                            "universal-type-identifier": "public.data",
+                        ]
                     ],
-                ],
-                "properties": [
-                    "on-demand-resource-tags": assetTags.sorted(),
-                ],
-            ])
+                    "properties": [
+                        "on-demand-resource-tags": assetTags.sorted()
+                    ],
+                ]
+            )
 
             try fs.write(path.join("x"), contents: bytes)
         }
@@ -79,33 +82,36 @@ private extension AssetPackManifestPlist {
             throw StubError.error("expected {\"resources\": [...]} in \(plist)")
         }
 
-        try self.init(resources: Set(array.map { itemPlist in
-            guard let item = itemPlist.dictValue else { throw StubError.error("expected dictionary in \(itemPlist)") }
-
-            guard let identifier = item["bundleKey"]?.stringValue else { throw StubError.error("expected bundleKey String in \(item)") }
-            guard let isStreamable = item["isStreamable"]?.boolValue else { throw StubError.error("expected isStreamable Bool in \(item)") }
-            guard let url = item["URL"]?.stringValue else { throw StubError.error("expected URL String in \(item)") }
-
-            let priority: Double?
-            if let priorityItem = item["downloadPriority"] {
-                guard let p = priorityItem.floatValue else { throw StubError.error("expected downloadPriority Double in \(item)") }
-                priority = p
-            }
-            else {
-                priority = nil
-            }
+        try self.init(
+            resources: Set(
+                array.map { itemPlist in
+                    guard let item = itemPlist.dictValue else { throw StubError.error("expected dictionary in \(itemPlist)") }
+
+                    guard let identifier = item["bundleKey"]?.stringValue else { throw StubError.error("expected bundleKey String in \(item)") }
+                    guard let isStreamable = item["isStreamable"]?.boolValue else { throw StubError.error("expected isStreamable Bool in \(item)") }
+                    guard let url = item["URL"]?.stringValue else { throw StubError.error("expected URL String in \(item)") }
+
+                    let priority: Double?
+                    if let priorityItem = item["downloadPriority"] {
+                        guard let p = priorityItem.floatValue else { throw StubError.error("expected downloadPriority Double in \(item)") }
+                        priority = p
+                    } else {
+                        priority = nil
+                    }
 
-            guard let uncompressedSize = item["uncompressedSize"]?.intValue else { throw StubError.error("expected uncompressedSize Int in \(item)") }
+                    guard let uncompressedSize = item["uncompressedSize"]?.intValue else { throw StubError.error("expected uncompressedSize Int in \(item)") }
 
-            guard let contentHash = item["primaryContentHash"]?.dictValue else { throw StubError.error("expected primaryContentHash Dictionary in \(item)") }
-            guard let contentHashStrategy = contentHash["strategy"]?.stringValue else { throw StubError.error("expected strategy String in \(contentHash)") }
-            guard contentHashStrategy == "modtime" else { throw StubError.error("expected modtime in \(contentHashStrategy)") }
+                    guard let contentHash = item["primaryContentHash"]?.dictValue else { throw StubError.error("expected primaryContentHash Dictionary in \(item)") }
+                    guard let contentHashStrategy = contentHash["strategy"]?.stringValue else { throw StubError.error("expected strategy String in \(contentHash)") }
+                    guard contentHashStrategy == "modtime" else { throw StubError.error("expected modtime in \(contentHashStrategy)") }
 
-            guard let modDateString = contentHash["hash"]?.stringValue else { throw StubError.error("expected hash String in \(contentHash)") }
-            guard let parsedDate = try? AssetPackManifestPlist.Resource.PrimaryContentHash.modtimeFormatStyle.parse(modDateString) else { throw StubError.error("failed to parse date from \(modDateString)") }
+                    guard let modDateString = contentHash["hash"]?.stringValue else { throw StubError.error("expected hash String in \(contentHash)") }
+                    guard let parsedDate = try? AssetPackManifestPlist.Resource.PrimaryContentHash.modtimeFormatStyle.parse(modDateString) else { throw StubError.error("failed to parse date from \(modDateString)") }
 
-            return AssetPackManifestPlist.Resource(assetPackBundleIdentifier: identifier, isStreamable: isStreamable, primaryContentHash: AssetPackManifestPlist.Resource.PrimaryContentHash.modtime(parsedDate), uncompressedSize: uncompressedSize, url: url, downloadPriority: priority)
-        }))
+                    return AssetPackManifestPlist.Resource(assetPackBundleIdentifier: identifier, isStreamable: isStreamable, primaryContentHash: AssetPackManifestPlist.Resource.PrimaryContentHash.modtime(parsedDate), uncompressedSize: uncompressedSize, url: url, downloadPriority: priority)
+                }
+            )
+        )
     }
 }
 
@@ -144,11 +150,11 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
 
         let expected: PropertyListItem = [
             "NSBundleResourceRequestTags": [
-                "t0": [ "NSAssetPacks": ["a0i"] ],
-                "t1": [ "NSAssetPacks": ["a0i", "a1i"] ],
+                "t0": ["NSAssetPacks": ["a0i"]],
+                "t1": ["NSAssetPacks": ["a0i", "a1i"]],
             ],
             "NSBundleResourceRequestAssetPacks": [
-                "a0i": ["x", "y"],
+                "a0i": ["x", "y"]
             ],
         ]
 
@@ -159,7 +165,7 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS))
     func assetPackManifestPlist() async throws {
         let date0 = Date(timeIntervalSince1970: 0)
-        let date1 = Date(timeIntervalSince1970: 60*60)
+        let date1 = Date(timeIntervalSince1970: 60 * 60)
 
         let resources = [
             AssetPackManifestPlist.Resource(assetPackBundleIdentifier: "a0i", isStreamable: true, primaryContentHash: .modtime(date0), uncompressedSize: 1, url: "http://test=a0i", downloadPriority: nil),
@@ -191,7 +197,7 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                     "uncompressedSize": 2,
                     "downloadPriority": 0.5,
                 ] as [String: PropertyListItem],
-            ],
+            ]
         ]
 
         #expect(model.propertyListItem == expected)
@@ -214,12 +220,12 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
             [
                 "bundle-id": "a0i",
                 "bundle-path": "/tmp/a0.assetpack",
-                "tags": [ "t0", "t1" ],
+                "tags": ["t0", "t1"],
             ] as [String: PropertyListItem],
             [
                 "bundle-id": "a1i",
                 "bundle-path": "/tmp/a1.assetpack",
-                "tags": [ "t1" ],
+                "tags": ["t1"],
             ] as [String: PropertyListItem],
         ]
 
@@ -235,10 +241,12 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("A.dat"),
-                    ]),
+                        TestFile("A.dat")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -249,7 +257,8 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                             "SDKROOT": "iphoneos",
                             "WRAP_ASSET_PACKS_IN_SEPARATE_DIRECTORIES": "YES",
                             "CODE_SIGN_ENTITLEMENTS": "App.entitlements",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -257,16 +266,18 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                         type: .application,
                         buildPhases: [
                             TestResourcesBuildPhase([
-                                TestBuildFile("A.dat", assetTags: Set(["foo"])),
-                            ]),
+                                TestBuildFile("A.dat", assetTags: Set(["foo"]))
+                            ])
                         ],
-                        dependencies: ["Framework"]),
+                        dependencies: ["Framework"]
+                    ),
                     TestStandardTarget("Framework", type: .framework),
-                ])
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false, continueBuildingAfterErrors: false)
             let provisioningInputs = [
-                "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing"),
+                "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing")
             ]
 
             // ODR is by default enabled on the app product type. If we enable it universally, we expect to see an error because the framework target should not support ODR.
@@ -289,11 +300,13 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("A.dat"),
                         TestFile("Assets.xcassets"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -303,8 +316,9 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "SDKROOT": "iphoneos",
                             "CODE_SIGN_ENTITLEMENTS": "App.entitlements",
-                            "CODESIGN": "/usr/bin/true", // we use "Apple Development" identity, so this test will never succeed with the real codesign
-                        ]),
+                            "CODESIGN": "/usr/bin/true",  // we use "Apple Development" identity, so this test will never succeed with the real codesign
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -314,9 +328,11 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                             TestResourcesBuildPhase([
                                 TestBuildFile("A.dat", assetTags: Set(["foo"])),
                                 "Assets.xcassets",
-                            ]),
-                        ]),
-                ])
+                            ])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             let fs = tester.fs
@@ -328,12 +344,12 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
 
             let assetCatalogPath = srcRoot.join("Sources/Assets.xcassets")
             let assetCatalog0 = TestAssetCatalog(entries: [
-                "acA": TestAssetCatalog.Entry(bytes: ByteString([0]), assetTags: Set(["foo"])),
+                "acA": TestAssetCatalog.Entry(bytes: ByteString([0]), assetTags: Set(["foo"]))
             ])
             try await assetCatalog0.write(fs, assetCatalogPath)
 
             let provisioningInputs = [
-                "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing"),
+                "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing")
             ]
 
             try await tester.checkBuild(parameters: BuildParameters(configuration: "Debug", overrides: ["ENABLE_ON_DEMAND_RESOURCES": "NO"]), runDestination: .iOS, signableTargets: Set(provisioningInputs.keys), signableTargetInputs: provisioningInputs) { results in
@@ -353,20 +369,21 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
 
     // MARK: Utility methods for testing ODR functionality
 
-
     /// Create a test project and return a tester for that project.
     private func createODRProjectAndTester(_ srcRoot: Path) async throws -> BuildOperationTester {
         let testProject = TestProject(
             "aProject",
             sourceRoot: srcRoot,
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("A.dat"),
                     TestFile("B.dat"),
                     TestFile("de.lproj/C.dat", regionVariantName: "de"),
                     TestFile("Assets.xcassets"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -378,8 +395,9 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                         "ON_DEMAND_RESOURCES_INITIAL_INSTALL_TAGS": "foo",
                         "ON_DEMAND_RESOURCES_PREFETCH_ORDER": "baz",
                         "CODE_SIGN_ENTITLEMENTS": "App.entitlements",
-                        "CODESIGN": "/usr/bin/true", // we use "Apple Development" identity, so this test will never succeed with the real codesign
-                    ]),
+                        "CODESIGN": "/usr/bin/true",  // we use "Apple Development" identity, so this test will never succeed with the real codesign
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -391,9 +409,11 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                             TestBuildFile("B.dat", assetTags: Set(["foo"])),
                             TestBuildFile("de.lproj/C.dat", assetTags: Set(["foo", "bar"])),
                             "Assets.xcassets",
-                        ]),
-                    ]),
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
         let fs = tester.fs
@@ -486,8 +506,10 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                 try results.checkTask(.matchRule(["CreateAssetPackManifest", assetPackManifestPlistPath.str])) { createAssetPackManifestTask in
                     /// All tasks which contribute to asset packs should have finished before createAssetPackManifestTask started
                     for precedingTask in precedingTasks {
-                        results.check(event:    .taskHadEvent(precedingTask,                event: .completed),
-                                      precedes: .taskHadEvent(createAssetPackManifestTask,  event: .started))
+                        results.check(
+                            event: .taskHadEvent(precedingTask, event: .completed),
+                            precedes: .taskHadEvent(createAssetPackManifestTask, event: .started)
+                        )
                     }
 
                     // Content
@@ -517,7 +539,7 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
 
             // Perform a build and check the results.
             let provisioningInputs = [
-                "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing"),
+                "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing")
             ]
 
             let buildStartDate0 = Date()
@@ -550,15 +572,17 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                 try results.checkTask(.matchRule(["WriteAuxiliaryFile", assetPackInfoPlistPath.str])) { task in
                     let data = try PropertyList.fromBytes(auxFileTaskContents(task).bytes)
 
-                    let expected: PropertyListItem = .init(allAssetPacks0
-                        .sorted { $0.identifier < $1.identifier }
-                        .map { assetPack in
-                            PropertyListItem([
-                                "bundle-id": .plString(assetPack.identifier),
-                                "tags": PropertyListItem(assetPack.tags.sorted()),
-                                "bundle-path": .plString(assetPack.path.str),
-                            ])
-                        })
+                    let expected: PropertyListItem = .init(
+                        allAssetPacks0
+                            .sorted { $0.identifier < $1.identifier }
+                            .map { assetPack in
+                                PropertyListItem([
+                                    "bundle-id": .plString(assetPack.identifier),
+                                    "tags": PropertyListItem(assetPack.tags.sorted()),
+                                    "bundle-path": .plString(assetPack.path.str),
+                                ])
+                            }
+                    )
 
                     #expect(expected == data)
                 }
@@ -569,7 +593,8 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                         StringPattern.anySequence,
                         StringPattern.equal("--asset-pack-output-specifications"),
                         StringPattern.equal(assetPackInfoPlistPath.str),
-                        StringPattern.anySequence])
+                        StringPattern.anySequence,
+                    ])
                     return task
                 }
 
@@ -596,7 +621,7 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
 
             // Perform a build for macCatalyst and check the results.
             let provisioningInputs = [
-                "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing"),
+                "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing")
             ]
             let overrides = [
                 "SDKROOT": "macosx",
@@ -648,10 +673,12 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("A.dat"),
-                    ]),
+                        TestFile("A.dat")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -663,8 +690,9 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                             "ASSET_PACK_FOLDER_PATH": odrRoot.str,
                             "EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE": "NO",
                             "CODE_SIGN_ENTITLEMENTS": "App.entitlements",
-                            "CODESIGN": "/usr/bin/true", // we use "Apple Development" identity, so this test will never succeed with the real codesign
-                        ]),
+                            "CODESIGN": "/usr/bin/true",  // we use "Apple Development" identity, so this test will never succeed with the real codesign
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -672,10 +700,12 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                         type: .application,
                         buildPhases: [
                             TestResourcesBuildPhase([
-                                TestBuildFile("A.dat", assetTags: Set(["foo"])),
-                            ]),
-                        ]),
-                ])
+                                TestBuildFile("A.dat", assetTags: Set(["foo"]))
+                            ])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             let fs = tester.fs
@@ -690,7 +720,7 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
             let assetPacks = [assetPackFoo]
 
             let provisioningInputs = [
-                "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing"),
+                "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing")
             ]
 
             try await tester.checkBuild(parameters: BuildParameters(configuration: "Debug"), runDestination: .iOS, signableTargets: Set(provisioningInputs.keys), signableTargetInputs: provisioningInputs) { results in
@@ -712,80 +742,79 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
     }
 
     // rdar://108165577 (Swift-frontend crashes due to heap corruption when compiling Swift Build)
-    /*
-     /// Allow users to point at a custom asset pack server using ASSET_PACK_MANIFEST_URL_PREFIX
-     func testAssetPackManifestURLPrefix() async throws {
-     try await XCTSkipUnlessSDKs(.iOS)
-     try await withTemporaryDirectory { tmpDirPath in
-     let srcRoot = tmpDirPath.join("srcroot")
-
-     let expectedURLPrefix = "https://example.com/packs"
-
-     let testProject = TestProject(
-     "aProject",
-     sourceRoot: srcRoot,
-     groupTree: TestGroup(
-     "SomeFiles", path: "Sources",
-     children: [
-     TestFile("A.dat"),
-     ]),
-     buildConfigurations: [
-     TestBuildConfiguration(
-     "Debug",
-     buildSettings: [
-     "INFOPLIST_FILE": "Info.plist",
-     "PRODUCT_BUNDLE_IDENTIFIER": "com.company.$(TARGET_NAME)",
-     "PRODUCT_NAME": "$(TARGET_NAME)",
-     "SDKROOT": "iphoneos",
-     "ASSET_PACK_MANIFEST_URL_PREFIX": expectedURLPrefix,
-     "CODE_SIGN_ENTITLEMENTS": "App.entitlements",
-     "CODESIGN": "/usr/bin/true", // we use "Apple Development" identity, so this test will never succeed with the real codesign
-     ]),
-     ],
-     targets: [
-     TestStandardTarget(
-     "App",
-     buildPhases: [
-     TestResourcesBuildPhase([
-     TestBuildFile("A.dat", assetTags: Set(["foo"])),
-     ]),
-     ]),
-     ])
-
-     let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
-     let fs = tester.fs
-
-     try fs.createDirectory(srcRoot.join("Sources"), recursive: true)
-     try fs.write(srcRoot.join("Sources/A.dat"), contents: ByteString([0]))
-
-     try fs.write(srcRoot.join("Info.plist"), contents: "<dict/>")
-     try fs.write(srcRoot.join("App.entitlements"), contents: "")
-
-     let assetPackFoo = ODRAssetPackInfo(identifier: "com.company.App.asset-pack-acbd18db4cc2f85cedef654fccc4a4d8", tags: Set(["foo"]), path: srcRoot.join("build/Debug-iphoneos/OnDemandResources/com.company.App.foo-acbd18db4cc2f85cedef654fccc4a4d8.assetpack"), priority: 1)
-     let assetPacks = [assetPackFoo]
-
-     let provisioningInputs = [
-     "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing"),
-     ]
-
-     try await tester.checkBuild(parameters: BuildParameters(configuration: "Debug", activeRunDestination: .iOS), signableTargets: Set(provisioningInputs.keys), signableTargetInputs: provisioningInputs) { results in
-     results.checkNoDiagnostics()
-
-     let assetPackManifestPlistPath = srcRoot.join("build/Debug-iphoneos/App.app/AssetPackManifest.plist")
-     try results.checkTask(.matchRule(["CreateAssetPackManifest", assetPackManifestPlistPath.str])) { createAssetPackManifestTask in
-     let manifest = try AssetPackManifestPlist(PropertyList.fromBytes(fs.read(assetPackManifestPlistPath).bytes))
-     XCTAssertEqual(assetPacks.count, manifest.resources.count)
-
-     for assetPack in assetPacks {
-     guard let item = (manifest.resources.first { $0.assetPackBundleIdentifier == assetPack.identifier }) else { XCTFail(); return }
-     let suffixStr = assetPack.path.basename
-     XCTAssertEqual(item.url, "\(expectedURLPrefix)\(suffixStr)")
-     }
-     }
-     }
-     }
-     }
-     */
+    //  /// Allow users to point at a custom asset pack server using ASSET_PACK_MANIFEST_URL_PREFIX
+    //  func testAssetPackManifestURLPrefix() async throws {
+    //  try await XCTSkipUnlessSDKs(.iOS)
+    //  try await withTemporaryDirectory { tmpDirPath in
+    //  let srcRoot = tmpDirPath.join("srcroot")
+
+    //  let expectedURLPrefix = "https://example.com/packs"
+
+    //  let testProject = TestProject(
+    //  "aProject",
+    //  sourceRoot: srcRoot,
+    //  groupTree: TestGroup(
+    //  "SomeFiles", path: "Sources",
+    //  children: [
+    //  TestFile("A.dat"),
+    //  ]),
+    //  buildConfigurations: [
+    //  TestBuildConfiguration(
+    //  "Debug",
+    //  buildSettings: [
+    //  "INFOPLIST_FILE": "Info.plist",
+    //  "PRODUCT_BUNDLE_IDENTIFIER": "com.company.$(TARGET_NAME)",
+    //  "PRODUCT_NAME": "$(TARGET_NAME)",
+    //  "SDKROOT": "iphoneos",
+    //  "ASSET_PACK_MANIFEST_URL_PREFIX": expectedURLPrefix,
+    //  "CODE_SIGN_ENTITLEMENTS": "App.entitlements",
+    //  "CODESIGN": "/usr/bin/true", // we use "Apple Development" identity, so this test will never succeed with the real codesign
+    //  ]),
+    //  ],
+    //  targets: [
+    //  TestStandardTarget(
+    //  "App",
+    //  buildPhases: [
+    //  TestResourcesBuildPhase([
+    //  TestBuildFile("A.dat", assetTags: Set(["foo"])),
+    //  ]),
+    //  ]),
+    //  ])
+
+    //  let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
+    //  let fs = tester.fs
+
+    //  try fs.createDirectory(srcRoot.join("Sources"), recursive: true)
+    //  try fs.write(srcRoot.join("Sources/A.dat"), contents: ByteString([0]))
+
+    //  try fs.write(srcRoot.join("Info.plist"), contents: "<dict/>")
+    //  try fs.write(srcRoot.join("App.entitlements"), contents: "")
+
+    //  let assetPackFoo = ODRAssetPackInfo(identifier: "com.company.App.asset-pack-acbd18db4cc2f85cedef654fccc4a4d8", tags: Set(["foo"]), path: srcRoot.join("build/Debug-iphoneos/OnDemandResources/com.company.App.foo-acbd18db4cc2f85cedef654fccc4a4d8.assetpack"), priority: 1)
+    //  let assetPacks = [assetPackFoo]
+
+    //  let provisioningInputs = [
+    //  "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing"),
+    //  ]
+
+    //  try await tester.checkBuild(parameters: BuildParameters(configuration: "Debug", activeRunDestination: .iOS), signableTargets: Set(provisioningInputs.keys), signableTargetInputs: provisioningInputs) { results in
+    //  results.checkNoDiagnostics()
+
+    //  let assetPackManifestPlistPath = srcRoot.join("build/Debug-iphoneos/App.app/AssetPackManifest.plist")
+    //  try results.checkTask(.matchRule(["CreateAssetPackManifest", assetPackManifestPlistPath.str])) { createAssetPackManifestTask in
+    //  let manifest = try AssetPackManifestPlist(PropertyList.fromBytes(fs.read(assetPackManifestPlistPath).bytes))
+    //  XCTAssertEqual(assetPacks.count, manifest.resources.count)
+
+    //  for assetPack in assetPacks {
+    //  guard let item = (manifest.resources.first { $0.assetPackBundleIdentifier == assetPack.identifier }) else { XCTFail(); return }
+    //  let suffixStr = assetPack.path.basename
+    //  XCTAssertEqual(item.url, "\(expectedURLPrefix)\(suffixStr)")
+    //  }
+    //  }
+    //  }
+    //  }
+    //  }
+
     @Test(.requireSDKs(.iOS))
     func assetPackManifestEmbedding() async throws {
         try await withTemporaryDirectory { tmpDirPath in
@@ -795,10 +824,12 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("A.dat"),
-                    ]),
+                        TestFile("A.dat")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -809,8 +840,9 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                             "SDKROOT": "iphoneos",
                             "EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE": "YES",
                             "CODE_SIGN_ENTITLEMENTS": "App.entitlements",
-                            "CODESIGN": "/usr/bin/true", // we use "Apple Development" identity, so this test will never succeed with the real codesign
-                        ]),
+                            "CODESIGN": "/usr/bin/true",  // we use "Apple Development" identity, so this test will never succeed with the real codesign
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -818,10 +850,12 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                         type: .application,
                         buildPhases: [
                             TestResourcesBuildPhase([
-                                TestBuildFile("A.dat", assetTags: Set(["foo"])),
-                            ]),
-                        ]),
-                ])
+                                TestBuildFile("A.dat", assetTags: Set(["foo"]))
+                            ])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             let fs = tester.fs
@@ -833,7 +867,7 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
             try fs.write(srcRoot.join("App.entitlements"), contents: "")
 
             let provisioningInputs = [
-                "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing"),
+                "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing")
             ]
 
             try await tester.checkBuild(parameters: BuildParameters(configuration: "Debug"), runDestination: .iOS, signableTargets: Set(provisioningInputs.keys), signableTargetInputs: provisioningInputs) { results in
@@ -862,11 +896,13 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("A.dat"),
                         TestFile("AssetPackManifest.plist"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -876,8 +912,9 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "SDKROOT": "iphoneos",
                             "CODE_SIGN_ENTITLEMENTS": "App.entitlements",
-                            "CODESIGN": "/usr/bin/true", // we use "Apple Development" identity, so this test will never succeed with the real codesign
-                        ]),
+                            "CODESIGN": "/usr/bin/true",  // we use "Apple Development" identity, so this test will never succeed with the real codesign
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -887,9 +924,11 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                             TestResourcesBuildPhase([
                                 TestBuildFile("AssetPackManifest.plist"),
                                 TestBuildFile("A.dat", assetTags: Set(["foo"])),
-                            ]),
-                        ]),
-                ])
+                            ])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             let fs = tester.fs
@@ -902,7 +941,7 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
             try fs.write(srcRoot.join("App.entitlements"), contents: "")
 
             let provisioningInputs = [
-                "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing"),
+                "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing")
             ]
 
             let assetPackFoo = ODRAssetPackInfo(identifier: "com.company.App.asset-pack-acbd18db4cc2f85cedef654fccc4a4d8", tags: Set(["foo"]), path: srcRoot.join("build/Debug-iphoneos/OnDemandResources/com.company.App.foo-acbd18db4cc2f85cedef654fccc4a4d8.assetpack"), priority: nil)
@@ -930,10 +969,12 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("Assets.xcassets"),
-                    ]),
+                        TestFile("Assets.xcassets")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -944,8 +985,9 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "SDKROOT": "iphoneos",
                             "CODE_SIGN_ENTITLEMENTS": "App.entitlements",
-                            "CODESIGN": "/usr/bin/true", // we use "Apple Development" identity, so this test will never succeed with the real codesign
-                        ]),
+                            "CODESIGN": "/usr/bin/true",  // we use "Apple Development" identity, so this test will never succeed with the real codesign
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -953,10 +995,12 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                         type: .application,
                         buildPhases: [
                             TestResourcesBuildPhase([
-                                "Assets.xcassets",
-                            ]),
-                        ]),
-                ])
+                                "Assets.xcassets"
+                            ])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             let fs = tester.fs
@@ -965,7 +1009,7 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
 
             let assetCatalogPath = srcRoot.join("Sources/Assets.xcassets")
             let assetCatalog0 = TestAssetCatalog(entries: [
-                "acA": TestAssetCatalog.Entry(bytes: ByteString([0]), assetTags: Set(["foo"])),
+                "acA": TestAssetCatalog.Entry(bytes: ByteString([0]), assetTags: Set(["foo"]))
             ])
             try await assetCatalog0.write(fs, assetCatalogPath)
 
@@ -975,7 +1019,7 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
             try fs.write(srcRoot.join("App.entitlements"), contents: "")
 
             let provisioningInputs = [
-                "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing"),
+                "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing")
             ]
 
             // Base build
@@ -988,7 +1032,7 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
             // Update the asset catalog
 
             let assetCatalog1 = TestAssetCatalog(entries: [
-                "acA": TestAssetCatalog.Entry(bytes: ByteString([0]), assetTags: Set(["foo", "bar"])),
+                "acA": TestAssetCatalog.Entry(bytes: ByteString([0]), assetTags: Set(["foo", "bar"]))
             ])
             try await assetCatalog1.write(fs, assetCatalogPath)
 
@@ -1011,11 +1055,13 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("A.dat"),
                         TestFile("B.dat"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -1025,12 +1071,13 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "SDKROOT": "iphoneos",
                             "CODE_SIGN_ENTITLEMENTS": "App.entitlements",
-                            "CODESIGN": "/usr/bin/true", // we use "Apple Development" identity, so this test will never succeed with the real codesign
+                            "CODESIGN": "/usr/bin/true",  // we use "Apple Development" identity, so this test will never succeed with the real codesign
 
                             // NOTE: THIS IS THE IMPORTANT SETTING! Ensure that opt-in is on, regardless of the default value.
                             "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING": "YES",
                             "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING_FOR_SCRIPT_OUTPUTS": "YES",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -1040,9 +1087,11 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
                             TestResourcesBuildPhase([
                                 TestBuildFile("A.dat", assetTags: Set(["foo"])),
                                 TestBuildFile("B.dat", assetTags: Set(["bar"])),
-                            ]),
-                        ]),
-                ])
+                            ])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             let fs = tester.fs
@@ -1061,7 +1110,7 @@ fileprivate struct OnDemandResourcesTests: CoreBasedTests {
             try fs.write(srcRoot.join("App.entitlements"), contents: "")
 
             let provisioningInputs = [
-                "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing"),
+                "App": ProvisioningTaskInputs(identityHash: "Apple Development", identityName: "Dev Signing")
             ]
 
             // Base build
diff --git a/Tests/SWBBuildSystemTests/PackageBuildOperationTests.swift b/Tests/SWBBuildSystemTests/PackageBuildOperationTests.swift
index 6563b003..08fef61d 100644
--- a/Tests/SWBBuildSystemTests/PackageBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/PackageBuildOperationTests.swift
@@ -39,46 +39,59 @@ fileprivate struct PackageBuildOperationTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("main.swift"),
-                    ]),
+                        TestFile("main.swift")
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "CODE_SIGNING_ALLOWED": "NO",
-                        "GENERATE_RESOURCE_ACCESSORS": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SWIFT_VERSION": "5"]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "GENERATE_RESOURCE_ACCESSORS": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SWIFT_VERSION": "5",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
-                        "swifttool", type: .commandLineTool,
+                        "swifttool",
+                        type: .commandLineTool,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "PACKAGE_RESOURCE_BUNDLE_NAME": "best_resources",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "PACKAGE_RESOURCE_BUNDLE_NAME": "best_resources",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["main.swift"]),
+                            TestSourcesBuildPhase(["main.swift"])
                         ],
                         dependencies: ["mallory"]
                     ),
                     TestStandardTarget(
-                        "mallory", type: .bundle,
+                        "mallory",
+                        type: .bundle,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "PACKAGE_RESOURCE_BUNDLE_NAME": "best_resources",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "PACKAGE_RESOURCE_BUNDLE_NAME": "best_resources",
+                                ]
+                            )
                         ]
                     ),
-                ])
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false, fileSystem: localFS)
 
             let projectDir = tester.workspace.projects[0].sourceRoot
             try await tester.fs.writeFileContents(projectDir.join("main.swift")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     import Foundation
 
                     let bundle = Bundle.module
@@ -110,50 +123,63 @@ fileprivate struct PackageBuildOperationTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("main.mm"),
-                    ]),
+                        TestFile("main.mm")
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "CODE_SIGNING_ALLOWED": "NO",
-                        "GENERATE_RESOURCE_ACCESSORS": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "USE_HEADERMAP": "NO"]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "GENERATE_RESOURCE_ACCESSORS": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "USE_HEADERMAP": "NO",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
-                        "objcpptool", type: .commandLineTool,
+                        "objcpptool",
+                        type: .commandLineTool,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "USE_HEADERMAP": "NO",
-                                "DEFINES_MODULE": "YES",
-                                "PACKAGE_RESOURCE_BUNDLE_NAME": "best_resources",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "USE_HEADERMAP": "NO",
+                                    "DEFINES_MODULE": "YES",
+                                    "PACKAGE_RESOURCE_BUNDLE_NAME": "best_resources",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["main.mm"]),
+                            TestSourcesBuildPhase(["main.mm"])
                         ],
                         dependencies: ["mallory"]
                     ),
                     TestStandardTarget(
-                        "mallory", type: .bundle,
+                        "mallory",
+                        type: .bundle,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "USE_HEADERMAP": "NO",
-                                "DEFINES_MODULE": "YES",
-                                "PACKAGE_RESOURCE_BUNDLE_NAME": "best_resources",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "USE_HEADERMAP": "NO",
+                                    "DEFINES_MODULE": "YES",
+                                    "PACKAGE_RESOURCE_BUNDLE_NAME": "best_resources",
+                                ]
+                            )
                         ]
                     ),
-                ])
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false, fileSystem: localFS)
 
             let projectDir = tester.workspace.projects[0].sourceRoot
             try await tester.fs.writeFileContents(projectDir.join("main.mm")) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     #import <Foundation/Foundation.h>
 
                     int main(int argc, const char * argv[]) {
@@ -192,7 +218,7 @@ fileprivate struct PackageBuildOperationTests: CoreBasedTests {
                             "SDKROOT": "xros",
                             "CODE_SIGNING_ALLOWED": "NO",
                             "SWIFT_VERSION": swiftVersion,
-                            "PACKAGE_RESOURCE_TARGET_KIND": "resource"
+                            "PACKAGE_RESOURCE_TARGET_KIND": "resource",
                         ]
                     )
                 ],
@@ -209,7 +235,7 @@ fileprivate struct PackageBuildOperationTests: CoreBasedTests {
                             "SDKROOT": "xros",
                             "CODE_SIGNING_ALLOWED": "NO",
                             "SWIFT_VERSION": swiftVersion,
-                            "PACKAGE_RESOURCE_TARGET_KIND": "regular"
+                            "PACKAGE_RESOURCE_TARGET_KIND": "regular",
                         ]
                     )
                 ],
@@ -251,7 +277,7 @@ fileprivate struct PackageBuildOperationTests: CoreBasedTests {
                         "-o", "\(workspace.sourceRoot.str)/aProject/build/Debug-xros/PackageLib.bundle/test.reality",
                         "\(packageRKAssetsFile.str)",
                         "--schema-file",
-                        "\(workspace.sourceRoot.str)/aProject/build/aProject.build/Debug-xros/PackageResourceBundle.build/DerivedSources/RealityAssetsGenerated/CustomComponentUSDInitializers.usda"
+                        "\(workspace.sourceRoot.str)/aProject/build/aProject.build/Debug-xros/PackageResourceBundle.build/DerivedSources/RealityAssetsGenerated/CustomComponentUSDInitializers.usda",
                     ])
                     try results.checkTaskFollows(task, .matchRuleType("RealityAssetsSchemaGen"))
                 }
@@ -260,12 +286,15 @@ fileprivate struct PackageBuildOperationTests: CoreBasedTests {
             }
 
             // modify the test.swift file in the package with the .rkassets so the schema file changes
-            try tester.fs.write(packageSwiftFileTest, contents: """
-            import RealityKit
-            public struct MyComponent: Component, Codable {
-                public init() {}
-            }
-            """)
+            try tester.fs.write(
+                packageSwiftFileTest,
+                contents: """
+                    import RealityKit
+                    public struct MyComponent: Component, Codable {
+                        public init() {}
+                    }
+                    """
+            )
 
             // Check that the next build is NOT null after touching the .swift file.
             try await tester.checkBuild(runDestination: .xrOS, persistent: true) { results in
@@ -279,7 +308,7 @@ fileprivate struct PackageBuildOperationTests: CoreBasedTests {
                         "-o", "\(workspace.sourceRoot.str)/aProject/build/Debug-xros/PackageLib.bundle/test.reality",
                         "\(packageRKAssetsFile.str)",
                         "--schema-file",
-                        "\(workspace.sourceRoot.str)/aProject/build/aProject.build/Debug-xros/PackageResourceBundle.build/DerivedSources/RealityAssetsGenerated/CustomComponentUSDInitializers.usda"
+                        "\(workspace.sourceRoot.str)/aProject/build/aProject.build/Debug-xros/PackageResourceBundle.build/DerivedSources/RealityAssetsGenerated/CustomComponentUSDInitializers.usda",
                     ])
                     try results.checkTaskFollows(task, .matchRuleType("RealityAssetsSchemaGen"))
                 }
@@ -304,7 +333,7 @@ fileprivate struct PackageBuildOperationTests: CoreBasedTests {
                             "SDKROOT": "watchos",
                             "CODE_SIGNING_ALLOWED": "NO",
                             "SWIFT_VERSION": swiftVersion,
-                            "PACKAGE_RESOURCE_TARGET_KIND": "resource"
+                            "PACKAGE_RESOURCE_TARGET_KIND": "resource",
                         ]
                     )
                 ],
@@ -321,7 +350,7 @@ fileprivate struct PackageBuildOperationTests: CoreBasedTests {
                             "SDKROOT": "watchos",
                             "CODE_SIGNING_ALLOWED": "NO",
                             "SWIFT_VERSION": swiftVersion,
-                            "PACKAGE_RESOURCE_TARGET_KIND": "regular"
+                            "PACKAGE_RESOURCE_TARGET_KIND": "regular",
                         ]
                     )
                 ],
@@ -369,61 +398,92 @@ fileprivate struct PackageBuildOperationTests: CoreBasedTests {
             let prodTarget = try await TestPackageProductTarget(
                 "AppProduct",
                 frameworksBuildPhase: TestFrameworksBuildPhase([
-                    TestBuildFile(.target("App"))]),
+                    TestBuildFile(.target("App"))
+                ]),
                 buildConfigurations: [
                     // Targets need to opt-in to specialization.
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "auto",
-                        "SDK_VARIANT": "auto",
-                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                        "SWIFT_VERSION": swiftVersion,
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "SDKROOT": "auto",
+                            "SDK_VARIANT": "auto",
+                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                            "SWIFT_VERSION": swiftVersion,
+                        ]
+                    )
                 ],
                 dependencies: ["App"]
             )
             let appTarget =
-            try await TestStandardTarget("App", type: .objectFile,
-                                         buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: [
-                                            "PRODUCT_NAME": "App",
-                                            "SDKROOT": "auto",
-                                            "SWIFT_PACKAGE_NAME": "appPkg",
-                                            "SDK_VARIANT": "auto",
-                                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                            "SWIFT_VERSION": swiftVersion,
-                                         ]) ],
-                                         buildPhases: [TestSourcesBuildPhase(["app.swift"]),
-                                                       TestFrameworksBuildPhase([
-                                                        TestBuildFile(.target("LibA")),
-                                                        TestBuildFile(.target("LibB"))
-                                                       ])],
-                                         dependencies: ["LibA", "LibB"])
+                try await TestStandardTarget(
+                    "App",
+                    type: .objectFile,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "App",
+                                "SDKROOT": "auto",
+                                "SWIFT_PACKAGE_NAME": "appPkg",
+                                "SDK_VARIANT": "auto",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                "SWIFT_VERSION": swiftVersion,
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase(["app.swift"]),
+                        TestFrameworksBuildPhase([
+                            TestBuildFile(.target("LibA")),
+                            TestBuildFile(.target("LibB")),
+                        ]),
+                    ],
+                    dependencies: ["LibA", "LibB"]
+                )
             let childTargetA =
-            try await TestStandardTarget("LibA", type: .objectFile,
-                                         buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: [
-                                            "PRODUCT_NAME": "LibA",
-                                            "SWIFT_PACKAGE_NAME": "libPkg",
-                                            "SDKROOT": "auto",
-                                            "SDK_VARIANT": "auto",
-                                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                            "SWIFT_VERSION": swiftVersion,
-                                         ]) ],
-                                         buildPhases: [TestSourcesBuildPhase(["libA.swift"])])
+                try await TestStandardTarget(
+                    "LibA",
+                    type: .objectFile,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "LibA",
+                                "SWIFT_PACKAGE_NAME": "libPkg",
+                                "SDKROOT": "auto",
+                                "SDK_VARIANT": "auto",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                "SWIFT_VERSION": swiftVersion,
+                            ]
+                        )
+                    ],
+                    buildPhases: [TestSourcesBuildPhase(["libA.swift"])]
+                )
             let childTargetB =
-            try await TestStandardTarget("LibB", type: .objectFile,
-                                         buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: [
-                                            "PRODUCT_NAME": "LibB",
-                                            "SDKROOT": "auto",
-                                            "SDK_VARIANT": "auto",
-                                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                            "SWIFT_VERSION": swiftVersion,
-                                         ]) ],
-                                         buildPhases: [TestSourcesBuildPhase(["libB.swift"])])
+                try await TestStandardTarget(
+                    "LibB",
+                    type: .objectFile,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "LibB",
+                                "SDKROOT": "auto",
+                                "SDK_VARIANT": "auto",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                "SWIFT_VERSION": swiftVersion,
+                            ]
+                        )
+                    ],
+                    buildPhases: [TestSourcesBuildPhase(["libB.swift"])]
+                )
 
             let package = TestPackageProject("rootPkg", groupTree: TestGroup("Package", children: [TestFile("app.swift"), TestFile("libA.swift"), TestFile("libB.swift")]), targets: [prodTarget, appTarget, childTargetA, childTargetB])
             let testWorkspace = TestWorkspace(
                 "Test",
                 sourceRoot: tmpDirPath.join("Test"),
-                projects: [package])
+                projects: [package]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("rootPkg/app.swift")) { stream in
@@ -477,48 +537,71 @@ fileprivate struct PackageBuildOperationTests: CoreBasedTests {
             let prodTarget = try await TestPackageProductTarget(
                 "PackageLibProduct",
                 frameworksBuildPhase: TestFrameworksBuildPhase([
-                    TestBuildFile(.target("PackageLib"))]),
+                    TestBuildFile(.target("PackageLib"))
+                ]),
                 buildConfigurations: [
                     // Targets need to opt-in to specialization.
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "auto",
-                        "SDK_VARIANT": "auto",
-                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                        "SWIFT_VERSION": swiftVersion,
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "SDKROOT": "auto",
+                            "SDK_VARIANT": "auto",
+                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                            "SWIFT_VERSION": swiftVersion,
+                        ]
+                    )
                 ],
                 dependencies: ["PackageLib"]
             )
             let stdTarget =
-            try await TestStandardTarget("PackageLib", type: .objectFile,
-                                         buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: [
-                                            "PRODUCT_NAME": "PackageLib",
-                                            "SDKROOT": "auto",
-                                            "SWIFT_MODULE_ALIASES": "ChildLib=MyLib",
-                                            "SDK_VARIANT": "auto",
-                                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                            "SWIFT_VERSION": swiftVersion,
-                                         ]) ],
-                                         buildPhases: [TestSourcesBuildPhase(["test.swift"]),
-                                                       TestFrameworksBuildPhase([TestBuildFile(.target("MyLib"))])],
-                                         dependencies: ["MyLib"])
+                try await TestStandardTarget(
+                    "PackageLib",
+                    type: .objectFile,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "PackageLib",
+                                "SDKROOT": "auto",
+                                "SWIFT_MODULE_ALIASES": "ChildLib=MyLib",
+                                "SDK_VARIANT": "auto",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                "SWIFT_VERSION": swiftVersion,
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase(["test.swift"]),
+                        TestFrameworksBuildPhase([TestBuildFile(.target("MyLib"))]),
+                    ],
+                    dependencies: ["MyLib"]
+                )
             let childTarget =
-            try await TestStandardTarget("MyLib", type: .objectFile,
-                                         buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: [
-                                            "PRODUCT_NAME": "MyLib",
-                                            "SWIFT_MODULE_ALIASES": "ChildLib=MyLib",
-                                            "SDKROOT": "auto",
-                                            "SDK_VARIANT": "auto",
-                                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                            "SWIFT_VERSION": swiftVersion,
-                                         ]) ],
-                                         buildPhases: [TestSourcesBuildPhase(["childtest.swift"])])
+                try await TestStandardTarget(
+                    "MyLib",
+                    type: .objectFile,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "MyLib",
+                                "SWIFT_MODULE_ALIASES": "ChildLib=MyLib",
+                                "SDKROOT": "auto",
+                                "SDK_VARIANT": "auto",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                "SWIFT_VERSION": swiftVersion,
+                            ]
+                        )
+                    ],
+                    buildPhases: [TestSourcesBuildPhase(["childtest.swift"])]
+                )
 
             let package = TestPackageProject("aPackage", groupTree: TestGroup("Package", children: [TestFile("test.swift"), TestFile("childtest.swift")]), targets: [prodTarget, stdTarget, childTarget])
             let testWorkspace = TestWorkspace(
                 "Test",
                 sourceRoot: tmpDirPath.join("Test"),
-                projects: [package])
+                projects: [package]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aPackage/test.swift")) { stream in
@@ -536,11 +619,11 @@ fileprivate struct PackageBuildOperationTests: CoreBasedTests {
                         #expect(targetName != "ChildLib")
                         if targetName == "MyLib" {
                             #expect(["-module-name", "MyLib"].allSatisfy(task.commandLine.contains))
-                            #expect(["-module-alias",  "ChildLib=MyLib"].allSatisfy(task.commandLine.contains))
+                            #expect(["-module-alias", "ChildLib=MyLib"].allSatisfy(task.commandLine.contains))
                         }
                         if targetName == "PackageLib" {
-                            #expect(["-module-name",  "PackageLib"].allSatisfy(task.commandLine.contains))
-                            #expect(["-module-alias",  "ChildLib=MyLib"].allSatisfy(task.commandLine.contains))
+                            #expect(["-module-name", "PackageLib"].allSatisfy(task.commandLine.contains))
+                            #expect(["-module-alias", "ChildLib=MyLib"].allSatisfy(task.commandLine.contains))
                         }
                     }
                 }
@@ -548,15 +631,15 @@ fileprivate struct PackageBuildOperationTests: CoreBasedTests {
                     for task in tasks {
                         let targetName = task.forTarget?.target.name ?? ""
                         if targetName == "MyLib" {
-                            #expect(["-module-name",  "MyLib"].allSatisfy(task.commandLine.contains))
-                            #expect(["-module-alias",  "ChildLib=MyLib"].allSatisfy(task.commandLine.contains))
-                            #expect(!task.commandLine.filter {$0.asString.contains("MyLib.swiftmodule")}.isEmpty)
-                            #expect(task.commandLine.filter {$0.asString.contains("ChildLib.swiftmodule")}.isEmpty)
+                            #expect(["-module-name", "MyLib"].allSatisfy(task.commandLine.contains))
+                            #expect(["-module-alias", "ChildLib=MyLib"].allSatisfy(task.commandLine.contains))
+                            #expect(!task.commandLine.filter { $0.asString.contains("MyLib.swiftmodule") }.isEmpty)
+                            #expect(task.commandLine.filter { $0.asString.contains("ChildLib.swiftmodule") }.isEmpty)
                         }
                         if targetName == "PackageLib" {
-                            #expect(["-module-name",  "PackageLib"].allSatisfy(task.commandLine.contains))
-                            #expect(["-module-alias",  "ChildLib=MyLib"].allSatisfy(task.commandLine.contains))
-                            #expect(!task.commandLine.filter {$0.asString.contains("PackageLib.swiftmodule")}.isEmpty)
+                            #expect(["-module-name", "PackageLib"].allSatisfy(task.commandLine.contains))
+                            #expect(["-module-alias", "ChildLib=MyLib"].allSatisfy(task.commandLine.contains))
+                            #expect(!task.commandLine.filter { $0.asString.contains("PackageLib.swiftmodule") }.isEmpty)
                         }
                     }
                 }
@@ -623,32 +706,48 @@ fileprivate struct PackageBuildOperationTests: CoreBasedTests {
     }
 
     func testerForBasicPackageProject(tmpDirPath: Path, configurationToBuild: String) async throws -> BuildOperationTester {
-        let package = try await TestPackageProject("aPackage", groupTree: TestGroup("Package", children: [TestFile("test.swift")]), targets: [
-            TestPackageProductTarget(
-                "PackageLibProduct",
-                frameworksBuildPhase: TestFrameworksBuildPhase([
-                    TestBuildFile(.target("PackageLib"))]),
-                buildConfigurations: [
-                    // Targets need to opt-in to specialization.
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "auto",
-                        "SDK_VARIANT": "auto",
-                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                        "SWIFT_VERSION": swiftVersion,
+        let package = try await TestPackageProject(
+            "aPackage",
+            groupTree: TestGroup("Package", children: [TestFile("test.swift")]),
+            targets: [
+                TestPackageProductTarget(
+                    "PackageLibProduct",
+                    frameworksBuildPhase: TestFrameworksBuildPhase([
+                        TestBuildFile(.target("PackageLib"))
                     ]),
-                ],
-                dependencies: ["PackageLib"]
-            ),
-            TestStandardTarget("PackageLib", type: .objectFile,
-                               buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: [
+                    buildConfigurations: [
+                        // Targets need to opt-in to specialization.
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SDK_VARIANT": "auto",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                "SWIFT_VERSION": swiftVersion,
+                            ]
+                        )
+                    ],
+                    dependencies: ["PackageLib"]
+                ),
+                TestStandardTarget(
+                    "PackageLib",
+                    type: .objectFile,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
                                 "PRODUCT_NAME": "PackageLib",
                                 "SDKROOT": "auto",
                                 "SDK_VARIANT": "auto",
                                 "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
                                 "SWIFT_VERSION": swiftVersion,
-                               ]) ],
-                               buildPhases: [TestSourcesBuildPhase(["test.swift"])])
-        ])
+                            ]
+                        )
+                    ],
+                    buildPhases: [TestSourcesBuildPhase(["test.swift"])]
+                ),
+            ]
+        )
 
         let buildSettings = try await [
             "PRODUCT_NAME": "$(TARGET_NAME)",
@@ -663,23 +762,33 @@ fileprivate struct PackageBuildOperationTests: CoreBasedTests {
             projects: [
                 TestProject(
                     "aProject",
-                    groupTree: TestGroup("Sources", children: [
-                        TestFile("Source.swift"),
-                    ]),
+                    groupTree: TestGroup(
+                        "Sources",
+                        children: [
+                            TestFile("Source.swift")
+                        ]
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration("BestDevelopment", buildSettings: buildSettings),
                         TestBuildConfiguration("BestDeployment", buildSettings: buildSettings),
                     ],
                     targets: [
                         TestStandardTarget(
-                            "Foo", type: .framework,
+                            "Foo",
+                            type: .framework,
                             buildConfigurations: [TestBuildConfiguration("Debug"), TestBuildConfiguration("Release")],
                             buildPhases: [
                                 TestSourcesBuildPhase(["Source.swift"]),
                                 TestFrameworksBuildPhase([
-                                    TestBuildFile(.target("PackageLibProduct"))])
+                                    TestBuildFile(.target("PackageLibProduct"))
+                                ]),
                             ],
-                            dependencies: ["PackageLibProduct"])]), package])
+                            dependencies: ["PackageLibProduct"]
+                        )
+                    ]
+                ), package,
+            ]
+        )
         let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
         try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Source.swift")) { stream in
             stream.write("import PackageLib")
diff --git a/Tests/SWBBuildSystemTests/PrefixHeaderAsModuleTests.swift b/Tests/SWBBuildSystemTests/PrefixHeaderAsModuleTests.swift
index b6ff7ff2..e71d57f0 100644
--- a/Tests/SWBBuildSystemTests/PrefixHeaderAsModuleTests.swift
+++ b/Tests/SWBBuildSystemTests/PrefixHeaderAsModuleTests.swift
@@ -34,43 +34,49 @@ fileprivate struct PrefixHeaderAsModuleTests: CoreBasedTests {
                             children: [
                                 TestFile("file.c"),
                                 TestFile("pch.h"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
-                                "GCC_PREFIX_HEADER": "pch.h",
-                                "CLANG_IMPORT_PREFIX_HEADER_AS_MODULE": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
+                                    "GCC_PREFIX_HEADER": "pch.h",
+                                    "CLANG_IMPORT_PREFIX_HEADER_AS_MODULE": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/pch.h")) { stream in
-                stream <<<
-                """
-                typedef int PCH_int;
-                #define PCH_one 1
-                """
+                stream <<< """
+                    typedef int PCH_int;
+                    #define PCH_one 1
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                PCH_int foo(void) {
-                  return PCH_one;
-                }
-                """
+                stream <<< """
+                    PCH_int foo(void) {
+                      return PCH_one;
+                    }
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
@@ -100,43 +106,49 @@ fileprivate struct PrefixHeaderAsModuleTests: CoreBasedTests {
                             children: [
                                 TestFile("file.c"),
                                 TestFile("pch.h"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "NO",
-                                "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
-                                "GCC_PREFIX_HEADER": "pch.h",
-                                "CLANG_IMPORT_PREFIX_HEADER_AS_MODULE": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "NO",
+                                    "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
+                                    "GCC_PREFIX_HEADER": "pch.h",
+                                    "CLANG_IMPORT_PREFIX_HEADER_AS_MODULE": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.c"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.c"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/pch.h")) { stream in
-                stream <<<
-                """
-                typedef int PCH_int;
-                #define PCH_one 1
-                """
+                stream <<< """
+                    typedef int PCH_int;
+                    #define PCH_one 1
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
-                stream <<<
-                """
-                PCH_int foo(void) {
-                  return PCH_one;
-                }
-                """
+                stream <<< """
+                    PCH_int foo(void) {
+                      return PCH_one;
+                    }
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
@@ -161,43 +173,49 @@ fileprivate struct PrefixHeaderAsModuleTests: CoreBasedTests {
                             children: [
                                 TestFile("file.cpp"),
                                 TestFile("pch.h"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "OTHER_CFLAGS": "-fmodules -fcxx-modules",
-                                "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
-                                "GCC_PREFIX_HEADER": "pch.h",
-                                "CLANG_IMPORT_PREFIX_HEADER_AS_MODULE": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "OTHER_CFLAGS": "-fmodules -fcxx-modules",
+                                    "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
+                                    "GCC_PREFIX_HEADER": "pch.h",
+                                    "CLANG_IMPORT_PREFIX_HEADER_AS_MODULE": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.cpp"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.cpp"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/pch.h")) { stream in
-                stream <<<
-                """
-                typedef int PCH_int;
-                #define PCH_one 1
-                """
+                stream <<< """
+                    typedef int PCH_int;
+                    #define PCH_one 1
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.cpp")) { stream in
-                stream <<<
-                """
-                PCH_int foo(void) {
-                  return PCH_one;
-                }
-                """
+                stream <<< """
+                    PCH_int foo(void) {
+                      return PCH_one;
+                    }
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
diff --git a/Tests/SWBBuildSystemTests/PreviewsBuildOperationTests.swift b/Tests/SWBBuildSystemTests/PreviewsBuildOperationTests.swift
index b95ae152..b4c91fd0 100644
--- a/Tests/SWBBuildSystemTests/PreviewsBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/PreviewsBuildOperationTests.swift
@@ -32,26 +32,30 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
                 "ProjectName",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "Sources", path: "Sources",
+                    "Sources",
+                    path: "Sources",
                     children: [
                         TestFile("main.swift"),
                         TestFile("Assets.xcassets"),
                     ]
                 ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
-                        "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS": "NO",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "iphoneos",
-                        "SWIFT_VERSION": "5.0",
-                        "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                        "SDK_STAT_CACHE_ENABLE": "NO",
-                        "SWIFT_ENABLE_EXPLICIT_MODULES": "NO",
-                        "PRODUCT_BUNDLE_IDENTIFIER": "com.test.ProjectName",
-                        "SWIFT_VALIDATE_CLANG_MODULES_ONCE_PER_BUILD_SESSION": "NO",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
+                            "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS": "NO",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "iphoneos",
+                            "SWIFT_VERSION": "5.0",
+                            "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                            "SDK_STAT_CACHE_ENABLE": "NO",
+                            "SWIFT_ENABLE_EXPLICIT_MODULES": "NO",
+                            "PRODUCT_BUNDLE_IDENTIFIER": "com.test.ProjectName",
+                            "SWIFT_VALIDATE_CLANG_MODULES_ONCE_PER_BUILD_SESSION": "NO",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -59,13 +63,13 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
                         type: .application,
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("main.swift"),
+                                TestBuildFile("main.swift")
                             ]),
                             TestResourcesBuildPhase([
-                                TestBuildFile("Assets.xcassets"),
-                            ])
+                                TestBuildFile("Assets.xcassets")
+                            ]),
                         ]
-                    ),
+                    )
                 ]
             )
 
@@ -83,31 +87,34 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
             let previewInfoInput = TaskGeneratePreviewInfoInput.thunkInfo(sourceFile: srcRoot.join("Sources/main.swift"), thunkVariantSuffix: "selection")
 
             // Concrete iOS simulator destination with overrides for an iPhone 14 Pro
-            let buildParameters = BuildParameters(configuration: "Debug", overrides: [
-                "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL": "iPhone15,2",
-                "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION": core.loadSDK(.iOSSimulator).defaultDeploymentTarget,
-                "ASSETCATALOG_FILTER_FOR_THINNING_DEVICE_CONFIGURATION": "iPhone15,2",
-                "BUILD_ACTIVE_RESOURCES_ONLY": "YES",
-                "ENABLE_SDK_IMPORTS": "NO",
-                "TARGET_DEVICE_IDENTIFIER": "DB9FA063-8DA7-41C1-835E-EC616E6AF448",
-                "TARGET_DEVICE_MODEL": "iPhone15,2",
-                "TARGET_DEVICE_OS_VERSION": core.loadSDK(.iOSSimulator).defaultDeploymentTarget,
-                "TARGET_DEVICE_PLATFORM_NAME": "iphonesimulator",
-
-                // And XOJIT previews enabled, which should be passed when the workspace setting is on
-                "ENABLE_XOJIT_PREVIEWS": "YES",
-
-                // Check that no warnings are produced from this setting.
-                "LD_WARN_UNUSED_DYLIBS": "YES",
-
-                // Skip objc runtime linking otherwise we get warning for the debug dylib about not
-                // using libobjc symbols.
-                "LINK_OBJC_RUNTIME": "NO",
-
-                "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
-                "CODE_SIGNING_ALLOWED": "YES",
-                "CODE_SIGN_IDENTITY": "-",
-            ])
+            let buildParameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL": "iPhone15,2",
+                    "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION": core.loadSDK(.iOSSimulator).defaultDeploymentTarget,
+                    "ASSETCATALOG_FILTER_FOR_THINNING_DEVICE_CONFIGURATION": "iPhone15,2",
+                    "BUILD_ACTIVE_RESOURCES_ONLY": "YES",
+                    "ENABLE_SDK_IMPORTS": "NO",
+                    "TARGET_DEVICE_IDENTIFIER": "DB9FA063-8DA7-41C1-835E-EC616E6AF448",
+                    "TARGET_DEVICE_MODEL": "iPhone15,2",
+                    "TARGET_DEVICE_OS_VERSION": core.loadSDK(.iOSSimulator).defaultDeploymentTarget,
+                    "TARGET_DEVICE_PLATFORM_NAME": "iphonesimulator",
+
+                    // And XOJIT previews enabled, which should be passed when the workspace setting is on
+                    "ENABLE_XOJIT_PREVIEWS": "YES",
+
+                    // Check that no warnings are produced from this setting.
+                    "LD_WARN_UNUSED_DYLIBS": "YES",
+
+                    // Skip objc runtime linking otherwise we get warning for the debug dylib about not
+                    // using libobjc symbols.
+                    "LINK_OBJC_RUNTIME": "NO",
+
+                    "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
+                    "CODE_SIGNING_ALLOWED": "YES",
+                    "CODE_SIGN_IDENTITY": "-",
+                ]
+            )
 
             let provisioningInputs = ["AppTarget": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict(["foo": "bar"]))]
 
@@ -163,7 +170,7 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
                             "-Xlinker", "-sectcreate", "-Xlinker", "__TEXT", "-Xlinker", "__ents_der", "-Xlinker", "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/AppTarget.app-Simulated.xcent.der",
                             "\(srcRoot.str)/build/Debug-iphonesimulator/AppTarget.app/AppTarget.debug.dylib",
                             "-Xlinker", "-no_adhoc_codesign",
-                            "-o", "\(srcRoot.str)/build/Debug-iphonesimulator/AppTarget.app/AppTarget"
+                            "-o", "\(srcRoot.str)/build/Debug-iphonesimulator/AppTarget.app/AppTarget",
                         ]
                     )
                 }
@@ -202,7 +209,7 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
                                 // Remove the flag
                                 compileCommandLine.remove(at: idx)
                             }
-                            if ["-fcolor-diagnostics", "-fno-color-diagnostics"].contains(compileCommandLine[idx+1]) && compileCommandLine[idx] == "-Xcc" {
+                            if ["-fcolor-diagnostics", "-fno-color-diagnostics"].contains(compileCommandLine[idx + 1]) && compileCommandLine[idx] == "-Xcc" {
                                 compileCommandLine.remove(at: idx)
                                 compileCommandLine.remove(at: idx)
                             }
@@ -300,9 +307,11 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
                         #expect(targetPreviewInfo.context.sdkVariant == "iphonesimulator")
 
                         #expect(targetPreviewInfo.targetDependencyInfo?.productModuleName == "AppTarget")
-                        #expect(targetPreviewInfo.targetDependencyInfo?.objectFileInputMap == [
-                            "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/main.o": Set(["\(srcRoot.str)/Sources/main.swift"])
-                            ])
+                        #expect(
+                            targetPreviewInfo.targetDependencyInfo?.objectFileInputMap == [
+                                "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/main.o": Set(["\(srcRoot.str)/Sources/main.swift"])
+                            ]
+                        )
                         var linkerCommandLine = targetPreviewInfo.targetDependencyInfo?.linkCommandLine ?? []
                         for idx in linkerCommandLine.indices.reversed() {
                             if linkerCommandLine[idx].hasSuffix("linker-args.resp") {
@@ -394,7 +403,8 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
                 "ProjectName",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "Sources", path: "Sources",
+                    "Sources",
+                    path: "Sources",
                     children: [
                         TestFile("main.swift"),
                         TestFile("File1.swift"),
@@ -404,18 +414,21 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
                     ]
                 ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
-                        "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS": "NO",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "iphoneos",
-                        "SWIFT_VERSION": "5.0",
-                        "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                        "SWIFT_ENABLE_EXPLICIT_MODULES": "NO",
-                        "SDK_STAT_CACHE_ENABLE": "NO",
-                        "SWIFT_VALIDATE_CLANG_MODULES_ONCE_PER_BUILD_SESSION": "NO",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
+                            "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS": "NO",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "iphoneos",
+                            "SWIFT_VERSION": "5.0",
+                            "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                            "SWIFT_ENABLE_EXPLICIT_MODULES": "NO",
+                            "SDK_STAT_CACHE_ENABLE": "NO",
+                            "SWIFT_VALIDATE_CLANG_MODULES_ONCE_PER_BUILD_SESSION": "NO",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -429,10 +442,10 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
                                 TestBuildFile("File3.swift"),
                             ]),
                             TestResourcesBuildPhase([
-                                TestBuildFile("Assets.xcassets"),
-                            ])
+                                TestBuildFile("Assets.xcassets")
+                            ]),
                         ]
-                    ),
+                    )
                 ]
             )
 
@@ -453,23 +466,26 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
             let previewInfoInput = TaskGeneratePreviewInfoInput.thunkInfo(sourceFile: srcRoot.join("Sources/File1.swift"), thunkVariantSuffix: "selection")
 
             // Concrete iOS simulator destination with overrides for an iPhone 14 Pro
-            let buildParameters = BuildParameters(configuration: "Debug", overrides: [
-                "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL": "iPhone15,2",
-                "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION": core.loadSDK(.iOSSimulator).defaultDeploymentTarget,
-                "ASSETCATALOG_FILTER_FOR_THINNING_DEVICE_CONFIGURATION": "iPhone15,2",
-                "BUILD_ACTIVE_RESOURCES_ONLY": "YES",
-                "ENABLE_SDK_IMPORTS": "NO",
-                "TARGET_DEVICE_IDENTIFIER": "DB9FA063-8DA7-41C1-835E-EC616E6AF448",
-                "TARGET_DEVICE_MODEL": "iPhone15,2",
-                "TARGET_DEVICE_OS_VERSION": core.loadSDK(.iOSSimulator).defaultDeploymentTarget,
-                "TARGET_DEVICE_PLATFORM_NAME": "iphonesimulator",
-
-                // And XOJIT previews enabled, which should be passed when the workspace setting is on
-                "ENABLE_XOJIT_PREVIEWS": "YES",
-                "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
-                "CODE_SIGNING_ALLOWED": "YES",
-                "CODE_SIGN_IDENTITY": "-",
-            ])
+            let buildParameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL": "iPhone15,2",
+                    "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION": core.loadSDK(.iOSSimulator).defaultDeploymentTarget,
+                    "ASSETCATALOG_FILTER_FOR_THINNING_DEVICE_CONFIGURATION": "iPhone15,2",
+                    "BUILD_ACTIVE_RESOURCES_ONLY": "YES",
+                    "ENABLE_SDK_IMPORTS": "NO",
+                    "TARGET_DEVICE_IDENTIFIER": "DB9FA063-8DA7-41C1-835E-EC616E6AF448",
+                    "TARGET_DEVICE_MODEL": "iPhone15,2",
+                    "TARGET_DEVICE_OS_VERSION": core.loadSDK(.iOSSimulator).defaultDeploymentTarget,
+                    "TARGET_DEVICE_PLATFORM_NAME": "iphonesimulator",
+
+                    // And XOJIT previews enabled, which should be passed when the workspace setting is on
+                    "ENABLE_XOJIT_PREVIEWS": "YES",
+                    "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
+                    "CODE_SIGNING_ALLOWED": "YES",
+                    "CODE_SIGN_IDENTITY": "-",
+                ]
+            )
 
             let provisioningInputs = ["AppTarget": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict(["foo": "bar"]))]
 
@@ -504,7 +520,7 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
                                 // Remove the flag
                                 compileCommandLine.remove(at: idx)
                             }
-                            if ["-fcolor-diagnostics", "-fno-color-diagnostics"].contains(compileCommandLine[idx+1]) && compileCommandLine[idx] == "-Xcc" {
+                            if ["-fcolor-diagnostics", "-fno-color-diagnostics"].contains(compileCommandLine[idx + 1]) && compileCommandLine[idx] == "-Xcc" {
                                 compileCommandLine.remove(at: idx)
                                 compileCommandLine.remove(at: idx)
                             }
@@ -605,12 +621,14 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
                         #expect(targetPreviewInfo.context.sdkVariant == "iphonesimulator")
 
                         #expect(targetPreviewInfo.targetDependencyInfo?.productModuleName == "AppTarget")
-                        #expect(targetPreviewInfo.targetDependencyInfo?.objectFileInputMap == [
-                            "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/main.o": Set(["\(srcRoot.str)/Sources/main.swift"]),
-                            "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/File1.o": Set(["\(srcRoot.str)/Sources/File1.swift"]),
-                            "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/File2.o": Set(["\(srcRoot.str)/Sources/File2.swift"]),
-                            "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/File3.o": Set(["\(srcRoot.str)/Sources/File3.swift"]),
-                        ])
+                        #expect(
+                            targetPreviewInfo.targetDependencyInfo?.objectFileInputMap == [
+                                "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/main.o": Set(["\(srcRoot.str)/Sources/main.swift"]),
+                                "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/File1.o": Set(["\(srcRoot.str)/Sources/File1.swift"]),
+                                "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/File2.o": Set(["\(srcRoot.str)/Sources/File2.swift"]),
+                                "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/File3.o": Set(["\(srcRoot.str)/Sources/File3.swift"]),
+                            ]
+                        )
                         var linkerCommandLine = targetPreviewInfo.targetDependencyInfo?.linkCommandLine ?? []
                         for idx in linkerCommandLine.indices.reversed() {
                             if linkerCommandLine[idx].hasSuffix("linker-args.resp") {
@@ -634,19 +652,23 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
                 "ProjectName",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "Sources", path: "Sources",
+                    "Sources",
+                    path: "Sources",
                     children: [
-                        TestFile("main.swift"),
+                        TestFile("main.swift")
                     ]
                 ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "iphoneos",
-                        "SWIFT_VERSION": "5.0",
-                        "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "iphoneos",
+                            "SWIFT_VERSION": "5.0",
+                            "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -654,10 +676,10 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
                         type: .application,
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("main.swift"),
-                            ]),
+                                TestBuildFile("main.swift")
+                            ])
                         ]
-                    ),
+                    )
                 ]
             )
 
@@ -667,10 +689,13 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
             try tester.fs.createDirectory(srcRoot.join("Sources"), recursive: true)
             try tester.fs.write(srcRoot.join("Sources/main.swift"), contents: "")
 
-            let buildParameters = BuildParameters(configuration: "Debug", overrides: [
-                // And XOJIT previews enabled, which should be passed when the workspace setting is on
-                "ENABLE_XOJIT_PREVIEWS": "YES",
-            ])
+            let buildParameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    // And XOJIT previews enabled, which should be passed when the workspace setting is on
+                    "ENABLE_XOJIT_PREVIEWS": "YES"
+                ]
+            )
 
             try await tester.checkBuild(parameters: buildParameters, runDestination: .anyiOSSimulator, buildCommand: .build(style: .buildOnly, skipDependencies: false)) { results in
                 results.checkNoDiagnostics()
@@ -708,19 +733,23 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
                 "ProjectName",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "Sources", path: "Sources",
+                    "Sources",
+                    path: "Sources",
                     children: [
-                        TestFile("main.swift"),
+                        TestFile("main.swift")
                     ]
                 ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "iphoneos",
-                        "SWIFT_VERSION": "5.0",
-                        "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "iphoneos",
+                            "SWIFT_VERSION": "5.0",
+                            "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -728,10 +757,10 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
                         type: .applicationExtension,
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("main.swift"),
-                            ]),
+                                TestBuildFile("main.swift")
+                            ])
                         ]
-                    ),
+                    )
                 ]
             )
 
@@ -741,10 +770,13 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
             try tester.fs.createDirectory(srcRoot.join("Sources"), recursive: true)
             try tester.fs.write(srcRoot.join("Sources/main.swift"), contents: "")
 
-            let buildParameters = BuildParameters(configuration: "Debug", overrides: [
-                // And XOJIT previews enabled, which should be passed when the workspace setting is on
-                "ENABLE_XOJIT_PREVIEWS": "YES",
-            ])
+            let buildParameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    // And XOJIT previews enabled, which should be passed when the workspace setting is on
+                    "ENABLE_XOJIT_PREVIEWS": "YES"
+                ]
+            )
 
             try await tester.checkBuild(parameters: buildParameters, runDestination: .iOSSimulator, buildCommand: .build(style: .buildOnly, skipDependencies: false)) { results in
                 results.checkNoDiagnostics()
@@ -782,7 +814,7 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
                             "-Xlinker", "-sectcreate", "-Xlinker", "__TEXT", "-Xlinker", "__debug_instlnm", "-Xlinker", "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppExTarget.build/AppExTarget-DebugDylibInstallName-normal-\(results.runDestinationTargetArchitecture).txt",
                             "-Xlinker", "-filelist", "-Xlinker", "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppExTarget.build/AppExTarget-ExecutorLinkFileList-normal-x86_64.txt",
                             "\(srcRoot.str)/build/Debug-iphonesimulator/AppExTarget.appex/AppExTarget.debug.dylib",
-                            "-o", "\(srcRoot.str)/build/Debug-iphonesimulator/AppExTarget.appex/AppExTarget"
+                            "-o", "\(srcRoot.str)/build/Debug-iphonesimulator/AppExTarget.appex/AppExTarget",
                         ]
                     )
                 }
@@ -809,7 +841,8 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
                     guid: "ProjectNameGUID",
                     sourceRoot: srcRoot,
                     groupTree: TestGroup(
-                        "Sources", path: "Sources",
+                        "Sources",
+                        path: "Sources",
                         children: [
                             TestFile("main.swift"),
                             TestFile("FrameworkTarget.h"),
@@ -818,33 +851,37 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
                             TestFile("ObjC.m"),
                             TestFile("Info.plist"),
                             TestFile("Entitlements.plist"),
-                        ]),
+                        ]
+                    ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "iphoneos",
-                            "MACOSX_DEPLOYMENT_TARGET": "13.0",
-                            "ARCHS": archs.joined(separator: " "),
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "CODE_SIGN_IDENTITY": "",
-                            "CODE_SIGNING_ALLOWED": "NO",
-                            "INFOPLIST_FILE": "Sources/Info.plist",
-                            "SWIFT_VERSION": swiftVersion,
-                            "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                            "ENABLE_PREVIEWS": "YES",
-                            "CLANG_ENABLE_MODULES": "YES",
-                            "SDK_STAT_CACHE_ENABLE": "NO",
-
-                            "SWIFT_ENABLE_EXPLICIT_MODULES": explicitModules ? "YES" : "NO",
-
-                            "SUPPORTS_TEXT_BASED_API": "YES",
-                            "DYLIB_INSTALL_NAME_BASE": "@rpath",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "iphoneos",
+                                "MACOSX_DEPLOYMENT_TARGET": "13.0",
+                                "ARCHS": archs.joined(separator: " "),
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "CODE_SIGN_IDENTITY": "",
+                                "CODE_SIGNING_ALLOWED": "NO",
+                                "INFOPLIST_FILE": "Sources/Info.plist",
+                                "SWIFT_VERSION": swiftVersion,
+                                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                                "ENABLE_PREVIEWS": "YES",
+                                "CLANG_ENABLE_MODULES": "YES",
+                                "SDK_STAT_CACHE_ENABLE": "NO",
+
+                                "SWIFT_ENABLE_EXPLICIT_MODULES": explicitModules ? "YES" : "NO",
+
+                                "SUPPORTS_TEXT_BASED_API": "YES",
+                                "DYLIB_INSTALL_NAME_BASE": "@rpath",
+                            ]
+                        )
                     ],
                     targets: [
                         TestAggregateTarget(
                             "Umbrella",
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug"),
+                                TestBuildConfiguration("Debug")
                             ],
                             dependencies: [
                                 "AppTargetBundleLoader",
@@ -859,25 +896,32 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
                             "AppTargetBundleLoader",
                             type: .application,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: [
-                                    "SWIFT_OBJC_BRIDGING_HEADER": "Sources/BridgingHeader.h",
-                                ]),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SWIFT_OBJC_BRIDGING_HEADER": "Sources/BridgingHeader.h"
+                                    ]
+                                )
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase([
                                     TestBuildFile("main.swift"),
                                     TestBuildFile("ObjC.m"),
-                                ]),
-                            ]),
+                                ])
+                            ]
+                        ),
 
                         // Standard framework
                         TestStandardTarget(
                             "FrameworkTarget",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings:[
-                                    "DEFINES_MODULE": "YES",
-                                ]),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "DEFINES_MODULE": "YES"
+                                    ]
+                                )
                             ],
                             buildPhases: [
                                 TestHeadersBuildPhase([
@@ -888,27 +932,33 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
                                     TestBuildFile("main.swift"),
                                     TestBuildFile("ObjC.m"),
                                 ]),
-                            ]),
+                            ]
+                        ),
 
                         // Should not be able to generate previews
                         TestStandardTarget(
                             "StaticTarget",
                             type: .staticLibrary,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: [
-                                    "SWIFT_OBJC_BRIDGING_HEADER": "Sources/BridgingHeader.h",
-                                ]),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SWIFT_OBJC_BRIDGING_HEADER": "Sources/BridgingHeader.h"
+                                    ]
+                                )
                             ],
                             buildPhases: [
                                 TestHeadersBuildPhase([
-                                    TestBuildFile("ObjC.h", headerVisibility: .public),
+                                    TestBuildFile("ObjC.h", headerVisibility: .public)
                                 ]),
                                 TestSourcesBuildPhase([
                                     TestBuildFile("main.swift"),
                                     TestBuildFile("ObjC.m"),
                                 ]),
-                            ]),
-                    ])
+                            ]
+                        ),
+                    ]
+                )
                 let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
 
                 try await tester.fs.writePlist(srcRoot.join("Sources/Info.plist"), .plDict([:]))
@@ -1012,49 +1062,67 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
         try await withTemporaryDirectory { tmpDirPath in
             let srcRoot = tmpDirPath.join("srcroot")
 
-            let testProject = try await TestPackageProject("aPackage", sourceRoot: srcRoot,
-                                                           groupTree: TestGroup(
-                                                            "Sources", path: "Sources",
-                                                            children: [
-                                                                TestFile("main.swift"),
-                                                            ]),
-                                                           buildConfigurations: [
-                                                            TestBuildConfiguration("Debug", buildSettings: [
-                                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                            ])
-                                                           ],
-                                                           targets: [
-                                                            TestPackageProductTarget(
-                                                                "PackageLibProduct",
-                                                                frameworksBuildPhase: TestFrameworksBuildPhase([
-                                                                    TestBuildFile(.target("PackageLib"))]),
-                                                                buildConfigurations: [
-                                                                    // Targets need to opt-in to specialization.
-                                                                    TestBuildConfiguration("Debug", buildSettings: [
-                                                                        "SDKROOT": "auto",
-                                                                        "SDK_VARIANT": "auto",
-                                                                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                                                        "SWIFT_VERSION": swiftVersion,
-                                                                        "ENABLE_PREVIEWS": "YES",
-                                                                        "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                                                                    ]),
-                                                                ],
-                                                                dependencies: ["PackageLib"]
-                                                            ),
-                                                            TestStandardTarget("PackageLib", type: .objectFile,
-                                                                               buildConfigurations: [
-                                                                                // Targets need to opt-in to specialization.
-                                                                                TestBuildConfiguration("Debug", buildSettings: [
-                                                                                    "SDKROOT": "auto",
-                                                                                    "SDK_VARIANT": "auto",
-                                                                                    "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                                                                    "SWIFT_VERSION": swiftVersion,
-                                                                                    "ENABLE_PREVIEWS": "YES",
-                                                                                    "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                                                                                ]),
-                                                                               ],
-                                                                               buildPhases: [TestSourcesBuildPhase([TestBuildFile("main.swift")])]),
-                                                           ])
+            let testProject = try await TestPackageProject(
+                "aPackage",
+                sourceRoot: srcRoot,
+                groupTree: TestGroup(
+                    "Sources",
+                    path: "Sources",
+                    children: [
+                        TestFile("main.swift")
+                    ]
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)"
+                        ]
+                    )
+                ],
+                targets: [
+                    TestPackageProductTarget(
+                        "PackageLibProduct",
+                        frameworksBuildPhase: TestFrameworksBuildPhase([
+                            TestBuildFile(.target("PackageLib"))
+                        ]),
+                        buildConfigurations: [
+                            // Targets need to opt-in to specialization.
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "auto",
+                                    "SDK_VARIANT": "auto",
+                                    "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "ENABLE_PREVIEWS": "YES",
+                                    "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                                ]
+                            )
+                        ],
+                        dependencies: ["PackageLib"]
+                    ),
+                    TestStandardTarget(
+                        "PackageLib",
+                        type: .objectFile,
+                        buildConfigurations: [
+                            // Targets need to opt-in to specialization.
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "auto",
+                                    "SDK_VARIANT": "auto",
+                                    "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "ENABLE_PREVIEWS": "YES",
+                                    "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                                ]
+                            )
+                        ],
+                        buildPhases: [TestSourcesBuildPhase([TestBuildFile("main.swift")])]
+                    ),
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
 
             try await tester.fs.writeFileContents(srcRoot.join("Sources/main.swift")) { stream in
@@ -1096,17 +1164,21 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
         let sdkPath = core.sdkRegistry.lookup("iphoneos")!.path
         let targetName = target.target.name
 
-        let installAPIArgs = targetName == "FrameworkTarget" ? [
-            "-emit-tbd",
-            "-emit-tbd-path", "\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/Objects-normal/\(arch)/Swift-API.tbd",
-            "-Xfrontend", "-tbd-install_name", "-Xfrontend", "@rpath/FrameworkTarget.framework/FrameworkTarget"
-        ] : []
-
-        let moduleOverlayArgs = expectUnextendedModuleOverlay ? [
-            "-Xcc",
-            "-ivfsoverlay",
-            "-Xcc",
-            "\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/unextended-module-overlay.yaml",
+        let installAPIArgs =
+            targetName == "FrameworkTarget"
+            ? [
+                "-emit-tbd",
+                "-emit-tbd-path", "\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/Objects-normal/\(arch)/Swift-API.tbd",
+                "-Xfrontend", "-tbd-install_name", "-Xfrontend", "@rpath/FrameworkTarget.framework/FrameworkTarget",
+            ] : []
+
+        let moduleOverlayArgs =
+            expectUnextendedModuleOverlay
+            ? [
+                "-Xcc",
+                "-ivfsoverlay",
+                "-Xcc",
+                "\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/unextended-module-overlay.yaml",
             ] : []
 
         // Ignore irrelevant paths which change often
@@ -1117,43 +1189,50 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
             }
         }
 
-        XCTAssertEqualSequences(compileCommandLine, [[
-            "\(core.developerPath.path.str)/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc",
-            "-enforce-exclusivity=checked",
-            "-enable-experimental-feature", "DebugDescriptionMacro",
-            "-sdk", sdkPath.str,
-            "-target", "\(arch)-apple-ios\(core.loadSDK(.iOS).defaultDeploymentTarget)",
-            "-Xfrontend", "-serialize-debugging-options",
-            "-swift-version", try await swiftVersion,
-            "-I", "\(srcRoot.str)/build/Debug-iphoneos",
-            "-F", "\(srcRoot.str)/build/Debug-iphoneos",
-            ], installAPIArgs, [
-            "-c",
-            "-j\(ProcessInfo.processInfo.activeProcessorCount)",
-            "-no-color-diagnostics",
-            "-serialize-diagnostics",
-            "-Xcc", "-I\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/swift-overrides.hmap",
-            "-Xcc", "-iquote", "-Xcc", "\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/\(targetName)-generated-files.hmap",
-            "-Xcc", "-I\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/\(targetName)-own-target-headers.hmap",
-            "-Xcc", "-I\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/\(targetName)-all-non-framework-target-headers.hmap",
-            "-Xcc", "-ivfsoverlay", "-Xcc", "\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/ProjectName-ProjectNameGUID-VFS-iphoneos/all-product-headers.yaml",
-            "-Xcc", "-iquote", "-Xcc", "\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/\(targetName)-project-headers.hmap",
-            "-Xcc", "-I\(srcRoot.str)/build/Debug-iphoneos/include",
-            "-Xcc", "-I\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/DerivedSources-normal/\(arch)",
-            "-Xcc", "-I\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/DerivedSources/\(arch)",
-            "-Xcc", "-I\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/DerivedSources",
-            ], moduleOverlayArgs, [
-            "-working-directory", "\(srcRoot.str)",
-            "-experimental-emit-module-separately",
-            "-disable-cmo",
-            "-disable-bridging-pch",
-            "\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/Objects-normal/\(arch)/main.selection.preview-thunk.swift",
-            "-o", "\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/Objects-normal/\(arch)/main.selection.preview-thunk.o",
-            "-module-name", "\(targetName)_PreviewReplacement_main_selection",
-            "-parse-as-library",
-            "-Onone",
-            "-Xfrontend", "-disable-modules-validate-system-headers",
-        ]].reduce([], +))
+        XCTAssertEqualSequences(
+            compileCommandLine,
+            [
+                [
+                    "\(core.developerPath.path.str)/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc",
+                    "-enforce-exclusivity=checked",
+                    "-enable-experimental-feature", "DebugDescriptionMacro",
+                    "-sdk", sdkPath.str,
+                    "-target", "\(arch)-apple-ios\(core.loadSDK(.iOS).defaultDeploymentTarget)",
+                    "-Xfrontend", "-serialize-debugging-options",
+                    "-swift-version", try await swiftVersion,
+                    "-I", "\(srcRoot.str)/build/Debug-iphoneos",
+                    "-F", "\(srcRoot.str)/build/Debug-iphoneos",
+                ], installAPIArgs,
+                [
+                    "-c",
+                    "-j\(ProcessInfo.processInfo.activeProcessorCount)",
+                    "-no-color-diagnostics",
+                    "-serialize-diagnostics",
+                    "-Xcc", "-I\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/swift-overrides.hmap",
+                    "-Xcc", "-iquote", "-Xcc", "\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/\(targetName)-generated-files.hmap",
+                    "-Xcc", "-I\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/\(targetName)-own-target-headers.hmap",
+                    "-Xcc", "-I\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/\(targetName)-all-non-framework-target-headers.hmap",
+                    "-Xcc", "-ivfsoverlay", "-Xcc", "\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/ProjectName-ProjectNameGUID-VFS-iphoneos/all-product-headers.yaml",
+                    "-Xcc", "-iquote", "-Xcc", "\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/\(targetName)-project-headers.hmap",
+                    "-Xcc", "-I\(srcRoot.str)/build/Debug-iphoneos/include",
+                    "-Xcc", "-I\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/DerivedSources-normal/\(arch)",
+                    "-Xcc", "-I\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/DerivedSources/\(arch)",
+                    "-Xcc", "-I\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/DerivedSources",
+                ], moduleOverlayArgs,
+                [
+                    "-working-directory", "\(srcRoot.str)",
+                    "-experimental-emit-module-separately",
+                    "-disable-cmo",
+                    "-disable-bridging-pch",
+                    "\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/Objects-normal/\(arch)/main.selection.preview-thunk.swift",
+                    "-o", "\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/Objects-normal/\(arch)/main.selection.preview-thunk.o",
+                    "-module-name", "\(targetName)_PreviewReplacement_main_selection",
+                    "-parse-as-library",
+                    "-Onone",
+                    "-Xfrontend", "-disable-modules-validate-system-headers",
+                ],
+            ].reduce([], +)
+        )
 
         let linkStyleArgs: [String]
         switch linkStyle {
@@ -1171,23 +1250,29 @@ fileprivate struct PreviewsBuildOperationTests: CoreBasedTests {
             }
         }
 
-        XCTAssertEqualSequences(linkerCommandLine, [[
-            "\(core.developerPath.path.str)/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang",
-            "-Xlinker", "-reproducible",
-            "-target", "\(arch)-apple-ios\(core.loadSDK(.iOS).defaultDeploymentTarget)",
-            "-isysroot", sdkPath.str,
-            "-Os",
-            "-L\(srcRoot.str)/build/EagerLinkingTBDs/Debug-iphoneos",
-            "-L\(srcRoot.str)/build/Debug-iphoneos",
-            "-F\(srcRoot.str)/build/EagerLinkingTBDs/Debug-iphoneos",
-            "-F\(srcRoot.str)/build/Debug-iphoneos",
-            "-fobjc-link-runtime",
-            "-L\(core.developerPath.path.str)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphoneos",
-            "-L/usr/lib/swift",
-        ], linkStyleArgs, [
-                "\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/Objects-normal/\(arch)/main.selection.preview-thunk.o",
-                "-o", "\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/Objects-normal/\(arch)/main.selection.preview-thunk.dylib",
-            ]].reduce([], +))
+        XCTAssertEqualSequences(
+            linkerCommandLine,
+            [
+                [
+                    "\(core.developerPath.path.str)/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang",
+                    "-Xlinker", "-reproducible",
+                    "-target", "\(arch)-apple-ios\(core.loadSDK(.iOS).defaultDeploymentTarget)",
+                    "-isysroot", sdkPath.str,
+                    "-Os",
+                    "-L\(srcRoot.str)/build/EagerLinkingTBDs/Debug-iphoneos",
+                    "-L\(srcRoot.str)/build/Debug-iphoneos",
+                    "-F\(srcRoot.str)/build/EagerLinkingTBDs/Debug-iphoneos",
+                    "-F\(srcRoot.str)/build/Debug-iphoneos",
+                    "-fobjc-link-runtime",
+                    "-L\(core.developerPath.path.str)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphoneos",
+                    "-L/usr/lib/swift",
+                ], linkStyleArgs,
+                [
+                    "\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/Objects-normal/\(arch)/main.selection.preview-thunk.o",
+                    "-o", "\(srcRoot.str)/build/ProjectName.build/Debug-iphoneos/\(targetName).build/Objects-normal/\(arch)/main.selection.preview-thunk.dylib",
+                ],
+            ].reduce([], +)
+        )
     }
 
     /// Check that actually executing the command-lines we produced for previews will work for the scenarios we enumerated
diff --git a/Tests/SWBBuildSystemTests/RebuildTests.swift b/Tests/SWBBuildSystemTests/RebuildTests.swift
index d09445d2..ce824ac5 100644
--- a/Tests/SWBBuildSystemTests/RebuildTests.swift
+++ b/Tests/SWBBuildSystemTests/RebuildTests.swift
@@ -37,25 +37,31 @@ fileprivate struct RebuildTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
+                            "Sources",
+                            path: "Sources",
+                            children: [
                                 TestFile("ClassOne.swift"),
                                 TestFile("ClassTwo.swift"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "SDKROOT": "iphoneos",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "INFOPLIST_FILE": "Sources/Info.plist",
-                                "SWIFT_VERSION": swiftVersion,
-                                "CODE_SIGN_IDENTITY": "-",
-                                "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
-                                "EAGER_LINKING": "NO",
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "iphoneos",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "INFOPLIST_FILE": "Sources/Info.plist",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "CODE_SIGN_IDENTITY": "-",
+                                    "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
+                                    "EAGER_LINKING": "NO",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Framework", type: .framework,
+                                "Framework",
+                                type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "ClassOne.swift",
@@ -64,8 +70,10 @@ fileprivate struct RebuildTests: CoreBasedTests {
                                     TestFrameworksBuildPhase(),
                                 ]
                             )
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
diff --git a/Tests/SWBBuildSystemTests/SDKImportsBuildOperationTests.swift b/Tests/SWBBuildSystemTests/SDKImportsBuildOperationTests.swift
index 902bfb2e..2b0b7306 100644
--- a/Tests/SWBBuildSystemTests/SDKImportsBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/SDKImportsBuildOperationTests.swift
@@ -28,22 +28,26 @@ fileprivate struct SDKImportsBuildOperationTests: CoreBasedTests {
                 children: [
                     TestFile("main.swift"),
                     TestFile("static.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ARCHS": "$(ARCHS_STANDARD)",
-                    "CODE_SIGNING_ALLOWED": "YES",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
-                    "DEFINES_MODULE": "YES",
-                    "ENABLE_SDK_IMPORTS": "YES",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SDKROOT": "$(HOST_PLATFORM)",
-                    "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
-                    "SWIFT_VERSION": swiftVersion,
-                    "OTHER_LDFLAGS": ldFlags,
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS": "$(ARCHS_STANDARD)",
+                        "CODE_SIGNING_ALLOWED": "YES",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
+                        "DEFINES_MODULE": "YES",
+                        "ENABLE_SDK_IMPORTS": "YES",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SDKROOT": "$(HOST_PLATFORM)",
+                        "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
+                        "SWIFT_VERSION": swiftVersion,
+                        "OTHER_LDFLAGS": ldFlags,
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -52,21 +56,22 @@ fileprivate struct SDKImportsBuildOperationTests: CoreBasedTests {
                     buildPhases: [
                         TestSourcesBuildPhase(["main.swift"]),
                         TestFrameworksBuildPhase([
-                            TestBuildFile(.target("staticlib")),
-                        ])
+                            TestBuildFile(.target("staticlib"))
+                        ]),
                     ],
                     dependencies: [
-                        "staticlib",
+                        "staticlib"
                     ]
                 ),
                 TestStandardTarget(
                     "staticlib",
                     type: .staticLibrary,
                     buildPhases: [
-                        TestSourcesBuildPhase(["static.swift"]),
+                        TestSourcesBuildPhase(["static.swift"])
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
@@ -96,7 +101,7 @@ fileprivate struct SDKImportsBuildOperationTests: CoreBasedTests {
             let tester = try await makeTester(tmpDir: tmpDir)
             let provisioningInputs = [
                 "staticlib": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict([:])),
-                "tool": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict([:]))
+                "tool": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict([:])),
             ]
 
             let destination: RunDestinationInfo = .host
@@ -132,36 +137,42 @@ fileprivate struct SDKImportsBuildOperationTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("lib.swift"),
-                    ]),
+                        TestFile("lib.swift")
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ARCHS": "$(ARCHS_STANDARD)",
-                        "CODE_SIGNING_ALLOWED": "NO",
-                        "DEFINES_MODULE": "YES",
-                        "ENABLE_SDK_IMPORTS": "YES",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "$(HOST_PLATFORM)",
-                        "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
-                        "SWIFT_VERSION": swiftVersion,
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ARCHS": "$(ARCHS_STANDARD)",
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "DEFINES_MODULE": "YES",
+                            "ENABLE_SDK_IMPORTS": "YES",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "$(HOST_PLATFORM)",
+                            "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
+                            "SWIFT_VERSION": swiftVersion,
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "lib",
                         type: .staticLibrary,
                         buildPhases: [
-                            TestSourcesBuildPhase(["lib.swift"]),
-                        ], dependencies: [
-                            "resources",
+                            TestSourcesBuildPhase(["lib.swift"])
+                        ],
+                        dependencies: [
+                            "resources"
                         ]
                     ),
                     TestStandardTarget(
                         "resources",
                         type: .bundle
-                    )
-                ])
+                    ),
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
@@ -198,7 +209,7 @@ fileprivate struct SDKImportsBuildOperationTests: CoreBasedTests {
                 let tester = try await makeTester(ldFlags: flags, tmpDir: tmpDir)
                 let provisioningInputs = [
                     "staticlib": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict([:])),
-                    "tool": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict([:]))
+                    "tool": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict([:])),
                 ]
 
                 let destination: RunDestinationInfo = .host
@@ -216,4 +227,3 @@ fileprivate struct SDKImportsBuildOperationTests: CoreBasedTests {
         }
     }
 }
-
diff --git a/Tests/SWBBuildSystemTests/SceneKitBuildOperationTests.swift b/Tests/SWBBuildSystemTests/SceneKitBuildOperationTests.swift
index 918f1936..d16d0090 100644
--- a/Tests/SWBBuildSystemTests/SceneKitBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/SceneKitBuildOperationTests.swift
@@ -25,35 +25,41 @@ fileprivate struct SceneKitBuildOperationTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("A.dae"),
                         TestFile("B.dae"),
-                        TestFile("C.DAE"), // test that uppercase extensions work too
+                        TestFile("C.DAE"),  // test that uppercase extensions work too
                         TestFile("D.scnassets"),
                         TestFile("E.scncache"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
                             "GENERATE_INFOPLIST_FILE": "YES",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
-                    TestStandardTarget("App",
-                                       type: .application,
-                                       buildPhases: [
-                        TestResourcesBuildPhase([
-                            TestBuildFile("A.dae", decompress: false),
-                            TestBuildFile("B.dae", decompress: true),
-                            TestBuildFile("C.DAE", decompress: false),
-                            TestBuildFile("D.scnassets"),
-                            TestBuildFile("E.scncache"),
-                        ]),
-                    ]),
-                ])
+                    TestStandardTarget(
+                        "App",
+                        type: .application,
+                        buildPhases: [
+                            TestResourcesBuildPhase([
+                                TestBuildFile("A.dae", decompress: false),
+                                TestBuildFile("B.dae", decompress: true),
+                                TestBuildFile("C.DAE", decompress: false),
+                                TestBuildFile("D.scnassets"),
+                                TestBuildFile("E.scncache"),
+                            ])
+                        ]
+                    )
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -91,7 +97,7 @@ fileprivate struct SceneKitBuildOperationTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("Copy"), .matchRuleItemBasename("D.scnassets")) { task in
                     task.checkRuleInfo(["Copy", "SceneKit", "assets", "\(SRCROOT)/Sources/D.scnassets"])
                     task.checkCommandLineContainsUninterrupted(["\(core.developerPath.path.str)/usr/bin/copySceneKitAssets", "\(SRCROOT)/Sources/D.scnassets", "-o", "\(SRCROOT)/build/Debug/App.app/Contents/Resources/D.scnassets", "--target-platform=macosx", "--target-version=\(core.loadSDK(.macOS).defaultDeploymentTarget)"])
-                    task.checkCommandLineContainsUninterrupted([ "--target-build-dir=\(SRCROOT)/build/Debug", "--resources-folder-path=App.app/Contents/Resources"])
+                    task.checkCommandLineContainsUninterrupted(["--target-build-dir=\(SRCROOT)/build/Debug", "--resources-folder-path=App.app/Contents/Resources"])
                     task.checkEnvironment([:], exact: true)
                 }
                 results.checkTask(.matchRuleType("Compile"), .matchRuleItemBasename("E.scncache")) { task in
diff --git a/Tests/SWBBuildSystemTests/ShellScriptSandboxingTests.swift b/Tests/SWBBuildSystemTests/ShellScriptSandboxingTests.swift
index b1f0f3f6..7ade068a 100644
--- a/Tests/SWBBuildSystemTests/ShellScriptSandboxingTests.swift
+++ b/Tests/SWBBuildSystemTests/ShellScriptSandboxingTests.swift
@@ -62,13 +62,17 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                 TestFile("raw.txt"),
                                 TestFile("subfolder/rawFileInSubfolder.txt"),
                                 TestFile("subfolder/subsubfolder/rawFileInSubsubfolder.txt"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "Calculate Checksum Target",
@@ -98,8 +102,12 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
 
                                     // Is writing to the null device allowed?
                                     TestShellScriptBuildPhase(name: "WriteToDevNull", shellPath: "/bin/bash", originalObjectID: "WriteToDevNull", contents: "echo Hello > \(Path.null.str)", inputs: [], outputs: [], alwaysOutOfDate: true),
-                                ]),
-                        ])])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -206,15 +214,19 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("raw.txt"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
-                                "USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES": "YES"
-                            ])],
+                                TestFile("raw.txt")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                                    "USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "Calculate Checksum Target",
@@ -229,10 +241,14 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                             cat "${SCRIPT_INPUT_FILE_0}/raw.txt" | md5 > "${SCRIPT_OUTPUT_FILE_0}"
                                             """#,
                                         inputs: ["$(SRCROOT)/myCryptoProject/"],
-                                        outputs: ["$DERIVED_FILE_DIR/checksum1.txt"]),
+                                        outputs: ["$DERIVED_FILE_DIR/checksum1.txt"]
+                                    )
                                 ]
-                            ),
-                        ])])
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -277,7 +293,6 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
         }
     }
 
-
     // Some files are written to /tmp/raw/
     // TaskA reads /tmp/raw/ and produces /tmp/headers/
     // TaskB reads /tmp/headers/ and produces /tmp/headers-copy/
@@ -323,23 +338,29 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestGroup("raw", children: [
-                                    TestFile("libX.fake-h"),
-                                    TestFile("libY.fake-h"),
-                                    TestFile("libZ.fake-h"),
-                                ])
+                                TestGroup(
+                                    "raw",
+                                    children: [
+                                        TestFile("libX.fake-h"),
+                                        TestFile("libY.fake-h"),
+                                        TestFile("libZ.fake-h"),
+                                    ]
+                                )
                             ]
                         ),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
-                                "FUSE_BUILD_SCRIPT_PHASES": "YES",
-                                "USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES": "YES",
-                                "ALLOW_DISJOINTED_DIRECTORIES_AS_DEPENDENCIES": "YES",
-                            ])],
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                                    "FUSE_BUILD_SCRIPT_PHASES": "YES",
+                                    "USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES": "YES",
+                                    "ALLOW_DISJOINTED_DIRECTORIES_AS_DEPENDENCIES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "ALL",
@@ -366,7 +387,8 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                             cat "${SCRIPT_OUTPUT_FILE_0}"
                                             """#,
                                         inputs: ["$(SHARED_DERIVED_FILE_DIR)/headers-processed/libY.fake-h"],
-                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/libY-from-TaskC.fake-h"]),
+                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/libY-from-TaskC.fake-h"]
+                                    )
                                 ],
                                 dependencies: ["TargetB"]
                             ),
@@ -395,7 +417,8 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                             done
                                             """#,
                                         inputs: ["$(SHARED_DERIVED_FILE_DIR)/headers/"],
-                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/headers-processed/"]),
+                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/headers-processed/"]
+                                    )
                                 ],
                                 dependencies: ["TargetA"]
                             ),
@@ -425,11 +448,16 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
 
                                             cat "${SCRIPT_OUTPUT_FILE_0}"/*
                                             """#,
-                                        inputs: ["$(SRCROOT)/myCryptoProject/raw/"], outputs: ["$(SHARED_DERIVED_FILE_DIR)/headers/"]),
+                                        inputs: ["$(SRCROOT)/myCryptoProject/raw/"],
+                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/headers/"]
+                                    )
                                 ],
                                 dependencies: ["Other"]
                             ),
-                        ])])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, continueBuildingAfterErrors: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -551,18 +579,21 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                         "myCryptoProject",
                         groupTree: TestGroup(
                             "Sources",
-                            children: [
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "NO", // We try both cases in this test
-                                "USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES": "YES",
-                                "ALLOW_DISJOINTED_DIRECTORIES_AS_DEPENDENCIES": "YES",
-                                "FUSE_BUILD_SCRIPT_PHASES": "YES",
-                            ])],
+                            children: []
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "NO",  // We try both cases in this test
+                                    "USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES": "YES",
+                                    "ALLOW_DISJOINTED_DIRECTORIES_AS_DEPENDENCIES": "YES",
+                                    "FUSE_BUILD_SCRIPT_PHASES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "ALL",
@@ -586,7 +617,8 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                             cat "${SCRIPT_INPUT_FILE_0}" | tr a-z A-Z > "${SCRIPT_OUTPUT_FILE_0}"
                                             """#,
                                         inputs: ["$(SHARED_DERIVED_FILE_DIR)/out/a.txt"],
-                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/output.txt"]),
+                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/output.txt"]
+                                    )
                                 ],
                                 dependencies: ["Other"]
                             ),
@@ -608,20 +640,28 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                             echo "$A_DOT_TXT_PREFIX: Output from TaskAB for a.txt!" > "${SCRIPT_OUTPUT_FILE_0}"/a.txt
                                             echo "$B_DOT_TXT_PREFIX: Output from TaskAB for b.txt!" > "${SCRIPT_OUTPUT_FILE_0}"/b.txt
                                             """#,
-                                        inputs: [], outputs: ["$(SHARED_DERIVED_FILE_DIR)/out/"]),
+                                        inputs: [],
+                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/out/"]
+                                    )
                                 ],
                                 dependencies: ["Other"]
                             ),
-                        ])])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             for enableSandboxingInTest in ["YES", "NO"] {
-                var overriddenParameters = BuildParameters(configuration: "Debug",
-                                                           overrides: ["ENABLE_USER_SCRIPT_SANDBOXING": enableSandboxingInTest,
-                                                                       "A_DOT_TXT_PREFIX": "A_PREFIX",
-                                                                       "B_DOT_TXT_PREFIX": "B_PREFIX",
-                                                                      ])
+                var overriddenParameters = BuildParameters(
+                    configuration: "Debug",
+                    overrides: [
+                        "ENABLE_USER_SCRIPT_SANDBOXING": enableSandboxingInTest,
+                        "A_DOT_TXT_PREFIX": "A_PREFIX",
+                        "B_DOT_TXT_PREFIX": "B_PREFIX",
+                    ]
+                )
 
                 try await tester.checkBuild(parameters: overriddenParameters, runDestination: .macOS, persistent: true) { results in
                     // Check that build succeeds
@@ -647,11 +687,14 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                 }
 
                 // Change $A_DOT_TXT_PREFIX
-                overriddenParameters = BuildParameters(configuration: "Debug",
-                                                       overrides: ["ENABLE_USER_SCRIPT_SANDBOXING": enableSandboxingInTest,
-                                                                   "A_DOT_TXT_PREFIX": "UPDATED_A_PREFIX",
-                                                                   "B_DOT_TXT_PREFIX": "B_PREFIX",
-                                                                  ])
+                overriddenParameters = BuildParameters(
+                    configuration: "Debug",
+                    overrides: [
+                        "ENABLE_USER_SCRIPT_SANDBOXING": enableSandboxingInTest,
+                        "A_DOT_TXT_PREFIX": "UPDATED_A_PREFIX",
+                        "B_DOT_TXT_PREFIX": "B_PREFIX",
+                    ]
+                )
 
                 // Incremental build to reflect the change in environment variable
                 try await tester.checkBuild(parameters: overriddenParameters, runDestination: .macOS, persistent: true) { results in
@@ -678,11 +721,14 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                 }
 
                 // Change $B_DOT_TXT_PREFIX
-                overriddenParameters = BuildParameters(configuration: "Debug",
-                                                       overrides: ["ENABLE_USER_SCRIPT_SANDBOXING": enableSandboxingInTest,
-                                                                   "A_DOT_TXT_PREFIX": "UPDATED_A_PREFIX",
-                                                                   "B_DOT_TXT_PREFIX": "UPDATED_B_PREFIX",
-                                                                  ])
+                overriddenParameters = BuildParameters(
+                    configuration: "Debug",
+                    overrides: [
+                        "ENABLE_USER_SCRIPT_SANDBOXING": enableSandboxingInTest,
+                        "A_DOT_TXT_PREFIX": "UPDATED_A_PREFIX",
+                        "B_DOT_TXT_PREFIX": "UPDATED_B_PREFIX",
+                    ]
+                )
 
                 // Swift Build cannot detect ahead of time that change to B_DOT_TXT_PREFIX will have no effect on the input of TaskC
                 // In this case rescheduling TaskAB and TaskC due to change in environment variables is correct..
@@ -738,17 +784,20 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                         "myCryptoProject",
                         groupTree: TestGroup(
                             "Sources",
-                            children: [
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "NO", // We test for both cases in this test
-                                "USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES": "YES",
-                                "ALLOW_DISJOINTED_DIRECTORIES_AS_DEPENDENCIES": "YES",
-                                "FUSE_BUILD_SCRIPT_PHASES": "YES",
-                            ])],
+                            children: []
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "NO",  // We test for both cases in this test
+                                    "USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES": "YES",
+                                    "ALLOW_DISJOINTED_DIRECTORIES_AS_DEPENDENCIES": "YES",
+                                    "FUSE_BUILD_SCRIPT_PHASES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "ErroneousTaskWritingToDirectoryOwnedByOtherTask",
@@ -767,7 +816,8 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                             echo "Output from TaskC.. This should be blocked" > "${SCRIPT_OUTPUT_FILE_0}"
                                             """#,
                                         inputs: [],
-                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/out/c.txt"]),
+                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/out/c.txt"]
+                                    ),
                                     TestShellScriptBuildPhase(
                                         name: "TaskB",
                                         shellPath: "/bin/bash",
@@ -782,7 +832,8 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                             cat "${SCRIPT_INPUT_FILE_0}" | tr a-z A-Z > "${SCRIPT_OUTPUT_FILE_0}"
                                             """#,
                                         inputs: ["$(SHARED_DERIVED_FILE_DIR)/out/a.txt"],
-                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/output.txt"]),
+                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/output.txt"]
+                                    ),
                                     TestShellScriptBuildPhase(
                                         name: "TaskA",
                                         shellPath: "/bin/bash",
@@ -797,25 +848,37 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                             echo "$A_DOT_TXT_PREFIX: Output from TaskA for a.txt!" > "${SCRIPT_OUTPUT_FILE_0}"/a.txt
                                             echo "$B_DOT_TXT_PREFIX: Output from TaskA for b.txt!" > "${SCRIPT_OUTPUT_FILE_0}"/b.txt
                                             """#,
-                                        inputs: [], outputs: ["$(SHARED_DERIVED_FILE_DIR)/out/"]),
+                                        inputs: [],
+                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/out/"]
+                                    ),
                                 ]
-                            ),
-                        ])])
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, continueBuildingAfterErrors: false)
 
-            let overriddenParameters = BuildParameters(configuration: "Debug",
-                                                       overrides: ["A_DOT_TXT_PREFIX": "A_PREFIX",
-                                                                   "B_DOT_TXT_PREFIX": "B_PREFIX",
-                                                                  ])
+            let overriddenParameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    "A_DOT_TXT_PREFIX": "A_PREFIX",
+                    "B_DOT_TXT_PREFIX": "B_PREFIX",
+                ]
+            )
 
             try await tester.checkBuild(parameters: overriddenParameters, runDestination: .macOS, persistent: true) { results in
                 // Check that build fails
                 results.checkError(
-                    .and(.prefix("Multiple commands produce"),
-                         .and(
+                    .and(
+                        .prefix("Multiple commands produce"),
+                        .and(
                             .and(.contains("TaskC"), .contains("TaskA")),
-                            .contains("c.txt"))))
+                            .contains("c.txt")
+                        )
+                    )
+                )
                 results.checkError("unable to load build file")
                 results.checkNoDiagnostics()
 
@@ -849,16 +912,19 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                         "myCryptoProject",
                         groupTree: TestGroup(
                             "Sources",
-                            children: [
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES": "YES",
-                                "ALLOW_DISJOINTED_DIRECTORIES_AS_DEPENDENCIES": "YES",
-                                "FUSE_BUILD_SCRIPT_PHASES": "YES",
-                            ])],
+                            children: []
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES": "YES",
+                                    "ALLOW_DISJOINTED_DIRECTORIES_AS_DEPENDENCIES": "YES",
+                                    "FUSE_BUILD_SCRIPT_PHASES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "ALL",
@@ -877,7 +943,8 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                             # contents of the script are irrelevant to this test
                                             """#,
                                         inputs: ["$(SRCROOT)/out/"],
-                                        outputs: ["$(SRCROOT)/mock.txt"]),
+                                        outputs: ["$(SRCROOT)/mock.txt"]
+                                    )
                                 ],
                                 dependencies: ["Other"]
                             ),
@@ -894,7 +961,8 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                             # contents of the script are irrelevant to this test
                                             """#,
                                         inputs: [],
-                                        outputs: ["$(SRCROOT)/out/"]),
+                                        outputs: ["$(SRCROOT)/out/"]
+                                    )
                                 ],
                                 dependencies: ["Other"]
                             ),
@@ -910,21 +978,29 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                             # contents of the script are irrelevant to this test
                                             """#,
                                         inputs: [],
-                                        outputs: ["$(SRCROOT)/out/"])
+                                        outputs: ["$(SRCROOT)/out/"]
+                                    )
                                 ],
                                 dependencies: ["Other"]
                             ),
-                        ])])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false, continueBuildingAfterErrors: false)
 
             try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
                 // Check that build fails
                 results.checkError(
-                    .and(.prefix("Multiple commands produce"),
-                         .and(
+                    .and(
+                        .prefix("Multiple commands produce"),
+                        .and(
                             .and(.contains("TaskA"), .contains("TaskB")),
-                            .contains("out/"))))
+                            .contains("out/")
+                        )
+                    )
+                )
                 results.checkWarning(.and(.prefix("duplicate output file"), .contains("Test/myCryptoProject/out")))
                 results.checkError("unable to load build file")
                 results.checkNoDiagnostics()
@@ -962,17 +1038,21 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                         "myCryptoProject",
                         groupTree: TestGroup(
                             "Sources",
-                            children: [TestFile("raw.txt")]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "NO", // We try both cases in this test
-                                "USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES": "YES",
-                                "ALLOW_DISJOINTED_DIRECTORIES_AS_DEPENDENCIES": "YES",
-                                "FUSE_BUILD_SCRIPT_PHASES": "YES",
-                            ])],
+                            children: [TestFile("raw.txt")]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "NO",  // We try both cases in this test
+                                    "USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES": "YES",
+                                    "ALLOW_DISJOINTED_DIRECTORIES_AS_DEPENDENCIES": "YES",
+                                    "FUSE_BUILD_SCRIPT_PHASES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "ALL",
@@ -994,7 +1074,9 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                             set -o pipefail
                                             echo "Output from TaskB for b.txt!" > "${SCRIPT_OUTPUT_FILE_0}"
                                             """#,
-                                        inputs: [], outputs: ["$(SHARED_DERIVED_FILE_DIR)/out/b.txt"]),
+                                        inputs: [],
+                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/out/b.txt"]
+                                    )
                                 ],
                                 dependencies: ["Other"]
                             ),
@@ -1015,7 +1097,9 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                             cat "${SCRIPT_INPUT_FILE_0}" > "${SCRIPT_OUTPUT_FILE_0}"
                                             cat "${SCRIPT_OUTPUT_FILE_0}"
                                             """#,
-                                        inputs: ["$(SRCROOT)/myCryptoProject/raw.txt"], outputs: ["$(SHARED_DERIVED_FILE_DIR)/out/a.txt"]),
+                                        inputs: ["$(SRCROOT)/myCryptoProject/raw.txt"],
+                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/out/a.txt"]
+                                    )
                                 ],
                                 dependencies: ["Other"]
                             ),
@@ -1037,11 +1121,15 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                             cat "${SCRIPT_INPUT_FILE_0}"/* | tr a-z A-Z > "${SCRIPT_OUTPUT_FILE_0}"
                                             """#,
                                         inputs: ["$(SHARED_DERIVED_FILE_DIR)/out/"],
-                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/combine-a-and-b.txt"]),
+                                        outputs: ["$(SHARED_DERIVED_FILE_DIR)/combine-a-and-b.txt"]
+                                    )
                                 ],
                                 dependencies: ["Other"]
                             ),
-                        ])])
+                        ]
+                    )
+                ]
+            )
 
             for enableSandboxingInTest in ["YES", "NO"] {
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
@@ -1117,20 +1205,24 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("A.txt"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
-                                "USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES": "YES"
-                            ])],
+                                TestFile("A.txt")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                                    "USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "TargetWithUndeclaredInput",
                                 buildPhases: [
-                                    TestShellScriptBuildPhase(name: "ScriptWithUndeclaredInput", shellPath: "/bin/bash", originalObjectID: "ScriptWithUndeclaredInput", contents: #"cat "$FAKE_PATH""#, inputs: [], outputs: []),
+                                    TestShellScriptBuildPhase(name: "ScriptWithUndeclaredInput", shellPath: "/bin/bash", originalObjectID: "ScriptWithUndeclaredInput", contents: #"cat "$FAKE_PATH""#, inputs: [], outputs: [])
                                 ]
                             ),
                             TestAggregateTarget(
@@ -1153,13 +1245,18 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                             ) &> "${DERIVED_FILE_DIR}/new-folder/log.txt"
                                             """#,
                                         inputs: [],
-                                        outputs: [ "$(DERIVED_FILE_DIR)/new-folder/",
-                                                   "$(DERIVED_FILE_DIR)/new-folder/declared.txt",
-                                                   "$(DERIVED_FILE_DIR)/new-folder/log.txt" ]
+                                        outputs: [
+                                            "$(DERIVED_FILE_DIR)/new-folder/",
+                                            "$(DERIVED_FILE_DIR)/new-folder/declared.txt",
+                                            "$(DERIVED_FILE_DIR)/new-folder/log.txt",
+                                        ]
                                     )
                                 ]
                             ),
-                        ])])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1171,8 +1268,10 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
             }
 
             // Override FAKE_PATH with testWorkspace.sourceRoot.join("aProject/A.txt")
-            let overriddenParameters = BuildParameters(configuration: "Debug",
-                                                       overrides: ["FAKE_PATH": Path(SRCROOT).join("aProject/A.txt").str])
+            let overriddenParameters = BuildParameters(
+                configuration: "Debug",
+                overrides: ["FAKE_PATH": Path(SRCROOT).join("aProject/A.txt").str]
+            )
 
             // Note: the two user scripts are not dependent on each other.
             // We manually run each target in the test via `firstBuildRequest` and `secondBuildRequest`
@@ -1191,18 +1290,20 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                     do {
                         let path = task.workingDirectory.join("build/aProject.build/Debug/TargetWithUndeclaredOutput.build/DerivedSources/new-folder/log.txt")
                         let output = try tester.fs.read(path).asString
-                        let expectedOutput = try Regex<Substring>("""
-                        \\+ set -o errexit
-                        \\+ set -o nounset
-                        \\+ set -o pipefail
-                        \\+ echo 'Contents of the declared file'
-                        \\+ cat .*
-                        Contents of the declared file
-                        \\+ echo Non-violation
-                        \\+ echo Violation
-                        .*/undeclared.txt: Operation not permitted
-                        $
-                        """)
+                        let expectedOutput = try Regex<Substring>(
+                            """
+                            \\+ set -o errexit
+                            \\+ set -o nounset
+                            \\+ set -o pipefail
+                            \\+ echo 'Contents of the declared file'
+                            \\+ cat .*
+                            Contents of the declared file
+                            \\+ echo Non-violation
+                            \\+ echo Violation
+                            .*/undeclared.txt: Operation not permitted
+                            $
+                            """
+                        )
                         XCTAssertMatch(output, .regex(expectedOutput))
                     }
 
@@ -1233,20 +1334,24 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("A.txt"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
-                                "USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES": "YES"
-                            ])],
+                                TestFile("A.txt")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                                    "USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "TargetWithUndeclaredInput",
                                 buildPhases: [
-                                    TestShellScriptBuildPhase(name: "ScriptWithUndeclaredInput", shellPath: "/bin/bash", originalObjectID: "ScriptWithUndeclaredInput", contents: #"cat "$FAKE_PATH""#, inputs: [], outputs: []),
+                                    TestShellScriptBuildPhase(name: "ScriptWithUndeclaredInput", shellPath: "/bin/bash", originalObjectID: "ScriptWithUndeclaredInput", contents: #"cat "$FAKE_PATH""#, inputs: [], outputs: [])
                                 ]
                             ),
                             TestAggregateTarget(
@@ -1268,13 +1373,18 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                             ) &> "${DERIVED_FILE_DIR}/new-folder/log.txt"
                                             """#,
                                         inputs: [],
-                                        outputs: [ "$(DERIVED_FILE_DIR)/new-folder/",
-                                                   "$(DERIVED_FILE_DIR)/new-folder/declared.txt",
-                                                   "$(DERIVED_FILE_DIR)/new-folder/log.txt" ]
+                                        outputs: [
+                                            "$(DERIVED_FILE_DIR)/new-folder/",
+                                            "$(DERIVED_FILE_DIR)/new-folder/declared.txt",
+                                            "$(DERIVED_FILE_DIR)/new-folder/log.txt",
+                                        ]
                                     )
                                 ]
                             ),
-                        ])])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1286,8 +1396,10 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
             }
 
             // Override FAKE_PATH with testWorkspace.sourceRoot.join("aProject/A.txt")
-            let overriddenParameters = BuildParameters(configuration: "Debug",
-                                                       overrides: ["FAKE_PATH": Path(SRCROOT).join("aProject/A.txt").str])
+            let overriddenParameters = BuildParameters(
+                configuration: "Debug",
+                overrides: ["FAKE_PATH": Path(SRCROOT).join("aProject/A.txt").str]
+            )
 
             // Note: the two user scripts are not dependent on each other.
             // We manually run each target in the test via `firstBuildRequest` and `secondBuildRequest`
@@ -1305,15 +1417,17 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                 try results.checkTask(.matchRuleType("PhaseScriptExecution"), .matchRuleItemPattern(.contains("ScriptWithUndeclaredOutput"))) { task in
                     let path = task.workingDirectory.join("build/aProject.build/Debug/TargetWithUndeclaredOutput.build/DerivedSources/new-folder/log.txt")
                     let output = try tester.fs.read(path).asString
-                    let expectedOutput = try Regex<Substring>("""
-                    \\+ set -o errexit
-                    \\+ set -o nounset
-                    \\+ set -o pipefail
-                    \\+ echo 'Contents of the declared file'
-                    \\+ cat .*
-                    Contents of the declared file
-                    \\+ echo Violation
-                    """)
+                    let expectedOutput = try Regex<Substring>(
+                        """
+                        \\+ set -o errexit
+                        \\+ set -o nounset
+                        \\+ set -o pipefail
+                        \\+ echo 'Contents of the declared file'
+                        \\+ cat .*
+                        Contents of the declared file
+                        \\+ echo Violation
+                        """
+                    )
                     XCTAssertMatch(output, .regex(expectedOutput))
                     self.checkForFlakyViolations(results, #/file-write-create .*/new-folder/undeclared.txt .*/#)
                 }
@@ -1327,14 +1441,14 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
     func ensureMkdirSucceedsInDeclaredOutput() async throws {
         try await withTemporaryDirectory() { tmpDirPath async throws -> Void in
             let script = #"""
-            set -o xtrace
-            set -o errexit
-            set -o nounset
-            cd "${SRCROOT}"
-            echo "File Zero" > "${SCRIPT_OUTPUT_FILE_0}"
-            cd subFolder # Already exists because Swift Build creates ancestors of outputs before script execution
-            echo "File One" > "${SCRIPT_OUTPUT_FILE_1}"
-            """#
+                set -o xtrace
+                set -o errexit
+                set -o nounset
+                cd "${SRCROOT}"
+                echo "File Zero" > "${SCRIPT_OUTPUT_FILE_0}"
+                cd subFolder # Already exists because Swift Build creates ancestors of outputs before script execution
+                echo "File One" > "${SCRIPT_OUTPUT_FILE_1}"
+                """#
 
             let testWorkspace = TestWorkspace(
                 "Test",
@@ -1344,21 +1458,28 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                         "myProjectWithPostProcessor",
                         groupTree: TestGroup(
                             "Sources",
-                            children: []),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
-                            ])],
+                            children: []
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "TargetWithTwoOutputs",
                                 buildPhases: [
-                                    TestShellScriptBuildPhase(name: "EnsureSubdirectoriesExist", shellPath: "/bin/bash", originalObjectID: "EnsureSubdirectoriesExist", contents: script, inputs: [], outputs: ["$(SRCROOT)/fileZero.txt", "$(SRCROOT)/subFolder/fileOne.txt"]),
+                                    TestShellScriptBuildPhase(name: "EnsureSubdirectoriesExist", shellPath: "/bin/bash", originalObjectID: "EnsureSubdirectoriesExist", contents: script, inputs: [], outputs: ["$(SRCROOT)/fileZero.txt", "$(SRCROOT)/subFolder/fileOne.txt"])
                                 ]
-                            ),
-                        ])])
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1396,26 +1517,37 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                 TestFile("raw.txt"),
                                 TestFile("in.xcfilelist"),
                                 TestFile("out.xcfilelist"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "CalculateChecksumTarget",
                                 buildPhases: [
-                                    TestShellScriptBuildPhase(name: "Run My Crypto", shellPath: "/bin/bash", originalObjectID: "RunMyCrypto", contents: #"set -e; cat "${FAKE_PATH_IN}" | md5 > "${DERIVED_FILE_DIR}/checksum.txt""#,
-                                                              inputs: [],
-                                                              inputFileLists: ["$(SRCROOT)/myCryptoProject/in.xcfilelist"],
-                                                              outputs: [],
-                                                              outputFileLists: ["$(SRCROOT)/myCryptoProject/out.xcfilelist"]
-                                                             ),
+                                    TestShellScriptBuildPhase(
+                                        name: "Run My Crypto",
+                                        shellPath: "/bin/bash",
+                                        originalObjectID: "RunMyCrypto",
+                                        contents: #"set -e; cat "${FAKE_PATH_IN}" | md5 > "${DERIVED_FILE_DIR}/checksum.txt""#,
+                                        inputs: [],
+                                        inputFileLists: ["$(SRCROOT)/myCryptoProject/in.xcfilelist"],
+                                        outputs: [],
+                                        outputFileLists: ["$(SRCROOT)/myCryptoProject/out.xcfilelist"]
+                                    )
                                 ]
-                            ),
-                        ])])
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1440,8 +1572,10 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                 stream <<< "$(DERIVED_FILE_DIR)/checksum.txt\n"
             }
 
-            let overriddenParameters = BuildParameters(configuration: "Debug",
-                                                       overrides: ["FAKE_PATH_IN": Path(SRCROOT).join("myCryptoProject/raw.txt").str])
+            let overriddenParameters = BuildParameters(
+                configuration: "Debug",
+                overrides: ["FAKE_PATH_IN": Path(SRCROOT).join("myCryptoProject/raw.txt").str]
+            )
 
             // Ensure content of checksum.txt is 8422bdbdffd21972340e63e377d9dbcf with no violation.
             try await tester.checkBuild(parameters: overriddenParameters, runDestination: .macOS) { results in
@@ -1479,28 +1613,35 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("A.txt"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
-                            ])],
+                                TestFile("A.txt")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "TargetWithUndeclaredInput",
                                 buildPhases: [
-                                    TestShellScriptBuildPhase(name: "ScriptWithUndeclaredInput", shellPath: "/bin/bash", originalObjectID: "ScriptWithUndeclaredInput", contents: #"cat "$FAKE_PATH""#, inputs: [], outputs: []),
+                                    TestShellScriptBuildPhase(name: "ScriptWithUndeclaredInput", shellPath: "/bin/bash", originalObjectID: "ScriptWithUndeclaredInput", contents: #"cat "$FAKE_PATH""#, inputs: [], outputs: [])
                                 ]
                             ),
                             TestAggregateTarget(
                                 "TargetWithUndeclaredOutput",
                                 buildPhases: [
-                                    TestShellScriptBuildPhase(name: "ScriptWithUndeclaredOutput", shellPath: "/bin/bash", originalObjectID: "ScriptWithUndeclaredOutput", contents: #"touch "${SRCROOT}/undeclared-output.txt""#, inputs: [], outputs: []),
+                                    TestShellScriptBuildPhase(name: "ScriptWithUndeclaredOutput", shellPath: "/bin/bash", originalObjectID: "ScriptWithUndeclaredOutput", contents: #"touch "${SRCROOT}/undeclared-output.txt""#, inputs: [], outputs: [])
                                 ]
                             ),
-                        ])])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1512,8 +1653,10 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
             }
 
             // Override FAKE_PATH with testWorkspace.sourceRoot.join("aProject/undeclared-input.txt")
-            let overriddenParameters = BuildParameters(configuration: "Debug",
-                                                       overrides: ["FAKE_PATH": Path(SRCROOT).join("aProject/undeclared-input.txt").str])
+            let overriddenParameters = BuildParameters(
+                configuration: "Debug",
+                overrides: ["FAKE_PATH": Path(SRCROOT).join("aProject/undeclared-input.txt").str]
+            )
 
             let firstBuildRequest = BuildRequest(parameters: overriddenParameters, buildTargets: [BuildRequest.BuildTargetInfo(parameters: overriddenParameters, target: tester.workspace.projects[0].targets[0])], continueBuildingAfterErrors: true, useParallelTargets: true, useImplicitDependencies: false, useDryRun: false)
 
@@ -1562,15 +1705,19 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("A.txt"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
-                            ])],
+                                TestFile("A.txt")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             // `BuildOperationTester::checkBuild` implicitly runs only the first target.
                             TestAggregateTarget(
@@ -1581,7 +1728,7 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                 "TargetWithDeclaredOutput",
                                 type: .application,
                                 buildPhases: [
-                                    TestShellScriptBuildPhase(name: "Run Me A", shellPath: "/bin/bash", originalObjectID: "RunMeA", contents: #"touch "${SCRIPT_OUTPUT_FILE_0}""#, inputs: [], outputs: ["$(SHARED_DERIVED_FILE_DIR)/A.txt"]),
+                                    TestShellScriptBuildPhase(name: "Run Me A", shellPath: "/bin/bash", originalObjectID: "RunMeA", contents: #"touch "${SCRIPT_OUTPUT_FILE_0}""#, inputs: [], outputs: ["$(SHARED_DERIVED_FILE_DIR)/A.txt"])
                                 ],
                                 dependencies: ["Other"]
                             ),
@@ -1589,11 +1736,14 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                 "TargetReadUndeclaredInputFromDeclaredOutputOfOtherTarget",
                                 type: .application,
                                 buildPhases: [
-                                    TestShellScriptBuildPhase(name: "ScriptReadUndeclaredInputFromDeclaredOutputOfOtherTarget", shellPath: "/bin/bash", originalObjectID: "ScriptReadUndeclaredInputFromDeclaredOutputOfOtherTarget", contents: #"cat "${SHARED_DERIVED_FILE_DIR}/A.txt""#, inputs: [], outputs: []),
+                                    TestShellScriptBuildPhase(name: "ScriptReadUndeclaredInputFromDeclaredOutputOfOtherTarget", shellPath: "/bin/bash", originalObjectID: "ScriptReadUndeclaredInputFromDeclaredOutputOfOtherTarget", contents: #"cat "${SHARED_DERIVED_FILE_DIR}/A.txt""#, inputs: [], outputs: [])
                                 ],
                                 dependencies: ["Other"]
                             ),
-                        ])])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1637,14 +1787,18 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("A.txt"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
-                            ])],
+                                TestFile("A.txt")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "ALL",
@@ -1653,17 +1807,20 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                             TestAggregateTarget(
                                 "DummmyShellTargetA",
                                 buildPhases: [
-                                    TestShellScriptBuildPhase(name: "EchoScript", shellPath: "/bin/bash", originalObjectID: "EchoScript", contents: "echo hello > \"\(aDotTxtPath)\"", inputs: [], outputs: []),
+                                    TestShellScriptBuildPhase(name: "EchoScript", shellPath: "/bin/bash", originalObjectID: "EchoScript", contents: "echo hello > \"\(aDotTxtPath)\"", inputs: [], outputs: [])
                                 ]
                             ),
                             TestAggregateTarget(
                                 "DummmyShellTargetB",
                                 buildPhases: [
-                                    TestShellScriptBuildPhase(name: "CatScript", shellPath: "/bin/bash", originalObjectID: "CatScript", contents: #"cat "${SCRIPT_INPUT_FILE_0}""#, inputs: [aDotTxtPath], outputs: []),
+                                    TestShellScriptBuildPhase(name: "CatScript", shellPath: "/bin/bash", originalObjectID: "CatScript", contents: #"cat "${SCRIPT_INPUT_FILE_0}""#, inputs: [aDotTxtPath], outputs: [])
                                 ],
                                 dependencies: ["DummmyShellTargetA"]
                             ),
-                        ])])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1699,13 +1856,17 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                             children: [
                                 TestFile("Configs/subfolder/FeatureHiding.swift"),
                                 TestFile("Configs/subfolder/FeatureHiding.xcconfig"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "FeatureHidingTarget",
@@ -1729,10 +1890,13 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                                             """,
                                         inputs: ["$(SRCROOT)/Configs/subfolder/FeatureHiding.swift", "$(SRCROOT)/Configs/subfolder/FeatureHiding.xcconfig"],
                                         outputs: ["$DERIVED_FILE_DIR/output.txt", "$DERIVED_FILE_DIR/swift_log.txt", "$DERIVED_FILE_DIR/FeatureHiding"]
-                                    ),
+                                    )
                                 ]
-                            ),
-                        ])])
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1741,33 +1905,33 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
 
             try await tester.fs.writeFileContents(Path(SRCROOT).join("Configs/subfolder/FeatureHiding.swift")) { stream in
                 let str = #"""
-                #!/usr/bin/swift
-                import Foundation
-
-                public func getcwd() -> String? {
-                    let cwd = getcwd(nil, Int(PATH_MAX))
-                    if cwd == nil {
-                       perror("getcwd")
-                       return nil
+                    #!/usr/bin/swift
+                    import Foundation
+
+                    public func getcwd() -> String? {
+                        let cwd = getcwd(nil, Int(PATH_MAX))
+                        if cwd == nil {
+                           perror("getcwd")
+                           return nil
+                        }
+
+                        defer { free(cwd) }
+                        guard let path = String(validatingUTF8: cwd!) else { fatalError("could not parse utf8 from getcwd") }
+                        return path
                     }
 
-                    defer { free(cwd) }
-                    guard let path = String(validatingUTF8: cwd!) else { fatalError("could not parse utf8 from getcwd") }
-                    return path
-                }
-
-                print("getcwd: \(getcwd() ?? "nil")")
-                print("FileManager.default.currentDirectoryPath: \(FileManager.default.currentDirectoryPath)")
-                print("NSHomeDirectory: \(NSHomeDirectory())")
+                    print("getcwd: \(getcwd() ?? "nil")")
+                    print("FileManager.default.currentDirectoryPath: \(FileManager.default.currentDirectoryPath)")
+                    print("NSHomeDirectory: \(NSHomeDirectory())")
 
-                let relURL = URL(fileURLWithPath: "FeatureHiding.xcconfig")
-                print("Data_contentsOf: \((try? Data(contentsOf: relURL))?.description ?? "nil")")
-                """#
+                    let relURL = URL(fileURLWithPath: "FeatureHiding.xcconfig")
+                    print("Data_contentsOf: \((try? Data(contentsOf: relURL))?.description ?? "nil")")
+                    """#
                 stream <<< str
             }
 
             try await tester.fs.writeFileContents(Path(SRCROOT).join("Configs/subfolder/FeatureHiding.xcconfig")) { stream in
-                stream <<< "The quick brown fox jumps over the lazy dog" // 43 bytes
+                stream <<< "The quick brown fox jumps over the lazy dog"  // 43 bytes
             }
 
             let overriddenParameters = BuildParameters(configuration: "Debug")
@@ -1825,27 +1989,33 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("blocked.txt"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
-                                "SRCROOT": SRCROOT
-                            ])],
+                                TestFile("blocked.txt")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                                    "SRCROOT": SRCROOT,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "TargetA",
                                 buildPhases: [
-                                    TestShellScriptBuildPhase(name: "EnsureProjectDirIsBlocked", shellPath: "/bin/bash", originalObjectID: "EnsureProjectDirIsBlocked", contents: #"cat "${PROJECT_DIR}/blocked.txt""#, inputs: [], outputs: []),
+                                    TestShellScriptBuildPhase(name: "EnsureProjectDirIsBlocked", shellPath: "/bin/bash", originalObjectID: "EnsureProjectDirIsBlocked", contents: #"cat "${PROJECT_DIR}/blocked.txt""#, inputs: [], outputs: [])
                                 ]
-                            ),
-                        ])])
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
-
             try tester.fs.createDirectory(Path(SRCROOT), recursive: true)
 
             try await tester.checkBuild(parameters: BuildParameters(configuration: "Debug"), runDestination: .macOS) { results in
@@ -1857,7 +2027,6 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
         }
     }
 
-
     @Test(.requireSDKs(.macOS))
     func ensureDerivedDataIsWritable() async throws {
         try await withTemporaryDirectory { tmpDirPath async throws -> Void in
@@ -1869,29 +2038,44 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                         "myCryptoProject",
                         groupTree: TestGroup(
                             "Sources",
-                            children: []),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
-                                "MY_DERIVED_DATA_DIR": "$(DERIVED_DATA_DIR)",
-                            ])],
+                            children: []
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                                    "MY_DERIVED_DATA_DIR": "$(DERIVED_DATA_DIR)",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestAggregateTarget(
                                 "Calculate Checksum Target",
                                 buildPhases: [
                                     // Write and read to DERIVED_DATA_DIR should be allowed
-                                    TestShellScriptBuildPhase(name: "ReadWriteToDerivedDataDir", shellPath: "/bin/bash", originalObjectID: "ReadWriteToDerivedDataDir", contents: #"""
-                (set -o xtrace
-                set -o errexit
-                set -o nounset
-                echo -n "Hello from DERIVED_DATA_DIR" > "${MY_DERIVED_DATA_DIR}/hello.txt"
-                cat "${MY_DERIVED_DATA_DIR}/hello.txt") &> "${SCRIPT_OUTPUT_FILE_0}"
-                """#, inputs: [], outputs: ["${DERIVED_FILE_DIR}/ReadWriteToDerivedDataDir.txt"], alwaysOutOfDate: true),
+                                    TestShellScriptBuildPhase(
+                                        name: "ReadWriteToDerivedDataDir",
+                                        shellPath: "/bin/bash",
+                                        originalObjectID: "ReadWriteToDerivedDataDir",
+                                        contents: #"""
+                                            (set -o xtrace
+                                            set -o errexit
+                                            set -o nounset
+                                            echo -n "Hello from DERIVED_DATA_DIR" > "${MY_DERIVED_DATA_DIR}/hello.txt"
+                                            cat "${MY_DERIVED_DATA_DIR}/hello.txt") &> "${SCRIPT_OUTPUT_FILE_0}"
+                                            """#,
+                                        inputs: [],
+                                        outputs: ["${DERIVED_FILE_DIR}/ReadWriteToDerivedDataDir.txt"],
+                                        alwaysOutOfDate: true
+                                    )
                                 ]
-                            ),
-                        ])])
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1911,13 +2095,15 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                 try results.checkTask(.matchRuleType("PhaseScriptExecution"), .matchRuleItemPattern(.contains("WriteToDerivedDataDir"))) { task in
                     let path = task.outputPaths[0]
                     let value = try tester.fs.read(path).asString
-                    #expect(value == """
-                    + set -o errexit
-                    + set -o nounset
-                    + echo -n 'Hello from DERIVED_DATA_DIR'
-                    + cat \(derivedData.str)/hello.txt
-                    Hello from DERIVED_DATA_DIR
-                    """)
+                    #expect(
+                        value == """
+                            + set -o errexit
+                            + set -o nounset
+                            + echo -n 'Hello from DERIVED_DATA_DIR'
+                            + cat \(derivedData.str)/hello.txt
+                            Hello from DERIVED_DATA_DIR
+                            """
+                    )
                 }
             }
         }
@@ -1935,32 +2121,41 @@ fileprivate struct ShellScriptSandboxingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("raw.fake-neutral"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
-                            ])],
+                                TestFile("raw.fake-neutral")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Calculate Checksum Target and a Very Very Very Very Very Very Very Very Very Very Very Very Very Very Very Very Very Long Description",
                                 type: .application,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "raw.fake-neutral",
-                                    ]),
+                                        "raw.fake-neutral"
+                                    ])
                                 ],
                                 buildRules: [
-                                    TestBuildRule(filePattern: "*.fake-neutral",
-                                                  script: #"set -o errexit; cat "${SCRIPT_INPUT_FILE}" | md5 > "${SCRIPT_OUTPUT_FILE_0}""#,
-                                                  outputs: ["$(DERIVED_FILES_DIR)/$(INPUT_FILE_NAME).md5"],
-                                                  runOncePerArchitecture: false),
+                                    TestBuildRule(
+                                        filePattern: "*.fake-neutral",
+                                        script: #"set -o errexit; cat "${SCRIPT_INPUT_FILE}" | md5 > "${SCRIPT_OUTPUT_FILE_0}""#,
+                                        outputs: ["$(DERIVED_FILES_DIR)/$(INPUT_FILE_NAME).md5"],
+                                        runOncePerArchitecture: false
+                                    )
                                 ]
-                            ),
-                        ])])
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
diff --git a/Tests/SWBBuildSystemTests/SpriteKitBuildOperationTests.swift b/Tests/SWBBuildSystemTests/SpriteKitBuildOperationTests.swift
index 45b6735d..50c2970f 100644
--- a/Tests/SWBBuildSystemTests/SpriteKitBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/SpriteKitBuildOperationTests.swift
@@ -28,27 +28,33 @@ fileprivate struct SpriteKitBuildOperationTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("assets.atlas"),
-                    ]),
+                        TestFile("assets.atlas")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
                             "GENERATE_INFOPLIST_FILE": "YES",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
-                    TestStandardTarget("App",
-                                       type: .application,
-                                       buildPhases: [
-                        TestResourcesBuildPhase([
-                            TestBuildFile("assets.atlas"),
-                        ]),
-                    ]),
-                ])
+                    TestStandardTarget(
+                        "App",
+                        type: .application,
+                        buildPhases: [
+                            TestResourcesBuildPhase([
+                                TestBuildFile("assets.atlas")
+                            ])
+                        ]
+                    )
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
diff --git a/Tests/SWBBuildSystemTests/StaleFileRemovalTests.swift b/Tests/SWBBuildSystemTests/StaleFileRemovalTests.swift
index 1969f1e2..b9922482 100644
--- a/Tests/SWBBuildSystemTests/StaleFileRemovalTests.swift
+++ b/Tests/SWBBuildSystemTests/StaleFileRemovalTests.swift
@@ -38,15 +38,17 @@ fileprivate struct StaleFileRemovalTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("foo.c"),
-                            ]),
+                                TestFile("foo.c")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
                                     "GENERATE_INFOPLIST_FILE": "YES",
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -54,12 +56,14 @@ fileprivate struct StaleFileRemovalTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "foo.c",
-                                    ]),
+                                        "foo.c"
+                                    ])
                                 ]
                             )
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot
 
@@ -97,8 +101,9 @@ fileprivate struct StaleFileRemovalTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("foo.c"),
-                            ]),
+                                TestFile("foo.c")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -107,7 +112,8 @@ fileprivate struct StaleFileRemovalTests: CoreBasedTests {
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "SDKROOT": "auto",
                                     "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -115,12 +121,14 @@ fileprivate struct StaleFileRemovalTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "foo.c",
-                                    ]),
+                                        "foo.c"
+                                    ])
                                 ]
                             )
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot
 
@@ -159,8 +167,9 @@ fileprivate struct StaleFileRemovalTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("foo.c"),
-                            ]),
+                                TestFile("foo.c")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -169,7 +178,8 @@ fileprivate struct StaleFileRemovalTests: CoreBasedTests {
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "SDKROOT": "macosx",
                                     "DSTROOT": tmpDirPath.join("dstroot").str,
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -177,12 +187,14 @@ fileprivate struct StaleFileRemovalTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "foo.c",
-                                    ]),
+                                        "foo.c"
+                                    ])
                                 ]
                             )
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = tester.workspace.projects[0].sourceRoot
 
@@ -211,23 +223,32 @@ fileprivate struct StaleFileRemovalTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
-                                TestFile("shared.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "Sources",
+                            path: "Sources",
+                            children: [
+                                TestFile("shared.m")
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)"
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "shared", type: .staticLibrary,
+                                "shared",
+                                type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["shared.m"]),
-                                ]),
-                        ])
-                ])
+                                    TestSourcesBuildPhase(["shared.m"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
@@ -237,13 +258,13 @@ fileprivate struct StaleFileRemovalTests: CoreBasedTests {
 
             let excludingTypes = Set([
                 "Copy", "Touch", "Gate", "MkDir", "WriteAuxiliaryFile", "SymLink", "CreateBuildDirectory",
-                "ProcessInfoPlistFile", "RegisterExecutionPolicyException", "ClangStatCache"
+                "ProcessInfoPlistFile", "RegisterExecutionPolicyException", "ClangStatCache",
             ])
 
             let sanitizerCombinations = [
                 "ENABLE_ADDRESS_SANITIZER",
                 "ENABLE_THREAD_SANITIZER",
-                "ENABLE_UNDEFINED_BEHAVIOR_SANITIZER"
+                "ENABLE_UNDEFINED_BEHAVIOR_SANITIZER",
             ].combinationsWithoutRepetition
 
             var previousBuildParameters = [BuildParameters]()
@@ -254,7 +275,7 @@ fileprivate struct StaleFileRemovalTests: CoreBasedTests {
                     continue
                 }
 
-                let overrides = combination.reduce(into: [String:String]()) { $0[$1] = "YES" }
+                let overrides = combination.reduce(into: [String: String]()) { $0[$1] = "YES" }
                 let parameters = BuildParameters(configuration: "Debug", overrides: overrides)
 
                 // Try build with new combination of sanitizers
diff --git a/Tests/SWBBuildSystemTests/SwiftBuildOperationTests.swift b/Tests/SWBBuildSystemTests/SwiftBuildOperationTests.swift
index 3f2f13c3..f7d341bb 100644
--- a/Tests/SWBBuildSystemTests/SwiftBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/SwiftBuildOperationTests.swift
@@ -37,7 +37,8 @@ fileprivate struct SwiftBuildOperationTests: CoreBasedTests {
                                 TestFile("App.swift"),
                                 TestFile("API.swift"),
                                 TestFile("Bridging.h"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -50,22 +51,26 @@ fileprivate struct SwiftBuildOperationTests: CoreBasedTests {
                                     "SWIFT_PRECOMPILE_BRIDGING_HEADER[arch=armv7k]": "NO",
                                     "SDKROOT": "watchos",
                                     "SWIFT_VERSION": "5.0",
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
                                 "Application",
                                 type: .application,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: [
-                                        "SWIFT_OBJC_BRIDGING_HEADER": "Bridging.h",
-                                    ])
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "SWIFT_OBJC_BRIDGING_HEADER": "Bridging.h"
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "App.m",
                                         "App.swift",
-                                    ]),
+                                    ])
                                 ],
                                 dependencies: ["Framework"]
                             ),
@@ -74,12 +79,14 @@ fileprivate struct SwiftBuildOperationTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "API.swift",
-                                    ]),
+                                        "API.swift"
+                                    ])
                                 ]
-                            )
-                        ])
-                ])
+                            ),
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/Bridging.h")) {
@@ -210,7 +217,8 @@ fileprivate struct SwiftBuildOperationTests: CoreBasedTests {
                             children: [
                                 TestFile("main.swift"),
                                 TestFile("API.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -219,7 +227,8 @@ fileprivate struct SwiftBuildOperationTests: CoreBasedTests {
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "BUILD_LIBRARY_FOR_DISTRIBUTION": "YES",
                                     "SWIFT_VERSION": "5.0",
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -227,8 +236,8 @@ fileprivate struct SwiftBuildOperationTests: CoreBasedTests {
                                 type: .commandLineTool,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "main.swift",
-                                    ]),
+                                        "main.swift"
+                                    ])
                                 ],
                                 dependencies: ["Framework"]
                             ),
@@ -237,12 +246,14 @@ fileprivate struct SwiftBuildOperationTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "API.swift",
-                                    ]),
+                                        "API.swift"
+                                    ])
                                 ]
-                            )
-                        ])
-                ])
+                            ),
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/API.swift")) {
diff --git a/Tests/SWBBuildSystemTests/SwiftBuildTraceTests.swift b/Tests/SWBBuildSystemTests/SwiftBuildTraceTests.swift
index 563c0575..e1429313 100644
--- a/Tests/SWBBuildSystemTests/SwiftBuildTraceTests.swift
+++ b/Tests/SWBBuildSystemTests/SwiftBuildTraceTests.swift
@@ -33,8 +33,9 @@ fileprivate struct SwiftBuildTraceTests: CoreBasedTests {
                             groupTree: TestGroup(
                                 "Sources",
                                 children: [
-                                    TestFile("main.swift"),
-                                ]),
+                                    TestFile("main.swift")
+                                ]
+                            ),
                             buildConfigurations: [
                                 TestBuildConfiguration(
                                     "Debug",
@@ -42,7 +43,8 @@ fileprivate struct SwiftBuildTraceTests: CoreBasedTests {
                                         "CODE_SIGNING_ALLOWED": "NO",
                                         "PRODUCT_NAME": "$(TARGET_NAME)",
                                         "SWIFT_VERSION": "5.0",
-                                    ]),
+                                    ]
+                                )
                             ],
                             targets: [
                                 TestStandardTarget(
@@ -50,12 +52,14 @@ fileprivate struct SwiftBuildTraceTests: CoreBasedTests {
                                     type: .commandLineTool,
                                     buildPhases: [
                                         TestSourcesBuildPhase([
-                                            "main.swift",
-                                        ]),
+                                            "main.swift"
+                                        ])
                                     ]
-                                ),
-                            ])
-                    ])
+                                )
+                            ]
+                        )
+                    ]
+                )
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
                 try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/main.swift")) {
diff --git a/Tests/SWBBuildSystemTests/SwiftCompilationCachingTests.swift b/Tests/SWBBuildSystemTests/SwiftCompilationCachingTests.swift
index ff197e51..79670f99 100644
--- a/Tests/SWBBuildSystemTests/SwiftCompilationCachingTests.swift
+++ b/Tests/SWBBuildSystemTests/SwiftCompilationCachingTests.swift
@@ -33,8 +33,9 @@ fileprivate struct SwiftCompilationCachingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("App.swift"),
-                            ]),
+                                TestFile("App.swift")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -50,7 +51,8 @@ fileprivate struct SwiftCompilationCachingTests: CoreBasedTests {
                                     "COMPILATION_CACHE_ENABLE_DIAGNOSTIC_REMARKS": "YES",
                                     "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
                                     "DSTROOT": tmpDirPath.join("dstroot").str,
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -58,12 +60,14 @@ fileprivate struct SwiftCompilationCachingTests: CoreBasedTests {
                                 type: .application,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "App.swift",
-                                    ]),
+                                        "App.swift"
+                                    ])
                                 ]
                             )
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/App.swift")) {
@@ -151,94 +155,128 @@ fileprivate struct SwiftCompilationCachingTests: CoreBasedTests {
                     TestPackageProductTarget(
                         "BarProduct",
                         frameworksBuildPhase: TestFrameworksBuildPhase([TestBuildFile(.target("Bar"))]),
-                        dependencies: ["Bar"]),
+                        dependencies: ["Bar"]
+                    ),
                     TestStandardTarget(
                         "Bar",
                         type: .dynamicLibrary,
                         buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Bar", "EXECUTABLE_PREFIX": "lib"])],
-                        buildPhases: [TestSourcesBuildPhase(["Bar.swift"])])])
+                        buildPhases: [TestSourcesBuildPhase(["Bar.swift"])]
+                    ),
+                ]
+            )
 
             let package = TestPackageProject(
                 "aPackage",
                 groupTree: TestGroup("Sources", children: [TestFile("Foo.swift")]),
-                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: commonBuildSettings.addingContents(of: [
-                    "SWIFT_INCLUDE_PATHS": "$(TARGET_BUILD_DIR)/../../../aPackageLeaf/build/Debug",
-                ]))],
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: commonBuildSettings.addingContents(of: [
+                            "SWIFT_INCLUDE_PATHS": "$(TARGET_BUILD_DIR)/../../../aPackageLeaf/build/Debug"
+                        ])
+                    )
+                ],
                 targets: [
                     TestPackageProductTarget(
                         "FooProduct",
                         frameworksBuildPhase: TestFrameworksBuildPhase([TestBuildFile(.target("Foo"))]),
-                        dependencies: ["Foo"]),
+                        dependencies: ["Foo"]
+                    ),
                     TestStandardTarget(
                         "Foo",
                         type: .dynamicLibrary,
                         buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Foo", "EXECUTABLE_PREFIX": "lib"])],
                         buildPhases: [
                             TestSourcesBuildPhase(["Foo.swift"]),
-                            TestFrameworksBuildPhase([TestBuildFile(.target("BarProduct"))])],
-                        dependencies: ["BarProduct"])])
+                            TestFrameworksBuildPhase([TestBuildFile(.target("BarProduct"))]),
+                        ],
+                        dependencies: ["BarProduct"]
+                    ),
+                ]
+            )
 
             let project = TestProject(
                 "aProject",
                 groupTree: TestGroup("Sources", children: [TestFile("App1.swift"), TestFile("App2.swift")]),
-                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: commonBuildSettings.addingContents(of: [
-                    "SWIFT_INCLUDE_PATHS": "$(TARGET_BUILD_DIR)/../../../aPackage/build/Debug $(TARGET_BUILD_DIR)/../../../aPackageLeaf/build/Debug"]))],
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: commonBuildSettings.addingContents(of: [
+                            "SWIFT_INCLUDE_PATHS": "$(TARGET_BUILD_DIR)/../../../aPackage/build/Debug $(TARGET_BUILD_DIR)/../../../aPackageLeaf/build/Debug"
+                        ])
+                    )
+                ],
                 targets: [
                     TestStandardTarget(
                         "App1",
                         type: .framework,
-                        buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "SWIFT_ENABLE_COMPILE_CACHE": "YES",
-                            "COMPILATION_CACHE_ENABLE_DIAGNOSTIC_REMARKS": "YES",
-                            "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str])],
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_ENABLE_COMPILE_CACHE": "YES",
+                                    "COMPILATION_CACHE_ENABLE_DIAGNOSTIC_REMARKS": "YES",
+                                    "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
+                                ]
+                            )
+                        ],
                         buildPhases: [
                             TestSourcesBuildPhase(["App1.swift"]),
-                            TestFrameworksBuildPhase([TestBuildFile(.target("FooProduct"))])],
-                        dependencies: ["FooProduct"]),
+                            TestFrameworksBuildPhase([TestBuildFile(.target("FooProduct"))]),
+                        ],
+                        dependencies: ["FooProduct"]
+                    ),
                     TestStandardTarget(
                         "App2",
                         type: .framework,
-                        buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)"])],
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)"
+                                ]
+                            )
+                        ],
                         buildPhases: [
                             TestSourcesBuildPhase(["App2.swift"]),
-                            TestFrameworksBuildPhase([TestBuildFile(.target("FooProduct"))])],
-                        dependencies: ["FooProduct"])])
+                            TestFrameworksBuildPhase([TestBuildFile(.target("FooProduct"))]),
+                        ],
+                        dependencies: ["FooProduct"]
+                    ),
+                ]
+            )
 
             let workspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath.join("Test"), projects: [project, package, leafPackage])
 
             let tester = try await BuildOperationTester(getCore(), workspace, simulated: false)
 
             try await tester.fs.writeFileContents(workspace.sourceRoot.join("aPackageLeaf/Bar.swift")) { stream in
-                stream <<<
-                """
-                public func baz() {}
-                """
+                stream <<< """
+                    public func baz() {}
+                    """
             }
 
             try await tester.fs.writeFileContents(workspace.sourceRoot.join("aPackage/Foo.swift")) { stream in
-                stream <<<
-                """
-                import Bar
-                public func foo() { baz() }
-                """
+                stream <<< """
+                    import Bar
+                    public func foo() { baz() }
+                    """
             }
 
             try await tester.fs.writeFileContents(workspace.sourceRoot.join("aProject/App1.swift")) { stream in
-                stream <<<
-                """
-                import Foo
-                func app() { foo() }
-                """
+                stream <<< """
+                    import Foo
+                    func app() { foo() }
+                    """
             }
 
             try await tester.fs.writeFileContents(workspace.sourceRoot.join("aProject/App2.swift")) { stream in
-                stream <<<
-                """
-                import Foo
-                func app() { foo() }
-                """
+                stream <<< """
+                    import Foo
+                    func app() { foo() }
+                    """
             }
 
             let parameters = BuildParameters(configuration: "Debug", overrides: ["ARCHS": "arm64"])
@@ -283,8 +321,9 @@ fileprivate struct SwiftCompilationCachingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("main.swift"),
-                            ]),
+                                TestFile("main.swift")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -298,7 +337,8 @@ fileprivate struct SwiftCompilationCachingTests: CoreBasedTests {
                                     "COMPILATION_CACHE_LIMIT_SIZE": "1",
                                     "COMPILATION_CACHE_CAS_PATH": tmpDirPath.join("CompilationCache").str,
                                     "DSTROOT": tmpDirPath.join("dstroot").str,
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -306,12 +346,14 @@ fileprivate struct SwiftCompilationCachingTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "main.swift",
-                                    ]),
+                                        "main.swift"
+                                    ])
                                 ]
                             )
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(tmpDirPath.join("Test/aProject/main.swift")) {
@@ -363,26 +405,33 @@ fileprivate struct SwiftCompilationCachingTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("file.swift"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: buildSettings)],
+                                TestFile("file.swift")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: buildSettings
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Library",
                                 type: .staticLibrary,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file.swift"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file.swift"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.swift")) { stream in
-                stream <<<
-                """
-                public func libFunc() {}
-                """
+                stream <<< """
+                    public func libFunc() {}
+                    """
             }
 
             let specificCAS = casPath.join("builtin")
diff --git a/Tests/SWBBuildSystemTests/SwiftDriverTests.swift b/Tests/SWBBuildSystemTests/SwiftDriverTests.swift
index facdb73a..f9df3cec 100644
--- a/Tests/SWBBuildSystemTests/SwiftDriverTests.swift
+++ b/Tests/SWBBuildSystemTests/SwiftDriverTests.swift
@@ -42,7 +42,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                                 TestFile("file3.swift"),
                                 TestFile("file4.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -52,7 +53,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "BUILD_VARIANTS": "normal",
 
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -62,8 +64,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "file1.swift",
                                         "file2.swift",
-                                    ]),
-                                ]),
+                                    ])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "TargetB",
                                 type: .staticLibrary,
@@ -71,10 +74,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "file3.swift",
                                         "file4.swift",
-                                    ]),
-                                ], dependencies: ["TargetA"]),
-                        ])
-                ])
+                                    ])
+                                ],
+                                dependencies: ["TargetA"]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -83,16 +90,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct A {
                         public init() {}
                     }
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     struct B {
                         let a = A()
                     }
@@ -100,14 +105,12 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file3.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     struct C {}
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file4.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     import TargetA
 
                     struct D {
@@ -202,7 +205,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                                 TestFile("file3.swift"),
                                 TestFile("file4.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -214,7 +218,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "VALID_ARCHS": "arm64e x86_64",
 
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -224,8 +229,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "file1.swift",
                                         "file2.swift",
-                                    ]),
-                                ]),
+                                    ])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "TargetB",
                                 type: .framework,
@@ -233,10 +239,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "file3.swift",
                                         "file4.swift",
-                                    ]),
-                                ], dependencies: ["TargetA"]),
-                        ])
-                ])
+                                    ])
+                                ],
+                                dependencies: ["TargetA"]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -245,16 +255,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct A {
                         public init() {}
                     }
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     struct B {
                         let a = A()
                     }
@@ -262,14 +270,12 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file3.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     struct C {}
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file4.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     import TargetA
 
                     struct D {
@@ -353,7 +359,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 TestFile("Bridging-Header.h"),
                                 TestFile("file1.swift"),
                                 TestFile("foo.c"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -364,7 +371,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "SWIFT_OBJC_BRIDGING_HEADER": "Sources/Bridging-Header.h",
 
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -373,14 +381,17 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "file1.swift",
-                                        "foo.c"
+                                        "foo.c",
                                     ]),
                                     TestHeadersBuildPhase([
                                         "Bridging-Header.h"
-                                    ])
-                                ]),
-                        ])
-                ])
+                                    ]),
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -389,26 +400,23 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                        """
-                        public struct A {
-                            public init() {
-                                foo()
-                            }
+                file <<< """
+                    public struct A {
+                        public init() {
+                            foo()
                         }
-                        """
+                    }
+                    """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/Bridging-Header.h")) { file in
-                file <<<
-                        """
-                        void foo(void);
-                        """
+                file <<< """
+                    void foo(void);
+                    """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/foo.c")) { file in
-                file <<<
-                        """
-                        void foo(void) {}
-                        """
+                file <<< """
+                    void foo(void) {}
+                    """
             }
 
             try await tester.checkBuild(runDestination: .host, buildRequest: buildRequest, persistent: true) { results in
@@ -433,7 +441,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                             children: [
                                 TestFile("Bridging-Header.h"),
                                 TestFile("file1.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -445,7 +454,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "SWIFT_OBJC_BRIDGING_HEADER": "Sources/Bridging-Header.h",
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
                                     "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -453,14 +463,17 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "file1.swift",
+                                        "file1.swift"
                                     ]),
                                     TestHeadersBuildPhase([
                                         "Bridging-Header.h"
-                                    ])
-                                ]),
-                        ])
-                ])
+                                    ]),
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -469,18 +482,16 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                        """
-                        public struct A {
-                            public init() {}
-                        }
-                        """
+                file <<< """
+                    public struct A {
+                        public init() {}
+                    }
+                    """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/Bridging-Header.h")) { file in
-                file <<<
-                        """
-                        @import Foundation;
-                        """
+                file <<< """
+                    @import Foundation;
+                    """
             }
 
             try await tester.checkBuild(runDestination: .anyMac, buildRequest: buildRequest, persistent: true) { results in
@@ -531,8 +542,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                             "Sources",
                             path: "Sources",
                             children: [
-                                TestFile("file1.swift"),
-                            ]),
+                                TestFile("file1.swift")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -546,7 +558,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
                                     "SWIFT_WHOLE_MODULE_OPTIMIZATION": enableWMO ? "YES" : "NO",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -554,11 +567,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 type: .dynamicLibrary,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "file1.swift",
-                                    ]),
-                                ]),
-                        ])
-                ])
+                                        "file1.swift"
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -567,12 +583,11 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                            """
-                            public struct A {
-                                public init() {}
-                            }
-                            """
+                file <<< """
+                    public struct A {
+                        public init() {}
+                    }
+                    """
             }
 
             try await tester.checkBuild(runDestination: .host, buildRequest: buildRequest, persistent: true) { results in
@@ -600,7 +615,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                             children: [
                                 TestFile("file1.swift"),
                                 TestFile("file2.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -612,7 +628,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "ARCHS": "$(ARCHS_STANDARD)",
 
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -623,13 +640,15 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                         "TargetAConfig",
                                         buildSettings: [
                                             "ARCHS": "arm64e"
-                                        ]),
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "file1.swift",
-                                    ]),
-                                ]),
+                                        "file1.swift"
+                                    ])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "TargetB",
                                 type: .dynamicLibrary,
@@ -638,16 +657,20 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                         "TargetBConfig",
                                         buildSettings: [
                                             "ARCHS": "arm64"
-                                        ]),
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "file2.swift",
-                                    ]),
+                                        "file2.swift"
+                                    ])
                                 ],
-                                dependencies: ["TargetA"]),
-                        ])
-                ])
+                                dependencies: ["TargetA"]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -656,22 +679,20 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                        """
-                        public struct A {
-                            public init() {}
-                        }
-                        """
+                file <<< """
+                    public struct A {
+                        public init() {}
+                    }
+                    """
             }
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file2.swift")) { file in
-                file <<<
-                        """
-                        public struct B {
-                            public init() {}
-                        }
-                        """
+                file <<< """
+                    public struct B {
+                        public init() {}
+                    }
+                    """
             }
 
             try await tester.checkBuild(runDestination: .anyMac, buildRequest: buildRequest, persistent: true) { results in
@@ -695,7 +716,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                             children: [
                                 TestFile("file1.swift"),
                                 TestFile("file2.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -709,7 +731,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
 
                                     "DSTROOT": tmpDirPath.join("dstroot").str,
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -720,24 +743,29 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                         "TargetAConfig",
                                         buildSettings: [
                                             "SKIP_INSTALL": "YES"
-                                        ]),
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "file1.swift",
-                                    ]),
-                                ]),
+                                        "file1.swift"
+                                    ])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "TargetB",
                                 type: .dynamicLibrary,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "file2.swift",
-                                    ]),
+                                        "file2.swift"
+                                    ])
                                 ],
-                                dependencies: ["TargetA"]),
-                        ])
-                ])
+                                dependencies: ["TargetA"]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(action: .installAPI, configuration: "Debug")
@@ -746,22 +774,20 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                        """
-                        public struct A {
-                            public init() {}
-                        }
-                        """
+                file <<< """
+                    public struct A {
+                        public init() {}
+                    }
+                    """
             }
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file2.swift")) { file in
-                file <<<
-                        """
-                        public struct B {
-                            public init() {}
-                        }
-                        """
+                file <<< """
+                    public struct B {
+                        public init() {}
+                    }
+                    """
             }
 
             try await tester.checkBuild(runDestination: .anyMac, buildRequest: buildRequest, persistent: true) { results in
@@ -786,7 +812,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                             path: "Sources",
                             children: [
                                 TestFile("file.swift")
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -797,7 +824,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "ARCHS": "arm64",
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
                                     "BLOCKLISTS_PATH": tmpDirPath.str,
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -806,10 +834,13 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "file.swift"
-                                    ]),
-                                ])
-                        ])
-                ])
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             var tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             try tester.fs.createDirectory(moduleCacheDir)
             let cleanParameters = BuildParameters(action: .clean, configuration: "Debug")
@@ -818,12 +849,11 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
             // Create the source file.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file.swift")) { file in
-                file <<<
-                            """
-                            public struct A {
-                                public init() {}
-                            }
-                            """
+                file <<< """
+                    public struct A {
+                        public init() {}
+                    }
+                    """
             }
 
             let checkExplicitBuildOn = { (results: BuildOperationTester.BuildResults) in
@@ -863,22 +893,28 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             }
 
             let parameterizedBuildRequest = { (_ parameters: BuildParameters) in
-                return BuildRequest(parameters: parameters,
-                                    buildTargets: tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }),
-                                    continueBuildingAfterErrors: true, useParallelTargets: true, useImplicitDependencies: false, useDryRun: false)
+                return BuildRequest(
+                    parameters: parameters,
+                    buildTargets: tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }),
+                    continueBuildingAfterErrors: true,
+                    useParallelTargets: true,
+                    useImplicitDependencies: false,
+                    useDryRun: false
+                )
             }
 
             do {
-                let buildParameters = BuildParameters(configuration: "Debug",
-                                                      commandLineOverrides: ["SWIFT_ENABLE_EXPLICIT_MODULES":"YES"])
+                let buildParameters = BuildParameters(
+                    configuration: "Debug",
+                    commandLineOverrides: ["SWIFT_ENABLE_EXPLICIT_MODULES": "YES"]
+                )
                 // Ensure explicit modules are enabled as per the default
                 try await tester.fs.writeFileContents(blockListFilePath) { file in
-                    file <<<
-                            """
-                            {
-                                "KnownFailures": []
-                            }
-                            """
+                    file <<< """
+                        {
+                            "KnownFailures": []
+                        }
+                        """
                 }
                 try await tester.checkBuild(runDestination: .macOS, buildRequest: parameterizedBuildRequest(buildParameters)) { results in checkExplicitBuildOn(results) }
                 try await tester.checkBuild(runDestination: .macOS, buildRequest: cleanRequest) { results in results.checkNoErrors() }
@@ -887,15 +923,16 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             do {
                 // Add project name to the `KnownFailures` and ensure explicit modules are disabled despite the build setting enable
-                let buildParameters = BuildParameters(configuration: "Debug",
-                                                      commandLineOverrides: ["SWIFT_ENABLE_EXPLICIT_MODULES":"YES"])
+                let buildParameters = BuildParameters(
+                    configuration: "Debug",
+                    commandLineOverrides: ["SWIFT_ENABLE_EXPLICIT_MODULES": "YES"]
+                )
                 try await tester.fs.writeFileContents(blockListFilePath) { file in
-                    file <<<
-                            """
-                            {
-                                "KnownFailures": ["aProject"]
-                            }
-                            """
+                    file <<< """
+                        {
+                            "KnownFailures": ["aProject"]
+                        }
+                        """
                 }
                 try await tester.checkBuild(runDestination: .macOS, buildRequest: parameterizedBuildRequest(buildParameters)) { results in checkExplicitBuildOff(results) }
                 try await tester.checkBuild(runDestination: .macOS, buildRequest: cleanRequest) { results in results.checkNoErrors() }
@@ -929,7 +966,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                                     TestFile("file5.swift"),
                                     TestFile("file6.swift"),
-                                ]),
+                                ]
+                            ),
                             buildConfigurations: [
                                 TestBuildConfiguration(
                                     "Debug",
@@ -942,7 +980,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                         "EXECUTABLE_PREFIX": "lib",
                                         "EXECUTABLE_PREFIX[sdk=windows*]": "",
                                         setting: "YES",
-                                    ])
+                                    ]
+                                )
                             ],
                             targets: [
                                 TestStandardTarget(
@@ -951,9 +990,10 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     buildPhases: [
                                         TestSourcesBuildPhase([
                                             "fileC.c",
-                                            "fileC.h"
-                                        ]),
-                                    ]),
+                                            "fileC.h",
+                                        ])
+                                    ]
+                                ),
                                 TestStandardTarget(
                                     "TargetA",
                                     type: .dynamicLibrary,
@@ -961,8 +1001,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                         TestSourcesBuildPhase([
                                             "file1.swift",
                                             "file2.swift",
-                                        ]),
-                                    ]),
+                                        ])
+                                    ]
+                                ),
                                 TestStandardTarget(
                                     "TargetB",
                                     type: .dynamicLibrary,
@@ -976,8 +1017,10 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                         // Explicitly linking dependencies is required. This may cause
                                         // a lot of projects to break though so we may need to make explicit modules
                                         // behave the same way and re-introduce auto-linking.
-                                        TestFrameworksBuildPhase([TestBuildFile(.target("TargetA"))])
-                                    ], dependencies: ["TargetA"]),
+                                        TestFrameworksBuildPhase([TestBuildFile(.target("TargetA"))]),
+                                    ],
+                                    dependencies: ["TargetA"]
+                                ),
                                 TestStandardTarget(
                                     "TargetC",
                                     type: .dynamicLibrary,
@@ -986,10 +1029,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                             "file5.swift",
                                             "file6.swift",
                                         ]),
-                                        TestFrameworksBuildPhase([TestBuildFile(.target("TargetA")), TestBuildFile(.target("TargetB"))])
-                                    ], dependencies: ["TargetB", "Target0"])
-                            ])
-                    ])
+                                        TestFrameworksBuildPhase([TestBuildFile(.target("TargetA")), TestBuildFile(.target("TargetB"))]),
+                                    ],
+                                    dependencies: ["TargetB", "Target0"]
+                                ),
+                            ]
+                        )
+                    ]
+                )
 
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
                 try tester.fs.createDirectory(moduleCacheDir)
@@ -999,28 +1046,24 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                 // Create the source files.
                 try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileC.c")) { file in
-                    file <<<
-                        """
+                    file <<< """
                         int foo() { return 11; }
                         """
                 }
                 try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileC.h")) { file in
-                    file <<<
-                        """
+                    file <<< """
                         int foo();
                         """
                 }
                 try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                    file <<<
-                        """
+                    file <<< """
                         public struct A {
                             public init() {}
                         }
                         """
                 }
                 try await tester.fs.writeFileContents(SRCROOT.join("Sources/file2.swift")) { file in
-                    file <<<
-                        """
+                    file <<< """
                         struct B {
                             let a = A()
                         }
@@ -1028,16 +1071,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                 }
 
                 try await tester.fs.writeFileContents(SRCROOT.join("Sources/file3.swift")) { file in
-                    file <<<
-                        """
+                    file <<< """
                         public struct C {
                             public init() {}
                         }
                         """
                 }
                 try await tester.fs.writeFileContents(SRCROOT.join("Sources/file4.swift")) { file in
-                    file <<<
-                        """
+                    file <<< """
                         import TargetA
 
                         struct D {
@@ -1047,14 +1088,12 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                 }
 
                 try await tester.fs.writeFileContents(SRCROOT.join("Sources/file5.swift")) { file in
-                    file <<<
-                        """
+                    file <<< """
                         struct E {}
                         """
                 }
                 try await tester.fs.writeFileContents(SRCROOT.join("Sources/file6.swift")) { file in
-                    file <<<
-                        """
+                    file <<< """
                         import TargetB
 
                         struct F {
@@ -1099,7 +1138,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                     }
 
                     results.checkTask(.matchTargetName("TargetA"), .matchRulePattern(["SwiftCompile", "normal", .any, "Compiling file2.swift", .equal(SRCROOT.join("Sources/file2.swift").str)])) { compileFile2Task in
-                        compileFile2Task.checkCommandLineMatches([.anySequence, "-primary-file", .equal(SRCROOT.join("Sources/file2.swift").str), .anySequence, "-disable-implicit-swift-modules",  .anySequence, "-o", .suffix("file2.o")])
+                        compileFile2Task.checkCommandLineMatches([.anySequence, "-primary-file", .equal(SRCROOT.join("Sources/file2.swift").str), .anySequence, "-disable-implicit-swift-modules", .anySequence, "-o", .suffix("file2.o")])
                     }
 
                     // Swift Driver changed default behavior from merging modules after compilation to eagerly emitting the module, both are valid here.
@@ -1112,11 +1151,11 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                     }
 
                     results.checkTask(.matchTargetName("TargetB"), .matchRulePattern(["SwiftCompile", "normal", .any, "Compiling file3.swift", .equal(SRCROOT.join("Sources/file3.swift").str)])) { compileFile3Task in
-                        compileFile3Task.checkCommandLineMatches([.anySequence, "-primary-file", .anySequence, .equal(SRCROOT.join("Sources/file3.swift").str), .anySequence, "-disable-implicit-swift-modules",  .anySequence, "-o", .suffix("file3.o")])
+                        compileFile3Task.checkCommandLineMatches([.anySequence, "-primary-file", .anySequence, .equal(SRCROOT.join("Sources/file3.swift").str), .anySequence, "-disable-implicit-swift-modules", .anySequence, "-o", .suffix("file3.o")])
                     }
 
                     results.checkTask(.matchTargetName("TargetB"), .matchRulePattern(["SwiftCompile", "normal", .any, "Compiling file4.swift", .equal(SRCROOT.join("Sources/file4.swift").str)])) { compileFile4Task in
-                        compileFile4Task.checkCommandLineMatches([.anySequence, "-primary-file", .anySequence, .equal(SRCROOT.join("Sources/file4.swift").str), .anySequence, "-disable-implicit-swift-modules",  .anySequence, "-o", .suffix("file4.o")])
+                        compileFile4Task.checkCommandLineMatches([.anySequence, "-primary-file", .anySequence, .equal(SRCROOT.join("Sources/file4.swift").str), .anySequence, "-disable-implicit-swift-modules", .anySequence, "-o", .suffix("file4.o")])
                     }
 
                     // Swift Driver changed default behavior from merging modules after compilation to eagerly emitting the module, both are valid here.
@@ -1128,11 +1167,11 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                         }
                     }
                     results.checkTask(.matchTargetName("TargetC"), .matchRulePattern(["SwiftCompile", "normal", .any, "Compiling file5.swift", .equal(SRCROOT.join("Sources/file5.swift").str)])) { compileFile3Task in
-                        compileFile3Task.checkCommandLineMatches([.anySequence, "-primary-file", .anySequence, .equal(SRCROOT.join("Sources/file5.swift").str), .anySequence, "-disable-implicit-swift-modules",  .anySequence, "-o", .suffix("file5.o")])
+                        compileFile3Task.checkCommandLineMatches([.anySequence, "-primary-file", .anySequence, .equal(SRCROOT.join("Sources/file5.swift").str), .anySequence, "-disable-implicit-swift-modules", .anySequence, "-o", .suffix("file5.o")])
                     }
 
                     results.checkTask(.matchTargetName("TargetC"), .matchRulePattern(["SwiftCompile", "normal", .any, "Compiling file6.swift", .equal(SRCROOT.join("Sources/file6.swift").str)])) { compileFile4Task in
-                        compileFile4Task.checkCommandLineMatches([.anySequence, "-primary-file", .anySequence, .equal(SRCROOT.join("Sources/file6.swift").str), .anySequence, "-disable-implicit-swift-modules",  .anySequence, "-o", .suffix("file6.o")])
+                        compileFile4Task.checkCommandLineMatches([.anySequence, "-primary-file", .anySequence, .equal(SRCROOT.join("Sources/file6.swift").str), .anySequence, "-disable-implicit-swift-modules", .anySequence, "-o", .suffix("file6.o")])
                     }
 
                     // Swift Driver changed default behavior from merging modules after compilation to eagerly emitting the module, both are valid here.
@@ -1184,7 +1223,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 TestFile("Target0.h"),
                                 TestFile("file1.swift"),
                                 TestFile("file2.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -1194,8 +1234,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "BUILD_VARIANTS": "normal",
                                     "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
                                     "DEFINES_MODULE": "YES",
-                                    "CLANG_ENABLE_MODULES": "YES"
-                                ])
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -1203,34 +1244,41 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "fileC.c",
+                                        "fileC.c"
                                     ]),
                                     TestHeadersBuildPhase([
                                         TestBuildFile("Target0.h", headerVisibility: .public)
-                                    ])
-                                ]),
+                                    ]),
+                                ]
+                            ),
                             TestStandardTarget(
                                 "TargetA",
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "file1.swift",
-                                    ]),
-                                ], dependencies: [
+                                        "file1.swift"
+                                    ])
+                                ],
+                                dependencies: [
                                     "Target0"
-                                ]),
+                                ]
+                            ),
                             TestStandardTarget(
                                 "TargetB",
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "file2.swift",
-                                    ]),
-                                ], dependencies: [
+                                        "file2.swift"
+                                    ])
+                                ],
+                                dependencies: [
                                     "Target0"
-                                ]),
-                        ])
-                ])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -1239,34 +1287,30 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileC.c")) { file in
-                file <<<
-                            """
-                            int foo() { return 11; }
-                            """
+                file <<< """
+                    int foo() { return 11; }
+                    """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/Target0.h")) { file in
-                file <<<
-                            """
-                            int foo();
-                            """
+                file <<< """
+                    int foo();
+                    """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                            """
-                            import Target0
-                            public struct A {
-                                public init() { foo() }
-                            }
-                            """
+                file <<< """
+                    import Target0
+                    public struct A {
+                        public init() { foo() }
+                    }
+                    """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file2.swift")) { file in
-                file <<<
-                            """
-                            import Target0
-                            public struct B {
-                                public init() { foo() }
-                            }
-                            """
+                file <<< """
+                    import Target0
+                    public struct B {
+                        public init() { foo() }
+                    }
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true) { results in
@@ -1301,7 +1345,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                             children: [
                                 TestFile("file1.swift"),
                                 TestFile("file2.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -1312,21 +1357,25 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "ARCHS": arch,
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
                                     "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
-                            TestStandardTarget("TargetA",
-                                               type: .framework,
-                                               buildConfigurations: [
-                                                TestBuildConfiguration("Debug"),
-                                               ],
-                                               buildPhases: [
-                                                TestSourcesBuildPhase([
-                                                    "file1.swift",
-                                                    "file2.swift"
-                                                ]),
-                                               ])
-                        ]),
+                            TestStandardTarget(
+                                "TargetA",
+                                type: .framework,
+                                buildConfigurations: [
+                                    TestBuildConfiguration("Debug")
+                                ],
+                                buildPhases: [
+                                    TestSourcesBuildPhase([
+                                        "file1.swift",
+                                        "file2.swift",
+                                    ])
+                                ]
+                            )
+                        ]
+                    ),
                     TestProject(
                         "bProject",
                         groupTree: TestGroup(
@@ -1335,7 +1384,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                             children: [
                                 TestFile("file3.swift"),
                                 TestFile("file4.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -1349,32 +1399,40 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     // FIXME: Unfortunately, `BuildOperationTester` doesn't set up a shared `BUILT_PRODUCTS_DIR` for the whole workspace.
                                     "SWIFT_INCLUDE_PATHS": "$(TARGET_BUILD_DIR)/../../../aProject/build/Debug",
                                     "FRAMEWORK_SEARCH_PATHS": "$(TARGET_BUILD_DIR)/../../../aProject/build/Debug",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
                                 "TargetB",
                                 type: .framework,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug"),
+                                    TestBuildConfiguration("Debug")
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "file3.swift",
                                         "file4.swift",
                                     ]),
-                                    TestFrameworksBuildPhase([TestBuildFile(.target("TargetA"))])
-                                ], dependencies: ["TargetA"])
-                        ])
-                ])
+                                    TestFrameworksBuildPhase([TestBuildFile(.target("TargetA"))]),
+                                ],
+                                dependencies: ["TargetA"]
+                            )
+                        ]
+                    ),
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             tester.userInfo = tester.userInfo.withAdditionalEnvironment(environment: ["SWIFT_FORCE_MODULE_LOADING": "only-interface"])
             try tester.fs.createDirectory(moduleCacheDir)
-            let parameters = BuildParameters(configuration: "Debug", overrides: [
-                // Redirect the prebuilt cache so we always build modules from source
-                "SWIFT_OVERLOAD_PREBUILT_MODULE_CACHE_PATH": tmpDirPath.str
-            ])
+            let parameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    // Redirect the prebuilt cache so we always build modules from source
+                    "SWIFT_OVERLOAD_PREBUILT_MODULE_CACHE_PATH": tmpDirPath.str
+                ]
+            )
             let targetsToBuild = tester.workspace.projects.flatMap { project in project.targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }) }
             let buildRequest = BuildRequest(parameters: parameters, buildTargets: targetsToBuild, continueBuildingAfterErrors: true, useParallelTargets: true, useImplicitDependencies: false, useDryRun: false)
             let SRCROOTA = testWorkspace.sourceRoot.join("aProject")
@@ -1382,30 +1440,26 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOTA.join("Sources/file1.swift")) { file in
-                file <<<
-                        """
-                        public struct A {\n\tpublic init() {}\n}
-                        """
+                file <<< """
+                    public struct A {\n\tpublic init() {}\n}
+                    """
             }
             try await tester.fs.writeFileContents(SRCROOTA.join("Sources/file2.swift")) { file in
-                file <<<
-                        """
-                        struct B {\n\tlet a = A()\n}
-                        """
+                file <<< """
+                    struct B {\n\tlet a = A()\n}
+                    """
             }
 
             try await tester.fs.writeFileContents(SRCROOTB.join("Sources/file3.swift")) { file in
-                file <<<
-                        """
-                        public struct C {\n\tpublic init() {}\n}
-                        """
+                file <<< """
+                    public struct C {\n\tpublic init() {}\n}
+                    """
             }
             try await tester.fs.writeFileContents(SRCROOTB.join("Sources/file4.swift")) { file in
-                file <<<
-                        """
-                        import TargetA\n\nstruct D {\n\tlet a = A()\n}
-                        """
-            }
+                file <<< """
+                    import TargetA\n\nstruct D {\n\tlet a = A()\n}
+                    """
+            }
 
             // Check that subtasks progress events are reported as expected.
             try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true) { results in
@@ -1448,7 +1502,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 TestFile("file1.swift"),
                                 TestFile("file2.swift"),
                                 TestFile("file3.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -1461,42 +1516,53 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "BUILD_LIBRARY_FOR_DISTRIBUTION": "YES",
                                     // Force use of a response file
                                     "GCC_PREPROCESSOR_DEFINITIONS": Array(repeating: "ABCD=1", count: 10000).joined(separator: " "),
-                                    "OTHER_SWIFT_FLAGS": "-Xfrontend -module-load-mode -Xfrontend only-interface"
-                                ])
+                                    "OTHER_SWIFT_FLAGS": "-Xfrontend -module-load-mode -Xfrontend only-interface",
+                                ]
+                            )
                         ],
                         targets: [
-                            TestStandardTarget("TargetC",
-                                               type: .framework,
-                                               buildConfigurations: [
-                                                TestBuildConfiguration("Debug"),
-                                               ],
-                                               buildPhases: [
-                                                TestSourcesBuildPhase([
-                                                    "file3.swift",
-                                                ]),
-                                               ]),
-                            TestStandardTarget("TargetA",
-                                               type: .framework,
-                                               buildConfigurations: [
-                                                TestBuildConfiguration("Debug"),
-                                               ],
-                                               buildPhases: [
-                                                TestSourcesBuildPhase([
-                                                    "file1.swift",
-                                                ]),
-                                               ], dependencies: ["TargetB", "TargetC"]),
-                            TestStandardTarget("TargetB",
-                                               type: .framework,
-                                               buildConfigurations: [
-                                                TestBuildConfiguration("Debug"),
-                                               ],
-                                               buildPhases: [
-                                                TestSourcesBuildPhase([
-                                                    "file2.swift"
-                                                ]),
-                                               ], dependencies: ["TargetC"])
-                        ])
-                ])
+                            TestStandardTarget(
+                                "TargetC",
+                                type: .framework,
+                                buildConfigurations: [
+                                    TestBuildConfiguration("Debug")
+                                ],
+                                buildPhases: [
+                                    TestSourcesBuildPhase([
+                                        "file3.swift"
+                                    ])
+                                ]
+                            ),
+                            TestStandardTarget(
+                                "TargetA",
+                                type: .framework,
+                                buildConfigurations: [
+                                    TestBuildConfiguration("Debug")
+                                ],
+                                buildPhases: [
+                                    TestSourcesBuildPhase([
+                                        "file1.swift"
+                                    ])
+                                ],
+                                dependencies: ["TargetB", "TargetC"]
+                            ),
+                            TestStandardTarget(
+                                "TargetB",
+                                type: .framework,
+                                buildConfigurations: [
+                                    TestBuildConfiguration("Debug")
+                                ],
+                                buildPhases: [
+                                    TestSourcesBuildPhase([
+                                        "file2.swift"
+                                    ])
+                                ],
+                                dependencies: ["TargetC"]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             try tester.fs.createDirectory(moduleCacheDir)
@@ -1507,24 +1573,21 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOTA.join("Sources/file1.swift")) { file in
-                file <<<
-                        """
-                        import TargetC
-                        func foo() { baz() }
-                        """
+                file <<< """
+                    import TargetC
+                    func foo() { baz() }
+                    """
             }
             try await tester.fs.writeFileContents(SRCROOTA.join("Sources/file2.swift")) { file in
-                file <<<
-                        """
-                        import TargetC
-                        func bar() { baz() }
-                        """
+                file <<< """
+                    import TargetC
+                    func bar() { baz() }
+                    """
             }
             try await tester.fs.writeFileContents(SRCROOTA.join("Sources/file3.swift")) { file in
-                file <<<
-                        """
-                        public func baz() {}
-                        """
+                file <<< """
+                    public func baz() {}
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true) { results in
@@ -1559,7 +1622,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                                     TestFile("file3.swift"),
                                     TestFile("file4.swift"),
-                                ]),
+                                ]
+                            ),
                             buildConfigurations: [
                                 TestBuildConfiguration(
                                     "Debug",
@@ -1570,7 +1634,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                         "ARCHS": arch,
                                         "SWIFT_USE_INTEGRATED_DRIVER": "YES",
                                         "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                                    ])
+                                    ]
+                                )
                             ],
                             targets: [
                                 // Ensure that a target containing both Swift and C sources
@@ -1581,31 +1646,36 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     buildConfigurations: [
                                         // Modify PRODUCT_NAME to ensure we use it downstream
                                         // for target dependency info, instead of target name.
-                                        TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "TargetA_X"]),
+                                        TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "TargetA_X"])
                                     ],
                                     buildPhases: [
                                         TestSourcesBuildPhase([
                                             "fileC.c",
                                             "fileC.h",
                                             "file1.swift",
-                                            "file2.swift"
-                                        ]),
-                                    ]),
+                                            "file2.swift",
+                                        ])
+                                    ]
+                                ),
                                 TestStandardTarget(
                                     "TargetB",
                                     type: .framework,
                                     buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "TargetB_X"]),
+                                        TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "TargetB_X"])
                                     ],
                                     buildPhases: [
                                         TestSourcesBuildPhase([
                                             "file3.swift",
                                             "file4.swift",
                                         ]),
-                                        TestFrameworksBuildPhase([TestBuildFile(.auto("TargetA_X.framework"))])
-                                    ], dependencies: ["TargetA"])
-                            ])
-                    ])
+                                        TestFrameworksBuildPhase([TestBuildFile(.auto("TargetA_X.framework"))]),
+                                    ],
+                                    dependencies: ["TargetA"]
+                                ),
+                            ]
+                        )
+                    ]
+                )
 
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
                 try tester.fs.createDirectory(moduleCacheDir)
@@ -1615,28 +1685,24 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                 // Create the source files.
                 try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileC.c")) { file in
-                    file <<<
-                        """
+                    file <<< """
                         int foo() { return 11; }
                         """
                 }
                 try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileC.h")) { file in
-                    file <<<
-                        """
+                    file <<< """
                         int foo();
                         """
                 }
                 try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                    file <<<
-                        """
+                    file <<< """
                         public struct A {
                             public init() {}
                         }
                         """
                 }
                 try await tester.fs.writeFileContents(SRCROOT.join("Sources/file2.swift")) { file in
-                    file <<<
-                        """
+                    file <<< """
                         struct B {
                             let a = A()
                         }
@@ -1644,16 +1710,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                 }
 
                 try await tester.fs.writeFileContents(SRCROOT.join("Sources/file3.swift")) { file in
-                    file <<<
-                        """
+                    file <<< """
                         public struct C {
                             public init() {}
                         }
                         """
                 }
                 try await tester.fs.writeFileContents(SRCROOT.join("Sources/file4.swift")) { file in
-                    file <<<
-                        """
+                    file <<< """
                         import TargetA_X
 
                         struct D {
@@ -1685,7 +1749,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                     }
 
                     results.checkTask(.matchTargetName("TargetA"), .matchRule(["SwiftCompile", "normal", arch, "Compiling file2.swift", SRCROOT.join("Sources/file2.swift").str])) { compileFile2Task in
-                        compileFile2Task.checkCommandLineMatches([.suffix("swift-frontend"), .anySequence, "-primary-file", .equal(SRCROOT.join("Sources/file2.swift").str), .anySequence, "-disable-implicit-swift-modules",  .anySequence, "-o", .suffix("file2.o")])
+                        compileFile2Task.checkCommandLineMatches([.suffix("swift-frontend"), .anySequence, "-primary-file", .equal(SRCROOT.join("Sources/file2.swift").str), .anySequence, "-disable-implicit-swift-modules", .anySequence, "-o", .suffix("file2.o")])
                     }
 
                     // Swift Driver changed default behavior from merging modules after compilation to eagerly emitting the module, both are valid here.
@@ -1698,11 +1762,11 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                     }
 
                     results.checkTask(.matchTargetName("TargetB"), .matchRule(["SwiftCompile", "normal", arch, "Compiling file3.swift", SRCROOT.join("Sources/file3.swift").str])) { compileFile3Task in
-                        compileFile3Task.checkCommandLineMatches([.suffix("swift-frontend"), .anySequence, "-primary-file", .equal(SRCROOT.join("Sources/file3.swift").str), .anySequence, "-disable-implicit-swift-modules",  .anySequence, "-o", .suffix("file3.o")])
+                        compileFile3Task.checkCommandLineMatches([.suffix("swift-frontend"), .anySequence, "-primary-file", .equal(SRCROOT.join("Sources/file3.swift").str), .anySequence, "-disable-implicit-swift-modules", .anySequence, "-o", .suffix("file3.o")])
                     }
 
                     results.checkTask(.matchTargetName("TargetB"), .matchRule(["SwiftCompile", "normal", arch, "Compiling file4.swift", SRCROOT.join("Sources/file4.swift").str])) { compileFile4Task in
-                        compileFile4Task.checkCommandLineMatches([.suffix("swift-frontend"), .anySequence, "-primary-file", .anySequence, .equal(SRCROOT.join("Sources/file4.swift").str), .anySequence, "-disable-implicit-swift-modules",  .anySequence, "-o", .suffix("file4.o")])
+                        compileFile4Task.checkCommandLineMatches([.suffix("swift-frontend"), .anySequence, "-primary-file", .anySequence, .equal(SRCROOT.join("Sources/file4.swift").str), .anySequence, "-disable-implicit-swift-modules", .anySequence, "-o", .suffix("file4.o")])
                     }
 
                     // Swift Driver changed default behavior from merging modules after compilation to eagerly emitting the module, both are valid here.
@@ -1753,7 +1817,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                             children: [
                                 TestFile("file1.swift"),
                                 TestFile("file2.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -1764,7 +1829,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "ARCHS": "arm64e",
 
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -1772,19 +1838,24 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "file1.swift",
-                                    ]),
-                                ]),
+                                        "file1.swift"
+                                    ])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "TargetB",
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "file2.swift",
-                                    ]),
-                                ], dependencies: ["TargetA"]),
-                        ])
-                ])
+                                        "file2.swift"
+                                    ])
+                                ],
+                                dependencies: ["TargetA"]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -1793,14 +1864,12 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     open class A1 {}
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     import TargetA
 
                     final class A2: A1 {}
@@ -1817,8 +1886,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Add method to A1 in TargetA to invalidate TargetA and TargetB planning
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     open class A1 {
                         open func foo() { }
                     }
@@ -1849,8 +1917,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                             "Sources",
                             path: "Sources",
                             children: [
-                                TestFile("file1.swift"),
-                            ]),
+                                TestFile("file1.swift")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -1861,7 +1930,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "ARCHS": "arm64e",
 
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -1869,11 +1939,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "file1.swift",
-                                    ]),
-                                ]),
-                        ])
-                ])
+                                        "file1.swift"
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -1882,8 +1955,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source file.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift"), waitForNewTimestamp: true) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct A1 {}
                     """
             }
@@ -1898,8 +1970,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Change the source file.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift"), waitForNewTimestamp: true) { file in
-                file <<<
-                    """
+                file <<< """
                     public class A1 { }
                     """
             }
@@ -1912,8 +1983,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Change the source file again.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift"), waitForNewTimestamp: true) { file in
-                file <<<
-                    """
+                file <<< """
                     public class A2 { }
                     """
             }
@@ -1943,7 +2013,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                             children: [
                                 TestFile("file1.swift"),
                                 TestFile("file2.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -1951,7 +2022,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "SWIFT_VERSION": swiftVersion,
                                     "BUILD_VARIANTS": "normal",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -1961,10 +2033,13 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "file1.swift",
                                         "file2.swift",
-                                    ]),
-                                ]),
-                        ])
-                ])
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -1973,8 +2048,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the sources.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift"), waitForNewTimestamp: true) { file in
-                file <<<
-                    """
+                file <<< """
                     func f() {
                         // We place this code inside a function body so that when we introduce an error, it is emitted by only the compile task, and not the emit-module task as well.
                         let x = y
@@ -1984,8 +2058,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file2.swift"), waitForNewTimestamp: true) { file in
-                file <<<
-                    """
+                file <<< """
                     let y = 42
                     """
             }
@@ -2003,8 +2076,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Update file2 such that the compilation of file1 will emit an error and fail.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file2.swift"), waitForNewTimestamp: true) { file in
-                file <<<
-                    """
+                file <<< """
                     let z = 42
                     """
             }
@@ -2018,8 +2090,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Revert the changes to file2. The new build should succeed, and both files should recompile, file2 because it was modified and file1 because it failed in the previous build.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file2.swift"), waitForNewTimestamp: true) { file in
-                file <<<
-                    """
+                file <<< """
                     let y = 42
                     """
             }
@@ -2055,7 +2126,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                                 TestFile("file3.swift"),
                                 TestFile("file4.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -2066,7 +2138,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "ARCHS": "arm64e",
 
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -2076,8 +2149,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "file1.swift",
                                         "file2.swift",
-                                    ]),
-                                ]),
+                                    ])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "TargetB",
                                 type: .framework,
@@ -2085,10 +2159,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "file3.swift",
                                         "file4.swift",
-                                    ]),
-                                ], dependencies: ["TargetA"]),
-                        ])
-                ])
+                                    ])
+                                ],
+                                dependencies: ["TargetA"]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -2097,14 +2175,12 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct A1 {}
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     open class A2 {
                         let a = A1()
                     }
@@ -2112,16 +2188,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file3.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     import TargetA
 
                     class B1: A2 {}
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file4.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     class B2: B1 {}
                     """
             }
@@ -2136,8 +2210,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Change B -> Incremental build
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file4.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     class B2 { }
                     """
             }
@@ -2171,8 +2244,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Change public API in A
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct A1 {}
                     public struct Foo {}
                     """
@@ -2217,7 +2289,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                                 TestFile("file3.swift"),
                                 TestFile("file4.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -2228,7 +2301,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "ARCHS": "arm64e",
 
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -2238,8 +2312,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "file1.swift",
                                         "file2.swift",
-                                    ]),
-                                ]),
+                                    ])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "TargetB",
                                 type: .framework,
@@ -2247,10 +2322,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "file3.swift",
                                         "file4.swift",
-                                    ]),
-                                ], dependencies: ["TargetA"]),
-                        ])
-                ])
+                                    ])
+                                ],
+                                dependencies: ["TargetA"]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -2259,14 +2338,12 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct A1 {}
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     open class A2 {
                         let a = A1()
                     }
@@ -2274,16 +2351,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file3.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     import TargetA
 
                     class B1: A2 {}
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file4.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     class B2: B1 {}
                     """
             }
@@ -2321,7 +2396,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 (0..<numberOfFilesPerTarget).map { fileNumber in
                                     TestFile("Target\(targetNumber)File\(fileNumber).swift")
                                 }
-                            }),
+                            }
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -2332,21 +2408,25 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "ARCHS": "arm64e",
 
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                ])
+                                ]
+                            )
                         ],
-                        targets:
-                            (0..<numberOfTargets).map { targetNumber in
-                                TestStandardTarget(
-                                    "Target\(targetNumber)",
-                                    type: .framework,
-                                    buildPhases: [
-                                        TestSourcesBuildPhase((0..<numberOfFilesPerTarget).map { fileNumber in
+                        targets: (0..<numberOfTargets).map { targetNumber in
+                            TestStandardTarget(
+                                "Target\(targetNumber)",
+                                type: .framework,
+                                buildPhases: [
+                                    TestSourcesBuildPhase(
+                                        (0..<numberOfFilesPerTarget).map { fileNumber in
                                             TestBuildFile("Target\(targetNumber)File\(fileNumber).swift")
-                                        })
-                                    ])
-                            }
+                                        }
+                                    )
+                                ]
+                            )
+                        }
                     )
-                ])
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -2357,10 +2437,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             for targetNumber in 0..<numberOfTargets {
                 for fileNumber in 0..<numberOfFilesPerTarget {
                     try await tester.fs.writeFileContents(SRCROOT.join("Sources/Target\(targetNumber)File\(fileNumber).swift")) { file in
-                        file <<<
-                                """
-                                public struct Target\(targetNumber)File\(fileNumber) { }
-                                """
+                        file <<< """
+                            public struct Target\(targetNumber)File\(fileNumber) { }
+                            """
                     }
                 }
             }
@@ -2385,7 +2464,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             path: "Sources",
-                            children: [ TestFile("file.swift") ]
+                            children: [TestFile("file.swift")]
                         ),
                         buildConfigurations: [
                             TestBuildConfiguration(
@@ -2399,21 +2478,23 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
 
                                     "OTHER_SWIFT_FLAGS": "$(inherited) " + (0..<numberOfSwiftFlags).map({ "-FLAG\($0)" }).joined(separator: " "),
-                                ])
+                                ]
+                            )
                         ],
-                        targets:
-                            [
-                                TestStandardTarget(
-                                    "TargetA",
-                                    type: .framework,
-                                    buildPhases: [
-                                        TestSourcesBuildPhase([
-                                            TestBuildFile("file.swift")
-                                        ])
+                        targets: [
+                            TestStandardTarget(
+                                "TargetA",
+                                type: .framework,
+                                buildPhases: [
+                                    TestSourcesBuildPhase([
+                                        TestBuildFile("file.swift")
                                     ])
-                            ]
+                                ]
+                            )
+                        ]
                     )
-                ])
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
@@ -2446,7 +2527,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 TestFile("file1.swift"),
                                 TestFile("file2.swift"),
                                 TestFile("file3.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -2458,7 +2540,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
                                     "OTHER_SWIFT_FLAGS": "$(inherited) -driver-batch-count 1",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -2469,10 +2552,13 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                         "file1.swift",
                                         "file2.swift",
                                         "file3.swift",
-                                    ]),
-                                ])
-                        ])
-                ])
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -2481,23 +2567,20 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public class A1: DoesNotExist { }
                     """
             }
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public class A2: DoesAlsoNotExist { }
                     """
             }
 
             // file3.swift has no source error, so the diagnostics path should be an empty file
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file3.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public class A3 { }
                     """
             }
@@ -2548,7 +2631,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 TestFile("file1.swift"),
                                 TestFile("file2.swift"),
                                 TestFile("file3.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -2559,7 +2643,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "ARCHS": arch,
                                     "SWIFT_WHOLE_MODULE_OPTIMIZATION": "YES",
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -2570,10 +2655,13 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                         "file1.swift",
                                         "file2.swift",
                                         "file3.swift",
-                                    ]),
-                                ])
-                        ])
-                ])
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -2582,23 +2670,20 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public class A1: DoesNotExist { }
                     """
             }
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public class A2: DoesAlsoNotExist { }
                     """
             }
 
             // file3.swift has no source error, so the diagnostics path should be an empty file
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file3.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public class A3 { }
                     """
             }
@@ -2636,17 +2721,22 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                             "Sources",
                             path: "Sources",
                             children: [
-                                TestGroup("A",
-                                          path: "A",
-                                          children: [
-                                            TestFile("file.swift", guid: "Afile.swift")
-                                          ]),
-                                TestGroup("B",
-                                          path: "B",
-                                          children: [
-                                            TestFile("file.swift", guid: "Bfile.swift")
-                                          ])
-                            ]),
+                                TestGroup(
+                                    "A",
+                                    path: "A",
+                                    children: [
+                                        TestFile("file.swift", guid: "Afile.swift")
+                                    ]
+                                ),
+                                TestGroup(
+                                    "B",
+                                    path: "B",
+                                    children: [
+                                        TestFile("file.swift", guid: "Bfile.swift")
+                                    ]
+                                ),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -2658,7 +2748,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
                                     "SUPPORTS_TEXT_BASED_API": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -2668,10 +2759,13 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "Afile.swift",
                                         "Bfile.swift",
-                                    ]),
-                                ]),
-                        ])
-                ])
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -2705,8 +2799,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                             "Sources",
                             path: "Sources",
                             children: [
-                                TestFile("file1.swift"),
-                            ]),
+                                TestFile("file1.swift")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -2718,7 +2813,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
                                     "SUPPORTS_TEXT_BASED_API": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -2726,11 +2822,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "file1.swift",
-                                    ]),
-                                ]),
-                        ])
-                ])
+                                        "file1.swift"
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -2739,15 +2838,13 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct A {
                         public init() {}
                     }
                     """
             }
 
-
             // Check that subtasks progress events are reported as expected.
             tester.userInfo = UserInfo(user: "user", group: "group", uid: 1337, gid: 42, home: tmpDirPath.join("home"), processEnvironment: ["LD_APPLICATION_EXTENSION_SAFE": "1"], buildSystemEnvironment: [:])
 
@@ -2775,7 +2872,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                                 TestFile("fileB1.swift"),
                                 TestFile("fileB2.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -2786,7 +2884,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "ARCHS": "arm64e",
 
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -2796,8 +2895,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "fileA1.swift",
                                         "fileA2.swift",
-                                    ]),
-                                ]),
+                                    ])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "TargetB",
                                 type: .framework,
@@ -2805,10 +2905,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "fileB1.swift",
                                         "fileB2.swift",
-                                    ]),
-                                ], dependencies: ["TargetA"]),
-                        ])
-                ])
+                                    ])
+                                ],
+                                dependencies: ["TargetA"]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -2817,16 +2921,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileA1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct A {
                         public init() {}
                     }
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileA2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     struct B {
                         let a = A()
                     }
@@ -2834,14 +2936,12 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileB1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     struct C {}
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileB2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     import TargetA\n\nstruct D {\n\tlet a = A()\n}
                     """
             }
@@ -2874,7 +2974,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                         results.checkTaskRequested(compilationTask, .matchTargetName(targetName), .matchRuleType("SwiftCompile"), .matchRuleItem(SRCROOT.join("Sources/file\(targetNameSuffix)1.swift").str))
                         results.checkTaskRequested(compilationTask, .matchTargetName(targetName), .matchRuleType("SwiftCompile"), .matchRuleItem(SRCROOT.join("Sources/file\(targetNameSuffix)2.swift").str))
-                        results.checkTaskRequested(compilationTask , .matchRuleType("SwiftDriver"), .matchTargetName(targetName))
+                        results.checkTaskRequested(compilationTask, .matchRuleType("SwiftDriver"), .matchTargetName(targetName))
                         results.checkTaskRequested(compilationTask, .matchTargetName(targetName), .matchRule(["SwiftEmitModule", "normal", "arm64e", "Emitting module for \(targetName)"]))
                         results.checkNoUncheckedTasksRequested(compilationTask)
                     }
@@ -2917,8 +3017,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 TestFile("fileC1.swift"),
                                 TestFile("fileC2.swift"),
 
-                                TestFile("libDylib.dylib")
-                            ]),
+                                TestFile("libDylib.dylib"),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -2932,7 +3033,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
                                     "EAGER_LINKING": "YES",
                                     "EAGER_LINKING_REQUIRE": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -2943,8 +3045,10 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                         "fileA1.swift",
                                         "fileA2.swift",
                                     ]),
-                                    TestFrameworksBuildPhase([TestBuildFile(.target("Fwk")), TestBuildFile("libDylib.dylib")])
-                                ], dependencies: ["Fwk", "DynamicLibrary"]),
+                                    TestFrameworksBuildPhase([TestBuildFile(.target("Fwk")), TestBuildFile("libDylib.dylib")]),
+                                ],
+                                dependencies: ["Fwk", "DynamicLibrary"]
+                            ),
                             TestStandardTarget(
                                 "Fwk",
                                 type: .framework,
@@ -2952,22 +3056,26 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "fileB1.swift",
                                         "fileB2.swift",
-                                    ]),
-                                ]),
+                                    ])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "DynamicLibrary",
                                 type: .dynamicLibrary,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "libDylib"]),
+                                    TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "libDylib"])
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "fileC1.swift",
                                         "fileC2.swift",
-                                    ]),
-                                ]),
-                        ])
-                ])
+                                    ])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -2976,8 +3084,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileA1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     import Fwk
                     import libDylib
                     @main public struct Tool {
@@ -2990,38 +3097,33 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileA2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     struct InternalStruct {}
                     """
             }
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileB1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct FwkStruct {
                         public init() {}
                     }
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileB2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     extension FwkStruct {}
                     """
             }
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileC1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct DylibStruct {
                         public init() {}
                     }
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileC2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     extension DylibStruct {}
                     """
             }
@@ -3064,7 +3166,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                                 TestFile("fileB1.swift"),
                                 TestFile("fileB2.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -3079,7 +3182,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
                                     "EAGER_LINKING": "YES",
                                     "EAGER_LINKING_REQUIRE": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -3090,8 +3194,10 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                         "fileA1.swift",
                                         "fileA2.swift",
                                     ]),
-                                    TestFrameworksBuildPhase([TestBuildFile(.target("Fwk"))])
-                                ], dependencies: ["Fwk"]),
+                                    TestFrameworksBuildPhase([TestBuildFile(.target("Fwk"))]),
+                                ],
+                                dependencies: ["Fwk"]
+                            ),
                             TestStandardTarget(
                                 "Fwk",
                                 type: .framework,
@@ -3099,10 +3205,13 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "fileB1.swift",
                                         "fileB2.swift",
-                                    ]),
-                                ]),
-                        ])
-                ])
+                                    ])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -3111,8 +3220,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileA1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     import Fwk
                     @main public struct Tool {
                         static func main() {
@@ -3123,23 +3231,20 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileA2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     struct InternalStruct {}
                     """
             }
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileB1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct FwkStruct {
                         public init() {}
                     }
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileB2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     extension FwkStruct {}
                     """
             }
@@ -3179,7 +3284,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                                 TestFile("fileB1.swift"),
                                 TestFile("fileB2.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -3192,7 +3298,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "SWIFT_ENABLE_LIBRARY_EVOLUTION": "YES",
                                     "SDKROOT": "iphoneos",
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -3202,8 +3309,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "fileA1.swift",
                                         "fileA2.swift",
-                                    ]),
-                                ]),
+                                    ])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "TargetB",
                                 type: .framework,
@@ -3211,10 +3319,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "fileB1.swift",
                                         "fileB2.swift",
-                                    ]),
-                                ], dependencies: ["TargetA"]),
-                        ])
-                ])
+                                    ])
+                                ],
+                                dependencies: ["TargetA"]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -3223,16 +3335,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileA1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct A {
                         public init() {}
                     }
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileA2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     struct B {
                         let a = A()
                     }
@@ -3240,14 +3350,12 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileB1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     struct C {}
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileB2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     import TargetA\n\nstruct D {\n\tlet a = A()\n}
                     """
             }
@@ -3319,7 +3427,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                                 TestFile("fileB1.swift"),
                                 TestFile("fileB2.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -3332,7 +3441,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "SWIFT_ENABLE_LIBRARY_EVOLUTION": "NO",
                                     "SDKROOT": "iphoneos",
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -3342,8 +3452,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "fileA1.swift",
                                         "fileA2.swift",
-                                    ]),
-                                ]),
+                                    ])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "TargetB",
                                 type: .framework,
@@ -3351,10 +3462,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "fileB1.swift",
                                         "fileB2.swift",
-                                    ]),
-                                ], dependencies: ["TargetA"]),
-                        ])
-                ])
+                                    ])
+                                ],
+                                dependencies: ["TargetA"]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -3363,16 +3478,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileA1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct A {
                         public init() {}
                     }
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileA2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     struct B {
                         let a = A()
                     }
@@ -3380,14 +3493,12 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileB1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     struct C {}
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileB2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     import TargetA\n\nstruct D {\n\tlet a = A()\n}
                     """
             }
@@ -3428,7 +3539,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                                     TestFile("fileB1.swift"),
                                     TestFile("fileB2.swift"),
-                                ]),
+                                ]
+                            ),
                             buildConfigurations: [
                                 TestBuildConfiguration(
                                     "Debug",
@@ -3439,7 +3551,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                         "ARCHS": arch,
                                         "SWIFT_USE_INTEGRATED_DRIVER": "YES",
                                         "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                                    ])
+                                    ]
+                                )
                             ],
                             targets: [
                                 TestStandardTarget(
@@ -3449,8 +3562,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                         TestSourcesBuildPhase([
                                             "fileA1.swift",
                                             "fileA2.swift",
-                                        ]),
-                                    ]),
+                                        ])
+                                    ]
+                                ),
                                 TestStandardTarget(
                                     "TargetB",
                                     type: .framework,
@@ -3464,46 +3578,49 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                         // Explicitly linking dependencies is required. This may cause
                                         // a lot of projects to break though so we may need to make explicit modules
                                         // behave the same way and re-introduce auto-linking.
-                                        TestFrameworksBuildPhase([TestBuildFile(.target("TargetA"))])
-                                    ], dependencies: ["TargetA"]),
-                            ])
-                    ])
+                                        TestFrameworksBuildPhase([TestBuildFile(.target("TargetA"))]),
+                                    ],
+                                    dependencies: ["TargetA"]
+                                ),
+                            ]
+                        )
+                    ]
+                )
 
                 let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
                 tester.userInfo = tester.userInfo.withAdditionalEnvironment(environment: ["SWIFT_FORCE_MODULE_LOADING": "only-interface"])
-                let parameters = BuildParameters(configuration: "Debug", overrides: [
-                    // Redirect the prebuilt cache so we always build modules from source
-                    "SWIFT_OVERLOAD_PREBUILT_MODULE_CACHE_PATH": tmpDirPath.str
-                ])
+                let parameters = BuildParameters(
+                    configuration: "Debug",
+                    overrides: [
+                        // Redirect the prebuilt cache so we always build modules from source
+                        "SWIFT_OVERLOAD_PREBUILT_MODULE_CACHE_PATH": tmpDirPath.str
+                    ]
+                )
                 let buildRequest = BuildRequest(parameters: parameters, buildTargets: tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }), continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: false, useDryRun: false)
                 let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
                 // Create the source files.
                 try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileA1.swift")) { file in
-                    file <<<
-                        """
+                    file <<< """
                         public struct A {
                             public init() { }
                         }
                         """
                 }
                 try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileA2.swift")) { file in
-                    file <<<
-                        """
+                    file <<< """
                         struct B {
                             let a = A()
                         }
                         """
                 }
                 try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileB1.swift")) { file in
-                    file <<<
-                        """
+                    file <<< """
                         struct C { }
                         """
                 }
                 try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileB2.swift")) { file in
-                    file <<<
-                        """
+                    file <<< """
                         import TargetA
 
                         struct D {
@@ -3615,9 +3732,10 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                         type: .framework,
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                "file1.swift",
-                            ]),
-                        ])
+                                "file1.swift"
+                            ])
+                        ]
+                    )
 
                     let testWorkspace = try await TestWorkspace(
                         "Test",
@@ -3629,8 +3747,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "Sources",
                                     path: "Sources",
                                     children: [
-                                        TestFile("file1.swift"),
-                                    ]),
+                                        TestFile("file1.swift")
+                                    ]
+                                ),
                                 buildConfigurations: [
                                     TestBuildConfiguration(
                                         "Debug",
@@ -3647,10 +3766,13 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                             // Eager linking is not supported when using the driver binary.
                                             "EAGER_LINKING": "NO",
                                             "SWIFT_VALIDATE_CLANG_MODULES_ONCE_PER_BUILD_SESSION": "NO",
-                                        ])
+                                        ]
+                                    )
                                 ],
-                                targets: [ targetA ])
-                        ])
+                                targets: [targetA]
+                            )
+                        ]
+                    )
 
                     let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
                     let parameters = BuildParameters(configuration: "Debug")
@@ -3659,8 +3781,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                     // Create the source files.
                     try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                        file <<<
-                            """
+                        file <<< """
                             public struct A {
                                 public init() { }
                             }
@@ -3723,9 +3844,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                 )
 
                 XCTAssertEqualSequences(
-                    integratedInfos.preview.commandLine.filter { $0 != "-disable-cmo" &&
-                                                                                                $0 != "-no-color-diagnostics" &&
-                                                                                                $0 != "-experimental-emit-module-separately" },
+                    integratedInfos.preview.commandLine.filter { $0 != "-disable-cmo" && $0 != "-no-color-diagnostics" && $0 != "-experimental-emit-module-separately" },
                     binaryInfos.preview.commandLine
                 )
             }
@@ -3745,8 +3864,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                             "Sources",
                             path: "Sources",
                             children: [
-                                TestFile("file.swift"),
-                            ]),
+                                TestFile("file.swift")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -3757,7 +3877,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "ARCHS": "arm64e",
 
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -3765,11 +3886,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "file.swift",
-                                    ]),
-                                ]),
-                        ])
-                ])
+                                        "file.swift"
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -3811,7 +3935,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                                 TestFile("file3.swift"),
                                 TestFile("file4.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -3822,7 +3947,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "ARCHS": "arm64e",
 
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -3832,8 +3958,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "file1.swift",
                                         "file2.swift",
-                                    ]),
-                                ]),
+                                    ])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "TargetB",
                                 type: .framework,
@@ -3841,10 +3968,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     TestSourcesBuildPhase([
                                         "file3.swift",
                                         "file4.swift",
-                                    ]),
-                                ], dependencies: ["TargetA"]),
-                        ])
-                ])
+                                    ])
+                                ],
+                                dependencies: ["TargetA"]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -3853,16 +3984,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct A {
                         public init() {}
                     }
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     struct B {
                         let a = A()
                     }
@@ -3870,14 +3999,12 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file3.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     struct C {}
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file4.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     import TargetA
 
                     struct D {
@@ -3911,8 +4038,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                             "Sources",
                             path: "Sources",
                             children: [
-                                TestFile("file1.swift"),
-                            ]),
+                                TestFile("file1.swift")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -3923,7 +4051,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "BUILD_VARIANTS": "normal",
                                     "ARCHS": "arm64",
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -3931,11 +4060,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 type: .dynamicLibrary,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "file1.swift",
-                                    ]),
-                                ]),
-                        ])
-                ])
+                                        "file1.swift"
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(action: .docBuild, configuration: "Debug")
@@ -3944,8 +4076,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct A {
                         public init() {}
                     }
@@ -3989,7 +4120,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 TestFile("file1.swift"),
 
                                 TestFile("file2.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -4000,7 +4132,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "ARCHS": "arm64e",
 
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -4008,19 +4141,24 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "file1.swift",
-                                    ]),
-                                ]),
+                                        "file1.swift"
+                                    ])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "TargetB",
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "file2.swift",
-                                    ]),
-                                ], dependencies: ["TargetA"]),
-                        ])
-                ])
+                                        "file2.swift"
+                                    ])
+                                ],
+                                dependencies: ["TargetA"]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -4032,16 +4170,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct A {
                         public static func foo() -> Int { 5 }
                     }
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     import TargetA
                     open class B {
                         let a = A.foo()
@@ -4064,8 +4200,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Change B -> Incremental build
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     import TargetA
                     final class B {
                         let a = A.foo()
@@ -4095,8 +4230,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Remove public API in A
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct A {
                         public init() {}
                     }
@@ -4129,8 +4263,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Fix call in B -> Incremental build
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file2.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     import TargetA
                     final class B {
                         let a = A()
@@ -4164,25 +4297,31 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDirPath,
                 groupTree: TestGroup(
-                    "Sources", children: [
+                    "Sources",
+                    children: [
                         TestFile("Source.swift"),
                         TestFile("Source2.swift"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SWIFT_VERSION": swiftVersion
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SWIFT_VERSION": swiftVersion,
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Foo",
                         type: .framework,
                         buildPhases: [
-                            TestSourcesBuildPhase(["Source.swift", "Source2.swift"]),
-                        ])
-                ])
-
+                            TestSourcesBuildPhase(["Source.swift", "Source2.swift"])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             try await tester.fs.writeFileContents(tmpDirPath.join("Source.swift")) {
@@ -4218,7 +4357,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                             children: [
                                 TestFile("file1.swift"),
                                 TestFile("TargetA.h"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -4229,7 +4369,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "ARCHS": "arm64e",
                                     "SWIFT_OBJC_BRIDGING_HEADER": tmpDirPath.join("Test/aProject/Sources/bridge.h").str,
                                     "DEFINES_MODULE": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -4240,11 +4381,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                         TestBuildFile("TargetA.h", headerVisibility: .public)
                                     ]),
                                     TestSourcesBuildPhase([
-                                        "file1.swift",
+                                        "file1.swift"
                                     ]),
-                                ]),
-                        ])
-                ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -4253,21 +4397,18 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct A {
                         public init() {}
                     }
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/TargetA.h")) { file in
-                file <<<
-                    """
+                file <<< """
                     """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/bridge.h")) { file in
-                file <<<
-                    """
+                file <<< """
                     @import Foundation;
                     """
             }
@@ -4297,8 +4438,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                             "Sources",
                             path: "Sources",
                             children: [
-                                TestFile("file1.swift"),
-                            ]),
+                                TestFile("file1.swift")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -4307,7 +4449,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "SWIFT_VERSION": swiftVersion,
                                     "BUILD_VARIANTS": "normal",
                                     "ARCHS": "arm64e",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -4316,11 +4459,14 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 buildPhases: [
                                     TestShellScriptBuildPhase(name: "A", originalObjectID: "A", contents: "echo 'error: something bad happened'", alwaysOutOfDate: true),
                                     TestSourcesBuildPhase([
-                                        "file1.swift",
+                                        "file1.swift"
                                     ]),
-                                ]),
-                        ])
-                ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -4328,8 +4474,7 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct A {
                         public init() {}
                     }
@@ -4361,18 +4506,22 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 TestFile("Framework1.h"),
                                 TestFile("file_1.c"),
                                 TestFile("file_2.swift"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                                "SWIFT_VERSION": swiftVersion,
-                                "DEFINES_MODULE": "YES",
-                                "VALID_ARCHS": "arm64",
-                                "DSTROOT": tmpDir.join("dstroot").str,
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "DEFINES_MODULE": "YES",
+                                    "VALID_ARCHS": "arm64",
+                                    "DSTROOT": tmpDir.join("dstroot").str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Framework1",
@@ -4380,43 +4529,45 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 buildPhases: [
                                     TestHeadersBuildPhase([TestBuildFile("Framework1.h", headerVisibility: .public)]),
                                     TestSourcesBuildPhase(["file_1.c"]),
-                                ]),
+                                ]
+                            ),
                             TestStandardTarget(
                                 "Framework2",
                                 type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file_2.swift"]),
+                                    TestSourcesBuildPhase(["file_2.swift"])
                                 ],
-                            dependencies: [
-                                "Framework1"
-                            ]),
-                        ])])
+                                dependencies: [
+                                    "Framework1"
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework1.h")) { stream in
-                stream <<<
-            """
-            void foo(void);
-            """
+                stream <<< """
+                    void foo(void);
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file_1.c")) { stream in
-                stream <<<
-            """
-            #include <Framework1/Framework1.h>
-            void foo(void) {}
-            """
+                stream <<< """
+                    #include <Framework1/Framework1.h>
+                    void foo(void) {}
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file_2.swift")) { stream in
-                stream <<<
-            """
-            import Framework1
-            public func bar() {
-                foo()
-            }
-            """
+                stream <<< """
+                    import Framework1
+                    public func bar() {
+                        foo()
+                    }
+                    """
             }
 
             let parameters = BuildParameters(configuration: "Debug", overrides: [:])
@@ -4452,19 +4603,23 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 TestFile("Framework1.h"),
                                 TestFile("file_1.c"),
                                 TestFile("file_2.swift"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                                "SWIFT_VERSION": swiftVersion,
-                                "DEFINES_MODULE": "YES",
-                                "VALID_ARCHS": "arm64",
-                                "DSTROOT": tmpDir.join("dstroot").str,
-                                "MODULEMAP_FILE_CONTENTS": "framework module Framework1 [system] { header \"Framework1.h\" }"
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "DEFINES_MODULE": "YES",
+                                    "VALID_ARCHS": "arm64",
+                                    "DSTROOT": tmpDir.join("dstroot").str,
+                                    "MODULEMAP_FILE_CONTENTS": "framework module Framework1 [system] { header \"Framework1.h\" }",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Framework1",
@@ -4472,43 +4627,45 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 buildPhases: [
                                     TestHeadersBuildPhase([TestBuildFile("Framework1.h", headerVisibility: .public)]),
                                     TestSourcesBuildPhase(["file_1.c"]),
-                                ]),
+                                ]
+                            ),
                             TestStandardTarget(
                                 "Framework2",
                                 type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file_2.swift"]),
+                                    TestSourcesBuildPhase(["file_2.swift"])
                                 ],
-                            dependencies: [
-                                "Framework1"
-                            ]),
-                        ])])
+                                dependencies: [
+                                    "Framework1"
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework1.h")) { stream in
-                stream <<<
-            """
-            void foo(void);
-            """
+                stream <<< """
+                    void foo(void);
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file_1.c")) { stream in
-                stream <<<
-            """
-            #include <Framework1/Framework1.h>
-            void foo(void) {}
-            """
+                stream <<< """
+                    #include <Framework1/Framework1.h>
+                    void foo(void) {}
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file_2.swift")) { stream in
-                stream <<<
-            """
-            import Framework1
-            public func bar() {
-                foo()
-            }
-            """
+                stream <<< """
+                    import Framework1
+                    public func bar() {
+                        foo()
+                    }
+                    """
             }
 
             let parameters = BuildParameters(configuration: "Debug", overrides: [:])
@@ -4545,19 +4702,23 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 TestFile("file_1.c"),
                                 TestFile("file_2.swift"),
                                 TestFile("file_3.swift"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                                "SWIFT_VERSION": swiftVersion,
-                                "DEFINES_MODULE": "YES",
-                                "VALID_ARCHS": "arm64",
-                                "DSTROOT": tmpDir.join("dstroot").str,
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "DEFINES_MODULE": "YES",
+                                    "VALID_ARCHS": "arm64",
+                                    "DSTROOT": tmpDir.join("dstroot").str,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Framework1",
@@ -4565,56 +4726,58 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 buildPhases: [
                                     TestHeadersBuildPhase([TestBuildFile("Framework1.h", headerVisibility: .public)]),
                                     TestSourcesBuildPhase(["file_1.c"]),
-                                ]),
+                                ]
+                            ),
                             TestStandardTarget(
                                 "Framework2",
                                 type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file_2.swift"]),
-                                ]),
+                                    TestSourcesBuildPhase(["file_2.swift"])
+                                ]
+                            ),
                             TestStandardTarget(
                                 "Framework3",
                                 type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file_3.swift"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file_3.swift"])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework1.h")) { stream in
-                stream <<<
-            """
-            void foo(void);
-            """
+                stream <<< """
+                    void foo(void);
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file_1.c")) { stream in
-                stream <<<
-            """
-            #include <Framework1/Framework1.h>
-            void foo(void) {}
-            """
+                stream <<< """
+                    #include <Framework1/Framework1.h>
+                    void foo(void) {}
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file_2.swift")) { stream in
-                stream <<<
-            """
-            public func bar() {}
-            """
+                stream <<< """
+                    public func bar() {}
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file_3.swift")) { stream in
-                stream <<<
-            """
-            import Framework1
-            import Framework2
+                stream <<< """
+                    import Framework1
+                    import Framework2
 
-            public func baz() {
-                foo()
-                bar()
-            }
-            """
+                    public func baz() {
+                        foo()
+                        bar()
+                    }
+                    """
             }
 
             for warningLevel in [BooleanWarningLevel.yes, .yesError] {
@@ -4655,71 +4818,83 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 TestFile("Framework1.h"),
                                 TestFile("file_1.c"),
                                 TestFile("file_2.swift"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
-                                "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                                "SWIFT_VERSION": swiftVersion,
-                                "DEFINES_MODULE": "YES",
-                                "VALID_ARCHS": "arm64",
-                                "DSTROOT": tmpDir.join("dstroot").str,
-                                "DIAGNOSE_MISSING_TARGET_DEPENDENCIES": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
+                                    "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "DEFINES_MODULE": "YES",
+                                    "VALID_ARCHS": "arm64",
+                                    "DSTROOT": tmpDir.join("dstroot").str,
+                                    "DIAGNOSE_MISSING_TARGET_DEPENDENCIES": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Framework1",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "IMPLICIT_DEPENDENCY_DOMAIN": "One"
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "IMPLICIT_DEPENDENCY_DOMAIN": "One"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
                                     TestHeadersBuildPhase([TestBuildFile("Framework1.h", headerVisibility: .public)]),
                                     TestSourcesBuildPhase(["file_1.c"]),
-                                ]),
+                                ]
+                            ),
                             TestStandardTarget(
                                 "Framework2",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration(
-                                    "Debug",
-                                    buildSettings: [
-                                        "IMPLICIT_DEPENDENCY_DOMAIN": "Two"
-                                    ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "IMPLICIT_DEPENDENCY_DOMAIN": "Two"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file_2.swift"]),
-                                ]),
-                        ])])
+                                    TestSourcesBuildPhase(["file_2.swift"])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework1.h")) { stream in
-                stream <<<
-            """
-            void foo(void);
-            """
+                stream <<< """
+                    void foo(void);
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file_1.c")) { stream in
-                stream <<<
-            """
-            #include <Framework1/Framework1.h>
-            void foo(void) {}
-            """
+                stream <<< """
+                    #include <Framework1/Framework1.h>
+                    void foo(void) {}
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file_2.swift")) { stream in
-                stream <<<
-            """
-            import Framework1
-            public func baz() {
-                foo()
-            }
-            """
+                stream <<< """
+                    import Framework1
+                    public func baz() {
+                        foo()
+                    }
+                    """
             }
 
             let parameters = BuildParameters(configuration: "Debug")
@@ -4749,7 +4924,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 TestFile("fileC.c"),
                                 TestFile("Target0.h"),
                                 TestFile("file1.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -4759,8 +4935,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "BUILD_VARIANTS": "normal other",
                                     "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
                                     "DEFINES_MODULE": "YES",
-                                    "CLANG_ENABLE_MODULES": "YES"
-                                ])
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -4768,24 +4945,29 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "fileC.c",
+                                        "fileC.c"
                                     ]),
                                     TestHeadersBuildPhase([
                                         TestBuildFile("Target0.h", headerVisibility: .public)
-                                    ])
-                                ]),
+                                    ]),
+                                ]
+                            ),
                             TestStandardTarget(
                                 "TargetA",
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "file1.swift",
-                                    ]),
-                                ], dependencies: [
+                                        "file1.swift"
+                                    ])
+                                ],
+                                dependencies: [
                                     "Target0"
-                                ]),
-                        ])
-                ])
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -4794,25 +4976,22 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileC.c")) { file in
-                file <<<
-                        """
-                        int foo() { return 11; }
-                        """
+                file <<< """
+                    int foo() { return 11; }
+                    """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/Target0.h")) { file in
-                file <<<
-                        """
-                        int foo();
-                        """
+                file <<< """
+                    int foo();
+                    """
             }
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/file1.swift")) { file in
-                file <<<
-                        """
-                        import Target0
-                        public struct A {
-                            public init() { foo() }
-                        }
-                        """
+                file <<< """
+                    import Target0
+                    public struct A {
+                        public init() { foo() }
+                    }
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true) { results in
@@ -4826,7 +5005,6 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
         }
     }
 
-
     @Test(.requireSDKs(.macOS))
     func diagnosingLanguageFeatureEnablement() async throws {
 
@@ -4843,7 +5021,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                             path: "Sources",
                             children: [
                                 TestFile("file.swift")
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -4855,7 +5034,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "ARCHS": "arm64",
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
                                     "BLOCKLISTS_PATH": tmpDirPath.str,
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -4864,10 +5044,13 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "file.swift"
-                                    ]),
-                                ])
-                        ])
-                ])
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             var tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let cleanParameters = BuildParameters(action: .clean, configuration: "Debug")
@@ -4880,27 +5063,31 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             }
 
             let parameterizedBuildRequest = { (_ parameters: BuildParameters) in
-                return BuildRequest(parameters: parameters,
-                                    buildTargets: tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }),
-                                    continueBuildingAfterErrors: true, useParallelTargets: true, useImplicitDependencies: false, useDryRun: false)
+                return BuildRequest(
+                    parameters: parameters,
+                    buildTargets: tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }),
+                    continueBuildingAfterErrors: true,
+                    useParallelTargets: true,
+                    useImplicitDependencies: false,
+                    useDryRun: false
+                )
             }
 
             // Test with a diagnostic level of "warn".
             do {
                 try await tester.fs.writeFileContents(blockListFilePath) { file in
-                    file <<<
-                            """
-                            {
-                                "features": {
-                                    "DeprecateApplicationMain": {
-                                        "level": "warn",
-                                        "buildSettings": ["SWIFT_UPCOMING_FEATURE_DEPRECATE_APPLICATION_MAIN"],
-                                        "learnMoreURL": "https://www.swift.org/swift-evolution/",
-                                        "moduleExceptions": [""]
-                                    }
+                    file <<< """
+                        {
+                            "features": {
+                                "DeprecateApplicationMain": {
+                                    "level": "warn",
+                                    "buildSettings": ["SWIFT_UPCOMING_FEATURE_DEPRECATE_APPLICATION_MAIN"],
+                                    "learnMoreURL": "https://www.swift.org/swift-evolution/",
+                                    "moduleExceptions": [""]
                                 }
                             }
-                            """
+                        }
+                        """
                 }
 
                 // Build without DeprecateApplicationMain enabled.
@@ -4916,24 +5103,30 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
 
                 // Build with 'SWIFT_UPCOMING_FEATURE_DEPRECATE_APPLICATION_MAIN = YES'.
                 do {
-                    let params = BuildParameters(configuration: "Debug",
-                                                 commandLineOverrides: ["SWIFT_UPCOMING_FEATURE_DEPRECATE_APPLICATION_MAIN": "YES"])
+                    let params = BuildParameters(
+                        configuration: "Debug",
+                        commandLineOverrides: ["SWIFT_UPCOMING_FEATURE_DEPRECATE_APPLICATION_MAIN": "YES"]
+                    )
                     try await tester.checkBuild(runDestination: .macOS, buildRequest: parameterizedBuildRequest(params)) { results in results.checkNoDiagnostics() }
                     try await tester.checkBuild(runDestination: .macOS, buildRequest: cleanRequest) { results in results.checkNoErrors() }
                 }
 
                 // Build with '-enable-upcoming-feature DeprecateApplicationMain'.
                 do {
-                    let params = BuildParameters(configuration: "Debug",
-                                                 commandLineOverrides: ["OTHER_SWIFT_FLAGS": "-enable-upcoming-feature DeprecateApplicationMain"])
+                    let params = BuildParameters(
+                        configuration: "Debug",
+                        commandLineOverrides: ["OTHER_SWIFT_FLAGS": "-enable-upcoming-feature DeprecateApplicationMain"]
+                    )
                     try await tester.checkBuild(runDestination: .macOS, buildRequest: parameterizedBuildRequest(params)) { results in results.checkNoDiagnostics() }
                     try await tester.checkBuild(runDestination: .macOS, buildRequest: cleanRequest) { results in results.checkNoErrors() }
                 }
 
                 // Build with '-enable-experimental-feature DeprecateApplicationMain'.
                 do {
-                    let params = BuildParameters(configuration: "Debug",
-                                                 commandLineOverrides: ["OTHER_SWIFT_FLAGS": "-enable-experimental-feature DeprecateApplicationMain"])
+                    let params = BuildParameters(
+                        configuration: "Debug",
+                        commandLineOverrides: ["OTHER_SWIFT_FLAGS": "-enable-experimental-feature DeprecateApplicationMain"]
+                    )
                     try await tester.checkBuild(runDestination: .macOS, buildRequest: parameterizedBuildRequest(params)) { results in results.checkNoDiagnostics() }
                     try await tester.checkBuild(runDestination: .macOS, buildRequest: cleanRequest) { results in results.checkNoErrors() }
                 }
@@ -4944,18 +5137,17 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             // Test with a diagnostic level of "error".
             do {
                 try await tester.fs.writeFileContents(blockListFilePath) { file in
-                    file <<<
-                            """
-                            {
-                                "features": {
-                                    "RegionBasedIsolation": {
-                                        "level": "error",
-                                        "learnMoreURL": "https://www.swift.org/swift-evolution/",
-                                        "moduleExceptions": [""]
-                                    }
+                    file <<< """
+                        {
+                            "features": {
+                                "RegionBasedIsolation": {
+                                    "level": "error",
+                                    "learnMoreURL": "https://www.swift.org/swift-evolution/",
+                                    "moduleExceptions": [""]
                                 }
                             }
-                            """
+                        }
+                        """
                 }
 
                 // Build without RegionBasedIsolation enabled.
@@ -4975,19 +5167,18 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             // Test with a setting which has a MIGRATE mode
             do {
                 try await tester.fs.writeFileContents(blockListFilePath) { file in
-                    file <<<
-                            """
-                            {
-                                "features": {
-                                    "MemberImportVisibility": {
-                                        "level": "warn",
-                                         "buildSettings": ["SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY"],
-                                        "learnMoreURL": "https://www.swift.org/swift-evolution/",
-                                        "moduleExceptions": []
-                                    }
+                    file <<< """
+                        {
+                            "features": {
+                                "MemberImportVisibility": {
+                                    "level": "warn",
+                                     "buildSettings": ["SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY"],
+                                    "learnMoreURL": "https://www.swift.org/swift-evolution/",
+                                    "moduleExceptions": []
                                 }
                             }
-                            """
+                        }
+                        """
                 }
 
                 do {
@@ -5000,8 +5191,10 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                 }
 
                 do {
-                    let params = BuildParameters(configuration: "Debug",
-                                                 commandLineOverrides: ["SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY": "YES"])
+                    let params = BuildParameters(
+                        configuration: "Debug",
+                        commandLineOverrides: ["SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY": "YES"]
+                    )
                     try await tester.checkBuild(runDestination: .macOS, buildRequest: parameterizedBuildRequest(params)) { results in
                         results.checkNoDiagnostics()
                     }
@@ -5014,18 +5207,17 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             do {
                 try await tester.fs.writeFileContents(blockListFilePath) { file in
-                    file <<<
-                            """
-                            {
-                                "features": {
-                                    "InternalImportsByDefault": {
-                                        "level": "warn",
-                                        "learnMoreURL": "https://www.swift.org/swift-evolution/",
-                                        "moduleExceptions": ["TargetA"]
-                                    }
+                    file <<< """
+                        {
+                            "features": {
+                                "InternalImportsByDefault": {
+                                    "level": "warn",
+                                    "learnMoreURL": "https://www.swift.org/swift-evolution/",
+                                    "moduleExceptions": ["TargetA"]
                                 }
                             }
-                            """
+                        }
+                        """
                 }
 
                 // Build without InternalImportsByDefault enabled.
@@ -5051,8 +5243,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                             "Sources",
                             path: "Sources",
                             children: [
-                                TestFile("fileA1.swift"),
-                            ]),
+                                TestFile("fileA1.swift")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -5062,7 +5255,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "BUILD_VARIANTS": "normal",
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
                                     "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -5070,29 +5264,34 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "fileA1.swift",
-                                    ]),
-                                ]),
-                        ])
-                ])
+                                        "fileA1.swift"
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             tester.userInfo = tester.userInfo.withAdditionalEnvironment(environment: ["SWIFT_FORCE_MODULE_LOADING": "only-interface"])
-            let parameters = BuildParameters(configuration: "Debug", overrides: [
-                // Redirect the prebuilt cache so we always build modules from source
-                "SWIFT_OVERLOAD_PREBUILT_MODULE_CACHE_PATH": tmpDirPath.str
-            ])
+            let parameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    // Redirect the prebuilt cache so we always build modules from source
+                    "SWIFT_OVERLOAD_PREBUILT_MODULE_CACHE_PATH": tmpDirPath.str
+                ]
+            )
             let buildRequest = BuildRequest(parameters: parameters, buildTargets: tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }), continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: false, useDryRun: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileA1.swift")) { file in
-                file <<<
-                        """
-                        public struct A {
-                            public init() { }
-                        }
-                        """
+                file <<< """
+                    public struct A {
+                        public init() { }
+                    }
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true) { results in
@@ -5122,8 +5321,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                             "Sources",
                             path: "Sources",
                             children: [
-                                TestFile("fileA1.swift"),
-                            ]),
+                                TestFile("fileA1.swift")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -5133,7 +5333,8 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                     "BUILD_VARIANTS": "normal",
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
                                     "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -5141,29 +5342,34 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "fileA1.swift",
-                                    ]),
-                                ]),
-                        ])
-                ])
+                                        "fileA1.swift"
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             tester.userInfo = tester.userInfo.withAdditionalEnvironment(environment: ["SWIFT_FORCE_MODULE_LOADING": "only-interface"])
-            let parameters = BuildParameters(configuration: "Debug", overrides: [
-                // Redirect the prebuilt cache so we always build modules from source
-                "SWIFT_OVERLOAD_PREBUILT_MODULE_CACHE_PATH": tmpDirPath.str
-            ])
+            let parameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    // Redirect the prebuilt cache so we always build modules from source
+                    "SWIFT_OVERLOAD_PREBUILT_MODULE_CACHE_PATH": tmpDirPath.str
+                ]
+            )
             let buildRequest = BuildRequest(parameters: parameters, buildTargets: tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }), continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: false, useDryRun: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileA1.swift")) { file in
-                file <<<
-                        """
-                        public struct A {
-                            public init() { }
-                        }
-                        """
+                file <<< """
+                    public struct A {
+                        public init() { }
+                    }
+                    """
             }
 
             var cleanResponseFileContents: ByteString? = nil
@@ -5181,14 +5387,13 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileA1.swift")) { file in
-                file <<<
-                        """
-                        public struct A {
-                            public init() { }
-                        }
+                file <<< """
+                    public struct A {
+                        public init() { }
+                    }
 
-                        public func foo() { }
-                        """
+                    public func foo() { }
+                    """
             }
 
             var incrementalResponseFileContents: ByteString? = nil
@@ -5228,19 +5433,23 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 TestFile("Framework2.h"),
                                 TestFile("file_2.c"),
                                 TestFile("file_3.swift"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                                "SWIFT_VERSION": swiftVersion,
-                                "DEFINES_MODULE": "YES",
-                                "VALID_ARCHS": "arm64",
-                                "DSTROOT": tmpDir.join("dstroot").str,
-                                "SWIFT_ENABLE_COMPILE_CACHE": "YES",
-                            ])],
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "DEFINES_MODULE": "YES",
+                                    "VALID_ARCHS": "arm64",
+                                    "DSTROOT": tmpDir.join("dstroot").str,
+                                    "SWIFT_ENABLE_COMPILE_CACHE": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
                                 "Framework1",
@@ -5248,66 +5457,67 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                                 buildPhases: [
                                     TestHeadersBuildPhase([TestBuildFile("Framework1.h", headerVisibility: .public)]),
                                     TestSourcesBuildPhase(["file_1.c"]),
-                                ]),
+                                ]
+                            ),
                             TestStandardTarget(
                                 "Framework2",
                                 type: .framework,
                                 buildPhases: [
                                     TestHeadersBuildPhase([TestBuildFile("Framework2.h", headerVisibility: .public)]),
                                     TestSourcesBuildPhase(["file_2.c"]),
-                                ]),
+                                ]
+                            ),
                             TestStandardTarget(
                                 "Framework3",
                                 type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["file_3.swift"]),
+                                    TestSourcesBuildPhase(["file_3.swift"])
                                 ],
                                 dependencies: [
                                     "Framework1",
-                                    "Framework2"
-                                ]),
-                        ])])
+                                    "Framework2",
+                                ]
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework1.h")) { stream in
-                stream <<<
-            """
-            void foo(void);
-            """
+                stream <<< """
+                    void foo(void);
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file_1.c")) { stream in
-                stream <<<
-            """
-            void foo(void) {}
-            """
+                stream <<< """
+                    void foo(void) {}
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework2.h")) { stream in
-                stream <<<
-            """
-            void qux(void);
-            """
+                stream <<< """
+                    void qux(void);
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file_2.c")) { stream in
-                stream <<<
-            """
-            void qux(void) {}
-            """
+                stream <<< """
+                    void qux(void) {}
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file_3.swift")) { stream in
-                stream <<<
-            """
-            import Framework1
-            import Framework2
-            public func bar() {
-                foo()
-                qux()
-            }
-            """
+                stream <<< """
+                    import Framework1
+                    import Framework2
+                    public func bar() {
+                        foo()
+                        qux()
+                    }
+                    """
             }
 
             let parameters = BuildParameters(configuration: "Debug", overrides: [:])
@@ -5323,10 +5533,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             try await tester.checkNullBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true)
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework1.h")) { stream in
-                stream <<<
-            """
-            void foo(void); introduce an error
-            """
+                stream <<< """
+                    void foo(void); introduce an error
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true) { results in
@@ -5338,10 +5547,9 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Framework1.h")) { stream in
-                stream <<<
-            """
-            void foo(void);
-            """
+                stream <<< """
+                    void foo(void);
+                    """
             }
 
             try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true) { results in
diff --git a/Tests/SWBBuildSystemTests/TrackedDomainOperationTests.swift b/Tests/SWBBuildSystemTests/TrackedDomainOperationTests.swift
index 758babf0..88078abf 100644
--- a/Tests/SWBBuildSystemTests/TrackedDomainOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/TrackedDomainOperationTests.swift
@@ -73,7 +73,7 @@ fileprivate struct TrackedDomainOperationTests: CoreBasedTests {
                             TestAggregateTarget(
                                 "All",
                                 dependencies: [
-                                    "App",
+                                    "App"
                                 ]
                             ),
                             TestStandardTarget(
@@ -86,7 +86,7 @@ fileprivate struct TrackedDomainOperationTests: CoreBasedTests {
                                             "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
                                             "AGGREGATE_TRACKED_DOMAINS": "YES",
                                         ]
-                                    ),
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
@@ -95,13 +95,17 @@ fileprivate struct TrackedDomainOperationTests: CoreBasedTests {
                                     TestFrameworksBuildPhase([
                                         "Framework.framework"
                                     ]),
-                                    TestCopyFilesBuildPhase([
-                                        "PrivacyInfo.xcprivacy",
-                                        "Framework.framework",
-                                    ], destinationSubfolder: .frameworks, onlyForDeployment: false)
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            "PrivacyInfo.xcprivacy",
+                                            "Framework.framework",
+                                        ],
+                                        destinationSubfolder: .frameworks,
+                                        onlyForDeployment: false
+                                    ),
                                 ],
                                 dependencies: [
-                                    "Framework",
+                                    "Framework"
                                 ]
                             ),
                             TestStandardTarget(
@@ -110,7 +114,7 @@ fileprivate struct TrackedDomainOperationTests: CoreBasedTests {
                                 buildConfigurations: [
                                     TestBuildConfiguration(
                                         "Debug"
-                                    ),
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
@@ -120,13 +124,21 @@ fileprivate struct TrackedDomainOperationTests: CoreBasedTests {
                                         "SubFramework.framework",
                                         "SubFrameworkEmpty.framework",
                                     ]),
-                                    TestCopyFilesBuildPhase([
-                                        "SubFramework.framework",
-                                        "SubFrameworkEmpty.framework",
-                                    ], destinationSubfolder: .frameworks, onlyForDeployment: false),
-                                    TestCopyFilesBuildPhase([
-                                        "Fmk/PrivacyInfo.xcprivacy"
-                                    ], destinationSubfolder: .resources, onlyForDeployment: false)
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            "SubFramework.framework",
+                                            "SubFrameworkEmpty.framework",
+                                        ],
+                                        destinationSubfolder: .frameworks,
+                                        onlyForDeployment: false
+                                    ),
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            "Fmk/PrivacyInfo.xcprivacy"
+                                        ],
+                                        destinationSubfolder: .resources,
+                                        onlyForDeployment: false
+                                    ),
                                 ],
                                 dependencies: [
                                     "SubFramework",
@@ -139,15 +151,19 @@ fileprivate struct TrackedDomainOperationTests: CoreBasedTests {
                                 buildConfigurations: [
                                     TestBuildConfiguration(
                                         "Debug"
-                                    ),
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "SubFrameworkSource.swift"
                                     ]),
-                                    TestCopyFilesBuildPhase([
-                                        "SubFmk/PrivacyInfo.xcprivacy"
-                                    ], destinationSubfolder: .resources, onlyForDeployment: false)
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            "SubFmk/PrivacyInfo.xcprivacy"
+                                        ],
+                                        destinationSubfolder: .resources,
+                                        onlyForDeployment: false
+                                    ),
                                 ]
                             ),
                             TestStandardTarget(
@@ -156,20 +172,25 @@ fileprivate struct TrackedDomainOperationTests: CoreBasedTests {
                                 buildConfigurations: [
                                     TestBuildConfiguration(
                                         "Debug"
-                                    ),
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "SubFrameworkSource.swift"
                                     ]),
-                                    TestCopyFilesBuildPhase([
-                                        "SubFmkEmpty/PrivacyInfo.xcprivacy"
-                                    ], destinationSubfolder: .resources, onlyForDeployment: false)
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            "SubFmkEmpty/PrivacyInfo.xcprivacy"
+                                        ],
+                                        destinationSubfolder: .resources,
+                                        onlyForDeployment: false
+                                    ),
                                 ]
-                            )
+                            ),
                         ]
                     )
-                ])
+                ]
+            )
 
             // Create a tester for driving the build.
             let tester = try await BuildOperationTester(core, testWorkspace, simulated: false)
@@ -210,116 +231,148 @@ fileprivate struct TrackedDomainOperationTests: CoreBasedTests {
             }
 
             // Write a barebones Info.plist file.
-            try await tester.fs.writePlist(testWorkspace.sourceRoot.join("TestProject/Info.plist"), .plDict([
-                "CFBundleDevelopmentRegion": .plString("en"),
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
-                "NSPrivacyTracking": "YES",
-                "NSPrivacyTrackingDomains": [
-                    "www.apple.com",
-                ]
-            ]))
-
-            try await tester.fs.writePlist(testWorkspace.sourceRoot.join("TestProject/PrivacyInfo.xcprivacy"), .plDict([
-                "NSPrivacyTracking": "YES",
-                "NSPrivacyTrackingDomains": [
-                    "www.best.com",
-                ]
-            ]))
+            try await tester.fs.writePlist(
+                testWorkspace.sourceRoot.join("TestProject/Info.plist"),
+                .plDict([
+                    "CFBundleDevelopmentRegion": .plString("en"),
+                    "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                    "NSPrivacyTracking": "YES",
+                    "NSPrivacyTrackingDomains": [
+                        "www.apple.com"
+                    ],
+                ])
+            )
+
+            try await tester.fs.writePlist(
+                testWorkspace.sourceRoot.join("TestProject/PrivacyInfo.xcprivacy"),
+                .plDict([
+                    "NSPrivacyTracking": "YES",
+                    "NSPrivacyTrackingDomains": [
+                        "www.best.com"
+                    ],
+                ])
+            )
 
             try tester.fs.createDirectory(testWorkspace.sourceRoot.join("TestProject/Fwk"), recursive: true)
-            try await tester.fs.writePlist(testWorkspace.sourceRoot.join("TestProject/Fmk/PrivacyInfo.xcprivacy"), .plDict([
-                "NSPrivacyTracking": "YES",
-                "NSPrivacyTrackingDomains": [
-                    "www.frameworka.com",
-                    "internal.frameworka.com",
-                    "www.allframeworks.com",
-                ]
-            ]))
+            try await tester.fs.writePlist(
+                testWorkspace.sourceRoot.join("TestProject/Fmk/PrivacyInfo.xcprivacy"),
+                .plDict([
+                    "NSPrivacyTracking": "YES",
+                    "NSPrivacyTrackingDomains": [
+                        "www.frameworka.com",
+                        "internal.frameworka.com",
+                        "www.allframeworks.com",
+                    ],
+                ])
+            )
 
             try tester.fs.createDirectory(testWorkspace.sourceRoot.join("TestProject/SubFwk"), recursive: true)
-            try await tester.fs.writePlist(testWorkspace.sourceRoot.join("TestProject/SubFmk/PrivacyInfo.xcprivacy"), .plDict([
-                "NSPrivacyTracking": "YES",
-                "NSPrivacyTrackingDomains": [
-                    "www.frameworkb.com",
-                    "internal.frameworkb.com",
-                    "www.allframeworks.com",
-                ]
-            ]))
+            try await tester.fs.writePlist(
+                testWorkspace.sourceRoot.join("TestProject/SubFmk/PrivacyInfo.xcprivacy"),
+                .plDict([
+                    "NSPrivacyTracking": "YES",
+                    "NSPrivacyTrackingDomains": [
+                        "www.frameworkb.com",
+                        "internal.frameworkb.com",
+                        "www.allframeworks.com",
+                    ],
+                ])
+            )
 
             try tester.fs.createDirectory(testWorkspace.sourceRoot.join("TestProject/SubFwkEmpty"), recursive: true)
-            try await tester.fs.writePlist(testWorkspace.sourceRoot.join("TestProject/SubFmkEmpty/PrivacyInfo.xcprivacy"), .plDict([
-                "NSPrivacyTracking": "YES",
-                "NSPrivacyTrackingDomains": [
-                    // empty
-                ]
-            ]))
+            try await tester.fs.writePlist(
+                testWorkspace.sourceRoot.join("TestProject/SubFmkEmpty/PrivacyInfo.xcprivacy"),
+                .plDict([
+                    "NSPrivacyTracking": "YES",
+                    "NSPrivacyTrackingDomains": [
+                        // empty
+                    ],
+                ])
+            )
 
             // Do an initial build. It's a clean build, so we expect all the tasks to run.
             let parameters = BuildParameters(action: .build, configuration: "Debug")
             try await tester.checkBuild(parameters: parameters, runDestination: .macOS, persistent: true) { results in
                 let buildDir = tmpDirPath.join(Path("Test/TestProject/build/\(parameters.configuration!)"))
 
-               try results.checkTask(.matchRuleType("ProcessInfoPlistFile"), .matchTargetName("App"), body: { task in
-                   task.checkCommandLineContains([
-                       "-scanforprivacyfile",
-                       "\(buildDir.str)/App.app/Contents/Frameworks/Framework.framework"
-                   ])
-
-                   let contentsData = try tester.fs.read(buildDir.join("App.app/Contents/Info.plist"))
-                   let (privacyPlist, _) = try PropertyList.fromBytesWithFormat(contentsData.bytes)
-                   let plistDict = try #require(privacyPlist.dictValue)
-                   let trackedDomains = try #require(plistDict["NSPrivacyTrackingDomains"]?.arrayValue).compactMap { $0.stringValue }
-
-                   // Nested frameworks are not currently supported. rdar://105200261
-//                   XCTAssertEqualSequences(trackedDomains, [
-//                        "internal.frameworka.com",
-//                        "internal.frameworkb.com",
-//                        // There should be no duplicates
-//                        "www.allframeworks.com",
-//                        "www.apple.com",
-//                        "www.frameworka.com",
-//                        "www.frameworkb.com",
-//                   ])
-
-                   XCTAssertEqualSequences(trackedDomains, [
-                        "internal.frameworka.com",
-                        // There should be no duplicates
-                        "www.allframeworks.com",
-                        "www.apple.com",
-                        "www.best.com",
-                        "www.frameworka.com",
-                   ])
-                })
+                try results.checkTask(
+                    .matchRuleType("ProcessInfoPlistFile"),
+                    .matchTargetName("App"),
+                    body: { task in
+                        task.checkCommandLineContains([
+                            "-scanforprivacyfile",
+                            "\(buildDir.str)/App.app/Contents/Frameworks/Framework.framework",
+                        ])
+
+                        let contentsData = try tester.fs.read(buildDir.join("App.app/Contents/Info.plist"))
+                        let (privacyPlist, _) = try PropertyList.fromBytesWithFormat(contentsData.bytes)
+                        let plistDict = try #require(privacyPlist.dictValue)
+                        let trackedDomains = try #require(plistDict["NSPrivacyTrackingDomains"]?.arrayValue).compactMap { $0.stringValue }
+
+                        // Nested frameworks are not currently supported. rdar://105200261
+                        //                   XCTAssertEqualSequences(trackedDomains, [
+                        //                        "internal.frameworka.com",
+                        //                        "internal.frameworkb.com",
+                        //                        // There should be no duplicates
+                        //                        "www.allframeworks.com",
+                        //                        "www.apple.com",
+                        //                        "www.frameworka.com",
+                        //                        "www.frameworkb.com",
+                        //                   ])
+
+                        XCTAssertEqualSequences(
+                            trackedDomains,
+                            [
+                                "internal.frameworka.com",
+                                // There should be no duplicates
+                                "www.allframeworks.com",
+                                "www.apple.com",
+                                "www.best.com",
+                                "www.frameworka.com",
+                            ]
+                        )
+                    }
+                )
             }
 
             // Update the frameworks's tracked domains and check that this causes a re-scan.
-            try await tester.fs.writePlist(testWorkspace.sourceRoot.join("TestProject/Fmk/PrivacyInfo.xcprivacy"), .plDict([
-                "NSPrivacyTracking": "YES",
-                "NSPrivacyTrackingDomains": [
-                    "www.additional.com",
-                ]
-            ]))
+            try await tester.fs.writePlist(
+                testWorkspace.sourceRoot.join("TestProject/Fmk/PrivacyInfo.xcprivacy"),
+                .plDict([
+                    "NSPrivacyTracking": "YES",
+                    "NSPrivacyTrackingDomains": [
+                        "www.additional.com"
+                    ],
+                ])
+            )
 
             try await tester.checkBuild(parameters: parameters, runDestination: .macOS, persistent: true) { results in
                 let buildDir = tmpDirPath.join(Path("Test/TestProject/build/\(parameters.configuration!)"))
 
-               try results.checkTask(.matchRuleType("ProcessInfoPlistFile"), .matchTargetName("App"), body: { task in
-                   task.checkCommandLineContains([
-                       "-scanforprivacyfile",
-                       "\(buildDir.str)/App.app/Contents/Frameworks/Framework.framework"
-                   ])
-
-                   let contentsData = try tester.fs.read(buildDir.join("App.app/Contents/Info.plist"))
-                   let (privacyPlist, _) = try PropertyList.fromBytesWithFormat(contentsData.bytes)
-                   let plistDict = try #require(privacyPlist.dictValue)
-                   let trackedDomains = try #require(plistDict["NSPrivacyTrackingDomains"]?.arrayValue).compactMap { $0.stringValue }
-
-                   XCTAssertEqualSequences(trackedDomains, [
-                        "www.additional.com",
-                        "www.apple.com",
-                        "www.best.com",
-                   ])
-                })
+                try results.checkTask(
+                    .matchRuleType("ProcessInfoPlistFile"),
+                    .matchTargetName("App"),
+                    body: { task in
+                        task.checkCommandLineContains([
+                            "-scanforprivacyfile",
+                            "\(buildDir.str)/App.app/Contents/Frameworks/Framework.framework",
+                        ])
+
+                        let contentsData = try tester.fs.read(buildDir.join("App.app/Contents/Info.plist"))
+                        let (privacyPlist, _) = try PropertyList.fromBytesWithFormat(contentsData.bytes)
+                        let plistDict = try #require(privacyPlist.dictValue)
+                        let trackedDomains = try #require(plistDict["NSPrivacyTrackingDomains"]?.arrayValue).compactMap { $0.stringValue }
+
+                        XCTAssertEqualSequences(
+                            trackedDomains,
+                            [
+                                "www.additional.com",
+                                "www.apple.com",
+                                "www.best.com",
+                            ]
+                        )
+                    }
+                )
             }
         }
     }
@@ -370,7 +423,7 @@ fileprivate struct TrackedDomainOperationTests: CoreBasedTests {
                             TestAggregateTarget(
                                 "All",
                                 dependencies: [
-                                    "App",
+                                    "App"
                                 ]
                             ),
                             TestStandardTarget(
@@ -383,7 +436,7 @@ fileprivate struct TrackedDomainOperationTests: CoreBasedTests {
                                             "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
                                             "AGGREGATE_TRACKED_DOMAINS": "YES",
                                         ]
-                                    ),
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
@@ -392,12 +445,16 @@ fileprivate struct TrackedDomainOperationTests: CoreBasedTests {
                                     TestFrameworksBuildPhase([
                                         "Framework.framework"
                                     ]),
-                                    TestCopyFilesBuildPhase([
-                                        "Framework.framework",
-                                    ], destinationSubfolder: .frameworks, onlyForDeployment: false)
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            "Framework.framework"
+                                        ],
+                                        destinationSubfolder: .frameworks,
+                                        onlyForDeployment: false
+                                    ),
                                 ],
                                 dependencies: [
-                                    "Framework",
+                                    "Framework"
                                 ]
                             ),
                             TestStandardTarget(
@@ -406,7 +463,7 @@ fileprivate struct TrackedDomainOperationTests: CoreBasedTests {
                                 buildConfigurations: [
                                     TestBuildConfiguration(
                                         "Debug"
-                                    ),
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
@@ -416,13 +473,21 @@ fileprivate struct TrackedDomainOperationTests: CoreBasedTests {
                                         "SubFramework.framework",
                                         "SubFrameworkEmpty.framework",
                                     ]),
-                                    TestCopyFilesBuildPhase([
-                                        "SubFramework.framework",
-                                        "SubFrameworkEmpty.framework",
-                                    ], destinationSubfolder: .frameworks, onlyForDeployment: false),
-                                    TestCopyFilesBuildPhase([
-                                        "Fmk/PrivacyInfo.xcprivacy"
-                                    ], destinationSubfolder: .resources, onlyForDeployment: false)
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            "SubFramework.framework",
+                                            "SubFrameworkEmpty.framework",
+                                        ],
+                                        destinationSubfolder: .frameworks,
+                                        onlyForDeployment: false
+                                    ),
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            "Fmk/PrivacyInfo.xcprivacy"
+                                        ],
+                                        destinationSubfolder: .resources,
+                                        onlyForDeployment: false
+                                    ),
                                 ],
                                 dependencies: [
                                     "SubFramework",
@@ -435,15 +500,19 @@ fileprivate struct TrackedDomainOperationTests: CoreBasedTests {
                                 buildConfigurations: [
                                     TestBuildConfiguration(
                                         "Debug"
-                                    ),
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "SubFrameworkSource.swift"
                                     ]),
-                                    TestCopyFilesBuildPhase([
-                                        "SubFmk/PrivacyInfo.xcprivacy"
-                                    ], destinationSubfolder: .resources, onlyForDeployment: false)
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            "SubFmk/PrivacyInfo.xcprivacy"
+                                        ],
+                                        destinationSubfolder: .resources,
+                                        onlyForDeployment: false
+                                    ),
                                 ]
                             ),
                             TestStandardTarget(
@@ -452,20 +521,25 @@ fileprivate struct TrackedDomainOperationTests: CoreBasedTests {
                                 buildConfigurations: [
                                     TestBuildConfiguration(
                                         "Debug"
-                                    ),
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "SubFrameworkSource.swift"
                                     ]),
-                                    TestCopyFilesBuildPhase([
-                                        "SubFmkEmpty/PrivacyInfo.xcprivacy"
-                                    ], destinationSubfolder: .resources, onlyForDeployment: false)
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            "SubFmkEmpty/PrivacyInfo.xcprivacy"
+                                        ],
+                                        destinationSubfolder: .resources,
+                                        onlyForDeployment: false
+                                    ),
                                 ]
-                            )
+                            ),
                         ]
                     )
-                ])
+                ]
+            )
 
             // Create a tester for driving the build.
             let tester = try await BuildOperationTester(core, testWorkspace, simulated: false)
@@ -506,87 +580,116 @@ fileprivate struct TrackedDomainOperationTests: CoreBasedTests {
             }
 
             // Write a barebones Info.plist file.
-            try await tester.fs.writePlist(testWorkspace.sourceRoot.join("TestProject/Info.plist"), .plDict([
-                "CFBundleDevelopmentRegion": .plString("en"),
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
-                "NSPrivacyTracking": "YES",
-                "NSPrivacyTrackingDomains": [
-                    // empty
-                ]
-            ]))
+            try await tester.fs.writePlist(
+                testWorkspace.sourceRoot.join("TestProject/Info.plist"),
+                .plDict([
+                    "CFBundleDevelopmentRegion": .plString("en"),
+                    "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                    "NSPrivacyTracking": "YES",
+                    "NSPrivacyTrackingDomains": [
+                        // empty
+                    ],
+                ])
+            )
 
             try tester.fs.createDirectory(testWorkspace.sourceRoot.join("TestProject/Fwk"), recursive: true)
-            try await tester.fs.writePlist(testWorkspace.sourceRoot.join("TestProject/Fmk/PrivacyInfo.xcprivacy"), .plDict([
-                "NSPrivacyTracking": "YES",
-                "NSPrivacyTrackingDomains": [
-                    // empty
-                ]
-            ]))
+            try await tester.fs.writePlist(
+                testWorkspace.sourceRoot.join("TestProject/Fmk/PrivacyInfo.xcprivacy"),
+                .plDict([
+                    "NSPrivacyTracking": "YES",
+                    "NSPrivacyTrackingDomains": [
+                        // empty
+                    ],
+                ])
+            )
 
             try tester.fs.createDirectory(testWorkspace.sourceRoot.join("TestProject/SubFwk"), recursive: true)
-            try await tester.fs.writePlist(testWorkspace.sourceRoot.join("TestProject/SubFmk/PrivacyInfo.xcprivacy"), .plDict([
-                "NSPrivacyTracking": "YES",
-                "NSPrivacyTrackingDomains": [
-                    // empty
-                ]
-            ]))
+            try await tester.fs.writePlist(
+                testWorkspace.sourceRoot.join("TestProject/SubFmk/PrivacyInfo.xcprivacy"),
+                .plDict([
+                    "NSPrivacyTracking": "YES",
+                    "NSPrivacyTrackingDomains": [
+                        // empty
+                    ],
+                ])
+            )
 
             try tester.fs.createDirectory(testWorkspace.sourceRoot.join("TestProject/SubFwkEmpty"), recursive: true)
-            try await tester.fs.writePlist(testWorkspace.sourceRoot.join("TestProject/SubFmkEmpty/PrivacyInfo.xcprivacy"), .plDict([
-                "NSPrivacyTracking": "YES",
-                "NSPrivacyTrackingDomains": [
-                    // empty
-                ]
-            ]))
+            try await tester.fs.writePlist(
+                testWorkspace.sourceRoot.join("TestProject/SubFmkEmpty/PrivacyInfo.xcprivacy"),
+                .plDict([
+                    "NSPrivacyTracking": "YES",
+                    "NSPrivacyTrackingDomains": [
+                        // empty
+                    ],
+                ])
+            )
 
             // Do an initial build. It's a clean build, so we expect all the tasks to run.
             let parameters = BuildParameters(action: .build, configuration: "Debug")
             try await tester.checkBuild(parameters: parameters, runDestination: .macOS, persistent: true) { results in
                 let buildDir = tmpDirPath.join(Path("Test/TestProject/build/\(parameters.configuration!)"))
 
-               try results.checkTask(.matchRuleType("ProcessInfoPlistFile"), .matchTargetName("App"), body: { task in
-                   task.checkCommandLineContains([
-                       "-scanforprivacyfile",
-                       "\(buildDir.str)/App.app/Contents/Frameworks/Framework.framework"
-                   ])
-
-                   let contentsData = try tester.fs.read(buildDir.join("App.app/Contents/Info.plist"))
-                   let (privacyPlist, _) = try PropertyList.fromBytesWithFormat(contentsData.bytes)
-                   let plistDict = try #require(privacyPlist.dictValue)
-                   let trackedDomains = try #require(plistDict["NSPrivacyTrackingDomains"]?.arrayValue).compactMap { $0.stringValue }
-
-                   XCTAssertEqualSequences(trackedDomains, [
-                    // empty
-                   ])
-                })
+                try results.checkTask(
+                    .matchRuleType("ProcessInfoPlistFile"),
+                    .matchTargetName("App"),
+                    body: { task in
+                        task.checkCommandLineContains([
+                            "-scanforprivacyfile",
+                            "\(buildDir.str)/App.app/Contents/Frameworks/Framework.framework",
+                        ])
+
+                        let contentsData = try tester.fs.read(buildDir.join("App.app/Contents/Info.plist"))
+                        let (privacyPlist, _) = try PropertyList.fromBytesWithFormat(contentsData.bytes)
+                        let plistDict = try #require(privacyPlist.dictValue)
+                        let trackedDomains = try #require(plistDict["NSPrivacyTrackingDomains"]?.arrayValue).compactMap { $0.stringValue }
+
+                        XCTAssertEqualSequences(
+                            trackedDomains,
+                            [
+                                // empty
+                            ]
+                        )
+                    }
+                )
             }
 
             // Update the frameworks's tracked domains and check that this causes a re-scan.
-            try await tester.fs.writePlist(testWorkspace.sourceRoot.join("TestProject/Fmk/PrivacyInfo.xcprivacy"), .plDict([
-                "NSPrivacyTracking": "YES",
-                "NSPrivacyTrackingDomains": [
-                    "www.additional.com",
-                ]
-            ]))
+            try await tester.fs.writePlist(
+                testWorkspace.sourceRoot.join("TestProject/Fmk/PrivacyInfo.xcprivacy"),
+                .plDict([
+                    "NSPrivacyTracking": "YES",
+                    "NSPrivacyTrackingDomains": [
+                        "www.additional.com"
+                    ],
+                ])
+            )
 
             try await tester.checkBuild(parameters: parameters, runDestination: .macOS, persistent: true) { results in
                 let buildDir = tmpDirPath.join(Path("Test/TestProject/build/\(parameters.configuration!)"))
 
-               try results.checkTask(.matchRuleType("ProcessInfoPlistFile"), .matchTargetName("App"), body: { task in
-                   task.checkCommandLineContains([
-                       "-scanforprivacyfile",
-                       "\(buildDir.str)/App.app/Contents/Frameworks/Framework.framework"
-                   ])
-
-                   let contentsData = try tester.fs.read(buildDir.join("App.app/Contents/Info.plist"))
-                   let (privacyPlist, _) = try PropertyList.fromBytesWithFormat(contentsData.bytes)
-                   let plistDict = try #require(privacyPlist.dictValue)
-                   let trackedDomains = try #require(plistDict["NSPrivacyTrackingDomains"]?.arrayValue).compactMap { $0.stringValue }
-
-                   XCTAssertEqualSequences(trackedDomains, [
-                        "www.additional.com",
-                   ])
-                })
+                try results.checkTask(
+                    .matchRuleType("ProcessInfoPlistFile"),
+                    .matchTargetName("App"),
+                    body: { task in
+                        task.checkCommandLineContains([
+                            "-scanforprivacyfile",
+                            "\(buildDir.str)/App.app/Contents/Frameworks/Framework.framework",
+                        ])
+
+                        let contentsData = try tester.fs.read(buildDir.join("App.app/Contents/Info.plist"))
+                        let (privacyPlist, _) = try PropertyList.fromBytesWithFormat(contentsData.bytes)
+                        let plistDict = try #require(privacyPlist.dictValue)
+                        let trackedDomains = try #require(plistDict["NSPrivacyTrackingDomains"]?.arrayValue).compactMap { $0.stringValue }
+
+                        XCTAssertEqualSequences(
+                            trackedDomains,
+                            [
+                                "www.additional.com"
+                            ]
+                        )
+                    }
+                )
             }
         }
     }
diff --git a/Tests/SWBBuildSystemTests/UnifdefTests.swift b/Tests/SWBBuildSystemTests/UnifdefTests.swift
index aa163cbc..a0ff9f96 100644
--- a/Tests/SWBBuildSystemTests/UnifdefTests.swift
+++ b/Tests/SWBBuildSystemTests/UnifdefTests.swift
@@ -29,33 +29,50 @@ fileprivate struct UnifdefTests: CoreBasedTests {
                 projects: [
                     TestProject(
                         "aProject",
-                        groupTree: TestGroup("Sources", children: [
-                            TestFile("A.h"),
-                        ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)",
-                                            "COPY_HEADERS_RUN_UNIFDEF": "YES"])],
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile("A.h")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "COPY_HEADERS_RUN_UNIFDEF": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Empty", type: .framework,
+                                "Empty",
+                                type: .framework,
                                 buildConfigurations: [TestBuildConfiguration("Debug")],
                                 buildPhases: [
                                     TestHeadersBuildPhase([TestBuildFile("A.h", headerVisibility: .public)])
-                                ])])])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
             try tester.fs.createDirectory(SRCROOT, recursive: true)
-            try tester.fs.write(SRCROOT.join("A.h"), contents: """
-            #if FOO
-            void f(void);
-            #endif
+            try tester.fs.write(
+                SRCROOT.join("A.h"),
+                contents: """
+                    #if FOO
+                    void f(void);
+                    #endif
 
-            #if BAR
-            void g(void);
-            #endif
-            """)
+                    #if BAR
+                    void g(void);
+                    #endif
+                    """
+            )
 
             // Check the initial build.
             try await tester.checkBuild(parameters: BuildParameters(configuration: "Debug", commandLineOverrides: ["COPY_HEADERS_UNIFDEF_FLAGS": "-DFOO"]), runDestination: .macOS, persistent: true) { results in
diff --git a/Tests/SWBBuildSystemTests/UnitTestBuildOperationTests.swift b/Tests/SWBBuildSystemTests/UnitTestBuildOperationTests.swift
index 0a7c1617..47d46ab4 100644
--- a/Tests/SWBBuildSystemTests/UnitTestBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/UnitTestBuildOperationTests.swift
@@ -19,7 +19,6 @@ import SWBProtocol
 import SWBUtil
 import SWBTaskExecution
 
-
 @Suite
 fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
 
@@ -41,8 +40,7 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                 if let signableTargets { return signableTargets }
                 if let provisioningInputs {
                     return Set(provisioningInputs.keys)
-                }
-                else {
+                } else {
                     return Set<String>()
                 }
             }()
@@ -60,7 +58,6 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
         }
     }
 
-
     // MARK: Application-hosted test targets
 
     /// Test building an application and its test target - which uses TEST_HOST - for macOS.
@@ -84,7 +81,8 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                 // Test target sources
                                 TestFile("TestOne.swift"),
                                 TestFile("TestTwo.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -95,7 +93,8 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                     "COPY_PHASE_STRIP": "NO",
                                     "SDKROOT": "macosx",
                                     "SWIFT_VERSION": swiftVersion,
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestAggregateTarget(
@@ -114,12 +113,13 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                             "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/Contents/MacOS/AppTarget",
                                             "BUNDLE_LOADER": "$(TEST_HOST)",
                                             "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks",
-                                        ]),
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "TestOne.swift",
-                                    ]),
+                                        "TestOne.swift"
+                                    ])
                                 ],
                                 dependencies: ["AppTarget"]
                             ),
@@ -134,12 +134,13 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                             "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/Contents/MacOS/AppTarget",
                                             "BUNDLE_LOADER": "$(TEST_HOST)",
                                             "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks",
-                                        ]),
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "TestTwo.swift",
-                                    ]),
+                                        "TestTwo.swift"
+                                    ])
                                 ],
                                 dependencies: ["AppTarget"]
                             ),
@@ -147,17 +148,19 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                 "AppTarget",
                                 type: .application,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings:["INFOPLIST_FILE": "AppTarget-Info.plist"]),
+                                    TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "AppTarget-Info.plist"])
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "main.c",
                                         "ClassOne.swift",
-                                    ]),
+                                    ])
                                 ]
                             ),
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Write the file data.
@@ -252,7 +255,8 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                 // Test target sources
                                 TestFile("TestOne.swift"),
                                 TestFile("TestTwo.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -264,7 +268,8 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                     "COPY_PHASE_STRIP": "NO",
                                     "SDKROOT": "iphoneos",
                                     "SWIFT_VERSION": swiftVersion,
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestAggregateTarget(
@@ -283,12 +288,13 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                             "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/AppTarget",
                                             "BUNDLE_LOADER": "$(TEST_HOST)",
                                             "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks",
-                                        ]),
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "TestOne.swift",
-                                    ]),
+                                        "TestOne.swift"
+                                    ])
                                 ],
                                 dependencies: ["AppTarget"]
                             ),
@@ -303,12 +309,13 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                             "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/AppTarget",
                                             "BUNDLE_LOADER": "$(TEST_HOST)",
                                             "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks",
-                                        ]),
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "TestTwo.swift",
-                                    ]),
+                                        "TestTwo.swift"
+                                    ])
                                 ],
                                 dependencies: ["AppTarget"]
                             ),
@@ -316,17 +323,19 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                 "AppTarget",
                                 type: .application,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings:["INFOPLIST_FILE": "AppTarget-Info.plist"]),
+                                    TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "AppTarget-Info.plist"])
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "main.c",
                                         "ClassOne.swift",
-                                    ]),
+                                    ])
                                 ]
                             ),
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Write the file data.
@@ -450,7 +459,8 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
 
                                 // Lib sources
                                 TestFile("Lib.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -462,7 +472,8 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                     "SDKROOT": "macosx",
                                     "SWIFT_VERSION": swiftVersion,
                                     "MACOSX_DEPLOYMENT_TARGET": core.loadSDK(.macOS).defaultDeploymentTarget,
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestAggregateTarget(
@@ -481,11 +492,12 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                             "MACOSX_DEPLOYMENT_TARGET": core.loadSDK(.macOS).defaultDeploymentTarget,
                                             "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/Contents/MacOS/AppTarget",
                                             "BUNDLE_LOADER": "$(TEST_HOST)",
-                                        ]),
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "TestOne.swift",
+                                        "TestOne.swift"
                                     ]),
                                     TestCopyFilesBuildPhase(["ResourceOne.txt"], destinationSubfolder: .resources, onlyForDeployment: false),
                                 ],
@@ -502,15 +514,16 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                             "MACOSX_DEPLOYMENT_TARGET": core.loadSDK(.macOS).defaultDeploymentTarget,
                                             "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/Contents/MacOS/AppTarget",
                                             "BUNDLE_LOADER": "$(TEST_HOST)",
-                                        ]),
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "TestTwo.swift",
+                                        "TestTwo.swift"
                                     ]),
                                     TestCopyFilesBuildPhase([TestBuildFile("Lib.framework", codeSignOnCopy: true)], destinationSubfolder: .frameworks),
                                     TestCopyFilesBuildPhase(["ResourceTwo.txt"], destinationSubfolder: .resources, onlyForDeployment: false),
-                                    TestShellScriptBuildPhase(name: "OutputTwo", shellPath: "/bin/bash", originalObjectID: "OutputTwo", contents: "touch $SCRIPT_OUTPUT_FILE_0", inputs: [], outputs: ["$(TARGET_BUILD_DIR)/nocycle.txt"])
+                                    TestShellScriptBuildPhase(name: "OutputTwo", shellPath: "/bin/bash", originalObjectID: "OutputTwo", contents: "touch $SCRIPT_OUTPUT_FILE_0", inputs: [], outputs: ["$(TARGET_BUILD_DIR)/nocycle.txt"]),
                                 ],
                                 dependencies: ["AppTarget"]
                             ),
@@ -518,30 +531,33 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                 "AppTarget",
                                 type: .application,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "AppTarget-Info.plist"]),
+                                    TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "AppTarget-Info.plist"])
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "App.swift",
+                                        "App.swift"
                                     ]),
                                     TestFrameworksBuildPhase([]),
                                     TestCopyFilesBuildPhase(["Resource.txt"], destinationSubfolder: .resources, onlyForDeployment: false),
-                                    TestShellScriptBuildPhase(name: "Output", shellPath: "/bin/bash", originalObjectID: "Output", contents: "echo $SCRIPT_OUTPUT_FILE_0", inputs: [], outputs: ["$(TARGET_BUILD_DIR)/nocycle.txt"])
+                                    TestShellScriptBuildPhase(name: "Output", shellPath: "/bin/bash", originalObjectID: "Output", contents: "echo $SCRIPT_OUTPUT_FILE_0", inputs: [], outputs: ["$(TARGET_BUILD_DIR)/nocycle.txt"]),
                                 ]
                             ),
                             TestStandardTarget(
                                 "Lib",
                                 type: .framework,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "Lib-Info.plist"]),
+                                    TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "Lib-Info.plist"])
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "Lib.swift",
-                                    ]),
+                                        "Lib.swift"
+                                    ])
                                 ]
                             ),
-                        ])])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(core, testWorkspace, simulated: false)
 
@@ -549,12 +565,11 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
             let buildDirectory = testWorkspace.sourceRoot.join("aProject/build").str
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/App.swift")) { stream in
-                stream <<<
-                """
-                import Cocoa
-                @main
-                class AppDelegate: NSObject, NSApplicationDelegate {}
-                """
+                stream <<< """
+                    import Cocoa
+                    @main
+                    class AppDelegate: NSObject, NSApplicationDelegate {}
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/TestOne.swift")) { stream in
@@ -564,10 +579,9 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                 stream <<< "func test2() {} \n"
             }
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Lib.swift")) { stream in
-                stream <<<
-                """
-                func mylib() -> Int { return 12 }
-                """
+                stream <<< """
+                    func mylib() -> Int { return 12 }
+                    """
             }
 
             try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/Resource.txt")) { stream in
@@ -588,11 +602,15 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
 
             let signableTargets: Set<String> = ["AppTarget", "UnitTestTargetOne", "UnitTestTargetTwo"]
 
-            let params = BuildParameters(action: .build, configuration: "Debug", overrides: [
-                // NOTE: THIS IS THE IMPORTANT SETTING! Ensure that opt-in is on, regardless of the default value.
-                "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING": "YES",
-                "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING_FOR_SCRIPT_OUTPUTS": "YES",
-            ])
+            let params = BuildParameters(
+                action: .build,
+                configuration: "Debug",
+                overrides: [
+                    // NOTE: THIS IS THE IMPORTANT SETTING! Ensure that opt-in is on, regardless of the default value.
+                    "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING": "YES",
+                    "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING_FOR_SCRIPT_OUTPUTS": "YES",
+                ]
+            )
 
             try await tester.checkBuild(parameters: params, runDestination: .macOS, schemeCommand: .test, persistent: true, signableTargets: signableTargets) { results in
                 results.consumeTasksMatchingRuleTypes(excludedTasks)
@@ -676,7 +694,8 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
 
                                 // Test target sources
                                 TestFile("TestOne.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -687,7 +706,8 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                     "COPY_PHASE_STRIP": "NO",
                                     "SDKROOT": "macosx",
                                     "SWIFT_VERSION": swiftVersion,
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -701,12 +721,13 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                             "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/Contents/MacOS/AppTarget",
                                             "BUNDLE_LOADER": "$(TEST_HOST)",
                                             "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks",
-                                        ]),
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "TestOne.swift",
-                                    ]),
+                                        "TestOne.swift"
+                                    ])
                                 ],
                                 dependencies: ["AppTarget"]
                             ),
@@ -714,19 +735,24 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                 "AppTarget",
                                 type: .application,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings:[
-                                        "INFOPLIST_FILE": "AppTarget-Info.plist",
-                                    ]),
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "INFOPLIST_FILE": "AppTarget-Info.plist"
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "main.c",
                                         "ClassOne.swift",
-                                    ]),
+                                    ])
                                 ]
                             ),
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Write the file data.
@@ -854,7 +880,6 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
         }
     }
 
-
     // MARK: UI test targets
 
     /// Test building an application and a UI test target for macOS.
@@ -877,7 +902,8 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
 
                                 // Test target sources
                                 TestFile("TestOne.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -888,7 +914,8 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                     "COPY_PHASE_STRIP": "NO",
                                     "SDKROOT": "macosx",
                                     "SWIFT_VERSION": swiftVersion,
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -903,12 +930,13 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                             "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks",
                                             "TEST_TARGET_NAME": "AppTarget",
                                             "PRODUCT_BUNDLE_IDENTIFIER": "com.apple.dt.UITestTarget-1",
-                                        ]),
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "TestOne.swift",
-                                    ]),
+                                        "TestOne.swift"
+                                    ])
                                 ],
                                 dependencies: ["AppTarget"]
                             ),
@@ -916,17 +944,19 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                 "AppTarget",
                                 type: .application,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings:["INFOPLIST_FILE": "AppTarget-Info.plist"]),
+                                    TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "AppTarget-Info.plist"])
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "main.c",
                                         "ClassOne.swift",
-                                    ]),
+                                    ])
                                 ]
                             ),
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Write the file data.
@@ -950,7 +980,7 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
             "com.apple.application-identifier": "59GAB85EFG.com.apple.dt.UITestTarget-1",
             "com.apple.security.app-sandbox": 1,
             "com.apple.security.network.client": 1,
-            // This is a truncated dictionary of what gets actually used in a UI test target's entitlements.
+                // This is a truncated dictionary of what gets actually used in a UI test target's entitlements.
         ]
         let provisioningInputs = [
             "UITestTarget": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: entitlements, simulatedEntitlements: [:]),
@@ -989,16 +1019,13 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                             #expect(infoDict["CFBundleIdentifier"]?.stringValue == "com.apple.dt.UITestTarget-1.xctrunner")
                             #expect(infoDict["CFBundleName"]?.stringValue == "UITestTarget-1-Runner")
                             #expect(infoDict["UIDeviceFamily"] == nil)
-                        }
-                        else {
+                        } else {
                             Issue.record("Could not read Info.plist for XCTRunner.app at path: \(infoPlistPath.str)")
                         }
-                    }
-                    else {
+                    } else {
                         Issue.record("Info.plist for XCTRunner.app does not exist at path: \(infoPlistPath.str)")
                     }
-                }
-                else {
+                } else {
                     Issue.record("Could not get path to Info.plist for XCTRunner.app from rule: \(task.ruleInfo)")
                 }
             }
@@ -1063,7 +1090,8 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
 
                                 // Test target sources
                                 TestFile("TestOne.swift"),
-                            ]),
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -1075,7 +1103,8 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                     "COPY_PHASE_STRIP": "NO",
                                     "SDKROOT": "iphoneos",
                                     "SWIFT_VERSION": swiftVersion,
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -1089,12 +1118,13 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                             "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks",
                                             "TEST_TARGET_NAME": "AppTarget",
                                             "PRODUCT_BUNDLE_IDENTIFIER": "com.apple.dt.UITestTarget",
-                                        ]),
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "TestOne.swift",
-                                    ]),
+                                        "TestOne.swift"
+                                    ])
                                 ],
                                 dependencies: ["AppTarget"]
                             ),
@@ -1102,17 +1132,19 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                                 "AppTarget",
                                 type: .application,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings:["INFOPLIST_FILE": "AppTarget-Info.plist"]),
+                                    TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "AppTarget-Info.plist"])
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
                                         "main.c",
                                         "ClassOne.swift",
-                                    ]),
+                                    ])
                                 ]
                             ),
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Write the file data.
@@ -1147,7 +1179,7 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
             "com.apple.application-identifier": "59GAB85EFG.com.apple.dt.UITestTarget",
             "com.apple.security.app-sandbox": 1,
             "com.apple.security.network.client": 1,
-            // This is a truncated dictionary of what gets actually used in a UI test target's entitlements.
+                // This is a truncated dictionary of what gets actually used in a UI test target's entitlements.
         ]
         let provisioningInputs = [
             "UITestTarget": ProvisioningTaskInputs(identityHash: "-", identityName: "Ad-Hoc Signing", signedEntitlements: testEntitlements, simulatedEntitlements: [:]),
@@ -1186,16 +1218,13 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                             #expect(infoDict["CFBundleIdentifier"]?.stringValue == "com.apple.dt.UITestTarget.xctrunner")
                             #expect(infoDict["CFBundleName"]?.stringValue == "UITestTarget-Runner")
                             #expect(infoDict["UIDeviceFamily"]?.intArrayValue == [1])
-                        }
-                        else {
+                        } else {
                             Issue.record("Could not read Info.plist for XCTRunner.app at path: \(infoPlistPath.str)")
                         }
-                    }
-                    else {
+                    } else {
                         Issue.record("Info.plist for XCTRunner.app does not exist at path: \(infoPlistPath.str)")
                     }
-                }
-                else {
+                } else {
                     Issue.record("Could not get path to Info.plist for XCTRunner.app from rule: \(task.ruleInfo)")
                 }
             }
@@ -1256,16 +1285,13 @@ fileprivate struct UnitTestBuildOperationTests: CoreBasedTests {
                             #expect(infoDict["CFBundleExecutable"]?.stringValue == "UITestTarget-Runner")
                             #expect(infoDict["CFBundleIdentifier"]?.stringValue == "com.apple.dt.UITestTarget.xctrunner")
                             #expect(infoDict["CFBundleName"]?.stringValue == "UITestTarget-Runner")
-                        }
-                        else {
+                        } else {
                             Issue.record("Could not read Info.plist for XCTRunner.app at path: \(infoPlistPath.str)")
                         }
-                    }
-                    else {
+                    } else {
                         Issue.record("Info.plist for XCTRunner.app does not exist at path: \(infoPlistPath.str)")
                     }
-                }
-                else {
+                } else {
                     Issue.record("Could not get path to Info.plist for XCTRunner.app from rule: \(task.ruleInfo)")
                 }
             }
diff --git a/Tests/SWBBuildSystemTests/WatchBuildOperationTests.swift b/Tests/SWBBuildSystemTests/WatchBuildOperationTests.swift
index 5a9df658..db9c7712 100644
--- a/Tests/SWBBuildSystemTests/WatchBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/WatchBuildOperationTests.swift
@@ -27,7 +27,8 @@ fileprivate struct WatchBuildOperationTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDirPath,
                 groupTree: TestGroup(
-                    "Sources", path: "Sources",
+                    "Sources",
+                    path: "Sources",
                     children: [
                         // watchOS app files
                         TestFile("watchosApp/Base.lproj/Interface.storyboard"),
@@ -39,7 +40,8 @@ fileprivate struct WatchBuildOperationTests: CoreBasedTests {
                         TestFile("watchosExtension/WatchClass.swift"),
                         TestFile("watchosExtension/Assets.xcassets"),
                         TestFile("watchosExtension/Info.plist"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -49,24 +51,31 @@ fileprivate struct WatchBuildOperationTests: CoreBasedTests {
                             "CODE_SIGN_IDENTITY": "Apple Development",
                             "SDKROOT": "watchos",
                             "SWIFT_VERSION": swiftVersion,
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Watchable",
                         type: .watchKitAppContainer,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug",
-                                                   buildSettings: [:]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [:]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([
                                 // The target must at least HAVE an empty phase for the automatic asset catalog and storyboard to work
                             ]),
-                            TestCopyFilesBuildPhase([
-                                "Watchable WatchKit App.app",
-                            ], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch", onlyForDeployment: false
-                                                   ),
+                            TestCopyFilesBuildPhase(
+                                [
+                                    "Watchable WatchKit App.app"
+                                ],
+                                destinationSubfolder: .builtProductsDir,
+                                destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch",
+                                onlyForDeployment: false
+                            ),
                         ],
                         dependencies: ["Watchable WatchKit App"]
                     ),
@@ -74,28 +83,33 @@ fileprivate struct WatchBuildOperationTests: CoreBasedTests {
                         "Watchable WatchKit App",
                         type: .watchKitApp,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug",
-                                                   buildSettings: [
-                                                    "ARCHS[sdk=watchos*]": "arm64_32",
-                                                    "ARCHS[sdk=watchsimulator*]": "x86_64",
-                                                    "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
-                                                    "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
-                                                    "INFOPLIST_FILE": "Sources/watchosApp/Info.plist",
-                                                    "SDKROOT": "watchos",
-                                                    "SKIP_INSTALL": "YES",
-                                                    "TARGETED_DEVICE_FAMILY": "4",
-                                                    "WATCHOS_DEPLOYMENT_TARGET": core.loadSDK(.watchOS).defaultDeploymentTarget,
-                                                   ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "ARCHS[sdk=watchos*]": "arm64_32",
+                                    "ARCHS[sdk=watchsimulator*]": "x86_64",
+                                    "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
+                                    "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
+                                    "INFOPLIST_FILE": "Sources/watchosApp/Info.plist",
+                                    "SDKROOT": "watchos",
+                                    "SKIP_INSTALL": "YES",
+                                    "TARGETED_DEVICE_FAMILY": "4",
+                                    "WATCHOS_DEPLOYMENT_TARGET": core.loadSDK(.watchOS).defaultDeploymentTarget,
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([
                                 "Base.lproj/Interface.storyboard",
                                 "watchosApp/Assets.xcassets",
                             ]),
-                            TestCopyFilesBuildPhase([
-                                "Watchable WatchKit Extension.appex",
-                            ], destinationSubfolder: .plugins, onlyForDeployment: false
-                                                   ),
+                            TestCopyFilesBuildPhase(
+                                [
+                                    "Watchable WatchKit Extension.appex"
+                                ],
+                                destinationSubfolder: .plugins,
+                                onlyForDeployment: false
+                            ),
                         ],
                         dependencies: ["Watchable WatchKit Extension", "Watchable WatchKit Extension (old)"]
                     ),
@@ -103,19 +117,21 @@ fileprivate struct WatchBuildOperationTests: CoreBasedTests {
                         "Watchable WatchKit Extension",
                         type: .watchKitExtension,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug",
-                                                   buildSettings: [
-                                                    "ARCHS[sdk=watchos*]": "arm64_32",
-                                                    "ARCHS[sdk=watchsimulator*]": "x86_64",
-                                                    "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
-                                                    "INFOPLIST_FILE": "Sources/watchosExtension/Info.plist",
-                                                    "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
-                                                    "SDKROOT": "watchos",
-                                                    "SKIP_INSTALL": "YES",
-                                                    "SWIFT_VERSION": swiftVersion,
-                                                    "TARGETED_DEVICE_FAMILY": "4",
-                                                    "WATCHOS_DEPLOYMENT_TARGET": core.loadSDK(.watchOS).defaultDeploymentTarget,
-                                                   ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "ARCHS[sdk=watchos*]": "arm64_32",
+                                    "ARCHS[sdk=watchsimulator*]": "x86_64",
+                                    "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
+                                    "INFOPLIST_FILE": "Sources/watchosExtension/Info.plist",
+                                    "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
+                                    "SDKROOT": "watchos",
+                                    "SKIP_INSTALL": "YES",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "TARGETED_DEVICE_FAMILY": "4",
+                                    "WATCHOS_DEPLOYMENT_TARGET": core.loadSDK(.watchOS).defaultDeploymentTarget,
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
@@ -128,7 +144,8 @@ fileprivate struct WatchBuildOperationTests: CoreBasedTests {
                             ]),
                         ]
                     ),
-                ])
+                ]
+            )
             let tester = try await BuildOperationTester(core, testProject, simulated: true)
 
             // Create files in the filesystem so they're known to exist.
diff --git a/Tests/SWBBuildSystemTests/WatchKitTests.swift b/Tests/SWBBuildSystemTests/WatchKitTests.swift
index f883835d..f0d4906e 100644
--- a/Tests/SWBBuildSystemTests/WatchKitTests.swift
+++ b/Tests/SWBBuildSystemTests/WatchKitTests.swift
@@ -31,27 +31,39 @@ fileprivate struct WatchKitTests: CoreBasedTests {
                 projects: [
                     TestProject(
                         "aProject",
-                        groupTree: TestGroup("Sources", children: [
-                            TestFile("File.m"),
-                        ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "CODE_SIGNING_ALLOWED": "NO",
-                                "CODE_SIGN_IDENTITY": "",
-                                "GCC_GENERATE_DEBUGGING_SYMBOLS": "NO",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_VERSION": "5.0",
-                                "SDKROOT": runDestination.sdk,
-                                "WATCHOS_DEPLOYMENT_TARGET": deploymentTarget,
-                            ])],
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile("File.m")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGNING_ALLOWED": "NO",
+                                    "CODE_SIGN_IDENTITY": "",
+                                    "GCC_GENERATE_DEBUGGING_SYMBOLS": "NO",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_VERSION": "5.0",
+                                    "SDKROOT": runDestination.sdk,
+                                    "WATCHOS_DEPLOYMENT_TARGET": deploymentTarget,
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "WKExt", type: .watchKitExtension,
+                                "WKExt",
+                                type: .watchKitExtension,
                                 buildConfigurations: [TestBuildConfiguration("Debug")],
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["File.m"]),
-                                ])])])
+                                    TestSourcesBuildPhase(["File.m"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
 
             // Create the input files.
diff --git a/Tests/SWBBuildSystemTests/WorkspaceDiagnosticsTests.swift b/Tests/SWBBuildSystemTests/WorkspaceDiagnosticsTests.swift
index 39d52254..722b593f 100644
--- a/Tests/SWBBuildSystemTests/WorkspaceDiagnosticsTests.swift
+++ b/Tests/SWBBuildSystemTests/WorkspaceDiagnosticsTests.swift
@@ -28,24 +28,31 @@ fileprivate struct WorkspaceDiagnosticsTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDirPath,
                 groupTree: TestGroup(
-                    "Sources", children: [
-                        TestFile("Source.m"),
-                    ]),
+                    "Sources",
+                    children: [
+                        TestFile("Source.m")
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "INFOPLIST_FILE": "Info.plist",
-                        "SDK_VARIANT": MacCatalystInfo.sdkVariantName,
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "INFOPLIST_FILE": "Info.plist",
+                            "SDK_VARIANT": MacCatalystInfo.sdkVariantName,
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Foo",
                         type: .appClip,
                         buildPhases: [
-                            TestSourcesBuildPhase(["Source.m"]),
-                        ]),
-                ])
+                            TestSourcesBuildPhase(["Source.m"])
+                        ]
+                    )
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
 
             try await tester.checkBuildDescription(BuildParameters(action: .build, configuration: "Debug"), runDestination: .macOS) { results in
diff --git a/Tests/SWBBuildSystemTests/XCFrameworkBuildOperationTests.swift b/Tests/SWBBuildSystemTests/XCFrameworkBuildOperationTests.swift
index 25d33b23..d7fd7de9 100644
--- a/Tests/SWBBuildSystemTests/XCFrameworkBuildOperationTests.swift
+++ b/Tests/SWBBuildSystemTests/XCFrameworkBuildOperationTests.swift
@@ -73,7 +73,7 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
         try await withTemporaryDirectory { tmpDirPath async throws -> Void in
             let xcode = try await InstalledXcode.currentlySelected()
             let infoLookup = try await getCore()
-            let path1 = try await xcode.compileFramework(path: tmpDirPath.join("macos"), platform: .macOS, infoLookup: infoLookup, archs: ["x86_64"], useSwift: true, static: `static`, linkerOptions: [.noAdhocCodeSign],object: object, needInfoPlist: true, needSigned: true)
+            let path1 = try await xcode.compileFramework(path: tmpDirPath.join("macos"), platform: .macOS, infoLookup: infoLookup, archs: ["x86_64"], useSwift: true, static: `static`, linkerOptions: [.noAdhocCodeSign], object: object, needInfoPlist: true, needSigned: true)
             let path2 = try await xcode.compileFramework(path: tmpDirPath.join("iphoneos"), platform: .iOS, infoLookup: infoLookup, archs: ["arm64", "arm64e"], useSwift: true, static: `static`, linkerOptions: [.noAdhocCodeSign], object: object, needInfoPlist: true, needSigned: true)
             let path3 = try await xcode.compileFramework(path: tmpDirPath.join("iphonesimulator"), platform: .iOSSimulator, infoLookup: infoLookup, archs: ["x86_64"], useSwift: true, static: `static`, linkerOptions: [.noAdhocCodeSign], object: object, needInfoPlist: true, needSigned: true)
             let path4 = try await xcode.compileFramework(path: tmpDirPath.join("watchos"), platform: .watchOS, infoLookup: infoLookup, archs: ["arm64_32"], useSwift: true, static: `static`, linkerOptions: [.noAdhocCodeSign], object: object, needInfoPlist: true, needSigned: true)
@@ -92,7 +92,7 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
 
             let sourceRoot = tmpDirPath.join("Test")
             let packageFrameworks = sourceRoot.join("aPackageProject/build/PackageFrameworks")
-            let binaryName = `static` ? "staticsample" : "sample" // `xcode.compileFramework` uses different names
+            let binaryName = `static` ? "staticsample" : "sample"  // `xcode.compileFramework` uses different names
             let frameworkName = binaryName + ".framework"
 
             let testWorkspace = try await TestWorkspace(
@@ -102,114 +102,160 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
+                            "Sources",
+                            path: "Sources",
+                            children: [
                                 TestFile("A1.c"),
                                 TestFile("A2.c"),
                                 TestFile("A3.c"),
                                 TestFile("sample.xcframework"),
                                 TestFile("Info.plist"),
-                                TestFile("best.swift")
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "USE_HEADERMAP": "NO",
-                                "SKIP_INSTALL": "NO",
-                                "INFOPLIST_FILE": "Sources/Info.plist",
-                                "SWIFT_VERSION": swiftVersion,
-                                "CODE_SIGN_IDENTITY": "-",
-                                "COPY_PHASE_STRIP": "NO",
-                                "PACKAGE_SKIP_AUTO_EMBEDDING_DYNAMIC_BINARY_FRAMEWORKS": skipDynamicAutoEmbed ? "YES" : "NO",
-                                "PACKAGE_SKIP_AUTO_EMBEDDING_STATIC_BINARY_FRAMEWORKS": skipStaticAutoEmbed ? "YES" : "NO",
+                                TestFile("best.swift"),
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "USE_HEADERMAP": "NO",
+                                    "SKIP_INSTALL": "NO",
+                                    "INFOPLIST_FILE": "Sources/Info.plist",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "CODE_SIGN_IDENTITY": "-",
+                                    "COPY_PHASE_STRIP": "NO",
+                                    "PACKAGE_SKIP_AUTO_EMBEDDING_DYNAMIC_BINARY_FRAMEWORKS": skipDynamicAutoEmbed ? "YES" : "NO",
+                                    "PACKAGE_SKIP_AUTO_EMBEDDING_STATIC_BINARY_FRAMEWORKS": skipStaticAutoEmbed ? "YES" : "NO",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "F1", type: .application,
+                                "F1",
+                                type: .application,
                                 buildPhases: [
                                     TestSourcesBuildPhase([TestBuildFile("A1.c"), TestBuildFile("best.swift")]),
                                     TestFrameworksBuildPhase([TestBuildFile("sample.xcframework", codeSignOnCopy: true)]),
-                                ], dependencies: ["F2", "F3"]),
+                                ],
+                                dependencies: ["F2", "F3"]
+                            ),
                             TestStandardTarget(
-                                "F2", type: .application,
+                                "F2",
+                                type: .application,
                                 buildPhases: [
                                     TestSourcesBuildPhase([TestBuildFile("A2.c"), TestBuildFile("best.swift")]),
                                     TestFrameworksBuildPhase([TestBuildFile("sample.xcframework", codeSignOnCopy: true)]),
                                     TestCopyFilesBuildPhase([TestBuildFile("sample.xcframework", codeSignOnCopy: true)], destinationSubfolder: .frameworks, onlyForDeployment: false),
-                                ], dependencies: ["F3"]),
+                                ],
+                                dependencies: ["F3"]
+                            ),
                             TestStandardTarget(
-                                "F3", type: .framework,
+                                "F3",
+                                type: .framework,
                                 buildPhases: [
-                                    TestSourcesBuildPhase([TestBuildFile("A3.c"), TestBuildFile("best.swift")]),
-                                ], dependencies: []),
+                                    TestSourcesBuildPhase([TestBuildFile("A3.c"), TestBuildFile("best.swift")])
+                                ],
+                                dependencies: []
+                            ),
                             TestStandardTarget(
-                                "F4", type: .application,
+                                "F4",
+                                type: .application,
                                 buildPhases: [
-                                    TestFrameworksBuildPhase([TestBuildFile(.target("P1Product"))]),
-                                ], dependencies: ["P1Product", "P2Product"]),
+                                    TestFrameworksBuildPhase([TestBuildFile(.target("P1Product"))])
+                                ],
+                                dependencies: ["P1Product", "P2Product"]
+                            ),
                             TestStandardTarget(
-                                "F5", type: .framework,
+                                "F5",
+                                type: .framework,
                                 buildPhases: [
-                                    TestFrameworksBuildPhase([TestBuildFile(.target("P1Product"))]),
-                                ], dependencies: ["P1Product", "P2Product"]),
+                                    TestFrameworksBuildPhase([TestBuildFile(.target("P1Product"))])
+                                ],
+                                dependencies: ["P1Product", "P2Product"]
+                            ),
                             TestStandardTarget(
-                                "F6", type: .applicationExtension,
+                                "F6",
+                                type: .applicationExtension,
                                 buildPhases: [
-                                    TestFrameworksBuildPhase([TestBuildFile(.target("P1Product"))]),
-                                ], dependencies: ["P1Product", "P2Product"]),
+                                    TestFrameworksBuildPhase([TestBuildFile(.target("P1Product"))])
+                                ],
+                                dependencies: ["P1Product", "P2Product"]
+                            ),
                             TestStandardTarget(
-                                "F7", type: .watchKitExtension,
-                                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: [
-                                    "SDKROOT": "watchsimulator", // explicitly using the simulator here to avoid code signing and entitlement requirements
-                                ])],
+                                "F7",
+                                type: .watchKitExtension,
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "SDKROOT": "watchsimulator"  // explicitly using the simulator here to avoid code signing and entitlement requirements
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [
-                                    TestFrameworksBuildPhase([TestBuildFile(.target("P1Product"))]),
-                                ], dependencies: ["P1Product", "P2Product"]),
+                                    TestFrameworksBuildPhase([TestBuildFile(.target("P1Product"))])
+                                ],
+                                dependencies: ["P1Product", "P2Product"]
+                            ),
                             TestStandardTarget(
-                                "F8", type: .staticLibrary,
+                                "F8",
+                                type: .staticLibrary,
                                 buildPhases: [
                                     TestSourcesBuildPhase([TestBuildFile("best.swift")]),
                                     TestFrameworksBuildPhase([TestBuildFile(.target("P1Product"))]),
-                                ], dependencies: ["P1Product", "P2Product"]),
-                        ]),
+                                ],
+                                dependencies: ["P1Product", "P2Product"]
+                            ),
+                        ]
+                    ),
                     TestPackageProject(
                         "aPackageProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
-                                TestFile("sample.xcframework", guid: "PKG-sample.xcframework"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "USE_HEADERMAP": "NO",
-                                "SKIP_INSTALL": "NO",
-                                "INFOPLIST_FILE": "Sources/Info.plist",
-                                "CODE_SIGN_IDENTITY": "-",
-                                "COPY_PHASE_STRIP": "NO",
+                            "Sources",
+                            path: "Sources",
+                            children: [
+                                TestFile("sample.xcframework", guid: "PKG-sample.xcframework")
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "USE_HEADERMAP": "NO",
+                                    "SKIP_INSTALL": "NO",
+                                    "INFOPLIST_FILE": "Sources/Info.plist",
+                                    "CODE_SIGN_IDENTITY": "-",
+                                    "COPY_PHASE_STRIP": "NO",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestPackageProductTarget(
                                 "P1Product",
-                                frameworksBuildPhase: TestFrameworksBuildPhase([TestBuildFile("sample.xcframework", codeSignOnCopy: true)])),
+                                frameworksBuildPhase: TestFrameworksBuildPhase([TestBuildFile("sample.xcframework", codeSignOnCopy: true)])
+                            ),
                             TestPackageProductTarget(
                                 "P2Product",
                                 frameworksBuildPhase: TestFrameworksBuildPhase([TestBuildFile("sample.xcframework", codeSignOnCopy: true)]),
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: [
-                                        "BUILT_PRODUCTS_DIR": packageFrameworks.str,
-                                        "TARGET_BUILD_DIR": packageFrameworks.str,
-                                    ])
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "BUILT_PRODUCTS_DIR": packageFrameworks.str,
+                                            "TARGET_BUILD_DIR": packageFrameworks.str,
+                                        ]
+                                    )
                                 ]
                             ),
-                        ]),
-                ])
+                        ]
+                    ),
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
@@ -219,10 +265,13 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
             let pkgBuildDirectory = testWorkspace.sourceRoot.join("aPackageProject/build").str
 
             // Write the Info.plist file.
-            try await tester.fs.writePlist(SRCROOT.join("Sources/Info.plist"), .plDict([
-                "CFBundleDevelopmentRegion": .plString("en"),
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)")
-            ]))
+            try await tester.fs.writePlist(
+                SRCROOT.join("Sources/Info.plist"),
+                .plDict([
+                    "CFBundleDevelopmentRegion": .plString("en"),
+                    "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                ])
+            )
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/A1.c")) { contents in
                 contents <<< "int f1(void) {\n";
@@ -244,9 +293,12 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
 
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/best.swift")) { contents in }
 
-            let parameters = BuildParameters(configuration: "Debug", overrides: [
-                "DSTROOT": tmpDirPath.join("dst").str,
-            ])
+            let parameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    "DSTROOT": tmpDirPath.join("dst").str
+                ]
+            )
 
             let signableTargets = Set(["F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "P1Product", "P2Product"])
             let signableTargetInputs = Dictionary(uniqueKeysWithValues: signableTargets.map { ($0, ProvisioningTaskInputs(identityHash: "-", identityName: "-", signedEntitlements: .plDict(["com.apple.security.get-task-allow": .plBool(true)]))) })
@@ -284,7 +336,7 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                     let linkage = try macho.slicesIncludingLinkage().linkage
                     #expect(linkage == .macho(.dylib))
                 } else {
-                    results.checkTask(.matchRule(["Copy",  "\(buildDirectory)/Debug/F2.app/Contents/Frameworks/\(frameworkName)", "\(sourceDirectory)/Sources/sample.xcframework/macos-x86_64/\(frameworkName)"])) { _ in }
+                    results.checkTask(.matchRule(["Copy", "\(buildDirectory)/Debug/F2.app/Contents/Frameworks/\(frameworkName)", "\(sourceDirectory)/Sources/sample.xcframework/macos-x86_64/\(frameworkName)"])) { _ in }
 
                     // Validate the base copy.
                     try validateStructure(at: basePath)
@@ -314,9 +366,14 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
 
             // Check building a package.
             let relevantTargets = tester.workspace.allTargets.filter { ["F4", "F5", "F6", "F7", "F8"].contains($0.name) }
-            let request = BuildRequest(parameters: parameters,
-                                       buildTargets: relevantTargets.map { BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) },
-                                       continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
+            let request = BuildRequest(
+                parameters: parameters,
+                buildTargets: relevantTargets.map { BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) },
+                continueBuildingAfterErrors: false,
+                useParallelTargets: true,
+                useImplicitDependencies: true,
+                useDryRun: false
+            )
 
             try await tester.checkBuild(parameters: parameters, runDestination: .macOSIntel, buildRequest: request, persistent: true, signableTargets: signableTargets, signableTargetInputs: signableTargetInputs) { results in
                 let basePath = Path(pkgBuildDirectory).join("Debug").join(frameworkName)
@@ -404,9 +461,14 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
 
             // Check building a package product only
             let packageProductTarget = try #require(tester.workspace.allTargets.first { $0.name == "P1Product" })
-            let packageProductRequest = BuildRequest(parameters: parameters,
-                                                     buildTargets: [BuildRequest.BuildTargetInfo(parameters: parameters, target: packageProductTarget)],
-                                                     continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
+            let packageProductRequest = BuildRequest(
+                parameters: parameters,
+                buildTargets: [BuildRequest.BuildTargetInfo(parameters: parameters, target: packageProductTarget)],
+                continueBuildingAfterErrors: false,
+                useParallelTargets: true,
+                useImplicitDependencies: true,
+                useDryRun: false
+            )
 
             try await tester.checkBuild(parameters: parameters, runDestination: .macOSIntel, buildRequest: packageProductRequest, persistent: true, signableTargets: signableTargets, signableTargetInputs: signableTargetInputs) { results in
                 let buildDir = Path(pkgBuildDirectory).join("Debug")
@@ -438,14 +500,18 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                         TestFile("file.c"),
                         TestFile("libsample.xcframework"),
                         TestFile("libother.xcframework"),
-                        TestFile("Info.plist")
-                    ]),
+                        TestFile("Info.plist"),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "CODE_SIGN_IDENTITY": "-",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "CODE_SIGN_IDENTITY": "-",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                        ]
+                    )
                 ],
                 targets: [
                     // Test building an app which links and embeds an xcframework.
@@ -453,15 +519,16 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                         "App",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug"),
+                            TestBuildConfiguration("Debug")
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["file.c"]),
                             TestFrameworksBuildPhase(["libsample.xcframework", "libother.xcframework"]),
                         ],
                         dependencies: []
-                    ),
-                ])
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             let fs = tester.fs
@@ -473,35 +540,47 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
 
             try await fs.writeFileContents(Path(SRCROOT).join("file.c"), body: { $0 <<< "int main() { return 0; }" })
 
-            let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
-                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos13.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
-            ])
+            let supportXCFramework = try XCFramework(
+                version: Version(1, 0),
+                libraries: [
+                    XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
+                    XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos13.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
+                ]
+            )
             let supportXCFrameworkPath = Path(SRCROOT).join("libsample.xcframework")
             try fs.createDirectory(supportXCFrameworkPath, recursive: true)
             try await XCFrameworkTestSupport.writeXCFramework(supportXCFramework, fs: fs, path: supportXCFrameworkPath, infoLookup: infoLookup)
 
-            let otherXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("libother.a"), binaryPath: Path("libother.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
-                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos13.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("libother.a"), binaryPath: Path("libother.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
-            ])
+            let otherXCFramework = try XCFramework(
+                version: Version(1, 0),
+                libraries: [
+                    XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("libother.a"), binaryPath: Path("libother.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
+                    XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos13.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("libother.a"), binaryPath: Path("libother.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
+                ]
+            )
             let otherXCFrameworkPath = Path(SRCROOT).join("libother.xcframework")
             try fs.createDirectory(otherXCFrameworkPath, recursive: true)
             try await XCFrameworkTestSupport.writeXCFramework(otherXCFramework, fs: fs, path: otherXCFrameworkPath, infoLookup: infoLookup)
 
             try await tester.checkBuild(parameters: BuildParameters(action: .build, configuration: "Debug"), runDestination: .macOSIntel) { results in
-                results.checkError(.equal(
-                                    """
-                                    Multiple commands produce '\(SRCROOT)/build/Debug/include/header1.h'
-                                    Command: ProcessXCFramework \(SRCROOT)/libother.xcframework \(SRCROOT)/build/Debug/libother.a macos
-                                    Command: ProcessXCFramework \(SRCROOT)/libsample.xcframework \(SRCROOT)/build/Debug/libsample.a macos
-                                    """))
-                results.checkError(.equal(
-                                    """
-                                    Multiple commands produce '\(SRCROOT)/build/Debug/include/header2.h'
-                                    Command: ProcessXCFramework \(SRCROOT)/libother.xcframework \(SRCROOT)/build/Debug/libother.a macos
-                                    Command: ProcessXCFramework \(SRCROOT)/libsample.xcframework \(SRCROOT)/build/Debug/libsample.a macos
-                                    """))
+                results.checkError(
+                    .equal(
+                        """
+                        Multiple commands produce '\(SRCROOT)/build/Debug/include/header1.h'
+                        Command: ProcessXCFramework \(SRCROOT)/libother.xcframework \(SRCROOT)/build/Debug/libother.a macos
+                        Command: ProcessXCFramework \(SRCROOT)/libsample.xcframework \(SRCROOT)/build/Debug/libsample.a macos
+                        """
+                    )
+                )
+                results.checkError(
+                    .equal(
+                        """
+                        Multiple commands produce '\(SRCROOT)/build/Debug/include/header2.h'
+                        Command: ProcessXCFramework \(SRCROOT)/libother.xcframework \(SRCROOT)/build/Debug/libother.a macos
+                        Command: ProcessXCFramework \(SRCROOT)/libsample.xcframework \(SRCROOT)/build/Debug/libsample.a macos
+                        """
+                    )
+                )
 
                 results.checkWarning(.equal("duplicate output file '\(SRCROOT)/build/Debug/include/header1.h' on task: ProcessXCFramework \(SRCROOT)/libsample.xcframework \(SRCROOT)/build/Debug/libsample.a macos"))
                 results.checkWarning(.equal("duplicate output file '\(SRCROOT)/build/Debug/include/header2.h' on task: ProcessXCFramework \(SRCROOT)/libsample.xcframework \(SRCROOT)/build/Debug/libsample.a macos"))
@@ -522,14 +601,18 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                     children: [
                         TestFile("file.c"),
                         TestFile("libsample.xcframework"),
-                        TestFile("Info.plist")
-                    ]),
+                        TestFile("Info.plist"),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "CODE_SIGN_IDENTITY": "-",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "CODE_SIGN_IDENTITY": "-",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                        ]
+                    )
                 ],
                 targets: [
                     // Test building an app which links and embeds an xcframework.
@@ -537,15 +620,16 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                         "App",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug"),
+                            TestBuildConfiguration("Debug")
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["file.c"]),
                             TestFrameworksBuildPhase(["libsample.xcframework"]),
                         ],
                         dependencies: []
-                    ),
-                ])
+                    )
+                ]
+            )
 
             let scenarios: [(path: (XCFramework.Library) -> Path?, message: (Path) -> String)] = [
                 (
@@ -570,10 +654,13 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                 try await fs.writeFileContents(Path(SRCROOT).join("file.c"), body: { $0 <<< "int main() { return 0; }" })
 
                 let supportXCFrameworkPath = Path(SRCROOT).join("libsample.xcframework")
-                let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-                    XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
-                    XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos13.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
-                ])
+                let supportXCFramework = try XCFramework(
+                    version: Version(1, 0),
+                    libraries: [
+                        XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
+                        XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos13.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
+                    ]
+                )
 
                 try fs.createDirectory(supportXCFrameworkPath, recursive: true)
                 try await XCFrameworkTestSupport.writeXCFramework(supportXCFramework, fs: fs, path: supportXCFrameworkPath, infoLookup: infoLookup)
@@ -581,8 +668,7 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                 func remove(_ path: Path) throws {
                     if fs.isDirectory(path) {
                         try fs.removeDirectory(path)
-                    }
-                    else {
+                    } else {
                         try fs.remove(path)
                     }
                     #expect(!fs.exists(path))
@@ -614,14 +700,18 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                     children: [
                         TestFile("file.c"),
                         TestFile("libsample.xcframework", expectedSignature: "AppleDeveloperProgram:mysignature"),
-                        TestFile("Info.plist")
-                    ]),
+                        TestFile("Info.plist"),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "CODE_SIGN_IDENTITY": "-",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "CODE_SIGN_IDENTITY": "-",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                        ]
+                    )
                 ],
                 targets: [
                     // Test building an app which links and embeds an xcframework.
@@ -629,15 +719,16 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                         "App",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug"),
+                            TestBuildConfiguration("Debug")
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["file.c"]),
                             TestFrameworksBuildPhase(["libsample.xcframework"]),
                         ],
                         dependencies: []
-                    ),
-                ])
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             let fs = tester.fs
@@ -650,15 +741,17 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
             try await fs.writeFileContents(Path(SRCROOT).join("file.c"), body: { $0 <<< "int main() { return 0; }" })
 
             let supportXCFrameworkPath = Path(SRCROOT).join("libsample.xcframework")
-            let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
-                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos13.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
-            ])
+            let supportXCFramework = try XCFramework(
+                version: Version(1, 0),
+                libraries: [
+                    XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
+                    XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos13.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
+                ]
+            )
 
             try fs.createDirectory(supportXCFrameworkPath, recursive: true)
             try await XCFrameworkTestSupport.writeXCFramework(supportXCFramework, fs: fs, path: supportXCFrameworkPath, infoLookup: infoLookup)
 
-
             try await tester.checkBuild(parameters: BuildParameters(action: .build, configuration: "Debug"), runDestination: .macOSIntel) { results in
                 results.checkError(.contains("“libsample.xcframework” is not signed with the expected identity and may have been compromised.\nExpected team identifier: mysignature"))
             }
@@ -678,14 +771,18 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                     children: [
                         TestFile("file.c"),
                         TestFile("libsample.xcframework", expectedSignature: "AppleDeveloperProgram:mysignature"),
-                        TestFile("Info.plist")
-                    ]),
+                        TestFile("Info.plist"),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "CODE_SIGN_IDENTITY": "-",
-                        "GENERATE_INFOPLIST_FILE": "YES"
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "CODE_SIGN_IDENTITY": "-",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                        ]
+                    )
                 ],
                 targets: [
                     // Test building an app which links and embeds an xcframework.
@@ -693,15 +790,16 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                         "App",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug"),
+                            TestBuildConfiguration("Debug")
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["file.c"]),
                             TestFrameworksBuildPhase(["libsample.xcframework"]),
                         ],
                         dependencies: []
-                    ),
-                ])
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             let fs = tester.fs
@@ -714,15 +812,17 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
             try await fs.writeFileContents(Path(SRCROOT).join("file.c"), body: { $0 <<< "int main() { return 0; }" })
 
             let supportXCFrameworkPath = Path(SRCROOT).join("libsample.xcframework")
-            let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
-                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos13.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
-            ])
+            let supportXCFramework = try XCFramework(
+                version: Version(1, 0),
+                libraries: [
+                    XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
+                    XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos13.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
+                ]
+            )
 
             try fs.createDirectory(supportXCFrameworkPath, recursive: true)
             try await XCFrameworkTestSupport.writeXCFramework(supportXCFramework, fs: fs, path: supportXCFrameworkPath, infoLookup: infoLookup)
 
-
             try await tester.checkBuild(parameters: BuildParameters(action: .build, configuration: "Debug", overrides: ["DISABLE_XCFRAMEWORK_SIGNATURE_VALIDATION": "YES"]), runDestination: .macOSIntel) { results in
                 results.checkWarning(.contains("XCFramework signature validation is being skipped. Remove `DISABLE_XCFRAMEWORK_SIGNATURE_VALIDATION` to disable this warning."))
             }
@@ -756,54 +856,71 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
+                            "Sources",
+                            path: "Sources",
+                            children: [
                                 TestFile("best.swift")
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "USE_HEADERMAP": "NO",
-                                "SKIP_INSTALL": "NO",
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "SWIFT_VERSION": swiftVersion,
-                                "SKIP_EMBEDDED_FRAMEWORKS_VALIDATION": "YES",
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "USE_HEADERMAP": "NO",
+                                    "SKIP_INSTALL": "NO",
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "SKIP_EMBEDDED_FRAMEWORKS_VALIDATION": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "App", type: .application,
+                                "App",
+                                type: .application,
                                 buildPhases: [
                                     TestSourcesBuildPhase([TestBuildFile("best.swift")]),
                                     TestFrameworksBuildPhase([TestBuildFile(.target("Product"))]),
                                     TestShellScriptBuildPhase(name: "Read Info.plist", shellPath: "/bin/bash", originalObjectID: "ReadPlist", contents: "echo Hello!", inputs: ["$(TARGET_BUILD_DIR)/$(INFOPLIST_PATH)"], outputs: [], alwaysOutOfDate: true),
-                                ], dependencies: ["Product"]),
-                        ]),
+                                ],
+                                dependencies: ["Product"]
+                            )
+                        ]
+                    ),
                     TestPackageProject(
                         "aPackageProject",
                         sourceRoot: sourceRoot.join("aPackageProject"),
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
-                                TestFile("sample.xcframework"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "USE_HEADERMAP": "NO",
-                                "SKIP_INSTALL": "NO",
+                            "Sources",
+                            path: "Sources",
+                            children: [
+                                TestFile("sample.xcframework")
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "USE_HEADERMAP": "NO",
+                                    "SKIP_INSTALL": "NO",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestPackageProductTarget(
                                 "Product",
-                                frameworksBuildPhase: TestFrameworksBuildPhase([TestBuildFile("sample.xcframework", codeSignOnCopy: true)])),
-                        ]),
-                ])
+                                frameworksBuildPhase: TestFrameworksBuildPhase([TestBuildFile("sample.xcframework", codeSignOnCopy: true)])
+                            )
+                        ]
+                    ),
+                ]
+            )
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             try await tester.fs.writeFileContents(sourceRoot.join("aProject/Sources/best.swift")) { contents in }
 
@@ -826,32 +943,43 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                         TestFile("file.c"),
                         TestFile("sample.xcframework"),
                         TestFile("libsample.xcframework"),
-                        TestFile("Info.plist")
-                    ]),
+                        TestFile("Info.plist"),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "CODE_SIGN_IDENTITY": "-",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "CODE_SIGN_IDENTITY": "-",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "App",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "SDKROOT": "iphoneos",
-                                "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "iphoneos",
+                                    "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["file.c"]),
                             TestFrameworksBuildPhase(["sample.xcframework", "libsample.xcframework"]),
-                            TestCopyFilesBuildPhase([
-                                "WatchApp.app",
-                            ], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch", onlyForDeployment: false
-                                                   ),
+                            TestCopyFilesBuildPhase(
+                                [
+                                    "WatchApp.app"
+                                ],
+                                destinationSubfolder: .builtProductsDir,
+                                destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch",
+                                onlyForDeployment: false
+                            ),
                         ],
                         dependencies: ["WatchApp"]
                     ),
@@ -859,10 +987,13 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                         "WatchApp",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "SDKROOT": "watchos",
-                                "SUPPORTED_PLATFORMS": "watchos watchsimulator"
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "watchos",
+                                    "SUPPORTED_PLATFORMS": "watchos watchsimulator",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["file.c"]),
@@ -870,7 +1001,8 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                         ],
                         dependencies: []
                     ),
-                ])
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             let fs = tester.fs
@@ -883,19 +1015,25 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
             try await fs.writeFileContents(Path(SRCROOT).join("file.c"), body: { $0 <<< "int main() { return 0; }" })
 
             let supportXCFrameworkPath = Path(SRCROOT).join("sample.xcframework")
-            let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(infoLookup.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("sample.framework"), binaryPath: Path("sample.framework/sample"), headersPath: nil, debugSymbolsPath: Path("dSYMs")),
-                XCFramework.Library(libraryIdentifier: "arm64-apple-watchos\(infoLookup.loadSDK(.watchOS).defaultDeploymentTarget)", supportedPlatform: "watchos", supportedArchitectures: ["arm64", "arm64_32"], platformVariant: nil, libraryPath: Path("sample.framework"), binaryPath: Path("sample.framework/sample"), headersPath: nil, debugSymbolsPath: Path("dSYMs")),
-            ])
+            let supportXCFramework = try XCFramework(
+                version: Version(1, 0),
+                libraries: [
+                    XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(infoLookup.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("sample.framework"), binaryPath: Path("sample.framework/sample"), headersPath: nil, debugSymbolsPath: Path("dSYMs")),
+                    XCFramework.Library(libraryIdentifier: "arm64-apple-watchos\(infoLookup.loadSDK(.watchOS).defaultDeploymentTarget)", supportedPlatform: "watchos", supportedArchitectures: ["arm64", "arm64_32"], platformVariant: nil, libraryPath: Path("sample.framework"), binaryPath: Path("sample.framework/sample"), headersPath: nil, debugSymbolsPath: Path("dSYMs")),
+                ]
+            )
 
             try fs.createDirectory(supportXCFrameworkPath, recursive: true)
             try await XCFrameworkTestSupport.writeXCFramework(supportXCFramework, fs: fs, path: supportXCFrameworkPath, infoLookup: infoLookup)
 
             let staticSupportXCFrameworkPath = Path(SRCROOT).join("libsample.xcframework")
-            let staticSupportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(infoLookup.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: nil, debugSymbolsPath: Path("dSYMs")),
-                XCFramework.Library(libraryIdentifier: "arm64-apple-watchos\(infoLookup.loadSDK(.watchOS).defaultDeploymentTarget)", supportedPlatform: "watchos", supportedArchitectures: ["arm64", "arm64_32"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: nil, debugSymbolsPath: Path("dSYMs")),
-            ])
+            let staticSupportXCFramework = try XCFramework(
+                version: Version(1, 0),
+                libraries: [
+                    XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(infoLookup.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: nil, debugSymbolsPath: Path("dSYMs")),
+                    XCFramework.Library(libraryIdentifier: "arm64-apple-watchos\(infoLookup.loadSDK(.watchOS).defaultDeploymentTarget)", supportedPlatform: "watchos", supportedArchitectures: ["arm64", "arm64_32"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: nil, debugSymbolsPath: Path("dSYMs")),
+                ]
+            )
 
             try fs.createDirectory(staticSupportXCFrameworkPath, recursive: true)
             try await XCFrameworkTestSupport.writeXCFramework(staticSupportXCFramework, fs: fs, path: staticSupportXCFrameworkPath, infoLookup: infoLookup)
@@ -923,30 +1061,41 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                         TestFile("test.swift"),
                         TestFile("Support.xcframework"),
                         TestFile("Info.plist"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "INFOPLIST_FILE": "Info.plist",
-                        "SWIFT_VERSION": swiftVersion,
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "INFOPLIST_FILE": "Info.plist",
+                            "SWIFT_VERSION": swiftVersion,
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "App",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "SDKROOT": "iphoneos",
-                                "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "iphoneos",
+                                    "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["main.c"]),
-                            TestCopyFilesBuildPhase([
-                                "WatchApp.app",
-                            ], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch", onlyForDeployment: false
-                                                   ),
+                            TestCopyFilesBuildPhase(
+                                [
+                                    "WatchApp.app"
+                                ],
+                                destinationSubfolder: .builtProductsDir,
+                                destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch",
+                                onlyForDeployment: false
+                            ),
                         ],
                         dependencies: ["WatchApp", "Multi"]
                     ),
@@ -954,13 +1103,16 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                         "WatchApp",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "SDKROOT": "watchos",
-                                "SUPPORTED_PLATFORMS": "watchos watchsimulator"
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "watchos",
+                                    "SUPPORTED_PLATFORMS": "watchos watchsimulator",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["main.c"]),
+                            TestSourcesBuildPhase(["main.c"])
                         ],
                         dependencies: ["Multi"]
                     ),
@@ -968,11 +1120,14 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                         "Multi",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "SDKROOT": "auto",
-                                "SDK_VARIANT": "auto",
-                                "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator watchos watchsimulator",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "auto",
+                                    "SDK_VARIANT": "auto",
+                                    "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator watchos watchsimulator",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["test.swift"]),
@@ -980,7 +1135,8 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                         ],
                         dependencies: []
                     ),
-                ])
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testProject, simulated: false)
             let fs = tester.fs
@@ -993,10 +1149,13 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
             try await fs.writeFileContents(SRCROOT.join("main.c"), body: { $0 <<< "int main() { return 0; }" })
             try await fs.writeFileContents(SRCROOT.join("test.swift"), body: { $0 <<< "// test.swift" })
 
-            try await tester.fs.writePlist(SRCROOT.join("Info.plist"), .plDict([
-                "CFBundleDevelopmentRegion": .plString("en"),
-                "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)")
-            ]))
+            try await tester.fs.writePlist(
+                SRCROOT.join("Info.plist"),
+                .plDict([
+                    "CFBundleDevelopmentRegion": .plString("en"),
+                    "CFBundleExecutable": .plString("$(EXECUTABLE_NAME)"),
+                ])
+            )
 
             let supportXCFrameworkPath = SRCROOT.join("Support.xcframework")
             let supportXCFramework = try XCFramework(
@@ -1004,7 +1163,8 @@ fileprivate struct XCFrameworkBuildOperationTests: CoreBasedTests {
                 libraries: [
                     XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(infoLookup.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
                     XCFramework.Library(libraryIdentifier: "arm64-apple-watchos\(infoLookup.loadSDK(.watchOS).defaultDeploymentTarget)", supportedPlatform: "watchos", supportedArchitectures: ["arm64", "arm64_32"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
-                ])
+                ]
+            )
 
             try fs.createDirectory(supportXCFrameworkPath, recursive: true)
             try await XCFrameworkTestSupport.writeXCFramework(supportXCFramework, fs: fs, path: supportXCFrameworkPath, infoLookup: infoLookup)
diff --git a/Tests/SWBCASPerfTests/CASFSNodePerfTests.swift b/Tests/SWBCASPerfTests/CASFSNodePerfTests.swift
index f628e878..13826c2e 100644
--- a/Tests/SWBCASPerfTests/CASFSNodePerfTests.swift
+++ b/Tests/SWBCASPerfTests/CASFSNodePerfTests.swift
@@ -28,7 +28,7 @@ fileprivate struct CASFSNodePerfTests: PerfTests {
         var rng = SystemRandomNumberGenerator()
         var bytes: [UInt8] = []
         bytes.reserveCapacity(count)
-        for _  in 0..<count {
+        for _ in 0..<count {
             bytes.append(UInt8.random(in: 0...UInt8.max, using: &rng))
         }
         return ByteString(bytes)
diff --git a/Tests/SWBCorePerfTests/CommandLineSpecPerfTests.swift b/Tests/SWBCorePerfTests/CommandLineSpecPerfTests.swift
index 390aee2a..6311e9b9 100644
--- a/Tests/SWBCorePerfTests/CommandLineSpecPerfTests.swift
+++ b/Tests/SWBCorePerfTests/CommandLineSpecPerfTests.swift
@@ -85,15 +85,13 @@ private final class CapturingTaskGenerationDelegate: TaskGenerationDelegate {
     var additionalCodeSignInputs: OrderedSet<Path> { return [] }
     var buildDirectories: Set<Path> { return [] }
 
-    func createTask(_ builder: inout PlannedTaskBuilder)
-    {
+    func createTask(_ builder: inout PlannedTaskBuilder) {
         shellTasksCount.withLock { $0 += 1 }
     }
     func createGateTask(inputs: [any PlannedNode], output: any PlannedNode, name: String?, mustPrecede: [any PlannedTask], taskConfiguration: (inout PlannedTaskBuilder) -> Void) {
         // Store somewhere if a test needs it.
     }
-    func createOrReuseSharedNodeWithIdentifier(_ ident: String, creator: () -> (any PlannedNode, any Sendable)) -> (any PlannedNode, any Sendable)
-    {
+    func createOrReuseSharedNodeWithIdentifier(_ ident: String, creator: () -> (any PlannedNode, any Sendable)) -> (any PlannedNode, any Sendable) {
         return sharedIntermediateNodes.getOrInsert(ident, creator)
     }
     func access(path: Path) {}
diff --git a/Tests/SWBCorePerfTests/FilePathResolverPerfTests.swift b/Tests/SWBCorePerfTests/FilePathResolverPerfTests.swift
index dbffb1b4..6a743751 100644
--- a/Tests/SWBCorePerfTests/FilePathResolverPerfTests.swift
+++ b/Tests/SWBCorePerfTests/FilePathResolverPerfTests.swift
@@ -55,8 +55,7 @@ fileprivate struct FilePathResolverPerfTests: PerfTests {
 
         await measure {
             // We do each iteration many times in order to samples that are more likely to be statistically significant.
-            for _ in 1...100000
-            {
+            for _ in 1...100000 {
                 // Create a new resolver each time because we don't want to hit the cache in this test.
                 let resolver = FilePathResolver(scope: self.scope)
 
@@ -74,8 +73,7 @@ fileprivate struct FilePathResolverPerfTests: PerfTests {
 
         await measure {
             // We do each iteration many times in order to samples that are more likely to be statistically significant.
-            for _ in 1...100000
-            {
+            for _ in 1...100000 {
                 // Resolve the path using the resolver property so that all but the first resolution uses its file group cache.
                 let resolvedPath = self.resolver.resolveAbsolutePath(rootGroup)
                 #expect(resolvedPath == Path("/tmp/SomeProject"))
@@ -90,8 +88,7 @@ fileprivate struct FilePathResolverPerfTests: PerfTests {
 
         await measure {
             // We do each iteration many times in order to samples that are more likely to be statistically significant.
-            for _ in 1...100000
-            {
+            for _ in 1...100000 {
                 // Create a new resolver each time because we don't want to hit the cache in this test.
                 let resolver = FilePathResolver(scope: self.scope)
 
@@ -104,15 +101,18 @@ fileprivate struct FilePathResolverPerfTests: PerfTests {
 
     @Test
     func groupRelativeSourceTree_1Level_X100000() async throws {
-        let model = try TestGroup("SomeProject", path: "/tmp/SomeProject", sourceTree: .absolute,
-                                  children: [TestGroup("AllFiles")]).toProtocol()
+        let model = try TestGroup(
+            "SomeProject",
+            path: "/tmp/SomeProject",
+            sourceTree: .absolute,
+            children: [TestGroup("AllFiles")]
+        ).toProtocol()
         let rootGroup = try #require(Reference.create(model, pifLoader, isRoot: true) as? FileGroup)
         let childGroup = try #require(rootGroup.children[0] as? FileGroup)
 
         await measure {
             // We do each iteration many times in order to samples that are more likely to be statistically significant.
-            for _ in 1...100000
-            {
+            for _ in 1...100000 {
                 // Create a new resolver each time because we don't want to hit the cache in this test.
                 let resolver = FilePathResolver(scope: self.scope)
 
@@ -125,17 +125,24 @@ fileprivate struct FilePathResolverPerfTests: PerfTests {
 
     @Test
     func groupRelativeSourceTree_2Levels_X100000() async throws {
-        let model = try TestGroup("SomeProject", path: "/tmp/SomeProject", sourceTree: .absolute,
-                                  children: [TestGroup("AllFiles",
-                                                       children: [TestGroup("SomeFiles")])]).toProtocol()
+        let model = try TestGroup(
+            "SomeProject",
+            path: "/tmp/SomeProject",
+            sourceTree: .absolute,
+            children: [
+                TestGroup(
+                    "AllFiles",
+                    children: [TestGroup("SomeFiles")]
+                )
+            ]
+        ).toProtocol()
         let rootGroup = try #require(Reference.create(model, pifLoader, isRoot: true) as? FileGroup)
         let childGroup = try #require(rootGroup.children[0] as? FileGroup)
         let grandchildGroup = try #require(childGroup.children[0] as? FileGroup)
 
         await measure {
             // We do each iteration many times in order to samples that are more likely to be statistically significant.
-            for _ in 1...100000
-            {
+            for _ in 1...100000 {
                 // Create a new resolver each time because we don't want to hit the cache in this test.
                 let resolver = FilePathResolver(scope: self.scope)
 
@@ -148,17 +155,24 @@ fileprivate struct FilePathResolverPerfTests: PerfTests {
 
     @Test
     func groupRelativeSourceTree_2Levels_Cached_X100000() async throws {
-        let model = try TestGroup("SomeProject", path: "/tmp/SomeProject", sourceTree: .absolute,
-                                  children: [TestGroup("AllFiles",
-                                                       children: [TestGroup("SomeFiles")])]).toProtocol()
+        let model = try TestGroup(
+            "SomeProject",
+            path: "/tmp/SomeProject",
+            sourceTree: .absolute,
+            children: [
+                TestGroup(
+                    "AllFiles",
+                    children: [TestGroup("SomeFiles")]
+                )
+            ]
+        ).toProtocol()
         let rootGroup = try #require(Reference.create(model, pifLoader, isRoot: true) as? FileGroup)
         let childGroup = try #require(rootGroup.children[0] as? FileGroup)
         let grandchildGroup = try #require(childGroup.children[0] as? FileGroup)
 
         await measure {
             // We do each iteration many times in order to samples that are more likely to be statistically significant.
-            for _ in 1...100000
-            {
+            for _ in 1...100000 {
                 // Resolve the path using the resolver property so that all but the first resolution uses its file group cache.
                 let resolvedPath = self.resolver.resolveAbsolutePath(grandchildGroup)
                 #expect(resolvedPath == Path("/tmp/SomeProject/AllFiles/SomeFiles"))
diff --git a/Tests/SWBCorePerfTests/MacroConfigFileParsingPerfTests.swift b/Tests/SWBCorePerfTests/MacroConfigFileParsingPerfTests.swift
index 3cecfb1b..c2783808 100644
--- a/Tests/SWBCorePerfTests/MacroConfigFileParsingPerfTests.swift
+++ b/Tests/SWBCorePerfTests/MacroConfigFileParsingPerfTests.swift
@@ -39,13 +39,13 @@ fileprivate struct MacroConfigFileParsingPerfTests: PerfTests {
 
     @Test
     func parsingOfMultipleSimpleAssignments_X1000() async {
-        let byteString = ByteString(encodingAsUTF8: [String](repeating:"MACRO=VALUE", count:10).joined(separator: "\n"))
+        let byteString = ByteString(encodingAsUTF8: [String](repeating: "MACRO=VALUE", count: 10).joined(separator: "\n"))
         await runParsingTest(byteString, iterations: 1000)
     }
 
     @Test
     func parsing1MBFile_X10() async {
-        let byteString = ByteString(encodingAsUTF8: (0..<44616).map{ "MACRO\($0) = VALUE\($0)" }.joined(separator: "\n"))
+        let byteString = ByteString(encodingAsUTF8: (0..<44616).map { "MACRO\($0) = VALUE\($0)" }.joined(separator: "\n"))
         await runParsingTest(byteString, iterations: 10)
     }
 }
diff --git a/Tests/SWBCorePerfTests/MacroExpressionParsingPerfTests.swift b/Tests/SWBCorePerfTests/MacroExpressionParsingPerfTests.swift
index 04a3b538..2446b670 100644
--- a/Tests/SWBCorePerfTests/MacroExpressionParsingPerfTests.swift
+++ b/Tests/SWBCorePerfTests/MacroExpressionParsingPerfTests.swift
@@ -16,7 +16,7 @@ import SWBUtil
 import SWBTestSupport
 import SWBMacro
 
-fileprivate final class MockMacroExpressionParserDelegate : MacroExpressionParserDelegate {
+fileprivate final class MockMacroExpressionParserDelegate: MacroExpressionParserDelegate {
     func foundLiteralStringFragment(_ string: Input, parser: MacroExpressionParser) {}
     func foundStringFormOnlyLiteralStringFragment(_ string: MacroExpressionParserDelegate.Input, parser: MacroExpressionParser) {}
     func foundStartOfSubstitutionSubexpression(alwaysEvalAsString: Bool, parser: MacroExpressionParser) {}
@@ -80,12 +80,12 @@ fileprivate struct MacroExpressionParsingPerfTests: CoreBasedTests, PerfTests {
         }
 
         // Create a function to make a parseable string from a command line template specifier.  There are various ways of specifying the command line fragment, but they all resolve down to parsable strings.  We still need to discuss how exactly the command lines will be generated (whether through more general-purpose expressions like this, or through special cases) but in any case this is useful for performance measurement.
-        func MakeParseableStringsFromCommandLineTemplateSpec (_ spec: BuildOptionValue.CommandLineTemplateSpecifier) -> [String] {
+        func MakeParseableStringsFromCommandLineTemplateSpec(_ spec: BuildOptionValue.CommandLineTemplateSpecifier) -> [String] {
             switch spec {
-            case .empty:               return []
-            case .literal:             return ["$(value)"]
-            case .args(let exprs):     return [exprs.stringRep]
-            case .flag(let str):       return [str.stringRep, "$(value)"]
+            case .empty: return []
+            case .literal: return ["$(value)"]
+            case .args(let exprs): return [exprs.stringRep]
+            case .flag(let str): return [str.stringRep, "$(value)"]
             case .prefixFlag(let str): return [str.stringRep + "$(value)"]
             }
         }
@@ -113,7 +113,7 @@ fileprivate struct MacroExpressionParsingPerfTests: CoreBasedTests, PerfTests {
 
         // Finally, parse the strings.
         await measure {
-            final class MockDelegate : MacroExpressionParserDelegate {
+            final class MockDelegate: MacroExpressionParserDelegate {
                 func foundLiteralStringFragment(_ string: Input, parser: MacroExpressionParser) {
                 }
 
diff --git a/Tests/SWBCorePerfTests/SerializationPerfTests.swift b/Tests/SWBCorePerfTests/SerializationPerfTests.swift
index 53952652..28eeafd0 100644
--- a/Tests/SWBCorePerfTests/SerializationPerfTests.swift
+++ b/Tests/SWBCorePerfTests/SerializationPerfTests.swift
@@ -25,11 +25,13 @@ fileprivate struct SerializationPerfTests: CoreBasedTests, PerfTests {
             "Workspace",
             sourceRoot: tmpDirPath,
             projects: [
-                TestProject("aProject",
-                            groupTree: TestGroup("SomeFiles"),
-                            targets: [TestStandardTarget("Target1", type: .application)]
-                           )
-            ]).loadHelper(getCore())
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles"),
+                    targets: [TestStandardTarget("Target1", type: .application)]
+                )
+            ]
+        ).loadHelper(getCore())
         let project = helper.project
         let target = project.targets[0]
         return helper.globalScope(buildRequestContext: BuildRequestContext(workspaceContext: helper.workspaceContext), project: project, target: target)
@@ -56,7 +58,6 @@ fileprivate struct SerializationPerfTests: CoreBasedTests, PerfTests {
                     accumulatedBytes += Float64(sz.byteString.count)
                 }
 
-
                 if !didEmitSerializedSize.withLock({ $0 }) {
                     let mb = accumulatedBytes / (1000.0 * 1000.0)
                     perfPrint("Serialized \(mb) megabytes for \(numberOfTargets) targets")
diff --git a/Tests/SWBCorePerfTests/SettingsPerfTests.swift b/Tests/SWBCorePerfTests/SettingsPerfTests.swift
index 255abf63..9a3b0dcf 100644
--- a/Tests/SWBCorePerfTests/SettingsPerfTests.swift
+++ b/Tests/SWBCorePerfTests/SettingsPerfTests.swift
@@ -27,11 +27,13 @@ fileprivate struct SettingsPerfTests: CoreBasedTests, PerfTests {
                 "Workspace",
                 sourceRoot: tmpDirPath,
                 projects: [
-                    TestProject("aProject",
-                                groupTree: TestGroup("SomeFiles"),
-                                targets: [TestStandardTarget("Target1", type: .application)]
-                               )
-                ]).loadHelper(getCore())
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup("SomeFiles"),
+                        targets: [TestStandardTarget("Target1", type: .application)]
+                    )
+                ]
+            ).loadHelper(getCore())
             let context = helper.workspaceContext
             let buildRequestContext = BuildRequestContext(workspaceContext: context)
             let project = helper.project
diff --git a/Tests/SWBCoreTests/BuildRuleTests.swift b/Tests/SWBCoreTests/BuildRuleTests.swift
index 3ca42c82..e4812b41 100644
--- a/Tests/SWBCoreTests/BuildRuleTests.swift
+++ b/Tests/SWBCoreTests/BuildRuleTests.swift
@@ -24,7 +24,7 @@ import SWBMacro
     func basicRuleLookup() async throws {
         let core = try await getCore()
         // Create a set of rules.  We’ll use a couple of helper functions for creating the rules.
-        var rules = Array<(any BuildRuleCondition,any BuildRuleAction)>()
+        var rules = Array<(any BuildRuleCondition, any BuildRuleAction)>()
         func MakeNamePatternConditionTaskActionRule(_ namePattern: String, _ compilerSpecIdent: String) throws -> (any BuildRuleCondition, any BuildRuleAction) {
             return (BuildRuleFileNameCondition(namePatterns: [core.specRegistry.internalMacroNamespace.parseString(namePattern)]), BuildRuleTaskAction(toolSpec: try core.specRegistry.getSpec(compilerSpecIdent) as CommandLineToolSpec))
         }
@@ -110,15 +110,20 @@ import SWBMacro
             let result = ruleSet.match(textFile, scope)
 
             // Check that there is a single diagnostic and that it matches the expected one.
-            #expect(result.diagnostics == [
-                .init(behavior: enableDebugActivityLogs ? .warning : .note, message: [
-                    "Multiple rules matching input \'\(textFilePath.str)\':",
-                    "Custom Rule 1",
-                    "Custom Rule 2",
-                    "",
-                    "Applying first matching rule \'Custom Rule 1\'",
-                ].joined(separator: "\n"))
-            ])
+            #expect(
+                result.diagnostics == [
+                    .init(
+                        behavior: enableDebugActivityLogs ? .warning : .note,
+                        message: [
+                            "Multiple rules matching input \'\(textFilePath.str)\':",
+                            "Custom Rule 1",
+                            "Custom Rule 2",
+                            "",
+                            "Applying first matching rule \'Custom Rule 1\'",
+                        ].joined(separator: "\n")
+                    )
+                ]
+            )
         }
 
         try testDiagnostic(enableDebugActivityLogs: true)
diff --git a/Tests/SWBCoreTests/CommandLineSpecTests.swift b/Tests/SWBCoreTests/CommandLineSpecTests.swift
index fa1c49e1..1c98a59e 100644
--- a/Tests/SWBCoreTests/CommandLineSpecTests.swift
+++ b/Tests/SWBCoreTests/CommandLineSpecTests.swift
@@ -200,7 +200,7 @@ import SWBMacro
         table.push(BuiltinMacros.DERIVED_FILE_DIR, literal: Path.root.join("tmp/output/obj/DerivedFiles").str)
         table.push(BuiltinMacros.SWIFT_OBJC_INTERFACE_HEADER_NAME, literal: "App1-Swift.h")
         table.push(BuiltinMacros.SWIFT_INSTALL_OBJC_HEADER, literal: true)
-        table.push(BuiltinMacros.SWIFT_RESPONSE_FILE_PATH,  core.specRegistry.internalMacroNamespace.parseString("$(PER_ARCH_OBJECT_FILE_DIR)/$(TARGET_NAME).SwiftFileList"))
+        table.push(BuiltinMacros.SWIFT_RESPONSE_FILE_PATH, core.specRegistry.internalMacroNamespace.parseString("$(PER_ARCH_OBJECT_FILE_DIR)/$(TARGET_NAME).SwiftFileList"))
         table.push(BuiltinMacros.SWIFT_INSTALL_MODULE, literal: true)
         table.push(BuiltinMacros.SWIFT_INSTALL_MODULE_FOR_DEPLOYMENT, literal: true)
         table.push(BuiltinMacros.SWIFT_ENABLE_EMIT_CONST_VALUES, literal: true)
@@ -244,8 +244,7 @@ import SWBMacro
             var additionalCommandLineArgs = [String]()
             if let swiftABIVersion = await (swiftSpec.discoveredCommandLineToolSpecInfo(producer, mockScope, delegate) as? DiscoveredSwiftCompilerToolSpecInfo)?.swiftABIVersion {
                 additionalCommandLineArgs += ["-Xlinker", "-rpath", "-Xlinker", "/usr/lib/swift-\(swiftABIVersion)"]
-            }
-            else {
+            } else {
                 additionalCommandLineArgs += ["-Xlinker", "-rpath", "-Xlinker", "/usr/lib/swift"]
             }
 
@@ -259,7 +258,7 @@ import SWBMacro
                 .path("/tmp/one.swift"),
                 .path("/tmp/two.swift"),
                 .path("/tmp/output/obj-normal/x86_64/App1.SwiftFileList"),
-                .path("/tmp/output/obj-normal/x86_64/App1-OutputFileMap.json")
+                .path("/tmp/output/obj-normal/x86_64/App1-OutputFileMap.json"),
             ])
             task.checkOutputs([
                 .path("/tmp/output/obj-normal/x86_64/one.o"),
@@ -270,7 +269,7 @@ import SWBMacro
                 .path("/tmp/output/obj-normal/x86_64/App1.swiftsourceinfo"),
                 .path("/tmp/output/obj-normal/x86_64/App1.abi.json"),
                 .path("/tmp/output/obj-normal/x86_64/App1-Swift.h"),
-                .path("/tmp/output/obj-normal/x86_64/App1.swiftdoc")
+                .path("/tmp/output/obj-normal/x86_64/App1.swiftdoc"),
             ])
         }
 
@@ -358,7 +357,7 @@ import SWBMacro
         table.push(BuiltinMacros.DERIVED_FILE_DIR, literal: "/tmp/output/obj/DerivedFiles")
         table.push(BuiltinMacros.SWIFT_OBJC_INTERFACE_HEADER_NAME, literal: "App1-Swift.h")
         table.push(BuiltinMacros.SWIFT_INSTALL_OBJC_HEADER, literal: true)
-        table.push(BuiltinMacros.SWIFT_RESPONSE_FILE_PATH,  core.specRegistry.internalMacroNamespace.parseString("$(PER_ARCH_OBJECT_FILE_DIR)/$(TARGET_NAME).SwiftFileList"))
+        table.push(BuiltinMacros.SWIFT_RESPONSE_FILE_PATH, core.specRegistry.internalMacroNamespace.parseString("$(PER_ARCH_OBJECT_FILE_DIR)/$(TARGET_NAME).SwiftFileList"))
         table.push(BuiltinMacros.SWIFT_INSTALL_MODULE, literal: true)
         table.push(BuiltinMacros.SWIFT_INSTALL_MODULE_FOR_DEPLOYMENT, literal: true)
         table.push(BuiltinMacros.SWIFT_USE_INTEGRATED_DRIVER, literal: true)
@@ -403,8 +402,7 @@ import SWBMacro
             var additionalCommandLineArgs = [String]()
             if let swiftABIVersion = await (swiftSpec.discoveredCommandLineToolSpecInfo(producer, mockScope, delegate) as? DiscoveredSwiftCompilerToolSpecInfo)?.swiftABIVersion {
                 additionalCommandLineArgs += ["-Xlinker", "-rpath", "-Xlinker", "/usr/lib/swift-\(swiftABIVersion)"]
-            }
-            else {
+            } else {
                 additionalCommandLineArgs += ["-Xlinker", "-rpath", "-Xlinker", "/usr/lib/swift"]
             }
 
@@ -422,7 +420,7 @@ import SWBMacro
                 .path("/tmp/output/obj-normal/x86_64/App1.swiftsourceinfo"),
                 .path("/tmp/output/obj-normal/x86_64/App1.abi.json"),
                 .path("/tmp/output/obj-normal/x86_64/App1-Swift.h"),
-                .path("/tmp/output/obj-normal/x86_64/App1.swiftdoc")
+                .path("/tmp/output/obj-normal/x86_64/App1.swiftdoc"),
             ])
         }
 
@@ -435,8 +433,7 @@ import SWBMacro
             var additionalCommandLineArgs = [String]()
             if let swiftABIVersion = await (swiftSpec.discoveredCommandLineToolSpecInfo(producer, mockScope, delegate) as? DiscoveredSwiftCompilerToolSpecInfo)?.swiftABIVersion {
                 additionalCommandLineArgs += ["-Xlinker", "-rpath", "-Xlinker", "/usr/lib/swift-\(swiftABIVersion)"]
-            }
-            else {
+            } else {
                 additionalCommandLineArgs += ["-Xlinker", "-rpath", "-Xlinker", "/usr/lib/swift"]
             }
 
@@ -567,8 +564,7 @@ import SWBMacro
             var additionalCommandLineArgs = [String]()
             if let swiftABIVersion = await (swiftSpec.discoveredCommandLineToolSpecInfo(producer, mockScope, delegate) as? DiscoveredSwiftCompilerToolSpecInfo)?.swiftABIVersion {
                 additionalCommandLineArgs += ["-Xlinker", "-rpath", "-Xlinker", "/usr/lib/swift-\(swiftABIVersion)"]
-            }
-            else {
+            } else {
                 additionalCommandLineArgs += ["-Xlinker", "-rpath", "-Xlinker", "/usr/lib/swift"]
             }
 
@@ -581,7 +577,7 @@ import SWBMacro
             task.checkInputs([
                 .path("/tmp/one.swift"),
                 .path("/tmp/two.swift"),
-                .path("/tmp/output/obj-normal/x86_64/App1-OutputFileMap.json")
+                .path("/tmp/output/obj-normal/x86_64/App1-OutputFileMap.json"),
             ])
             task.checkOutputs([
                 .path("/tmp/output/obj-normal/x86_64/one.o"),
@@ -592,7 +588,7 @@ import SWBMacro
                 .path("/tmp/output/obj-normal/x86_64/App1.swiftsourceinfo"),
                 .path("/tmp/output/obj-normal/x86_64/App1.abi.json"),
                 .path("/tmp/output/obj-normal/x86_64/App1-Swift.h"),
-                .path("/tmp/output/obj-normal/x86_64/App1.swiftdoc")
+                .path("/tmp/output/obj-normal/x86_64/App1.swiftdoc"),
             ])
         }
     }
@@ -612,7 +608,7 @@ import SWBMacro
         table.push(BuiltinMacros.BUILT_PRODUCTS_DIR, literal: Path.root.join("build").str)
         table.push(BuiltinMacros.PER_ARCH_OBJECT_FILE_DIR, literal: Path.root.join("build/objects").str)
         table.push(BuiltinMacros.SWIFT_MODULE_NAME, literal: "MyModule")
-        table.push(BuiltinMacros.SWIFT_RESPONSE_FILE_PATH,  core.specRegistry.internalMacroNamespace.parseString("$(PER_ARCH_OBJECT_FILE_DIR)/$(TARGET_NAME).SwiftFileList"))
+        table.push(BuiltinMacros.SWIFT_RESPONSE_FILE_PATH, core.specRegistry.internalMacroNamespace.parseString("$(PER_ARCH_OBJECT_FILE_DIR)/$(TARGET_NAME).SwiftFileList"))
 
         // remove in rdar://53000820
         table.push(BuiltinMacros.USE_SWIFT_RESPONSE_FILE, literal: true)
@@ -828,7 +824,7 @@ import SWBMacro
             task.checkCommandLine(["clang", "-x", "c", "-target", "x86_64-apple-macos13.0", "-fmessage-length=0", "-fdiagnostics-show-note-include-stack", "-fmacro-backtrace-limit=0", "-fno-color-diagnostics", "-fmodules", "-fmodules-prune-interval=86400", "-fmodules-prune-after=345600", "-fmodules-ignore-macro=defn1", "-fmodules-ignore-macro=defn2", "-Wnon-modular-include-in-framework-module", "-Werror=non-modular-include-in-framework-module", "-Wno-trigraphs", "-fpascal-strings", "-Os", "-Wno-missing-field-initializers", "-Wno-missing-prototypes", "-Wno-return-type", "-Wno-missing-braces", "-Wparentheses", "-Wswitch", "-Wno-unused-function", "-Wno-unused-label", "-Wno-unused-parameter", "-Wno-unused-variable", "-Wunused-value", "-Wno-empty-body", "-Wno-uninitialized", "-Wno-unknown-pragmas", "-Wno-shadow", "-Wno-four-char-constants", "-Wno-conversion", "-Wno-constant-conversion", "-Wno-int-conversion", "-Wno-bool-conversion", "-Wno-enum-conversion", "-Wno-shorten-64-to-32", "-Wpointer-sign", "-Wno-newline-eof", "-fasm-blocks", "-fstrict-aliasing", "-Wdeprecated-declarations", "-Wno-sign-conversion", "-Wno-infinite-recursion", "-Wno-semicolon-before-method-body", "-iquote", Path.root.join("tmp/Product-generated-files.hmap").str, "-I\(Path.root.join("tmp/Product-own-target-headers.hmap").str)", "-I\(Path.root.join("tmp/Product-all-non-framework-target-headers.hmap").str)", "-ivfsoverlay", "/--VFS/all-product-headers.yaml", "-iquote", Path.root.join("tmp/Product-project-headers.hmap").str, "-I\(Path.root.join("tmp/product/type/specific/header/search/path").str)", "-I\(Path.root.join("tmp/derived-normal/x86_64").str)", "-I\(Path.root.join("tmp/derived/x86_64").str)", "-I\(Path.root.join("tmp/derived").str)", "-DX86.64", "-iframework", Path.root.join("tmp/product/type/specific/framework/search/path").str, "-DFrom_GLOBAL_CFLAGS", "-DFrom_OTHER_CFLAGS_normal", "-include", Path.root.join("tmp/prefix.h").str, "-Ddefn1", "-Ddefn2", "-DFrom_GCC_OTHER_CFLAGS_NOT_USED_IN_PRECOMPS", "-MMD", "-MT", "dependencies", "-MF", Path.root.join("tmp/output/obj-normal/x86_64/input.d").str, "--serialize-diagnostics", Path.root.join("tmp/output/obj-normal/x86_64/input.dia").str, "-c", Path.root.join("tmp/input.c").str, "-o", Path.root.join("tmp/output/obj-normal/x86_64/input.o").str])
             task.checkInputs([
                 .path(Path.root.join("tmp/prefix.h").str),
-                .path(Path.root.join("tmp/input.c").str)
+                .path(Path.root.join("tmp/input.c").str),
             ])
             task.checkOutputs([
                 .path(Path.root.join("tmp/output/obj-normal/x86_64/input.o").str)
@@ -848,7 +844,7 @@ import SWBMacro
             task.checkCommandLine(["clang", "-x", "c", "-target", "x86_64-apple-macos13.0", "-fmessage-length=0", "-fdiagnostics-show-note-include-stack", "-fmacro-backtrace-limit=0", "-fno-color-diagnostics", "-fmodules", "-fmodules-prune-interval=86400", "-fmodules-prune-after=345600", "-fmodules-ignore-macro=defn1", "-fmodules-ignore-macro=defn2", "-Wnon-modular-include-in-framework-module", "-Werror=non-modular-include-in-framework-module", "-Wno-trigraphs", "-fpascal-strings", "-Os", "-Wno-missing-field-initializers", "-Wno-missing-prototypes", "-Wno-return-type", "-Wno-missing-braces", "-Wparentheses", "-Wswitch", "-Wno-unused-function", "-Wno-unused-label", "-Wno-unused-parameter", "-Wno-unused-variable", "-Wunused-value", "-Wno-empty-body", "-Wno-uninitialized", "-Wno-unknown-pragmas", "-Wno-shadow", "-Wno-four-char-constants", "-Wno-conversion", "-Wno-constant-conversion", "-Wno-int-conversion", "-Wno-bool-conversion", "-Wno-enum-conversion", "-Wno-shorten-64-to-32", "-Wpointer-sign", "-Wno-newline-eof", "-fasm-blocks", "-fstrict-aliasing", "-Wdeprecated-declarations", "-Wno-sign-conversion", "-Wno-infinite-recursion", "-Wno-semicolon-before-method-body", "-iquote", Path.root.join("tmp/Product-generated-files.hmap").str, "-I\(Path.root.join("tmp/Product-own-target-headers.hmap").str)", "-I\(Path.root.join("tmp/Product-all-non-framework-target-headers.hmap").str)", "-ivfsoverlay", "/--VFS/all-product-headers.yaml", "-iquote", Path.root.join("tmp/Product-project-headers.hmap").str, "-I\(Path.root.join("tmp/product/type/specific/header/search/path").str)", "-DX86.64", "-iframework", Path.root.join("tmp/product/type/specific/framework/search/path").str, "-DFrom_GLOBAL_CFLAGS", "-DFrom_OTHER_CFLAGS_normal", "-include", Path.root.join("tmp/prefix.h").str, "-Ddefn1", "-Ddefn2", "-DFrom_GCC_OTHER_CFLAGS_NOT_USED_IN_PRECOMPS", "-MMD", "-MT", "dependencies", "-MF", Path.root.join("tmp/output/obj-normal/x86_64/input.d").str, "--serialize-diagnostics", Path.root.join("tmp/output/obj-normal/x86_64/input.dia").str, "-c", Path.root.join("tmp/input.c").str, "-o", Path.root.join("tmp/output/obj-normal/x86_64/input.o").str])
             task.checkInputs([
                 .path(Path.root.join("tmp/prefix.h").str),
-                .path(Path.root.join("tmp/input.c").str)
+                .path(Path.root.join("tmp/input.c").str),
             ])
             task.checkOutputs([
                 .path(Path.root.join("tmp/output/obj-normal/x86_64/input.o").str)
@@ -926,35 +922,37 @@ import SWBMacro
         let pchHash: String
         if core.hostOperatingSystem == .windows {
             // non-constant on Windows because Path.root may evaluate to any drive letter
-            pchHash = String(ClangCompilerSpec.sharedPrecompiledHeaderSharingIdentifier(commandLine: [
-                "clang.exe",
-                "-x",
-                "c",
-                "-target",
-                "x86_64-apple-macos13.0",
-                "-fmodules",
-                "-fpascal-strings",
-                "-Os",
-                "-fasm-blocks",
-                "-iquote",
-                Path.root.join("tmp/Product-generated-files.hmap").str,
-                "-I\(Path.root.join("tmp/Product-own-target-headers.hmap").str)",
-                "-I\(Path.root.join("tmp/Product-all-non-framework-target-headers.hmap").str)",
-                "-ivfsoverlay",
-                "\\--VFS\\all-product-headers.yaml",
-                "-iquote",
-                Path.root.join("tmp/Product-project-headers.hmap").str,
-                "-I\(Path.root.join("tmp/derived-normal/x86_64").str)",
-                "-I\(Path.root.join("tmp/derived/x86_64").str)",
-                "-I\(Path.root.join("tmp/derived").str)",
-                Path.root.join("tmp/prefix.h").str,
-            ]).hashValue)
+            pchHash = String(
+                ClangCompilerSpec.sharedPrecompiledHeaderSharingIdentifier(commandLine: [
+                    "clang.exe",
+                    "-x",
+                    "c",
+                    "-target",
+                    "x86_64-apple-macos13.0",
+                    "-fmodules",
+                    "-fpascal-strings",
+                    "-Os",
+                    "-fasm-blocks",
+                    "-iquote",
+                    Path.root.join("tmp/Product-generated-files.hmap").str,
+                    "-I\(Path.root.join("tmp/Product-own-target-headers.hmap").str)",
+                    "-I\(Path.root.join("tmp/Product-all-non-framework-target-headers.hmap").str)",
+                    "-ivfsoverlay",
+                    "\\--VFS\\all-product-headers.yaml",
+                    "-iquote",
+                    Path.root.join("tmp/Product-project-headers.hmap").str,
+                    "-I\(Path.root.join("tmp/derived-normal/x86_64").str)",
+                    "-I\(Path.root.join("tmp/derived/x86_64").str)",
+                    "-I\(Path.root.join("tmp/derived").str)",
+                    Path.root.join("tmp/prefix.h").str,
+                ]).hashValue
+            )
         } else {
             pchHash = "1041705040740768206"
         }
 
         // Check the precompilation task
-        let precompileTask = delegate.shellTasks.first{ $0.ruleInfo.first! == "ProcessPCH" }!
+        let precompileTask = delegate.shellTasks.first { $0.ruleInfo.first! == "ProcessPCH" }!
         precompileTask.checkCommandLine([core.hostOperatingSystem.imageFormat.executableName(basename: "clang"), "-x", "c-header", "-target", "x86_64-apple-macos13.0", "-fmessage-length=0", "-fdiagnostics-show-note-include-stack", "-fmacro-backtrace-limit=0", "-fno-color-diagnostics", "-fmodules", "-fmodules-prune-interval=86400", "-fmodules-prune-after=345600", "-Wnon-modular-include-in-framework-module", "-Werror=non-modular-include-in-framework-module", "-Wno-trigraphs", "-fpascal-strings", "-Os", "-Wno-missing-field-initializers", "-Wno-missing-prototypes", "-Wno-return-type", "-Wno-missing-braces", "-Wparentheses", "-Wswitch", "-Wno-unused-function", "-Wno-unused-label", "-Wno-unused-parameter", "-Wno-unused-variable", "-Wunused-value", "-Wno-empty-body", "-Wno-uninitialized", "-Wno-unknown-pragmas", "-Wno-shadow", "-Wno-four-char-constants", "-Wno-conversion", "-Wno-constant-conversion", "-Wno-int-conversion", "-Wno-bool-conversion", "-Wno-enum-conversion", "-Wno-shorten-64-to-32", "-Wpointer-sign", "-Wno-newline-eof", "-Wno-implicit-fallthrough", "-fasm-blocks", "-fstrict-aliasing", "-Wdeprecated-declarations", "-Wno-sign-conversion", "-Wno-infinite-recursion", "-Wno-semicolon-before-method-body", "-iquote", Path.root.join("tmp/Product-generated-files.hmap").str, "-I\(Path.root.join("tmp/Product-own-target-headers.hmap").str)", "-I\(Path.root.join("tmp/Product-all-non-framework-target-headers.hmap").str)", "-ivfsoverlay", Path("/--VFS/all-product-headers.yaml").str, "-iquote", Path.root.join("tmp/Product-project-headers.hmap").str, "-I\(Path.root.join("tmp/derived-normal/x86_64").str)", "-I\(Path.root.join("tmp/derived/x86_64").str)", "-I\(Path.root.join("tmp/derived").str)", "-c", Path.root.join("tmp/prefix.h").str, "-MD", "-MT", "dependencies", "-MF", "\(Path.root.join("tmp/precomps/SharedPrecompiledHeaders/\(pchHash)/prefix.h.d").str)", "-o", "\(Path.root.join("tmp/precomps/SharedPrecompiledHeaders/\(pchHash)/prefix.h.gch").str)", "--serialize-diagnostics", "\(Path.root.join("tmp/precomps/SharedPrecompiledHeaders/\(pchHash)/prefix.h.dia").str)"])
         #expect(precompileTask.ruleInfo == ["ProcessPCH", Path.root.join("tmp/precomps/SharedPrecompiledHeaders/\(pchHash)/prefix.h.gch").str, Path.root.join("tmp/prefix.h").str, "normal", "x86_64", "c", "com.apple.compilers.llvm.clang.1_0"])
         #expect(precompileTask.execDescription == "Precompile prefix.h (x86_64)")
@@ -969,14 +967,14 @@ import SWBMacro
 
         // Check the compile tasks
         for compileTaskIndex in 0..<numCompileTasks {
-            let compileTask = delegate.shellTasks.first{ $0.ruleInfo.first! == "CompileC" && $0.inputs.contains{ $0.path.basename == "input-\(compileTaskIndex).c" } }!
+            let compileTask = delegate.shellTasks.first { $0.ruleInfo.first! == "CompileC" && $0.inputs.contains { $0.path.basename == "input-\(compileTaskIndex).c" } }!
             #expect(compileTask.ruleInfo == ["CompileC", Path.root.join("tmp/output/obj-normal/x86_64/input-\(compileTaskIndex).o").str, Path.root.join("tmp/input-\(compileTaskIndex).c").str, "normal", "x86_64", "c", "com.apple.compilers.llvm.clang.1_0"])
             #expect(compileTask.execDescription == "Compile input-\(compileTaskIndex).c (x86_64)")
 
             compileTask.checkCommandLine([core.hostOperatingSystem.imageFormat.executableName(basename: "clang"), "-x", "c", "-target", "x86_64-apple-macos13.0", "-fmessage-length=0", "-fdiagnostics-show-note-include-stack", "-fmacro-backtrace-limit=0", "-fno-color-diagnostics", "-fmodules", "-fmodules-prune-interval=86400", "-fmodules-prune-after=345600", "-Wnon-modular-include-in-framework-module", "-Werror=non-modular-include-in-framework-module", "-Wno-trigraphs", "-fpascal-strings", "-Os", "-Wno-missing-field-initializers", "-Wno-missing-prototypes", "-Wno-return-type", "-Wno-missing-braces", "-Wparentheses", "-Wswitch", "-Wno-unused-function", "-Wno-unused-label", "-Wno-unused-parameter", "-Wno-unused-variable", "-Wunused-value", "-Wno-empty-body", "-Wno-uninitialized", "-Wno-unknown-pragmas", "-Wno-shadow", "-Wno-four-char-constants", "-Wno-conversion", "-Wno-constant-conversion", "-Wno-int-conversion", "-Wno-bool-conversion", "-Wno-enum-conversion", "-Wno-shorten-64-to-32", "-Wpointer-sign", "-Wno-newline-eof", "-Wno-implicit-fallthrough", "-fasm-blocks", "-fstrict-aliasing", "-Wdeprecated-declarations", "-Wno-sign-conversion", "-Wno-infinite-recursion", "-Wno-semicolon-before-method-body", "-iquote", Path.root.join("tmp/Product-generated-files.hmap").str, "-I\(Path.root.join("tmp/Product-own-target-headers.hmap").str)", "-I\(Path.root.join("tmp/Product-all-non-framework-target-headers.hmap").str)", "-ivfsoverlay", Path("/--VFS/all-product-headers.yaml").str, "-iquote", Path.root.join("tmp/Product-project-headers.hmap").str, "-I\(Path.root.join("tmp/derived-normal/x86_64").str)", "-I\(Path.root.join("tmp/derived/x86_64").str)", "-I\(Path.root.join("tmp/derived").str)", "-include", "\(Path.root.join("tmp/precomps/SharedPrecompiledHeaders/\(pchHash)/prefix.h").str)", "-MMD", "-MT", "dependencies", "-MF", "\(Path.root.join("tmp/output/obj-normal/x86_64/input-\(compileTaskIndex).d").str)", "--serialize-diagnostics", "\(Path.root.join("tmp/output/obj-normal/x86_64/input-\(compileTaskIndex).dia").str)", "-c", "\(Path.root.join("tmp/input-\(compileTaskIndex).c").str)", "-o", "\(Path.root.join("tmp/output/obj-normal/x86_64/input-\(compileTaskIndex).o").str)"])
             compileTask.checkInputs([
                 .path(Path.root.join("tmp/precomps/SharedPrecompiledHeaders/\(pchHash)/prefix.h.gch").str),
-                .path(Path.root.join("tmp/input-\(compileTaskIndex).c").str)
+                .path(Path.root.join("tmp/input-\(compileTaskIndex).c").str),
             ])
             compileTask.checkOutputs([
                 .path(Path.root.join("tmp/output/obj-normal/x86_64/input-\(compileTaskIndex).o").str)
@@ -1017,8 +1015,12 @@ import SWBMacro
         table.push(BuiltinMacros.CLANG_USE_RESPONSE_FILE, literal: false)
 
         /// Utility method to create a task and pass it to a checker block.
-        func createTask(with table: MacroValueAssignmentTable, spec: String, _ checkTask: ((inout PlannedTaskBuilder) -> Void),
-                        sourceLocation: SourceLocation = #_sourceLocation) async throws {
+        func createTask(
+            with table: MacroValueAssignmentTable,
+            spec: String,
+            _ checkTask: ((inout PlannedTaskBuilder) -> Void),
+            sourceLocation: SourceLocation = #_sourceLocation
+        ) async throws {
             // Create the delegate, scope, file type, etc.
             let producer = try MockCommandProducer(core: core, productTypeIdentifier: "com.apple.product-type.framework", platform: "macosx")
             let delegate = try CapturingTaskGenerationDelegate(producer: producer, userPreferences: .defaultForTesting)
@@ -1107,8 +1109,13 @@ import SWBMacro
         table.push(BuiltinMacros.CLANG_USE_RESPONSE_FILE, literal: false)
 
         /// Utility method to create a task and pass it to a checker block.
-        func createTask(with table: MacroValueAssignmentTable, cxxLangMode: String , spec: String, _ checkTask: ((inout PlannedTaskBuilder) -> Void),
-                        sourceLocation: SourceLocation = #_sourceLocation) async throws {
+        func createTask(
+            with table: MacroValueAssignmentTable,
+            cxxLangMode: String,
+            spec: String,
+            _ checkTask: ((inout PlannedTaskBuilder) -> Void),
+            sourceLocation: SourceLocation = #_sourceLocation
+        ) async throws {
             var configTable = table
             configTable.push(BuiltinMacros.CLANG_CXX_LANGUAGE_STANDARD, literal: cxxLangMode)
             // Create the delegate, scope, file type, etc.
@@ -1178,10 +1185,8 @@ import SWBMacro
             }
         }
 
-
     }
 
-
     /// Check that C_COMPILER_LAUNCHER is honored.
     @Test(.skipHostOS(.windows, "output file is coming out as tmp\\input.o (non-absolute)"))
     func cCompilerLauncher() async throws {
@@ -1259,7 +1264,7 @@ import SWBMacro
             ".c": try core.specRegistry.getSpec("sourcecode.c.c") as FileTypeSpec,
             ".cpp": try core.specRegistry.getSpec("sourcecode.cpp.cpp") as FileTypeSpec,
             ".m": try core.specRegistry.getSpec("sourcecode.c.objc") as FileTypeSpec,
-            ".mm": try core.specRegistry.getSpec("sourcecode.cpp.objcpp") as FileTypeSpec
+            ".mm": try core.specRegistry.getSpec("sourcecode.cpp.objcpp") as FileTypeSpec,
         ]
 
         // Check with just CC.
@@ -1388,7 +1393,8 @@ import SWBMacro
             "-lbar_normal_search", "-Xlinker", "-reexport-lbar_reexport_search", "-Xlinker", "-merge-lbar_merge_search", "-Xlinker", "-no_merge-lbar_reexport_merge_search", "-weak-lbar_weak_search", Path.root.join("usr/lib/libbar_normal_abs.dylib").str, "-Xlinker", "-reexport_library", "-Xlinker", Path.root.join("usr/lib/libbar_reexport_abs.dylib").str, "-Xlinker", "-merge_library", "-Xlinker", Path.root.join("usr/lib/libbar_merge_abs.dylib").str, "-Xlinker", "-no_merge_library", "-Xlinker", Path.root.join("usr/lib/libbar_reexport_merge_abs.dylib").str, "-weak_library", Path.root.join("usr/lib/libbar_weak_abs.dylib").str,
             "-lbaz_normal_search", "-lbaz_reexport_search", "-lbaz_merge_search", "-lbaz_reexport_merge_search", "-weak-lbaz_weak_search", Path.root.join("usr/lib/libbaz_normal_abs.tbd").str, Path.root.join("usr/lib/libbaz_reexport_abs.tbd").str, Path.root.join("usr/lib/libbaz_merge_abs.tbd").str, Path.root.join("usr/lib/libbaz_reexport_merge_abs.tbd").str, "-weak_library", Path.root.join("usr/lib/libbaz_weak_abs.tbd").str,
             "-framework", "Foo_normal_search", "-Xlinker", "-reexport_framework", "-Xlinker", "Foo_reexport_search", "-Xlinker", "-merge_framework", "-Xlinker", "Foo_merge_search", "-Xlinker", "-no_merge_framework", "-Xlinker", "Foo_reexport_merge_search", "-weak_framework", "Foo_weak_search", Path.root.join("tmp/Foo_normal_abs.framework/Foo_normal_abs").str, "-Xlinker", "-reexport_library", "-Xlinker", Path.root.join("tmp/Foo_reexport_abs.framework/Foo_reexport_abs").str, "-Xlinker", "-merge_library", "-Xlinker", Path.root.join("tmp/Foo_merge_abs.framework/Foo_merge_abs").str, "-Xlinker", "-no_merge_library", "-Xlinker", Path.root.join("tmp/Foo_reexport_merge_abs.framework/Foo_reexport_merge_abs").str, "-weak_library", Path.root.join("tmp/Foo_weak_abs.framework/Foo_weak_abs").str,
-            "-o", Path.root.join("tmp/obj/normal/x86_64/output").str])
+            "-o", Path.root.join("tmp/obj/normal/x86_64/output").str,
+        ])
         // FIXME: The input here should really be the link file list.
         if SWBFeatureFlag.enableLinkerInputsFromLibrarySpecifiers.value {
             task.checkInputs([
@@ -1626,12 +1632,13 @@ import SWBMacro
             "-lfoo1", "-lfoo2", Path.root.join("usr/lib/libfoo3.a").str, Path.root.join("usr/lib/libfoo4.a").str,
             // dylibs are not passed
             // tbd files are not passed
-            "-o", Path.root.join("tmp/obj/normal/x86_64/output").str])
+            "-o", Path.root.join("tmp/obj/normal/x86_64/output").str,
+        ])
         // FIXME: The input here should really be the link file list.
         task.checkInputs([
             .path(Path.root.join("tmp/obj/normal/x86_64/file1.o").str),
             .path(Path.root.join("usr/lib/libfoo3.a").str),
-            .path(Path.root.join("usr/lib/libfoo4.a").str)
+            .path(Path.root.join("usr/lib/libfoo4.a").str),
         ])
         task.checkOutputs([
             .path(Path.root.join("tmp/obj/normal/x86_64/output").str)
@@ -1667,28 +1674,40 @@ import SWBMacro
         }
 
         // Check with just LD.
-        for (name, expected) in [("file.c", core.hostOperatingSystem.imageFormat.executableName(basename:"SomeCLinker")), ("file.cpp", core.hostOperatingSystem.imageFormat.executableName(basename:"clang++"))] {
-            try await check(name: name, expectedLinker: expected, macros: [
-                BuiltinMacros.LD: "SomeCLinker"
-                // NOTE: One wonders whether this shouldn't change the C++ linker.
-            ])
+        for (name, expected) in [("file.c", core.hostOperatingSystem.imageFormat.executableName(basename: "SomeCLinker")), ("file.cpp", core.hostOperatingSystem.imageFormat.executableName(basename: "clang++"))] {
+            try await check(
+                name: name,
+                expectedLinker: expected,
+                macros: [
+                    BuiltinMacros.LD: "SomeCLinker"
+                        // NOTE: One wonders whether this shouldn't change the C++ linker.
+                ]
+            )
         }
 
         // Check with LD & LDPLUSPLUS.
-        for (name, expected) in [("file.c", core.hostOperatingSystem.imageFormat.executableName(basename:"SomeCLinker")), ("file.cpp", core.hostOperatingSystem.imageFormat.executableName(basename:"SomeC++Linker"))] {
-            try await check(name: name, expectedLinker: expected, macros: [
-                BuiltinMacros.LD: "SomeCLinker",
-                BuiltinMacros.LDPLUSPLUS: "SomeC++Linker"
-            ])
+        for (name, expected) in [("file.c", core.hostOperatingSystem.imageFormat.executableName(basename: "SomeCLinker")), ("file.cpp", core.hostOperatingSystem.imageFormat.executableName(basename: "SomeC++Linker"))] {
+            try await check(
+                name: name,
+                expectedLinker: expected,
+                macros: [
+                    BuiltinMacros.LD: "SomeCLinker",
+                    BuiltinMacros.LDPLUSPLUS: "SomeC++Linker",
+                ]
+            )
         }
 
         // Check with arch specific LD.
-        for (name, expected) in [("file.c", core.hostOperatingSystem.imageFormat.executableName(basename:"SomeCLinker_x86_64")), ("file.cpp", core.hostOperatingSystem.imageFormat.executableName(basename:"SomeC++Linker_x86_64"))] {
-            try await check(name: name, expectedLinker: expected, macros: [
-                BuiltinMacros.CURRENT_ARCH: "x86_64",
-                try core.specRegistry.internalMacroNamespace.declareStringMacro("LD_x86_64"): "SomeCLinker_x86_64",
-                try core.specRegistry.internalMacroNamespace.declareStringMacro("LDPLUSPLUS_x86_64"): "SomeC++Linker_x86_64"
-            ])
+        for (name, expected) in [("file.c", core.hostOperatingSystem.imageFormat.executableName(basename: "SomeCLinker_x86_64")), ("file.cpp", core.hostOperatingSystem.imageFormat.executableName(basename: "SomeC++Linker_x86_64"))] {
+            try await check(
+                name: name,
+                expectedLinker: expected,
+                macros: [
+                    BuiltinMacros.CURRENT_ARCH: "x86_64",
+                    try core.specRegistry.internalMacroNamespace.declareStringMacro("LD_x86_64"): "SomeCLinker_x86_64",
+                    try core.specRegistry.internalMacroNamespace.declareStringMacro("LDPLUSPLUS_x86_64"): "SomeC++Linker_x86_64",
+                ]
+            )
         }
     }
 
@@ -1728,8 +1747,7 @@ import SWBMacro
                 // For 'YES_THIN' there should be additional linker args.
                 #expect(delegate.shellTasks[safe: 0]?.commandLine.contains(.literal(ByteString(encodingAsUTF8: flag))) ?? false, "linker command line does not contain \(flag)")
                 // We're not checking the other stuff that's added by YES_THIN.
-            }
-            else {
+            } else {
                 // For all other values, there should not be additional linker args.
                 #expect((delegate.shellTasks[safe: 0]?.commandLine.contains(.literal(ByteString(encodingAsUTF8: flag))) ?? false) == false, "linker command line unexpectedly contains \(flag)")
             }
@@ -1979,28 +1997,52 @@ import SWBMacro
             try completion(prefixMaps)
         }
 
-        try await test(caching: false, prefixMapping: true, extraMaps: ["/a=/b"], completion: { args in
-            #expect(args == [])
-        })
-        try await test(caching: true, prefixMapping: false, extraMaps: ["/a=/b"], completion: { args in
-            #expect(args == [])
-        })
-        try await test(caching: true, prefixMapping: true, extraMaps: [], completion: { args in
-            #expect(args == [
-                "-fdepscan-prefix-map-sdk=/^sdk",
-                "-fdepscan-prefix-map-toolchain=/^toolchain",
-                "-fdepscan-prefix-map=/Xcode.app/Contents/Developer=/^xcode",
-            ])
-        })
-        try await test(caching: true, prefixMapping: true, extraMaps: ["/a=/b", "/c=/d"], completion: { args in
-            #expect(args == [
-                "-fdepscan-prefix-map-sdk=/^sdk",
-                "-fdepscan-prefix-map-toolchain=/^toolchain",
-                "-fdepscan-prefix-map=/Xcode.app/Contents/Developer=/^xcode",
-                "-fdepscan-prefix-map=/a=/b",
-                "-fdepscan-prefix-map=/c=/d",
-            ])
-        })
+        try await test(
+            caching: false,
+            prefixMapping: true,
+            extraMaps: ["/a=/b"],
+            completion: { args in
+                #expect(args == [])
+            }
+        )
+        try await test(
+            caching: true,
+            prefixMapping: false,
+            extraMaps: ["/a=/b"],
+            completion: { args in
+                #expect(args == [])
+            }
+        )
+        try await test(
+            caching: true,
+            prefixMapping: true,
+            extraMaps: [],
+            completion: { args in
+                #expect(
+                    args == [
+                        "-fdepscan-prefix-map-sdk=/^sdk",
+                        "-fdepscan-prefix-map-toolchain=/^toolchain",
+                        "-fdepscan-prefix-map=/Xcode.app/Contents/Developer=/^xcode",
+                    ]
+                )
+            }
+        )
+        try await test(
+            caching: true,
+            prefixMapping: true,
+            extraMaps: ["/a=/b", "/c=/d"],
+            completion: { args in
+                #expect(
+                    args == [
+                        "-fdepscan-prefix-map-sdk=/^sdk",
+                        "-fdepscan-prefix-map-toolchain=/^toolchain",
+                        "-fdepscan-prefix-map=/Xcode.app/Contents/Developer=/^xcode",
+                        "-fdepscan-prefix-map=/a=/b",
+                        "-fdepscan-prefix-map=/c=/d",
+                    ]
+                )
+            }
+        )
     }
 
     @Test
@@ -2025,7 +2067,7 @@ import SWBMacro
             table.push(BuiltinMacros.BUILT_PRODUCTS_DIR, literal: Path.root.join("build").str)
             table.push(BuiltinMacros.PER_ARCH_OBJECT_FILE_DIR, literal: Path.root.join("build/objects").str)
             table.push(BuiltinMacros.SWIFT_MODULE_NAME, literal: "MyModule")
-            table.push(BuiltinMacros.SWIFT_RESPONSE_FILE_PATH,  core.specRegistry.internalMacroNamespace.parseString("$(PER_ARCH_OBJECT_FILE_DIR)/$(TARGET_NAME).SwiftFileList"))
+            table.push(BuiltinMacros.SWIFT_RESPONSE_FILE_PATH, core.specRegistry.internalMacroNamespace.parseString("$(PER_ARCH_OBJECT_FILE_DIR)/$(TARGET_NAME).SwiftFileList"))
 
             // remove in rdar://53000820
             table.push(BuiltinMacros.USE_SWIFT_RESPONSE_FILE, literal: true)
@@ -2054,33 +2096,56 @@ import SWBMacro
             try completion(prefixMaps)
         }
 
-        try await test(caching: false, prefixMapping: true, extraMaps: ["/a=/b"], completion: { args in
-            #expect(args == [])
-        })
-        try await test(caching: true, prefixMapping: false, extraMaps: ["/a=/b"], completion: { args in
-            #expect(args == [])
-        })
-        try await test(caching: true, prefixMapping: true, extraMaps: [], completion: { args in
-            #expect(args == [
-                "-scanner-prefix-map-sdk", "/^sdk",
-                "-scanner-prefix-map-toolchain", "/^toolchain",
-                "-scanner-prefix-map", "/Xcode.app/Contents/Developer=/^xcode",
-            ])
-        })
-        try await test(caching: true, prefixMapping: true, extraMaps: ["/a=/b", "/c=/d"], completion: { args in
-            #expect(args == [
-                "-scanner-prefix-map-sdk", "/^sdk",
-                "-scanner-prefix-map-toolchain", "/^toolchain",
-                "-scanner-prefix-map", "/Xcode.app/Contents/Developer=/^xcode",
-                "-scanner-prefix-map", "/a=/b",
-                "-scanner-prefix-map", "/c=/d",
-            ])
-        })
+        try await test(
+            caching: false,
+            prefixMapping: true,
+            extraMaps: ["/a=/b"],
+            completion: { args in
+                #expect(args == [])
+            }
+        )
+        try await test(
+            caching: true,
+            prefixMapping: false,
+            extraMaps: ["/a=/b"],
+            completion: { args in
+                #expect(args == [])
+            }
+        )
+        try await test(
+            caching: true,
+            prefixMapping: true,
+            extraMaps: [],
+            completion: { args in
+                #expect(
+                    args == [
+                        "-scanner-prefix-map-sdk", "/^sdk",
+                        "-scanner-prefix-map-toolchain", "/^toolchain",
+                        "-scanner-prefix-map", "/Xcode.app/Contents/Developer=/^xcode",
+                    ]
+                )
+            }
+        )
+        try await test(
+            caching: true,
+            prefixMapping: true,
+            extraMaps: ["/a=/b", "/c=/d"],
+            completion: { args in
+                #expect(
+                    args == [
+                        "-scanner-prefix-map-sdk", "/^sdk",
+                        "-scanner-prefix-map-toolchain", "/^toolchain",
+                        "-scanner-prefix-map", "/Xcode.app/Contents/Developer=/^xcode",
+                        "-scanner-prefix-map", "/a=/b",
+                        "-scanner-prefix-map", "/c=/d",
+                    ]
+                )
+            }
+        )
     }
 
 }
 
-
 // MARK: CommandLineSpecSimulatedTests
 
 @Suite fileprivate struct CommandLineSpecSimulatedTests: CoreBasedTests {
@@ -2117,35 +2182,35 @@ import SWBMacro
                 "Name": "THING_RECENTLY_ADDED",
                 "Type": "Boolean",
                 "DefaultValue": "YES",
-                "SupportedVersionRanges": [ "9.0.0" ],
+                "SupportedVersionRanges": ["9.0.0"],
                 "CommandLineFlag": "-recently_added",
             ],
             [
                 "Name": "THING_JUST_ADDED",
                 "Type": "Boolean",
                 "DefaultValue": "YES",
-                "SupportedVersionRanges": [ "9.0.3" ],
+                "SupportedVersionRanges": ["9.0.3"],
                 "CommandLineFlag": "-just_added",
             ],
             [
                 "Name": "THING_NOT_YET_ADDED",
                 "Type": "Boolean",
                 "DefaultValue": "YES",
-                "SupportedVersionRanges": [ "9.2.0" ],
+                "SupportedVersionRanges": ["9.2.0"],
                 "CommandLineFlag": "-not_yet_added",
             ],
             [
                 "Name": "THING_RECENTLY_ADDED_RANGE",
                 "Type": "Boolean",
                 "DefaultValue": "YES",
-                "SupportedVersionRanges": [ ["9.0.2", "9.1.99"], "9.2.2" ],
+                "SupportedVersionRanges": [["9.0.2", "9.1.99"], "9.2.2"],
                 "CommandLineFlag": "-recently_added_range",
             ],
             [
                 "Name": "THING_NOT_YET_ADDED_RANGE",
                 "Type": "Boolean",
                 "DefaultValue": "YES",
-                "SupportedVersionRanges": [ ["9.1.2", "9.1.99"], "9.3.2" ],
+                "SupportedVersionRanges": [["9.1.2", "9.1.99"], "9.3.2"],
                 "CommandLineFlag": "-not_yet_added_range",
             ],
 
@@ -2161,7 +2226,7 @@ import SWBMacro
                 "Name": "THING_BEHIND_MULTIPLE_EXISTING_FLAGS",
                 "Type": "Boolean",
                 "DefaultValue": "YES",
-                "FeatureFlags": [ "test-feature", "test-feature-2" ],
+                "FeatureFlags": ["test-feature", "test-feature-2"],
                 "CommandLineFlag": "-feature2_exists",
             ],
             [
@@ -2175,7 +2240,7 @@ import SWBMacro
                 "Name": "THING_BEHIND_MISSING_FLAGS",
                 "Type": "Boolean",
                 "DefaultValue": "YES",
-                "FeatureFlags": [ "test-feature", "missing-test-feature" ],
+                "FeatureFlags": ["test-feature", "missing-test-feature"],
                 "CommandLineFlag": "-missing_features",
             ],
         ]
@@ -2190,14 +2255,14 @@ import SWBMacro
                 "CommandLine": "thing [options] [input] -o [output]",
                 "RuleName": "Thingify $(InputFile)",
                 "InputFileTypes": [
-                    "file.thing",
+                    "file.thing"
                 ],
                 "Outputs": [
                     "$(ProductResourcesDir)/$(InputFileBase).something",
-                    "$(UnlocalizedProductResourcesDir)/$(InputFileRegionPathComponent)$(InputFileBase).somethingelse"
+                    "$(UnlocalizedProductResourcesDir)/$(InputFileRegionPathComponent)$(InputFileBase).somethingelse",
                 ],
                 "SynthesizeBuildRule": "YES",
-                "Options": PropertyListItem(options)
+                "Options": PropertyListItem(options),
             ],
             // The input file type.
             [
@@ -2216,14 +2281,17 @@ import SWBMacro
         try await withTemporaryDirectory(fs: fs) { tmpDir in
             try await Self.writeTestData(to: tmpDir.path, fs: fs)
 
-            let core = try await Self.makeCore(registerExtraPlugins: { pluginManager in
-                struct TestPlugin: SpecificationsExtension {
-                    func specificationClasses() -> [any SpecIdentifierType.Type] {
-                        [ThingToolSpec.self]
+            let core = try await Self.makeCore(
+                registerExtraPlugins: { pluginManager in
+                    struct TestPlugin: SpecificationsExtension {
+                        func specificationClasses() -> [any SpecIdentifierType.Type] {
+                            [ThingToolSpec.self]
+                        }
                     }
-                }
-                pluginManager.register(TestPlugin(), type: SpecificationsExtensionPoint.self)
-            }, simulatedInferiorProductsPath: tmpDir.path)
+                    pluginManager.register(TestPlugin(), type: SpecificationsExtensionPoint.self)
+                },
+                simulatedInferiorProductsPath: tmpDir.path
+            )
 
             do {
                 // Get the tool spec.
@@ -2248,25 +2316,26 @@ import SWBMacro
                     return
                 }
                 #expect(task.ruleInfo == ["Thingify", Path.root.join("tmp/file.thing").str])
-                task.checkCommandLine([             "thing",
-                                                    // Options
-                                                    "-always",
-                                                    "-recently_added",
-                                                    "-just_added",
-                                                    "-recently_added_range",
-                                                    "-feature_exists",
-                                                    "-feature2_exists",
-                                                    // Inputs and outputs
-                                                    Path.root.join("tmp/file.thing").str,
-                                                    "-o",
-                                                    Path.root.join("tmp/dst/file.something").str,
-                                      ])
+                task.checkCommandLine([
+                    "thing",
+                    // Options
+                    "-always",
+                    "-recently_added",
+                    "-just_added",
+                    "-recently_added_range",
+                    "-feature_exists",
+                    "-feature2_exists",
+                    // Inputs and outputs
+                    Path.root.join("tmp/file.thing").str,
+                    "-o",
+                    Path.root.join("tmp/dst/file.something").str,
+                ])
                 task.checkInputs([
                     .path(Path.root.join("tmp/file.thing").str)
                 ])
                 task.checkOutputs([
                     .path(Path.root.join("tmp/dst/file.something").str),
-                    .path(Path.root.join("tmp/dst/file.somethingelse").str)
+                    .path(Path.root.join("tmp/dst/file.somethingelse").str),
                 ])
             }
 
@@ -2312,7 +2381,7 @@ import SWBMacro
                 ])
                 task.checkOutputs([
                     .path(Path.root.join("tmp/dst/en.lproj/file.something").str),
-                    .path(Path.root.join("tmp/dst/en.lproj/file.somethingelse").str)
+                    .path(Path.root.join("tmp/dst/en.lproj/file.somethingelse").str),
                 ])
             }
         }
diff --git a/Tests/SWBCoreTests/CommandLineToolSpecDiscoveredInfoTests.swift b/Tests/SWBCoreTests/CommandLineToolSpecDiscoveredInfoTests.swift
index 78129048..a6cff4cc 100644
--- a/Tests/SWBCoreTests/CommandLineToolSpecDiscoveredInfoTests.swift
+++ b/Tests/SWBCoreTests/CommandLineToolSpecDiscoveredInfoTests.swift
@@ -23,15 +23,15 @@ import SWBMacro
     func discoveredClangSpecInfo() async throws {
         try await withSpec("com.apple.compilers.llvm.clang.1_0", .deferred) { (info: DiscoveredClangToolSpecInfo) in
             #expect(!info.toolPath.isEmpty)
-#if canImport(Darwin)
-            #expect(info.clangVersion != nil)
-#endif
+            #if canImport(Darwin)
+                #expect(info.clangVersion != nil)
+            #endif
             if let clangVersion = info.clangVersion {
                 #expect(clangVersion > Version(0, 0, 0, 0))
             }
-#if canImport(Darwin)
-            #expect(info.llvmVersion != nil)
-#endif
+            #if canImport(Darwin)
+                #expect(info.llvmVersion != nil)
+            #endif
             if let llvmVersion = info.llvmVersion {
                 #expect(llvmVersion > Version(0, 0, 0))
             }
@@ -80,7 +80,7 @@ import SWBMacro
     func discoveredClangSpecInfoAcrossToolchains() async throws {
         let core = try await getCore()
         let toolchains = core.toolchainRegistry.toolchains
-        #expect(toolchains.count > 0) // must be at least one toolchain (default)
+        #expect(toolchains.count > 0)  // must be at least one toolchain (default)
         for toolchain in toolchains.sorted(by: \.identifier) {
             if toolchain.identifier == "qnx" {
                 // QNX toolchains do not have clang
@@ -91,17 +91,17 @@ import SWBMacro
             let info = try await discoveredClangToolInfo(toolPath: clangPath, arch: "undefined_arch", sysroot: nil)
             #expect(info.toolPath == clangPath)
 
-#if canImport(Darwin)
-            if toolchain.identifier.hasPrefix("org.swift.") || toolchain.identifier.hasPrefix("org.swiftwasm.") {
-                #expect(info.clangVersion == nil, "Open Source toolchains are expected to NOT have a clang version")
-            } else if toolchain.identifier == "android" {
-                #expect(info.clangVersion == nil, "Android toolchains are expected to NOT have a clang version")
-            } else {
-                #expect(info.clangVersion != nil, "Unable to find clang version for toolchain \(toolchain.identifier). Used clang at path \(clangPath.str).")
-            }
+            #if canImport(Darwin)
+                if toolchain.identifier.hasPrefix("org.swift.") || toolchain.identifier.hasPrefix("org.swiftwasm.") {
+                    #expect(info.clangVersion == nil, "Open Source toolchains are expected to NOT have a clang version")
+                } else if toolchain.identifier == "android" {
+                    #expect(info.clangVersion == nil, "Android toolchains are expected to NOT have a clang version")
+                } else {
+                    #expect(info.clangVersion != nil, "Unable to find clang version for toolchain \(toolchain.identifier). Used clang at path \(clangPath.str).")
+                }
 
-            #expect(info.llvmVersion != nil, "Unable to find llvm version for toolchain \(toolchain.identifier). Used clang at path \(clangPath.str).")
-#endif
+                #expect(info.llvmVersion != nil, "Unable to find llvm version for toolchain \(toolchain.identifier). Used clang at path \(clangPath.str).")
+            #endif
         }
     }
 
@@ -140,7 +140,7 @@ import SWBMacro
             #expect(info.swiftTag == "swiftlang-5.9.0.106.53 clang-1500.0.13.6")
         }
 
-        try await withSpec(SwiftCompilerSpec.self, .result(status: .exit(0), stdout: Data("Swift version 5.10.1 (swift-5.10.1-RELEASE)\nTarget: aarch64-unknown-linux-gnu\n".utf8), stderr: Data())) {  (info: DiscoveredSwiftCompilerToolSpecInfo) in
+        try await withSpec(SwiftCompilerSpec.self, .result(status: .exit(0), stdout: Data("Swift version 5.10.1 (swift-5.10.1-RELEASE)\nTarget: aarch64-unknown-linux-gnu\n".utf8), stderr: Data())) { (info: DiscoveredSwiftCompilerToolSpecInfo) in
             #expect(info.toolPath.basename == core.hostOperatingSystem.imageFormat.executableName(basename: "swiftc"))
             #expect(info.swiftVersion == Version(5, 10, 1))
             #expect(info.swiftTag == "swift-5.10.1-RELEASE")
@@ -159,9 +159,9 @@ import SWBMacro
     }
 
     // Linker tool discovery is a bit more complex as it afffected by the ALTERNATE_LINKER build setting.
-    func ldMacroTable() async throws ->  MacroValueAssignmentTable {
-            let core = try await getCore()
-            return MacroValueAssignmentTable(namespace: core.specRegistry.internalMacroNamespace)
+    func ldMacroTable() async throws -> MacroValueAssignmentTable {
+        let core = try await getCore()
+        return MacroValueAssignmentTable(namespace: core.specRegistry.internalMacroNamespace)
     }
 
     @Test
@@ -312,15 +312,19 @@ import SWBMacro
         }
     }
 
-    @Test(.skipHostOS(.windows)) // docc.exe is missing from the Swift toolchain distribution
+    @Test(.skipHostOS(.windows))  // docc.exe is missing from the Swift toolchain distribution
     func discoveredDoccSpecInfo() async throws {
         let core = try await getCore()
 
         // Once with the real tool
-        try await withSpec("com.apple.compilers.documentation", .deferred, { (info: DocumentationCompilerToolSpecInfo) in
-            #expect(info.toolPath.basename == core.hostOperatingSystem.imageFormat.executableName(basename: "docc"))
-            #expect(info.toolVersion == nil)
-            #expect(info.toolFeatures.has(.diagnosticsFile))
-        })
+        try await withSpec(
+            "com.apple.compilers.documentation",
+            .deferred,
+            { (info: DocumentationCompilerToolSpecInfo) in
+                #expect(info.toolPath.basename == core.hostOperatingSystem.imageFormat.executableName(basename: "docc"))
+                #expect(info.toolVersion == nil)
+                #expect(info.toolFeatures.has(.diagnosticsFile))
+            }
+        )
     }
 }
diff --git a/Tests/SWBCoreTests/CoreTests.swift b/Tests/SWBCoreTests/CoreTests.swift
index 35020f17..d72dd532 100644
--- a/Tests/SWBCoreTests/CoreTests.swift
+++ b/Tests/SWBCoreTests/CoreTests.swift
@@ -45,17 +45,20 @@ import SWBServiceCore
             let sdkCanonicalName = try #require(platform.sdkCanonicalName)
             let publicSDK = try #require(core.sdkRegistry.lookup(sdkCanonicalName))
             let macOSSDKVariant = try #require(publicSDK.defaultVariant)
-            #expect(macOSSDKVariant.deviceFamilies.list == [
-                .init(name: "mac", displayName: "Mac")
-            ])
+            #expect(
+                macOSSDKVariant.deviceFamilies.list == [
+                    .init(name: "mac", displayName: "Mac")
+                ]
+            )
 
             let macCatalystSDKVariant = try #require(publicSDK.variant(for: MacCatalystInfo.sdkVariantName))
-            #expect(macCatalystSDKVariant.deviceFamilies.list == [
-                .init(identifier: 2, name: "ipad", displayName: "iPad"),
-                .init(identifier: 6, name: "mac", displayName: "Mac")
-            ])
-        }
-        else {
+            #expect(
+                macCatalystSDKVariant.deviceFamilies.list == [
+                    .init(identifier: 2, name: "ipad", displayName: "iPad"),
+                    .init(identifier: 6, name: "mac", displayName: "Mac"),
+                ]
+            )
+        } else {
             Issue.record("did not load platform '\(identifier)'")
         }
     }
@@ -72,12 +75,13 @@ import SWBServiceCore
                 let sdkCanonicalName = try #require(platform.sdkCanonicalName)
                 let publicSDK = try #require(core.sdkRegistry.lookup(sdkCanonicalName))
                 let defaultVariant = try #require(publicSDK.defaultVariant)
-                #expect(defaultVariant.deviceFamilies.list == [
-                    .init(identifier: 1, name: "iphone", displayName: "iPhone"),
-                    .init(identifier: 2, name: "ipad", displayName: "iPad"),
-                ])
-            }
-            else {
+                #expect(
+                    defaultVariant.deviceFamilies.list == [
+                        .init(identifier: 1, name: "iphone", displayName: "iPhone"),
+                        .init(identifier: 2, name: "ipad", displayName: "iPad"),
+                    ]
+                )
+            } else {
                 Issue.record("did not load platform '\(identifier)'")
             }
         }
@@ -90,12 +94,13 @@ import SWBServiceCore
                 let sdkCanonicalName = try #require(platform.sdkCanonicalName)
                 let publicSDK = try #require(core.sdkRegistry.lookup(sdkCanonicalName))
                 let defaultVariant = try #require(publicSDK.defaultVariant)
-                #expect(defaultVariant.deviceFamilies.list == [
-                    DeviceFamily(identifier: 1, name: "iphone", displayName: "iPhone"),
-                    DeviceFamily(identifier: 2, name: "ipad", displayName: "iPad"),
-                ])
-            }
-            else {
+                #expect(
+                    defaultVariant.deviceFamilies.list == [
+                        DeviceFamily(identifier: 1, name: "iphone", displayName: "iPhone"),
+                        DeviceFamily(identifier: 2, name: "ipad", displayName: "iPad"),
+                    ]
+                )
+            } else {
                 Issue.record("did not load platform '\(identifier)'")
             }
         }
@@ -113,11 +118,12 @@ import SWBServiceCore
                 let sdkCanonicalName = try #require(platform.sdkCanonicalName)
                 let publicSDK = try #require(core.sdkRegistry.lookup(sdkCanonicalName))
                 let defaultVariant = try #require(publicSDK.defaultVariant)
-                #expect(defaultVariant.deviceFamilies.list == [
-                    DeviceFamily(identifier: 3, name: "tv", displayName: "Apple TV")
-                ])
-            }
-            else {
+                #expect(
+                    defaultVariant.deviceFamilies.list == [
+                        DeviceFamily(identifier: 3, name: "tv", displayName: "Apple TV")
+                    ]
+                )
+            } else {
                 Issue.record("did not load platform '\(identifier)'")
             }
         }
@@ -130,11 +136,12 @@ import SWBServiceCore
                 let sdkCanonicalName = try #require(platform.sdkCanonicalName)
                 let publicSDK = try #require(core.sdkRegistry.lookup(sdkCanonicalName))
                 let defaultVariant = try #require(publicSDK.defaultVariant)
-                #expect(defaultVariant.deviceFamilies.list == [
-                    DeviceFamily(identifier: 3, name: "tv", displayName: "Apple TV")
-                ])
-            }
-            else {
+                #expect(
+                    defaultVariant.deviceFamilies.list == [
+                        DeviceFamily(identifier: 3, name: "tv", displayName: "Apple TV")
+                    ]
+                )
+            } else {
                 Issue.record("did not load platform '\(identifier)'")
             }
         }
@@ -152,11 +159,12 @@ import SWBServiceCore
                 let sdkCanonicalName = try #require(platform.sdkCanonicalName)
                 let publicSDK = try #require(core.sdkRegistry.lookup(sdkCanonicalName))
                 let defaultVariant = try #require(publicSDK.defaultVariant)
-                #expect(defaultVariant.deviceFamilies.list == [
-                    DeviceFamily(identifier: 4, name: "watch", displayName: "Apple Watch")
-                ])
-            }
-            else {
+                #expect(
+                    defaultVariant.deviceFamilies.list == [
+                        DeviceFamily(identifier: 4, name: "watch", displayName: "Apple Watch")
+                    ]
+                )
+            } else {
                 Issue.record("did not load platform '\(identifier)'")
             }
         }
@@ -169,11 +177,12 @@ import SWBServiceCore
                 let sdkCanonicalName = try #require(platform.sdkCanonicalName)
                 let publicSDK = try #require(core.sdkRegistry.lookup(sdkCanonicalName))
                 let defaultVariant = try #require(publicSDK.defaultVariant)
-                #expect(defaultVariant.deviceFamilies.list == [
-                    DeviceFamily(identifier: 4, name: "watch", displayName: "Apple Watch")
-                ])
-            }
-            else {
+                #expect(
+                    defaultVariant.deviceFamilies.list == [
+                        DeviceFamily(identifier: 4, name: "watch", displayName: "Apple Watch")
+                    ]
+                )
+            } else {
                 Issue.record("did not load platform '\(identifier)'")
             }
         }
@@ -191,11 +200,12 @@ import SWBServiceCore
                 let sdkCanonicalName = try #require(platform.sdkCanonicalName)
                 let publicSDK = try #require(core.sdkRegistry.lookup(sdkCanonicalName))
                 let defaultVariant = try #require(publicSDK.defaultVariant)
-                #expect(defaultVariant.deviceFamilies.list == [
-                    DeviceFamily(identifier: 7, name: "vision", displayName: "Apple Vision")
-                ])
-            }
-            else {
+                #expect(
+                    defaultVariant.deviceFamilies.list == [
+                        DeviceFamily(identifier: 7, name: "vision", displayName: "Apple Vision")
+                    ]
+                )
+            } else {
                 Issue.record("did not load platform '\(identifier)'")
             }
         }
@@ -208,17 +218,17 @@ import SWBServiceCore
                 let sdkCanonicalName = try #require(platform.sdkCanonicalName)
                 let publicSDK = try #require(core.sdkRegistry.lookup(sdkCanonicalName))
                 let defaultVariant = try #require(publicSDK.defaultVariant)
-                #expect(defaultVariant.deviceFamilies.list == [
-                    DeviceFamily(identifier: 7, name: "vision", displayName: "Apple Vision")
-                ])
-            }
-            else {
+                #expect(
+                    defaultVariant.deviceFamilies.list == [
+                        DeviceFamily(identifier: 7, name: "vision", displayName: "Apple Vision")
+                    ]
+                )
+            } else {
                 Issue.record("did not load platform '\(identifier)'")
             }
         }
     }
 
-
     @Test(.requireHostOS(.macOS))
     func toolchainLoading() async throws {
         // Validate that we loaded the default toolchain.
@@ -226,7 +236,7 @@ import SWBServiceCore
         #expect(defaultToolchain.identifier == ToolchainRegistry.defaultToolchainIdentifier)
     }
 
-    final class Delegate : CoreDelegate {
+    final class Delegate: CoreDelegate {
         private let _diagnosticsEngine = DiagnosticsEngine()
 
         var diagnosticsEngine: DiagnosticProducingDelegateProtocolPrivate<DiagnosticsEngine> {
@@ -322,14 +332,17 @@ import SWBServiceCore
             let fakePlatformPath = tmpDirPath.join("Platforms/Fake.platform")
             try localFS.createDirectory(tmpDirPath.join("Toolchains"), recursive: true)
             try localFS.createDirectory(fakePlatformPath, recursive: true)
-            try await localFS.writePlist(fakePlatformPath.join("Info.plist"), .plDict([
-                "Description": .plString("Fake"),
-                "FamilyName": .plString("Fake"),
-                "FamilyIdentifier": .plString("Fake"),
-                "Identifier": .plString("com.apple.FakePlatform"),
-                "Name": .plString("fake"),
-                "Type": .plString("Platform"),
-            ]))
+            try await localFS.writePlist(
+                fakePlatformPath.join("Info.plist"),
+                .plDict([
+                    "Description": .plString("Fake"),
+                    "FamilyName": .plString("Fake"),
+                    "FamilyIdentifier": .plString("Fake"),
+                    "Identifier": .plString("com.apple.FakePlatform"),
+                    "Name": .plString("fake"),
+                    "Type": .plString("Platform"),
+                ])
+            )
 
             let delegate = Delegate()
             let pluginManager = await MutablePluginManager(skipLoadingPluginIdentifiers: [])
@@ -354,27 +367,37 @@ import SWBServiceCore
             try await testExternalToolchainPath(toolchainPath: tmpDir, withSetEnv: nil, expecting: [], originalToolchain)
             try await testExternalToolchainPath(toolchainPath: tmpDir, withSetEnv: tmpDir.join("tmp/Foobar/MyDir").str, expecting: [tmpDir.join("tmp/Foobar/MyDir").str], originalToolchain)
             try await testExternalToolchainPath(toolchainPath: tmpDir, withSetEnv: nil, expecting: [], originalToolchain)
-            try await testExternalToolchainPath(toolchainPath: tmpDir, withSetEnv: [tmpDir.join("tmp/MetalToolchain1.0").str, tmpDir.join("tmp/MetalToolchain2.0").str, tmpDir.join("tmp/MetalToolchain3.0").str].joined(separator: String(Path.pathEnvironmentSeparator)), expecting: [
-                tmpDir.join("tmp/MetalToolchain1.0").str,
-                tmpDir.join("tmp/MetalToolchain2.0").str,
-                tmpDir.join("tmp/MetalToolchain3.0").str,
-            ], originalToolchain)
+            try await testExternalToolchainPath(
+                toolchainPath: tmpDir,
+                withSetEnv: [tmpDir.join("tmp/MetalToolchain1.0").str, tmpDir.join("tmp/MetalToolchain2.0").str, tmpDir.join("tmp/MetalToolchain3.0").str].joined(separator: String(Path.pathEnvironmentSeparator)),
+                expecting: [
+                    tmpDir.join("tmp/MetalToolchain1.0").str,
+                    tmpDir.join("tmp/MetalToolchain2.0").str,
+                    tmpDir.join("tmp/MetalToolchain3.0").str,
+                ],
+                originalToolchain
+            )
             try await testExternalToolchainPath(toolchainPath: tmpDir, withSetEnv: nil, expecting: [], originalToolchain)
             try await testExternalToolchainPath(toolchainPath: tmpDir, withSetEnv: "", expecting: [], originalToolchain)
 
             // Environment overrides
-            try await testExternalToolchainPath(toolchainPath: tmpDir, withSetEnv: nil, expecting: [], originalToolchain) // Clear
+            try await testExternalToolchainPath(toolchainPath: tmpDir, withSetEnv: nil, expecting: [], originalToolchain)  // Clear
 
-            try await testExternalToolchainPath(toolchainPath: tmpDir, environmentOverrides: ["Hello":"world"], expecting: [], originalToolchain)
+            try await testExternalToolchainPath(toolchainPath: tmpDir, environmentOverrides: ["Hello": "world"], expecting: [], originalToolchain)
             try await testExternalToolchainPath(toolchainPath: tmpDir, environmentOverrides: ["EXTERNAL_TOOLCHAINS_DIR": tmpDir.join("tmp/Foobar/MyDir").str], expecting: [tmpDir.join("tmp/Foobar/MyDir").str], originalToolchain)
             try await testExternalToolchainPath(toolchainPath: tmpDir, environmentOverrides: [:], expecting: [], originalToolchain)
-            try await testExternalToolchainPath(toolchainPath: tmpDir, environmentOverrides: [
-                "EXTERNAL_TOOLCHAINS_DIR" : [tmpDir.join("tmp/MetalToolchain1.0").str, tmpDir.join("tmp/MetalToolchain2.0").str, tmpDir.join("tmp/MetalToolchain3.0").str].joined(separator: String(Path.pathEnvironmentSeparator)),
-            ], expecting: [
-                tmpDir.join("tmp/MetalToolchain1.0").str,
-                tmpDir.join("tmp/MetalToolchain2.0").str,
-                tmpDir.join("tmp/MetalToolchain3.0").str,
-            ], originalToolchain)
+            try await testExternalToolchainPath(
+                toolchainPath: tmpDir,
+                environmentOverrides: [
+                    "EXTERNAL_TOOLCHAINS_DIR": [tmpDir.join("tmp/MetalToolchain1.0").str, tmpDir.join("tmp/MetalToolchain2.0").str, tmpDir.join("tmp/MetalToolchain3.0").str].joined(separator: String(Path.pathEnvironmentSeparator))
+                ],
+                expecting: [
+                    tmpDir.join("tmp/MetalToolchain1.0").str,
+                    tmpDir.join("tmp/MetalToolchain2.0").str,
+                    tmpDir.join("tmp/MetalToolchain3.0").str,
+                ],
+                originalToolchain
+            )
             try await testExternalToolchainPath(toolchainPath: tmpDir, environmentOverrides: [:], expecting: [], originalToolchain)
         }
     }
@@ -428,7 +451,7 @@ import SWBServiceCore
         }
     }
 
-    func testExternalToolchainPath(toolchainPath: Path, environmentOverrides: [String:String], expecting expectedPathStrings: [String], _ originalToolchainCount: Int) async throws {
+    func testExternalToolchainPath(toolchainPath: Path, environmentOverrides: [String: String], expecting expectedPathStrings: [String], _ originalToolchainCount: Int) async throws {
         let delegate = Delegate()
         let pluginManager = await MutablePluginManager(skipLoadingPluginIdentifiers: [])
         await pluginManager.registerExtensionPoint(DeveloperDirectoryExtensionPoint())
@@ -460,9 +483,12 @@ import SWBServiceCore
         }
         let toolchainPaths = try #require(core?.toolchainPaths)
         for expectedPathString in expectedPathStrings {
-            #expect(toolchainPaths.contains(where: { searchPath in
-                searchPath.path == Path(expectedPathString) && searchPath.strict == false
-            }), "Unable to find \(expectedPathString)")
+            #expect(
+                toolchainPaths.contains(where: { searchPath in
+                    searchPath.path == Path(expectedPathString) && searchPath.strict == false
+                }),
+                "Unable to find \(expectedPathString)"
+            )
         }
 
         #expect(toolchainPaths.count == originalToolchainCount + expectedPathStrings.count)
diff --git a/Tests/SWBCoreTests/DependencyScopingTests.swift b/Tests/SWBCoreTests/DependencyScopingTests.swift
index a18490c4..a52f0327 100644
--- a/Tests/SWBCoreTests/DependencyScopingTests.swift
+++ b/Tests/SWBCoreTests/DependencyScopingTests.swift
@@ -30,18 +30,18 @@ import Foundation
                     groupTree: TestGroup(
                         "G1",
                         children: [
-                            TestFile("S1.c"),
+                            TestFile("S1.c")
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "T1",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
@@ -52,7 +52,7 @@ import Foundation
                             "T2",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
@@ -63,14 +63,14 @@ import Foundation
                             "T3",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
                             ]
-                        )
+                        ),
                     ]
-                ),
+                )
             ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -112,18 +112,18 @@ import Foundation
                     groupTree: TestGroup(
                         "G1",
                         children: [
-                            TestFile("S1.c"),
+                            TestFile("S1.c")
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "T1",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)", "__SKIP_BUILD": "YES"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)", "__SKIP_BUILD": "YES"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
@@ -134,7 +134,7 @@ import Foundation
                             "T2",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
@@ -145,14 +145,14 @@ import Foundation
                             "T3",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
                             ]
-                        )
+                        ),
                     ]
-                ),
+                )
             ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -182,18 +182,18 @@ import Foundation
                     groupTree: TestGroup(
                         "G1",
                         children: [
-                            TestFile("S1.c"),
+                            TestFile("S1.c")
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "T1",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
@@ -204,7 +204,7 @@ import Foundation
                             "T2",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
@@ -215,14 +215,14 @@ import Foundation
                             "T3",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
                             ]
-                        )
+                        ),
                     ]
-                ),
+                )
             ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -254,18 +254,18 @@ import Foundation
                     groupTree: TestGroup(
                         "G1",
                         children: [
-                            TestFile("S1.c"),
+                            TestFile("S1.c")
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "T1",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
@@ -276,7 +276,7 @@ import Foundation
                             "T2",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
@@ -287,7 +287,7 @@ import Foundation
                             "T3",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
@@ -298,7 +298,7 @@ import Foundation
                             "T4",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
@@ -309,7 +309,7 @@ import Foundation
                             "T5",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
@@ -320,7 +320,7 @@ import Foundation
                             "T6",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
@@ -331,7 +331,7 @@ import Foundation
                             "T7",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
@@ -342,15 +342,15 @@ import Foundation
                             "T8",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
                             ],
                             dependencies: []
-                        )
+                        ),
                     ]
-                ),
+                )
             ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -390,18 +390,18 @@ import Foundation
                     groupTree: TestGroup(
                         "G1",
                         children: [
-                            TestFile("S1.c"),
+                            TestFile("S1.c")
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "T1",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
@@ -412,7 +412,7 @@ import Foundation
                             "T2",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
@@ -423,12 +423,12 @@ import Foundation
                             "T3",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"]),
                                 TestFrameworksBuildPhase([
-                                    "T5.framework",
+                                    "T5.framework"
                                 ]),
                             ]
                         ),
@@ -436,7 +436,7 @@ import Foundation
                             "T4",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
@@ -446,14 +446,14 @@ import Foundation
                             "T5",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
                             ]
-                        )
+                        ),
                     ]
-                ),
+                )
             ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -517,20 +517,25 @@ import Foundation
                     groupTree: TestGroup(
                         "G1",
                         children: [
-                            TestFile("S1.c"),
+                            TestFile("S1.c")
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "T1",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)",
-                                                                                "SDKROOT": "auto",
-                                                                                "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"]),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "SDKROOT": "auto",
+                                        "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
+                                    ]
+                                )
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
@@ -541,9 +546,14 @@ import Foundation
                             "T2",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)",
-                                                                                "SDKROOT": "auto",
-                                                                                "SUPPORTED_PLATFORMS": "macosx"]),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "SDKROOT": "auto",
+                                        "SUPPORTED_PLATFORMS": "macosx",
+                                    ]
+                                )
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
@@ -554,16 +564,21 @@ import Foundation
                             "T3",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)",
-                                                                                "SDKROOT": "auto",
-                                                                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator"]),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "SDKROOT": "auto",
+                                        "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                                    ]
+                                )
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
                             ]
-                        )
+                        ),
                     ]
-                ),
+                )
             ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -600,24 +615,24 @@ import Foundation
                     groupTree: TestGroup(
                         "G1",
                         children: [
-                            TestFile("S1.c"),
+                            TestFile("S1.c")
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "T1",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["S1.c"])
                             ],
                             dependencies: ["PackageProductWithTransitiveRefs"]
-                        ),
+                        )
                     ]
                 ),
                 TestPackageProject(
@@ -628,62 +643,90 @@ import Foundation
                             TestFile("foo.c"),
                             TestFile("libBEGIN.a"),
                             TestFile("libEND.a"),
-                        ]),
+                        ]
+                    ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Release", buildSettings: [
-                            "LIBTOOL": libtoolPath.str,
-                            "CODE_SIGN_IDENTITY": "",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "USE_HEADERMAP": "NO"]),
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "LIBTOOL": libtoolPath.str,
+                                "CODE_SIGN_IDENTITY": "",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "USE_HEADERMAP": "NO",
+                            ]
+                        )
                     ],
                     targets: [
                         TestPackageProductTarget(
                             "SomePackageProduct",
                             frameworksBuildPhase: TestFrameworksBuildPhase([
-                                TestBuildFile(.target("A"))]),
-                            dependencies: ["A"]),
+                                TestBuildFile(.target("A"))
+                            ]),
+                            dependencies: ["A"]
+                        ),
                         TestPackageProductTarget(
                             "NestedPackagedProduct",
                             frameworksBuildPhase: TestFrameworksBuildPhase([
-                                TestBuildFile(.target("B"))]),
-                            dependencies: ["B"]),
+                                TestBuildFile(.target("B"))
+                            ]),
+                            dependencies: ["B"]
+                        ),
                         TestPackageProductTarget(
                             "PackageProductWithTransitiveRefs",
                             frameworksBuildPhase: TestFrameworksBuildPhase([
                                 TestBuildFile(.target("SomePackageProduct")),
                                 TestBuildFile(.target("NestedPackagedProduct")),
                                 TestBuildFile(.target("C")),
-                                TestBuildFile(.target("D"))]),
-                            dependencies: ["SomePackageProduct", "NestedPackageProduct", "C", "D"]),
+                                TestBuildFile(.target("D")),
+                            ]),
+                            dependencies: ["SomePackageProduct", "NestedPackageProduct", "C", "D"]
+                        ),
                         TestStandardTarget(
-                            "A", type: .staticLibrary,
-                            buildPhases: [TestSourcesBuildPhase(["foo.c"])]),
+                            "A",
+                            type: .staticLibrary,
+                            buildPhases: [TestSourcesBuildPhase(["foo.c"])]
+                        ),
                         TestStandardTarget(
-                            "B", type: .staticLibrary,
-                            buildPhases: [TestSourcesBuildPhase(["foo.c"])]),
+                            "B",
+                            type: .staticLibrary,
+                            buildPhases: [TestSourcesBuildPhase(["foo.c"])]
+                        ),
                         TestStandardTarget(
-                            "C", type: .staticLibrary,
+                            "C",
+                            type: .staticLibrary,
                             buildPhases: [
                                 TestSourcesBuildPhase(["foo.c"]),
                                 TestFrameworksBuildPhase([
-                                    TestBuildFile(.target("C_Impl"))])],
-                            dependencies: ["C_Impl"]),
+                                    TestBuildFile(.target("C_Impl"))
+                                ]),
+                            ],
+                            dependencies: ["C_Impl"]
+                        ),
                         TestStandardTarget(
-                            "C_Impl", type: .staticLibrary,
-                            buildPhases: [TestSourcesBuildPhase(["foo.c"])]),
+                            "C_Impl",
+                            type: .staticLibrary,
+                            buildPhases: [TestSourcesBuildPhase(["foo.c"])]
+                        ),
                         TestStandardTarget(
-                            "D", type: .objectFile,
+                            "D",
+                            type: .objectFile,
                             buildPhases: [
                                 TestSourcesBuildPhase([]),
                                 TestFrameworksBuildPhase([
-                                    TestBuildFile(.target("E"))])
-                            ], dependencies: ["E"]),
+                                    TestBuildFile(.target("E"))
+                                ]),
+                            ],
+                            dependencies: ["E"]
+                        ),
                         TestStandardTarget(
-                            "E", type: .objectFile,
+                            "E",
+                            type: .objectFile,
                             buildPhases: [
                                 TestSourcesBuildPhase(["foo.c"])
-                            ]),
-                    ])
+                            ]
+                        ),
+                    ]
+                ),
             ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
diff --git a/Tests/SWBCoreTests/DocumentationDiagnosticsOutputParserTests.swift b/Tests/SWBCoreTests/DocumentationDiagnosticsOutputParserTests.swift
index 3129d428..f9752b24 100644
--- a/Tests/SWBCoreTests/DocumentationDiagnosticsOutputParserTests.swift
+++ b/Tests/SWBCoreTests/DocumentationDiagnosticsOutputParserTests.swift
@@ -22,70 +22,70 @@ import SWBUtil
     @Test(.requireSDKs(.macOS))
     func parsingDiagnosticsFile() async throws {
         let diagnosticJSON = """
-{
-  "version": {
-    "major": 1,
-    "minor": 0,
-    "patch": 0
-  },
-  "diagnostics": [
-    {
-      "summary": "Topic reference 'LineList/translateToFileSpace(_:)' couldn't be resolved. Reference is ambiguous after '/SymbolKit/SymbolGraph/LineList'.",
-      "source": "file:///Users/username/Development/swift-docc-symbolkit/Sources/SymbolKit/SymbolGraph/LineList/LineList.swift",
-      "severity": "warning",
-      "range": {
-        "start": {
-          "line": 173,
-          "column": 41
-        },
-        "end": {
-          "line": 173,
-          "column": 78
-        }
-      },
-      "solutions": [
-        {
-          "summary": "Insert '9dlzx' to refer to 'func translateToFileSpace(_ position: SourceRange.Position) -> SourceRange.Position?'",
-          "replacements": [
             {
-              "range": {
-                "start": {
-                  "line": 173,
-                  "column": 76
-                },
-                "end": {
-                  "line": 173,
-                  "column": 76
-                }
+              "version": {
+                "major": 1,
+                "minor": 0,
+                "patch": 0
               },
-              "text": "-9dlzx"
-            }
-          ]
-        },
-        {
-          "summary": "Insert '4tk1b' to refer to 'func translateToFileSpace(_ range: SourceRange) -> SourceRange?'",
-          "replacements": [
-            {
-              "range": {
-                "start": {
-                  "line": 173,
-                  "column": 76
-                },
-                "end": {
-                  "line": 173,
-                  "column": 76
+              "diagnostics": [
+                {
+                  "summary": "Topic reference 'LineList/translateToFileSpace(_:)' couldn't be resolved. Reference is ambiguous after '/SymbolKit/SymbolGraph/LineList'.",
+                  "source": "file:///Users/username/Development/swift-docc-symbolkit/Sources/SymbolKit/SymbolGraph/LineList/LineList.swift",
+                  "severity": "warning",
+                  "range": {
+                    "start": {
+                      "line": 173,
+                      "column": 41
+                    },
+                    "end": {
+                      "line": 173,
+                      "column": 78
+                    }
+                  },
+                  "solutions": [
+                    {
+                      "summary": "Insert '9dlzx' to refer to 'func translateToFileSpace(_ position: SourceRange.Position) -> SourceRange.Position?'",
+                      "replacements": [
+                        {
+                          "range": {
+                            "start": {
+                              "line": 173,
+                              "column": 76
+                            },
+                            "end": {
+                              "line": 173,
+                              "column": 76
+                            }
+                          },
+                          "text": "-9dlzx"
+                        }
+                      ]
+                    },
+                    {
+                      "summary": "Insert '4tk1b' to refer to 'func translateToFileSpace(_ range: SourceRange) -> SourceRange?'",
+                      "replacements": [
+                        {
+                          "range": {
+                            "start": {
+                              "line": 173,
+                              "column": 76
+                            },
+                            "end": {
+                              "line": 173,
+                              "column": 76
+                            }
+                          },
+                          "text": "-4tk1b"
+                        }
+                      ]
+                    }
+                  ],
+                  "notes": []
                 }
-              },
-              "text": "-4tk1b"
+              ]
             }
-          ]
-        }
-      ],
-      "notes": []
-    }
-  ]
-}
-"""
+            """
         let delegate = CapturingTaskParserDelegate()
 
         try await withTemporaryDirectory { (tmpDir: Path) in
@@ -98,7 +98,7 @@ import SWBUtil
             let core = try await getCore()
             let workspaceContext = try WorkspaceContext(core: core, workspace: TestWorkspace("test", projects: []).load(core), processExecutionCache: .sharedForTesting)
             let parser = DocumentationDiagnosticsOutputParser(for: task, workspaceContext: workspaceContext, buildRequestContext: BuildRequestContext(workspaceContext: workspaceContext), delegate: delegate, progressReporter: nil)
-            parser.write(bytes: "error: is an error\n") // no diagnostic should be created created for this
+            parser.write(bytes: "error: is an error\n")  // no diagnostic should be created created for this
             parser.close(result: TaskResult.exit(exitStatus: .exit(0), metrics: nil))
         }
 
@@ -141,7 +141,7 @@ import SWBUtil
                             newText: "-4tk1b"
                         )
                     ]
-                )
+                ),
             ]
         )
         #expect(delegate.diagnosticsEngine.diagnostics == [expectedDiagnostic])
diff --git a/Tests/SWBCoreTests/FilePathResolverTests.swift b/Tests/SWBCoreTests/FilePathResolverTests.swift
index 558f426a..fa6c4e1b 100644
--- a/Tests/SWBCoreTests/FilePathResolverTests.swift
+++ b/Tests/SWBCoreTests/FilePathResolverTests.swift
@@ -75,17 +75,27 @@ import SWBMacro
 
     @Test
     func groupTreePaths() throws {
-        let model = try TestGroup("SomeProject", sourceTree: .buildSetting("PROJECT_DIR"),
-                                  children: [
-                                    TestGroup("SomeFiles", children: [
-                                        TestGroup("OtherFiles",
-                                                  children: [TestFile("SourceFile.m"), TestFile("HeaderFile.h")]),
-                                        TestFile("SourceFile2.c", sourceTree: .buildSetting("SOURCE_TREE_ONE")),
-                                        TestFile("Frameworks/Cocoa.framework", sourceTree: .buildSetting("SYSTEM_LIBRARY_DIR")),
-                                        TestVariantGroup("View.xib",
-                                                         children: [TestFile("Base.lproj/View.xib"), TestFile("fr.lproj/View.strings", regionVariantName: "fr")])
-                                    ])
-                                  ]).toProtocol()
+        let model = try TestGroup(
+            "SomeProject",
+            sourceTree: .buildSetting("PROJECT_DIR"),
+            children: [
+                TestGroup(
+                    "SomeFiles",
+                    children: [
+                        TestGroup(
+                            "OtherFiles",
+                            children: [TestFile("SourceFile.m"), TestFile("HeaderFile.h")]
+                        ),
+                        TestFile("SourceFile2.c", sourceTree: .buildSetting("SOURCE_TREE_ONE")),
+                        TestFile("Frameworks/Cocoa.framework", sourceTree: .buildSetting("SYSTEM_LIBRARY_DIR")),
+                        TestVariantGroup(
+                            "View.xib",
+                            children: [TestFile("Base.lproj/View.xib"), TestFile("fr.lproj/View.strings", regionVariantName: "fr")]
+                        ),
+                    ]
+                )
+            ]
+        ).toProtocol()
         let rootGroup = try #require(Reference.create(model, pifLoader, isRoot: true) as? FileGroup)
 
         // Test the individual references.
@@ -186,13 +196,23 @@ import SWBMacro
 
     @Test
     func dotDotEmbeddedInFileGroupPath() throws {
-        let model = try TestGroup("SomeProject", sourceTree: .buildSetting("PROJECT_DIR"), children: [
-            TestGroup("Sources", children: [
-                TestGroup("../OtherFiles", children: [
-                    TestFile("Resource.txt")
-                ]),
-            ])
-        ]).toProtocol()
+        let model = try TestGroup(
+            "SomeProject",
+            sourceTree: .buildSetting("PROJECT_DIR"),
+            children: [
+                TestGroup(
+                    "Sources",
+                    children: [
+                        TestGroup(
+                            "../OtherFiles",
+                            children: [
+                                TestFile("Resource.txt")
+                            ]
+                        )
+                    ]
+                )
+            ]
+        ).toProtocol()
         let rootGroup = try #require(Reference.create(model, pifLoader, isRoot: true) as? FileGroup)
 
         // Get the absolute path for the reference and test it.
diff --git a/Tests/SWBCoreTests/FileTextEncodingTests.swift b/Tests/SWBCoreTests/FileTextEncodingTests.swift
index ee898097..e0e19801 100644
--- a/Tests/SWBCoreTests/FileTextEncodingTests.swift
+++ b/Tests/SWBCoreTests/FileTextEncodingTests.swift
@@ -26,7 +26,7 @@ import SWBTestSupport
         #expect(FileTextEncoding("utf8") != FileTextEncoding.utf8)
     }
 
-    @Test(.requireHostOS(.macOS)) // requires CoreFoundation which is macOS-only
+    @Test(.requireHostOS(.macOS))  // requires CoreFoundation which is macOS-only
     func encoding() throws {
         #expect(FileTextEncoding.utf8.stringEncoding == String.Encoding.utf8)
         #expect(FileTextEncoding.utf16.stringEncoding == String.Encoding.utf16)
@@ -38,7 +38,7 @@ import SWBTestSupport
         #expect(FileTextEncoding("utf-64").stringEncoding == nil)
     }
 
-    @Test(.requireHostOS(.macOS)) // crashes on Linux
+    @Test(.requireHostOS(.macOS))  // crashes on Linux
     func decoding() throws {
         #expect(FileTextEncoding(stringEncoding: String.Encoding.utf8) == FileTextEncoding.utf8)
         #expect(FileTextEncoding(stringEncoding: String.Encoding.utf16) == FileTextEncoding.utf16)
@@ -73,30 +73,30 @@ import SWBTestSupport
         let bom_utf32le = [UInt8]([0xFF, 0xFE, 0x00, 0x00])
 
         /*
-         Illustration for how to get host ordered UTF information.
-
-         let bom_utf16_host: [UInt8] = {
-         switch __CFByteOrder(UInt32(CFByteOrderGetCurrent())) {
-         case CFByteOrderBigEndian:
-         return bom_utf16be
-         case CFByteOrderLittleEndian:
-         return bom_utf16le
-         default:
-         return []
-         }
-         }()
-
-         let bom_utf32_host: [UInt8] = {
-         switch __CFByteOrder(UInt32(CFByteOrderGetCurrent())) {
-         case CFByteOrderBigEndian:
-         return bom_utf32be
-         case CFByteOrderLittleEndian:
-         return bom_utf32le
-         default:
-         return []
-         }
-         }()
-         */
+         * Illustration for how to get host ordered UTF information.
+         *
+         * let bom_utf16_host: [UInt8] = {
+         * switch __CFByteOrder(UInt32(CFByteOrderGetCurrent())) {
+         * case CFByteOrderBigEndian:
+         * return bom_utf16be
+         * case CFByteOrderLittleEndian:
+         * return bom_utf16le
+         * default:
+         * return []
+         * }
+         * }()
+         *
+         * let bom_utf32_host: [UInt8] = {
+         * switch __CFByteOrder(UInt32(CFByteOrderGetCurrent())) {
+         * case CFByteOrderBigEndian:
+         * return bom_utf32be
+         * case CFByteOrderLittleEndian:
+         * return bom_utf32le
+         * default:
+         * return []
+         * }
+         * }()
+         **/
 
         func XCTAssertDecode(_ lhs: @autoclosure () throws -> (string: String, originalEncoding: FileTextEncoding)?, _ rhs: @autoclosure () throws -> (string: String, originalEncoding: FileTextEncoding)?, sourceLocation: SourceLocation = #_sourceLocation) throws {
             try #require(try lhs()?.string == rhs()?.string, sourceLocation: sourceLocation)
diff --git a/Tests/SWBCoreTests/IncrementalPIFLoadingTests.swift b/Tests/SWBCoreTests/IncrementalPIFLoadingTests.swift
index 03a5a101..1d13c6d1 100644
--- a/Tests/SWBCoreTests/IncrementalPIFLoadingTests.swift
+++ b/Tests/SWBCoreTests/IncrementalPIFLoadingTests.swift
@@ -26,7 +26,8 @@ import SWBProtocol
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup("Sources"),
-            targets: [testTarget])
+            targets: [testTarget]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let testWorkspace2 = TestWorkspace("bWorkspace", projects: [testProject])
 
@@ -46,25 +47,25 @@ import SWBProtocol
 
             // Initiate a loading session.
             let session = incrementalLoader.startLoading(workspaceSignature: testWorkspace.signature)
-            #expect(session.missingObjects.map{ $0.signature } == [testWorkspace.signature])
+            #expect(session.missingObjects.map { $0.signature } == [testWorkspace.signature])
 
             // Add the workspace data.
             try session.add(object: workspaceObject)
-            #expect(session.missingObjects.map{ $0.signature } == [testProject.signature])
+            #expect(session.missingObjects.map { $0.signature } == [testProject.signature])
 
             // Add the project data.
             try session.add(object: projectObject)
-            #expect(session.missingObjects.map{ $0.signature } == [testTarget.signature])
+            #expect(session.missingObjects.map { $0.signature } == [testTarget.signature])
 
             // Add the target data.
             try session.add(object: targetObject)
-            #expect(session.missingObjects.map{ $0.signature } == [])
+            #expect(session.missingObjects.map { $0.signature } == [])
 
             // Load the workspace.
             let workspace = try session.load()
 
             #expect(workspace.name == "aWorkspace")
-            #expect(workspace.projects.map{ $0.name } == ["aProject"])
+            #expect(workspace.projects.map { $0.name } == ["aProject"])
 
             #expect(IncrementalPIFLoader.loadsRequested.value == 1)
             #expect(IncrementalPIFLoader.objectsLoaded.value == 3)
@@ -82,23 +83,23 @@ import SWBProtocol
 
             // Initiate a loading session.
             let session = incrementalLoader.startLoading(workspaceSignature: testWorkspace2.signature)
-            #expect(session.missingObjects.map{ $0.signature } == [testWorkspace2.signature])
+            #expect(session.missingObjects.map { $0.signature } == [testWorkspace2.signature])
 
             // Add the workspace data, which should complete all the necessary objects.
             try session.add(object: workspaceObject)
-            #expect(session.missingObjects.map{ $0.signature } == [])
+            #expect(session.missingObjects.map { $0.signature } == [])
 
             // Check we error out if we try to add something that isn't required.
             #expect(throws: (any Error).self) {
                 try session.add(object: workspaceObject)
             }
-            #expect(session.missingObjects.map{ $0.signature } == [])
+            #expect(session.missingObjects.map { $0.signature } == [])
 
             // Load the workspace.
             let workspace = try session.load()
 
             #expect(workspace.name == "bWorkspace")
-            #expect(workspace.projects.map{ $0.name } == ["aProject"])
+            #expect(workspace.projects.map { $0.name } == ["aProject"])
 
             #expect(IncrementalPIFLoader.loadsRequested.value == 1)
             #expect(IncrementalPIFLoader.objectsLoaded.value == 1)
@@ -112,7 +113,8 @@ import SWBProtocol
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup("Sources"),
-            targets: [testTarget])
+            targets: [testTarget]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let fs = PseudoFS()
         let cachePath = Path.root.join("tmp")
@@ -127,11 +129,11 @@ import SWBProtocol
         // Load the pif.
         do {
             let session = incrementalLoader.startLoading(workspaceSignature: testWorkspace.signature)
-            #expect(session.missingObjects.map{$0}.count == 1)
+            #expect(session.missingObjects.map { $0 }.count == 1)
             try session.add(object: workspaceObject)
             try session.add(object: projectObject)
             try session.add(object: targetObject)
-            #expect(session.missingObjects.map{ $0.signature } == [])
+            #expect(session.missingObjects.map { $0.signature } == [])
             let workspace = try session.load()
             #expect(workspace.name == "aWorkspace")
         }
@@ -139,7 +141,7 @@ import SWBProtocol
         // We should not get any missing object when we load again.
         do {
             let session = incrementalLoader.startLoading(workspaceSignature: testWorkspace.signature)
-            #expect(session.missingObjects.map{ $0.signature } == [])
+            #expect(session.missingObjects.map { $0.signature } == [])
             let workspace = try session.load()
             #expect(workspace.name == "aWorkspace")
         }
@@ -155,11 +157,11 @@ import SWBProtocol
             let session = incrementalLoader.startLoading(workspaceSignature: testWorkspace.signature)
             // We should have missingObjects.
             #expect(incrementalLoader.loadedObjectCount == 2)
-            #expect(session.missingObjects.map{$0}.count == 1)
+            #expect(session.missingObjects.map { $0 }.count == 1)
 
             // Add the workspace object back.
             try session.add(object: workspaceObject)
-            #expect(session.missingObjects.map{ $0.signature } == [])
+            #expect(session.missingObjects.map { $0.signature } == [])
             let workspace = try session.load()
             #expect(workspace.name == "aWorkspace")
         }
@@ -170,13 +172,13 @@ import SWBProtocol
             let session = incrementalLoader.startLoading(workspaceSignature: testWorkspace.signature)
             // We should have missingObjects.
             #expect(incrementalLoader.loadedObjectCount == 2)
-            #expect(session.missingObjects.map{$0}.count == 1)
+            #expect(session.missingObjects.map { $0 }.count == 1)
 
             // Add the objects back.
             try session.add(object: workspaceObject)
             try session.add(object: projectObject)
             try session.add(object: targetObject)
-            #expect(session.missingObjects.map{ $0.signature } == [])
+            #expect(session.missingObjects.map { $0.signature } == [])
             let workspace = try session.load()
             #expect(workspace.name == "aWorkspace")
         }
@@ -188,7 +190,8 @@ import SWBProtocol
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup("Sources"),
-            targets: [testTarget])
+            targets: [testTarget]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let testWorkspace2 = TestWorkspace("bWorkspace", projects: [testProject])
 
@@ -208,7 +211,7 @@ import SWBProtocol
             try session.add(object: workspaceObject)
             try session.add(object: projectObject)
             try session.add(object: targetObject)
-            #expect(session.missingObjects.map{ $0.signature } == [])
+            #expect(session.missingObjects.map { $0.signature } == [])
             let workspace = try session.load()
             #expect(workspace.name == "aWorkspace")
 
@@ -225,7 +228,7 @@ import SWBProtocol
             let pifObjects = try testWorkspace.toObjects()
             #expect(pifObjects.count == 3)
             let session = incrementalLoader.startLoading(workspaceSignature: testWorkspace.signature)
-            #expect(session.missingObjects.map{ $0.signature } == [])
+            #expect(session.missingObjects.map { $0.signature } == [])
             let workspace = try session.load()
             #expect(workspace.name == "aWorkspace")
 
@@ -244,7 +247,7 @@ import SWBProtocol
             let workspaceObject = pifObjects[0]
             let session = incrementalLoader.startLoading(workspaceSignature: testWorkspace2.signature)
             try session.add(object: workspaceObject)
-            #expect(session.missingObjects.map{ $0.signature } == [])
+            #expect(session.missingObjects.map { $0.signature } == [])
             let workspace = try session.load()
             #expect(workspace.name == "bWorkspace")
 
@@ -260,15 +263,18 @@ import SWBProtocol
         let testTargetA = TestStandardTarget(
             "aTarget",
             type: .application,
-            buildPhases: [TestSourcesBuildPhase(["foo.c"])])
+            buildPhases: [TestSourcesBuildPhase(["foo.c"])]
+        )
         let testTargetB = TestStandardTarget(
             "bTarget",
             type: .application,
-            buildPhases: [TestSourcesBuildPhase(["bar.c"])])
+            buildPhases: [TestSourcesBuildPhase(["bar.c"])]
+        )
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup("Sources", children: [TestFile("foo.c"), TestFile("bar.c"), TestFile("baz.c")]),
-            targets: [testTargetA, testTargetB])
+            targets: [testTargetA, testTargetB]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
 
         let incrementalLoader = IncrementalPIFLoader(internalNamespace: BuiltinMacros.namespace, cachePath: nil)
@@ -290,12 +296,12 @@ import SWBProtocol
             try session.add(object: projectObject)
             try session.add(object: targetObjectA)
             try session.add(object: targetObjectB)
-            #expect(session.missingObjects.map{ $0.signature } == [])
+            #expect(session.missingObjects.map { $0.signature } == [])
             let workspace = try session.load()
 
             #expect(workspace.name == "aWorkspace")
-            #expect(workspace.projects.map{ $0.name } == ["aProject"])
-            #expect(workspace.projects.flatMap{ $0.targets }.map{ $0.name } == ["aTarget", "bTarget"])
+            #expect(workspace.projects.map { $0.name } == ["aProject"])
+            #expect(workspace.projects.flatMap { $0.targets }.map { $0.name } == ["aTarget", "bTarget"])
 
             #expect(IncrementalPIFLoader.loadsRequested.value == 1)
             #expect(IncrementalPIFLoader.objectsLoaded.value == 4)
@@ -309,11 +315,13 @@ import SWBProtocol
         let testTargetB2 = TestStandardTarget(
             "bTarget",
             type: .application,
-            buildPhases: [TestSourcesBuildPhase(["baz.c"])])
+            buildPhases: [TestSourcesBuildPhase(["baz.c"])]
+        )
         let testProject2 = TestProject(
             "aProject",
             groupTree: TestGroup("Sources", children: [TestFile("foo.c"), TestFile("bar.c"), TestFile("baz.c")]),
-            targets: [testTargetA, testTargetB2])
+            targets: [testTargetA, testTargetB2]
+        )
         let testWorkspace2 = TestWorkspace("aWorkspace", projects: [testProject2])
 
         // Load a second workspace with the new target.
@@ -329,12 +337,12 @@ import SWBProtocol
             try session.add(object: workspaceObject)
             try session.add(object: projectObject)
             try session.add(object: targetObjectB)
-            #expect(session.missingObjects.map{ $0.signature } == [])
+            #expect(session.missingObjects.map { $0.signature } == [])
             let workspace = try session.load()
 
             #expect(workspace.name == "aWorkspace")
-            #expect(workspace.projects.map{ $0.name } == ["aProject"])
-            #expect(workspace.projects.flatMap{ $0.targets }.map{ $0.name } == ["aTarget", "bTarget"])
+            #expect(workspace.projects.map { $0.name } == ["aProject"])
+            #expect(workspace.projects.flatMap { $0.targets }.map { $0.name } == ["aTarget", "bTarget"])
 
             #expect(IncrementalPIFLoader.loadsRequested.value == 1)
             #expect(IncrementalPIFLoader.objectsLoaded.value == 3)
@@ -374,4 +382,3 @@ import SWBProtocol
         }
     }
 }
-
diff --git a/Tests/SWBCoreTests/IndexSelectConfiguredTargetTests.swift b/Tests/SWBCoreTests/IndexSelectConfiguredTargetTests.swift
index 99951832..534eaba6 100644
--- a/Tests/SWBCoreTests/IndexSelectConfiguredTargetTests.swift
+++ b/Tests/SWBCoreTests/IndexSelectConfiguredTargetTests.swift
@@ -26,15 +26,19 @@ import SWBUtil
             "appTarget",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                    "SUPPORTED_PLATFORMS": "macosx iphonesimulator iphoneos watchsimulator watchos",
-                    "SUPPORTS_MACCATALYST": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx",
+                        "SUPPORTED_PLATFORMS": "macosx iphonesimulator iphoneos watchsimulator watchos",
+                        "SUPPORTS_MACCATALYST": "YES",
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.swift"]),
-            ])
+                TestSourcesBuildPhase(["main.swift"])
+            ]
+        )
 
         let workspace = try await TestWorkspace(
             "Test",
@@ -44,18 +48,24 @@ import SWBUtil
                     groupTree: TestGroup(
                         "SomeFiles",
                         children: [
-                            TestFile("main.swift"),
-                        ]),
+                            TestFile("main.swift")
+                        ]
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "SWIFT_VERSION": swiftVersion,
-                            ])],
+                            ]
+                        )
+                    ],
                     targets: [
                         appTarget
-                    ])])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await BuildOperationTester(core, workspace, simulated: false)
         try await tester.checkIndexBuildGraph(targets: [appTarget], workspaceOperation: true) { results in
diff --git a/Tests/SWBCoreTests/IndexTargetDependencyResolverTests.swift b/Tests/SWBCoreTests/IndexTargetDependencyResolverTests.swift
index 4441e541..126bd882 100644
--- a/Tests/SWBCoreTests/IndexTargetDependencyResolverTests.swift
+++ b/Tests/SWBCoreTests/IndexTargetDependencyResolverTests.swift
@@ -26,42 +26,53 @@ import SWBUtil
             "macApp",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx"
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase(["main.swift"]),
                 TestFrameworksBuildPhase(["FwkTarget.framework"]),
-            ])
+            ]
+        )
 
         let iosApp = TestStandardTarget(
             "iosApp",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "iphoneos",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "iphoneos"
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase(["main.swift"]),
                 TestFrameworksBuildPhase(["FwkTarget.framework"]),
-            ])
+            ]
+        )
 
         let macApp2 = TestStandardTarget(
             "macApp2",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx"
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase(["main.swift"]),
                 TestFrameworksBuildPhase(["FwkTarget.framework"]),
             ],
             dependencies: [
-                "FwkTarget_mac",
+                "FwkTarget_mac"
             ]
         )
 
@@ -69,16 +80,19 @@ import SWBUtil
             "iosApp2",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "iphoneos",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "iphoneos"
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase(["main.swift"]),
                 TestFrameworksBuildPhase(["FwkTarget.framework"]),
             ],
             dependencies: [
-                "FwkTarget_ios",
+                "FwkTarget_ios"
             ]
         )
 
@@ -86,13 +100,16 @@ import SWBUtil
             "FwkTarget_mac",
             type: .framework,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                    "PRODUCT_NAME": "FwkTarget",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx",
+                        "PRODUCT_NAME": "FwkTarget",
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.swift"]),
+                TestSourcesBuildPhase(["main.swift"])
             ]
         )
 
@@ -100,13 +117,16 @@ import SWBUtil
             "FwkTarget_ios",
             type: .framework,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "iphoneos",
-                    "PRODUCT_NAME": "FwkTarget",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "iphoneos",
+                        "PRODUCT_NAME": "FwkTarget",
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.swift"]),
+                TestSourcesBuildPhase(["main.swift"])
             ]
         )
 
@@ -118,30 +138,38 @@ import SWBUtil
                     groupTree: TestGroup(
                         "SomeFiles",
                         children: [
-                            TestFile("main.swift"),
-                        ]),
+                            TestFile("main.swift")
+                        ]
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])],
+                                "PRODUCT_NAME": "$(TARGET_NAME)"
+                            ]
+                        )
+                    ],
                     targets: [
                         macApp, macApp2,
                         iosApp, iosApp2,
                         fwkTarget_mac,
                         fwkTarget_ios,
-                    ])])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await BuildOperationTester(core, workspace, simulated: false)
         let workspaceContext = WorkspaceContext(core: core, workspace: tester.workspace, processExecutionCache: .sharedForTesting)
         workspaceContext.updateUserPreferences(.defaultForTesting)
         try await tester.checkIndexBuildGraph(targets: [macApp, macApp2, iosApp, iosApp2, fwkTarget_mac, fwkTarget_ios], workspaceOperation: true) { results in
-            #expect(results.targets().map { results.targetNameAndPlatform($0) } == [
-                "FwkTarget_mac-macos", "macApp-macos", "macApp2-macos",
-                "FwkTarget_ios-iphoneos", "iosApp-iphoneos", "FwkTarget_ios-iphonesimulator", "iosApp-iphonesimulator", "iosApp2-iphoneos", "iosApp2-iphonesimulator",
-                "FwkTarget_ios-iosmac"
-            ])
+            #expect(
+                results.targets().map { results.targetNameAndPlatform($0) } == [
+                    "FwkTarget_mac-macos", "macApp-macos", "macApp2-macos",
+                    "FwkTarget_ios-iphoneos", "iosApp-iphoneos", "FwkTarget_ios-iphonesimulator", "iosApp-iphonesimulator", "iosApp2-iphoneos", "iosApp2-iphonesimulator",
+                    "FwkTarget_ios-iosmac",
+                ]
+            )
 
             try results.checkDependencies(of: macApp, are: [.init(fwkTarget_mac)])
             try results.checkDependencies(of: macApp2, are: [.init(fwkTarget_mac)])
@@ -156,7 +184,7 @@ import SWBUtil
                 results.delegate.checkDiagnostics([
                     "FwkTarget_mac rejected as an implicit dependency because its SUPPORTED_PLATFORMS (macosx) does not contain this target's platform (iphoneos). (in target 'iosApp' from project 'aProject')",
                     "FwkTarget_ios rejected as an implicit dependency because its SUPPORTED_PLATFORMS (iphoneos iphonesimulator) does not contain this target's platform (macosx). (in target 'macApp' from project 'aProject')",
-                    "FwkTarget_mac rejected as an implicit dependency because its SUPPORTED_PLATFORMS (macosx) does not contain this target's platform (iphonesimulator). (in target 'iosApp' from project 'aProject')"
+                    "FwkTarget_mac rejected as an implicit dependency because its SUPPORTED_PLATFORMS (macosx) does not contain this target's platform (iphonesimulator). (in target 'iosApp' from project 'aProject')",
                 ])
             } else {
                 results.delegate.checkNoDiagnostics()
@@ -172,28 +200,39 @@ import SWBUtil
             "macApp",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx"
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.swift"]),
-            ])
+                TestSourcesBuildPhase(["main.swift"])
+            ]
+        )
 
         let iosApp = TestStandardTarget(
             "iosApp",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "iphoneos",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "iphoneos"
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase(["main.swift"]),
-                TestCopyFilesBuildPhase([
-                    "Watchable WatchKit App.app",
-                ], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch", onlyForDeployment: false
-                                       ),
+                TestCopyFilesBuildPhase(
+                    [
+                        "Watchable WatchKit App.app"
+                    ],
+                    destinationSubfolder: .builtProductsDir,
+                    destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch",
+                    onlyForDeployment: false
+                ),
             ],
             dependencies: [
                 "macApp",
@@ -205,17 +244,23 @@ import SWBUtil
             "Watchable WatchKit App",
             type: .watchKitApp,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "INFOPLIST_FILE": "Sources/watchosApp/Info.plist",
-                    "SDKROOT": "watchos",
-                    "SKIP_INSTALL": "YES",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "INFOPLIST_FILE": "Sources/watchosApp/Info.plist",
+                        "SDKROOT": "watchos",
+                        "SKIP_INSTALL": "YES",
+                    ]
+                )
             ],
             buildPhases: [
-                TestCopyFilesBuildPhase([
-                    "Watchable WatchKit Extension.appex",
-                ], destinationSubfolder: .plugins, onlyForDeployment: false
-                                       ),
+                TestCopyFilesBuildPhase(
+                    [
+                        "Watchable WatchKit Extension.appex"
+                    ],
+                    destinationSubfolder: .plugins,
+                    onlyForDeployment: false
+                )
             ]
         )
 
@@ -223,18 +268,21 @@ import SWBUtil
             "Watchable WatchKit Extension",
             type: .watchKitExtension,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
-                    "INFOPLIST_FILE": "Sources/watchosExtension/Info.plist",
-                    "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
-                    "SDKROOT": "watchos",
-                    "SKIP_INSTALL": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
+                        "INFOPLIST_FILE": "Sources/watchosExtension/Info.plist",
+                        "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
+                        "SDKROOT": "watchos",
+                        "SKIP_INSTALL": "YES",
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase([
-                    "main.swift",
-                ]),
+                    "main.swift"
+                ])
             ]
         )
 
@@ -246,29 +294,37 @@ import SWBUtil
                     groupTree: TestGroup(
                         "SomeFiles",
                         children: [
-                            TestFile("main.swift"),
-                        ]),
+                            TestFile("main.swift")
+                        ]
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])],
+                                "PRODUCT_NAME": "$(TARGET_NAME)"
+                            ]
+                        )
+                    ],
                     targets: [
                         macApp,
                         iosApp,
                         watchKitApp,
                         watchKitExt,
-                    ])])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await BuildOperationTester(core, workspace, simulated: false)
         let workspaceContext = WorkspaceContext(core: core, workspace: tester.workspace, processExecutionCache: .sharedForTesting)
         workspaceContext.updateUserPreferences(.defaultForTesting)
         try await tester.checkIndexBuildGraph(targets: [macApp, iosApp, watchKitApp, watchKitExt], workspaceOperation: true) { results in
-            #expect(results.targets().map { results.targetNameAndPlatform($0) } == [
-                "macApp-macos", "iosApp-iphoneos", "iosApp-iphonesimulator",
-                "Watchable WatchKit Extension-watchos", "Watchable WatchKit App-watchos", "Watchable WatchKit Extension-watchsimulator", "Watchable WatchKit App-watchsimulator",
-            ])
+            #expect(
+                results.targets().map { results.targetNameAndPlatform($0) } == [
+                    "macApp-macos", "iosApp-iphoneos", "iosApp-iphonesimulator",
+                    "Watchable WatchKit Extension-watchos", "Watchable WatchKit App-watchos", "Watchable WatchKit Extension-watchsimulator", "Watchable WatchKit App-watchsimulator",
+                ]
+            )
 
             try results.checkDependencies(of: .init(iosApp, "iphoneos"), are: [])
             try results.checkDependencies(of: .init(iosApp, "iphonesimulator"), are: [])
@@ -277,7 +333,7 @@ import SWBUtil
             if workspaceContext.userPreferences.enableDebugActivityLogs {
                 results.delegate.checkDiagnostics([
                     "Watchable WatchKit App rejected as an implicit dependency because its SUPPORTED_PLATFORMS (watchos watchsimulator) does not contain this target's platform (iphoneos). (in target 'iosApp' from project 'aProject')",
-                    "Watchable WatchKit App rejected as an implicit dependency because its SUPPORTED_PLATFORMS (watchos watchsimulator) does not contain this target's platform (iphonesimulator). (in target 'iosApp' from project 'aProject')"
+                    "Watchable WatchKit App rejected as an implicit dependency because its SUPPORTED_PLATFORMS (watchos watchsimulator) does not contain this target's platform (iphonesimulator). (in target 'iosApp' from project 'aProject')",
                 ])
             } else {
                 results.delegate.checkNoDiagnostics()
@@ -290,18 +346,22 @@ import SWBUtil
         let core = try await getCore()
 
         let iosApp = TestStandardTarget(
-            "iosApp", type: .application,
+            "iosApp",
+            type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "iphoneos",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "iphoneos"
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.swift"]),
+                TestSourcesBuildPhase(["main.swift"])
             ],
             dependencies: [
                 "hostTool",
-                "watchApp"
+                "watchApp",
             ]
         )
 
@@ -309,37 +369,48 @@ import SWBUtil
             "watchApp",
             type: .watchKitApp,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "watchos",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "watchos"
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.swift"]),
+                TestSourcesBuildPhase(["main.swift"])
             ]
         )
 
         let hostToolDep = TestStandardTarget(
-            "hostToolDep", type: .staticLibrary,
+            "hostToolDep",
+            type: .staticLibrary,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx"
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.swift"]),
+                TestSourcesBuildPhase(["main.swift"])
             ],
             dependencies: []
         )
 
         let hostTool = TestStandardTarget(
-            "hostTool", type: .hostBuildTool,
+            "hostTool",
+            type: .hostBuildTool,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "auto",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "auto"
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.swift"]),
+                TestSourcesBuildPhase(["main.swift"])
             ],
             dependencies: ["hostToolDep"]
         )
@@ -352,28 +423,36 @@ import SWBUtil
                     groupTree: TestGroup(
                         "SomeFiles",
                         children: [
-                            TestFile("main.swift"),
-                        ]),
+                            TestFile("main.swift")
+                        ]
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])],
+                                "PRODUCT_NAME": "$(TARGET_NAME)"
+                            ]
+                        )
+                    ],
                     targets: [
                         iosApp,
                         watchApp,
                         hostTool,
-                        hostToolDep
-                    ])])
+                        hostToolDep,
+                    ]
+                )
+            ]
+        )
 
         let tester = try await BuildOperationTester(core, workspace, simulated: false)
         try await tester.checkIndexBuildGraph(targets: [iosApp, watchApp, hostTool, hostToolDep], workspaceOperation: true) { results in
-            #expect(results.targets().map { results.targetNameAndPlatform($0) } == [
-                "hostToolDep-macos", "hostTool-macos",
-                "iosApp-iphoneos", "iosApp-iphonesimulator",
-                "watchApp-watchos", "watchApp-watchsimulator",
-            ])
+            #expect(
+                results.targets().map { results.targetNameAndPlatform($0) } == [
+                    "hostToolDep-macos", "hostTool-macos",
+                    "iosApp-iphoneos", "iosApp-iphonesimulator",
+                    "watchApp-watchos", "watchApp-watchsimulator",
+                ]
+            )
 
             try results.checkDependencies(of: .init(iosApp, "iphoneos"), are: [.init(hostTool, "macos")])
             try results.checkDependencies(of: .init(iosApp, "iphonesimulator"), are: [.init(hostTool, "macos")])
@@ -391,45 +470,57 @@ import SWBUtil
         let core = try await getCore()
 
         let commonDep = TestStandardTarget(
-            "commonDep", type: .staticLibrary,
+            "commonDep",
+            type: .staticLibrary,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "auto",
-                    "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator"
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "auto",
+                        "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.swift"]),
+                TestSourcesBuildPhase(["main.swift"])
             ],
             dependencies: []
         )
 
         let hostTool = TestStandardTarget(
-            "hostTool", type: .hostBuildTool,
+            "hostTool",
+            type: .hostBuildTool,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "auto",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "auto"
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.swift"]),
+                TestSourcesBuildPhase(["main.swift"])
             ],
             dependencies: ["commonDep"]
         )
 
         let iosApp = TestStandardTarget(
-            "iosApp", type: .application,
+            "iosApp",
+            type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "iphoneos",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "iphoneos"
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.swift"]),
+                TestSourcesBuildPhase(["main.swift"])
             ],
             dependencies: [
                 "hostTool",
-                "commonDep"
+                "commonDep",
             ]
         )
 
@@ -441,25 +532,33 @@ import SWBUtil
                     groupTree: TestGroup(
                         "SomeFiles",
                         children: [
-                            TestFile("main.swift"),
-                        ]),
+                            TestFile("main.swift")
+                        ]
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])],
+                                "PRODUCT_NAME": "$(TARGET_NAME)"
+                            ]
+                        )
+                    ],
                     targets: [
                         iosApp,
                         hostTool,
-                        commonDep
-                    ])])
+                        commonDep,
+                    ]
+                )
+            ]
+        )
 
         let tester = try await BuildOperationTester(core, workspace, simulated: false)
         try await tester.checkIndexBuildGraph(targets: [iosApp, hostTool, commonDep], workspaceOperation: true) { results in
-            #expect(results.targets().map { results.targetNameAndPlatform($0) } == [
-                "commonDep-macos", "hostTool-macos", "commonDep-iphoneos", "iosApp-iphoneos", "commonDep-iphonesimulator", "iosApp-iphonesimulator", "commonDep-iosmac"
-            ])
+            #expect(
+                results.targets().map { results.targetNameAndPlatform($0) } == [
+                    "commonDep-macos", "hostTool-macos", "commonDep-iphoneos", "iosApp-iphoneos", "commonDep-iphonesimulator", "iosApp-iphonesimulator", "commonDep-iosmac",
+                ]
+            )
 
             try results.checkDependencies(of: .init(commonDep, "macos"), are: [])
             try results.checkDependencies(of: .init(commonDep, "iosmac"), are: [])
@@ -489,12 +588,15 @@ import SWBUtil
             "macApp",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx"
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.swift"]),
+                TestSourcesBuildPhase(["main.swift"])
             ],
             dependencies: ["Aggregate"]
         )
@@ -503,12 +605,15 @@ import SWBUtil
             "iosApp",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "iphoneos",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "iphoneos"
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.swift"]),
+                TestSourcesBuildPhase(["main.swift"])
             ],
             dependencies: ["Aggregate"]
         )
@@ -517,12 +622,15 @@ import SWBUtil
             "macApp2",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx"
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.swift"]),
+                TestSourcesBuildPhase(["main.swift"])
             ]
         )
 
@@ -530,12 +638,15 @@ import SWBUtil
             "iosApp2",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "iphoneos",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "iphoneos"
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.swift"]),
+                TestSourcesBuildPhase(["main.swift"])
             ]
         )
 
@@ -547,22 +658,28 @@ import SWBUtil
                     groupTree: TestGroup(
                         "SomeFiles",
                         children: [
-                            TestFile("main.swift"),
-                        ]),
+                            TestFile("main.swift")
+                        ]
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
                                 "SDKROOT": "macosx",
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])],
+                            ]
+                        )
+                    ],
                     targets: [
                         macApp, macApp2,
                         iosApp, iosApp2,
                         aggrTarget,
-                    ])])
+                    ]
+                )
+            ]
+        )
 
-        let targetsToCheck = [macApp, iosApp, macApp2, iosApp2] // excludes `aggrTarget` from top-level targets.
+        let targetsToCheck = [macApp, iosApp, macApp2, iosApp2]  // excludes `aggrTarget` from top-level targets.
         let checkDependencies = { (results: BuildOperationTester.BuildGraphResult) in
             try results.checkDependencies(of: macApp, are: [.init(aggrTarget, "macos")])
             try results.checkDependencies(of: .init(iosApp, "iphoneos"), are: [.init(aggrTarget, "iphoneos")])
@@ -578,17 +695,19 @@ import SWBUtil
 
         let tester = try await BuildOperationTester(core, workspace, simulated: false)
         try await tester.checkIndexBuildGraph(targets: targetsToCheck, workspaceOperation: true) { results in
-            #expect(results.targets().map { results.targetNameAndPlatform($0) } == [
-                "macApp2-macos",
-                "Aggregate-macos",
-                "macApp-macos",
-                "iosApp2-iphoneos",
-                "Aggregate-iphoneos",
-                "iosApp-iphoneos",
-                "iosApp2-iphonesimulator",
-                "Aggregate-iphonesimulator",
-                "iosApp-iphonesimulator",
-            ])
+            #expect(
+                results.targets().map { results.targetNameAndPlatform($0) } == [
+                    "macApp2-macos",
+                    "Aggregate-macos",
+                    "macApp-macos",
+                    "iosApp2-iphoneos",
+                    "Aggregate-iphoneos",
+                    "iosApp-iphoneos",
+                    "iosApp2-iphonesimulator",
+                    "Aggregate-iphonesimulator",
+                    "iosApp-iphonesimulator",
+                ]
+            )
 
             macApp2_macosConfTarget = try results.target(.init(macApp2, "macos"))
             iosApp2_iosConfTarget = try results.target(.init(iosApp2, "iphoneos"))
@@ -598,17 +717,19 @@ import SWBUtil
 
         // Same request but with reversed order of top-level targets. Make sure the graph is same.
         try await tester.checkIndexBuildGraph(targets: targetsToCheck.reversed(), workspaceOperation: true) { results in
-            #expect(results.targets().map { results.targetNameAndPlatform($0) } == [
-                "iosApp2-iphoneos",
-                "iosApp2-iphonesimulator",
-                "macApp2-macos",
-                "Aggregate-iphoneos",
-                "iosApp-iphoneos",
-                "Aggregate-iphonesimulator",
-                "iosApp-iphonesimulator",
-                "Aggregate-macos",
-                "macApp-macos",
-            ])
+            #expect(
+                results.targets().map { results.targetNameAndPlatform($0) } == [
+                    "iosApp2-iphoneos",
+                    "iosApp2-iphonesimulator",
+                    "macApp2-macos",
+                    "Aggregate-iphoneos",
+                    "iosApp-iphoneos",
+                    "Aggregate-iphonesimulator",
+                    "iosApp-iphonesimulator",
+                    "Aggregate-macos",
+                    "macApp-macos",
+                ]
+            )
             try checkDependencies(results)
         }
 
@@ -628,94 +749,117 @@ import SWBUtil
             "catalystApp1",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "iphoneos",
-                    "SUPPORTS_MACCATALYST": "YES",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "iphoneos",
+                        "SUPPORTS_MACCATALYST": "YES",
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase(["main.m"]),
                 TestFrameworksBuildPhase([
-                    "FwkTarget.framework",
+                    "FwkTarget.framework"
                 ]),
-            ])
+            ]
+        )
 
         let catalystAppTarget2 = TestStandardTarget(
             "catalystApp2",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "iphoneos",
-                    "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator macosx",
-                    "SDK_VARIANT[sdk=macosx*]": "iosmac",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "iphoneos",
+                        "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator macosx",
+                        "SDK_VARIANT[sdk=macosx*]": "iosmac",
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase(["main.m"]),
                 TestFrameworksBuildPhase([
-                    "FwkTarget.framework",
+                    "FwkTarget.framework"
                 ]),
-            ])
+            ]
+        )
 
         let catalystAppTarget3 = TestStandardTarget(
             "catalystApp3",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "iphoneos",
-                    "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator macosx",
-                    "SUPPORTS_MACCATALYST": "YES",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "iphoneos",
+                        "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator macosx",
+                        "SUPPORTS_MACCATALYST": "YES",
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase(["main.m"]),
                 TestFrameworksBuildPhase([
-                    "FwkTarget.framework",
+                    "FwkTarget.framework"
                 ]),
-            ])
+            ]
+        )
 
         let osxAppTarget = TestStandardTarget(
             "osxApp",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx"
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase(["main.m"]),
                 TestFrameworksBuildPhase([
                     "FwkTarget.framework"
                 ]),
-            ])
+            ]
+        )
 
         let osxAppTarget_iosmac = TestStandardTarget(
             "osxApp_iosmac",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                    "SDK_VARIANT": "iosmac",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx",
+                        "SDK_VARIANT": "iosmac",
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase(["main.m"]),
                 TestFrameworksBuildPhase([
                     "FwkTarget.framework"
                 ]),
-            ])
+            ]
+        )
 
         let fwkTarget = try await TestStandardTarget(
             "FwkTarget",
             type: .framework,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "iphoneos",
-                    "SWIFT_VERSION": swiftVersion,
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "iphoneos",
+                        "SWIFT_VERSION": swiftVersion,
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.swift"]),
+                TestSourcesBuildPhase(["main.swift"])
             ]
         )
 
@@ -723,15 +867,18 @@ import SWBUtil
             "FwkTarget_osx",
             type: .framework,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                    "PRODUCT_NAME": "FwkTarget",
-                    "SWIFT_VERSION": swiftVersion,
-                    "IS_ZIPPERED": "YES",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx",
+                        "PRODUCT_NAME": "FwkTarget",
+                        "SWIFT_VERSION": swiftVersion,
+                        "IS_ZIPPERED": "YES",
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.swift"]),
+                TestSourcesBuildPhase(["main.swift"])
             ]
         )
 
@@ -745,26 +892,34 @@ import SWBUtil
                         children: [
                             TestFile("main.swift"),
                             TestFile("main.m"),
-                        ]),
+                        ]
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])],
+                                "PRODUCT_NAME": "$(TARGET_NAME)"
+                            ]
+                        )
+                    ],
                     targets: [
                         catalystAppTarget1, catalystAppTarget2, catalystAppTarget3,
                         osxAppTarget, osxAppTarget_iosmac,
                         fwkTarget, fwkTarget_osx,
-                    ])])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await BuildOperationTester(core, workspace, simulated: false)
         let workspaceContext = WorkspaceContext(core: core, workspace: tester.workspace, processExecutionCache: .sharedForTesting)
         workspaceContext.updateUserPreferences(.defaultForTesting)
         try await tester.checkIndexBuildGraph(targets: [catalystAppTarget1, catalystAppTarget2, catalystAppTarget3, osxAppTarget, osxAppTarget_iosmac, fwkTarget, fwkTarget_osx], workspaceOperation: true) { results in
-            #expect(results.targets().map { results.targetNameAndPlatform($0) } == [
-                "FwkTarget-iphoneos", "catalystApp1-iphoneos", "FwkTarget-iphonesimulator", "catalystApp1-iphonesimulator", "FwkTarget-iosmac", "catalystApp1-iosmac", "catalystApp2-iphoneos", "catalystApp2-iphonesimulator", "catalystApp2-iosmac", "catalystApp3-iphoneos", "catalystApp3-iphonesimulator", "catalystApp3-iosmac", "FwkTarget_osx-macos", "catalystApp3-macos", "osxApp-macos", "osxApp_iosmac-iosmac", "FwkTarget_osx-iosmac",
-            ])
+            #expect(
+                results.targets().map { results.targetNameAndPlatform($0) } == [
+                    "FwkTarget-iphoneos", "catalystApp1-iphoneos", "FwkTarget-iphonesimulator", "catalystApp1-iphonesimulator", "FwkTarget-iosmac", "catalystApp1-iosmac", "catalystApp2-iphoneos", "catalystApp2-iphonesimulator", "catalystApp2-iosmac", "catalystApp3-iphoneos", "catalystApp3-iphonesimulator", "catalystApp3-iosmac", "FwkTarget_osx-macos", "catalystApp3-macos", "osxApp-macos", "osxApp_iosmac-iosmac", "FwkTarget_osx-iosmac",
+                ]
+            )
 
             try results.checkDependencies(of: .init(catalystAppTarget1, "iphoneos"), are: [.init(fwkTarget, "iphoneos")])
             try results.checkDependencies(of: .init(catalystAppTarget1, "iphonesimulator"), are: [.init(fwkTarget, "iphonesimulator")])
@@ -779,7 +934,7 @@ import SWBUtil
             try results.checkDependencies(of: osxAppTarget, are: [.init(fwkTarget_osx, "macos")])
             try results.checkDependencies(of: osxAppTarget_iosmac, are: [.init(fwkTarget, "iosmac")])
 
-            if workspaceContext.userPreferences.enableDebugActivityLogs  {
+            if workspaceContext.userPreferences.enableDebugActivityLogs {
                 results.delegate.checkDiagnostics([
                     "FwkTarget rejected as an implicit dependency because its SUPPORTED_PLATFORMS (iphoneos iphonesimulator) does not contain this target's platform (macosx). (in target 'catalystApp3' from project 'aProject')",
                     "FwkTarget rejected as an implicit dependency because its SUPPORTED_PLATFORMS (iphoneos iphonesimulator) does not contain this target's platform (macosx). (in target 'osxApp' from project 'aProject')",
@@ -811,40 +966,61 @@ import SWBUtil
     func swiftPackage() async throws {
         let core = try await getCore()
 
-        let packageLib = TestStandardTarget("PackageLib", type: .objectFile, buildConfigurations: [
-            TestBuildConfiguration("Debug")
-        ], buildPhases: [TestSourcesBuildPhase(["test.swift"])])
+        let packageLib = TestStandardTarget(
+            "PackageLib",
+            type: .objectFile,
+            buildConfigurations: [
+                TestBuildConfiguration("Debug")
+            ],
+            buildPhases: [TestSourcesBuildPhase(["test.swift"])]
+        )
 
         let packageLib2 = TestStandardTarget(
-            "PackageLib2", type: .objectFile,
+            "PackageLib2",
+            type: .objectFile,
             buildConfigurations: [TestBuildConfiguration("Debug")],
             buildPhases: [TestSourcesBuildPhase(["test.swift"])],
             dependencies: ["PackageTool"]
         )
 
-        let unreferencedPackageLib = TestStandardTarget("UnreferencedPackageLib", type: .objectFile, buildConfigurations: [
-            TestBuildConfiguration("Debug")
-        ], buildPhases: [TestSourcesBuildPhase(["test.swift"])])
+        let unreferencedPackageLib = TestStandardTarget(
+            "UnreferencedPackageLib",
+            type: .objectFile,
+            buildConfigurations: [
+                TestBuildConfiguration("Debug")
+            ],
+            buildPhases: [TestSourcesBuildPhase(["test.swift"])]
+        )
 
         let packageProduct = TestPackageProductTarget(
             "PackageLibProduct",
             frameworksBuildPhase: TestFrameworksBuildPhase([
-                TestBuildFile(.target("PackageLib"))]),
+                TestBuildFile(.target("PackageLib"))
+            ]),
             buildConfigurations: [
-                TestBuildConfiguration("Debug"),
+                TestBuildConfiguration("Debug")
             ],
             dependencies: ["PackageLib"]
         )
 
-        let packageTool = TestStandardTarget("PackageTool", type: .commandLineTool, buildConfigurations: [
-            TestBuildConfiguration("Debug", buildSettings: [
-                "EXECUTABLE_NAME": "PackageTool",
-                "SUPPORTED_PLATFORMS": "macosx",
-            ])
-        ], buildPhases: [TestSourcesBuildPhase(["test.swift"])])
+        let packageTool = TestStandardTarget(
+            "PackageTool",
+            type: .commandLineTool,
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "EXECUTABLE_NAME": "PackageTool",
+                        "SUPPORTED_PLATFORMS": "macosx",
+                    ]
+                )
+            ],
+            buildPhases: [TestSourcesBuildPhase(["test.swift"])]
+        )
 
         let package = try await TestPackageProject(
-            "aPackage", groupTree: TestGroup("Package", children: [TestFile("test.swift")]),
+            "aPackage",
+            groupTree: TestGroup("Package", children: [TestFile("test.swift")]),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -854,22 +1030,28 @@ import SWBUtil
                         "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "SWIFT_VERSION": swiftVersion,
-                    ])],
+                    ]
+                )
+            ],
             targets: [
                 packageProduct,
                 packageLib,
                 packageLib2,
                 packageTool,
                 unreferencedPackageLib,
-            ])
+            ]
+        )
 
         let macAppTarget = TestStandardTarget(
             "macAppTarget",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx"
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase(["main.swift"]),
@@ -877,15 +1059,19 @@ import SWBUtil
                     TestBuildFile(.target("PackageLibProduct"))
                 ]),
             ],
-            dependencies: ["PackageLibProduct"])
+            dependencies: ["PackageLibProduct"]
+        )
 
         let iosAppTarget = TestStandardTarget(
             "iOSAppTarget",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "iphoneos",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "iphoneos"
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase(["main.swift"]),
@@ -893,7 +1079,8 @@ import SWBUtil
                     TestBuildFile(.target("PackageLibProduct"))
                 ]),
             ],
-            dependencies: ["PackageLibProduct"])
+            dependencies: ["PackageLibProduct"]
+        )
 
         let workspace = try await TestWorkspace(
             "Test",
@@ -903,28 +1090,38 @@ import SWBUtil
                     groupTree: TestGroup(
                         "SomeFiles",
                         children: [
-                            TestFile("main.swift"),
-                        ]),
+                            TestFile("main.swift")
+                        ]
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "SWIFT_VERSION": swiftVersion,
-                            ])],
+                            ]
+                        )
+                    ],
                     targets: [
                         macAppTarget,
                         iosAppTarget,
-                    ]), package])
+                    ]
+                ), package,
+            ]
+        )
 
         let tester = try await BuildOperationTester(core, workspace, simulated: false)
         try await tester.checkIndexBuildGraph(targets: [macAppTarget, iosAppTarget], workspaceOperation: true) { results in
-            #expect(results.targets(macAppTarget).map { results.targetNameAndPlatform($0) } == [
-                "macAppTarget-macos",
-            ])
-            #expect(results.targets(iosAppTarget).map {results.targetNameAndPlatform($0) } == [
-                "iOSAppTarget-iphoneos", "iOSAppTarget-iphonesimulator",
-            ])
+            #expect(
+                results.targets(macAppTarget).map { results.targetNameAndPlatform($0) } == [
+                    "macAppTarget-macos"
+                ]
+            )
+            #expect(
+                results.targets(iosAppTarget).map { results.targetNameAndPlatform($0) } == [
+                    "iOSAppTarget-iphoneos", "iOSAppTarget-iphonesimulator",
+                ]
+            )
 
             try results.checkDependencies(of: macAppTarget, are: [.init(packageProduct, "macos")])
             try results.checkDependencies(of: .init(iosAppTarget, "iphoneos"), are: [.init(packageProduct, "iphoneos")])
@@ -933,11 +1130,11 @@ import SWBUtil
         }
 
         try await tester.checkIndexBuildGraph(targets: [packageLib, packageLib2, packageProduct, packageTool, unreferencedPackageLib], activeRunDestination: .macOS, graphTypes: TargetGraphFactory.GraphType.allCases) { results in
-            #expect(results.targets(packageTool).map{ results.targetNameAndPlatform($0) } == ["PackageTool-macos"])
-            #expect(results.targets(packageLib).map{ results.targetNameAndPlatform($0) } == ["PackageLib-macos"])
-            #expect(results.targets(packageLib2).map{ results.targetNameAndPlatform($0) } == ["PackageLib2-macos"])
-            #expect(results.targets(packageProduct).map{ results.targetNameAndPlatform($0) } == ["PackageLibProduct-macos"])
-            #expect(results.targets(unreferencedPackageLib).map{ results.targetNameAndPlatform($0) } == ["UnreferencedPackageLib-macos"])
+            #expect(results.targets(packageTool).map { results.targetNameAndPlatform($0) } == ["PackageTool-macos"])
+            #expect(results.targets(packageLib).map { results.targetNameAndPlatform($0) } == ["PackageLib-macos"])
+            #expect(results.targets(packageLib2).map { results.targetNameAndPlatform($0) } == ["PackageLib2-macos"])
+            #expect(results.targets(packageProduct).map { results.targetNameAndPlatform($0) } == ["PackageLibProduct-macos"])
+            #expect(results.targets(unreferencedPackageLib).map { results.targetNameAndPlatform($0) } == ["UnreferencedPackageLib-macos"])
 
             switch results.graphType {
             case .dependency:
@@ -949,11 +1146,11 @@ import SWBUtil
         }
 
         try await tester.checkIndexBuildGraph(targets: [packageLib, packageLib2, packageProduct, packageTool, unreferencedPackageLib], activeRunDestination: .iOS, graphTypes: TargetGraphFactory.GraphType.allCases) { results in
-            #expect(results.targets(packageTool).map{ results.targetNameAndPlatform($0) } == ["PackageTool-macos"])
-            #expect(results.targets(packageLib).map{ results.targetNameAndPlatform($0) } == ["PackageLib-iphoneos"])
-            #expect(results.targets(packageLib2).map{ results.targetNameAndPlatform($0) } == ["PackageLib2-iphoneos"])
-            #expect(results.targets(packageProduct).map{ results.targetNameAndPlatform($0) } == ["PackageLibProduct-iphoneos"])
-            #expect(results.targets(unreferencedPackageLib).map{ results.targetNameAndPlatform($0) } == ["UnreferencedPackageLib-iphoneos"])
+            #expect(results.targets(packageTool).map { results.targetNameAndPlatform($0) } == ["PackageTool-macos"])
+            #expect(results.targets(packageLib).map { results.targetNameAndPlatform($0) } == ["PackageLib-iphoneos"])
+            #expect(results.targets(packageLib2).map { results.targetNameAndPlatform($0) } == ["PackageLib2-iphoneos"])
+            #expect(results.targets(packageProduct).map { results.targetNameAndPlatform($0) } == ["PackageLibProduct-iphoneos"])
+            #expect(results.targets(unreferencedPackageLib).map { results.targetNameAndPlatform($0) } == ["UnreferencedPackageLib-iphoneos"])
 
             switch results.graphType {
             case .dependency:
@@ -973,14 +1170,18 @@ import SWBUtil
             "iosApp",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                    "SUPPORTED_PLATFORMS": "iphonesimulator iphoneos",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx",
+                        "SUPPORTED_PLATFORMS": "iphonesimulator iphoneos",
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.c"]),
-            ])
+                TestSourcesBuildPhase(["main.c"])
+            ]
+        )
 
         let workspace = TestWorkspace(
             "Test",
@@ -990,23 +1191,31 @@ import SWBUtil
                     groupTree: TestGroup(
                         "SomeFiles",
                         children: [
-                            TestFile("main.c"),
-                        ]),
+                            TestFile("main.c")
+                        ]
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])],
+                                "PRODUCT_NAME": "$(TARGET_NAME)"
+                            ]
+                        )
+                    ],
                     targets: [
-                        iosApp,
-                    ])])
+                        iosApp
+                    ]
+                )
+            ]
+        )
 
         let tester = try await BuildOperationTester(core, workspace, simulated: false)
         try await tester.checkIndexBuildGraph(targets: [iosApp], workspaceOperation: true) { results in
-            #expect(results.targets().map { results.targetNameAndPlatform($0) } == [
-                "iosApp-iphoneos", "iosApp-iphonesimulator",
-            ])
+            #expect(
+                results.targets().map { results.targetNameAndPlatform($0) } == [
+                    "iosApp-iphoneos", "iosApp-iphonesimulator",
+                ]
+            )
             results.delegate.checkNoDiagnostics()
         }
     }
@@ -1020,14 +1229,18 @@ import SWBUtil
                 name,
                 type: .application,
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": sdkRoot,
-                        "ARCHS": archs,
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "SDKROOT": sdkRoot,
+                            "ARCHS": archs,
+                        ]
+                    )
                 ],
                 buildPhases: [
-                    TestSourcesBuildPhase(["main.swift"]),
-                ])
+                    TestSourcesBuildPhase(["main.swift"])
+                ]
+            )
         }
         let macosApp = createTarget(name: "macosApp", sdkRoot: "macosx", archs: "x86_64 arm64")
         let iosApp = createTarget(name: "iosApp", sdkRoot: "iphoneos", archs: "arm64")
@@ -1041,19 +1254,25 @@ import SWBUtil
                     groupTree: TestGroup(
                         "SomeFiles",
                         children: [
-                            TestFile("main.swift"),
-                        ]),
+                            TestFile("main.swift")
+                        ]
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])],
+                                "PRODUCT_NAME": "$(TARGET_NAME)"
+                            ]
+                        )
+                    ],
                     targets: [
                         macosApp,
                         iosApp,
                         driver,
-                    ])])
+                    ]
+                )
+            ]
+        )
 
         func checkTargetArch(_ arch: String, expected: [String: String], sourceLocation: SourceLocation = #_sourceLocation) async throws {
             let tester = try await BuildOperationTester(core, workspace, simulated: false)
@@ -1067,18 +1286,24 @@ import SWBUtil
             }
         }
 
-        try await checkTargetArch("x86_64", expected: [
-            "macosApp-macos": "x86_64",
-            "iosApp-iphoneos": "arm64",
-            "iosApp-iphonesimulator": "x86_64",
-            "driver-driverkit": "x86_64",
-        ])
-        try await checkTargetArch("arm64", expected: [
-            "macosApp-macos": "arm64",
-            "iosApp-iphoneos": "arm64",
-            "iosApp-iphonesimulator": "arm64",
-            "driver-driverkit": "arm64",
-        ])
+        try await checkTargetArch(
+            "x86_64",
+            expected: [
+                "macosApp-macos": "x86_64",
+                "iosApp-iphoneos": "arm64",
+                "iosApp-iphonesimulator": "x86_64",
+                "driver-driverkit": "x86_64",
+            ]
+        )
+        try await checkTargetArch(
+            "arm64",
+            expected: [
+                "macosApp-macos": "arm64",
+                "iosApp-iphoneos": "arm64",
+                "iosApp-iphonesimulator": "arm64",
+                "driver-driverkit": "arm64",
+            ]
+        )
     }
 }
 
diff --git a/Tests/SWBCoreTests/ModuleVerifierFilenameMapTests.swift b/Tests/SWBCoreTests/ModuleVerifierFilenameMapTests.swift
index 604b8311..4f9866b1 100644
--- a/Tests/SWBCoreTests/ModuleVerifierFilenameMapTests.swift
+++ b/Tests/SWBCoreTests/ModuleVerifierFilenameMapTests.swift
@@ -22,13 +22,16 @@ import SWBTestSupport
         let fs = PseudoFS()
         try await withTemporaryDirectory(fs: fs) { tmpDir in
             let path = tmpDir.join("sampleFilenameMap.json")
-            try await fs.writeJSON(path, [
-                "case-sensitive":"false",
-                "contents": [
-                    "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/usr/include/err.h":"/tmp/DerivedData/test/Build/Products/Debug/test.framework/Headers/err.h"
-                ],
-                "version":"0"
-            ])
+            try await fs.writeJSON(
+                path,
+                [
+                    "case-sensitive": "false",
+                    "contents": [
+                        "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/usr/include/err.h": "/tmp/DerivedData/test/Build/Products/Debug/test.framework/Headers/err.h"
+                    ],
+                    "version": "0",
+                ]
+            )
 
             let filenameMap = ModuleVerifierFilenameMap(from: path, fs: fs)
             let filename = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/usr/include/err.h"
diff --git a/Tests/SWBCoreTests/ModuleVerifierFrameworkTests.swift b/Tests/SWBCoreTests/ModuleVerifierFrameworkTests.swift
index 17e0a215..acb7c15e 100644
--- a/Tests/SWBCoreTests/ModuleVerifierFrameworkTests.swift
+++ b/Tests/SWBCoreTests/ModuleVerifierFrameworkTests.swift
@@ -23,60 +23,86 @@ import Testing
         }
     }
 
-    fileprivate func assert(_ frameworkInstance: ModuleVerifierFramework,
-                            path: Path,
-                            inSDK: Bool,
-                            framework: String,
-                            name: String,
-                            headersPath: Path,
-                            privateHeadersPath: Path,
-                            publicHeaderNames: [String],
-                            privateHeaderNames: [String],
-                            hasPublicModuleMap: Bool,
-                            hasPrivateModuleMap: Bool,
-                            hasPublicUmbrellaHeader: Bool,
-                            hasPrivateUmbrellaHeader: Bool,
-                            additionalModuleMapsCount: Int,
-                            additionalModuleFilesCount: Int) {
-
-        #expect(frameworkInstance.directory == path,
-                "path is \(frameworkInstance.directory), should be \(path)")
-
-        #expect(frameworkInstance.inSDK == inSDK,
-                "inSDK is \(frameworkInstance.inSDK), should be \(inSDK)")
-
-        #expect(frameworkInstance.framework == framework,
-                "framework is \(frameworkInstance.framework), should be \(framework)")
-
-        #expect(frameworkInstance.name == name,
-                "name is \(frameworkInstance.name), should be \(name)")
-
-        #expect(frameworkInstance.headersDirectory == headersPath,
-                "headersPath is \(frameworkInstance.headersDirectory), should be \(headersPath)")
-
-        #expect(frameworkInstance.privateHeadersDirectory == privateHeadersPath,
-                "privateHeadersPath is \(frameworkInstance.privateHeadersDirectory), should be \(privateHeadersPath)")
-
-        #expect(frameworkInstance.publicHeaderNames == publicHeaderNames,
-                "publicHeaderNames is \(frameworkInstance.publicHeaderNames), should be \(publicHeaderNames)")
-
-        #expect(frameworkInstance.privateHeaderNames == privateHeaderNames,
-                "privateHeaderNames is \(frameworkInstance.privateHeaderNames), should be \(privateHeaderNames)")
+    fileprivate func assert(
+        _ frameworkInstance: ModuleVerifierFramework,
+        path: Path,
+        inSDK: Bool,
+        framework: String,
+        name: String,
+        headersPath: Path,
+        privateHeadersPath: Path,
+        publicHeaderNames: [String],
+        privateHeaderNames: [String],
+        hasPublicModuleMap: Bool,
+        hasPrivateModuleMap: Bool,
+        hasPublicUmbrellaHeader: Bool,
+        hasPrivateUmbrellaHeader: Bool,
+        additionalModuleMapsCount: Int,
+        additionalModuleFilesCount: Int
+    ) {
+
+        #expect(
+            frameworkInstance.directory == path,
+            "path is \(frameworkInstance.directory), should be \(path)"
+        )
+
+        #expect(
+            frameworkInstance.inSDK == inSDK,
+            "inSDK is \(frameworkInstance.inSDK), should be \(inSDK)"
+        )
+
+        #expect(
+            frameworkInstance.framework == framework,
+            "framework is \(frameworkInstance.framework), should be \(framework)"
+        )
+
+        #expect(
+            frameworkInstance.name == name,
+            "name is \(frameworkInstance.name), should be \(name)"
+        )
+
+        #expect(
+            frameworkInstance.headersDirectory == headersPath,
+            "headersPath is \(frameworkInstance.headersDirectory), should be \(headersPath)"
+        )
+
+        #expect(
+            frameworkInstance.privateHeadersDirectory == privateHeadersPath,
+            "privateHeadersPath is \(frameworkInstance.privateHeadersDirectory), should be \(privateHeadersPath)"
+        )
+
+        #expect(
+            frameworkInstance.publicHeaderNames == publicHeaderNames,
+            "publicHeaderNames is \(frameworkInstance.publicHeaderNames), should be \(publicHeaderNames)"
+        )
+
+        #expect(
+            frameworkInstance.privateHeaderNames == privateHeaderNames,
+            "privateHeaderNames is \(frameworkInstance.privateHeaderNames), should be \(privateHeaderNames)"
+        )
 
         if hasPublicModuleMap {
-            #expect(frameworkInstance.publicModuleMap != nil,
-                    "publicModuleMap is nil")
+            #expect(
+                frameworkInstance.publicModuleMap != nil,
+                "publicModuleMap is nil"
+            )
         } else {
-            #expect(frameworkInstance.publicModuleMap == nil,
-                    "hasPublicModuleMap should be nil instead of \(frameworkInstance.publicModuleMap?.path.str ?? "")")
+            #expect(
+                frameworkInstance.publicModuleMap == nil,
+                "hasPublicModuleMap should be nil instead of \(frameworkInstance.publicModuleMap?.path.str ?? "")"
+            )
         }
 
         if hasPrivateModuleMap {
-            #expect(frameworkInstance.privateModuleMap != nil,
-                    "privateModuleMap is nil")
+            #expect(
+                frameworkInstance.privateModuleMap != nil,
+                "privateModuleMap is nil"
+            )
         } else {
-            #expect(frameworkInstance.privateModuleMap == nil,
-                    "hasPrivateModuleMap should be nil instead of \(frameworkInstance.privateModuleMap?.path.str ?? "")")
+            #expect(
+                frameworkInstance.privateModuleMap == nil,
+                "hasPrivateModuleMap should be nil instead of \(frameworkInstance.privateModuleMap?.path.str ?? "")"
+            )
         }
 
         if hasPublicUmbrellaHeader {
@@ -91,11 +117,15 @@ import Testing
             #expect(frameworkInstance.privateUmbrellaHeader == nil, "privateUmbrellaHeader should be nil instead of \(frameworkInstance.publicUmbrellaHeader?.file.str ?? "")")
         }
 
-        #expect(frameworkInstance.additionalModuleMaps.count == additionalModuleMapsCount,
-                "path is \(frameworkInstance.additionalModuleMaps.count), should be \(additionalModuleMapsCount).  additionalModuleMaps=\(frameworkInstance.additionalModuleMaps.map { $0.path.str })")
+        #expect(
+            frameworkInstance.additionalModuleMaps.count == additionalModuleMapsCount,
+            "path is \(frameworkInstance.additionalModuleMaps.count), should be \(additionalModuleMapsCount).  additionalModuleMaps=\(frameworkInstance.additionalModuleMaps.map { $0.path.str })"
+        )
 
-        #expect(frameworkInstance.additionalModuleFiles.count == additionalModuleFilesCount,
-                "additionalModuleFilesCount is \(frameworkInstance.additionalModuleFiles.count), should be \(additionalModuleFilesCount).  additionalModuleFiles=\(frameworkInstance.additionalModuleFiles.map { $0.str })")
+        #expect(
+            frameworkInstance.additionalModuleFiles.count == additionalModuleFilesCount,
+            "additionalModuleFilesCount is \(frameworkInstance.additionalModuleFiles.count), should be \(additionalModuleFilesCount).  additionalModuleFiles=\(frameworkInstance.additionalModuleFiles.map { $0.str })"
+        )
     }
 
     @Test
@@ -106,59 +136,73 @@ import Testing
         let frameworkPath = tmpDir.join(framework)
         try fs.createDirectory(frameworkPath.join("Headers"), recursive: true)
         try fs.createDirectory(frameworkPath.join("Modules"), recursive: true)
-        try fs.write(frameworkPath.join("Headers/BadHeader.h"), contents: """
-            #if THIS_MACRO_IS_NOT_DEFINED
-            int x = 1;
-            #endif
-
-            #if TARGET_OS_MAC
-            int y = 2;
-            #endif
-
-            void bad_function( int );
-
-            inline void inline_function(void) {
-                unsigned char z;
-            }
-            """)
-        try fs.write(frameworkPath.join("Modules/module.modulemap"), contents: """
-            framework module BadFramework {
-                umbrella "Headers"
-                export *
-                module * { export * }
-            }
-            """)
-        try fs.write(frameworkPath.join("module.map"), contents: """
-            framework module BadFramework {
-                umbrella "Headers"
-                export *
-                module * { export * }
-            }
-            """)
-        try fs.write(frameworkPath.join("Modules/additionalFile"), contents: """
-            framework module BadFramework {
-                umbrella "Headers"
-                export *
-                module * { export * }
-            }
-            """)
+        try fs.write(
+            frameworkPath.join("Headers/BadHeader.h"),
+            contents: """
+                #if THIS_MACRO_IS_NOT_DEFINED
+                int x = 1;
+                #endif
+
+                #if TARGET_OS_MAC
+                int y = 2;
+                #endif
+
+                void bad_function( int );
+
+                inline void inline_function(void) {
+                    unsigned char z;
+                }
+                """
+        )
+        try fs.write(
+            frameworkPath.join("Modules/module.modulemap"),
+            contents: """
+                framework module BadFramework {
+                    umbrella "Headers"
+                    export *
+                    module * { export * }
+                }
+                """
+        )
+        try fs.write(
+            frameworkPath.join("module.map"),
+            contents: """
+                framework module BadFramework {
+                    umbrella "Headers"
+                    export *
+                    module * { export * }
+                }
+                """
+        )
+        try fs.write(
+            frameworkPath.join("Modules/additionalFile"),
+            contents: """
+                framework module BadFramework {
+                    umbrella "Headers"
+                    export *
+                    module * { export * }
+                }
+                """
+        )
         let testFramework = try await ModuleVerifierFramework(directory: frameworkPath, fs: fs, inSDK: false, specLookupContext: specLookupContext)
 
-        self.assert(testFramework,
-                    path: frameworkPath,
-                    inSDK: false,
-                    framework: framework,
-                    name: framework.replacingOccurrences(of: ".framework", with: ""),
-                    headersPath: frameworkPath.join("Headers"),
-                    privateHeadersPath: frameworkPath.join("PrivateHeaders"),
-                    publicHeaderNames: ["BadHeader.h"],
-                    privateHeaderNames: [],
-                    hasPublicModuleMap: true,
-                    hasPrivateModuleMap: false,
-                    hasPublicUmbrellaHeader: false,
-                    hasPrivateUmbrellaHeader: false,
-                    additionalModuleMapsCount: 1,
-                    additionalModuleFilesCount: 1)
+        self.assert(
+            testFramework,
+            path: frameworkPath,
+            inSDK: false,
+            framework: framework,
+            name: framework.replacingOccurrences(of: ".framework", with: ""),
+            headersPath: frameworkPath.join("Headers"),
+            privateHeadersPath: frameworkPath.join("PrivateHeaders"),
+            publicHeaderNames: ["BadHeader.h"],
+            privateHeaderNames: [],
+            hasPublicModuleMap: true,
+            hasPrivateModuleMap: false,
+            hasPublicUmbrellaHeader: false,
+            hasPrivateUmbrellaHeader: false,
+            additionalModuleMapsCount: 1,
+            additionalModuleFilesCount: 1
+        )
     }
 
     @Test
@@ -169,37 +213,45 @@ import Testing
         let frameworkPath = tmpDir.join(framework)
         try fs.createDirectory(frameworkPath.join("Headers"), recursive: true)
         try fs.createDirectory(frameworkPath.join("Modules"), recursive: true)
-        try fs.write(frameworkPath.join("Headers/NewHeader.h"), contents: """
-            #if THIS_MACRO_IS_NOT_DEFINED
-            int x = 1;
-            #endif
-
-            void new_function( int );
-            """)
-        try fs.write(frameworkPath.join("Modules/module.modulemap"), contents: """
-            framework module NewFramework {
-                umbrella "Headers"
-                export *
-                module * { export * }
-            }
-            """)
+        try fs.write(
+            frameworkPath.join("Headers/NewHeader.h"),
+            contents: """
+                #if THIS_MACRO_IS_NOT_DEFINED
+                int x = 1;
+                #endif
+
+                void new_function( int );
+                """
+        )
+        try fs.write(
+            frameworkPath.join("Modules/module.modulemap"),
+            contents: """
+                framework module NewFramework {
+                    umbrella "Headers"
+                    export *
+                    module * { export * }
+                }
+                """
+        )
         let testFramework = try await ModuleVerifierFramework(directory: frameworkPath, fs: fs, inSDK: false, specLookupContext: specLookupContext)
 
-        self.assert(testFramework,
-                    path: frameworkPath,
-                    inSDK: false,
-                    framework: framework,
-                    name: framework.replacingOccurrences(of: ".framework", with: ""),
-                    headersPath: frameworkPath.join("Headers"),
-                    privateHeadersPath: frameworkPath.join("PrivateHeaders"),
-                    publicHeaderNames: ["NewHeader.h"],
-                    privateHeaderNames: [],
-                    hasPublicModuleMap: true,
-                    hasPrivateModuleMap: false,
-                    hasPublicUmbrellaHeader: false,
-                    hasPrivateUmbrellaHeader: false,
-                    additionalModuleMapsCount: 0,
-                    additionalModuleFilesCount: 0)
+        self.assert(
+            testFramework,
+            path: frameworkPath,
+            inSDK: false,
+            framework: framework,
+            name: framework.replacingOccurrences(of: ".framework", with: ""),
+            headersPath: frameworkPath.join("Headers"),
+            privateHeadersPath: frameworkPath.join("PrivateHeaders"),
+            publicHeaderNames: ["NewHeader.h"],
+            privateHeaderNames: [],
+            hasPublicModuleMap: true,
+            hasPrivateModuleMap: false,
+            hasPublicUmbrellaHeader: false,
+            hasPrivateUmbrellaHeader: false,
+            additionalModuleMapsCount: 0,
+            additionalModuleFilesCount: 0
+        )
     }
 
     @Test
@@ -211,51 +263,71 @@ import Testing
         try fs.createDirectory(frameworkPath.join("Headers"), recursive: true)
         try fs.createDirectory(frameworkPath.join("PrivateHeaders"), recursive: true)
         try fs.createDirectory(frameworkPath.join("Modules"), recursive: true)
-        try fs.write(frameworkPath.join("Headers/PerfectFramework.h"), contents: """
-            #import <PerfectFramework/PerfectHeader.h>
-            """)
-        try fs.write(frameworkPath.join("Headers/PerfectHeader.h"), contents: """
-            void perfect_function( int );
-            """)
-        try fs.write(frameworkPath.join("PrivateHeaders/PerfectFramework_Private.h"), contents: """
-            #import <PerfectFramework/PerfectPrivateHeader.h>
-            """)
-        try fs.write(frameworkPath.join("PrivateHeaders/PerfectPrivateHeader.h"), contents: """
-            void perfect_private_function( int );
-            """)
-        try fs.write(frameworkPath.join("Modules/module.modulemap"), contents: """
-            framework module PerfectFramework [system] [extern_c] {
-                umbrella header "PerfectFramework.h"
-                export *
-                module * { export * }
-            }
-            """)
-        try fs.write(frameworkPath.join("Modules/module.private.modulemap"), contents: """
-            framework module PerfectFramework_Private [system] [extern_c] {
-                umbrella header "PerfectFramework_Private.h"
-                export *
-                module * { export * }
-            }
-            """)
+        try fs.write(
+            frameworkPath.join("Headers/PerfectFramework.h"),
+            contents: """
+                #import <PerfectFramework/PerfectHeader.h>
+                """
+        )
+        try fs.write(
+            frameworkPath.join("Headers/PerfectHeader.h"),
+            contents: """
+                void perfect_function( int );
+                """
+        )
+        try fs.write(
+            frameworkPath.join("PrivateHeaders/PerfectFramework_Private.h"),
+            contents: """
+                #import <PerfectFramework/PerfectPrivateHeader.h>
+                """
+        )
+        try fs.write(
+            frameworkPath.join("PrivateHeaders/PerfectPrivateHeader.h"),
+            contents: """
+                void perfect_private_function( int );
+                """
+        )
+        try fs.write(
+            frameworkPath.join("Modules/module.modulemap"),
+            contents: """
+                framework module PerfectFramework [system] [extern_c] {
+                    umbrella header "PerfectFramework.h"
+                    export *
+                    module * { export * }
+                }
+                """
+        )
+        try fs.write(
+            frameworkPath.join("Modules/module.private.modulemap"),
+            contents: """
+                framework module PerfectFramework_Private [system] [extern_c] {
+                    umbrella header "PerfectFramework_Private.h"
+                    export *
+                    module * { export * }
+                }
+                """
+        )
         try fs.write(frameworkPath.join("PerfectFramework.tbd"), contents: "")
 
         let testFramework = try await ModuleVerifierFramework(directory: frameworkPath, fs: fs, inSDK: false, specLookupContext: specLookupContext)
 
-        self.assert(testFramework,
-                    path: frameworkPath,
-                    inSDK: false,
-                    framework: framework,
-                    name: framework.replacingOccurrences(of: ".framework", with: ""),
-                    headersPath: frameworkPath.join("Headers"),
-                    privateHeadersPath: frameworkPath.join("PrivateHeaders"),
-                    publicHeaderNames: ["PerfectFramework.h", "PerfectHeader.h"],
-                    privateHeaderNames: ["PerfectFramework_Private.h", "PerfectPrivateHeader.h"],
-                    hasPublicModuleMap: true,
-                    hasPrivateModuleMap: true,
-                    hasPublicUmbrellaHeader: true,
-                    hasPrivateUmbrellaHeader: true,
-                    additionalModuleMapsCount: 0,
-                    additionalModuleFilesCount: 0)
+        self.assert(
+            testFramework,
+            path: frameworkPath,
+            inSDK: false,
+            framework: framework,
+            name: framework.replacingOccurrences(of: ".framework", with: ""),
+            headersPath: frameworkPath.join("Headers"),
+            privateHeadersPath: frameworkPath.join("PrivateHeaders"),
+            publicHeaderNames: ["PerfectFramework.h", "PerfectHeader.h"],
+            privateHeaderNames: ["PerfectFramework_Private.h", "PerfectPrivateHeader.h"],
+            hasPublicModuleMap: true,
+            hasPrivateModuleMap: true,
+            hasPublicUmbrellaHeader: true,
+            hasPrivateUmbrellaHeader: true,
+            additionalModuleMapsCount: 0,
+            additionalModuleFilesCount: 0
+        )
     }
 
     @Test
@@ -266,36 +338,47 @@ import Testing
         let frameworkPath = tmpDir.join(framework)
         try fs.createDirectory(frameworkPath.join("PrivateHeaders"), recursive: true)
         try fs.createDirectory(frameworkPath.join("Modules"), recursive: true)
-        try fs.write(frameworkPath.join("PrivateHeaders/PrivateOnlyPublicModule_Private.h"), contents: """
-            #import <PrivateOnlyPublicModule/PrivateHeader.h>
-            """)
-        try fs.write(frameworkPath.join("PrivateHeaders/PrivateHeader.h"), contents: """
-            void perfect_private_function( int );
-            """)
-        try fs.write(frameworkPath.join("Modules/module.modulemap"), contents: """
-            framework module PrivateOnlyPublicModule_Private [system] [extern_c] {
-                umbrella header "PrivateOnlyPublicModule_Private.h"
-                export *
-                module * { export * }
-            }
-            """)
+        try fs.write(
+            frameworkPath.join("PrivateHeaders/PrivateOnlyPublicModule_Private.h"),
+            contents: """
+                #import <PrivateOnlyPublicModule/PrivateHeader.h>
+                """
+        )
+        try fs.write(
+            frameworkPath.join("PrivateHeaders/PrivateHeader.h"),
+            contents: """
+                void perfect_private_function( int );
+                """
+        )
+        try fs.write(
+            frameworkPath.join("Modules/module.modulemap"),
+            contents: """
+                framework module PrivateOnlyPublicModule_Private [system] [extern_c] {
+                    umbrella header "PrivateOnlyPublicModule_Private.h"
+                    export *
+                    module * { export * }
+                }
+                """
+        )
         let testFramework = try await ModuleVerifierFramework(directory: frameworkPath, fs: fs, inSDK: false, specLookupContext: specLookupContext)
 
-        self.assert(testFramework,
-                    path: frameworkPath,
-                    inSDK: false,
-                    framework: framework,
-                    name: framework.replacingOccurrences(of: ".framework", with: ""),
-                    headersPath: frameworkPath.join("Headers"),
-                    privateHeadersPath: frameworkPath.join("PrivateHeaders"),
-                    publicHeaderNames: [],
-                    privateHeaderNames: ["PrivateHeader.h", "PrivateOnlyPublicModule_Private.h"],
-                    hasPublicModuleMap: false,
-                    hasPrivateModuleMap: true,
-                    hasPublicUmbrellaHeader: false,
-                    hasPrivateUmbrellaHeader: true,
-                    additionalModuleMapsCount: 0,
-                    additionalModuleFilesCount: 0)
+        self.assert(
+            testFramework,
+            path: frameworkPath,
+            inSDK: false,
+            framework: framework,
+            name: framework.replacingOccurrences(of: ".framework", with: ""),
+            headersPath: frameworkPath.join("Headers"),
+            privateHeadersPath: frameworkPath.join("PrivateHeaders"),
+            publicHeaderNames: [],
+            privateHeaderNames: ["PrivateHeader.h", "PrivateOnlyPublicModule_Private.h"],
+            hasPublicModuleMap: false,
+            hasPrivateModuleMap: true,
+            hasPublicUmbrellaHeader: false,
+            hasPrivateUmbrellaHeader: true,
+            additionalModuleMapsCount: 0,
+            additionalModuleFilesCount: 0
+        )
     }
 
     @Test
@@ -306,37 +389,48 @@ import Testing
         let frameworkPath = tmpDir.join(framework)
         try fs.createDirectory(frameworkPath.join("PrivateHeaders"), recursive: true)
         try fs.createDirectory(frameworkPath.join("Modules"), recursive: true)
-        try fs.write(frameworkPath.join("PrivateHeaders/PrivateOnlyPublicPrivateModule_Private.h"), contents: """
-            #import <PrivateOnlyPublicModule/PrivateHeader.h>
-            """)
-        try fs.write(frameworkPath.join("PrivateHeaders/PrivateHeader.h"), contents: """
-            void private_function( int );
-            """)
+        try fs.write(
+            frameworkPath.join("PrivateHeaders/PrivateOnlyPublicPrivateModule_Private.h"),
+            contents: """
+                #import <PrivateOnlyPublicModule/PrivateHeader.h>
+                """
+        )
+        try fs.write(
+            frameworkPath.join("PrivateHeaders/PrivateHeader.h"),
+            contents: """
+                void private_function( int );
+                """
+        )
         try fs.write(frameworkPath.join("Modules/module.modulemap"), contents: "")
-        try fs.write(frameworkPath.join("Modules/module.private.modulemap"), contents: """
-            framework module PrivateOnlyPublicPrivateModule [system] {
-                umbrella header "PrivateOnlyPublicPrivateModule_Private.h"
-                export *
-                module * { export * }
-            }
-            """)
+        try fs.write(
+            frameworkPath.join("Modules/module.private.modulemap"),
+            contents: """
+                framework module PrivateOnlyPublicPrivateModule [system] {
+                    umbrella header "PrivateOnlyPublicPrivateModule_Private.h"
+                    export *
+                    module * { export * }
+                }
+                """
+        )
         let testFramework = try await ModuleVerifierFramework(directory: frameworkPath, fs: fs, inSDK: false, specLookupContext: specLookupContext)
 
-        self.assert(testFramework,
-                    path: frameworkPath,
-                    inSDK: false,
-                    framework: framework,
-                    name: framework.replacingOccurrences(of: ".framework", with: ""),
-                    headersPath: frameworkPath.join("Headers"),
-                    privateHeadersPath: frameworkPath.join("PrivateHeaders"),
-                    publicHeaderNames: [],
-                    privateHeaderNames: ["PrivateHeader.h", "PrivateOnlyPublicPrivateModule_Private.h"],
-                    hasPublicModuleMap: true,
-                    hasPrivateModuleMap: true,
-                    hasPublicUmbrellaHeader: false,
-                    hasPrivateUmbrellaHeader: true,
-                    additionalModuleMapsCount: 0,
-                    additionalModuleFilesCount: 0)
+        self.assert(
+            testFramework,
+            path: frameworkPath,
+            inSDK: false,
+            framework: framework,
+            name: framework.replacingOccurrences(of: ".framework", with: ""),
+            headersPath: frameworkPath.join("Headers"),
+            privateHeadersPath: frameworkPath.join("PrivateHeaders"),
+            publicHeaderNames: [],
+            privateHeaderNames: ["PrivateHeader.h", "PrivateOnlyPublicPrivateModule_Private.h"],
+            hasPublicModuleMap: true,
+            hasPrivateModuleMap: true,
+            hasPublicUmbrellaHeader: false,
+            hasPrivateUmbrellaHeader: true,
+            additionalModuleMapsCount: 0,
+            additionalModuleFilesCount: 0
+        )
     }
 
     @Test
@@ -350,39 +444,57 @@ import Testing
         try fs.createDirectory(frameworkPath.join("Modules"), recursive: true)
         try fs.write(frameworkPath.join("Headers/FrameworkWithNonModularHeaders.h"), contents: "")
         try fs.write(frameworkPath.join("Headers/NonModular.h"), contents: "")
-        try fs.write(frameworkPath.join("PrivateHeaders/Modular.h"), contents: """
-            #import <PerfectFramework/PerfectPrivateHeader.h>
-            """)
-        try fs.write(frameworkPath.join("PrivateHeaders/Private.h"), contents: """
-            void perfect_private_function( int );
-            """)
-        try fs.write(frameworkPath.join("PrivateHeaders/PrivateTextual.h"), contents: """
-            void perfect_private_function( int );
-            """)
-        try fs.write(frameworkPath.join("PrivateHeaders/Excluded.h"), contents: """
-            void perfect_private_function( int );
-            """)
-        try fs.write(frameworkPath.join("Modules/module.modulemap"), contents: """
-            framework module FrameworkWithNonModularHeaders [system] {
-              umbrella header "FrameworkWithNonModularHeaders.h"
-
-              exclude header "NonModular.h"
-
-              export *
-              module * { export * }
-            }
-            """)
-        try fs.write(frameworkPath.join("Modules/module.private.modulemap"), contents: """
-            framework module FrameworkWithNonModularHeaders_Private [system] {
-              umbrella "PrivateHeaders"
-
-              exclude header "Excluded.h"
-              private header "Private.h"
-              private  textual   header    "PrivateTextual.h"
-
-              module * { export * }
-            }
-            """)
+        try fs.write(
+            frameworkPath.join("PrivateHeaders/Modular.h"),
+            contents: """
+                #import <PerfectFramework/PerfectPrivateHeader.h>
+                """
+        )
+        try fs.write(
+            frameworkPath.join("PrivateHeaders/Private.h"),
+            contents: """
+                void perfect_private_function( int );
+                """
+        )
+        try fs.write(
+            frameworkPath.join("PrivateHeaders/PrivateTextual.h"),
+            contents: """
+                void perfect_private_function( int );
+                """
+        )
+        try fs.write(
+            frameworkPath.join("PrivateHeaders/Excluded.h"),
+            contents: """
+                void perfect_private_function( int );
+                """
+        )
+        try fs.write(
+            frameworkPath.join("Modules/module.modulemap"),
+            contents: """
+                framework module FrameworkWithNonModularHeaders [system] {
+                  umbrella header "FrameworkWithNonModularHeaders.h"
+
+                  exclude header "NonModular.h"
+
+                  export *
+                  module * { export * }
+                }
+                """
+        )
+        try fs.write(
+            frameworkPath.join("Modules/module.private.modulemap"),
+            contents: """
+                framework module FrameworkWithNonModularHeaders_Private [system] {
+                  umbrella "PrivateHeaders"
+
+                  exclude header "Excluded.h"
+                  private header "Private.h"
+                  private  textual   header    "PrivateTextual.h"
+
+                  module * { export * }
+                }
+                """
+        )
         let testFramework = try await ModuleVerifierFramework(directory: frameworkPath, fs: fs, inSDK: false, specLookupContext: specLookupContext)
 
         let publicIncludes = testFramework.allHeaderIncludes(language: .c)
diff --git a/Tests/SWBCoreTests/ModuleVerifierHeaderTests.swift b/Tests/SWBCoreTests/ModuleVerifierHeaderTests.swift
index a88a9b44..374d13d2 100644
--- a/Tests/SWBCoreTests/ModuleVerifierHeaderTests.swift
+++ b/Tests/SWBCoreTests/ModuleVerifierHeaderTests.swift
@@ -29,20 +29,25 @@ import Testing
         try withTemporaryDirectory { tmpDir in
             let headerPath = tmpDir.join("PerfectFramework.framework/Versions/A/Headers/PerfectFramework.h")
             try localFS.createDirectory(headerPath.dirname, recursive: true)
-            try localFS.write(headerPath, contents: """
-                #import <PerfectFramework/PerfectHeader.h>
-                """)
+            try localFS.write(
+                headerPath,
+                contents: """
+                    #import <PerfectFramework/PerfectHeader.h>
+                    """
+            )
 
             let header = ModuleVerifierHeader(header: headerPath, frameworkName: "PerfectFramework")
 
-            self.assert(header: header,
-                        file: headerPath,
-                        frameworkName: "PerfectFramework",
-                        subFolder: [],
-                        headerName: "PerfectFramework.h",
-                        language: .objectiveC,
-                        include: "#import <PerfectFramework/PerfectFramework.h>",
-                        cPlusPlus: false)
+            self.assert(
+                header: header,
+                file: headerPath,
+                frameworkName: "PerfectFramework",
+                subFolder: [],
+                headerName: "PerfectFramework.h",
+                language: .objectiveC,
+                include: "#import <PerfectFramework/PerfectFramework.h>",
+                cPlusPlus: false
+            )
         }
     }
 }
diff --git a/Tests/SWBCoreTests/ModuleVerifierModuleMapTests.swift b/Tests/SWBCoreTests/ModuleVerifierModuleMapTests.swift
index f0dedb48..c7170dcd 100644
--- a/Tests/SWBCoreTests/ModuleVerifierModuleMapTests.swift
+++ b/Tests/SWBCoreTests/ModuleVerifierModuleMapTests.swift
@@ -33,22 +33,27 @@ import Testing
         let frameworkPath = tmpDir.join("\(frameworkName).framework")
         let modulemapPath = frameworkPath.join("Versions/A/Modules/module.modulemap")
         try fs.createDirectory(modulemapPath.dirname, recursive: true)
-        try fs.write(modulemapPath, contents: """
-            framework module BadFramework {
-                umbrella "Headers"
-                export *
-                module * { export * }
-            }
-            """)
+        try fs.write(
+            modulemapPath,
+            contents: """
+                framework module BadFramework {
+                    umbrella "Headers"
+                    export *
+                    module * { export * }
+                }
+                """
+        )
 
         let moduleMap = try ModuleVerifierModuleMap(moduleMap: modulemapPath, fs: fs, frameworkName: frameworkName)
 
-        assert(moduleMap: moduleMap,
-               kind: .publicModule,
-               path: modulemapPath,
-               frameworkName: frameworkName,
-               modules: [frameworkName],
-               isInPreferredPath: true)
+        assert(
+            moduleMap: moduleMap,
+            kind: .publicModule,
+            path: modulemapPath,
+            frameworkName: frameworkName,
+            modules: [frameworkName],
+            isInPreferredPath: true
+        )
     }
 
     @Test
@@ -59,22 +64,27 @@ import Testing
         let frameworkPath = tmpDir.join("\(frameworkName).framework")
         let modulemapPath = frameworkPath.join("Versions/A/Modules/module.modulemap")
         try fs.createDirectory(modulemapPath.dirname, recursive: true)
-        try fs.write(modulemapPath, contents: """
-            framework module NewFramework {
-                umbrella "Headers"
-                export *
-                module * { export * }
-            }
-            """)
+        try fs.write(
+            modulemapPath,
+            contents: """
+                framework module NewFramework {
+                    umbrella "Headers"
+                    export *
+                    module * { export * }
+                }
+                """
+        )
 
         let moduleMap = try ModuleVerifierModuleMap(moduleMap: modulemapPath, fs: fs, frameworkName: frameworkName)
 
-        assert(moduleMap: moduleMap,
-               kind: .publicModule,
-               path: modulemapPath,
-               frameworkName: frameworkName,
-               modules: [frameworkName],
-               isInPreferredPath: true)
+        assert(
+            moduleMap: moduleMap,
+            kind: .publicModule,
+            path: modulemapPath,
+            frameworkName: frameworkName,
+            modules: [frameworkName],
+            isInPreferredPath: true
+        )
     }
 
     @Test
@@ -86,38 +96,48 @@ import Testing
         let modulemapPath = frameworkPath.join("Versions/A/Modules/module.modulemap")
         let modulemapPathPrivate = frameworkPath.join("Versions/A/Modules/module.private.modulemap")
         try fs.createDirectory(modulemapPath.dirname, recursive: true)
-        try fs.write(modulemapPath, contents: """
-            framework module PerfectFramework [system] [extern_c] {
-                umbrella header "PerfectFramework.h"
-                export *
-                module * { export * }
-            }
-            """)
-        try fs.write(modulemapPathPrivate, contents: """
-            framework module PerfectFramework_Private [system] [extern_c] {
-                umbrella header "PerfectFramework_Private.h"
-                export *
-                module * { export * }
-            }
-            """)
+        try fs.write(
+            modulemapPath,
+            contents: """
+                framework module PerfectFramework [system] [extern_c] {
+                    umbrella header "PerfectFramework.h"
+                    export *
+                    module * { export * }
+                }
+                """
+        )
+        try fs.write(
+            modulemapPathPrivate,
+            contents: """
+                framework module PerfectFramework_Private [system] [extern_c] {
+                    umbrella header "PerfectFramework_Private.h"
+                    export *
+                    module * { export * }
+                }
+                """
+        )
 
         let publicModuleMap = try ModuleVerifierModuleMap(moduleMap: modulemapPath, fs: fs, frameworkName: frameworkName)
 
-        assert(moduleMap: publicModuleMap,
-               kind: .publicModule,
-               path: modulemapPath,
-               frameworkName: frameworkName,
-               modules: [frameworkName],
-               isInPreferredPath: true)
+        assert(
+            moduleMap: publicModuleMap,
+            kind: .publicModule,
+            path: modulemapPath,
+            frameworkName: frameworkName,
+            modules: [frameworkName],
+            isInPreferredPath: true
+        )
 
         let privateModuleMap = try ModuleVerifierModuleMap(moduleMap: modulemapPathPrivate, fs: fs, frameworkName: frameworkName)
 
-        assert(moduleMap: privateModuleMap,
-               kind: .privateModule,
-               path: modulemapPathPrivate,
-               frameworkName: frameworkName,
-               modules: ["\(frameworkName)_Private"],
-               isInPreferredPath: true)
+        assert(
+            moduleMap: privateModuleMap,
+            kind: .privateModule,
+            path: modulemapPathPrivate,
+            frameworkName: frameworkName,
+            modules: ["\(frameworkName)_Private"],
+            isInPreferredPath: true
+        )
     }
 
     @Test
@@ -129,27 +149,33 @@ import Testing
         let modulemapPath = frameworkPath.join("Versions/A/Modules/module.modulemap")
         let modulemapPathPrivate = frameworkPath.join("Versions/A/Modules/module.private.modulemap")
         try fs.createDirectory(modulemapPath.dirname, recursive: true)
-        try fs.write(modulemapPath, contents: """
-            framework module FrameworkWithNonModularHeaders [system] {
-              umbrella header "FrameworkWithNonModularHeaders.h"
-
-              exclude header "NonModular.h"
-
-              export *
-              module * { export * }
-            }
-            """)
-        try fs.write(modulemapPathPrivate, contents: """
-            framework module FrameworkWithNonModularHeaders_Private [system] {
-              umbrella "PrivateHeaders"
-
-              exclude header "Excluded.h"
-              private header "Private.h"
-              private  textual   header    "PrivateTextual.h"
-
-              module * { export * }
-            }
-            """)
+        try fs.write(
+            modulemapPath,
+            contents: """
+                framework module FrameworkWithNonModularHeaders [system] {
+                  umbrella header "FrameworkWithNonModularHeaders.h"
+
+                  exclude header "NonModular.h"
+
+                  export *
+                  module * { export * }
+                }
+                """
+        )
+        try fs.write(
+            modulemapPathPrivate,
+            contents: """
+                framework module FrameworkWithNonModularHeaders_Private [system] {
+                  umbrella "PrivateHeaders"
+
+                  exclude header "Excluded.h"
+                  private header "Private.h"
+                  private  textual   header    "PrivateTextual.h"
+
+                  module * { export * }
+                }
+                """
+        )
 
         let moduleMap = try ModuleVerifierModuleMap(moduleMap: modulemapPathPrivate, fs: fs, frameworkName: frameworkName)
 
@@ -170,18 +196,24 @@ import Testing
         let modulemapPath = frameworkPath.join("Versions/A/Modules/module.modulemap")
         let modulemapPathPrivate = frameworkPath.join("Versions/A/Modules/module.private.modulemap")
         try fs.createDirectory(modulemapPath.dirname, recursive: true)
-        try fs.write(modulemapPath, contents: """
-            framework module PrivateOnlyPublicNoContentsPrivateModule [system] {
-            }
-            """)
-        try fs.write(modulemapPathPrivate, contents: """
-            framework module PrivateOnlyPublicNoContentsPrivateModule_Private [system] {
-              umbrella header "PrivateOnlyPublicNoContentsPrivateModule_Private.h"
-              export *
-
-              module * { export * }
-            }
-            """)
+        try fs.write(
+            modulemapPath,
+            contents: """
+                framework module PrivateOnlyPublicNoContentsPrivateModule [system] {
+                }
+                """
+        )
+        try fs.write(
+            modulemapPathPrivate,
+            contents: """
+                framework module PrivateOnlyPublicNoContentsPrivateModule_Private [system] {
+                  umbrella header "PrivateOnlyPublicNoContentsPrivateModule_Private.h"
+                  export *
+
+                  module * { export * }
+                }
+                """
+        )
 
         let moduleMap = try ModuleVerifierModuleMap(moduleMap: modulemapPath, fs: fs, frameworkName: frameworkName)
         #expect(!moduleMap.modulesHaveContents)
diff --git a/Tests/SWBCoreTests/ModuleVerifierTargetTests.swift b/Tests/SWBCoreTests/ModuleVerifierTargetTests.swift
index ee681bb2..7ee86008 100644
--- a/Tests/SWBCoreTests/ModuleVerifierTargetTests.swift
+++ b/Tests/SWBCoreTests/ModuleVerifierTargetTests.swift
@@ -64,7 +64,7 @@ import Testing
             ModuleVerifierTargetSet(language: .c, standard: .gnu11, target: "a-1", targetVariant: "a-2"),
             ModuleVerifierTargetSet(language: .c, standard: .gnu11, target: "a-2", targetVariant: "a-1"),
             ModuleVerifierTargetSet(language: .c, standard: .gnu11, target: "b-1", targetVariant: nil),
-            ModuleVerifierTargetSet(language: .c, standard: .gnu11, target: "b-2", targetVariant: nil)
+            ModuleVerifierTargetSet(language: .c, standard: .gnu11, target: "b-2", targetVariant: nil),
         ]
         var expectedDiagnostics: [Diagnostic] = [
             Diagnostic(behavior: .warning, location: .buildSettings(names: ["MODULE_VERIFIER_TARGET_TRIPLE_ARCHS"]), data: DiagnosticData("Duplicate target architectures found - b-1, b-2")),
diff --git a/Tests/SWBCoreTests/MultiPlatformDependencyResolverTests.swift b/Tests/SWBCoreTests/MultiPlatformDependencyResolverTests.swift
index 7c5749b4..07497d1e 100644
--- a/Tests/SWBCoreTests/MultiPlatformDependencyResolverTests.swift
+++ b/Tests/SWBCoreTests/MultiPlatformDependencyResolverTests.swift
@@ -40,7 +40,6 @@ extension TestTargetDependency: DependencyFilter {
     var value: String { return self.name }
 }
 
-
 extension SWBCore.Workspace {
     /// Finds the target with the given name.
     /// - Precondition: There are no duplicate targets with the given name.
@@ -64,9 +63,9 @@ extension SWBCore.Workspace {
     }
 
     /// Used to create the test workspace to test with multiple top-level targets and shared targets across multiple projects.
-    func createCoreScenarioTestWorkspace(useImplicitDependencies: Bool, overrides: [String:String] = [:]) async throws -> SWBCore.Workspace {
+    func createCoreScenarioTestWorkspace(useImplicitDependencies: Bool, overrides: [String: String] = [:]) async throws -> SWBCore.Workspace {
         let core = try await getCore()
-        let defaultSettings: [String:String] = try await [
+        let defaultSettings: [String: String] = try await [
             "ARCHS": "$(ARCHS_STANDARD)",
             "ENABLE_ON_DEMAND_RESOURCES": "NO",
             "PRODUCT_NAME": "$(TARGET_NAME)",
@@ -86,24 +85,31 @@ extension SWBCore.Workspace {
             "aProject",
             groupTree: TestGroup("Sources"),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: defaultSettings),
+                TestBuildConfiguration("Debug", buildSettings: defaultSettings)
             ],
             targets: [
                 TestStandardTarget(
                     "Watchable",
                     type: .watchKitAppContainer,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "iphoneos",
-                            "SUPPORTED_PLATFORMS": "iphoneos",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "iphoneos",
+                                "SUPPORTED_PLATFORMS": "iphoneos",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
                             // The target must at least HAVE an empty phase for the automatic asset catalog and storyboard to work
                         ]),
-                        TestCopyFilesBuildPhase(["Watchable WatchKit App.app"], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch", onlyForDeployment: false
-                                               ),
+                        TestCopyFilesBuildPhase(
+                            ["Watchable WatchKit App.app"],
+                            destinationSubfolder: .builtProductsDir,
+                            destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch",
+                            onlyForDeployment: false
+                        ),
                     ],
                     dependencies: deps(["Watchable WatchKit App"], useImplicitDependencies: useImplicitDependencies)
                 ),
@@ -111,19 +117,25 @@ extension SWBCore.Workspace {
                     "Watchable WatchKit App",
                     type: .watchKitApp,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
-                            "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
-                            "SDKROOT": "watchos",
-                            "TARGETED_DEVICE_FAMILY": "4",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
+                                "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
+                                "SDKROOT": "watchos",
+                                "TARGETED_DEVICE_FAMILY": "4",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
                             // The target must at least HAVE an empty phase for the automatic asset catalog and storyboard to work
                         ]),
-                        TestCopyFilesBuildPhase(["Watchable WatchKit Extension.appex"], destinationSubfolder: .plugins, onlyForDeployment: false
-                                               ),
+                        TestCopyFilesBuildPhase(
+                            ["Watchable WatchKit Extension.appex"],
+                            destinationSubfolder: .plugins,
+                            onlyForDeployment: false
+                        ),
                         TestFrameworksBuildPhase([
                             TestBuildFile(.target("Shared Framework")),
                             TestBuildFile(.target("SharedPkgTarget")),
@@ -137,28 +149,34 @@ extension SWBCore.Workspace {
                     "Watchable WatchKit Extension",
                     type: .watchKitExtension,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
-                            "SDKROOT": "watchos",
-                            "TARGETED_DEVICE_FAMILY": "4",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
+                                "SDKROOT": "watchos",
+                                "TARGETED_DEVICE_FAMILY": "4",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
                             // The target must at least HAVE an empty phase for the automatic asset catalog and storyboard to work
-                        ]),
+                        ])
                     ]
                 ),
                 TestStandardTarget(
                     "iOS App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
-                            "SDKROOT": "iphoneos",
-                            "TARGETED_DEVICE_FAMILY": "1",
-                            "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
+                                "SDKROOT": "iphoneos",
+                                "TARGETED_DEVICE_FAMILY": "1",
+                                "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
@@ -177,13 +195,16 @@ extension SWBCore.Workspace {
                     "macCatalyst App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ALWAYS_SEARCH_USER_PATHS": "NO",
-                            "CODE_SIGNING_ALLOWED": "NO",
-                            "SDKROOT": "iphoneos",
-                            "SUPPORTS_MACCATALYST": "YES",
-                            "TARGETED_DEVICE_FAMILY": "2,6",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                "CODE_SIGNING_ALLOWED": "NO",
+                                "SDKROOT": "iphoneos",
+                                "SUPPORTS_MACCATALYST": "YES",
+                                "TARGETED_DEVICE_FAMILY": "2,6",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestFrameworksBuildPhase([
@@ -193,16 +214,19 @@ extension SWBCore.Workspace {
                             TestBuildFile(.target("OtherSharedPkgTarget")),
                         ])
                     ],
-                    dependencies: deps([TestTargetDependency("Shared Framework"), TestTargetDependency("Other Shared Framework"), ], useImplicitDependencies: useImplicitDependencies).appending(contentsOf: [TestTargetDependency("SharedPkgTarget"), TestTargetDependency("OtherSharedPkgTarget")])
+                    dependencies: deps([TestTargetDependency("Shared Framework"), TestTargetDependency("Other Shared Framework")], useImplicitDependencies: useImplicitDependencies).appending(contentsOf: [TestTargetDependency("SharedPkgTarget"), TestTargetDependency("OtherSharedPkgTarget")])
                 ),
                 TestStandardTarget(
                     "macOS App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "macosx",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
@@ -221,20 +245,27 @@ extension SWBCore.Workspace {
                     "Shared Framework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                            "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
-                        ].addingContents(of: overrides)),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
+                            ].addingContents(of: overrides)
+                        )
                     ],
                     buildPhases: []
                 ),
                 TestStandardTarget(
-                    "MacAppEmbeddingiOSApp", type: .application,
+                    "MacAppEmbeddingiOSApp",
+                    type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "macosx",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
@@ -246,16 +277,18 @@ extension SWBCore.Workspace {
                             TestBuildFile(.target("SharedPkgTarget")),
                             TestBuildFile(.target("OtherSharedPkgTarget")),
                         ]),
-                        TestCopyFilesBuildPhase([TestBuildFile(.target("iOS App"))], destinationSubfolder: .builtProductsDir, destinationSubpath: "Samples")
+                        TestCopyFilesBuildPhase([TestBuildFile(.target("iOS App"))], destinationSubfolder: .builtProductsDir, destinationSubpath: "Samples"),
                     ],
-                    dependencies: deps([TestTargetDependency("Shared Framework"), TestTargetDependency("Other Shared Framework")], useImplicitDependencies: useImplicitDependencies).appending(contentsOf: [TestTargetDependency("SharedPkgTarget"), TestTargetDependency("OtherSharedPkgTarget"),  TestTargetDependency("iOS App")])
-                )
-            ])
+                    dependencies: deps([TestTargetDependency("Shared Framework"), TestTargetDependency("Other Shared Framework")], useImplicitDependencies: useImplicitDependencies).appending(contentsOf: [TestTargetDependency("SharedPkgTarget"), TestTargetDependency("OtherSharedPkgTarget"), TestTargetDependency("iOS App")])
+                ),
+            ]
+        )
 
         let packageProject = TestPackageProject(
-            "Package", groupTree: TestGroup("Sources"),
+            "Package",
+            groupTree: TestGroup("Sources"),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: defaultSettings),
+                TestBuildConfiguration("Debug", buildSettings: defaultSettings)
             ],
             targets: [
                 TestPackageProductTarget(
@@ -264,52 +297,64 @@ extension SWBCore.Workspace {
                         TestBuildFile(.target("SharedPkgTarget"))
                     ]),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
-                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                            "SUPPORTS_MACCATALYST": "YES",
-                        ].addingContents(of: overrides)),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                "SUPPORTS_MACCATALYST": "YES",
+                            ].addingContents(of: overrides)
+                        )
                     ],
                     dependencies: deps(["SharedPkgTarget", "OtherSharedPkgTarget"], useImplicitDependencies: useImplicitDependencies)
                 ),
                 TestStandardTarget(
-                    "SharedPkgTarget", type: .framework,
+                    "SharedPkgTarget",
+                    type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
-                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                            "SUPPORTS_MACCATALYST": "YES",
-                        ].addingContents(of: overrides)),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                "SUPPORTS_MACCATALYST": "YES",
+                            ].addingContents(of: overrides)
+                        )
                     ],
                     buildPhases: []
                 ),
-            ])
+            ]
+        )
 
         let otherProject = TestProject(
             "otherProject",
             groupTree: TestGroup("Sources"),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: defaultSettings),
+                TestBuildConfiguration("Debug", buildSettings: defaultSettings)
             ],
             targets: [
                 TestStandardTarget(
                     "Other Shared Framework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                            "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
-                        ].addingContents(of: overrides)),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
+                            ].addingContents(of: overrides)
+                        )
                     ],
                     buildPhases: []
-                ),
-            ])
+                )
+            ]
+        )
 
         let otherPackageProject = TestPackageProject(
             "OtherPackage",
             groupTree: TestGroup("Sources"),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: defaultSettings),
+                TestBuildConfiguration("Debug", buildSettings: defaultSettings)
             ],
             targets: [
                 TestPackageProductTarget(
@@ -318,26 +363,34 @@ extension SWBCore.Workspace {
                         TestBuildFile(.target("SharedPkgTarget"))
                     ]),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
-                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                            "SUPPORTS_MACCATALYST": "YES",
-                        ].addingContents(of: overrides)),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                "SUPPORTS_MACCATALYST": "YES",
+                            ].addingContents(of: overrides)
+                        )
                     ],
                     dependencies: deps(["OtherSharedPkgTarget"], useImplicitDependencies: useImplicitDependencies)
                 ),
                 TestStandardTarget(
-                    "OtherSharedPkgTarget", type: .framework,
+                    "OtherSharedPkgTarget",
+                    type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
-                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                            "SUPPORTS_MACCATALYST": "YES",
-                        ].addingContents(of: overrides)),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                "SUPPORTS_MACCATALYST": "YES",
+                            ].addingContents(of: overrides)
+                        )
                     ],
                     buildPhases: []
-                )
-            ])
+                ),
+            ]
+        )
 
         return try TestWorkspace("Workspace", projects: [testProject, packageProject, otherProject, otherPackageProject]).load(core)
     }
@@ -381,11 +434,13 @@ extension SWBCore.Workspace {
             #expect(deps.map(\.nameAndPlatform).sorted() == expectedDeps)
 
             for dep in deps {
-                #expect(dep.parameters.overrides == [
-                    "SDKROOT": "macosx",
-                    "SDK_VARIANT": "macos",
-                    "SUPPORTS_MACCATALYST": "NO",
-                ])
+                #expect(
+                    dep.parameters.overrides == [
+                        "SDKROOT": "macosx",
+                        "SDK_VARIANT": "macos",
+                        "SUPPORTS_MACCATALYST": "NO",
+                    ]
+                )
             }
         }
     }
@@ -414,11 +469,13 @@ extension SWBCore.Workspace {
             #expect(deps.map(\.nameAndPlatform).sorted() == expectedDeps)
 
             for dep in deps {
-                #expect(dep.parameters.overrides == [
-                    "SDKROOT": "iphoneos",
-                    "SDK_VARIANT": "iphoneos",
-                    "SUPPORTS_MACCATALYST": "NO",
-                ])
+                #expect(
+                    dep.parameters.overrides == [
+                        "SDKROOT": "iphoneos",
+                        "SDK_VARIANT": "iphoneos",
+                        "SUPPORTS_MACCATALYST": "NO",
+                    ]
+                )
             }
         }
     }
@@ -446,11 +503,13 @@ extension SWBCore.Workspace {
             #expect(deps.map(\.nameAndPlatform).sorted() == expectedDeps)
 
             for dep in deps {
-                #expect(dep.parameters.overrides == [
-                    "SDKROOT": "macosx",
-                    "SDK_VARIANT": "iosmac",
-                    "SUPPORTS_MACCATALYST": "YES",
-                ])
+                #expect(
+                    dep.parameters.overrides == [
+                        "SDKROOT": "macosx",
+                        "SDK_VARIANT": "iosmac",
+                        "SUPPORTS_MACCATALYST": "YES",
+                    ]
+                )
             }
         }
     }
@@ -469,7 +528,7 @@ extension SWBCore.Workspace {
         try await _testCoreScenario(targetName: "Watchable", destination: .watchOS, useImplicitDependencies: false) { target, graph in
 
             let expectedDeps1 = [
-                "Watchable WatchKit App-watchos",
+                "Watchable WatchKit App-watchos"
             ]
             let deps1 = try graph.dependencies(target)
             #expect(deps1.map(\.nameAndPlatform).sorted() == expectedDeps1)
@@ -488,13 +547,14 @@ extension SWBCore.Workspace {
             for dep in deps1.appending(contentsOf: deps2) {
                 if noOverrides.contains(dep.nameAndPlatform) {
                     #expect(dep.parameters.overrides == [:])
-                }
-                else {
-                    #expect(dep.parameters.overrides == [
-                        "SDKROOT": "watchos",
-                        "SDK_VARIANT": "watchos",
-                        "SUPPORTS_MACCATALYST": "NO",
-                    ])
+                } else {
+                    #expect(
+                        dep.parameters.overrides == [
+                            "SDKROOT": "watchos",
+                            "SDK_VARIANT": "watchos",
+                            "SUPPORTS_MACCATALYST": "NO",
+                        ]
+                    )
                 }
             }
         }
@@ -528,11 +588,14 @@ extension SWBCore.Workspace {
                 #expect(deps.map(\.nameAndPlatform).sorted() == expectedDeps)
 
                 for dep in deps {
-                    #expect(dep.parameters.overrides == [
-                        "SDKROOT": "macosx",
-                        "SDK_VARIANT": "macos",
-                        "SUPPORTS_MACCATALYST": "NO",
-                    ].addingContents(of: destination == .macOS || destination == .macCatalyst ? [:] : ["SUPPORTED_PLATFORMS": "macosx"]))
+                    #expect(
+                        dep.parameters.overrides
+                            == [
+                                "SDKROOT": "macosx",
+                                "SDK_VARIANT": "macos",
+                                "SUPPORTS_MACCATALYST": "NO",
+                            ].addingContents(of: destination == .macOS || destination == .macCatalyst ? [:] : ["SUPPORTED_PLATFORMS": "macosx"])
+                    )
                 }
             }
 
@@ -551,11 +614,14 @@ extension SWBCore.Workspace {
                 #expect(deps.map(\.nameAndPlatform).sorted() == expectedDeps)
 
                 for dep in deps {
-                    #expect(dep.parameters.overrides == [
-                        "SDKROOT": "iphoneos",
-                        "SDK_VARIANT": "iphoneos",
-                        "SUPPORTS_MACCATALYST": "NO",
-                    ].addingContents(of: destination == .iOS ? [:] : ["SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"]))
+                    #expect(
+                        dep.parameters.overrides
+                            == [
+                                "SDKROOT": "iphoneos",
+                                "SDK_VARIANT": "iphoneos",
+                                "SUPPORTS_MACCATALYST": "NO",
+                            ].addingContents(of: destination == .iOS ? [:] : ["SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"])
+                    )
                 }
             }
 
@@ -574,12 +640,15 @@ extension SWBCore.Workspace {
                 #expect(deps.map(\.nameAndPlatform).sorted() == expectedDeps)
 
                 for dep in deps {
-                    #expect(dep.parameters.overrides == [
-                        "SDKROOT": "\([.iOS, .macOS, nil].contains(destination) ? "iphoneos" : "macosx")",
-                        "SDK_VARIANT": "\([.iOS, .macOS, nil].contains(destination) ? "iphoneos" : "iosmac")",
-                    ]
-                        .addingContents(of: [.iOS, .macCatalyst].contains(destination) ? [:] : ["SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"])
-                        .addingContents(of: destination == .macCatalyst ? ["SUPPORTS_MACCATALYST": "YES"] : ["SUPPORTS_MACCATALYST": "NO"]))
+                    #expect(
+                        dep.parameters.overrides
+                            == [
+                                "SDKROOT": "\([.iOS, .macOS, nil].contains(destination) ? "iphoneos" : "macosx")",
+                                "SDK_VARIANT": "\([.iOS, .macOS, nil].contains(destination) ? "iphoneos" : "iosmac")",
+                            ]
+                            .addingContents(of: [.iOS, .macCatalyst].contains(destination) ? [:] : ["SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"])
+                            .addingContents(of: destination == .macCatalyst ? ["SUPPORTS_MACCATALYST": "YES"] : ["SUPPORTS_MACCATALYST": "NO"])
+                    )
                 }
             }
 
@@ -588,7 +657,7 @@ extension SWBCore.Workspace {
                 let target = try #require(targets.filter({ $0.target.name == "Watchable" }).first)
 
                 let expectedDeps1 = [
-                    "Watchable WatchKit App-\(destination?.sdkVariant ?? "")",
+                    "Watchable WatchKit App-\(destination?.sdkVariant ?? "")"
                 ]
                 let deps1 = try graph.dependencies(target)
                 #expect(deps1.map(\.nameAndPlatform).sorted() == expectedDeps1)
@@ -598,7 +667,7 @@ extension SWBCore.Workspace {
                     "OtherSharedPkgTarget-watchos",
                     "Shared Framework-watchos",
                     "SharedPkgTarget-watchos",
-                    "Watchable WatchKit Extension-\(destination?.sdkVariant ?? "")", // why is this empty?
+                    "Watchable WatchKit Extension-\(destination?.sdkVariant ?? "")",  // why is this empty?
                 ]
                 let deps2 = graph.dependencies(of: deps1[0])
                 #expect(deps2.map(\.nameAndPlatform).sorted() == expectedDeps2)
@@ -607,18 +676,18 @@ extension SWBCore.Workspace {
                 for dep in deps2 {
                     if noOverrides.contains(dep.nameAndPlatform) {
                         #expect(dep.parameters.overrides == [:])
-                    }
-                    else {
+                    } else {
                         if dep.nameAndPlatform.starts(with: "Watchable WatchKit Extension-") {
                             #expect(dep.parameters.overrides == [:])
-                        }
-                        else {
-                            #expect(dep.parameters.overrides == [
-                                "SDKROOT": "watchos",
-                                "SDK_VARIANT": "watchos",
-                                "SUPPORTED_PLATFORMS": "watchos watchsimulator",
-                                "SUPPORTS_MACCATALYST": "NO",
-                            ])
+                        } else {
+                            #expect(
+                                dep.parameters.overrides == [
+                                    "SDKROOT": "watchos",
+                                    "SDK_VARIANT": "watchos",
+                                    "SUPPORTED_PLATFORMS": "watchos watchsimulator",
+                                    "SUPPORTS_MACCATALYST": "NO",
+                                ]
+                            )
                         }
                     }
                 }
@@ -654,7 +723,7 @@ extension SWBCore.Workspace {
     // Helper test method to verify that SUPPORTED_PLATFORMS properly filters potential dependencies.
     func _testNarrowSpecialization(useImplicitDependencies: Bool) async throws {
         let core = try await getCore()
-        let defaultSettings: [String:String] = try await [
+        let defaultSettings: [String: String] = try await [
             "ARCHS": "$(ARCHS_STANDARD)",
             "ENABLE_ON_DEMAND_RESOURCES": "NO",
             "PRODUCT_NAME": "$(TARGET_NAME)",
@@ -672,26 +741,29 @@ extension SWBCore.Workspace {
             "aProject",
             groupTree: TestGroup("Sources"),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: defaultSettings),
+                TestBuildConfiguration("Debug", buildSettings: defaultSettings)
             ],
             targets: [
                 TestStandardTarget(
                     "iOS App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
-                            "SDKROOT": "iphoneos",
-                            "TARGETED_DEVICE_FAMILY": "1",
-                            "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
+                                "SDKROOT": "iphoneos",
+                                "TARGETED_DEVICE_FAMILY": "1",
+                                "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
                             // The target must at least HAVE an empty phase for the automatic asset catalog and storyboard to work
                         ]),
                         TestFrameworksBuildPhase([
-                            TestBuildFile(.target("Shared Framework")),
+                            TestBuildFile(.target("Shared Framework"))
                         ]),
                     ],
                     dependencies: deps([TestTargetDependency("Shared Framework")], useImplicitDependencies: useImplicitDependencies)
@@ -700,17 +772,20 @@ extension SWBCore.Workspace {
                     "macOS App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "macosx",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
                             // The target must at least HAVE an empty phase for the automatic asset catalog and storyboard to work
                         ]),
                         TestFrameworksBuildPhase([
-                            TestBuildFile(.target("Shared Framework")),
+                            TestBuildFile(.target("Shared Framework"))
                         ]),
                     ],
                     dependencies: deps([TestTargetDependency("Shared Framework")], useImplicitDependencies: useImplicitDependencies)
@@ -719,15 +794,19 @@ extension SWBCore.Workspace {
                     "Shared Framework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
-                            "SUPPORTED_PLATFORMS": "macosx appletvos",
-                            "SDKROOT": "macosx",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
+                                "SUPPORTED_PLATFORMS": "macosx appletvos",
+                                "SDKROOT": "macosx",
+                            ]
+                        )
                     ],
                     buildPhases: []
-                )
-            ])
+                ),
+            ]
+        )
 
         let workspace = try TestWorkspace("aWorkspace", projects: [testProject]).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -789,36 +868,42 @@ extension SWBCore.Workspace {
             "aProject",
             groupTree: TestGroup("Sources"),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: defaultSettings),
+                TestBuildConfiguration("Debug", buildSettings: defaultSettings)
             ],
             targets: [
                 TestStandardTarget(
                     "macOS App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "macosx",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestFrameworksBuildPhase([
                             "shared.framework"
-                        ]),
+                        ])
                     ]
                 ),
                 TestStandardTarget(
                     "macCatalyst App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ALWAYS_SEARCH_USER_PATHS": "NO",
-                            "CODE_SIGNING_ALLOWED": "NO",
-                            "SDKROOT": "iphoneos",
-                            "SUPPORTS_MACCATALYST": "YES",
-                            "TARGETED_DEVICE_FAMILY": "2,6",
-                            "SUPPORTED_PLATFORMS": "macosx iphoneos",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                "CODE_SIGNING_ALLOWED": "NO",
+                                "SDKROOT": "iphoneos",
+                                "SUPPORTS_MACCATALYST": "YES",
+                                "TARGETED_DEVICE_FAMILY": "2,6",
+                                "SUPPORTED_PLATFORMS": "macosx iphoneos",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestFrameworksBuildPhase([
@@ -830,11 +915,14 @@ extension SWBCore.Workspace {
                     "Shared Framework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "shared",
-                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                            "SDKROOT": "macosx",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "shared",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                "SDKROOT": "macosx",
+                            ]
+                        )
                     ],
                     buildPhases: []
                 ),
@@ -842,16 +930,20 @@ extension SWBCore.Workspace {
                     "Other Shared Framework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "shared",
-                            "SUPPORTED_PLATFORMS": "iphoneos",
-                            "SUPPORTS_MACCATALYST": "YES",
-                            "SDKROOT": "iphoneos",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "shared",
+                                "SUPPORTED_PLATFORMS": "iphoneos",
+                                "SUPPORTS_MACCATALYST": "YES",
+                                "SDKROOT": "iphoneos",
+                            ]
+                        )
                     ],
                     buildPhases: []
-                )
-            ])
+                ),
+            ]
+        )
 
         let workspace = try TestWorkspace("aWorkspace", projects: [testProject]).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -872,8 +964,7 @@ extension SWBCore.Workspace {
 
             if workspaceContext.userPreferences.enableDebugActivityLogs {
                 // ignore the rejection diagnostics
-            }
-            else {
+            } else {
                 delegate.checkNoDiagnostics()
             }
         }
@@ -891,8 +982,7 @@ extension SWBCore.Workspace {
 
             if workspaceContext.userPreferences.enableDebugActivityLogs {
                 // ignore the rejection diagnostics
-            }
-            else {
+            } else {
                 delegate.checkNoDiagnostics()
             }
         }
diff --git a/Tests/SWBCoreTests/PIFInlineLoadingTests.swift b/Tests/SWBCoreTests/PIFInlineLoadingTests.swift
index 2fe88e4d..532fe8fe 100644
--- a/Tests/SWBCoreTests/PIFInlineLoadingTests.swift
+++ b/Tests/SWBCoreTests/PIFInlineLoadingTests.swift
@@ -24,7 +24,7 @@ import SWBUtil
             "guid": "some-workspace-guid",
             "name": "aWorkspace",
             "path": "/tmp/aWorkspace.xcworkspace/contents.xcworkspacedata",
-            "projects": [] as [String]
+            "projects": [] as [String],
         ]
 
         let pifLoader = PIFLoader(data: testInlineWorkspacePIF, namespace: BuiltinMacros.namespace)
@@ -42,18 +42,18 @@ import SWBUtil
                 "type": "group",
                 "name": "SomeFiles",
                 "sourceTree": "PROJECT_DIR",
-                "path": "/tmp/SomeProject/SomeFiles"
+                "path": "/tmp/SomeProject/SomeFiles",
             ],
             "buildConfigurations": [] as [String],
             "defaultConfigurationName": "Debug",
-            "developmentRegion": "English"
+            "developmentRegion": "English",
         ]
 
         let testWorkspacePIF: [String: PropertyListItem] = [
             "guid": "some-workspace-guid",
             "name": "aWorkspace",
             "path": "/tmp/aWorkspace.xcworkspace/contents.xcworkspacedata",
-            "projects": [testProjectPIF] // Inline *project* reference.
+            "projects": [testProjectPIF],  // Inline *project* reference.
         ]
 
         // Convert the test data into a property list, then read the workspace from it.
@@ -66,7 +66,7 @@ import SWBUtil
             "guid": "some-workspace-guid",
             "name": "aWorkspace",
             "path": "/tmp/aWorkspace.xcworkspace/contents.xcworkspacedata",
-            "projects": ["PROJECT"]
+            "projects": ["PROJECT"],
         ]
 
         let testTargetPIF: PropertyListItem = [
@@ -81,13 +81,13 @@ import SWBUtil
             "buildPhases": [] as [String],
             "buildRules": [] as [String],
             "buildConfigurations": [] as [String],
-            "dependencies": [] as [String]
+            "dependencies": [] as [String],
         ]
 
         let testProjectPIF: PropertyListItem = [
             "guid": "some-project-guid",
             "path": "/tmp/SomeProject/aProject.xcodeproj",
-            "targets": [testTargetPIF], // Inline *target* reference.
+            "targets": [testTargetPIF],  // Inline *target* reference.
             "groupTree": [
                 "guid": "some-fileGroup-guid",
                 "type": "group",
@@ -97,20 +97,20 @@ import SWBUtil
             ],
             "buildConfigurations": [] as [String],
             "defaultConfigurationName": "Debug",
-            "developmentRegion": "English"
+            "developmentRegion": "English",
         ]
 
         let testPIF: PropertyListItem = [
             [
                 "signature": "WORKSPACE",
                 "type": "workspace",
-                "contents": testWorkspacePIF
+                "contents": testWorkspacePIF,
             ],
             [
                 "signature": "PROJECT",
                 "type": "project",
-                "contents": testProjectPIF
-            ]
+                "contents": testProjectPIF,
+            ],
         ]
 
         let pifLoader = PIFLoader(data: testPIF, namespace: BuiltinMacros.namespace)
diff --git a/Tests/SWBCoreTests/PIFLoadingTests.swift b/Tests/SWBCoreTests/PIFLoadingTests.swift
index f79bf378..b4638ecc 100644
--- a/Tests/SWBCoreTests/PIFLoadingTests.swift
+++ b/Tests/SWBCoreTests/PIFLoadingTests.swift
@@ -114,23 +114,32 @@ private final class ProjectModelItemClass: ProjectModelItem {
         #expect(absentValue == nil)
 
         // Test failure cases.
-        #expect(performing: {
-            try ProjectModelItemClass.parseValueForKeyAsString("arrayOfItemsKey", pifDict: pifDict)
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "arrayOfItemsKey", objectType: ProjectModelItemClass.self, expectedType: "String", destinationType: nil).description
-        })
-
-        #expect(performing: {
-            try ProjectModelItemClass.parseOptionalValueForKeyAsString("arrayOfItemsKey", pifDict: pifDict)
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "arrayOfItemsKey", objectType: ProjectModelItemClass.self, expectedType: "String", destinationType: nil).description
-        })
-
-        #expect(performing: {
-            try ProjectModelItemClass.parseValueForKeyAsString("missingKey", pifDict: pifDict)
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "missingKey", objectType: ProjectModelItemClass.self).description
-        })
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseValueForKeyAsString("arrayOfItemsKey", pifDict: pifDict)
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "arrayOfItemsKey", objectType: ProjectModelItemClass.self, expectedType: "String", destinationType: nil).description
+            }
+        )
+
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseOptionalValueForKeyAsString("arrayOfItemsKey", pifDict: pifDict)
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "arrayOfItemsKey", objectType: ProjectModelItemClass.self, expectedType: "String", destinationType: nil).description
+            }
+        )
+
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseValueForKeyAsString("missingKey", pifDict: pifDict)
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "missingKey", objectType: ProjectModelItemClass.self).description
+            }
+        )
     }
 
     @Test
@@ -148,17 +157,23 @@ private final class ProjectModelItemClass: ProjectModelItem {
         #expect(!missingFalseValue)
 
         // Test failure cases.
-        #expect(performing: {
-            try ProjectModelItemClass.parseValueForKeyAsBool("arrayOfItemsKey", pifDict: pifDict)
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "arrayOfItemsKey", objectType: ProjectModelItemClass.self, expectedType: "String", destinationType: "Bool").description
-        })
-
-        #expect(performing: {
-            try ProjectModelItemClass.parseValueForKeyAsBool("stringKey", pifDict: pifDict)
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.invalidEnumValue(keyName: "stringKey", objectType: ProjectModelItemClass.self, actualValue: "aValue", destinationType: PIFBoolValue.self).description
-        })
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseValueForKeyAsBool("arrayOfItemsKey", pifDict: pifDict)
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "arrayOfItemsKey", objectType: ProjectModelItemClass.self, expectedType: "String", destinationType: "Bool").description
+            }
+        )
+
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseValueForKeyAsBool("stringKey", pifDict: pifDict)
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.invalidEnumValue(keyName: "stringKey", objectType: ProjectModelItemClass.self, actualValue: "aValue", destinationType: PIFBoolValue.self).description
+            }
+        )
     }
 
     @Test
@@ -228,23 +243,32 @@ private final class ProjectModelItemClass: ProjectModelItem {
         #expect(absentValue == nil)
 
         // Test failure cases.
-        #expect(performing: {
-            try ProjectModelItemClass.parseValueForKeyAsArrayOfPropertyListItems("stringKey", pifDict: pifDict)
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "stringKey", objectType: ProjectModelItemClass.self, expectedType: "Array", destinationType: nil).description
-        })
-
-        #expect(performing: {
-            try ProjectModelItemClass.parseOptionalValueForKeyAsArrayOfPropertyListItems("stringKey", pifDict: pifDict)
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "stringKey", objectType: ProjectModelItemClass.self, expectedType: "Array", destinationType: nil).description
-        })
-
-        #expect(performing: {
-            try ProjectModelItemClass.parseValueForKeyAsArrayOfPropertyListItems("missingKey", pifDict: pifDict)
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "missingKey", objectType: ProjectModelItemClass.self).description
-        })
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseValueForKeyAsArrayOfPropertyListItems("stringKey", pifDict: pifDict)
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "stringKey", objectType: ProjectModelItemClass.self, expectedType: "Array", destinationType: nil).description
+            }
+        )
+
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseOptionalValueForKeyAsArrayOfPropertyListItems("stringKey", pifDict: pifDict)
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "stringKey", objectType: ProjectModelItemClass.self, expectedType: "Array", destinationType: nil).description
+            }
+        )
+
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseValueForKeyAsArrayOfPropertyListItems("missingKey", pifDict: pifDict)
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "missingKey", objectType: ProjectModelItemClass.self).description
+            }
+        )
     }
 
     @Test
@@ -262,29 +286,41 @@ private final class ProjectModelItemClass: ProjectModelItem {
         #expect(requiredValue[2].guid == "some-fileGroup-guid")
 
         // Test failure cases.
-        #expect(performing: {
-            try ProjectModelItemClass.parseValueForKeyAsArrayOfProjectModelItems("stringKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "stringKey", objectType: ProjectModelItemClass.self, expectedType: "Array", destinationType: nil).description
-        })
-
-        #expect(performing: {
-            try ProjectModelItemClass.parseValueForKeyAsArrayOfProjectModelItems("missingKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "missingKey", objectType: ProjectModelItemClass.self).description
-        })
-
-        #expect(performing: {
-            try ProjectModelItemClass.parseValueForKeyAsArrayOfProjectModelItems("arrayOfStringsKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.incorrectTypeInArray(keyName: "arrayOfStringsKey", objectType: ProjectModelItemClass.self, expectedType: "Dictionary").description
-        })
-
-        #expect(performing: {
-            try ProjectModelItemClass.parseValueForKeyAsArrayOfProjectModelItems("arrayOfEmptyDictsKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "guid", objectType: Reference.self).description
-        })
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseValueForKeyAsArrayOfProjectModelItems("stringKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "stringKey", objectType: ProjectModelItemClass.self, expectedType: "Array", destinationType: nil).description
+            }
+        )
+
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseValueForKeyAsArrayOfProjectModelItems("missingKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "missingKey", objectType: ProjectModelItemClass.self).description
+            }
+        )
+
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseValueForKeyAsArrayOfProjectModelItems("arrayOfStringsKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.incorrectTypeInArray(keyName: "arrayOfStringsKey", objectType: ProjectModelItemClass.self, expectedType: "Dictionary").description
+            }
+        )
+
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseValueForKeyAsArrayOfProjectModelItems("arrayOfEmptyDictsKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "guid", objectType: Reference.self).description
+            }
+        )
     }
 
     @Test
@@ -305,23 +341,32 @@ private final class ProjectModelItemClass: ProjectModelItem {
         #expect(absentValue == nil)
 
         // Test failure cases.
-        #expect(performing: {
-            try ProjectModelItemClass.parseOptionalValueForKeyAsArrayOfProjectModelItems("stringKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "stringKey", objectType: ProjectModelItemClass.self, expectedType: "Array", destinationType: nil).description
-        })
-
-        #expect(performing: {
-            try ProjectModelItemClass.parseOptionalValueForKeyAsArrayOfProjectModelItems("arrayOfStringsKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.incorrectTypeInArray(keyName: "arrayOfStringsKey", objectType: ProjectModelItemClass.self, expectedType: "Dictionary").description
-        })
-
-        #expect(performing: {
-            try ProjectModelItemClass.parseOptionalValueForKeyAsArrayOfProjectModelItems("arrayOfEmptyDictsKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "guid", objectType: Reference.self).description
-        })
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseOptionalValueForKeyAsArrayOfProjectModelItems("stringKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "stringKey", objectType: ProjectModelItemClass.self, expectedType: "Array", destinationType: nil).description
+            }
+        )
+
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseOptionalValueForKeyAsArrayOfProjectModelItems("arrayOfStringsKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.incorrectTypeInArray(keyName: "arrayOfStringsKey", objectType: ProjectModelItemClass.self, expectedType: "Dictionary").description
+            }
+        )
+
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseOptionalValueForKeyAsArrayOfProjectModelItems("arrayOfEmptyDictsKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "guid", objectType: Reference.self).description
+            }
+        )
     }
 
     @Test
@@ -334,46 +379,61 @@ private final class ProjectModelItemClass: ProjectModelItem {
         // Test the required version.
         let requiredValue = try ProjectModelItemClass.parseValueForKeyAsArrayOfStrings("arrayOfStringsKey", pifDict: pifDict)
         #expect(requiredValue.count == 5)
-        #expect(requiredValue == [ "one", "two", "three", "four", "five" ])
+        #expect(requiredValue == ["one", "two", "three", "four", "five"])
 
         // Test the optional version.
         let presentValue = try ProjectModelItemClass.parseOptionalValueForKeyAsArrayOfStrings("arrayOfStringsKey", pifDict: pifDict)
         #expect(presentValue?.count == 5)
-        #expect(presentValue == [ "one", "two", "three", "four", "five" ])
+        #expect(presentValue == ["one", "two", "three", "four", "five"])
 
         let absentValue = try ProjectModelItemClass.parseOptionalValueForKeyAsArrayOfStrings("missingKey", pifDict: pifDict)
         #expect(absentValue == nil)
 
         // Test failure cases.
-        #expect(performing: {
-            try ProjectModelItemClass.parseValueForKeyAsArrayOfStrings("stringKey", pifDict: pifDict)
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "stringKey", objectType: ProjectModelItemClass.self, expectedType: "Array", destinationType: nil).description
-        })
-
-        #expect(performing: {
-            try ProjectModelItemClass.parseOptionalValueForKeyAsArrayOfStrings("stringKey", pifDict: pifDict)
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "stringKey", objectType: ProjectModelItemClass.self, expectedType: "Array", destinationType: nil).description
-        })
-
-        #expect(performing: {
-            try ProjectModelItemClass.parseValueForKeyAsArrayOfStrings("missingKey", pifDict: pifDict)
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "missingKey", objectType: ProjectModelItemClass.self).description
-        })
-
-        #expect(performing: {
-            try ProjectModelItemClass.parseValueForKeyAsArrayOfStrings("arrayOfItemsKey", pifDict: pifDict)
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.incorrectTypeInArray(keyName: "arrayOfItemsKey", objectType: ProjectModelItemClass.self, expectedType: "String").description
-        })
-
-        #expect(performing: {
-            try ProjectModelItemClass.parseOptionalValueForKeyAsArrayOfStrings("arrayOfItemsKey", pifDict: pifDict)
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.incorrectTypeInArray(keyName: "arrayOfItemsKey", objectType: ProjectModelItemClass.self, expectedType: "String").description
-        })
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseValueForKeyAsArrayOfStrings("stringKey", pifDict: pifDict)
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "stringKey", objectType: ProjectModelItemClass.self, expectedType: "Array", destinationType: nil).description
+            }
+        )
+
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseOptionalValueForKeyAsArrayOfStrings("stringKey", pifDict: pifDict)
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "stringKey", objectType: ProjectModelItemClass.self, expectedType: "Array", destinationType: nil).description
+            }
+        )
+
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseValueForKeyAsArrayOfStrings("missingKey", pifDict: pifDict)
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "missingKey", objectType: ProjectModelItemClass.self).description
+            }
+        )
+
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseValueForKeyAsArrayOfStrings("arrayOfItemsKey", pifDict: pifDict)
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.incorrectTypeInArray(keyName: "arrayOfItemsKey", objectType: ProjectModelItemClass.self, expectedType: "String").description
+            }
+        )
+
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseOptionalValueForKeyAsArrayOfStrings("arrayOfItemsKey", pifDict: pifDict)
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.incorrectTypeInArray(keyName: "arrayOfItemsKey", objectType: ProjectModelItemClass.self, expectedType: "String").description
+            }
+        )
     }
 
     @Test
@@ -395,23 +455,32 @@ private final class ProjectModelItemClass: ProjectModelItem {
         #expect(absentValue == nil)
 
         // Test failure cases.
-        #expect(performing: {
-            try ProjectModelItemClass.parseValueForKeyAsPIFDictionary("arrayOfItemsKey", pifDict: pifDict)
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "arrayOfItemsKey", objectType: ProjectModelItemClass.self, expectedType: "Dictionary", destinationType: nil).description
-        })
-
-        #expect(performing: {
-            try ProjectModelItemClass.parseOptionalValueForKeyAsPIFDictionary("arrayOfItemsKey", pifDict: pifDict)
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "arrayOfItemsKey", objectType: ProjectModelItemClass.self, expectedType: "Dictionary", destinationType: nil).description
-        })
-
-        #expect(performing: {
-            try ProjectModelItemClass.parseValueForKeyAsPIFDictionary("missingKey", pifDict: pifDict)
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "missingKey", objectType: ProjectModelItemClass.self).description
-        })
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseValueForKeyAsPIFDictionary("arrayOfItemsKey", pifDict: pifDict)
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "arrayOfItemsKey", objectType: ProjectModelItemClass.self, expectedType: "Dictionary", destinationType: nil).description
+            }
+        )
+
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseOptionalValueForKeyAsPIFDictionary("arrayOfItemsKey", pifDict: pifDict)
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "arrayOfItemsKey", objectType: ProjectModelItemClass.self, expectedType: "Dictionary", destinationType: nil).description
+            }
+        )
+
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseValueForKeyAsPIFDictionary("missingKey", pifDict: pifDict)
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "missingKey", objectType: ProjectModelItemClass.self).description
+            }
+        )
     }
 
     @Test
@@ -425,23 +494,32 @@ private final class ProjectModelItemClass: ProjectModelItem {
         let _ = try FileGroup.parseValueForKeyAsProjectModelItem("fileGroupKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try FileGroup(fromDictionary: $0, withPIFLoader: pifLoader, isRoot: false) })
 
         // Test failure cases.
-        #expect(performing: {
-            try ProjectModelItemClass.parseValueForKeyAsProjectModelItem("stringKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "stringKey", objectType: ProjectModelItemClass.self, expectedType: "Dictionary", destinationType: nil).description
-        })
-
-        #expect(performing: {
-            try ProjectModelItemClass.parseValueForKeyAsProjectModelItem("missingKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "missingKey", objectType: ProjectModelItemClass.self).description
-        })
-
-        #expect(performing: {
-            try ProjectModelItemClass.parseValueForKeyAsProjectModelItem("dictionaryKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "guid", objectType: Reference.self).description
-        })
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseValueForKeyAsProjectModelItem("stringKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "stringKey", objectType: ProjectModelItemClass.self, expectedType: "Dictionary", destinationType: nil).description
+            }
+        )
+
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseValueForKeyAsProjectModelItem("missingKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "missingKey", objectType: ProjectModelItemClass.self).description
+            }
+        )
+
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseValueForKeyAsProjectModelItem("dictionaryKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "guid", objectType: Reference.self).description
+            }
+        )
     }
 
     @Test
@@ -459,17 +537,23 @@ private final class ProjectModelItemClass: ProjectModelItem {
         #expect(absentValue == nil)
 
         // Test failure cases.
-        #expect(performing: {
-            try ProjectModelItemClass.parseOptionalValueForKeyAsProjectModelItem("stringKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "stringKey", objectType: ProjectModelItemClass.self, expectedType: "Dictionary", destinationType: nil).description
-        })
-
-        #expect(performing: {
-            try ProjectModelItemClass.parseOptionalValueForKeyAsProjectModelItem("dictionaryKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
-        }, throws: { error in
-            (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "guid", objectType: Reference.self).description
-        })
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseOptionalValueForKeyAsProjectModelItem("stringKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.incorrectType(keyName: "stringKey", objectType: ProjectModelItemClass.self, expectedType: "Dictionary", destinationType: nil).description
+            }
+        )
+
+        #expect(
+            performing: {
+                try ProjectModelItemClass.parseOptionalValueForKeyAsProjectModelItem("dictionaryKey", pifDict: pifDict, pifLoader: pifLoader, construct: { try Reference(fromDictionary: $0, withPIFLoader: pifLoader) })
+            },
+            throws: { error in
+                (error as? PIFParsingError)?.description == PIFParsingError.missingRequiredKey(keyName: "guid", objectType: Reference.self).description
+            }
+        )
     }
 
     @Test
@@ -490,7 +574,6 @@ private final class ProjectModelItemClass: ProjectModelItem {
     }
 }
 
-
 // MARK: - Test cases for loading PIF items in isolation
 
 @Suite fileprivate struct PIFLoadingUnitTests {
@@ -512,7 +595,7 @@ private final class ProjectModelItemClass: ProjectModelItem {
             Issue.record("property list is not a dictionary")
             return
         }
-        let workspace = try Workspace( fromDictionary: workspacePIF, signature: "mock", withPIFLoader: pifLoader )
+        let workspace = try Workspace(fromDictionary: workspacePIF, signature: "mock", withPIFLoader: pifLoader)
 
         // Examine the workspace.
         #expect(workspace.guid == "some-workspace-guid")
@@ -548,7 +631,7 @@ private final class ProjectModelItemClass: ProjectModelItem {
             Issue.record("property list is not a dictionary")
             return
         }
-        let project = try Project(fromDictionary: projectPIF, signature: "mock", withPIFLoader: pifLoader )
+        let project = try Project(fromDictionary: projectPIF, signature: "mock", withPIFLoader: pifLoader)
 
         // Examine the project.
         #expect(project.guid == "some-project-guid")
@@ -596,7 +679,7 @@ private final class ProjectModelItemClass: ProjectModelItem {
                 "signature": "PROJECT",
                 "type": "project",
                 "contents": .init(testProjectData),
-            ]
+            ],
         ]
 
         let loader = PIFLoader(data: .init(testData), namespace: BuiltinMacros.namespace)
@@ -816,7 +899,7 @@ private final class ProjectModelItemClass: ProjectModelItem {
         ]
 
         // Convert the test data into a property list, then read the variant group from it.
-        let variantGroup = try #require(GroupTreeReference.parsePIFDictAsReference( variantGroupPIF, pifLoader: pifLoader, isRoot: true) as? SWBCore.VariantGroup)
+        let variantGroup = try #require(GroupTreeReference.parsePIFDictAsReference(variantGroupPIF, pifLoader: pifLoader, isRoot: true) as? SWBCore.VariantGroup)
 
         // Examine the variant group.
         #expect(variantGroup.guid == "some-variantGroup-guid")
@@ -870,7 +953,8 @@ private final class ProjectModelItemClass: ProjectModelItem {
                 "GCC_PREPROCESSOR_DEFINITIONS": [
                     "DEBUG=1",
                     "$(inherited)",
-                ]],
+                ],
+            ],
         ]
 
         // Convert the test data into a property list, then read the build configuration from it.
@@ -938,7 +1022,7 @@ private final class ProjectModelItemClass: ProjectModelItem {
                         "guid": "first-buildFile-guid",
                         "name": "ClassOne.m",
                         "fileReference": "first-fileReference-guid",
-                    ],
+                    ]
                 ],
             ]
 
@@ -959,7 +1043,7 @@ private final class ProjectModelItemClass: ProjectModelItem {
                         "guid": "first-buildFile-guid",
                         "name": "ClassOne.h",
                         "fileReference": "first-fileReference-guid",
-                    ],
+                    ]
                 ],
             ]
 
@@ -980,7 +1064,7 @@ private final class ProjectModelItemClass: ProjectModelItem {
                         "guid": "first-buildFile-guid",
                         "name": "Thingy.xib",
                         "fileReference": "first-fileReference-guid",
-                    ],
+                    ]
                 ],
             ]
 
@@ -1003,7 +1087,7 @@ private final class ProjectModelItemClass: ProjectModelItem {
                         "guid": "second-buildFile-guid",
                         "name": "ClassTwo.m",
                         "fileReference": "second-fileReference-guid",
-                    ],
+                    ]
                 ],
                 "runOnlyForDeploymentPostprocessing": "true",
             ]
@@ -1028,10 +1112,10 @@ private final class ProjectModelItemClass: ProjectModelItem {
                 "scriptContents": "echo \"Nothing to do.\"\nexit 0",
                 "originalObjectID": "1234512345",
                 "inputFilePaths": [
-                    "/tmp/foo.in",
+                    "/tmp/foo.in"
                 ],
                 "outputFilePaths": [
-                    "/tmp/foo.out",
+                    "/tmp/foo.out"
                 ],
                 "emitEnvironment": "true",
                 "runOnlyForDeploymentPostprocessing": "true",
@@ -1064,7 +1148,7 @@ private final class ProjectModelItemClass: ProjectModelItem {
                 "fileTypeIdentifier": "sourcecode.c.objc",
                 "compilerSpecificationIdentifier": "com.apple.compilers.llvm.clang.1_0",
                 "outputFilePaths": [
-                    "/tmp/$(INPUT_FILE_BASE).o",
+                    "/tmp/$(INPUT_FILE_BASE).o"
                 ],
             ]
 
@@ -1100,7 +1184,7 @@ private final class ProjectModelItemClass: ProjectModelItem {
                 "scriptContents": "/bin/cp $(INPUT_FILE) $(OUTPUT_FILE_0)",
                 "inputFilePaths": [],
                 "outputFilePaths": [
-                    "/tmp/$(INPUT_FILE_BASE).bar",
+                    "/tmp/$(INPUT_FILE_BASE).bar"
                 ],
             ]
 
@@ -1186,7 +1270,7 @@ private final class ProjectModelItemClass: ProjectModelItem {
                         "guid": "framework-source-buildFile-guid",
                         "name": "FrameworkClass.m",
                         "fileReference": classOneFileRef.guid,
-                    ],
+                    ]
                 ],
             ]
             let testFrameworksBuildPhaseData: [String: PropertyListItem] = [
@@ -1197,7 +1281,7 @@ private final class ProjectModelItemClass: ProjectModelItem {
                         "guid": "cocoa-framework-buildFile-guid",
                         "name": "Cocoa.framework",
                         "fileReference": cocoaFwkFileRef.guid,
-                    ],
+                    ]
                 ],
             ]
             let testProductRefData: [String: PropertyListItem] = [
@@ -1209,7 +1293,7 @@ private final class ProjectModelItemClass: ProjectModelItem {
                 "guid": "framework-target-guid",
                 "name": "Target Uno",
                 "buildConfigurations": .plArray([
-                    .plDict(testBuildConfigurationData),
+                    .plDict(testBuildConfigurationData)
                 ]),
                 "buildPhases": .plArray([
                     .plDict(testSourcesBuildPhaseData),
@@ -1222,7 +1306,7 @@ private final class ProjectModelItemClass: ProjectModelItem {
             ]
 
             // Convert the test data into a property list, then read the target from it.
-            return try StandardTarget( fromDictionary: targetPIF, signature: "mock", withPIFLoader: pifLoader )
+            return try StandardTarget(fromDictionary: targetPIF, signature: "mock", withPIFLoader: pifLoader)
         }()
 
         // Examine the framework target.
@@ -1234,14 +1318,11 @@ private final class ProjectModelItemClass: ProjectModelItem {
         #expect(frameworkTarget.productReference.guid == "framework-productReference-guid")
         #expect(frameworkTarget.productTypeIdentifier == "com.apple.product-type.framework")
 
-        if let provisioningSourceData = frameworkTarget.provisioningSourceData(for: "Debug")
-        {
+        if let provisioningSourceData = frameworkTarget.provisioningSourceData(for: "Debug") {
             #expect(provisioningSourceData.configurationName == "Debug")
             #expect(provisioningSourceData.provisioningStyle == .automatic)
             #expect(provisioningSourceData.bundleIdentifierFromInfoPlist == "")
-        }
-        else
-        {
+        } else {
             Issue.record("frameworkTarget does not have provisioning source data")
         }
 
@@ -1284,7 +1365,7 @@ private final class ProjectModelItemClass: ProjectModelItem {
                         "guid": "cocoa-framework-buildFile-guid",
                         "name": "Cocoa.framework",
                         "fileReference": cocoaFwkFileRef.guid,
-                    ],
+                    ]
                 ],
             ]
             let testProductRefData: [String: PropertyListItem] = [
@@ -1296,17 +1377,17 @@ private final class ProjectModelItemClass: ProjectModelItem {
                 "guid": "app-target-guid",
                 "name": "Target Dos",
                 "buildConfigurations": .plArray([
-                    .plDict(testBuildConfigurationData),
+                    .plDict(testBuildConfigurationData)
                 ]),
                 "provisioningSourceData": .plArray([
-                    .plDict(testProvisioningSourceData),
+                    .plDict(testProvisioningSourceData)
                 ]),
                 "buildPhases": .plArray([
                     .plDict(testSourcesBuildPhaseData),
                     .plDict(testFrameworksBuildPhaseData),
                 ]),
                 "dependencies": [
-                    ["guid": "framework-target-guid"],
+                    ["guid": "framework-target-guid"]
                 ],
                 "productReference": .plDict(testProductRefData),
                 "productTypeIdentifier": "com.apple.product-type.application",
@@ -1314,7 +1395,7 @@ private final class ProjectModelItemClass: ProjectModelItem {
             ]
 
             // Convert the test data into a property list, then read the target from it.
-            return try StandardTarget( fromDictionary: targetPIF, signature: "mock", withPIFLoader: pifLoader )
+            return try StandardTarget(fromDictionary: targetPIF, signature: "mock", withPIFLoader: pifLoader)
         }()
 
         // Examine the app target.
@@ -1326,14 +1407,11 @@ private final class ProjectModelItemClass: ProjectModelItem {
         #expect(appTarget.productReference.guid == "app-productReference-guid")
         #expect(appTarget.productTypeIdentifier == "com.apple.product-type.application")
 
-        if let provisioningSourceData = appTarget.provisioningSourceData(for: "Debug")
-        {
+        if let provisioningSourceData = appTarget.provisioningSourceData(for: "Debug") {
             #expect(provisioningSourceData.configurationName == "Debug")
             #expect(provisioningSourceData.provisioningStyle == .manual)
             #expect(provisioningSourceData.bundleIdentifierFromInfoPlist == "CocoaApp")
-        }
-        else
-        {
+        } else {
             Issue.record("appTarget does not have provisioning source data")
         }
 
@@ -1364,8 +1442,7 @@ private final class ProjectModelItemClass: ProjectModelItem {
             try checkBuildFileRef(of: appFrameworksBuildPhase, fileRef: cocoaFwkFileRef)
             try checkBuildFileRef(of: frameworkSourcesBuildPhase, fileRef: classOneFileRef)
             try checkBuildFileRef(of: frameworkFrameworksBuildPhase, fileRef: cocoaFwkFileRef)
-        }
-        catch {
+        } catch {
             // Any #require failures which caused the block above to abort will have been reported by the test macro.
         }
 
@@ -1381,14 +1458,14 @@ private final class ProjectModelItemClass: ProjectModelItem {
                 "guid": "aggregate-target-guid",
                 "name": "Debug",
                 "buildSettings": [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                    "PRODUCT_NAME": "$(TARGET_NAME)"
                 ],
             ]
             let targetPIF: [String: PropertyListItem] = [
                 "guid": "aggregate-target-guid",
                 "name": "Aggregate",
                 "buildConfigurations": [
-                    testBuildConfigurationData,
+                    testBuildConfigurationData
                 ],
                 "buildPhases": [],
                 "buildRules": [],
@@ -1412,14 +1489,14 @@ private final class ProjectModelItemClass: ProjectModelItem {
                 "guid": "external-buildConfiguration-guid",
                 "name": "Debug",
                 "buildSettings": [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                    "PRODUCT_NAME": "$(TARGET_NAME)"
                 ],
             ]
             let targetPIF: [String: PropertyListItem] = [
                 "guid": "external-target-guid",
                 "name": "External",
                 "buildConfigurations": [
-                    testBuildConfigurationData,
+                    testBuildConfigurationData
                 ],
                 "toolPath": "/usr/bin/make",
                 "arguments": "$(ACTION)",
@@ -1481,7 +1558,7 @@ private final class ProjectModelItemClass: ProjectModelItem {
                         TestBuildConfiguration(
                             "Release",
                             buildSettings: [
-                                "SKIP_INSTALL": "YES",
+                                "SKIP_INSTALL": "YES"
                             ]
                         ),
                     ],
@@ -1500,13 +1577,12 @@ private final class ProjectModelItemClass: ProjectModelItem {
                             buildConfigurations: [TestBuildConfiguration("Debug"), TestBuildConfiguration("Release")],
                             buildPhases: [
                                 TestHeadersBuildPhase([
-                                    "HeaderFile1.h",
+                                    "HeaderFile1.h"
                                 ]),
                                 TestSourcesBuildPhase([
-                                    "SourceFile1.m",
-                                ]),
-                                TestFrameworksBuildPhase([
+                                    "SourceFile1.m"
                                 ]),
+                                TestFrameworksBuildPhase([]),
                             ]
                         ),
                         TestStandardTarget(
@@ -1515,24 +1591,27 @@ private final class ProjectModelItemClass: ProjectModelItem {
                             buildConfigurations: [TestBuildConfiguration("Debug"), TestBuildConfiguration("Release")],
                             buildPhases: [
                                 TestSourcesBuildPhase([
-                                    "SourceFile2.m",
+                                    "SourceFile2.m"
                                 ]),
                                 TestFrameworksBuildPhase([
-                                    "FwkTarget.framework",
+                                    "FwkTarget.framework"
                                 ]),
                                 TestResourcesBuildPhase([
-                                    "View.xib",
+                                    "View.xib"
                                 ]),
-                                TestCopyFilesBuildPhase([
-                                    TestBuildFile(
-                                        "FwkTarget.framework",
-                                        codeSignOnCopy: true,
-                                        removeHeadersOnCopy: true
-                                    ),
-                                ], destinationSubfolder: .frameworks),
+                                TestCopyFilesBuildPhase(
+                                    [
+                                        TestBuildFile(
+                                            "FwkTarget.framework",
+                                            codeSignOnCopy: true,
+                                            removeHeadersOnCopy: true
+                                        )
+                                    ],
+                                    destinationSubfolder: .frameworks
+                                ),
                             ],
                             dependencies: [
-                                "FwkTarget",
+                                "FwkTarget"
                             ]
                         ),
                         TestExternalTarget(
@@ -1675,37 +1754,35 @@ private final class ProjectModelItemClass: ProjectModelItem {
                 TestProject(
                     "aProject",
                     groupTree: TestGroup(
-                        "SomeFiles", path: "Sources",
-                        children: []),
+                        "SomeFiles",
+                        path: "Sources",
+                        children: []
+                    ),
                     targets: [
                         TestStandardTarget(
                             "CoreFoo",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug",
-                                                       buildSettings: [
-                                                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                       ]),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
                             ],
                             buildPhases: [
-                                TestSourcesBuildPhase([
-                                ]),
-                                TestSourcesBuildPhase([
-                                ]),
-                                TestFrameworksBuildPhase([
-                                ]),
-                                TestFrameworksBuildPhase([
-                                ]),
-                                TestHeadersBuildPhase([
-                                ]),
-                                TestHeadersBuildPhase([
-                                ]),
-                                TestResourcesBuildPhase([
-                                ]),
-                                TestResourcesBuildPhase([
-                                ]),
-                            ]),
-                    ]),
+                                TestSourcesBuildPhase([]),
+                                TestSourcesBuildPhase([]),
+                                TestFrameworksBuildPhase([]),
+                                TestFrameworksBuildPhase([]),
+                                TestHeadersBuildPhase([]),
+                                TestHeadersBuildPhase([]),
+                                TestResourcesBuildPhase([]),
+                                TestResourcesBuildPhase([]),
+                            ]
+                        )
+                    ]
+                )
             ]
         )
         let workspace = try await testWorkspace.load(getCore())
@@ -1718,11 +1795,13 @@ private final class ProjectModelItemClass: ProjectModelItem {
             return
         }
         #expect(target.errors == [])
-        #expect(target.warnings == [
-            "target has multiple Compile Sources build phases, which may cause it to build incorrectly - all but one should be deleted",
-            "target has multiple Link Binary build phases, which may cause it to build incorrectly - all but one should be deleted",
-            "target has multiple Copy Headers build phases, which may cause it to build incorrectly - all but one should be deleted",
-            "target has multiple Copy Bundle Resources build phases, which may cause it to build incorrectly - all but one should be deleted",
-        ])
+        #expect(
+            target.warnings == [
+                "target has multiple Compile Sources build phases, which may cause it to build incorrectly - all but one should be deleted",
+                "target has multiple Link Binary build phases, which may cause it to build incorrectly - all but one should be deleted",
+                "target has multiple Copy Headers build phases, which may cause it to build incorrectly - all but one should be deleted",
+                "target has multiple Copy Bundle Resources build phases, which may cause it to build incorrectly - all but one should be deleted",
+            ]
+        )
     }
 }
diff --git a/Tests/SWBCoreTests/PlatformRegistryTests.swift b/Tests/SWBCoreTests/PlatformRegistryTests.swift
index 72287e8e..583be3b4 100644
--- a/Tests/SWBCoreTests/PlatformRegistryTests.swift
+++ b/Tests/SWBCoreTests/PlatformRegistryTests.swift
@@ -59,7 +59,7 @@ import SWBMacro
     /// - parameter perform: A block to run with the registry that results from scanning the inputs, as well as the list of warnings and errors. Each warning and error is a pair of the path basename and the diagnostic message.
     private func withRegistryForTestInputs(_ inputs: [(String, PropertyListItem?)], perform: (PlatformRegistry, TestDataDelegate) async throws -> Void) async throws {
         try await withTemporaryDirectory { tmpDirPath in
-            for (name,dataOpt) in inputs {
+            for (name, dataOpt) in inputs {
                 let itemPath = tmpDirPath.join(name).join("Info.plist")
                 try localFS.createDirectory(itemPath.dirname, recursive: true)
 
@@ -75,7 +75,7 @@ import SWBMacro
         }
     }
     private func withRegistryForTestInputs(_ inputs: [(String, [String: PropertyListItem]?)], perform: (PlatformRegistry, TestDataDelegate) throws -> Void) async throws {
-        try await withRegistryForTestInputs(inputs.map{ ($0, $1.flatMap{ .plDict($0) }) }, perform: perform)
+        try await withRegistryForTestInputs(inputs.map { ($0, $1.flatMap { .plDict($0) }) }, perform: perform)
     }
 
     @Test
@@ -89,13 +89,19 @@ import SWBMacro
             #expect(Set(registry.platformsByIdentifier.keys) == Set(["c"]))
             registry.loadExtendedInfo(MacroNamespace())
 
-            XCTAssertMatch(delegate.errors, [
-                .contains("b.platform: unexpected platform data"),
-            ])
+            XCTAssertMatch(
+                delegate.errors,
+                [
+                    .contains("b.platform: unexpected platform data")
+                ]
+            )
 
-            XCTAssertMatch(delegate.warnings, [
-                .equal("unexpected macro parsing failure loading platform c: inconsistentMacroDefinition(name: \"CODE_SIGNING_REQUIRED\", type: SWBMacro.MacroType.userDefined, value: true)"),
-            ])
+            XCTAssertMatch(
+                delegate.warnings,
+                [
+                    .equal("unexpected macro parsing failure loading platform c: inconsistentMacroDefinition(name: \"CODE_SIGNING_REQUIRED\", type: SWBMacro.MacroType.userDefined, value: true)")
+                ]
+            )
 
             // We no longer warn about platforms which are missing their Info.plist - we just silently don't load them, which avoids spamming the user console in some common scenarios.
             XCTAssertMatch(delegate.warnings, [])
@@ -128,20 +134,23 @@ import SWBMacro
             #expect(jPlatform.name == "okName")
             #expect(jPlatform.defaultSettings["NAME"] == .plString("VALUE"))
 
-            XCTAssertMatch(delegate.errors, [
-                .contains("c.platform: invalid 'Type' field"),
-                .contains("d.platform: missing 'Name' field"),
-                .contains("e.platform: invalid 'Name' field"),
-                .contains("f.platform: missing 'Identifier' field"),
-                .contains("g.platform: invalid 'Identifier' field"),
-                .contains("h.platform: missing 'Description' field"), // missing the 'Version' field is allowed.
-                .contains("i.platform: invalid 'Version' field"),
-                .contains("j.platform: missing 'Description' field"),
-                .contains("k.platform: invalid 'Description' field"),
-                .contains("l.platform: missing 'FamilyName' field"),
-                .contains("m.platform: invalid 'FamilyName' field"),
-                .contains("ok2.platform: platform 'ok' already registered"),
-            ])
+            XCTAssertMatch(
+                delegate.errors,
+                [
+                    .contains("c.platform: invalid 'Type' field"),
+                    .contains("d.platform: missing 'Name' field"),
+                    .contains("e.platform: invalid 'Name' field"),
+                    .contains("f.platform: missing 'Identifier' field"),
+                    .contains("g.platform: invalid 'Identifier' field"),
+                    .contains("h.platform: missing 'Description' field"),  // missing the 'Version' field is allowed.
+                    .contains("i.platform: invalid 'Version' field"),
+                    .contains("j.platform: missing 'Description' field"),
+                    .contains("k.platform: invalid 'Description' field"),
+                    .contains("l.platform: missing 'FamilyName' field"),
+                    .contains("m.platform: invalid 'FamilyName' field"),
+                    .contains("ok2.platform: platform 'ok' already registered"),
+                ]
+            )
             #expect(delegate.warnings == [])
         }
     }
diff --git a/Tests/SWBCoreTests/ProductTypesTests.swift b/Tests/SWBCoreTests/ProductTypesTests.swift
index 5bc412bb..618eb3ed 100644
--- a/Tests/SWBCoreTests/ProductTypesTests.swift
+++ b/Tests/SWBCoreTests/ProductTypesTests.swift
@@ -22,55 +22,65 @@ fileprivate struct ProductTypesTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS))
     func testDeepFramework_FrameworksSymlink() async throws {
         let core = try await getCore()
-        let testWorkspace = TestWorkspace("Workspace",
+        let testWorkspace = TestWorkspace(
+            "Workspace",
             projects: [
                 TestProject(
                     "aProject",
-                    groupTree: TestGroup("SomeFiles", children: [
-                        TestFile("aFramework.m"),
-                        TestFile("embeddedFramework.m"),
-                    ]),
+                    groupTree: TestGroup(
+                        "SomeFiles",
+                        children: [
+                            TestFile("aFramework.m"),
+                            TestFile("embeddedFramework.m"),
+                        ]
+                    ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Release", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "SDKROOT": "macosx",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                        ])
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SDKROOT": "macosx",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                            ]
+                        )
                     ],
                     targets: [
                         TestStandardTarget(
                             "aFramework",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Release"),
+                                TestBuildConfiguration("Release")
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["aFramework.m"]),
-                                TestCopyFilesBuildPhase([
-                                    "embeddedFramework.framework",
-                                ], destinationSubfolder: .frameworks),
+                                TestCopyFilesBuildPhase(
+                                    [
+                                        "embeddedFramework.framework"
+                                    ],
+                                    destinationSubfolder: .frameworks
+                                ),
                                 TestFrameworksBuildPhase([
-                                    "embeddedFramework.framework",
+                                    "embeddedFramework.framework"
                                 ]),
                             ],
                             dependencies: [
-                                "embeddedFramework",
+                                "embeddedFramework"
                             ]
                         ),
                         TestStandardTarget(
                             "embeddedFramework",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Release"),
+                                TestBuildConfiguration("Release")
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase(["embeddedFramework.m"]),
                                 TestFrameworksBuildPhase(),
                             ]
-                        )
+                        ),
                     ]
-                ),
+                )
             ]
         )
 
diff --git a/Tests/SWBCoreTests/ProvisioningTests.swift b/Tests/SWBCoreTests/ProvisioningTests.swift
index 38edbadf..ef379a87 100644
--- a/Tests/SWBCoreTests/ProvisioningTests.swift
+++ b/Tests/SWBCoreTests/ProvisioningTests.swift
@@ -40,7 +40,7 @@ private func createMockProject() throws -> SWBCore.Project {
     return try Project(fromDictionary: projectPIF, signature: "mock", withPIFLoader: pifLoader)
 }
 
-private func setupMacroEvaluationScope(_ settings: [MacroDeclaration:String] = [MacroDeclaration:String](), tableSetupHandler: ((inout MacroValueAssignmentTable) -> Void)? = nil) -> MacroEvaluationScope{
+private func setupMacroEvaluationScope(_ settings: [MacroDeclaration: String] = [MacroDeclaration: String](), tableSetupHandler: ((inout MacroValueAssignmentTable) -> Void)? = nil) -> MacroEvaluationScope {
     var table = MacroValueAssignmentTable(namespace: BuiltinMacros.namespace)
 
     for (key, value) in settings {
@@ -59,16 +59,15 @@ private func setupMacroEvaluationScope(_ settings: [MacroDeclaration:String] = [
     return MacroEvaluationScope(table: table)
 }
 
-
 @Suite fileprivate struct ProvisioningTests: CoreBasedTests {
     @Test
     func computeBundleIdentifier() {
         let bundleIdentifierFromInfoPlist = BuiltinMacros.namespace.parseString("com.apple.$(PRODUCT_NAME)")
-        let scope = setupMacroEvaluationScope([ BuiltinMacros.PRODUCT_BUNDLE_IDENTIFIER: "BundleID" ])
+        let scope = setupMacroEvaluationScope([BuiltinMacros.PRODUCT_BUNDLE_IDENTIFIER: "BundleID"])
         var result = SWBCore.computeBundleIdentifier(from: scope, bundleIdentifierFromInfoPlist: bundleIdentifierFromInfoPlist)
         #expect(result == "BundleID")
 
-        let scopeWithoutBundleID = setupMacroEvaluationScope([ BuiltinMacros.PRODUCT_NAME: "ProductName" ])
+        let scopeWithoutBundleID = setupMacroEvaluationScope([BuiltinMacros.PRODUCT_NAME: "ProductName"])
         result = SWBCore.computeBundleIdentifier(from: scopeWithoutBundleID, bundleIdentifierFromInfoPlist: bundleIdentifierFromInfoPlist)
         #expect(result == "com.apple.ProductName")
     }
@@ -84,14 +83,14 @@ private func setupMacroEvaluationScope(_ settings: [MacroDeclaration:String] = [
         var result = SWBCore.computeBundleIdentifier(from: scope, bundleIdentifierFromInfoPlist: bundleIdentifierFromInfoPlist)
         #expect(result == "BundleID.xctrunner")
 
-        let scopeWithoutBundleID = setupMacroEvaluationScope([ BuiltinMacros.PRODUCT_NAME: "ProductName" ])
+        let scopeWithoutBundleID = setupMacroEvaluationScope([BuiltinMacros.PRODUCT_NAME: "ProductName"])
         result = SWBCore.computeBundleIdentifier(from: scopeWithoutBundleID, bundleIdentifierFromInfoPlist: bundleIdentifierFromInfoPlist)
         #expect(result == "com.apple.ProductName")
     }
 
     @Test(.requireSDKs(.iOS))
     func computeSigningCertificateIdentifier() async throws {
-        let scope = setupMacroEvaluationScope([ BuiltinMacros.CODE_SIGN_IDENTITY: "MyIdentity" ])
+        let scope = setupMacroEvaluationScope([BuiltinMacros.CODE_SIGN_IDENTITY: "MyIdentity"])
         do {
             if let platform = try await getCore().platformRegistry.lookup(identifier: "com.apple.platform.iphoneos") {
                 let result = SWBCore.computeSigningCertificateIdentifier(from: scope, platform: platform)
@@ -104,7 +103,7 @@ private func setupMacroEvaluationScope(_ settings: [MacroDeclaration:String] = [
         do {
             if let platform = try await getCore().platformRegistry.lookup(identifier: "com.apple.platform.iphonesimulator") {
                 let result = SWBCore.computeSigningCertificateIdentifier(from: scope, platform: platform)
-                #expect(result == "-") // always Ad-hoc sign for simulator even if CODE_SIGN_IDENTITY has been overridden
+                #expect(result == "-")  // always Ad-hoc sign for simulator even if CODE_SIGN_IDENTITY has been overridden
             } else {
                 Issue.record("couldn't lookup platform com.apple.platform.iphonesimulator")
             }
@@ -124,9 +123,9 @@ private func setupMacroEvaluationScope(_ settings: [MacroDeclaration:String] = [
         let entitlementsPath = Path("/Entitlements/entitlements.plist")
         let sdkEntitlementsPath = sdk.path.join(Path("Entitlements.plist"))
 
-        let scope = setupMacroEvaluationScope([ BuiltinMacros.CODE_SIGN_ENTITLEMENTS: entitlementsPath.str ])
+        let scope = setupMacroEvaluationScope([BuiltinMacros.CODE_SIGN_ENTITLEMENTS: entitlementsPath.str])
         var result = SWBCore.lookupEntitlementsFilePath(from: scope, project: project, sdk: sdk, fs: fs)
-        #expect(result == entitlementsPath) // FIXME: Path isn't checked for existence, is that correct?
+        #expect(result == entitlementsPath)  // FIXME: Path isn't checked for existence, is that correct?
 
         try fs.createDirectory(entitlementsPath.dirname, recursive: false)
         try fs.write(entitlementsPath, contents: "foo = bar")
@@ -164,24 +163,24 @@ private func setupMacroEvaluationScope(_ settings: [MacroDeclaration:String] = [
                     groupTree: TestGroup(
                         "Sources",
                         children: [
-                            TestFile("aClass.m"),
+                            TestFile("aClass.m")
                         ]
                     ),
-                    buildConfigurations:[
-                        TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)",])
+                    buildConfigurations: [
+                        TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                     ],
                     targets: [
                         TestStandardTarget(
                             "AppTarget",
                             type: .application,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug"),
+                                TestBuildConfiguration("Debug")
                             ],
                             buildPhases: [
-                                TestSourcesBuildPhase(["aClass.m"]),
+                                TestSourcesBuildPhase(["aClass.m"])
                             ],
                             provisioningSourceData: [
-                                ProvisioningSourceData(configurationName: "Debug", provisioningStyle: .automatic, bundleIdentifierFromInfoPlist: "AppTarget"),
+                                ProvisioningSourceData(configurationName: "Debug", provisioningStyle: .automatic, bundleIdentifierFromInfoPlist: "AppTarget")
                             ]
                         )
                     ]
diff --git a/Tests/SWBCoreTests/RecursiveSearchPathResolverTests.swift b/Tests/SWBCoreTests/RecursiveSearchPathResolverTests.swift
index 1ee674e6..ca9f9c81 100644
--- a/Tests/SWBCoreTests/RecursiveSearchPathResolverTests.swift
+++ b/Tests/SWBCoreTests/RecursiveSearchPathResolverTests.swift
@@ -33,16 +33,22 @@ import SWBUtil
             try await runProcess(["/bin/chmod", "100", tmpDirPath.join("inaccessible").str])
 
             let (paths, warnings) = resolver.expandedPaths(for: tmpDirPath, relativeTo: tmpDirPath)
-            #expect(paths.map{ $0.str } == [
-                ".",
-                // This directory can be seen, but not traversed.
-                "inaccessible",
-                "other",
-                "subdir",
-                "subdir/subsubdir"])
-            XCTAssertMatch(warnings, [
-                .regex(#/unable to expand children of '.*/inaccessible'/#),
-            ])
+            #expect(
+                paths.map { $0.str } == [
+                    ".",
+                    // This directory can be seen, but not traversed.
+                    "inaccessible",
+                    "other",
+                    "subdir",
+                    "subdir/subsubdir",
+                ]
+            )
+            XCTAssertMatch(
+                warnings,
+                [
+                    .regex(#/unable to expand children of '.*/inaccessible'/#)
+                ]
+            )
 
             // Allow the inaccessible path to be removed.
             try await runProcess(["/bin/chmod", "755", tmpDirPath.join("inaccessible").str])
@@ -56,7 +62,7 @@ import SWBUtil
         let resolver = RecursiveSearchPathResolver(fs: fs)
         try fs.createDirectory(Path.root.join("a/b"), recursive: true)
         let (paths, _) = resolver.expandedPaths(for: Path.root.join("a"), relativeTo: .root)
-        #expect(paths.map{ $0.str } == ["a", "a/b"])
+        #expect(paths.map { $0.str } == ["a", "a/b"])
     }
 
     /// Check the resolver honors the entry limit.
@@ -65,7 +71,7 @@ import SWBUtil
         let fs = PseudoFS()
         let resolver = RecursiveSearchPathResolver(fs: fs)
         let N = 10000
-        for i in 0 ..< N {
+        for i in 0..<N {
             try fs.createDirectory(Path.root.join("dir-\(i)"), recursive: false)
         }
         let (paths, _) = resolver.expandedPaths(for: .root, relativeTo: .root)
@@ -84,7 +90,7 @@ import SWBUtil
 
             let (paths, warnings) = resolver.expandedPaths(for: .root, relativeTo: .root, excludedPatterns: excluded, includedPatterns: included)
             #expect(warnings == [])
-            #expect(paths.map{ $0.str } == expected)
+            #expect(paths.map { $0.str } == expected)
         }
 
         try check(files: [.root.join("a"), .root.join("aa"), .root.join("b"), .root.join("c")], excluded: ["a*"], included: ["aa"], expected: [".", "aa", "b", "c"])
diff --git a/Tests/SWBCoreTests/SDKRegistryTests.swift b/Tests/SWBCoreTests/SDKRegistryTests.swift
index 368da32d..cff1604c 100644
--- a/Tests/SWBCoreTests/SDKRegistryTests.swift
+++ b/Tests/SWBCoreTests/SDKRegistryTests.swift
@@ -20,7 +20,7 @@ import SWBMacro
 @Suite fileprivate struct SDKRegistryTests: CoreBasedTests {
 
     /// Delegate for testing loading SDKs in a registry.
-    final class TestDataDelegate : SDKRegistryDelegate {
+    final class TestDataDelegate: SDKRegistryDelegate {
         let namespace = MacroNamespace()
         let pluginManager: any PluginManager
         private let _diagnosticsEngine = DiagnosticsEngine()
@@ -50,10 +50,12 @@ import SWBMacro
     ///
     /// - parameter inputs: A list of test inputs, in the form (name, testData). These inputs will be written to files in a temporary directory for testing.
     /// - parameter perform: A block to run with the registry that results from scanning the inputs, as well as the list of warnings and errors. Each warning and error is a pair of the path basename and the diagnostic message.
-    private func withRegistryForTestInputs(_ inputs: [(String, PropertyListItem?)],
-                                           registryType: SDKRegistry.SDKRegistryType = .builtin,
-                                           sourceLocation: SourceLocation = #_sourceLocation,
-                                           perform: (SDKRegistry, TestDataDelegate, Path) async throws -> Void) async throws {
+    private func withRegistryForTestInputs(
+        _ inputs: [(String, PropertyListItem?)],
+        registryType: SDKRegistry.SDKRegistryType = .builtin,
+        sourceLocation: SourceLocation = #_sourceLocation,
+        perform: (SDKRegistry, TestDataDelegate, Path) async throws -> Void
+    ) async throws {
         try await withTemporaryDirectory { tmpDirPath in
             for (name, dataOpt) in inputs {
                 let itemPath = tmpDirPath.join(name).join("SDKSettings.plist")
@@ -83,8 +85,7 @@ import SWBMacro
             do {
                 components = try SDK.parseSDKName(sdkName, registry: try await getCore().sdkRegistry)
                 errorString = nil
-            }
-            catch {
+            } catch {
                 components = nil
                 errorString = "\(error)"
             }
@@ -153,12 +154,15 @@ import SWBMacro
             #expect(dSDK?.canonicalName == "d")
             #expect(dSDK?.defaultSettings["NAME"] == .plString("VALUE"))
 
-            XCTAssertMatch(delegate.errors, [
-                .contains("a.sdk: unable to load SDK: 'SDKSettings.plist' was malformed"),
-                .contains("b.sdk: unexpected SDK data"),
-                .contains("c.sdk: invalid or missing 'CanonicalName' field"),
-                .contains("e.sdk: SDK 'd' already registered")
-            ])
+            XCTAssertMatch(
+                delegate.errors,
+                [
+                    .contains("a.sdk: unable to load SDK: 'SDKSettings.plist' was malformed"),
+                    .contains("b.sdk: unexpected SDK data"),
+                    .contains("c.sdk: invalid or missing 'CanonicalName' field"),
+                    .contains("e.sdk: SDK 'd' already registered"),
+                ]
+            )
             #expect(delegate.warnings == [])
         }
     }
@@ -177,8 +181,12 @@ import SWBMacro
         ]) { registry, delegate, tmpDir in
 
             // Check the canonical names all defined SDKs to make sure we have a reasonable baseline.
-            #expect(Set(registry.allSDKs.map({ $0.canonicalName })) == Set([
-                "macosx", "toastos1.0", "toastos2.0", "toastos2.0.1", "toastosextra1.0", "driverkit.toastos2.0"]))
+            #expect(
+                Set(registry.allSDKs.map({ $0.canonicalName }))
+                    == Set([
+                        "macosx", "toastos1.0", "toastos2.0", "toastos2.0.1", "toastosextra1.0", "driverkit.toastos2.0",
+                    ])
+            )
 
             // Look up the boot SDK (macosx) by name and make sure it has the expected properties.
             let bootSDK = try #require(registry.lookup("macosx"))
@@ -248,7 +256,7 @@ import SWBMacro
     @Test
     func externalSDKs() async throws {
         try await withRegistryForTestInputs([
-            ("boot.sdk", ["CanonicalName": "macosx"]),
+            ("boot.sdk", ["CanonicalName": "macosx"])
         ]) { coreSDKRegistry, delegate, _ in
 
             // Create an external SDK.
@@ -284,23 +292,27 @@ import SWBMacro
     @Test
     func customBuildSettings() async throws {
         try await withRegistryForTestInputs([
-            ("boot.sdk", ["CanonicalName": "macosx"]),
+            ("boot.sdk", ["CanonicalName": "macosx"])
         ]) { coreSDKRegistry, delegate, _ in
 
             // Create an SDK with custom build settings.
             try await withTemporaryDirectory { sdksDirPath in
                 let sdkPath = sdksDirPath.join("TestSDK.sdk")
                 let sdkIdentifier = "com.apple.sdk.1.0"
-                try await writeSDK(name: sdkPath.basename, parentDir: sdksDirPath, settings: [
-                    "CanonicalName": .plString(sdkIdentifier),
-                    "IsBaseSDK": "NO",
-                    "DefaultProperties": [
-                        "SOME_CUSTOM_SETTING": "foo"
-                    ],
-                    "CustomProperties": [
-                        "SOME_CUSTOM_SETTING": "$(inherited) SOME_CUSTOM_SETTING"
-                    ],
-                ])
+                try await writeSDK(
+                    name: sdkPath.basename,
+                    parentDir: sdksDirPath,
+                    settings: [
+                        "CanonicalName": .plString(sdkIdentifier),
+                        "IsBaseSDK": "NO",
+                        "DefaultProperties": [
+                            "SOME_CUSTOM_SETTING": "foo"
+                        ],
+                        "CustomProperties": [
+                            "SOME_CUSTOM_SETTING": "$(inherited) SOME_CUSTOM_SETTING"
+                        ],
+                    ]
+                )
                 let userNamespace = MacroNamespace()
                 let registry = WorkspaceContextSDKRegistry(coreSDKRegistry: coreSDKRegistry, delegate: delegate, userNamespace: userNamespace, overridingSDKsDir: nil)
 
@@ -316,23 +328,27 @@ import SWBMacro
     @Test
     func invalidCustomBuildSettings() async throws {
         try await withRegistryForTestInputs([
-            ("boot.sdk", ["CanonicalName": "macosx"]),
+            ("boot.sdk", ["CanonicalName": "macosx"])
         ]) { coreSDKRegistry, delegate, _ in
 
             // Create an SDK with custom build settings.
             try await withTemporaryDirectory { sdksDirPath in
                 let sdkPath = sdksDirPath.join("TestSDK.sdk")
                 let sdkIdentifier = "com.apple.sdk.1.0"
-                try await writeSDK(name: sdkPath.basename, parentDir: sdksDirPath, settings: [
-                    "CanonicalName": .plString(sdkIdentifier),
-                    "IsBaseSDK": "NO",
-                    "DefaultProperties": [
-                        "CODE_SIGNING_REQUIRED": true
-                    ],
-                    "CustomProperties": [
-                        "CODE_SIGNING_REQUIRED": true
-                    ],
-                ])
+                try await writeSDK(
+                    name: sdkPath.basename,
+                    parentDir: sdksDirPath,
+                    settings: [
+                        "CanonicalName": .plString(sdkIdentifier),
+                        "IsBaseSDK": "NO",
+                        "DefaultProperties": [
+                            "CODE_SIGNING_REQUIRED": true
+                        ],
+                        "CustomProperties": [
+                            "CODE_SIGNING_REQUIRED": true
+                        ],
+                    ]
+                )
                 let userNamespace = MacroNamespace()
                 let registry = WorkspaceContextSDKRegistry(coreSDKRegistry: coreSDKRegistry, delegate: delegate, userNamespace: userNamespace, overridingSDKsDir: nil)
 
@@ -348,73 +364,79 @@ import SWBMacro
     @Test
     func SDKVariants() async throws {
         try await withRegistryForTestInputs([
-            ("boot.sdk", ["CanonicalName": "macosx"]),
+            ("boot.sdk", ["CanonicalName": "macosx"])
         ]) { coreSDKRegistry, delegate, _ in
 
             // Create an SDK with variants.
             try await withTemporaryDirectory { sdksDirPath in
                 let sdkPath = sdksDirPath.join("TestSDK.sdk")
                 let sdkIdentifier = "com.apple.sdk.1.0"
-                try await writeSDK(name: sdkPath.basename, parentDir: sdksDirPath, settings: [
-                    "CanonicalName": .plString(sdkIdentifier),
-                    "Version": "1.0",
-                    "IsBaseSDK": "YES",
-                    "DefaultProperties": [
-                        "SOME_CUSTOM_SETTING": "foo"
-                    ],
-                    "CustomProperties": [
-                        "SOME_CUSTOM_SETTING": "$(inherited) SOME_CUSTOM_SETTING"
-                    ],
-                    "Variants": [
-                        [   "Name": "iosmac",
-                            "BuildSettings": [
-                                "SOME_CUSTOM_SETTING": "$(inherited) S",
-                            ],
-                        ] as PropertyListItem,
-                        [   "Name": "macos",
-                            "BuildSettings": [
-                                "SOME_CUSTOM_SETTING": "$(inherited) V",
-                            ],
-                        ] as PropertyListItem
-                    ],
-                    "SupportedTargets": [
-                        "iosmac": [
-                            "Archs": [ "x86_64", "x86_64h" ],
-                            "BuildVersionPlatformID": "6",
-                            "MinimumDeploymentTarget": "13.0",
-                            "MaximumDeploymentTarget": "13.0.99",
-                            "DefaultDeploymentTarget": "13.0",
-                            "ValidDeploymentTargets": [ "13.0" ],
-                            "LLVMTargetTripleVendor": "apple",
-                            "LLVMTargetTripleSys": "ios",
-                            "LLVMTargetTripleEnvironment": "macabi",
-                        ] as PropertyListItem,
-                        // Test the fact that the macOS variant's name is 'macos' but the target name is 'macosx', and we want to standardize on the platform name.
-                        "macosx": [
-                            "Archs": [ "x86_64" ],
-                            "BuildVersionPlatformID": "1",
-                            "MinimumDeploymentTarget": "10.12",
-                            "DefaultDeploymentTarget": "10.15",
-                            "ValidDeploymentTargets": [ "10.12", "10.13", "10.14", "10.15" ],
-                            "LLVMTargetTripleVendor": "apple",
-                            "LLVMTargetTripleSys": "macos",
-                            "LLVMTargetTripleEnvironment": "",
-                        ] as PropertyListItem,
-                        // Test an externally defined platform target that we don't know about
-                        "toastos": [
-                            "Archs": [ "x86_64" ],
-                            "BuildVersionPlatformID": "99",
-                            "MinimumDeploymentTarget": "99.99",
-                            "DeploymentTargetSettingName": "TOASTOS_DEPLOYMENT_TARGET",
-                            "DefaultDeploymentTarget": "99.99",
-                            "ValidDeploymentTargets": [ "99.99" ],
-                            "LLVMTargetTripleVendor": "apple",
-                            "LLVMTargetTripleSys": "toastos",
-                            "PlatformFamilyName": "toastOS",
-                        ] as PropertyListItem,
-                    ],
-                    "DefaultVariant": "macos"
-                ])
+                try await writeSDK(
+                    name: sdkPath.basename,
+                    parentDir: sdksDirPath,
+                    settings: [
+                        "CanonicalName": .plString(sdkIdentifier),
+                        "Version": "1.0",
+                        "IsBaseSDK": "YES",
+                        "DefaultProperties": [
+                            "SOME_CUSTOM_SETTING": "foo"
+                        ],
+                        "CustomProperties": [
+                            "SOME_CUSTOM_SETTING": "$(inherited) SOME_CUSTOM_SETTING"
+                        ],
+                        "Variants": [
+                            [
+                                "Name": "iosmac",
+                                "BuildSettings": [
+                                    "SOME_CUSTOM_SETTING": "$(inherited) S"
+                                ],
+                            ] as PropertyListItem,
+                            [
+                                "Name": "macos",
+                                "BuildSettings": [
+                                    "SOME_CUSTOM_SETTING": "$(inherited) V"
+                                ],
+                            ] as PropertyListItem,
+                        ],
+                        "SupportedTargets": [
+                            "iosmac": [
+                                "Archs": ["x86_64", "x86_64h"],
+                                "BuildVersionPlatformID": "6",
+                                "MinimumDeploymentTarget": "13.0",
+                                "MaximumDeploymentTarget": "13.0.99",
+                                "DefaultDeploymentTarget": "13.0",
+                                "ValidDeploymentTargets": ["13.0"],
+                                "LLVMTargetTripleVendor": "apple",
+                                "LLVMTargetTripleSys": "ios",
+                                "LLVMTargetTripleEnvironment": "macabi",
+                            ] as PropertyListItem,
+                            // Test the fact that the macOS variant's name is 'macos' but the target name is 'macosx', and we want to standardize on the platform name.
+                            "macosx": [
+                                "Archs": ["x86_64"],
+                                "BuildVersionPlatformID": "1",
+                                "MinimumDeploymentTarget": "10.12",
+                                "DefaultDeploymentTarget": "10.15",
+                                "ValidDeploymentTargets": ["10.12", "10.13", "10.14", "10.15"],
+                                "LLVMTargetTripleVendor": "apple",
+                                "LLVMTargetTripleSys": "macos",
+                                "LLVMTargetTripleEnvironment": "",
+                            ] as PropertyListItem,
+                            // Test an externally defined platform target that we don't know about
+                            "toastos": [
+                                "Archs": ["x86_64"],
+                                "BuildVersionPlatformID": "99",
+                                "MinimumDeploymentTarget": "99.99",
+                                "DeploymentTargetSettingName": "TOASTOS_DEPLOYMENT_TARGET",
+                                "DefaultDeploymentTarget": "99.99",
+                                "ValidDeploymentTargets": ["99.99"],
+                                "LLVMTargetTripleVendor": "apple",
+                                "LLVMTargetTripleSys": "toastos",
+                                "PlatformFamilyName": "toastOS",
+                            ] as PropertyListItem,
+                        ],
+                        "DefaultVariant": "macos",
+                    ]
+                )
                 let userNamespace = MacroNamespace()
                 let registry = WorkspaceContextSDKRegistry(coreSDKRegistry: coreSDKRegistry, delegate: delegate, userNamespace: userNamespace, overridingSDKsDir: nil)
 
@@ -429,11 +451,14 @@ import SWBMacro
                 #expect(sdk.variants.count == 3)
                 let macCatalystVariant = try #require(sdk.variants[MacCatalystInfo.sdkVariantName])
                 #expect(macCatalystVariant.name == MacCatalystInfo.sdkVariantName)
-                #expect(Set(macCatalystVariant.settings.keys) == Set([
-                    "IS_MACCATALYST",
-                    "SDK_VARIANT",
-                    "SOME_CUSTOM_SETTING",
-                ]))
+                #expect(
+                    Set(macCatalystVariant.settings.keys)
+                        == Set([
+                            "IS_MACCATALYST",
+                            "SDK_VARIANT",
+                            "SOME_CUSTOM_SETTING",
+                        ])
+                )
                 #expect(macCatalystVariant.settings["IS_MACCATALYST"]?.stringValue == "YES")
                 #expect(macCatalystVariant.settings["SDK_VARIANT"]?.stringValue == MacCatalystInfo.sdkVariantName)
                 #expect(macCatalystVariant.settings["SOME_CUSTOM_SETTING"]?.stringValue == "$(inherited) S")
@@ -442,11 +467,14 @@ import SWBMacro
                     return
                 }
                 #expect(macosVariant.name == "macos")
-                #expect(Set(macCatalystVariant.settings.keys) == Set([
-                    "IS_MACCATALYST",
-                    "SDK_VARIANT",
-                    "SOME_CUSTOM_SETTING",
-                ]))
+                #expect(
+                    Set(macCatalystVariant.settings.keys)
+                        == Set([
+                            "IS_MACCATALYST",
+                            "SDK_VARIANT",
+                            "SOME_CUSTOM_SETTING",
+                        ])
+                )
                 #expect(macosVariant.settings["IS_MACCATALYST"]?.stringValue == "NO")
                 #expect(macosVariant.settings["SDK_VARIANT"]?.stringValue == "macos")
                 #expect(macosVariant.settings["SOME_CUSTOM_SETTING"]?.stringValue == "$(inherited) V")
@@ -455,21 +483,21 @@ import SWBMacro
                 #expect(sdk.defaultVariant === macosVariant)
 
                 // Check the other properties.
-                #expect(macCatalystVariant.archs == [ "x86_64", "x86_64h" ])
+                #expect(macCatalystVariant.archs == ["x86_64", "x86_64h"])
                 #expect(macCatalystVariant.buildVersionPlatformID == 6)
                 #expect(macCatalystVariant.minimumDeploymentTarget == Version(13, 0))
                 #expect(macCatalystVariant.maximumDeploymentTarget == Version(13, 0, 99))
                 #expect(macCatalystVariant.defaultDeploymentTarget == Version(13, 0))
-                #expect(macCatalystVariant.validDeploymentTargets == [ Version(13, 0) ])
+                #expect(macCatalystVariant.validDeploymentTargets == [Version(13, 0)])
                 #expect(macCatalystVariant.llvmTargetTripleVendor == "apple")
                 #expect(macCatalystVariant.llvmTargetTripleSys == "ios")
                 #expect(macCatalystVariant.llvmTargetTripleEnvironment == "macabi")
-                #expect(macosVariant.archs == [ "x86_64" ])
+                #expect(macosVariant.archs == ["x86_64"])
                 #expect(macosVariant.buildVersionPlatformID == 1)
                 #expect(macosVariant.minimumDeploymentTarget == Version(10, 12))
                 #expect(macosVariant.maximumDeploymentTarget == nil)
                 #expect(macosVariant.defaultDeploymentTarget == Version(10, 15))
-                #expect(macosVariant.validDeploymentTargets == [ Version(10, 12), Version(10, 13), Version(10, 14), Version(10, 15) ])
+                #expect(macosVariant.validDeploymentTargets == [Version(10, 12), Version(10, 13), Version(10, 14), Version(10, 15)])
                 #expect(macosVariant.llvmTargetTripleVendor == "apple")
                 #expect(macosVariant.llvmTargetTripleSys == "macos")
                 #expect(macosVariant.llvmTargetTripleEnvironment == "")
@@ -490,7 +518,8 @@ import SWBMacro
                 }
 
                 if let toastPlatform = sdk.targetBuildVersionPlatform(sdkVariant: toastosVariant),
-                   let infoProvider = Lookup(toastosVariant).lookupPlatformInfo(platform: toastPlatform) {
+                    let infoProvider = Lookup(toastosVariant).lookupPlatformInfo(platform: toastPlatform)
+                {
                     #expect(infoProvider.buildVersionPlatformID == 99)
                     #expect(infoProvider.defaultDeploymentTarget == Version(99, 99))
                     #expect(infoProvider.deploymentTargetSettingName == "TOASTOS_DEPLOYMENT_TARGET")
@@ -512,35 +541,43 @@ import SWBMacro
     @Test
     func SDKVariantsEvaluatedTargetedDeviceFamilyIdentifierSkipping() async throws {
         try await withRegistryForTestInputs([
-            ("boot.sdk", ["CanonicalName": "macosx"]),
+            ("boot.sdk", ["CanonicalName": "macosx"])
         ]) { coreSDKRegistry, delegate, _ in
 
             // Create an SDK with variants.
             try await withTemporaryDirectory { sdksDirPath in
                 let toastSDKPath = sdksDirPath.join("ToastOS1.0.sdk")
-                try await writeSDK(name: toastSDKPath.basename, parentDir: sdksDirPath, settings: [
-                    "CanonicalName": "toastos",
-                    "IsBaseSDK": "YES",
-                    "SupportedTargets": [
-                        "toastos": [
-                            "BuildVersionPlatformID": "11",
-                            "DeviceFamilies": [
-                                [ "DisplayName": "iPhone", "Identifier": "1", "Name": "phone" ],
-                                [ "DisplayName": "iPad", "Identifier": "2", "Name": "pad" ],
-                                [ "DisplayName": "Toaster", "Identifier": "7", "Name": "toaster" ],
-                            ]
-                        ] as PropertyListItem
+                try await writeSDK(
+                    name: toastSDKPath.basename,
+                    parentDir: sdksDirPath,
+                    settings: [
+                        "CanonicalName": "toastos",
+                        "IsBaseSDK": "YES",
+                        "SupportedTargets": [
+                            "toastos": [
+                                "BuildVersionPlatformID": "11",
+                                "DeviceFamilies": [
+                                    ["DisplayName": "iPhone", "Identifier": "1", "Name": "phone"],
+                                    ["DisplayName": "iPad", "Identifier": "2", "Name": "pad"],
+                                    ["DisplayName": "Toaster", "Identifier": "7", "Name": "toaster"],
+                                ],
+                            ] as PropertyListItem
+                        ],
                     ]
-                ])
+                )
 
                 let macosBorkSDKPath = sdksDirPath.join("MacOSBork.sdk")
-                try await writeSDK(name: macosBorkSDKPath.basename, parentDir: sdksDirPath, settings: [
-                    "CanonicalName": "macosbork",
-                    "IsBaseSDK": "YES",
-                    "SupportedTargets": [
-                        "iosmac": [] as PropertyListItem
+                try await writeSDK(
+                    name: macosBorkSDKPath.basename,
+                    parentDir: sdksDirPath,
+                    settings: [
+                        "CanonicalName": "macosbork",
+                        "IsBaseSDK": "YES",
+                        "SupportedTargets": [
+                            "iosmac": [] as PropertyListItem
+                        ],
                     ]
-                ])
+                )
 
                 let core = try await self.getCore()
                 let userNamespace = MacroNamespace()
@@ -566,8 +603,8 @@ import SWBMacro
                 #expect(scope.evaluate(BuiltinMacros.TARGETED_DEVICE_FAMILY) == "1,2")
 
                 var (filteredIds, effectiveIds, _, _) = toastVariant.evaluateTargetedDeviceFamilyBuildSetting(scope, toastAppSpec)
-                #expect(filteredIds == Set([1,2]))
-                #expect(effectiveIds == Set([1,2]))
+                #expect(filteredIds == Set([1, 2]))
+                #expect(effectiveIds == Set([1, 2]))
 
                 table.push(BuiltinMacros.TARGETED_DEVICE_FAMILY, literal: "7")
                 scope = MacroEvaluationScope(table: table)
@@ -597,21 +634,21 @@ import SWBMacro
                 scope = MacroEvaluationScope(table: table)
                 (filteredIds, effectiveIds, _, _) = iosmacVariant.evaluateTargetedDeviceFamilyBuildSetting(scope, macAppSpec)
                 #expect(filteredIds == Set())
-                #expect(effectiveIds == Set([2,6]))
+                #expect(effectiveIds == Set([2, 6]))
 
                 table.push(BuiltinMacros.TARGETED_DEVICE_FAMILY, literal: "")
                 scope = MacroEvaluationScope(table: table)
                 (filteredIds, effectiveIds, _, _) = iosmacVariant.evaluateTargetedDeviceFamilyBuildSetting(scope, macAppSpec)
                 #expect(filteredIds == Set())
-                #expect(effectiveIds == Set([2,6]))
+                #expect(effectiveIds == Set([2, 6]))
 
                 // deployment target 13.0 keeps both devices
                 table.push(BuiltinMacros.TARGETED_DEVICE_FAMILY, literal: "2,6")
                 table.push(BuiltinMacros.IPHONEOS_DEPLOYMENT_TARGET, literal: "13.0")
                 scope = MacroEvaluationScope(table: table)
                 (filteredIds, effectiveIds, _, _) = iosmacVariant.evaluateTargetedDeviceFamilyBuildSetting(scope, macAppSpec)
-                #expect(filteredIds == Set([2,6]))
-                #expect(effectiveIds == Set([2,6]))
+                #expect(filteredIds == Set([2, 6]))
+                #expect(effectiveIds == Set([2, 6]))
 
                 // deployment target >= 14.0 skips ipad and only includes iosmac
                 table.push(BuiltinMacros.IPHONEOS_DEPLOYMENT_TARGET, literal: "15.0")
@@ -648,7 +685,7 @@ import SWBMacro
                 ],
                 "CustomProperties": [
                     "MACOSX_DEPLOYMENT_TARGET": "10.11",
-                    "SOME_OTHER_SETTING": "foo"
+                    "SOME_OTHER_SETTING": "foo",
                 ],
             ]
             try await writeSDK(name: sdkPath.basename, parentDir: sdkPath.dirname, settings: settings)
@@ -716,7 +753,7 @@ import SWBMacro
             let sym2Path = sdksDir.join(sym2Name + ".sdk")
 
             let sdkSettings: PropertyListItem = .plDict([
-                "CanonicalName": .plString("iphoneos11.0"),
+                "CanonicalName": .plString("iphoneos11.0")
             ])
 
             try localFS.createDirectory(dirPath)
@@ -726,7 +763,7 @@ import SWBMacro
             try localFS.symlink(sym2Path, target: Path(dirPath.basename))
 
             let registry: SDKRegistry = try await {
-                final class TestDataDelegate : SDKRegistryDelegate {
+                final class TestDataDelegate: SDKRegistryDelegate {
                     let namespace = MacroNamespace()
                     let pluginManager: any PluginManager
 
@@ -765,29 +802,33 @@ import SWBMacro
     @Test
     func versionMap() async throws {
         try await withRegistryForTestInputs([
-            ("boot.sdk", ["CanonicalName": "macosx"]),
+            ("boot.sdk", ["CanonicalName": "macosx"])
         ]) { coreSDKRegistry, delegate, _ in
 
             // Create an SDK with custom build settings.
             try await withTemporaryDirectory { sdksDirPath in
                 let sdkPath = sdksDirPath.join("TestSDK.sdk")
                 let sdkIdentifier = "com.apple.sdk.1.0"
-                try await writeSDK(name: sdkPath.basename, parentDir: sdksDirPath, settings: [
-                    "CanonicalName": .plString(sdkIdentifier),
-                    "IsBaseSDK": "NO",
-                    "VersionMap": [
-                        "iOSMac_macOS": [
-                            "13.0": "10.15",
-                            "14.0": "11.0",
-                        ],
-                        "macOS_iOSMac": [
-                            "10.15": "13.0"
+                try await writeSDK(
+                    name: sdkPath.basename,
+                    parentDir: sdksDirPath,
+                    settings: [
+                        "CanonicalName": .plString(sdkIdentifier),
+                        "IsBaseSDK": "NO",
+                        "VersionMap": [
+                            "iOSMac_macOS": [
+                                "13.0": "10.15",
+                                "14.0": "11.0",
+                            ],
+                            "macOS_iOSMac": [
+                                "10.15": "13.0"
+                            ],
+                            "f_x": [
+                                "1": "3.4.2"
+                            ],
                         ],
-                        "f_x": [
-                            "1": "3.4.2"
-                        ]
                     ]
-                ])
+                )
                 let userNamespace = MacroNamespace()
                 let registry = WorkspaceContextSDKRegistry(coreSDKRegistry: coreSDKRegistry, delegate: delegate, userNamespace: userNamespace, overridingSDKsDir: nil)
 
@@ -795,17 +836,17 @@ import SWBMacro
                 let sdk = registry.lookup(sdkPath)
                 #expect(sdk?.canonicalName == sdkIdentifier)
 
-                let expected: [String:[Version:Version]] = [
+                let expected: [String: [Version: Version]] = [
                     "iOSMac_macOS": [
                         Version(13, 0): Version(10, 15),
                         Version(14, 0): Version(11, 0),
                     ],
                     "macOS_iOSMac": [
-                        Version(10, 15): Version(13),
+                        Version(10, 15): Version(13)
                     ],
                     "f_x": [
-                        Version(1): Version(3, 4, 2),
-                    ]
+                        Version(1): Version(3, 4, 2)
+                    ],
                 ]
 
                 #expect(sdk?.versionMap == expected)
@@ -819,17 +860,21 @@ import SWBMacro
     @Test
     func noVersionMap() async throws {
         try await withRegistryForTestInputs([
-            ("boot.sdk", ["CanonicalName": "macosx"]),
+            ("boot.sdk", ["CanonicalName": "macosx"])
         ]) { coreSDKRegistry, delegate, _ in
 
             // Create an SDK with custom build settings.
             try await withTemporaryDirectory { sdksDirPath in
                 let sdkPath = sdksDirPath.join("TestSDK.sdk")
                 let sdkIdentifier = "com.apple.sdk.1.0"
-                try await writeSDK(name: sdkPath.basename, parentDir: sdksDirPath, settings: [
-                    "CanonicalName": .plString(sdkIdentifier),
-                    "IsBaseSDK": "NO",
-                ])
+                try await writeSDK(
+                    name: sdkPath.basename,
+                    parentDir: sdksDirPath,
+                    settings: [
+                        "CanonicalName": .plString(sdkIdentifier),
+                        "IsBaseSDK": "NO",
+                    ]
+                )
                 let userNamespace = MacroNamespace()
                 let registry = WorkspaceContextSDKRegistry(coreSDKRegistry: coreSDKRegistry, delegate: delegate, userNamespace: userNamespace, overridingSDKsDir: nil)
 
@@ -890,7 +935,6 @@ import SWBMacro
         #expect(realRegistry.lookup("xrsimulator")?.targetBuildVersionPlatform() == .xrOSSimulator)
     }
 
-
     /// Tests that the DriverKit SDK knows which Mach-O platform it's targeting.
     @Test(.requireSDKs(.driverKit))
     func SDKBuildVersionPlatform_DriverKit() async throws {
diff --git a/Tests/SWBCoreTests/SerializationTests.swift b/Tests/SWBCoreTests/SerializationTests.swift
index f03f349d..df884e84 100644
--- a/Tests/SWBCoreTests/SerializationTests.swift
+++ b/Tests/SWBCoreTests/SerializationTests.swift
@@ -19,8 +19,7 @@ import SWBProtocol
 import SWBMacro
 
 @Suite fileprivate struct SerializationTests: CoreBasedTests {
-    struct MacroEvaluationScopeDeserializerDelegate: MacroValueAssignmentTableDeserializerDelegate
-    {
+    struct MacroEvaluationScopeDeserializerDelegate: MacroValueAssignmentTableDeserializerDelegate {
         let namespace: MacroNamespace
     }
 
@@ -63,8 +62,8 @@ import SWBMacro
         table.push(A, literal: true)
         table.push(B, literal: false)
         table.push(U, namespace.parseForMacro(U, value: "u"))
-        table.push(C, literal: "MAC", conditions: MacroConditionSet(conditions: [MacroCondition(parameter:param, valuePattern:"macosx")]))
-        table.push(C, literal: "IOS", conditions: MacroConditionSet(conditions: [MacroCondition(parameter:param, valuePattern:"iphoneos")]))
+        table.push(C, literal: "MAC", conditions: MacroConditionSet(conditions: [MacroCondition(parameter: param, valuePattern: "macosx")]))
+        table.push(C, literal: "IOS", conditions: MacroConditionSet(conditions: [MacroCondition(parameter: param, valuePattern: "iphoneos")]))
 
         // Create a macro evaluation scope for testing.
         let scope = MacroEvaluationScope(table: table, conditionParameterValues: [param: ["iphoneos"]])
@@ -75,11 +74,11 @@ import SWBMacro
 
         // Deserialize!
         // We re-use the namespace here since these are simple tests.
-        let dsz = MsgPackDeserializer(sz.byteString, delegate:MacroEvaluationScopeDeserializerDelegate(namespace: namespace))
+        let dsz = MsgPackDeserializer(sz.byteString, delegate: MacroEvaluationScopeDeserializerDelegate(namespace: namespace))
         let dszScope: MacroEvaluationScope = try dsz.deserialize()
         #expect(throws: (any Error).self) {
             try dsz.deserialize() as String
-        }                // Next element is not a String
+        }  // Next element is not a String
         // Nothing left to deserialize.
 
         // Test that we get expected and identical values from both scopes.
@@ -101,7 +100,7 @@ import SWBMacro
         #expect(scope.evaluate(A) == dszScope.evaluate(A))
         #expect(!scope.evaluate(B))
         #expect(scope.evaluate(B) == dszScope.evaluate(B))
-        #expect(scope.evaluateAsString(U) == "u")                              // MacroEvaluationScope doesn't support evaluate() for user-defined macros
+        #expect(scope.evaluateAsString(U) == "u")  // MacroEvaluationScope doesn't support evaluate() for user-defined macros
         #expect(scope.evaluateAsString(U) == dszScope.evaluateAsString(U))
         #expect(scope.evaluate(C) == "IOS")
         #expect(scope.evaluate(C) == dszScope.evaluate(C))
@@ -110,36 +109,42 @@ import SWBMacro
     /// Test serializing the settings for a scope for a simple project with some overriding parameters.
     @Test(.skipHostOS(.windows, "seems to hit an assertion in evaluating the :relativeto operator"))
     func basicProjectSettingsSerialization() async throws {
-        let testWorkspaceData = TestWorkspace("Workspace",
-                                              projects:
-                                                [
-                                                    TestProject("aProject",
-                                                                groupTree: TestGroup("SomeFiles"),
-                                                                buildConfigurations:
-                                                                    [
-                                                                        TestBuildConfiguration("Debug", buildSettings:
-                                                                                                [
-                                                                                                    "BAZ": "project-$(inherited)",
-                                                                                                    "PROJECT_LEVEL": "project",
-                                                                                                ]),
-                                                                    ],
-                                                                targets:
-                                                                    [
-                                                                        TestAggregateTarget("AggregateTarget",
-                                                                                            buildConfigurations:
-                                                                                                [
-                                                                                                    TestBuildConfiguration("Debug", buildSettings:
-                                                                                                                            [
-                                                                                                                                "BAZ": "target-$(inherited)",
-                                                                                                                                "TARGET_LEVEL": "target",
-                                                                                                                            ]),
-                                                                                                ]),
-                                                                    ]),
-                                                ])
+        let testWorkspaceData = TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles"),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "BAZ": "project-$(inherited)",
+                                "PROJECT_LEVEL": "project",
+                            ]
+                        )
+                    ],
+                    targets: [
+                        TestAggregateTarget(
+                            "AggregateTarget",
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "BAZ": "target-$(inherited)",
+                                        "TARGET_LEVEL": "target",
+                                    ]
+                                )
+                            ]
+                        )
+                    ]
+                )
+            ]
+        )
 
         let core = try await getCore()
         let context = try WorkspaceContext(core: core, workspace: testWorkspaceData.load(core), processExecutionCache: .sharedForTesting)
-        context.updateUserInfo(UserInfo(user: "exampleUser", group: "exampleGroup", uid: 1234, gid:12345, home: Path("/Users/exampleUser"), environment: ["BAZ": "environment-$(inherited)"]))
+        context.updateUserInfo(UserInfo(user: "exampleUser", group: "exampleGroup", uid: 1234, gid: 12345, home: Path("/Users/exampleUser"), environment: ["BAZ": "environment-$(inherited)"]))
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
 
         let testProject = context.workspace.projects[0]
@@ -153,7 +158,8 @@ import SWBMacro
             commandLineConfigOverridesPath: nil,
             commandLineConfigOverrides: ["BAZ": "commandlineconfig-$(inherited)"],
             environmentConfigOverridesPath: nil,
-            environmentConfigOverrides: ["BAZ": "environmentconfig-$(inherited)"])
+            environmentConfigOverrides: ["BAZ": "environmentconfig-$(inherited)"]
+        )
         let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: testProject, target: testTarget)
 
         let scope = settings.globalScope
@@ -165,11 +171,11 @@ import SWBMacro
         // Deserialize!
         // Create a new namespace which is a child of the workspace's namespace, which will be a peer to the settings object's namespace.  This gets us some coverage of declaring macros in a new namespace.
         let dszNamespace = MacroNamespace(parent: context.workspace.userNamespace, debugDescription: "deserializer")
-        let dsz = MsgPackDeserializer(sz.byteString, delegate:MacroEvaluationScopeDeserializerDelegate(namespace: dszNamespace))
+        let dsz = MsgPackDeserializer(sz.byteString, delegate: MacroEvaluationScopeDeserializerDelegate(namespace: dszNamespace))
         let dszScope: MacroEvaluationScope = try dsz.deserialize()
         #expect(throws: (any Error).self) {
             try dsz.deserialize() as String
-        }                // Next element is not a String
+        }  // Next element is not a String
         // Nothing left to deserialize.
 
         let macroName = "PROJECT_LEVEL"
@@ -181,24 +187,17 @@ import SWBMacro
         #expect(baseValue == dszValue)
 
         // Iterate through all of the settings in the original settings scope, and check that they evaluate to the same value in the deserialized scope.
-        for settingsMacro in scope.table.valueAssignments.keys
-        {
-            if let dszMacro = dszNamespace.lookupMacroDeclaration(settingsMacro.name)
-            {
-                if settingsMacro.type == dszMacro.type
-                {
+        for settingsMacro in scope.table.valueAssignments.keys {
+            if let dszMacro = dszNamespace.lookupMacroDeclaration(settingsMacro.name) {
+                if settingsMacro.type == dszMacro.type {
                     // We use evaluateAsString() here to keep the logic simple.
                     let settingsValue = scope.evaluateAsString(settingsMacro)
                     let dszValue = dszScope.evaluateAsString(dszMacro)
                     #expect(settingsValue == dszValue)
-                }
-                else
-                {
+                } else {
                     Issue.record("Macro '\(settingsMacro.name)' is of type \(settingsMacro.type) in original settings namespace, but type \(dszMacro.type) in deserializer namespace.")
                 }
-            }
-            else
-            {
+            } else {
                 Issue.record("Could not find macro '\(settingsMacro.name)' (type \(settingsMacro.type)) in deserializer namespace.")
             }
         }
diff --git a/Tests/SWBCoreTests/SettingsTests.swift b/Tests/SWBCoreTests/SettingsTests.swift
index 515f71a2..6d63b841 100644
--- a/Tests/SWBCoreTests/SettingsTests.swift
+++ b/Tests/SWBCoreTests/SettingsTests.swift
@@ -28,32 +28,36 @@ import SWBTestSupport
         // Test the basic settings construction for a trivial test project.
         let files: [Path: String] = [
             // The paths and includes in these .xcconfigs are devised to test searching the includer’s directory in addition to relative paths.
-            .root.join("tmp/xcconfigs/Base0.xcconfig"): (
-                "XCCONFIG_USER_SETTING = from-xcconfig\n"),
-            .root.join("tmp/xcconfigs/Base1.xcconfig"): (
-                "#include \"Base0.xcconfig\""),
-            .root.join("tmp/Test.xcconfig"): (
-                "#include \"xcconfigs/Base1.xcconfig\"\n" +
-                "XCCONFIG_HEADER_SEARCH_PATHS = /tmp/path /tmp/other-path\n"
-            )]
-        let testWorkspace = try TestWorkspace("Workspace",
-                                              projects: [
-                                                TestProject("aProject",
-                                                            groupTree: TestGroup("SomeFiles",
-                                                                                 children: [TestFile(Path.root.join("tmp/Test.xcconfig").str)]),
-                                                            buildConfigurations:[
-                                                                TestBuildConfiguration("Config1", baseConfig: "Test.xcconfig", buildSettings: [
-                                                                    "USER_PROJECT_SETTING": "USER_PROJECT_VALUE",
-                                                                    "OTHER_CFLAGS[arch=*]": "-Wall",
-                                                                    "OTHER_CFLAGS": "this value should be shadowed",
-                                                                    "HEADER_SEARCH_PATHS": "$(inherited) $(SRCROOT)/include $(XCCONFIG_HEADER_SEARCH_PATHS)"
-                                                                ])
-                                                            ],
-                                                            appPreferencesBuildSettings: [
-                                                                "APP_PREF_SETTING": "APP_PREF_VALUE",
-                                                            ]
-                                                           )
-                                              ]
+            .root.join("tmp/xcconfigs/Base0.xcconfig"): ("XCCONFIG_USER_SETTING = from-xcconfig\n"),
+            .root.join("tmp/xcconfigs/Base1.xcconfig"): ("#include \"Base0.xcconfig\""),
+            .root.join("tmp/Test.xcconfig"): ("#include \"xcconfigs/Base1.xcconfig\"\n" + "XCCONFIG_HEADER_SEARCH_PATHS = /tmp/path /tmp/other-path\n"),
+        ]
+        let testWorkspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup(
+                        "SomeFiles",
+                        children: [TestFile(Path.root.join("tmp/Test.xcconfig").str)]
+                    ),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Config1",
+                            baseConfig: "Test.xcconfig",
+                            buildSettings: [
+                                "USER_PROJECT_SETTING": "USER_PROJECT_VALUE",
+                                "OTHER_CFLAGS[arch=*]": "-Wall",
+                                "OTHER_CFLAGS": "this value should be shadowed",
+                                "HEADER_SEARCH_PATHS": "$(inherited) $(SRCROOT)/include $(XCCONFIG_HEADER_SEARCH_PATHS)",
+                            ]
+                        )
+                    ],
+                    appPreferencesBuildSettings: [
+                        "APP_PREF_SETTING": "APP_PREF_VALUE"
+                    ]
+                )
+            ]
         ).load(core)
 
         // Construct a mock environment.
@@ -111,24 +115,24 @@ import SWBTestSupport
         #expect(settings.tableForTesting.lookupMacro(BuiltinMacros.PROJECT_TEMP_DIR)?.expression.stringRep == "$(OBJROOT)/$(PROJECT_NAME).build")
         #expect(settings.tableForTesting.lookupMacro(BuiltinMacros.CONFIGURATION)?.expression.stringRep == "Config1")
         #expect(settings.tableForTesting.lookupMacro(BuiltinMacros.CONFIGURATION_BUILD_DIR)?.expression.stringRep == "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)")
-#if !RC_PLAYGROUNDS
-        func checkXcodeVersion(_ settingName: StringMacroDeclaration, expectedVersion: Version, sourceLocation: SourceLocation = #_sourceLocation) {
-            if let value = settings.tableForTesting.lookupMacro(settingName)?.expression.stringRep {
-                if value.count >= 4, let uintValue = UInt(value) {
-                    let version = Version(uintValue / 100, (uintValue % 100) / 10, uintValue % 10)
-                    #expect(version == expectedVersion, sourceLocation: sourceLocation)
+        #if !RC_PLAYGROUNDS
+            func checkXcodeVersion(_ settingName: StringMacroDeclaration, expectedVersion: Version, sourceLocation: SourceLocation = #_sourceLocation) {
+                if let value = settings.tableForTesting.lookupMacro(settingName)?.expression.stringRep {
+                    if value.count >= 4, let uintValue = UInt(value) {
+                        let version = Version(uintValue / 100, (uintValue % 100) / 10, uintValue % 10)
+                        #expect(version == expectedVersion, sourceLocation: sourceLocation)
+                    } else {
+                        Issue.record("Unexpected value for \(settingName.name): \(value)", sourceLocation: sourceLocation)
+                    }
                 } else {
-                    Issue.record("Unexpected value for \(settingName.name): \(value)", sourceLocation: sourceLocation)
+                    Issue.record("\(settingName.name) is undefined", sourceLocation: sourceLocation)
                 }
-            } else {
-                Issue.record("\(settingName.name) is undefined", sourceLocation: sourceLocation)
             }
-        }
-        checkXcodeVersion(BuiltinMacros.XCODE_VERSION_MAJOR, expectedVersion: core.xcodeVersion.normalized(toNumberOfComponents: 1))
-        checkXcodeVersion(BuiltinMacros.XCODE_VERSION_MINOR, expectedVersion: core.xcodeVersion.normalized(toNumberOfComponents: 2))
-        checkXcodeVersion(BuiltinMacros.XCODE_VERSION_ACTUAL, expectedVersion: core.xcodeVersion)
-        #expect(settings.tableForTesting.lookupMacro(BuiltinMacros.XCODE_PRODUCT_BUILD_VERSION)?.expression.stringRep == core.xcodeProductBuildVersionString)
-#endif
+            checkXcodeVersion(BuiltinMacros.XCODE_VERSION_MAJOR, expectedVersion: core.xcodeVersion.normalized(toNumberOfComponents: 1))
+            checkXcodeVersion(BuiltinMacros.XCODE_VERSION_MINOR, expectedVersion: core.xcodeVersion.normalized(toNumberOfComponents: 2))
+            checkXcodeVersion(BuiltinMacros.XCODE_VERSION_ACTUAL, expectedVersion: core.xcodeVersion)
+            #expect(settings.tableForTesting.lookupMacro(BuiltinMacros.XCODE_PRODUCT_BUILD_VERSION)?.expression.stringRep == core.xcodeProductBuildVersionString)
+        #endif
         #expect(settings.tableForTesting.lookupMacro(BuiltinMacros.USER)?.expression.stringRep == "exampleUser")
 
         // Verify that the settings from the xcconfig were added.
@@ -197,9 +201,10 @@ import SWBTestSupport
         macro = try #require(scope.namespace.lookupMacroDeclaration("XCCONFIG_HEADER_SEARCH_PATHS"))
         #expect(scope.evaluateAsString(macro) == "/tmp/path /tmp/other-path")
 
-        try context.fs.write(xcconfigPath,
-                             contents: ByteString(encodingAsUTF8:   "#include \"xcconfigs/Base1.xcconfig\"\n" +
-                                                  "XCCONFIG_HEADER_SEARCH_PATHS = /tmp/changed\n"))
+        try context.fs.write(
+            xcconfigPath,
+            contents: ByteString(encodingAsUTF8: "#include \"xcconfigs/Base1.xcconfig\"\n" + "XCCONFIG_HEADER_SEARCH_PATHS = /tmp/changed\n")
+        )
 
         do {
             let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -212,9 +217,10 @@ import SWBTestSupport
         xcconfigPath = Path.root.join("tmp/Other.xcconfig")
         #expect(buildRequestContext.getCachedMacroConfigFile(xcconfigPath, project: testProject, context: .baseConfiguration).diagnostics.map { $0.formatLocalizedDescription(.debug) } == ["/tmp/Workspace/aProject/aProject.xcodeproj: error: Unable to open base configuration reference file '/tmp/Other.xcconfig'."])
 
-        try context.fs.write(xcconfigPath,
-                             contents: ByteString(encodingAsUTF8:   "#include \"xcconfigs/Base1.xcconfig\"\n" +
-                                                  "XCCONFIG_HEADER_SEARCH_PATHS = /tmp/changed\n"))
+        try context.fs.write(
+            xcconfigPath,
+            contents: ByteString(encodingAsUTF8: "#include \"xcconfigs/Base1.xcconfig\"\n" + "XCCONFIG_HEADER_SEARCH_PATHS = /tmp/changed\n")
+        )
 
         do {
             let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -230,40 +236,63 @@ import SWBTestSupport
         let core = try await getCore()
         try await withTemporaryDirectory { (sdksDirPath: Path) in
             let additionalSDKPath = sdksDirPath.join("TestSDK.sdk")
-            try await writeSDK(name: additionalSDKPath.basename, parentDir: sdksDirPath, settings: [
-                "CanonicalName": "com.apple.sdk.1.0",
-                "IsBaseSDK": "NO",
-            ])
+            try await writeSDK(
+                name: additionalSDKPath.basename,
+                parentDir: sdksDirPath,
+                settings: [
+                    "CanonicalName": "com.apple.sdk.1.0",
+                    "IsBaseSDK": "NO",
+                ]
+            )
 
             // Test the basic settings construction for a trivial test target.
-            let testWorkspace = try TestWorkspace("Workspace",
-                                                  projects: [TestProject("aProject",
-                                                                         groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
-                                                                         buildConfigurations:[
-                                                                            TestBuildConfiguration("Config1", buildSettings: [
-                                                                                "USER_PROJECT_SETTING": "USER_PROJECT_VALUE",
-                                                                                "HEADER_SEARCH_PATHS": "$(inherited) $(SRCROOT)/include /usr/include .",
-                                                                                "FRAMEWORK_SEARCH_PATHS": "$(inherited) /System/Library/Frameworks /Applications/Xcode.app /usr",
-                                                                                "OTHER_LDFLAGS": "-current_version $(DYLIB_CURRENT_VERSION)",
-                                                                                "GCC_PREFIX_HEADER": "/Cocoa.pch",
-                                                                                "ADDITIONAL_SDKS": "\(additionalSDKPath.str)",
-                                                                                "ARCHS": "x86_64 x86_64h",
-                                                                                "RC_ARCHS": "x86_64 x86_64h",
-                                                                                "VALID_ARCHS": "$(inherited) x86_64h",
-                                                                            ])],
-                                                                         targets: [
-                                                                            TestStandardTarget("Target1",
-                                                                                               type: .application,
-                                                                                               buildConfigurations: [
-                                                                                                TestBuildConfiguration("Config1", buildSettings: [
-                                                                                                    "BUILD_VARIANTS": "normal other",
-                                                                                                    "ENABLE_TESTABILITY": "YES",
-                                                                                                    "INSTALL_PATH": "",
-                                                                                                    // Use this to check conditions end to end.
-                                                                                                    "PRODUCT_NAME[sdk=macosx*]": "Foo",
-                                                                                                    "USER_TARGET_SETTING": "USER_TARGET_VALUE"])],
-                                                                                               buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])])])]).load(core)
-            let context = try await contextForTestData(testWorkspace,
+            let testWorkspace = try TestWorkspace(
+                "Workspace",
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Config1",
+                                buildSettings: [
+                                    "USER_PROJECT_SETTING": "USER_PROJECT_VALUE",
+                                    "HEADER_SEARCH_PATHS": "$(inherited) $(SRCROOT)/include /usr/include .",
+                                    "FRAMEWORK_SEARCH_PATHS": "$(inherited) /System/Library/Frameworks /Applications/Xcode.app /usr",
+                                    "OTHER_LDFLAGS": "-current_version $(DYLIB_CURRENT_VERSION)",
+                                    "GCC_PREFIX_HEADER": "/Cocoa.pch",
+                                    "ADDITIONAL_SDKS": "\(additionalSDKPath.str)",
+                                    "ARCHS": "x86_64 x86_64h",
+                                    "RC_ARCHS": "x86_64 x86_64h",
+                                    "VALID_ARCHS": "$(inherited) x86_64h",
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "Target1",
+                                type: .application,
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Config1",
+                                        buildSettings: [
+                                            "BUILD_VARIANTS": "normal other",
+                                            "ENABLE_TESTABILITY": "YES",
+                                            "INSTALL_PATH": "",
+                                            // Use this to check conditions end to end.
+                                            "PRODUCT_NAME[sdk=macosx*]": "Foo",
+                                            "USER_TARGET_SETTING": "USER_TARGET_VALUE",
+                                        ]
+                                    )
+                                ],
+                                buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                            )
+                        ]
+                    )
+                ]
+            ).load(core)
+            let context = try await contextForTestData(
+                testWorkspace,
                 files: [
                     core.loadSDK(.macOS).path.join("Cocoa.pch"): "",
                     core.loadSDK(.macOS).path.join("System/Library/Frameworks/mock.txt"): "",
@@ -335,20 +364,22 @@ import SWBTestSupport
             // Verify that we rewrote the SDK into certain paths.
             #expect(settings.globalScope.evaluate(BuiltinMacros.HEADER_SEARCH_PATHS) == ["/tmp/Workspace/aProject/build/Config1/include", "/tmp/Workspace/aProject/include", core.loadSDK(.macOS).path.join("usr/include").str, "."])
 
-            #expect(settings.globalScope.evaluate(BuiltinMacros.FRAMEWORK_SEARCH_PATHS) == [
-                "/tmp/Workspace/aProject/build/Config1",
+            #expect(
+                settings.globalScope.evaluate(BuiltinMacros.FRAMEWORK_SEARCH_PATHS) == [
+                    "/tmp/Workspace/aProject/build/Config1",
 
-                // Paths found in SDKROOT get prefixed
-                core.loadSDK(.macOS).path.join("System/Library/Frameworks").str,
+                    // Paths found in SDKROOT get prefixed
+                    core.loadSDK(.macOS).path.join("System/Library/Frameworks").str,
 
-                // Paths found in additional SDKs get mentioned twice: once prefixed and once as is
-                additionalSDKPath.join("Applications/Xcode.app").str,
-                "/Applications/Xcode.app",
+                    // Paths found in additional SDKs get mentioned twice: once prefixed and once as is
+                    additionalSDKPath.join("Applications/Xcode.app").str,
+                    "/Applications/Xcode.app",
 
-                // Paths found in both SDKROOT and additional SDKs get mentioned twice: once prefixed with the additional SDK and once prefixed with the SDKROOT
-                additionalSDKPath.join("usr").str,
-                core.loadSDK(.macOS).path.join("usr").str,
-            ])
+                    // Paths found in both SDKROOT and additional SDKs get mentioned twice: once prefixed with the additional SDK and once prefixed with the SDKROOT
+                    additionalSDKPath.join("usr").str,
+                    core.loadSDK(.macOS).path.join("usr").str,
+                ]
+            )
 
             #expect(settings.globalScope.evaluate(BuiltinMacros.GCC_PREFIX_HEADER) == core.loadSDK(.macOS).path.join("Cocoa.pch"))
 
@@ -376,12 +407,14 @@ import SWBTestSupport
 
             // Verify that "install"/"archive" actions behaves as expected.
             for action in [BuildAction.install, BuildAction.archive] {
-                let context2 = try await contextForTestData(testWorkspace,
-                                                            environment: [:],
-                                                            files: [
-                                                                core.loadSDK(.macOS).path.join("Cocoa.pch"): "",
-                                                                core.loadSDK(.macOS).path.join("System/Library/Frameworks/mock.txt"): "",
-                                                            ])
+                let context2 = try await contextForTestData(
+                    testWorkspace,
+                    environment: [:],
+                    files: [
+                        core.loadSDK(.macOS).path.join("Cocoa.pch"): "",
+                        core.loadSDK(.macOS).path.join("System/Library/Frameworks/mock.txt"): "",
+                    ]
+                )
                 let parameters2 = BuildParameters(action: action, configuration: "Debug")
                 settings = Settings(workspaceContext: context2, buildRequestContext: buildRequestContext, parameters: parameters2, project: testProject, target: testTarget)
                 #expect(settings.tableForTesting.lookupMacro(BuiltinMacros.ACTION)?.expression.stringRep == action.actionName)
@@ -428,25 +461,37 @@ import SWBTestSupport
         let core = try await getCore()
 
         // Test the basic settings construction for a trivial test target.
-        let testWorkspace = try TestWorkspace("Workspace",
-                                              projects: [TestProject("aProject",
-                                                                     groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
-                                                                     targets: [
-                                                                        TestStandardTarget("Target1",
-                                                                                           type: .application,
-                                                                                           buildConfigurations: [
-                                                                                            TestBuildConfiguration("Debug",
-                                                                                                                   buildSettings: [
-                                                                                                                    "SDKROOT": "iphoneos",
-
-                                                                                                                    "IPHONEOS_SETTING[sdk=iphoneos*]": "correct",
-                                                                                                                    "IPHONESIM_SETTING[sdk=iphonesimulator*]": "correct",
-                                                                                                                    "EMBEDDED_SETTING[sdk=embedded*]": "correct",
-                                                                                                                    // These are disabled because at the moment we don't enforce ordering of 'iphoneos' over 'embedded', so the success of evaluating this setting is not guaranteed.
-                                                                                                                    //                                    "UNIFIED_SETTING[sdk=iphoneos*]": "iphoneos",
-                                                                                                                    //                                    "UNIFIED_SETTING[sdk=embedded*]": "embedded",
-                                                                                                                   ])],
-                                                                                           buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])])])]).load(core)
+        let testWorkspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "iphoneos",
+
+                                        "IPHONEOS_SETTING[sdk=iphoneos*]": "correct",
+                                        "IPHONESIM_SETTING[sdk=iphonesimulator*]": "correct",
+                                        "EMBEDDED_SETTING[sdk=embedded*]": "correct",
+                                            // These are disabled because at the moment we don't enforce ordering of 'iphoneos' over 'embedded', so the success of evaluating this setting is not guaranteed.
+                                            //                                    "UNIFIED_SETTING[sdk=iphoneos*]": "iphoneos",
+                                            //                                    "UNIFIED_SETTING[sdk=embedded*]": "embedded",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(core)
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -475,20 +520,32 @@ import SWBTestSupport
 
     @Test(.requireSDKs(.macOS))
     func bogusSupportedPlatforms() async throws {
-        let testWorkspace = try await TestWorkspace("Workspace",
-                                                    projects: [TestProject("aProject",
-                                                                           groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
-                                                                           targets: [
-                                                                            TestStandardTarget("Target1",
-                                                                                               type: .application,
-                                                                                               buildConfigurations: [
-                                                                                                TestBuildConfiguration("Debug",
-                                                                                                                       buildSettings: [
-                                                                                                                        "SDKROOT": "macosx",
-                                                                                                                        "ONLY_ACTIVE_ARCH": "YES",
-                                                                                                                        "SUPPORTED_PLATFORMS": "macOS fakeOS"
-                                                                                                                       ])],
-                                                                                               buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])])])]).load(getCore())
+        let testWorkspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "macosx",
+                                        "ONLY_ACTIVE_ARCH": "YES",
+                                        "SUPPORTED_PLATFORMS": "macOS fakeOS",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -504,33 +561,52 @@ import SWBTestSupport
     func deploymentTargetFallback() async throws {
         // Test the basic settings construction for a trivial test target.
         let core = try await getCore()
-        let testWorkspace = try TestWorkspace("Workspace",
-                                              projects: [TestProject("aProject",
-                                                                     groupTree: TestGroup("SomeFiles", children: [
-                                                                        TestFile("Mock.cpp")
-                                                                     ]),
-                                                                     targets: [
-                                                                        TestStandardTarget("macOSTarget",
-                                                                                           type: .application,
-                                                                                           buildConfigurations: [
-                                                                                            TestBuildConfiguration("Debug",
-                                                                                                                   buildSettings: [
-                                                                                                                    "SDKROOT": "macosx",
-                                                                                                                    "MACOSX_DEPLOYMENT_TARGET": "",
-                                                                                                                    "IPHONEOS_DEPLOYMENT_TARGET": "",
-                                                                                                                   ])],
-                                                                                           buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]),
-                                                                        TestStandardTarget("iOSTarget",
-                                                                                           type: .application,
-                                                                                           buildConfigurations: [
-                                                                                            TestBuildConfiguration("Debug",
-                                                                                                                   buildSettings: [
-                                                                                                                    "SDKROOT": "iphoneos",
-                                                                                                                    "MACOSX_DEPLOYMENT_TARGET": "",
-                                                                                                                    "IPHONEOS_DEPLOYMENT_TARGET": "",
-                                                                                                                   ])],
-                                                                                           buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]),
-                                                                     ])]).load(core)
+        let testWorkspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup(
+                        "SomeFiles",
+                        children: [
+                            TestFile("Mock.cpp")
+                        ]
+                    ),
+                    targets: [
+                        TestStandardTarget(
+                            "macOSTarget",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "macosx",
+                                        "MACOSX_DEPLOYMENT_TARGET": "",
+                                        "IPHONEOS_DEPLOYMENT_TARGET": "",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                        ),
+                        TestStandardTarget(
+                            "iOSTarget",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "iphoneos",
+                                        "MACOSX_DEPLOYMENT_TARGET": "",
+                                        "IPHONEOS_DEPLOYMENT_TARGET": "",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                        ),
+                    ]
+                )
+            ]
+        ).load(core)
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -554,23 +630,31 @@ import SWBTestSupport
         let core = try await getCore()
 
         // Test the basic settings construction for an aggregate test target.
-        let testWorkspace = try TestWorkspace("Workspace",
-                                              projects: [TestProject(
-                                                "aProject",
-                                                groupTree: TestGroup("SomeFiles"),
-                                                buildConfigurations:[
-                                                    TestBuildConfiguration("TargetConfig",
-                                                                           buildSettings: [
-                                                                            "SDKROOT": "macosx",
-                                                                           ]),
-                                                ],
-                                                targets: [
-                                                    TestAggregateTarget("AggregateTarget1",
-                                                                        buildConfigurations: [
-                                                                            TestBuildConfiguration("TargetConfig"),
-                                                                        ]),
-                                                ]),
-                                              ]).load(core)
+        let testWorkspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles"),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "TargetConfig",
+                            buildSettings: [
+                                "SDKROOT": "macosx"
+                            ]
+                        )
+                    ],
+                    targets: [
+                        TestAggregateTarget(
+                            "AggregateTarget1",
+                            buildConfigurations: [
+                                TestBuildConfiguration("TargetConfig")
+                            ]
+                        )
+                    ]
+                )
+            ]
+        ).load(core)
         let testProject = testWorkspace.projects[0]
         let testTarget = testProject.targets[0]
 
@@ -604,17 +688,22 @@ import SWBTestSupport
         #expect(settings.exportedMacroNames.contains(BuiltinMacros.YACC))
     }
 
-
     @Test(.requireHostOS(.macOS))
     func executablePaths() async throws {
         let core = try await getCore()
         // Check that we locate executables in the right places.
-        let testWorkspaceData = TestWorkspace("Workspace",
-                                              projects: [
-                                                TestProject("aProject",
-                                                            groupTree: TestGroup("SomeFiles"),
-                                                            targets: [
-                                                                TestAggregateTarget("AggregateTarget")])])
+        let testWorkspaceData = TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles"),
+                    targets: [
+                        TestAggregateTarget("AggregateTarget")
+                    ]
+                )
+            ]
+        )
         // We test against the actual FS, to check the real executable paths.
         let context = WorkspaceContext(core: core, workspace: try testWorkspaceData.load(core), fs: SWBUtil.localFS, processExecutionCache: .sharedForTesting)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -650,18 +739,36 @@ import SWBTestSupport
     @Test
     func settingOverrides() async throws {
         try await withTemporaryDirectory { tmpDir async throws -> Void in
-            let testWorkspace = try await TestWorkspace("Workspace",
-                                                        projects: [
-                                                            TestProject("aProject",
-                                                                        groupTree: TestGroup("SomeFiles"),
-                                                                        buildConfigurations: [
-                                                                            TestBuildConfiguration("Debug", buildSettings: [
-                                                                                "BAZ": "project-$(inherited)"])],
-                                                                        targets: [
-                                                                            TestAggregateTarget("AggregateTarget",
-                                                                                                buildConfigurations: [
-                                                                                                    TestBuildConfiguration("Debug", buildSettings: [
-                                                                                                        "BAZ": "target-$(inherited)"])])])]).load(getCore())
+            let testWorkspace = try await TestWorkspace(
+                "Workspace",
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup("SomeFiles"),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "BAZ": "project-$(inherited)"
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestAggregateTarget(
+                                "AggregateTarget",
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "BAZ": "target-$(inherited)"
+                                        ]
+                                    )
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            ).load(getCore())
             let context = try await contextForTestData(testWorkspace, environment: ["BAZ": "environment-$(inherited)"])
             let buildRequestContext = BuildRequestContext(workspaceContext: context)
             let testProject = context.workspace.projects[0]
@@ -683,7 +790,8 @@ import SWBTestSupport
                 commandLineConfigOverridesPath: cliPath,
                 commandLineConfigOverrides: ["BAZ": "commandlineconfig-$(inherited)"],
                 environmentConfigOverridesPath: envPath,
-                environmentConfigOverrides: ["BAZ": "environmentconfig-$(inherited)"])
+                environmentConfigOverrides: ["BAZ": "environmentconfig-$(inherited)"]
+            )
             let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: testProject, target: testTarget)
 
             let diagnosticErrors = settings.diagnostics.filter { $0.behavior == .error }
@@ -705,18 +813,30 @@ import SWBTestSupport
     @Test
     func settingsOverridesDevelopmentAssets() async throws {
         func test(buildSettings: [String: String], action: BuildAction = .install, overrides: [String: String] = [:], extraFiles: [Path: String] = [:], configuration: String = "Debug", baseConfig: String? = nil, expectedExcludedFileNames: [String] = [], sourceLocation: SourceLocation = #_sourceLocation) async throws {
-            let testWorkspace = try await TestWorkspace("Workspace", projects: [
-                TestProject("aProject",
-                            groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift"), TestFile("Test.xcconfig")]),
-                            buildConfigurations: [
-                                TestBuildConfiguration("Debug", baseConfig: baseConfig, buildSettings: buildSettings), TestBuildConfiguration("Release", baseConfig: baseConfig, buildSettings: buildSettings)],
-                            targets: [
-                                TestAggregateTarget("AppTarget", buildConfigurations: [TestBuildConfiguration("Debug"), TestBuildConfiguration("Release")], buildPhases: [TestSourcesBuildPhase(["main.swift"])])])]).load(getCore())
+            let testWorkspace = try await TestWorkspace(
+                "Workspace",
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift"), TestFile("Test.xcconfig")]),
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug", baseConfig: baseConfig, buildSettings: buildSettings), TestBuildConfiguration("Release", baseConfig: baseConfig, buildSettings: buildSettings),
+                        ],
+                        targets: [
+                            TestAggregateTarget("AppTarget", buildConfigurations: [TestBuildConfiguration("Debug"), TestBuildConfiguration("Release")], buildPhases: [TestSourcesBuildPhase(["main.swift"])])
+                        ]
+                    )
+                ]
+            ).load(getCore())
 
-            let context = try await contextForTestData(testWorkspace, systemInfo: SystemInfo(operatingSystemVersion: Version(), productBuildVersion: "", nativeArchitecture: "arm64"), files: [
-                .root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/AppIcon.png"): "a picture",
-                .root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/Info.plist"): "a plist"
-            ].merging(extraFiles, uniquingKeysWith: { original, override in override }))
+            let context = try await contextForTestData(
+                testWorkspace,
+                systemInfo: SystemInfo(operatingSystemVersion: Version(), productBuildVersion: "", nativeArchitecture: "arm64"),
+                files: [
+                    .root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/AppIcon.png"): "a picture",
+                    .root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/Info.plist"): "a plist",
+                ].merging(extraFiles, uniquingKeysWith: { original, override in override })
+            )
             let buildRequestContext = BuildRequestContext(workspaceContext: context)
 
             let testProject = context.workspace.projects[0]
@@ -725,120 +845,175 @@ import SWBTestSupport
             let parameters = BuildParameters(
                 action: action,
                 configuration: configuration,
-                overrides: overrides)
+                overrides: overrides
+            )
             let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: testProject, target: testTarget)
 
             #expect(settings.errors.isEmpty, "Expect to not produce any errors", sourceLocation: sourceLocation)
 
             let scope = settings.globalScope
-            #expect(scope.evaluate(BuiltinMacros.EXCLUDED_SOURCE_FILE_NAMES) == expectedExcludedFileNames,  sourceLocation: sourceLocation)
+            #expect(scope.evaluate(BuiltinMacros.EXCLUDED_SOURCE_FILE_NAMES) == expectedExcludedFileNames, sourceLocation: sourceLocation)
         }
 
         // Specifying DEVELOPMENT_ASSET_PATHS and EXCLUDED_SOURCE_FILE_NAMES should merge them
-        try await test(buildSettings: ["DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources'",
-                                       "EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*"],
-                       expectedExcludedFileNames: ["docs/*", Path.root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/*").str])
+        try await test(
+            buildSettings: [
+                "DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources'",
+                "EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*",
+            ],
+            expectedExcludedFileNames: ["docs/*", Path.root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/*").str]
+        )
 
         // Specifying DEVELOPMENT_ASSET_PATHS which are absolute should work as well
-        try await test(buildSettings: ["DEVELOPMENT_ASSET_PATHS": "'\(Path.root.join("tmp/Workspace/aProject/AppTarget/Preview Resources").strWithPosixSlashes)'",
-                                       "EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*"],
-                       expectedExcludedFileNames: ["docs/*", Path.root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/*").str])
+        try await test(
+            buildSettings: [
+                "DEVELOPMENT_ASSET_PATHS": "'\(Path.root.join("tmp/Workspace/aProject/AppTarget/Preview Resources").strWithPosixSlashes)'",
+                "EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*",
+            ],
+            expectedExcludedFileNames: ["docs/*", Path.root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/*").str]
+        )
 
         // Specifying DEVELOPMENT_ASSET_PATHS which are absolute that are not part of SRCROOT should work as well
-        try await test(buildSettings: ["DEVELOPMENT_ASSET_PATHS": "'\(Path.root.join("tmp/Workspace/bProject/AppTarget/Preview Resources").strWithPosixSlashes)'",
-                                       "EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*"],
-                       // the directory needs to exist (for /* at the end), so we write a mock file here
-                       extraFiles: [.root.join("tmp/Workspace/bProject/AppTarget/Preview Resources/afile.txt"): ""],
-                       expectedExcludedFileNames: ["docs/*", Path.root.join("tmp/Workspace/bProject/AppTarget/Preview Resources/*").str])
+        try await test(
+            buildSettings: [
+                "DEVELOPMENT_ASSET_PATHS": "'\(Path.root.join("tmp/Workspace/bProject/AppTarget/Preview Resources").strWithPosixSlashes)'",
+                "EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*",
+            ],
+            // the directory needs to exist (for /* at the end), so we write a mock file here
+            extraFiles: [.root.join("tmp/Workspace/bProject/AppTarget/Preview Resources/afile.txt"): ""],
+            expectedExcludedFileNames: ["docs/*", Path.root.join("tmp/Workspace/bProject/AppTarget/Preview Resources/*").str]
+        )
 
         // Not specifying DEVELOPMENT_ASSET_PATHS should not affect EXCLUDED_SOURCE_FILE_NAMES
-        try await test(buildSettings: ["EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*"],
-                       expectedExcludedFileNames: ["docs/*"])
+        try await test(
+            buildSettings: ["EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*"],
+            expectedExcludedFileNames: ["docs/*"]
+        )
 
         // Not specifying EXCLUDED_SOURCE_FILE_NAMES but DEVELOPMENT_ASSET_PATHS should create a list with DEVELOPMENT_ASSET_PATHS' contents
-        try await test(buildSettings: ["DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources'"],
-                       expectedExcludedFileNames: [Path.root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/*").str])
+        try await test(
+            buildSettings: ["DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources'"],
+            expectedExcludedFileNames: [Path.root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/*").str]
+        )
 
         // If the specified directory does not exist, we expect to not receive an error during Settings creation
         // Since the directory does not exist, it gets added as a file (without '*')
-        try await test(buildSettings: ["DEVELOPMENT_ASSET_PATHS": "'AppTarget/Does Not Exist'"],
-                       expectedExcludedFileNames: [Path.root.join("tmp/Workspace/aProject/AppTarget/Does Not Exist").str])
+        try await test(
+            buildSettings: ["DEVELOPMENT_ASSET_PATHS": "'AppTarget/Does Not Exist'"],
+            expectedExcludedFileNames: [Path.root.join("tmp/Workspace/aProject/AppTarget/Does Not Exist").str]
+        )
 
         // If the build action is install, development resources should be excluded
         for action in [BuildAction.install, .installAPI, .installHeaders, .installLoc, .installSource, .archive] {
-            try await test(buildSettings: ["DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources'",
-                                           "EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*"],
-                           action: action,
-                           expectedExcludedFileNames: ["docs/*", Path.root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/*").str])
+            try await test(
+                buildSettings: [
+                    "DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources'",
+                    "EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*",
+                ],
+                action: action,
+                expectedExcludedFileNames: ["docs/*", Path.root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/*").str]
+            )
         }
 
         // If the build action is anything else but install (and DEPLOYMENT_POSTPROCESSING is not specified), we don't exclude
         for action in [BuildAction.analyze, .clean, .build] {
-            try await test(buildSettings: ["DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources'",
-                                           "EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*"],
-                           action: action,
-                           expectedExcludedFileNames: ["docs/*"])
-            try await test(buildSettings: ["DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources'",
-                                           "EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*"],
-                           action: action,
-                           overrides: ["DEPLOYMENT_LOCATION": "YES"],
-                           expectedExcludedFileNames: ["docs/*"])
+            try await test(
+                buildSettings: [
+                    "DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources'",
+                    "EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*",
+                ],
+                action: action,
+                expectedExcludedFileNames: ["docs/*"]
+            )
+            try await test(
+                buildSettings: [
+                    "DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources'",
+                    "EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*",
+                ],
+                action: action,
+                overrides: ["DEPLOYMENT_LOCATION": "YES"],
+                expectedExcludedFileNames: ["docs/*"]
+            )
         }
 
         // If the build action is anything else but install *but* DEPLOYMENT_POSTPROCESSING is specified, we exclude
         for action in [BuildAction.analyze, .clean, .build] {
-            try await test(buildSettings: ["DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources'",
-                                           "EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*"],
-                           action: action,
-                           overrides: ["DEPLOYMENT_POSTPROCESSING": "YES"],
-                           expectedExcludedFileNames: ["docs/*", Path.root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/*").str])
+            try await test(
+                buildSettings: [
+                    "DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources'",
+                    "EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*",
+                ],
+                action: action,
+                overrides: ["DEPLOYMENT_POSTPROCESSING": "YES"],
+                expectedExcludedFileNames: ["docs/*", Path.root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/*").str]
+            )
         }
 
         // However, if DEPLOYMENT_LOCATION is explicitly set to NO, development assets should not be excluded
         for action in [BuildAction.analyze, .clean, .build] {
-            try await test(buildSettings: ["DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources'",
-                                           "EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*"],
-                           action: action,
-                           overrides: ["DEPLOYMENT_LOCATION": "NO"],
-                           expectedExcludedFileNames: ["docs/*"])
+            try await test(
+                buildSettings: [
+                    "DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources'",
+                    "EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*",
+                ],
+                action: action,
+                overrides: ["DEPLOYMENT_LOCATION": "NO"],
+                expectedExcludedFileNames: ["docs/*"]
+            )
         }
 
         // Exclude directories and files
-        try await test(buildSettings: ["DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources' 'AppTarget/DevelopmentResourceFile.txt'",
-                                       "EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*"],
-                       expectedExcludedFileNames: ["docs/*", Path.root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/*").str, Path.root.join("tmp/Workspace/aProject/AppTarget/DevelopmentResourceFile.txt").str])
+        try await test(
+            buildSettings: [
+                "DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources' 'AppTarget/DevelopmentResourceFile.txt'",
+                "EXCLUDED_SOURCE_FILE_NAMES": "$(inherited) docs/*",
+            ],
+            expectedExcludedFileNames: ["docs/*", Path.root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/*").str, Path.root.join("tmp/Workspace/aProject/AppTarget/DevelopmentResourceFile.txt").str]
+        )
 
         let baseConfigFiles: [Path: String] = [
             .root.join("tmp/Workspace/aProject/Test.xcconfig"): "EXCLUDED_SOURCE_FILE_NAMES[config=Debug] = 'debug/files/*'"
         ]
 
         // Check that specified paths get added for condition sets as well
-        try await test(buildSettings: ["DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources'"],
-                       action: .install,
-                       extraFiles: baseConfigFiles,
-                       configuration: "Debug",
-                       baseConfig: "Test.xcconfig",
-                       expectedExcludedFileNames: ["debug/files/*", Path.root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/*").str])
+        try await test(
+            buildSettings: ["DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources'"],
+            action: .install,
+            extraFiles: baseConfigFiles,
+            configuration: "Debug",
+            baseConfig: "Test.xcconfig",
+            expectedExcludedFileNames: ["debug/files/*", Path.root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/*").str]
+        )
 
         // If the condition set states debug, but we build release, we should only have dev assets in the value
-        try await test(buildSettings: ["DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources'"],
-                       action: .install,
-                       extraFiles: baseConfigFiles,
-                       configuration: "Release",
-                       baseConfig: "Test.xcconfig",
-                       expectedExcludedFileNames: [Path.root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/*").str])
+        try await test(
+            buildSettings: ["DEVELOPMENT_ASSET_PATHS": "'AppTarget/Preview Resources'"],
+            action: .install,
+            extraFiles: baseConfigFiles,
+            configuration: "Release",
+            baseConfig: "Test.xcconfig",
+            expectedExcludedFileNames: [Path.root.join("tmp/Workspace/aProject/AppTarget/Preview Resources/*").str]
+        )
     }
 
     @Test
     func arenaSettings() async throws {
-        let testWorkspace = try await TestWorkspace("Workspace",
-                                                    projects: [
-                                                        TestProject("aProject",
-                                                                    groupTree: TestGroup("SomeFiles"),
-                                                                    buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: [:])],
-                                                                    targets: [
-                                                                        TestAggregateTarget("AggregateTarget",
-                                                                                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: [:])])])]).load(getCore())
+        let testWorkspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles"),
+                    buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: [:])],
+                    targets: [
+                        TestAggregateTarget(
+                            "AggregateTarget",
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: [:])]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
 
@@ -849,7 +1024,8 @@ import SWBTestSupport
         let parameters = BuildParameters(
             action: .build,
             configuration: "Debug",
-            arena: arena)
+            arena: arena
+        )
         let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: testProject, target: testTarget)
 
         guard settings.errors.isEmpty else {
@@ -897,8 +1073,7 @@ import SWBTestSupport
                 #expect(settings.tableForTesting.lookupMacro(BuiltinMacros.MAC_OS_X_VERSION_MINOR)?.expression.stringRep == "110100")
                 #expect(settings.tableForTesting.lookupMacro(BuiltinMacros.MAC_OS_X_VERSION_ACTUAL)?.expression.stringRep == "110102")
                 #expect(settings.tableForTesting.lookupMacro(BuiltinMacros.MAC_OS_X_PRODUCT_BUILD_VERSION)?.expression.stringRep == "20C129")
-            }
-            else {
+            } else {
                 #expect(settings.tableForTesting.lookupMacro(BuiltinMacros.MAC_OS_X_VERSION_MAJOR) == nil)
                 #expect(settings.tableForTesting.lookupMacro(BuiltinMacros.MAC_OS_X_VERSION_MINOR) == nil)
                 #expect(settings.tableForTesting.lookupMacro(BuiltinMacros.MAC_OS_X_VERSION_ACTUAL) == nil)
@@ -927,8 +1102,7 @@ import SWBTestSupport
                 #expect(settings.tableForTesting.lookupMacro(BuiltinMacros.MAC_OS_X_VERSION_MINOR)?.expression.stringRep == "1504")
                 #expect(settings.tableForTesting.lookupMacro(BuiltinMacros.MAC_OS_X_VERSION_ACTUAL)?.expression.stringRep == "101504")
                 #expect(settings.tableForTesting.lookupMacro(BuiltinMacros.MAC_OS_X_PRODUCT_BUILD_VERSION)?.expression.stringRep == "19E287")
-            }
-            else {
+            } else {
                 #expect(settings.tableForTesting.lookupMacro(BuiltinMacros.MAC_OS_X_VERSION_MAJOR) == nil)
                 #expect(settings.tableForTesting.lookupMacro(BuiltinMacros.MAC_OS_X_VERSION_MINOR) == nil)
                 #expect(settings.tableForTesting.lookupMacro(BuiltinMacros.MAC_OS_X_VERSION_ACTUAL) == nil)
@@ -946,22 +1120,31 @@ import SWBTestSupport
         let macosx = try #require(core.platformRegistry.lookup(name: "macosx"), "could not load macosx platform")
 
         // Construct the test project.
-        let testWorkspace = TestWorkspace("Workspace",
-                                          projects: [TestProject("aProject",
-                                                                 groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
-                                                                 buildConfigurations:[
-                                                                    TestBuildConfiguration("Debug", buildSettings: [:])
-                                                                 ],
-                                                                 targets: [
-                                                                    TestStandardTarget("Target1",
-                                                                                       type: .application,
-                                                                                       buildConfigurations: [
-                                                                                        TestBuildConfiguration("Debug", buildSettings: [:]
-                                                                                                              )],
-                                                                                       buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
-                                                                                      ),
-                                                                 ])
-                                          ])
+        let testWorkspace = TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
+                    buildConfigurations: [
+                        TestBuildConfiguration("Debug", buildSettings: [:])
+                    ],
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [:]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                        )
+                    ]
+                )
+            ]
+        )
         let context = try await contextForTestData(testWorkspace, core: core)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
 
@@ -969,41 +1152,53 @@ import SWBTestSupport
         try await withTemporaryDirectory { sdksDirPath in
             do {
                 let sdk = sdksDirPath.join("MacOSX11.1.2.sdk")
-                try await writeSDK(name: sdk.basename, parentDir: sdksDirPath, settings: [
-                    "CanonicalName": "macosx11.1.2",
-                    "IsBaseSDK": "YES",
-                    "Version": "11.1.2",
-                    "DefaultProperties": [
-                        "PLATFORM_NAME": "macosx"
-                    ],
-                ])
+                try await writeSDK(
+                    name: sdk.basename,
+                    parentDir: sdksDirPath,
+                    settings: [
+                        "CanonicalName": "macosx11.1.2",
+                        "IsBaseSDK": "YES",
+                        "Version": "11.1.2",
+                        "DefaultProperties": [
+                            "PLATFORM_NAME": "macosx"
+                        ],
+                    ]
+                )
             }
 
             do {
                 let sdk = sdksDirPath.join("MacOSX10.15.4.sdk")
-                try await writeSDK(name: sdk.basename, parentDir: sdksDirPath, settings: [
-                    "CanonicalName": "macosx10.15.4",
-                    "IsBaseSDK": "YES",
-                    "Version": "10.15.4",
-                    "DefaultProperties": [
-                        "PLATFORM_NAME": "macosx"
-                    ],
-                ])
-            }
-
+                try await writeSDK(
+                    name: sdk.basename,
+                    parentDir: sdksDirPath,
+                    settings: [
+                        "CanonicalName": "macosx10.15.4",
+                        "IsBaseSDK": "YES",
+                        "Version": "10.15.4",
+                        "DefaultProperties": [
+                            "PLATFORM_NAME": "macosx"
+                        ],
+                    ]
+                )
+            }
+
             do {
                 let sdk = sdksDirPath.join("WatchOS8.1.2.sdk")
-                try await writeSDK(name: sdk.basename, parentDir: sdksDirPath, settings: [
-                    "CanonicalName": "watchos8.1.2",
-                    "IsBaseSDK": "YES",
-                    "Version": "8.1.2",
-                    "DefaultProperties": [
-                        "PLATFORM_NAME": "watchos"
-                    ],
-                ])
+                try await writeSDK(
+                    name: sdk.basename,
+                    parentDir: sdksDirPath,
+                    settings: [
+                        "CanonicalName": "watchos8.1.2",
+                        "IsBaseSDK": "YES",
+                        "Version": "8.1.2",
+                        "DefaultProperties": [
+                            "PLATFORM_NAME": "watchos"
+                        ],
+                    ]
+                )
             }
 
-            final class TestDataDelegate : SDKRegistryDelegate {
+            final class TestDataDelegate: SDKRegistryDelegate {
                 let namespace: MacroNamespace
                 let pluginManager: any PluginManager
                 private let _diagnosticsEngine = DiagnosticsEngine()
@@ -1073,20 +1268,32 @@ import SWBTestSupport
     @Test(.requireSDKs(.iOS))
     func nativeArchSettings() async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("Workspace",
-                                          projects: [TestProject("aProject",
-                                                                 groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
-                                                                 targets: [
-                                                                    TestStandardTarget("Target1",
-                                                                                       type: .dynamicLibrary,
-                                                                                       buildConfigurations: [
-                                                                                        TestBuildConfiguration("Debug",
-                                                                                                               buildSettings: [
-                                                                                                                "SDKROOT": "iphoneos",
-                                                                                                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                                                                                                "SUPPORTS_MACCATALYST": "YES",
-                                                                                                               ])],
-                                                                                       buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])])])]).load(core)
+        let workspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .dynamicLibrary,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "iphoneos",
+                                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                        "SUPPORTS_MACCATALYST": "YES",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(core)
         let context = try await contextForTestData(workspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let project = context.workspace.projects[0]
@@ -1128,7 +1335,8 @@ import SWBTestSupport
                     "aProject",
                     groupTree: TestGroup(
                         "SomeFiles",
-                        children: [TestFile("Mock.cpp")]),
+                        children: [TestFile("Mock.cpp")]
+                    ),
                     targets: [
                         TestStandardTarget(
                             "Target1",
@@ -1137,9 +1345,16 @@ import SWBTestSupport
                                 TestBuildConfiguration(
                                     "Debug",
                                     buildSettings: [
-                                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                    ])],
-                            buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])])])]).load(core)
+                                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)"
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(core)
         let context = try await contextForTestData(workspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let project = context.workspace.projects[0]
@@ -1186,18 +1401,30 @@ import SWBTestSupport
     @Test
     func platformPreferredArchSettings() async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("Workspace",
-                                          projects: [TestProject("aProject",
-                                                                 groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
-                                                                 targets: [
-                                                                    TestStandardTarget("Target1",
-                                                                                       type: .dynamicLibrary,
-                                                                                       buildConfigurations: [
-                                                                                        TestBuildConfiguration("Debug",
-                                                                                                               buildSettings: [
-                                                                                                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                                                                                               ])],
-                                                                                       buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])])])]).load(core)
+        let workspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .dynamicLibrary,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)"
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(core)
         let context = try await contextForTestData(workspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let project = context.workspace.projects[0]
@@ -1233,21 +1460,33 @@ import SWBTestSupport
     func architectures() async throws {
         let core = try await getCore()
         // Use an iOS workspace for most of our tests.
-        let iosWorkspace = try TestWorkspace("Workspace",
-                                             projects: [TestProject("aProject",
-                                                                    groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
-                                                                    targets: [
-                                                                        TestStandardTarget("Target1",
-                                                                                           type: .application,
-                                                                                           buildConfigurations: [
-                                                                                            TestBuildConfiguration("Debug",
-                                                                                                                   buildSettings: [
-                                                                                                                    "SDKROOT": "iphoneos",
-                                                                                                                    "ARCHS": "arm64 arm64e",
-                                                                                                                    "VALID_ARCHS": "$(ARCHS)",
-                                                                                                                    "EXCLUDED_ARCHS": "",
-                                                                                                                   ])],
-                                                                                           buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])])])]).load(core)
+        let iosWorkspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "iphoneos",
+                                        "ARCHS": "arm64 arm64e",
+                                        "VALID_ARCHS": "$(ARCHS)",
+                                        "EXCLUDED_ARCHS": "",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(core)
         let context = try await contextForTestData(iosWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let iosProject = context.workspace.projects[0]
@@ -1262,8 +1501,7 @@ import SWBTestSupport
                 let scope = settings.globalScope
 
                 #expect(scope.evaluate(BuiltinMacros.ARCHS) == ["arm64", "arm64e"])
-            }
-            else {
+            } else {
                 Issue.record("Errors creating settings: \(settings.errors)")
             }
         }
@@ -1273,13 +1511,12 @@ import SWBTestSupport
             let parameters = BuildParameters(action: .build, configuration: "Debug", overrides: ["EXCLUDED_ARCHS": "arm64"])
             let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: iosProject, target: iosTarget)
 
-            if settings.errors.isEmpty  {
+            if settings.errors.isEmpty {
                 let scope = settings.globalScope
 
                 // arm64e doesn't get removed by EXCLUDED_ARCHS because compatibility archs aren't used with that setting.
                 #expect(scope.evaluate(BuiltinMacros.ARCHS) == ["arm64e"])
-            }
-            else {
+            } else {
                 Issue.record("Errors creating settings: \(settings.errors)")
             }
         }
@@ -1291,13 +1528,12 @@ import SWBTestSupport
             let parameters = BuildParameters(action: .build, configuration: "Debug", activeRunDestination: runDestination, overrides: ["EXCLUDED_ARCHS": "arm64e", "ONLY_ACTIVE_ARCH": "YES"])
             let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: iosProject, target: iosTarget)
 
-            if settings.errors.isEmpty  {
+            if settings.errors.isEmpty {
                 let scope = settings.globalScope
 
                 // arm64 should still be considered a valid arch for arm64e, so it should fallback.
                 #expect(scope.evaluate(BuiltinMacros.ARCHS) == ["arm64"])
-            }
-            else {
+            } else {
                 Issue.record("Errors creating settings: \(settings.errors)")
             }
         }
@@ -1309,13 +1545,12 @@ import SWBTestSupport
             let parameters = BuildParameters(action: .build, configuration: "Debug", activeRunDestination: runDestination, overrides: ["EXCLUDED_ARCHS": "arm64", "ONLY_ACTIVE_ARCH": "YES"])
             let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: iosProject, target: iosTarget)
 
-            if settings.errors.isEmpty  {
+            if settings.errors.isEmpty {
                 let scope = settings.globalScope
 
                 // This test should effectively be a no-op and arm64e is chosen.
                 #expect(scope.evaluate(BuiltinMacros.ARCHS) == ["arm64e"])
-            }
-            else {
+            } else {
                 Issue.record("Errors creating settings: \(settings.errors)")
             }
         }
@@ -1327,13 +1562,12 @@ import SWBTestSupport
             let parameters = BuildParameters(action: .build, configuration: "Debug", activeRunDestination: runDestination, overrides: ["EXCLUDED_ARCHS": "arm64e", "ONLY_ACTIVE_ARCH": "YES"])
             let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: iosProject, target: iosTarget)
 
-            if settings.errors.isEmpty  {
+            if settings.errors.isEmpty {
                 let scope = settings.globalScope
 
                 // Nothing from the device is allowed, so fallback to what ARCHS has.
                 #expect(scope.evaluate(BuiltinMacros.ARCHS) == ["arm64"])
-            }
-            else {
+            } else {
                 Issue.record("Errors creating settings: \(settings.errors)")
             }
         }
@@ -1351,15 +1585,18 @@ import SWBTestSupport
                     "aProject",
                     groupTree: TestGroup(
                         "SomeFiles",
-                        children: []),
+                        children: []
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration(
-                            "Config1", buildSettings: [
+                            "Config1",
+                            buildSettings: [
                                 "ARCHS": "arm64 arm64e",
                                 "SDKROOT": "iphoneos",
                                 "VALID_ARCHS": "arm64",
                                 "__POPULATE_COMPATIBILITY_ARCH_MAP": "YES",
-                            ])
+                            ]
+                        )
                     ],
                     targets: [TestStandardTarget("Target", type: .application)]
                 )
@@ -1379,16 +1616,28 @@ import SWBTestSupport
 
     func testArchPointerAuthentication(platform: String) async throws {
         func test(buildSettings: [String: String], expectedARCHS_STANDARD: [String], expectedErrors: [String] = [], sourceLocation: SourceLocation = #_sourceLocation) async throws {
-            let workspace = try await TestWorkspace("Workspace",
-                                                    projects: [TestProject("aProject",
-                                                                           groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
-                                                                           targets: [
-                                                                            TestStandardTarget("Target1",
-                                                                                               type: .application,
-                                                                                               buildConfigurations: [
-                                                                                                TestBuildConfiguration("Debug",
-                                                                                                                       buildSettings: buildSettings)],
-                                                                                               buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])])])]).load(getCore())
+            let workspace = try await TestWorkspace(
+                "Workspace",
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
+                        targets: [
+                            TestStandardTarget(
+                                "Target1",
+                                type: .application,
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: buildSettings
+                                    )
+                                ],
+                                buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                            )
+                        ]
+                    )
+                ]
+            ).load(getCore())
             let context = try await contextForTestData(workspace)
             let buildRequestContext = BuildRequestContext(workspaceContext: context)
             let project = context.workspace.projects[0]
@@ -1401,8 +1650,7 @@ import SWBTestSupport
                 let scope = settings.globalScope
 
                 #expect(scope.evaluate(BuiltinMacros.ARCHS_STANDARD) == expectedARCHS_STANDARD)
-            }
-            else {
+            } else {
                 if expectedErrors.isEmpty {
                     Issue.record("Errors creating settings: \(settings.errors)", sourceLocation: sourceLocation)
                 } else {
@@ -1412,21 +1660,33 @@ import SWBTestSupport
         }
 
         // overriding ARCHS should always work
-        try await test(buildSettings: ["SDKROOT": platform,
-                                       "ARCHS": "foobar",
-                                       "EXCLUDED_ARCHS": "",
-                                       "ENABLE_POINTER_AUTHENTICATION": "YES"],
-                       expectedARCHS_STANDARD: ["arm64", "arm64e"])
+        try await test(
+            buildSettings: [
+                "SDKROOT": platform,
+                "ARCHS": "foobar",
+                "EXCLUDED_ARCHS": "",
+                "ENABLE_POINTER_AUTHENTICATION": "YES",
+            ],
+            expectedARCHS_STANDARD: ["arm64", "arm64e"]
+        )
 
         // using pointer authentication will include arm64e
-        try await test(buildSettings: ["SDKROOT": platform,
-                                       "ENABLE_POINTER_AUTHENTICATION": "YES"],
-                       expectedARCHS_STANDARD: ["arm64", "arm64e"])
+        try await test(
+            buildSettings: [
+                "SDKROOT": platform,
+                "ENABLE_POINTER_AUTHENTICATION": "YES",
+            ],
+            expectedARCHS_STANDARD: ["arm64", "arm64e"]
+        )
 
         // explicitly opting out of pointer authentication does not add arm64e
-        try await test(buildSettings: ["SDKROOT": platform,
-                                       "ENABLE_POINTER_AUTHENTICATION": "NO"],
-                       expectedARCHS_STANDARD: ["arm64"])
+        try await test(
+            buildSettings: [
+                "SDKROOT": platform,
+                "ENABLE_POINTER_AUTHENTICATION": "NO",
+            ],
+            expectedARCHS_STANDARD: ["arm64"]
+        )
     }
 
     @Test(.requireSDKs(.iOS))
@@ -1441,13 +1701,15 @@ import SWBTestSupport
 
     @Test(.requireSDKs(.iOS))
     func swiftModuleOnlyArchs() async throws {
-        func test(archs: [String],
-                  moduleOnlyArchs: [String],
-                  expectedArchs: [String],
-                  expectedModuleOnlyArchs: [String],
-                  overrides: [String:String] = [:],
-                  runDestination: RunDestinationInfo? = nil,
-                  sourceLocation: SourceLocation = #_sourceLocation) async throws {
+        func test(
+            archs: [String],
+            moduleOnlyArchs: [String],
+            expectedArchs: [String],
+            expectedModuleOnlyArchs: [String],
+            overrides: [String: String] = [:],
+            runDestination: RunDestinationInfo? = nil,
+            sourceLocation: SourceLocation = #_sourceLocation
+        ) async throws {
 
             let buildSettings = [
                 "SDKROOT": "iphoneos",
@@ -1455,26 +1717,35 @@ import SWBTestSupport
                 "SWIFT_MODULE_ONLY_ARCHS": moduleOnlyArchs.joined(separator: " "),
             ]
 
-            let testWorkspace = try await TestWorkspace("Workspace", projects: [
-                TestProject(
-                    "TestProject",
-                    groupTree: TestGroup(
-                        "SomeFiles",
-                        children: [TestFile("Test.swift")]),
-                    buildConfigurations: [
-                        TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: buildSettings.addingContents(of: overrides)),
-                    ],
-                    targets: [TestAggregateTarget(
-                        "AppTarget",
+            let testWorkspace = try await TestWorkspace(
+                "Workspace",
+                projects: [
+                    TestProject(
+                        "TestProject",
+                        groupTree: TestGroup(
+                            "SomeFiles",
+                            children: [TestFile("Test.swift")]
+                        ),
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug")
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: buildSettings.addingContents(of: overrides)
+                            )
                         ],
-                        buildPhases: [
-                            TestSourcesBuildPhase(["Test.swift"])
-                        ])
-                    ])]).load(getCore())
+                        targets: [
+                            TestAggregateTarget(
+                                "AppTarget",
+                                buildConfigurations: [
+                                    TestBuildConfiguration("Debug")
+                                ],
+                                buildPhases: [
+                                    TestSourcesBuildPhase(["Test.swift"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            ).load(getCore())
 
             let context = try await contextForTestData(testWorkspace)
             let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -1494,51 +1765,65 @@ import SWBTestSupport
         }
 
         // Test empty SWIFT_MODULE_ONLY_ARCHS archs is a no-op.
-        try await test(archs: ["arm64", "arm64e"],
-                       moduleOnlyArchs: [],
-                       expectedArchs: ["arm64", "arm64e"],
-                       expectedModuleOnlyArchs: [])
+        try await test(
+            archs: ["arm64", "arm64e"],
+            moduleOnlyArchs: [],
+            expectedArchs: ["arm64", "arm64e"],
+            expectedModuleOnlyArchs: []
+        )
 
         // Test SWIFT_MODULE_ONLY_ARCHS parses correctly.
-        try await test(archs: ["arm64", "arm64e"],
-                       moduleOnlyArchs: ["armv7", "armv7s"],
-                       expectedArchs: ["arm64", "arm64e"],
-                       expectedModuleOnlyArchs: ["armv7", "armv7s"])
+        try await test(
+            archs: ["arm64", "arm64e"],
+            moduleOnlyArchs: ["armv7", "armv7s"],
+            expectedArchs: ["arm64", "arm64e"],
+            expectedModuleOnlyArchs: ["armv7", "armv7s"]
+        )
 
         // Test SWIFT_MODULE_ONLY_ARCHS is a disjoint set from ARCHS.
-        try await test(archs: ["arm64", "arm64e"],
-                       moduleOnlyArchs: ["arm64", "armv7", "armv7s"],
-                       expectedArchs: ["arm64", "arm64e"],
-                       expectedModuleOnlyArchs: ["armv7", "armv7s"])
+        try await test(
+            archs: ["arm64", "arm64e"],
+            moduleOnlyArchs: ["arm64", "armv7", "armv7s"],
+            expectedArchs: ["arm64", "arm64e"],
+            expectedModuleOnlyArchs: ["armv7", "armv7s"]
+        )
 
         // Test SWIFT_MODULE_ONLY_ARCHS only contains valid archs.
-        try await test(archs: ["arm64", "arm64e"],
-                       moduleOnlyArchs: ["nonsense64b"],
-                       expectedArchs: ["arm64", "arm64e"],
-                       expectedModuleOnlyArchs: [])
+        try await test(
+            archs: ["arm64", "arm64e"],
+            moduleOnlyArchs: ["nonsense64b"],
+            expectedArchs: ["arm64", "arm64e"],
+            expectedModuleOnlyArchs: []
+        )
 
         // Test SWIFT_MODULE_ONLY_ARCHS removes excluded archs.
-        try await test(archs: ["arm64", "arm64e"],
-                       moduleOnlyArchs: ["armv7", "armv7s"],
-                       expectedArchs: ["arm64", "arm64e"],
-                       expectedModuleOnlyArchs: ["armv7"],
-                       overrides: ["EXCLUDED_ARCHS": "armv7s"])
+        try await test(
+            archs: ["arm64", "arm64e"],
+            moduleOnlyArchs: ["armv7", "armv7s"],
+            expectedArchs: ["arm64", "arm64e"],
+            expectedModuleOnlyArchs: ["armv7"],
+            overrides: ["EXCLUDED_ARCHS": "armv7s"]
+        )
 
         // Test SWIFT_MODULE_ONLY_ARCHS is disabled if ONLY_ACTIVE_ARCH is active.
-        try await test(archs: ["arm64", "arm64e"],
-                       moduleOnlyArchs: ["arm64", "armv7", "armv7s"],
-                       expectedArchs: ["arm64"],
-                       expectedModuleOnlyArchs: [],
-                       overrides: ["ONLY_ACTIVE_ARCH": "YES"],
-                       runDestination: .iOS)
+        try await test(
+            archs: ["arm64", "arm64e"],
+            moduleOnlyArchs: ["arm64", "armv7", "armv7s"],
+            expectedArchs: ["arm64"],
+            expectedModuleOnlyArchs: [],
+            overrides: ["ONLY_ACTIVE_ARCH": "YES"],
+            runDestination: .iOS
+        )
 
         // ...though with no run destination to provide an active arch, it's ignored.
-        try await test(archs: ["arm64", "arm64e"],
-                       moduleOnlyArchs: ["arm64", "armv7", "armv7s"],
-                       expectedArchs: ["arm64", "arm64e"],
-                       expectedModuleOnlyArchs: ["armv7", "armv7s"],
-                       overrides: ["ONLY_ACTIVE_ARCH": "YES"],
-                       runDestination: nil)
+        try await test(
+            archs: ["arm64", "arm64e"],
+            moduleOnlyArchs: ["arm64", "armv7", "armv7s"],
+            expectedArchs: ["arm64", "arm64e"],
+            expectedModuleOnlyArchs: ["armv7", "armv7s"],
+            overrides: ["ONLY_ACTIVE_ARCH": "YES"],
+            runDestination: nil
+        )
     }
 
     @Test
@@ -1554,24 +1839,32 @@ import SWBTestSupport
             "SWIFT_MODULE_ONLY_IPHONEOS_DEPLOYMENT_TARGET[arch=armv7s]": "10.3",
         ]
 
-        let testWorkspace = try await TestWorkspace("Workspace", projects: [
-            TestProject(
-                "TestProject",
-                groupTree: TestGroup(
-                    "SomeFiles",
-                    children: [TestFile("Test.swift")]),
-                buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: buildSettings),
-                ],
-                targets: [TestAggregateTarget(
-                    "AppTarget",
+        let testWorkspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "TestProject",
+                    groupTree: TestGroup(
+                        "SomeFiles",
+                        children: [TestFile("Test.swift")]
+                    ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug")
+                        TestBuildConfiguration("Debug", buildSettings: buildSettings)
                     ],
-                    buildPhases: [
-                        TestSourcesBuildPhase(["Test.swift"])
-                    ])
-                ])]).load(getCore())
+                    targets: [
+                        TestAggregateTarget(
+                            "AppTarget",
+                            buildConfigurations: [
+                                TestBuildConfiguration("Debug")
+                            ],
+                            buildPhases: [
+                                TestSourcesBuildPhase(["Test.swift"])
+                            ]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
 
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -1610,20 +1903,32 @@ import SWBTestSupport
     @Test(.requireSDKs(.iOS))
     func signingBasics() async throws {
         // Set up a trivial iOS project.
-        let testWorkspace = try await TestWorkspace("Workspace",
-                                                    projects: [TestProject("aProject",
-                                                                           groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
-                                                                           targets: [
-                                                                            TestStandardTarget("Target1",
-                                                                                               type: .application,
-                                                                                               buildConfigurations: [
-                                                                                                TestBuildConfiguration("Debug",
-                                                                                                                       buildSettings: [
-                                                                                                                        "SDKROOT": "iphoneos",
-                                                                                                                        "CODE_SIGN_IDENTITY": "foo",
-                                                                                                                        "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
-                                                                                                                       ])],
-                                                                                               buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])])])]).load(getCore())
+        let testWorkspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "iphoneos",
+                                        "CODE_SIGN_IDENTITY": "foo",
+                                        "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -1651,18 +1956,30 @@ import SWBTestSupport
     @Test(.requireSDKs(.iOS))
     func signingBasicErrorsForRequiredPlatforms() async throws {
         // Set up a trivial iOS project.
-        let testWorkspace = try await TestWorkspace("Workspace",
-                                                    projects: [TestProject("aProject",
-                                                                           groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
-                                                                           targets: [
-                                                                            TestStandardTarget("Target1",
-                                                                                               type: .application,
-                                                                                               buildConfigurations: [
-                                                                                                TestBuildConfiguration("Debug",
-                                                                                                                       buildSettings: [
-                                                                                                                        "SDKROOT": "iphoneos",
-                                                                                                                       ])],
-                                                                                               buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])])])]).load(getCore())
+        let testWorkspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "iphoneos"
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -1674,10 +1991,13 @@ import SWBTestSupport
             let provisioningInputs = ProvisioningTaskInputs(identityHash: "", identityName: "", profileName: "foo", profileUUID: "foofoo", profilePath: Path.root.join("var/tmp/foo.mobileprovision"))
             let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: testProject, target: testTarget, provisioningTaskInputs: provisioningInputs)
 
-            XCTAssertMatch(settings.errors.elements, [
-                .prefix("An empty code signing identity is not valid when signing a binary for the"),
-                .prefix("Entitlements are required for product type \'Application\' in SDK \'iOS"),
-            ])
+            XCTAssertMatch(
+                settings.errors.elements,
+                [
+                    .prefix("An empty code signing identity is not valid when signing a binary for the"),
+                    .prefix("Entitlements are required for product type \'Application\' in SDK \'iOS"),
+                ]
+            )
         }
 
         // Try without an identity.
@@ -1686,9 +2006,12 @@ import SWBTestSupport
             let provisioningInputs = ProvisioningTaskInputs(identityHash: "", identityName: "", profileName: "foo", profileUUID: "foofoo", profilePath: Path.root.join("var/tmp/foo.mobileprovision"), signedEntitlements: .plDict(["hi": .plString("bye")]))
             let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: testProject, target: testTarget, provisioningTaskInputs: provisioningInputs)
 
-            XCTAssertMatch(settings.errors.elements, [
-                .prefix("An empty code signing identity is not valid when signing a binary for the")
-            ])
+            XCTAssertMatch(
+                settings.errors.elements,
+                [
+                    .prefix("An empty code signing identity is not valid when signing a binary for the")
+                ]
+            )
         }
 
         // Try without entitlements.
@@ -1698,25 +2021,40 @@ import SWBTestSupport
             let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: testProject, target: testTarget, provisioningTaskInputs: provisioningInputs)
 
             // This is a case that is explicitly allowed by falling back to ad-hoc signing.
-            XCTAssertMatch(settings.errors.elements, [
-                .prefix("Entitlements are required for product type \'Application\' in SDK \'iOS")
-            ])
+            XCTAssertMatch(
+                settings.errors.elements,
+                [
+                    .prefix("Entitlements are required for product type \'Application\' in SDK \'iOS")
+                ]
+            )
         }
     }
 
     @Test(.requireSDKs(.iOS))
     func signingBasicWarningsForNonRequiredPlatforms() async throws {
         // Set up a trivial macOS project.
-        let testWorkspace = try await TestWorkspace("Workspace",
-                                                    projects: [TestProject("aProject",
-                                                                           groupTree: TestGroup("SomeFiles",
-                                                                                                children: [TestFile("Mock.cpp")]),
-                                                                           targets: [
-                                                                            TestStandardTarget("Target1",
-                                                                                               type: .framework,
-                                                                                               buildConfigurations: [
-                                                                                                TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"])],
-                                                                                               buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])])])]).load(getCore())
+        let testWorkspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup(
+                        "SomeFiles",
+                        children: [TestFile("Mock.cpp")]
+                    ),
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"])
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -1737,16 +2075,28 @@ import SWBTestSupport
     @Test(.requireSDKs(.iOS))
     func signingBasicErrorsForPlatformsAdhocIphoneos() async throws {
         // Set up a trivial iOS project.
-        let testWorkspace = try await TestWorkspace("Workspace",
-                                                    projects: [TestProject("aProject",
-                                                                           groupTree: TestGroup("SomeFiles",
-                                                                                                children: [TestFile("Mock.cpp")]),
-                                                                           targets: [
-                                                                            TestStandardTarget("Target1",
-                                                                                               type: .framework,
-                                                                                               buildConfigurations: [
-                                                                                                TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"])],
-                                                                                               buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])])])]).load(getCore())
+        let testWorkspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup(
+                        "SomeFiles",
+                        children: [TestFile("Mock.cpp")]
+                    ),
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"])
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -1856,20 +2206,30 @@ import SWBTestSupport
         let core = try await getCore()
 
         func settings(sdk: String, sdkVariant: String, targetType: TestStandardTarget.TargetType, extraSettings: [String: String] = [:]) async throws -> Settings {
-            let testWorkspace = try TestWorkspace("Workspace",
-                                                  projects: [TestProject("aProject",
-                                                                         groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
-                                                                         targets: [
-                                                                            TestStandardTarget("Target1",
-                                                                                               type: targetType,
-                                                                                               buildConfigurations: [
-                                                                                                TestBuildConfiguration("Debug", buildSettings: [
-                                                                                                    "SDKROOT": sdk,
-                                                                                                    "SDK_VARIANT": sdkVariant,
-                                                                                                ].addingContents(of: extraSettings))
-                                                                                               ])
-                                                                         ])
-                                                  ]).load(core)
+            let testWorkspace = try TestWorkspace(
+                "Workspace",
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
+                        targets: [
+                            TestStandardTarget(
+                                "Target1",
+                                type: targetType,
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "SDKROOT": sdk,
+                                            "SDK_VARIANT": sdkVariant,
+                                        ].addingContents(of: extraSettings)
+                                    )
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            ).load(core)
             let context = try await contextForTestData(testWorkspace)
             let buildRequestContext = BuildRequestContext(workspaceContext: context)
             let testProject = context.workspace.projects[0]
@@ -1908,25 +2268,42 @@ import SWBTestSupport
     @Test(.requireSDKs(.host))
     func userDefinedSettings() async throws {
         // Set up a trivial iOS project.
-        let testWorkspace = try await TestWorkspace("Workspace",
-                                                    projects: [TestProject("aProject",
-                                                                           groupTree: TestGroup("SomeFiles", children: []),
-                                                                           targets: [
-                                                                            TestStandardTarget("Target1", type: .commandLineTool,
-                                                                                               buildConfigurations: [
-                                                                                                TestBuildConfiguration("Debug",
-                                                                                                                       buildSettings: [
-                                                                                                                        "USER_HEADER_SEARCH_PATHS": "$(USER_PARAMETER)",
-                                                                                                                       ])])])]).load(getCore())
-        let context = try await contextForTestData(testWorkspace)
-        let buildRequestContext = BuildRequestContext(workspaceContext: context)
-        let testProject = context.workspace.projects[0]
-        let testTarget = testProject.targets[0]
-
+        let testWorkspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: []),
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .commandLineTool,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "USER_HEADER_SEARCH_PATHS": "$(USER_PARAMETER)"
+                                    ]
+                                )
+                            ]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
+        let context = try await contextForTestData(testWorkspace)
+        let buildRequestContext = BuildRequestContext(workspaceContext: context)
+        let testProject = context.workspace.projects[0]
+        let testTarget = testProject.targets[0]
+
         // Check that the user parameter is parsed as a string list.
-        let parameters = BuildParameters(action: .build, configuration: "Debug", overrides: [
-            "USER_PARAMETER": "A B"
-        ])
+        let parameters = BuildParameters(
+            action: .build,
+            configuration: "Debug",
+            overrides: [
+                "USER_PARAMETER": "A B"
+            ]
+        )
         let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: testProject, target: testTarget)
 
         guard settings.errors.isEmpty else {
@@ -1941,18 +2318,30 @@ import SWBTestSupport
     // Test that we correctly normalize path of some special macros.
     @Test(.requireSDKs(.host))
     func macroPathNormalization() async throws {
-        let testWorkspace = try await TestWorkspace("Workspace",
-                                                    projects: [
-                                                        TestProject("aProject",
-                                                                    groupTree: TestGroup("SomeFiles", children: []),
-                                                                    targets: [
-                                                                        TestStandardTarget("Target1", type: .commandLineTool, buildConfigurations: [
-                                                                            TestBuildConfiguration("Debug", buildSettings: [
-                                                                                "SYMROOT": "./build",
-                                                                                "DSTROOT": "build/foo/bar/something/../dst",
-                                                                            ])
-                                                                        ])
-                                                                    ])]).load(getCore())
+        let testWorkspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: []),
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .commandLineTool,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SYMROOT": "./build",
+                                        "DSTROOT": "build/foo/bar/something/../dst",
+                                    ]
+                                )
+                            ]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -1974,17 +2363,30 @@ import SWBTestSupport
 
     @Test(.requireSDKs(.tvOS))
     func unableToResolveProductType() async throws {
-        let testWorkspace = try await TestWorkspace("Workspace",
-                                                    projects: [TestProject("aProject",
-                                                                           groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
-                                                                           targets: [
-                                                                            TestStandardTarget("Target1", type: .xcodeExtension,
-                                                                                               buildConfigurations: [
-                                                                                                TestBuildConfiguration("Debug",
-                                                                                                                       buildSettings: [
-                                                                                                                        "SDKROOT": "appletvos",
-                                                                                                                       ])],
-                                                                                               buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])])])]).load(getCore())
+        let testWorkspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .xcodeExtension,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "appletvos"
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -2011,8 +2413,15 @@ import SWBTestSupport
                             buildConfigurations: [
                                 TestBuildConfiguration(
                                     "Debug",
-                                    buildSettings: targetBuildSettings)],
-                            buildPhases: [TestSourcesBuildPhase(["file.c"])])])]).load(getCore())
+                                    buildSettings: targetBuildSettings
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["file.c"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
 
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -2046,17 +2455,20 @@ import SWBTestSupport
             try await withEnvironment([.externalToolchainsDir: toolchainsDir.str]) {
                 // Add in our custom toolchain.
                 try fs.createDirectory(toolchainsDir.join("org.swift.testoss.xctoolchain"), recursive: true)
-                try await fs.writePlist(toolchainsDir.join("org.swift.testoss.xctoolchain").join("Info.plist"), .plDict([
-                    "Identifier": "org.swift.testoss",
-                    "DisplayName": "TestOSS",
-                    "Version": "1.2.3",
-                    "DefaultBuildSettings": .plDict([
-                        "TOOLCHAIN_DEFAULT": .plString("IncorrectValue"),
-                    ]),
-                    "OverrideBuildSettings": .plDict([
-                        "TOOLCHAIN_OVERRIDE": .plString("CorrectValue"),
+                try await fs.writePlist(
+                    toolchainsDir.join("org.swift.testoss.xctoolchain").join("Info.plist"),
+                    .plDict([
+                        "Identifier": "org.swift.testoss",
+                        "DisplayName": "TestOSS",
+                        "Version": "1.2.3",
+                        "DefaultBuildSettings": .plDict([
+                            "TOOLCHAIN_DEFAULT": .plString("IncorrectValue")
+                        ]),
+                        "OverrideBuildSettings": .plDict([
+                            "TOOLCHAIN_OVERRIDE": .plString("CorrectValue")
+                        ]),
                     ])
-                ]))
+                )
 
                 // Make a new core to avoid impacting other tests, since we register a toolchain.
                 let core = try await Self.makeCore()
@@ -2065,14 +2477,18 @@ import SWBTestSupport
                 #expect(toolchain.identifier == "org.swift.testoss")
                 #expect(toolchain.displayName == "TestOSS")
                 #expect(toolchain.version == Version(1, 2, 3))
-                #expect(toolchain.defaultSettings == [
-                    "TOOLCHAIN_DEFAULT": .plString("IncorrectValue"),
-                ])
-                #expect(toolchain.overrideSettings == [
-                    "TOOLCHAIN_OVERRIDE": .plString("CorrectValue"),
-                    "SWIFT_DEVELOPMENT_TOOLCHAIN": "YES",
-                    "SWIFT_USE_DEVELOPMENT_TOOLCHAIN_RUNTIME": "YES"
-                ])
+                #expect(
+                    toolchain.defaultSettings == [
+                        "TOOLCHAIN_DEFAULT": .plString("IncorrectValue")
+                    ]
+                )
+                #expect(
+                    toolchain.overrideSettings == [
+                        "TOOLCHAIN_OVERRIDE": .plString("CorrectValue"),
+                        "SWIFT_DEVELOPMENT_TOOLCHAIN": "YES",
+                        "SWIFT_USE_DEVELOPMENT_TOOLCHAIN_RUNTIME": "YES",
+                    ]
+                )
 
                 // Set up a trivial iOS project.
                 let testWorkspace = try TestWorkspace(
@@ -2141,16 +2557,23 @@ import SWBTestSupport
                     "Project",
                     groupTree: TestGroup("SomeFiles", children: [TestFile("file.c")]),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "macosx",
-                        ])],
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx"
+                            ]
+                        )
+                    ],
                     targets: [
                         TestExternalTarget(
                             "ExternalTarget",
                             buildConfigurations: [TestBuildConfiguration("Debug")],
                             passBuildSettingsInEnvironment: true
-                        ),
-                    ])]).load(core)
+                        )
+                    ]
+                )
+            ]
+        ).load(core)
 
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -2183,37 +2606,40 @@ import SWBTestSupport
     @Test(.requireSDKs(.macOS))
     func configurationConditionParameter() async throws {
         let files: [Path: String] = [
-            .root.join("tmp/Workspace/aProject/Sources/Test.xcconfig"): (
-                "CONFIG_OVERRIDE[config=Release] = value_release\n" +       // This value will be overridden by the later unconditional value.
-                "CONFIG_OVERRIDE = value_default\n" +
-                "CONFIG_OVERRIDE[config=Debug] = value_debug\n" +           // This value overrides the preceding unconditional value for the Debug configuration.
-                "CONFIG_PARTIAL = value_default\n" +
-                "CONFIG_PARTIAL[config=D*] = value_d"
-            )]
-        let testWorkspace = try await TestWorkspace("Workspace",
-                                                    projects: [
-                                                        TestProject("aProject",
-                                                                    groupTree: TestGroup(
-                                                                        "SomeFiles",  path: "Sources",
-                                                                        children: [
-                                                                            TestFile("Test.xcconfig"),
-                                                                        ]),
-                                                                    buildConfigurations: [
-                                                                        TestBuildConfiguration("Debug"),
-                                                                        TestBuildConfiguration("Release"),
-                                                                    ],
-                                                                    targets: [
-                                                                        TestStandardTarget(
-                                                                            "Application", type: .application,
-                                                                            buildConfigurations: [
-                                                                                TestBuildConfiguration("Debug", baseConfig: "Test.xcconfig", buildSettings: [:]),
-                                                                                TestBuildConfiguration("Release", baseConfig: "Test.xcconfig", buildSettings: [:]),
-                                                                            ],
-                                                                            buildPhases: []
-                                                                        )
-                                                                    ]
-                                                                   )
-                                                    ]
+            .root.join("tmp/Workspace/aProject/Sources/Test.xcconfig"):
+                ("CONFIG_OVERRIDE[config=Release] = value_release\n"  // This value will be overridden by the later unconditional value.
+                + "CONFIG_OVERRIDE = value_default\n" + "CONFIG_OVERRIDE[config=Debug] = value_debug\n"  // This value overrides the preceding unconditional value for the Debug configuration.
+                + "CONFIG_PARTIAL = value_default\n" + "CONFIG_PARTIAL[config=D*] = value_d")
+        ]
+        let testWorkspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup(
+                        "SomeFiles",
+                        path: "Sources",
+                        children: [
+                            TestFile("Test.xcconfig")
+                        ]
+                    ),
+                    buildConfigurations: [
+                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Release"),
+                    ],
+                    targets: [
+                        TestStandardTarget(
+                            "Application",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Debug", baseConfig: "Test.xcconfig", buildSettings: [:]),
+                                TestBuildConfiguration("Release", baseConfig: "Test.xcconfig", buildSettings: [:]),
+                            ],
+                            buildPhases: []
+                        )
+                    ]
+                )
+            ]
         ).load(getCore())
 
         let context = try await contextForTestData(testWorkspace, files: files)
@@ -2221,7 +2647,6 @@ import SWBTestSupport
         let testProject = context.workspace.projects[0]
         let testTarget = testProject.targets[0]
 
-
         // Test the Debug configuration.
         do {
             let parameters = BuildParameters(action: .build, configuration: "Debug")
@@ -2267,39 +2692,56 @@ import SWBTestSupport
             let iosSparseSDKPath = tmpDirPath.join("iosSparse1.0.sdk")
             let iosSparseSDKIdentBase = "com.apple.sdk.ios"
             let iosSparseSDKIdent = "\(iosSparseSDKIdentBase)1.0"
-            try await writeSDK(name: iosSparseSDKPath.basename, parentDir: iosSparseSDKPath.dirname, settings: [
-                "CanonicalName": .plString(iosSparseSDKIdent),
-                "IsBaseSDK": "NO",
-            ])
+            try await writeSDK(
+                name: iosSparseSDKPath.basename,
+                parentDir: iosSparseSDKPath.dirname,
+                settings: [
+                    "CanonicalName": .plString(iosSparseSDKIdent),
+                    "IsBaseSDK": "NO",
+                ]
+            )
             let simSparseSDKPath = tmpDirPath.join("simSparse1.0.sdk")
             let simSparseSDKIdentBase = "com.apple.sdk.sparse.sim"
             let simSparseSDKIdent = "\(simSparseSDKIdentBase)1.0"
-            try await writeSDK(name: simSparseSDKPath.basename, parentDir: simSparseSDKPath.dirname, settings: [
-                "CanonicalName": .plString(simSparseSDKIdent),
-                "IsBaseSDK": "NO",
-            ])
+            try await writeSDK(
+                name: simSparseSDKPath.basename,
+                parentDir: simSparseSDKPath.dirname,
+                settings: [
+                    "CanonicalName": .plString(simSparseSDKIdent),
+                    "IsBaseSDK": "NO",
+                ]
+            )
 
             // Construct the test project.
-            let testWorkspace = try TestWorkspace("Workspace",
-                                                  projects: [TestProject("aProject",
-                                                                         groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
-                                                                         buildConfigurations:[
-                                                                            TestBuildConfiguration("Debug", buildSettings: [:])
-                                                                         ],
-                                                                         targets: [
-                                                                            TestStandardTarget("Target1",
-                                                                                               type: .application,
-                                                                                               buildConfigurations: [
-                                                                                                TestBuildConfiguration("Debug", buildSettings: [
-                                                                                                    "SDKROOT": "macosx",
-                                                                                                    "ADDITIONAL_SDKS[sdk=iphoneos*]": "\(iosSparseSDKPath.str)",
-                                                                                                    "ADDITIONAL_SDKS[sdk=iphonesimulator*]": "\(simSparseSDKPath.str)",
-                                                                                                ]
-                                                                                                                      )],
-                                                                                               buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
-                                                                                              ),
-                                                                         ])
-                                                  ]).load(await getCore())
+            let testWorkspace = try TestWorkspace(
+                "Workspace",
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug", buildSettings: [:])
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "Target1",
+                                type: .application,
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "SDKROOT": "macosx",
+                                            "ADDITIONAL_SDKS[sdk=iphoneos*]": "\(iosSparseSDKPath.str)",
+                                            "ADDITIONAL_SDKS[sdk=iphonesimulator*]": "\(simSparseSDKPath.str)",
+                                        ]
+                                    )
+                                ],
+                                buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                            )
+                        ]
+                    )
+                ]
+            ).load(await getCore())
             let context = try await contextForTestData(testWorkspace)
             let buildRequestContext = BuildRequestContext(workspaceContext: context)
             let testProject = context.workspace.projects[0]
@@ -2328,8 +2770,7 @@ import SWBTestSupport
 
                 #expect(settings.warnings == [])
                 #expect(settings.errors == [])
-            }
-            else {
+            } else {
                 Issue.record("unable to look up macOS SDK")
             }
 
@@ -2349,8 +2790,7 @@ import SWBTestSupport
 
                 #expect(settings.warnings == [])
                 #expect(settings.errors == [])
-            }
-            else {
+            } else {
                 Issue.record("unable to look up iOS SDK")
             }
 
@@ -2370,8 +2810,7 @@ import SWBTestSupport
 
                 #expect(settings.warnings == [])
                 #expect(settings.errors == [])
-            }
-            else {
+            } else {
                 Issue.record("unable to look up iOS simulator SDK")
             }
 
@@ -2379,10 +2818,14 @@ import SWBTestSupport
             if let iosSDK = context.sdkRegistry.lookup("iphoneos") {
                 let iosSparseSDK2Path = tmpDirPath.join("iosSparse2.0.sdk")
                 let iosSparseSDK2Ident = "\(iosSparseSDKIdentBase)2.0"
-                try await writeSDK(name: iosSparseSDK2Path.basename, parentDir: iosSparseSDK2Path.dirname, settings: [
-                    "CanonicalName": .plString(iosSparseSDK2Ident),
-                    "IsBaseSDK": "NO",
-                ])
+                try await writeSDK(
+                    name: iosSparseSDK2Path.basename,
+                    parentDir: iosSparseSDK2Path.dirname,
+                    settings: [
+                        "CanonicalName": .plString(iosSparseSDK2Ident),
+                        "IsBaseSDK": "NO",
+                    ]
+                )
 
                 let parameters = BuildParameters(action: .build, configuration: "Debug", overrides: ["SDKROOT": "iphoneos", "ADDITIONAL_SDKS": "$(inherited) \(iosSparseSDK2Path.str)"])
                 let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: testProject, target: testTarget)
@@ -2399,8 +2842,7 @@ import SWBTestSupport
 
                 #expect(settings.warnings == ["Multiple SDKs define the setting \'SDK_DIR_com_apple_sdk_ios\'; either the target is using multiple SDKs which shouldn\'t be used together, or some of these SDKs need their \'CanonicalName\' key updated to avoid this collision: \(iosSparseSDKPath.str), \(iosSparseSDK2Path.str)"])
                 #expect(settings.errors == [])
-            }
-            else {
+            } else {
                 Issue.record("unable to look up iOS SDK")
             }
         }
@@ -2414,25 +2856,34 @@ import SWBTestSupport
         }
 
         // Construct the test project.
-        let testWorkspace = try TestWorkspace("Workspace",
-                                              projects: [TestProject("aProject",
-                                                                     groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
-                                                                     buildConfigurations:[
-                                                                        TestBuildConfiguration("Debug", buildSettings: [:])
-                                                                     ],
-                                                                     targets: [
-                                                                        TestStandardTarget("Target1",
-                                                                                           type: .application,
-                                                                                           buildConfigurations: [
-                                                                                            TestBuildConfiguration("Debug", buildSettings: [
-                                                                                                "SDKROOT": "linuxB",
-                                                                                                "PLATFORM_NAME": "linux",
-                                                                                            ]
-                                                                                                                  )],
-                                                                                           buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
-                                                                                          ),
-                                                                     ])
-                                              ]).load(core)
+        let testWorkspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
+                    buildConfigurations: [
+                        TestBuildConfiguration("Debug", buildSettings: [:])
+                    ],
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "linuxB",
+                                        "PLATFORM_NAME": "linux",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(core)
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
 
@@ -2440,15 +2891,19 @@ import SWBTestSupport
         try await withTemporaryDirectory { sdksDirPath in
             for (version, name) in ["linuxB", "linuxA", "linux"].enumerated() {
                 let sdk = sdksDirPath.join("\(name).sdk")
-                try await writeSDK(name: sdk.basename, parentDir: sdksDirPath, settings: [
-                    "CanonicalName": .plString(name),
-                    "Version": .plString("\(version).0"),
-                    "DefaultProperties": [
-                        "PLATFORM_NAME": "linux"
-                    ],
-                ])
+                try await writeSDK(
+                    name: sdk.basename,
+                    parentDir: sdksDirPath,
+                    settings: [
+                        "CanonicalName": .plString(name),
+                        "Version": .plString("\(version).0"),
+                        "DefaultProperties": [
+                            "PLATFORM_NAME": "linux"
+                        ],
+                    ]
+                )
             }
-            final class TestDataDelegate : SDKRegistryDelegate {
+            final class TestDataDelegate: SDKRegistryDelegate {
                 let namespace: MacroNamespace
                 let pluginManager: any PluginManager
                 private let _diagnosticsEngine = DiagnosticsEngine()
@@ -2491,51 +2946,66 @@ import SWBTestSupport
         try await withTemporaryDirectory { sdksDirPath in
             let sdkPath = sdksDirPath.join("TestSDK.sdk")
             let sdkIdentifier = "com.apple.sdk.1.0"
-            try await writeSDK(name: sdkPath.basename, parentDir: sdksDirPath, settings: [
-                "CanonicalName": .plString(sdkIdentifier),
-                "Version": "1.0",
-                "IsBaseSDK": "YES",
-                "DefaultProperties": [
-                    "GCC_PREPROCESSOR_DEFINITIONS": "A=B",
-                    "PLATFORM_NAME": "macosx",
-                ],
-                "CustomProperties": [
-                    "GCC_PREPROCESSOR_DEFINITIONS": "$(inherited) C=D"
-                ],
-                "Variants": [
-                    [   "Name": "Strawberry",
-                        "BuildSettings": [
-                            "GCC_PREPROCESSOR_DEFINITIONS": "$(inherited) FLAVOR=Strawberry",
-                        ],
-                    ] as PropertyListItem,
-                    [   "Name": "Vanilla",
-                        "BuildSettings": [
-                            "GCC_PREPROCESSOR_DEFINITIONS": "$(inherited) FLAVOR=Vanilla",
-                        ],
-                    ] as PropertyListItem,
-                ],
-                "DefaultVariant": "Vanilla"
-            ])
+            try await writeSDK(
+                name: sdkPath.basename,
+                parentDir: sdksDirPath,
+                settings: [
+                    "CanonicalName": .plString(sdkIdentifier),
+                    "Version": "1.0",
+                    "IsBaseSDK": "YES",
+                    "DefaultProperties": [
+                        "GCC_PREPROCESSOR_DEFINITIONS": "A=B",
+                        "PLATFORM_NAME": "macosx",
+                    ],
+                    "CustomProperties": [
+                        "GCC_PREPROCESSOR_DEFINITIONS": "$(inherited) C=D"
+                    ],
+                    "Variants": [
+                        [
+                            "Name": "Strawberry",
+                            "BuildSettings": [
+                                "GCC_PREPROCESSOR_DEFINITIONS": "$(inherited) FLAVOR=Strawberry"
+                            ],
+                        ] as PropertyListItem,
+                        [
+                            "Name": "Vanilla",
+                            "BuildSettings": [
+                                "GCC_PREPROCESSOR_DEFINITIONS": "$(inherited) FLAVOR=Vanilla"
+                            ],
+                        ] as PropertyListItem,
+                    ],
+                    "DefaultVariant": "Vanilla",
+                ]
+            )
 
             // Construct the test project.
-            let testWorkspace = try TestWorkspace("Workspace",
-                                                  projects: [TestProject("aProject",
-                                                                         groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
-                                                                         buildConfigurations:[
-                                                                            TestBuildConfiguration("Debug", buildSettings: [:])
-                                                                         ],
-                                                                         targets: [
-                                                                            TestStandardTarget("Target1",
-                                                                                               type: .application,
-                                                                                               buildConfigurations: [
-                                                                                                TestBuildConfiguration("Debug", buildSettings: [
-                                                                                                    "SDKROOT": "\(sdkPath.str)",
-                                                                                                ]
-                                                                                                                      )],
-                                                                                               buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
-                                                                                              ),
-                                                                         ])
-                                                  ]).load(await getCore())
+            let testWorkspace = try TestWorkspace(
+                "Workspace",
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug", buildSettings: [:])
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "Target1",
+                                type: .application,
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "SDKROOT": "\(sdkPath.str)"
+                                        ]
+                                    )
+                                ],
+                                buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                            )
+                        ]
+                    )
+                ]
+            ).load(await getCore())
             let context = try await contextForTestData(testWorkspace)
             let buildRequestContext = BuildRequestContext(workspaceContext: context)
             let testProject = context.workspace.projects[0]
@@ -2589,26 +3059,35 @@ import SWBTestSupport
         let productBuildVersion = try #require(macosSDK.productBuildVersion)
 
         // Construct the test project.
-        let testWorkspace = try await TestWorkspace("Workspace",
-                                                    projects: [TestProject("aProject",
-                                                                           groupTree: TestGroup("SomeFiles", children: [TestFile("Dummy.cpp")]),
-                                                                           buildConfigurations:[
-                                                                            TestBuildConfiguration("Debug", buildSettings: [:])
-                                                                           ],
-                                                                           targets: [
-                                                                            TestStandardTarget("Target1",
-                                                                                               type: .application,
-                                                                                               buildConfigurations: [
-                                                                                                TestBuildConfiguration("Debug", buildSettings: [
-                                                                                                    "FRAMEWORK_SEARCH_PATHS": "$(inherited) onePath",
-                                                                                                    "FRAMEWORK_SEARCH_PATHS[_sdk_build_version=\(productBuildVersion)]" : "$(inherited) twoPath",
-                                                                                                    "FRAMEWORK_SEARCH_PATHS[_sdk_build_version=1A1234t]" : "$(inherited) threePath",
-                                                                                                ]
-                                                                                                                      )],
-                                                                                               buildPhases: [TestSourcesBuildPhase(["Dummy.cpp"])]
-                                                                                              ),
-                                                                           ])
-                                                    ]).load(getCore())
+        let testWorkspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("Dummy.cpp")]),
+                    buildConfigurations: [
+                        TestBuildConfiguration("Debug", buildSettings: [:])
+                    ],
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "FRAMEWORK_SEARCH_PATHS": "$(inherited) onePath",
+                                        "FRAMEWORK_SEARCH_PATHS[_sdk_build_version=\(productBuildVersion)]": "$(inherited) twoPath",
+                                        "FRAMEWORK_SEARCH_PATHS[_sdk_build_version=1A1234t]": "$(inherited) threePath",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["Dummy.cpp"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -2626,71 +3105,80 @@ import SWBTestSupport
         try await withTemporaryDirectory { sdksDirPath in
             let sdkPath = sdksDirPath.join("TestSDK.sdk")
             let sdkIdentifier = "appletvos"
-            try await writeSDK(name: sdkPath.basename, parentDir: sdksDirPath, settings: [
-                "CanonicalName": .plString(sdkIdentifier),
-                "Version": "1.0",
-                "IsBaseSDK": "Yes",
-                "DefaultProperties": [
-                    "PLATFORM_NAME": "macosx",
-                ],
-                "PropertyConditionFallbackNames": [
-                    "iphoneos",
-                    "embedded",
-                ],
-            ])
+            try await writeSDK(
+                name: sdkPath.basename,
+                parentDir: sdksDirPath,
+                settings: [
+                    "CanonicalName": .plString(sdkIdentifier),
+                    "Version": "1.0",
+                    "IsBaseSDK": "Yes",
+                    "DefaultProperties": [
+                        "PLATFORM_NAME": "macosx"
+                    ],
+                    "PropertyConditionFallbackNames": [
+                        "iphoneos",
+                        "embedded",
+                    ],
+                ]
+            )
 
             // Construct the test project.
             let files: [Path: String] = [
-                .root.join("tmp/Workspace/aProject/ProjectSettings.xcconfig"): (
-                    "GCC_PREPROCESSOR_DEFINITIONS = $(inherited) PROJECT_XCCONFIG_BASE=Generic\n" +
-                    "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphone*] = $(inherited) PROJECT_XCCONFIG_FLAVOR=iPhone\n" +
-                    "GCC_PREPROCESSOR_DEFINITIONS[sdk=appletv*] = $(inherited) PROJECT_XCCONFIG_FLAVOR=AppleTV\n" +
-                    "GCC_PREPROCESSOR_DEFINITIONS[sdk=watch*] = $(inherited) PROJECT_XCCONFIG_FLAVOR=Watch\n" +
-                    "GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS[sdk=embedded*] = $(inherited) PROJECT_XCCONFIG_FLAVOR=Embedded\n"
-                ),
-                .root.join("tmp/Workspace/aProject/TargetSettings.xcconfig"): (
-                    "GCC_PREPROCESSOR_DEFINITIONS = $(inherited) TARGET_XCCONFIG_BASE=Generic\n" +
-                    "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphone*] = $(inherited) TARGET_XCCONFIG_FLAVOR=iPhone\n" +
-                    "GCC_PREPROCESSOR_DEFINITIONS[sdk=appletv*] = $(inherited) TARGET_XCCONFIG_FLAVOR=AppleTV\n" +
-                    "GCC_PREPROCESSOR_DEFINITIONS[sdk=watch*] = $(inherited) TARGET_XCCONFIG_FLAVOR=Watch\n" +
-                    "GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS[sdk=embedded*][config=Debug] = $(inherited) TARGET_XCCONFIG_FLAVOR=Embedded\n"
-                ),
+                .root.join("tmp/Workspace/aProject/ProjectSettings.xcconfig"): ("GCC_PREPROCESSOR_DEFINITIONS = $(inherited) PROJECT_XCCONFIG_BASE=Generic\n" + "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphone*] = $(inherited) PROJECT_XCCONFIG_FLAVOR=iPhone\n" + "GCC_PREPROCESSOR_DEFINITIONS[sdk=appletv*] = $(inherited) PROJECT_XCCONFIG_FLAVOR=AppleTV\n" + "GCC_PREPROCESSOR_DEFINITIONS[sdk=watch*] = $(inherited) PROJECT_XCCONFIG_FLAVOR=Watch\n" + "GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS[sdk=embedded*] = $(inherited) PROJECT_XCCONFIG_FLAVOR=Embedded\n"),
+                .root.join("tmp/Workspace/aProject/TargetSettings.xcconfig"): ("GCC_PREPROCESSOR_DEFINITIONS = $(inherited) TARGET_XCCONFIG_BASE=Generic\n" + "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphone*] = $(inherited) TARGET_XCCONFIG_FLAVOR=iPhone\n" + "GCC_PREPROCESSOR_DEFINITIONS[sdk=appletv*] = $(inherited) TARGET_XCCONFIG_FLAVOR=AppleTV\n" + "GCC_PREPROCESSOR_DEFINITIONS[sdk=watch*] = $(inherited) TARGET_XCCONFIG_FLAVOR=Watch\n" + "GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS[sdk=embedded*][config=Debug] = $(inherited) TARGET_XCCONFIG_FLAVOR=Embedded\n"),
             ]
-            let testWorkspace = try TestWorkspace("Workspace",
-                                                  projects: [TestProject("aProject",
-                                                                         groupTree: TestGroup("Sources", children: [
-                                                                            TestFile("ProjectSettings.xcconfig"),
-                                                                            TestFile("TargetSettings.xcconfig"),
-                                                                            TestFile("Mock.cpp"),
-                                                                         ]),
-                                                                         buildConfigurations:[
-                                                                            TestBuildConfiguration("Debug", baseConfig: "ProjectSettings.xcconfig", buildSettings: [
-                                                                                "GCC_PREPROCESSOR_DEFINITIONS": "$(inherited) PROJECT_BASE=Generic",
-                                                                                "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphone*]": "$(inherited) PROJECT_FLAVOR=iPhone",
-                                                                                "GCC_PREPROCESSOR_DEFINITIONS[sdk=appletv*]": "$(inherited) PROJECT_FLAVOR=AppleTV",
-                                                                                "GCC_PREPROCESSOR_DEFINITIONS[sdk=watch*]": "$(inherited) PROJECT_FLAVOR=Watch",
-                                                                                "GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS[sdk=embedded*][arch=other-arch]": "$(inherited) PROJECT_FLAVOR=Embedded",
-                                                                            ])
-                                                                         ],
-                                                                         targets: [
-                                                                            TestStandardTarget("Target1",
-                                                                                               type: .application,
-                                                                                               buildConfigurations: [
-                                                                                                TestBuildConfiguration("Debug", baseConfig: "TargetSettings.xcconfig", buildSettings: [
-                                                                                                    "SDKROOT": "\(sdkPath.str)",
-                                                                                                    "GCC_PREPROCESSOR_DEFINITIONS": "$(inherited) TARGET_BASE=Generic",
-                                                                                                    "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphone*]": "$(inherited) TARGET_FLAVOR=iPhone",
-                                                                                                    "GCC_PREPROCESSOR_DEFINITIONS[sdk=appletv*]": "$(inherited) TARGET_FLAVOR=AppleTV",
-                                                                                                    "GCC_PREPROCESSOR_DEFINITIONS[sdk=watch*]": "$(inherited) TARGET_FLAVOR=Watch",
-                                                                                                    "GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS[sdk=embedded*]": "$(inherited) TARGET_FLAVOR=Embedded",
-                                                                                                ]
-                                                                                                                      )],
-                                                                                               buildPhases: [
-                                                                                                TestSourcesBuildPhase(["Mock.cpp"])
-                                                                                               ]
-                                                                                              ),
-                                                                         ])
-                                                  ]).load(await getCore())
+            let testWorkspace = try TestWorkspace(
+                "Workspace",
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile("ProjectSettings.xcconfig"),
+                                TestFile("TargetSettings.xcconfig"),
+                                TestFile("Mock.cpp"),
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                baseConfig: "ProjectSettings.xcconfig",
+                                buildSettings: [
+                                    "GCC_PREPROCESSOR_DEFINITIONS": "$(inherited) PROJECT_BASE=Generic",
+                                    "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphone*]": "$(inherited) PROJECT_FLAVOR=iPhone",
+                                    "GCC_PREPROCESSOR_DEFINITIONS[sdk=appletv*]": "$(inherited) PROJECT_FLAVOR=AppleTV",
+                                    "GCC_PREPROCESSOR_DEFINITIONS[sdk=watch*]": "$(inherited) PROJECT_FLAVOR=Watch",
+                                    "GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS[sdk=embedded*][arch=other-arch]": "$(inherited) PROJECT_FLAVOR=Embedded",
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "Target1",
+                                type: .application,
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        baseConfig: "TargetSettings.xcconfig",
+                                        buildSettings: [
+                                            "SDKROOT": "\(sdkPath.str)",
+                                            "GCC_PREPROCESSOR_DEFINITIONS": "$(inherited) TARGET_BASE=Generic",
+                                            "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphone*]": "$(inherited) TARGET_FLAVOR=iPhone",
+                                            "GCC_PREPROCESSOR_DEFINITIONS[sdk=appletv*]": "$(inherited) TARGET_FLAVOR=AppleTV",
+                                            "GCC_PREPROCESSOR_DEFINITIONS[sdk=watch*]": "$(inherited) TARGET_FLAVOR=Watch",
+                                            "GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS[sdk=embedded*]": "$(inherited) TARGET_FLAVOR=Embedded",
+                                        ]
+                                    )
+                                ],
+                                buildPhases: [
+                                    TestSourcesBuildPhase(["Mock.cpp"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            ).load(await getCore())
             let context = try await contextForTestData(testWorkspace, files: files)
             let buildRequestContext = BuildRequestContext(workspaceContext: context)
             let testProject = context.workspace.projects[0]
@@ -2719,36 +3207,47 @@ import SWBTestSupport
     func settingsIssues() async throws {
         do {
             // Construct the test project.
-            let testWorkspace = try await TestWorkspace("Workspace",
-                                                        projects: [TestProject("aProject",
-                                                                               groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
-                                                                               buildConfigurations:[
-                                                                                TestBuildConfiguration("Debug", buildSettings: [:])
-                                                                               ],
-                                                                               targets: [
-                                                                                TestStandardTarget("Target1",
-                                                                                                   type: .application,
-                                                                                                   buildConfigurations: [
-                                                                                                    TestBuildConfiguration("Debug", buildSettings: [
-                                                                                                        "SDKROOT": "bogus",
-                                                                                                    ]
-                                                                                                                          )],
-                                                                                                   buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
-                                                                                                  ),
-                                                                               ])
-                                                        ]).load(getCore())
-            let context = try await contextForTestData(testWorkspace)
-            let buildRequestContext = BuildRequestContext(workspaceContext: context)
-            let testProject = context.workspace.projects[0]
-            let testTarget = testProject.targets[0]
-
+            let testWorkspace = try await TestWorkspace(
+                "Workspace",
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug", buildSettings: [:])
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "Target1",
+                                type: .application,
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "SDKROOT": "bogus"
+                                        ]
+                                    )
+                                ],
+                                buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                            )
+                        ]
+                    )
+                ]
+            ).load(getCore())
+            let context = try await contextForTestData(testWorkspace)
+            let buildRequestContext = BuildRequestContext(workspaceContext: context)
+            let testProject = context.workspace.projects[0]
+            let testTarget = testProject.targets[0]
+
             // Create the settings and check for expected issues.
             let parameters = BuildParameters(action: .build, configuration: "Debug", overrides: [:])
             let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: testProject, target: testTarget)
-            #expect(settings.errors == [
-                "unable to resolve product type \'com.apple.product-type.application\'",
-                "unable to find sdk \'bogus\'",
-            ])
+            #expect(
+                settings.errors == [
+                    "unable to resolve product type \'com.apple.product-type.application\'",
+                    "unable to find sdk \'bogus\'",
+                ]
+            )
         }
     }
 
@@ -2757,26 +3256,36 @@ import SWBTestSupport
         // A test project which uses a deprecated WatchKit 1.0 spec.
         do {
             // Construct the test project.
-            let testWorkspace = try await TestWorkspace("Workspace",
-                                                        projects: [TestProject("aProject",
-                                                                               groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
-                                                                               buildConfigurations:[
-                                                                                TestBuildConfiguration("Debug", buildSettings: [:])
-                                                                               ],
-                                                                               targets: [
-                                                                                TestStandardTarget("Target1",
-                                                                                                   guid: nil,
-                                                                                                   type: .watchKit1App,
-                                                                                                   buildConfigurations: [
-                                                                                                    TestBuildConfiguration("Debug", buildSettings: [
-                                                                                                        "SDKROOT": "iphoneos",
-                                                                                                        "IPHONEOS_DEPLOYMENT_TARGET": "9.0",
-                                                                                                        "TARGETED_DEVICE_FAMILY": "1,2",
-                                                                                                    ]
-                                                                                                                          )],
-                                                                                                   buildPhases: [TestSourcesBuildPhase(["main.swift"])])
-                                                                               ])
-                                                        ]).load(getCore())
+            let testWorkspace = try await TestWorkspace(
+                "Workspace",
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug", buildSettings: [:])
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "Target1",
+                                guid: nil,
+                                type: .watchKit1App,
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "SDKROOT": "iphoneos",
+                                            "IPHONEOS_DEPLOYMENT_TARGET": "9.0",
+                                            "TARGETED_DEVICE_FAMILY": "1,2",
+                                        ]
+                                    )
+                                ],
+                                buildPhases: [TestSourcesBuildPhase(["main.swift"])]
+                            )
+                        ]
+                    )
+                ]
+            ).load(getCore())
             let context = try await contextForTestData(testWorkspace)
             let buildRequestContext = BuildRequestContext(workspaceContext: context)
             let testProject = context.workspace.projects[0]
@@ -2794,30 +3303,37 @@ import SWBTestSupport
     func previews() async throws {
         let testWorkspace = try await TestWorkspace(
             "Workspace",
-            projects: [TestProject(
-                "aProject",
-                groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
-                buildConfigurations:[
-                    TestBuildConfiguration("Debug", buildSettings: [:])
-                ],
-                targets: [
-                    TestStandardTarget(
-                        "Target1",
-                        guid: nil,
-                        type: .application,
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "SDKROOT": "iphoneos",
-                                "SWIFT_VERSION": "5",
-                                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                                "ENABLE_PREVIEWS": "YES",
-                                "ENABLE_DEBUG_DYLIB": "YES",
-                                "ENABLE_THREAD_SANITIZER": "YES",
-                            ]
-                                                  )],
-                        buildPhases: [TestSourcesBuildPhase(["main.swift"])])
-                ])
-            ]).load(getCore())
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
+                    buildConfigurations: [
+                        TestBuildConfiguration("Debug", buildSettings: [:])
+                    ],
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            guid: nil,
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "iphoneos",
+                                        "SWIFT_VERSION": "5",
+                                        "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                                        "ENABLE_PREVIEWS": "YES",
+                                        "ENABLE_DEBUG_DYLIB": "YES",
+                                        "ENABLE_THREAD_SANITIZER": "YES",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["main.swift"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -2838,31 +3354,38 @@ import SWBTestSupport
     func previewsXOJIT() async throws {
         let testWorkspace = try await TestWorkspace(
             "Workspace",
-            projects: [TestProject(
-                "aProject",
-                groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
-                buildConfigurations:[
-                    TestBuildConfiguration("Debug", buildSettings: [:])
-                ],
-                targets: [
-                    TestStandardTarget(
-                        "Target1",
-                        guid: nil,
-                        type: .application,
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "SDKROOT": "iphoneos",
-                                "SWIFT_VERSION": "5",
-                                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                                "ENABLE_XOJIT_PREVIEWS": "YES",
-                                "ENABLE_DEBUG_DYLIB": "YES",
-                                "ENABLE_THREAD_SANITIZER": "YES",
-                                "PRODUCT_NAME": "Target1",
-                            ]
-                                                  )],
-                        buildPhases: [TestSourcesBuildPhase(["main.swift"])])
-                ])
-            ]).load(getCore())
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
+                    buildConfigurations: [
+                        TestBuildConfiguration("Debug", buildSettings: [:])
+                    ],
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            guid: nil,
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "iphoneos",
+                                        "SWIFT_VERSION": "5",
+                                        "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                                        "ENABLE_XOJIT_PREVIEWS": "YES",
+                                        "ENABLE_DEBUG_DYLIB": "YES",
+                                        "ENABLE_THREAD_SANITIZER": "YES",
+                                        "PRODUCT_NAME": "Target1",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["main.swift"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -2883,32 +3406,39 @@ import SWBTestSupport
     func previewsXOJITWithAnLDClientName() async throws {
         let testWorkspace = try await TestWorkspace(
             "Workspace",
-            projects: [TestProject(
-                "aProject",
-                groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
-                buildConfigurations:[
-                    TestBuildConfiguration("Debug", buildSettings: [:])
-                ],
-                targets: [
-                    TestStandardTarget(
-                        "Target1",
-                        guid: nil,
-                        type: .application,
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "SDKROOT": "iphoneos",
-                                "SWIFT_VERSION": "5",
-                                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                                "ENABLE_XOJIT_PREVIEWS": "YES",
-                                "ENABLE_DEBUG_DYLIB": "YES",
-                                "ENABLE_THREAD_SANITIZER": "YES",
-                                "LD_CLIENT_NAME": "MyOtherClient",
-                                "PRODUCT_NAME": "Target1",
-                            ]
-                                                  )],
-                        buildPhases: [TestSourcesBuildPhase(["main.swift"])])
-                ])
-            ]).load(getCore())
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
+                    buildConfigurations: [
+                        TestBuildConfiguration("Debug", buildSettings: [:])
+                    ],
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            guid: nil,
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "iphoneos",
+                                        "SWIFT_VERSION": "5",
+                                        "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                                        "ENABLE_XOJIT_PREVIEWS": "YES",
+                                        "ENABLE_DEBUG_DYLIB": "YES",
+                                        "ENABLE_THREAD_SANITIZER": "YES",
+                                        "LD_CLIENT_NAME": "MyOtherClient",
+                                        "PRODUCT_NAME": "Target1",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["main.swift"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -2932,62 +3462,77 @@ import SWBTestSupport
     func previewsEnablingDisabling() async throws {
         let testWorkspace = try await TestWorkspace(
             "Workspace",
-            projects: [TestProject(
-                "aProject",
-                groupTree: TestGroup(
-                    "SomeFiles",
-                    children: [
-                        TestFile("main.swift"),
-                    ]
-                ),
-                buildConfigurations:[
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ENABLE_PREVIEWS": "YES",
-                        "SDKROOT": "iphoneos",
-                    ])
-                ],
-                targets: [
-                    // Should be on
-                    TestStandardTarget(
-                        "Target-on",
-                        type: .application,
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "SWIFT_VERSION": "5",
-                                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                                "ENABLE_PREVIEWS_EXPECTED": "YES",
-                            ]),
-                        ],
-                        buildPhases: [TestSourcesBuildPhase(["main.swift"])]
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup(
+                        "SomeFiles",
+                        children: [
+                            TestFile("main.swift")
+                        ]
                     ),
-
-                    // Should be off due to Opt Level
-                    TestStandardTarget(
-                        "Target-opt-level",
-                        type: .application,
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "SWIFT_VERSION": "5",
-                                "SWIFT_OPTIMIZATION_LEVEL": "-O",
-                                "ENABLE_PREVIEWS_EXPECTED": "NO",
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ENABLE_PREVIEWS": "YES",
+                                "SDKROOT": "iphoneos",
                             ]
-                                                  )],
-                        buildPhases: [TestSourcesBuildPhase(["main.swift"])]
-                    ),
+                        )
+                    ],
+                    targets: [
+                        // Should be on
+                        TestStandardTarget(
+                            "Target-on",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SWIFT_VERSION": "5",
+                                        "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                                        "ENABLE_PREVIEWS_EXPECTED": "YES",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["main.swift"])]
+                        ),
 
-                    // Should be off because no Swift version
-                    TestStandardTarget(
-                        "Target-no-swift",
-                        type: .application,
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "ENABLE_PREVIEWS_EXPECTED": "NO",
-                            ]
-                                                  )],
-                        buildPhases: [TestSourcesBuildPhase(["main.swift"])]
-                    ),
-                ])
-            ]).load(getCore())
+                        // Should be off due to Opt Level
+                        TestStandardTarget(
+                            "Target-opt-level",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SWIFT_VERSION": "5",
+                                        "SWIFT_OPTIMIZATION_LEVEL": "-O",
+                                        "ENABLE_PREVIEWS_EXPECTED": "NO",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["main.swift"])]
+                        ),
+
+                        // Should be off because no Swift version
+                        TestStandardTarget(
+                            "Target-no-swift",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "ENABLE_PREVIEWS_EXPECTED": "NO"
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["main.swift"])]
+                        ),
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -3003,8 +3548,7 @@ import SWBTestSupport
             if !expected {
                 // We do not currently emit any reasons for disabling in the notes.
                 #expect(settings.notes == [])
-            }
-            else {
+            } else {
                 #expect(settings.notes == [])
             }
         }
@@ -3023,59 +3567,71 @@ import SWBTestSupport
     func previewsDisablingHardenedRuntimeWithAdHocSigning() async throws {
         let testWorkspace = try await TestWorkspace(
             "Workspace",
-            projects: [TestProject(
-                "aProject",
-                groupTree: TestGroup(
-                    "SomeFiles",
-                    children: [
-                        TestFile("main.swift"),
-                    ]
-                ),
-                buildConfigurations:[
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "iphoneos",
-                    ])
-                ],
-                targets: [
-                    // Should be left alone
-                    TestStandardTarget(
-                        "Target-on",
-                        type: .application,
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "SWIFT_VERSION": "5",
-                                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                                "ENABLE_HARDENED_RUNTIME": "YES",
-                                "MACH_O_TYPE": "mh_execute",
-                                "ENABLE_XOJIT_PREVIEWS": "YES",
-                                "CODE_SIGN_IDENTITY": "An Engineer",
-
-                                "ENABLE_HARDENED_RUNTIME_EXPECTED": "YES",
-                            ]),
-                        ],
-                        buildPhases: [TestSourcesBuildPhase(["main.swift"])]
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup(
+                        "SomeFiles",
+                        children: [
+                            TestFile("main.swift")
+                        ]
                     ),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "iphoneos"
+                            ]
+                        )
+                    ],
+                    targets: [
+                        // Should be left alone
+                        TestStandardTarget(
+                            "Target-on",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SWIFT_VERSION": "5",
+                                        "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                                        "ENABLE_HARDENED_RUNTIME": "YES",
+                                        "MACH_O_TYPE": "mh_execute",
+                                        "ENABLE_XOJIT_PREVIEWS": "YES",
+                                        "CODE_SIGN_IDENTITY": "An Engineer",
+
+                                        "ENABLE_HARDENED_RUNTIME_EXPECTED": "YES",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["main.swift"])]
+                        ),
 
-                    // Should be force disabled
-                    TestStandardTarget(
-                        "Target-off",
-                        type: .application,
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "SWIFT_VERSION": "5",
-                                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                                "ENABLE_HARDENED_RUNTIME": "YES",
-                                "MACH_O_TYPE": "mh_execute",
-                                "ENABLE_XOJIT_PREVIEWS": "YES",
-                                "CODE_SIGN_IDENTITY": "-",
-
-                                "ENABLE_HARDENED_RUNTIME_EXPECTED": "NO",
-                            ]),
-                        ],
-                        buildPhases: [TestSourcesBuildPhase(["main.swift"])]
-                    ),
-                ])
-            ]).load(getCore())
+                        // Should be force disabled
+                        TestStandardTarget(
+                            "Target-off",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SWIFT_VERSION": "5",
+                                        "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                                        "ENABLE_HARDENED_RUNTIME": "YES",
+                                        "MACH_O_TYPE": "mh_execute",
+                                        "ENABLE_XOJIT_PREVIEWS": "YES",
+                                        "CODE_SIGN_IDENTITY": "-",
+
+                                        "ENABLE_HARDENED_RUNTIME_EXPECTED": "NO",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["main.swift"])]
+                        ),
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -3099,8 +3655,7 @@ import SWBTestSupport
             if expected {
                 #expect(actual, "Hardened runtime should remain enabled")
                 #expect(settings.notes == [])
-            }
-            else {
+            } else {
                 #expect(!actual, "Hardened runtime should be disabled when ad-hoc signed")
                 #expect(settings.notes == ["Disabling hardened runtime with ad-hoc codesigning."])
             }
@@ -3109,31 +3664,50 @@ import SWBTestSupport
 
     @Test(.requireSDKs(.macOS))
     func impartedProperties() async throws {
-        let testWorkspace = try await TestWorkspace("Workspace",
-                                                    projects: [TestPackageProject("aProject",
-                                                                                  groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
-                                                                                  buildConfigurations:[
-                                                                                    TestBuildConfiguration("Config1", buildSettings: [
-                                                                                        "USER_PROJECT_SETTING": "USER_PROJECT_VALUE",
-                                                                                        "HEADER_SEARCH_PATHS": "$(inherited) $(SRCROOT)/include /usr/include .",
-                                                                                        "FRAMEWORK_SEARCH_PATHS": "$(inherited) /System/Library/Frameworks /Applications/Xcode.app /usr",
-                                                                                        "OTHER_LDFLAGS": "-current_version 2.0",
-                                                                                    ])],
-                                                                                  targets: [
-                                                                                    TestStandardTarget("Target1",
-                                                                                                       type: .application,
-                                                                                                       buildConfigurations: [
-                                                                                                        TestBuildConfiguration("Config1", buildSettings: [
-                                                                                                            "BUILD_VARIANTS": "normal other",
-                                                                                                            "ENABLE_TESTABILITY": "YES",
-                                                                                                            "INSTALL_PATH": "",
-                                                                                                            // Use this to check conditions end to end.
-                                                                                                            "PRODUCT_NAME[sdk=macosx*]": "Foo",
-                                                                                                            "USER_TARGET_SETTING": "USER_TARGET_VALUE"])],
-                                                                                                       buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])])])]).load(getCore())
-        let context = try await contextForTestData(testWorkspace,
+        let testWorkspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestPackageProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Config1",
+                            buildSettings: [
+                                "USER_PROJECT_SETTING": "USER_PROJECT_VALUE",
+                                "HEADER_SEARCH_PATHS": "$(inherited) $(SRCROOT)/include /usr/include .",
+                                "FRAMEWORK_SEARCH_PATHS": "$(inherited) /System/Library/Frameworks /Applications/Xcode.app /usr",
+                                "OTHER_LDFLAGS": "-current_version 2.0",
+                            ]
+                        )
+                    ],
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Config1",
+                                    buildSettings: [
+                                        "BUILD_VARIANTS": "normal other",
+                                        "ENABLE_TESTABILITY": "YES",
+                                        "INSTALL_PATH": "",
+                                        // Use this to check conditions end to end.
+                                        "PRODUCT_NAME[sdk=macosx*]": "Foo",
+                                        "USER_TARGET_SETTING": "USER_TARGET_VALUE",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
+        let context = try await contextForTestData(
+            testWorkspace,
             environment: [
-                "RC_ARCHS": "x86_64 x86_64h",
+                "RC_ARCHS": "x86_64 x86_64h"
             ],
             files: [:]
         )
@@ -3170,52 +3744,59 @@ import SWBTestSupport
         try await withTemporaryDirectory { sdksDirPath in
             let sdkPath = sdksDirPath.join("TestSDK.sdk")
             let sdkIdentifier = "macosx"
-            try await writeSDK(name: sdkPath.basename, parentDir: sdksDirPath, settings: [
-                "CanonicalName": .plString(sdkIdentifier),
-                "Version": "1.0",
-                "IsBaseSDK": "Yes",
-                "DefaultProperties": [
-                    "MACOSX_DEPLOYMENT_TARGET": "10.14",
-                    "PLATFORM_NAME": "macosx",
-                ],
-                "DefaultVariant": "default",
-                "Variants": [
-                    [   "Name": "iosmac",
-                        "BuildSettings": [:] as PropertyListItem,
-                    ] as PropertyListItem,
-                    [   "Name": "trooper",
-                        "BuildSettings": [
-                            "MACOSX_DEPLOYMENT_TARGET": "10.14",
-                        ],
-                    ] as PropertyListItem,
-                    [   "Name": "default",
-                        "BuildSettings": [:] as PropertyListItem,
-                    ] as PropertyListItem
-                ],
-                "SupportedTargets": [
-                    "iosmac": [
-                        "DefaultDeploymentTarget": "13.0",
-                        "MinimumDeploymentTarget": "13.0",
-                        "MaximumDeploymentTarget": "13.99",
+            try await writeSDK(
+                name: sdkPath.basename,
+                parentDir: sdksDirPath,
+                settings: [
+                    "CanonicalName": .plString(sdkIdentifier),
+                    "Version": "1.0",
+                    "IsBaseSDK": "Yes",
+                    "DefaultProperties": [
+                        "MACOSX_DEPLOYMENT_TARGET": "10.14",
+                        "PLATFORM_NAME": "macosx",
                     ],
-                    "trooper": [:] as PropertyListItem,
-                    "default": [:] as PropertyListItem,
-                ],
-                "VersionMap": [
-                    "iOSMac_macOS": [
-                        "13.0": "10.15",
-                        "13.1": "10.15.1",
-                        "14.0": "11.0",
-                        "90.0": "87.0"
+                    "DefaultVariant": "default",
+                    "Variants": [
+                        [
+                            "Name": "iosmac",
+                            "BuildSettings": [:] as PropertyListItem,
+                        ] as PropertyListItem,
+                        [
+                            "Name": "trooper",
+                            "BuildSettings": [
+                                "MACOSX_DEPLOYMENT_TARGET": "10.14"
+                            ],
+                        ] as PropertyListItem,
+                        [
+                            "Name": "default",
+                            "BuildSettings": [:] as PropertyListItem,
+                        ] as PropertyListItem,
                     ],
-                    "macOS_iOSMac": [
-                        "10.15": "13.0",
-                        "10.15.1": "13.1",
-                        "11.0": "14.0",
-                        "87.0": "90.0",
+                    "SupportedTargets": [
+                        "iosmac": [
+                            "DefaultDeploymentTarget": "13.0",
+                            "MinimumDeploymentTarget": "13.0",
+                            "MaximumDeploymentTarget": "13.99",
+                        ],
+                        "trooper": [:] as PropertyListItem,
+                        "default": [:] as PropertyListItem,
+                    ],
+                    "VersionMap": [
+                        "iOSMac_macOS": [
+                            "13.0": "10.15",
+                            "13.1": "10.15.1",
+                            "14.0": "11.0",
+                            "90.0": "87.0",
+                        ],
+                        "macOS_iOSMac": [
+                            "10.15": "13.0",
+                            "10.15.1": "13.1",
+                            "11.0": "14.0",
+                            "87.0": "90.0",
+                        ],
                     ],
                 ]
-            ])
+            )
 
             // Get platform properties relevant to tests.
             guard let macOSPlatform = core.platformRegistry.lookup(name: "macosx") else {
@@ -3233,9 +3814,7 @@ import SWBTestSupport
 
             // Construct the test project.
             let files: [Path: String] = [
-                .root.join("tmp/Workspace/aProject/ProjectSettings.xcconfig"): (
-                    "IPHONEOS_DEPLOYMENT_TARGET=13.0\n"
-                ),
+                .root.join("tmp/Workspace/aProject/ProjectSettings.xcconfig"): ("IPHONEOS_DEPLOYMENT_TARGET=13.0\n")
             ]
 
             typealias DeploymentTargetTestCaseData = (
@@ -3245,261 +3824,319 @@ import SWBTestSupport
                 expectedWarnings: [String],
                 expectedErrors: [String]
             )
-            let targets = [
-                // Non-macCatalyst case: The effective macOS deployment target should be the one in the SDK.
-                (
-                    TestStandardTarget("Target1",
-                                       type: .application,
-                                       buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: [
-                                            "SDKROOT": "\(sdkPath.str)",
-                                        ]
-                                                              )],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase(["Mock.cpp"])
-                                       ]
-                                      ),
-                    "10.14",
-                    nil,
-                    [],
-                    []
-                ),
-                // macCatalyst case: The iOS deployment target should be the value from the macCatalyst target info, and the macOS deployment target should match it since we're building an unzippered target.
-                (
-                    TestStandardTarget("Target2",
-                                       type: .application,
-                                       buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: [
-                                            "SDKROOT": "\(sdkPath.str)",
-                                            "SDK_VARIANT": MacCatalystInfo.sdkVariantName,
-                                        ]
-                                                              )],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase(["Mock.cpp"])
-                                       ]
-                                      ),
-                    "10.15",
-                    "13.0",
-                    [],
-                    []
-                ),
-                // macCatalyst case: The iOS deployment target should be the value from the macCatalyst target info, and the macOS deployment target should match it since we're building an unzippered target.
-                (
-                    TestStandardTarget("Target3",
-                                       type: .application,
-                                       buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: [
-                                            "SDKROOT": "\(sdkPath.str)",
-                                            "MACOSX_DEPLOYMENT_TARGET": "",
-                                            "SDK_VARIANT": MacCatalystInfo.sdkVariantName,
-                                        ]
-                                                              )],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase(["Mock.cpp"])
-                                       ]
-                                      ),
-                    "10.15",
-                    "13.0",
-                    [],
-                    []
-                ),
-                // Non-macCatalyst case: The effective macOS deployment target should be the one from the "trooper" SDK variant.
-                (
-                    TestStandardTarget("Target4",
-                                       type: .application,
-                                       buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: [
-                                            "SDKROOT": "\(sdkPath.str)",
-                                            "SDK_VARIANT": "trooper",
-                                        ]
-                                                              )],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase(["Mock.cpp"])
-                                       ]
-                                      ),
-                    "10.14",
-                    nil,
-                    [],
-                    []
-                ),
-                // Non-macCatalyst case: The effective macOS deployment target should be the one defined in this target.
-                (
-                    TestStandardTarget("Target5",
-                                       type: .application,
-                                       buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: [
-                                            "SDKROOT": "\(sdkPath.str)",
-                                            "MACOSX_DEPLOYMENT_TARGET": "101",
-                                        ]
-                                                              )],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase(["Mock.cpp"])
-                                       ]
-                                      ),
-                    "101",
-                    nil,
-                    ["[targetIntegrity] The macOS deployment target \'MACOSX_DEPLOYMENT_TARGET\' is set to 101, but the range of supported deployment target versions is \(platformMinDeploymentTarget) to \(platformMaxDeploymentTarget). (in target 'Target5' from project 'aProject')"],
-                    []
-                ),
-                // macCatalyst case: The iOS deployment target should be the value from the macCatalyst target info, and the macOS deployment target should match it since we're building an unzippered target.
-                (
-                    TestStandardTarget("Target6",
-                                       type: .application,
-                                       buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: [
-                                            "SDKROOT": "\(sdkPath.str)",
-                                            "MACOSX_DEPLOYMENT_TARGET": "10.18",
-                                            "SDK_VARIANT": MacCatalystInfo.sdkVariantName,
-                                        ]
-                                                              )],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase(["Mock.cpp"])
-                                       ]
-                                      ),
-                    "10.15",
-                    "13.0",
-                    [],
-                    []
-                ),
-                // macCatalyst case: The iOS deployment target should be the value from defined in the target, and the macOS deployment target should match it since we're building an unzippered target.
-                (
-                    TestStandardTarget("Target7",
-                                       type: .application,
-                                       buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: [
-                                            "SDKROOT": "\(sdkPath.str)",
-                                            "IPHONEOS_DEPLOYMENT_TARGET": "90.0",
-                                            "SDK_VARIANT": MacCatalystInfo.sdkVariantName,
-                                        ]
-                                                              )],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase(["Mock.cpp"])
-                                       ]
-                                      ),
-                    "87.0",
-                    "90.0",
-                    ["[targetIntegrity] The Mac Catalyst deployment target \'IPHONEOS_DEPLOYMENT_TARGET\' is set to 90.0, but the range of supported deployment target versions is 13.0 to 13.99. (in target 'Target7' from project 'aProject')",
-                     "[targetIntegrity] The macOS deployment target \'MACOSX_DEPLOYMENT_TARGET\' is set to 87.0, but the range of supported deployment target versions is \(platformMinDeploymentTarget) to \(platformMaxDeploymentTarget). (in target 'Target7' from project 'aProject')"],
-                    []
-                ),
-                // macCatalyst case: The iOS deployment target should be the value from defined in the target, and the macOS deployment target should match it since we're building an unzippered target.
-                (
-                    TestStandardTarget("Target8",
-                                       type: .application,
-                                       buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: [
-                                            "SDKROOT": "\(sdkPath.str)",
-                                            "IPHONEOS_DEPLOYMENT_TARGET": "13.1",
-                                            "SDK_VARIANT": MacCatalystInfo.sdkVariantName,
-                                        ]
-                                                              )],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase(["Mock.cpp"])
-                                       ]
-                                      ),
-                    "10.15.1",
-                    "13.1",
-                    [],
-                    []
-                ),
-                // Non-macCatalyst case: Since this is a zippered target, both the iOS and macOS deployment targets defined in the target should be preserved.
-                (
-                    TestStandardTarget("Target9",
-                                       type: .application,
-                                       buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: [
-                                            "SDKROOT": "\(sdkPath.str)",
-                                            "MACOSX_DEPLOYMENT_TARGET": "10.13",
-                                            "IPHONEOS_DEPLOYMENT_TARGET": "13.0",
-                                            "IS_ZIPPERED": "YES",
-                                        ]
-                                                              )],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase(["Mock.cpp"])
-                                       ]
-                                      ),
-                    "10.13",
-                    "13.0",
-                    [],
-                    []
-                ),
-                // macCatalyst case: Since this is a zippered target, both the iOS and macOS deployment targets defined in the target should be preserved.
-                (
-                    TestStandardTarget("Target10",
-                                       type: .application,
-                                       buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: [
-                                            "SDKROOT": "\(sdkPath.str)",
-                                            "MACOSX_DEPLOYMENT_TARGET": "10.13",
-                                            "IPHONEOS_DEPLOYMENT_TARGET": "13.0",
-                                            "SDK_VARIANT": MacCatalystInfo.sdkVariantName,
-                                            "IS_ZIPPERED": "YES",
-                                        ]
-                                                              )],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase(["Mock.cpp"])
-                                       ]
-                                      ),
-                    "10.13",
-                    "13.0",
-                    [],
-                    []
-                ),
-                // Non-macCatalyst case: Since this is a zippered target, the macOS deployment target defined in the target should be preserved, but the iOS deployment target should be set to the lower limit.
-                (
-                    TestStandardTarget("Target11",
-                                       type: .application,
-                                       buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: [
-                                            "SDKROOT": "\(sdkPath.str)",
-                                            "MACOSX_DEPLOYMENT_TARGET": "10.13",
-                                            "IPHONEOS_DEPLOYMENT_TARGET": "10.0",
-                                            "IS_ZIPPERED": "YES",
-                                        ]
-                                                              )],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase(["Mock.cpp"])
-                                       ]
-                                      ),
-                    "10.13",
-                    "13.0",
-                    [],
-                    []
-                ),
-                // Non-macCatalyst case: Since this is a zippered target, the macOS deployment target defined in the target should be preserved, and the iOS deployment target should be derived from it.
-                (
-                    TestStandardTarget("Target12",
-                                       type: .application,
-                                       buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: [
-                                            "SDKROOT": "\(sdkPath.str)",
-                                            "MACOSX_DEPLOYMENT_TARGET": "10.15.1",
-                                            "IPHONEOS_DEPLOYMENT_TARGET": "",
-                                            "IS_ZIPPERED": "YES",
-                                        ]
-                                                              )],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase(["Mock.cpp"])
-                                       ]
-                                      ),
-                    "10.15.1",
-                    "13.1",
-                    [],
-                    []
-                ),
-            ] as [DeploymentTargetTestCaseData]
-            let testWorkspace = try TestWorkspace("Workspace",
-                                                  projects: [TestProject("aProject",
-                                                                         groupTree: TestGroup("Sources", children: [
-                                                                            TestFile("ProjectSettings.xcconfig"),
-                                                                            TestFile("Mock.cpp"),
-                                                                         ]),
-                                                                         buildConfigurations:[
-                                                                            TestBuildConfiguration("Debug", baseConfig: "ProjectSettings.xcconfig", buildSettings: [:])
-                                                                         ],
-                                                                         targets: targets.map({ $0.target })
-                                                                        )
-                                                  ]).load(core)
+            let targets =
+                [
+                    // Non-macCatalyst case: The effective macOS deployment target should be the one in the SDK.
+                    (
+                        TestStandardTarget(
+                            "Target1",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "\(sdkPath.str)"
+                                    ]
+                                )
+                            ],
+                            buildPhases: [
+                                TestSourcesBuildPhase(["Mock.cpp"])
+                            ]
+                        ),
+                        "10.14",
+                        nil,
+                        [],
+                        []
+                    ),
+                    // macCatalyst case: The iOS deployment target should be the value from the macCatalyst target info, and the macOS deployment target should match it since we're building an unzippered target.
+                    (
+                        TestStandardTarget(
+                            "Target2",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "\(sdkPath.str)",
+                                        "SDK_VARIANT": MacCatalystInfo.sdkVariantName,
+                                    ]
+                                )
+                            ],
+                            buildPhases: [
+                                TestSourcesBuildPhase(["Mock.cpp"])
+                            ]
+                        ),
+                        "10.15",
+                        "13.0",
+                        [],
+                        []
+                    ),
+                    // macCatalyst case: The iOS deployment target should be the value from the macCatalyst target info, and the macOS deployment target should match it since we're building an unzippered target.
+                    (
+                        TestStandardTarget(
+                            "Target3",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "\(sdkPath.str)",
+                                        "MACOSX_DEPLOYMENT_TARGET": "",
+                                        "SDK_VARIANT": MacCatalystInfo.sdkVariantName,
+                                    ]
+                                )
+                            ],
+                            buildPhases: [
+                                TestSourcesBuildPhase(["Mock.cpp"])
+                            ]
+                        ),
+                        "10.15",
+                        "13.0",
+                        [],
+                        []
+                    ),
+                    // Non-macCatalyst case: The effective macOS deployment target should be the one from the "trooper" SDK variant.
+                    (
+                        TestStandardTarget(
+                            "Target4",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "\(sdkPath.str)",
+                                        "SDK_VARIANT": "trooper",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [
+                                TestSourcesBuildPhase(["Mock.cpp"])
+                            ]
+                        ),
+                        "10.14",
+                        nil,
+                        [],
+                        []
+                    ),
+                    // Non-macCatalyst case: The effective macOS deployment target should be the one defined in this target.
+                    (
+                        TestStandardTarget(
+                            "Target5",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "\(sdkPath.str)",
+                                        "MACOSX_DEPLOYMENT_TARGET": "101",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [
+                                TestSourcesBuildPhase(["Mock.cpp"])
+                            ]
+                        ),
+                        "101",
+                        nil,
+                        ["[targetIntegrity] The macOS deployment target \'MACOSX_DEPLOYMENT_TARGET\' is set to 101, but the range of supported deployment target versions is \(platformMinDeploymentTarget) to \(platformMaxDeploymentTarget). (in target 'Target5' from project 'aProject')"],
+                        []
+                    ),
+                    // macCatalyst case: The iOS deployment target should be the value from the macCatalyst target info, and the macOS deployment target should match it since we're building an unzippered target.
+                    (
+                        TestStandardTarget(
+                            "Target6",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "\(sdkPath.str)",
+                                        "MACOSX_DEPLOYMENT_TARGET": "10.18",
+                                        "SDK_VARIANT": MacCatalystInfo.sdkVariantName,
+                                    ]
+                                )
+                            ],
+                            buildPhases: [
+                                TestSourcesBuildPhase(["Mock.cpp"])
+                            ]
+                        ),
+                        "10.15",
+                        "13.0",
+                        [],
+                        []
+                    ),
+                    // macCatalyst case: The iOS deployment target should be the value from defined in the target, and the macOS deployment target should match it since we're building an unzippered target.
+                    (
+                        TestStandardTarget(
+                            "Target7",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "\(sdkPath.str)",
+                                        "IPHONEOS_DEPLOYMENT_TARGET": "90.0",
+                                        "SDK_VARIANT": MacCatalystInfo.sdkVariantName,
+                                    ]
+                                )
+                            ],
+                            buildPhases: [
+                                TestSourcesBuildPhase(["Mock.cpp"])
+                            ]
+                        ),
+                        "87.0",
+                        "90.0",
+                        [
+                            "[targetIntegrity] The Mac Catalyst deployment target \'IPHONEOS_DEPLOYMENT_TARGET\' is set to 90.0, but the range of supported deployment target versions is 13.0 to 13.99. (in target 'Target7' from project 'aProject')",
+                            "[targetIntegrity] The macOS deployment target \'MACOSX_DEPLOYMENT_TARGET\' is set to 87.0, but the range of supported deployment target versions is \(platformMinDeploymentTarget) to \(platformMaxDeploymentTarget). (in target 'Target7' from project 'aProject')",
+                        ],
+                        []
+                    ),
+                    // macCatalyst case: The iOS deployment target should be the value from defined in the target, and the macOS deployment target should match it since we're building an unzippered target.
+                    (
+                        TestStandardTarget(
+                            "Target8",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "\(sdkPath.str)",
+                                        "IPHONEOS_DEPLOYMENT_TARGET": "13.1",
+                                        "SDK_VARIANT": MacCatalystInfo.sdkVariantName,
+                                    ]
+                                )
+                            ],
+                            buildPhases: [
+                                TestSourcesBuildPhase(["Mock.cpp"])
+                            ]
+                        ),
+                        "10.15.1",
+                        "13.1",
+                        [],
+                        []
+                    ),
+                    // Non-macCatalyst case: Since this is a zippered target, both the iOS and macOS deployment targets defined in the target should be preserved.
+                    (
+                        TestStandardTarget(
+                            "Target9",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "\(sdkPath.str)",
+                                        "MACOSX_DEPLOYMENT_TARGET": "10.13",
+                                        "IPHONEOS_DEPLOYMENT_TARGET": "13.0",
+                                        "IS_ZIPPERED": "YES",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [
+                                TestSourcesBuildPhase(["Mock.cpp"])
+                            ]
+                        ),
+                        "10.13",
+                        "13.0",
+                        [],
+                        []
+                    ),
+                    // macCatalyst case: Since this is a zippered target, both the iOS and macOS deployment targets defined in the target should be preserved.
+                    (
+                        TestStandardTarget(
+                            "Target10",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "\(sdkPath.str)",
+                                        "MACOSX_DEPLOYMENT_TARGET": "10.13",
+                                        "IPHONEOS_DEPLOYMENT_TARGET": "13.0",
+                                        "SDK_VARIANT": MacCatalystInfo.sdkVariantName,
+                                        "IS_ZIPPERED": "YES",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [
+                                TestSourcesBuildPhase(["Mock.cpp"])
+                            ]
+                        ),
+                        "10.13",
+                        "13.0",
+                        [],
+                        []
+                    ),
+                    // Non-macCatalyst case: Since this is a zippered target, the macOS deployment target defined in the target should be preserved, but the iOS deployment target should be set to the lower limit.
+                    (
+                        TestStandardTarget(
+                            "Target11",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "\(sdkPath.str)",
+                                        "MACOSX_DEPLOYMENT_TARGET": "10.13",
+                                        "IPHONEOS_DEPLOYMENT_TARGET": "10.0",
+                                        "IS_ZIPPERED": "YES",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [
+                                TestSourcesBuildPhase(["Mock.cpp"])
+                            ]
+                        ),
+                        "10.13",
+                        "13.0",
+                        [],
+                        []
+                    ),
+                    // Non-macCatalyst case: Since this is a zippered target, the macOS deployment target defined in the target should be preserved, and the iOS deployment target should be derived from it.
+                    (
+                        TestStandardTarget(
+                            "Target12",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "\(sdkPath.str)",
+                                        "MACOSX_DEPLOYMENT_TARGET": "10.15.1",
+                                        "IPHONEOS_DEPLOYMENT_TARGET": "",
+                                        "IS_ZIPPERED": "YES",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [
+                                TestSourcesBuildPhase(["Mock.cpp"])
+                            ]
+                        ),
+                        "10.15.1",
+                        "13.1",
+                        [],
+                        []
+                    ),
+                ] as [DeploymentTargetTestCaseData]
+            let testWorkspace = try TestWorkspace(
+                "Workspace",
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup(
+                            "Sources",
+                            children: [
+                                TestFile("ProjectSettings.xcconfig"),
+                                TestFile("Mock.cpp"),
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug", baseConfig: "ProjectSettings.xcconfig", buildSettings: [:])
+                        ],
+                        targets: targets.map({ $0.target })
+                    )
+                ]
+            ).load(core)
             let context = try await contextForTestData(testWorkspace, files: files)
             let buildRequestContext = BuildRequestContext(workspaceContext: context)
             let testProject = context.workspace.projects[0]
@@ -3533,27 +4170,35 @@ import SWBTestSupport
 
         let testWorkspace = try await TestWorkspace(
             "Workspace",
-            projects: [TestProject(
-                "aProject",
-                groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
-                targets: [
-                    TestStandardTarget(
-                        "Target1",
-                        guid: nil,
-                        type: .application,
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "ARCHS": archs.joined(separator: " "),
-                                "VALID_ARCHS": "$(inherited) x86_64h",
-                                "BUILD_VARIANTS": "normal",
-                                "PRODUCT_NAME": "Target1",
-
-                                // remove in rdar://53000820
-                                "USE_SWIFT_RESPONSE_FILE": "YES",
-                            ])],
-                        buildPhases: [TestSourcesBuildPhase(["main.swift"])])
-                ])
-            ]).load(getCore())
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            guid: nil,
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "ARCHS": archs.joined(separator: " "),
+                                        "VALID_ARCHS": "$(inherited) x86_64h",
+                                        "BUILD_VARIANTS": "normal",
+                                        "PRODUCT_NAME": "Target1",
+
+                                        // remove in rdar://53000820
+                                        "USE_SWIFT_RESPONSE_FILE": "YES",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["main.swift"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -3578,26 +4223,42 @@ import SWBTestSupport
     @Test(.requireSDKs(.macOS))
     func buildDatabaseLocationOverride() async throws {
         // Set up a trivial macOS project.
-        let testWorkspace = try await TestWorkspace("Workspace",
-                                                    projects: [TestProject("aProject",
-                                                                           groupTree: TestGroup("SomeFiles", children: []),
-                                                                           targets: [
-                                                                            TestStandardTarget("Target1",
-                                                                                               type: .application,
-                                                                                               buildConfigurations: [
-                                                                                                TestBuildConfiguration("Debug",
-                                                                                                                       buildSettings: [
-                                                                                                                        "USER_HEADER_SEARCH_PATHS": "$(USER_PARAMETER)",
-                                                                                                                        "BUILD_DESCRIPTION_CACHE_DIR": "/var/tmp/cache",
-                                                                                                                       ])])])]).load(getCore())
+        let testWorkspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: []),
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "USER_HEADER_SEARCH_PATHS": "$(USER_PARAMETER)",
+                                        "BUILD_DESCRIPTION_CACHE_DIR": "/var/tmp/cache",
+                                    ]
+                                )
+                            ]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
         let testTarget = testProject.targets[0]
 
-        let parameters = BuildParameters(action: .build, configuration: "Debug", overrides: [
-            "BUILD_DESCRIPTION_CACHE_DIR": "/var/tmp/cache_override"
-        ])
+        let parameters = BuildParameters(
+            action: .build,
+            configuration: "Debug",
+            overrides: [
+                "BUILD_DESCRIPTION_CACHE_DIR": "/var/tmp/cache_override"
+            ]
+        )
         let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: testProject, target: testTarget)
 
         guard settings.errors.isEmpty else {
@@ -3612,22 +4273,28 @@ import SWBTestSupport
     /// Test disabling various `ENABLE_DEFAULT_SEARCH_PATHS` settings.
     @Test(.requireSDKs(.macOS))
     func defaultSearchPaths() async throws {
-        let testWorkspace = try await TestWorkspace("Workspace",
-                                                    projects: [TestProject("aProject",
-                                                                           groupTree: TestGroup("SomeFiles", children: []),
-                                                                           targets: [
-                                                                            TestStandardTarget("Target1",
-                                                                                               type: .application,
-                                                                                               buildConfigurations: [
-                                                                                                TestBuildConfiguration("Debug",
-                                                                                                                       buildSettings: [
-                                                                                                                        "ENABLE_DEFAULT_SEARCH_PATHS": "YES",
-                                                                                                                       ]
-                                                                                                                      )
-                                                                                               ]
-                                                                                              )
-                                                                           ]
-                                                                          )]
+        let testWorkspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: []),
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "ENABLE_DEFAULT_SEARCH_PATHS": "YES"
+                                    ]
+                                )
+                            ]
+                        )
+                    ]
+                )
+            ]
         ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -3697,59 +4364,79 @@ import SWBTestSupport
         try await withTemporaryDirectory { sdksDirPath in
             let macos13_0Path = sdksDirPath.join("macOS13.0.sdk")
             let macos13_0Identifier = "macosx13.0.bogus"
-            try await writeSDK(name: macos13_0Path.basename, parentDir: sdksDirPath, settings: [
-                "CanonicalName": .plString(macos13_0Identifier),
-                "Version": "13.0",
-                "IsBaseSDK": "Yes",
-                "DefaultProperties": [
-                    "PLATFORM_NAME": "macosx",
-                ],
-            ])
+            try await writeSDK(
+                name: macos13_0Path.basename,
+                parentDir: sdksDirPath,
+                settings: [
+                    "CanonicalName": .plString(macos13_0Identifier),
+                    "Version": "13.0",
+                    "IsBaseSDK": "Yes",
+                    "DefaultProperties": [
+                        "PLATFORM_NAME": "macosx"
+                    ],
+                ]
+            )
             let ios16_0Path = sdksDirPath.join("iphoneos16.0.sdk")
             let ios16_0Identifier = "iphoneos16.0.bogus"
-            try await writeSDK(name: ios16_0Path.basename, parentDir: sdksDirPath, settings: [
-                "CanonicalName": .plString(ios16_0Identifier),
-                "Version": "16.0",
-                "IsBaseSDK": "Yes",
-                "DefaultProperties": [
-                    "PLATFORM_NAME": "macosx",
-                ],
-            ])
-
-            let testWorkspace = try TestWorkspace("Workspace",
-                                                  projects: [
-                                                    TestProject("aProject",
-                                                                groupTree: TestGroup("SomeFiles", children: [
-                                                                    TestFile("Mock.m"),
-                                                                    TestFile("StringAndDict.xcstrings"), // suppose this one got migrated to xcstrings
-                                                                ]),
-                                                                buildConfigurations: [
-                                                                    TestBuildConfiguration("Debug", buildSettings: [
-                                                                        "SDKROOT": "\(macos13_0Path.str)",
-                                                                        "SDKROOT[sdk=macosx*][variant=profile]": "\(macos13_0Path.str)",
-                                                                        "CLANG_CXX_LIBRARY": "libstdc++",
-                                                                        "DIAGNOSE_LOCALIZATION_FILE_EXCLUSION": "YES",
-                                                                        "INCLUDED_SOURCE_FILE_NAMES": "Foo/Localizable.strings Foo/Localizable.xcstrings StringAndDict.strings*",
-                                                                        "LOCALIZATION_PREFERS_STRING_CATALOGS": "NO",
-                                                                    ])
-                                                                ],
-                                                                targets: [
-                                                                    TestStandardTarget("AppTarget",
-                                                                                       type: .application,
-                                                                                       buildConfigurations: [
-                                                                                        TestBuildConfiguration("Debug", buildSettings: [
-                                                                                            "SDKROOT[sdk=iphoneos*]": "\(ios16_0Path.str)",
-                                                                                            "EXCLUDED_SOURCE_FILE_NAMES": "Localizable.strings Src/Other.strings Src/Other.stringsdict Src/Other.xcstrings Modern.xcstrings OtherStringAndDict.strings*",
-                                                                                        ]
-                                                                                                              )],
-                                                                                       buildPhases: [
-                                                                                        TestSourcesBuildPhase(["Mock.m"]),
-                                                                                        TestResourcesBuildPhase(["StringAndDict.xcstrings"]),
-                                                                                       ]
-                                                                                      ),
-                                                                ]
-                                                               )
-                                                  ]
+            try await writeSDK(
+                name: ios16_0Path.basename,
+                parentDir: sdksDirPath,
+                settings: [
+                    "CanonicalName": .plString(ios16_0Identifier),
+                    "Version": "16.0",
+                    "IsBaseSDK": "Yes",
+                    "DefaultProperties": [
+                        "PLATFORM_NAME": "macosx"
+                    ],
+                ]
+            )
+
+            let testWorkspace = try TestWorkspace(
+                "Workspace",
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup(
+                            "SomeFiles",
+                            children: [
+                                TestFile("Mock.m"),
+                                TestFile("StringAndDict.xcstrings"),  // suppose this one got migrated to xcstrings
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "\(macos13_0Path.str)",
+                                    "SDKROOT[sdk=macosx*][variant=profile]": "\(macos13_0Path.str)",
+                                    "CLANG_CXX_LIBRARY": "libstdc++",
+                                    "DIAGNOSE_LOCALIZATION_FILE_EXCLUSION": "YES",
+                                    "INCLUDED_SOURCE_FILE_NAMES": "Foo/Localizable.strings Foo/Localizable.xcstrings StringAndDict.strings*",
+                                    "LOCALIZATION_PREFERS_STRING_CATALOGS": "NO",
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "AppTarget",
+                                type: .application,
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "SDKROOT[sdk=iphoneos*]": "\(ios16_0Path.str)",
+                                            "EXCLUDED_SOURCE_FILE_NAMES": "Localizable.strings Src/Other.strings Src/Other.stringsdict Src/Other.xcstrings Modern.xcstrings OtherStringAndDict.strings*",
+                                        ]
+                                    )
+                                ],
+                                buildPhases: [
+                                    TestSourcesBuildPhase(["Mock.m"]),
+                                    TestResourcesBuildPhase(["StringAndDict.xcstrings"]),
+                                ]
+                            )
+                        ]
+                    )
+                ]
             ).load(core)
 
             let context = try await contextForTestData(testWorkspace)
@@ -3762,15 +4449,17 @@ import SWBTestSupport
             #expect(settings.project === testProject)
             #expect(settings.target === testTarget)
             if settings.errors.isEmpty {
-                #expect(Set(settings.warnings) == [
-                    "SDK condition on SDKROOT is unsupported, so the SDKROOT[sdk=macosx*][variant=profile] assignment at the project level will be ignored.",
-                    "SDK condition on SDKROOT is unsupported, so the SDKROOT[sdk=iphoneos*] assignment at the target level will be ignored.",
-                    "CLANG_CXX_LIBRARY is set to \'libstdc++\': The \'libstdc++\' C++ Standard Library is no longer available, and this setting can be removed.",
-                    "The pattern with prefix 'Localizable' in EXCLUDED_SOURCE_FILE_NAMES at the target level matches strings files, but not stringsdict and xcstrings files. Consider using a file extension pattern such as '.*' or '.*strings*'",
-                    "The pattern with prefix 'Foo/Localizable' in INCLUDED_SOURCE_FILE_NAMES at the project level matches strings and xcstrings files, but not stringsdict files. Consider using a file extension pattern such as '.*' or '.*strings*'",
-                    "The pattern with prefix 'StringAndDict' in INCLUDED_SOURCE_FILE_NAMES at the project level matches strings and stringsdict files, but not xcstrings files. Consider using a file extension pattern such as '.*' or '.*strings*'",
-                    // Shouldn't warn about OtherStringAndDict.strings* because there is no such xcstrings file in the project anyway.
-                ])
+                #expect(
+                    Set(settings.warnings) == [
+                        "SDK condition on SDKROOT is unsupported, so the SDKROOT[sdk=macosx*][variant=profile] assignment at the project level will be ignored.",
+                        "SDK condition on SDKROOT is unsupported, so the SDKROOT[sdk=iphoneos*] assignment at the target level will be ignored.",
+                        "CLANG_CXX_LIBRARY is set to \'libstdc++\': The \'libstdc++\' C++ Standard Library is no longer available, and this setting can be removed.",
+                        "The pattern with prefix 'Localizable' in EXCLUDED_SOURCE_FILE_NAMES at the target level matches strings files, but not stringsdict and xcstrings files. Consider using a file extension pattern such as '.*' or '.*strings*'",
+                        "The pattern with prefix 'Foo/Localizable' in INCLUDED_SOURCE_FILE_NAMES at the project level matches strings and xcstrings files, but not stringsdict files. Consider using a file extension pattern such as '.*' or '.*strings*'",
+                        "The pattern with prefix 'StringAndDict' in INCLUDED_SOURCE_FILE_NAMES at the project level matches strings and stringsdict files, but not xcstrings files. Consider using a file extension pattern such as '.*' or '.*strings*'",
+                        // Shouldn't warn about OtherStringAndDict.strings* because there is no such xcstrings file in the project anyway.
+                    ]
+                )
             } else {
                 Issue.record("Errors creating settings: \(settings.errors)")
             }
@@ -3778,21 +4467,27 @@ import SWBTestSupport
 
         // Test cases where we don't expect to see warnings (but might if the settings were configured slightly differently).
         do {
-            let testWorkspace = try TestWorkspace("Workspace",
-                                                  projects: [
-                                                    TestProject("aProject",
-                                                                groupTree: TestGroup("SomeFiles",
-                                                                                     children: []
-                                                                                    ),
-                                                                buildConfigurations: [
-                                                                    TestBuildConfiguration("Debug", buildSettings: [
-                                                                        "CLANG_CXX_LIBRARY": "libc++",
-                                                                        "DIAGNOSE_LOCALIZATION_FILE_EXCLUSION": "NO",
-                                                                        "EXCLUDED_SOURCE_FILE_NAMES": "Localizable.strings",
-                                                                    ])
-                                                                ]
-                                                               )
-                                                  ]
+            let testWorkspace = try TestWorkspace(
+                "Workspace",
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup(
+                            "SomeFiles",
+                            children: []
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CLANG_CXX_LIBRARY": "libc++",
+                                    "DIAGNOSE_LOCALIZATION_FILE_EXCLUSION": "NO",
+                                    "EXCLUDED_SOURCE_FILE_NAMES": "Localizable.strings",
+                                ]
+                            )
+                        ]
+                    )
+                ]
             ).load(core)
 
             let context = try await contextForTestData(testWorkspace)
@@ -3836,7 +4531,8 @@ import SWBTestSupport
                                     "DIAGNOSE_LOCALIZATION_FILE_EXCLUSION": "YES_ERROR",
                                     "EXCLUDED_SOURCE_FILE_NAMES": "Localizable.strings Src/Other.stringsdict Src/Migrated.strings*",
                                     "LOCALIZATION_PREFERS_STRING_CATALOGS": "YES",
-                                ])
+                                ]
+                            )
                         ]
                     )
                 ]
@@ -3851,33 +4547,48 @@ import SWBTestSupport
             #expect(settings.project === testProject)
             #expect(settings.target === nil)
             #expect(settings.warnings == [])
-            #expect(Set(settings.errors) == Set([
-                "DEVELOPER_DIR cannot be used to evaluate INSTALL_PATH, use DEVELOPER_INSTALL_DIR instead",
-                "TOOLCHAIN_DIR cannot be used to evaluate INSTALL_PATH, use DT_TOOLCHAIN_DIR instead",
-                "DT_TOOLCHAIN_DIR cannot be used to evaluate FRAMEWORK_SEARCH_PATHS, use TOOLCHAIN_DIR instead",
-                "DT_TOOLCHAIN_DIR cannot be used to evaluate LIBRARY_SEARCH_PATHS, use TOOLCHAIN_DIR instead",
-                "The pattern with prefix 'Localizable' in EXCLUDED_SOURCE_FILE_NAMES at the project level matches strings files, but not stringsdict and xcstrings files. Consider using a file extension pattern such as '.*' or '.*strings*'",
-                "The pattern with prefix 'Src/Other' in EXCLUDED_SOURCE_FILE_NAMES at the project level matches stringsdict files, but not strings and xcstrings files. Consider using a file extension pattern such as '.*' or '.*strings*'",
-                "The pattern with prefix 'Src/Migrated' in EXCLUDED_SOURCE_FILE_NAMES at the project level matches strings and stringsdict files, but not xcstrings files. Consider using a file extension pattern such as '.*' or '.*strings*'",
-            ]))
+            #expect(
+                Set(settings.errors)
+                    == Set([
+                        "DEVELOPER_DIR cannot be used to evaluate INSTALL_PATH, use DEVELOPER_INSTALL_DIR instead",
+                        "TOOLCHAIN_DIR cannot be used to evaluate INSTALL_PATH, use DT_TOOLCHAIN_DIR instead",
+                        "DT_TOOLCHAIN_DIR cannot be used to evaluate FRAMEWORK_SEARCH_PATHS, use TOOLCHAIN_DIR instead",
+                        "DT_TOOLCHAIN_DIR cannot be used to evaluate LIBRARY_SEARCH_PATHS, use TOOLCHAIN_DIR instead",
+                        "The pattern with prefix 'Localizable' in EXCLUDED_SOURCE_FILE_NAMES at the project level matches strings files, but not stringsdict and xcstrings files. Consider using a file extension pattern such as '.*' or '.*strings*'",
+                        "The pattern with prefix 'Src/Other' in EXCLUDED_SOURCE_FILE_NAMES at the project level matches stringsdict files, but not strings and xcstrings files. Consider using a file extension pattern such as '.*' or '.*strings*'",
+                        "The pattern with prefix 'Src/Migrated' in EXCLUDED_SOURCE_FILE_NAMES at the project level matches strings and stringsdict files, but not xcstrings files. Consider using a file extension pattern such as '.*' or '.*strings*'",
+                    ])
+            )
         }
     }
 
     @Test(.requireSDKs(.macOS))
     func autoSDKROOTReplacement() async throws {
-        let testWorkspace = try await TestWorkspace("Workspace",
-                                                    projects: [TestProject("aProject",
-                                                                           groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
-                                                                           targets: [
-                                                                            TestStandardTarget("Target1",
-                                                                                               type: .application,
-                                                                                               buildConfigurations: [
-                                                                                                TestBuildConfiguration("Debug",
-                                                                                                                       buildSettings: [
-                                                                                                                        "SDKROOT": "auto",
-                                                                                                                        "SUPPORTED_PLATFORMS": "macosx"
-                                                                                                                       ])],
-                                                                                               buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])])])]).load(getCore())
+        let testWorkspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "auto",
+                                        "SUPPORTED_PLATFORMS": "macosx",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -3894,10 +4605,12 @@ import SWBTestSupport
         do {
             let parameters = BuildParameters(action: .build, configuration: "Debug", activeRunDestination: .iOS)
             let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: testProject, target: testTarget)
-            #expect(settings.errors == [
-                "unable to resolve product type \'com.apple.product-type.application\'",
-                "unable to find sdk \'auto\'",
-            ])
+            #expect(
+                settings.errors == [
+                    "unable to resolve product type \'com.apple.product-type.application\'",
+                    "unable to find sdk \'auto\'",
+                ]
+            )
             #expect(settings.warnings == [])
             #expect(settings.globalScope.evaluate(BuiltinMacros.SDKROOT).str == "auto")
         }
@@ -3905,20 +4618,32 @@ import SWBTestSupport
 
     @Test(.requireSDKs(.macOS, .iOS))
     func autoSDKROOTReplacementForMacCatalyst() async throws {
-        let testWorkspace = try await TestWorkspace("Workspace",
-                                                    projects: [TestProject("aProject",
-                                                                           groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
-                                                                           targets: [
-                                                                            TestStandardTarget("Target1",
-                                                                                               type: .application,
-                                                                                               buildConfigurations: [
-                                                                                                TestBuildConfiguration("Debug",
-                                                                                                                       buildSettings: [
-                                                                                                                        "SDKROOT": "auto",
-                                                                                                                        "SUPPORTED_PLATFORMS": "iphoneos",
-                                                                                                                        "SUPPORTS_MACCATALYST": "YES",
-                                                                                                                       ])],
-                                                                                               buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])])])]).load(getCore())
+        let testWorkspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("Mock.cpp")]),
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "auto",
+                                        "SUPPORTED_PLATFORMS": "iphoneos",
+                                        "SUPPORTS_MACCATALYST": "YES",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["Mock.cpp"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -3927,10 +4652,12 @@ import SWBTestSupport
         do {
             let parameters = BuildParameters(action: .build, configuration: "Debug", activeRunDestination: .macOS)
             let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: testProject, target: testTarget)
-            #expect(settings.errors == [
-                "unable to resolve product type \'com.apple.product-type.application\'",
-                "unable to find sdk \'auto\'",
-            ])
+            #expect(
+                settings.errors == [
+                    "unable to resolve product type \'com.apple.product-type.application\'",
+                    "unable to find sdk \'auto\'",
+                ]
+            )
             #expect(settings.warnings == [])
             #expect(settings.globalScope.evaluate(BuiltinMacros.SDKROOT).str == "auto")
         }
@@ -3955,30 +4682,39 @@ import SWBTestSupport
     /// Test that `Settings` objects created for different purposes have the intended content for that purpose.
     @Test(.requireSDKs(.macOS))
     func settingsForDifferentPurposes() async throws {
-        let testWorkspace = try await TestWorkspace("Workspace",
-                                                    projects: [
-                                                        TestProject("aProject",
-                                                                    groupTree: TestGroup("SomeFiles"),
-                                                                    buildConfigurations: [
-                                                                        TestBuildConfiguration("Debug", buildSettings: [
-                                                                            "SDKROOT": "macosx",
-                                                                            "FOO": "project-$(inherited)",
-                                                                            "FOO[sdk=macosx*]": "macos_$(inherited)",
-                                                                            "FOO[sdk=iphone*]": "ios_$(inherited)",
-                                                                            "BAZ": "project-$(inherited)",
-                                                                        ])
-                                                                    ],
-                                                                    targets: [
-                                                                        TestAggregateTarget("AggregateTarget",
-                                                                                            buildConfigurations: [
-                                                                                                TestBuildConfiguration("Debug", buildSettings: [
-                                                                                                    "BAZ": "target-$(inherited)",
-                                                                                                ])
-                                                                                            ]
-                                                                                           )
-                                                                    ]
-                                                                   )
-                                                    ]
+        let testWorkspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles"),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "FOO": "project-$(inherited)",
+                                "FOO[sdk=macosx*]": "macos_$(inherited)",
+                                "FOO[sdk=iphone*]": "ios_$(inherited)",
+                                "BAZ": "project-$(inherited)",
+                            ]
+                        )
+                    ],
+                    targets: [
+                        TestAggregateTarget(
+                            "AggregateTarget",
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "BAZ": "target-$(inherited)"
+                                    ]
+                                )
+                            ]
+                        )
+                    ]
+                )
+            ]
         ).load(getCore())
         let context = try await contextForTestData(testWorkspace, environment: ["BAZ": "environment-$(inherited)"])
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -3991,7 +4727,8 @@ import SWBTestSupport
             overrides: ["BAZ": "overrides-$(inherited)"],
             commandLineOverrides: ["BAZ": "commandline-$(inherited)"],
             commandLineConfigOverrides: ["BAZ": "commandlineconfig-$(inherited)"],
-            environmentConfigOverrides: ["BAZ": "environmentconfig-$(inherited)"])
+            environmentConfigOverrides: ["BAZ": "environmentconfig-$(inherited)"]
+        )
 
         // The .build purpose includes overrides and binds conditional settings to a specific SDK.  (The overrides testing here is not as comprehensive as in testSettingOverrides().)
         do {
@@ -4018,7 +4755,7 @@ import SWBTestSupport
             #expect(scope.evaluateAsString(try #require(settings.userNamespace.lookupMacroDeclaration("FOO"))) == "macos_project-")
             // Second, check that only assignments using the bound SDK - or which don't use the SDK at all - are still in the table.
             var foo: MacroValueAssignment? = scope.table.lookupMacro(try #require(settings.userNamespace.lookupMacroDeclaration("FOO")))
-            #expect(foo?.conditions?.description == nil)          // The condition has been removed because the assignment has been bound to the macOS SDK
+            #expect(foo?.conditions?.description == nil)  // The condition has been removed because the assignment has been bound to the macOS SDK
             #expect(foo?.expression.stringRep == "macos_$(inherited)")
             foo = foo?.next
             #expect(foo?.conditions?.description == nil)
@@ -4065,28 +4802,33 @@ import SWBTestSupport
         }
     }
 
-
     /// Test settings which are set for different kinds of builds, such as `IS_UNOPTIMIZED_BUILD`.
     @Test(.requireSDKs(.macOS))
     func settingsDescribingTypeOfBuild() async throws {
-        let testWorkspace = try await TestWorkspace("Workspace",
-                                                    projects: [
-                                                        TestProject("aProject",
-                                                                    groupTree: TestGroup("SomeFiles"),
-                                                                    buildConfigurations: [
-                                                                        TestBuildConfiguration("Debug", buildSettings: [
-                                                                            "SDKROOT": "macosx",
-                                                                        ])
-                                                                    ],
-                                                                    targets: [
-                                                                        TestAggregateTarget("AggregateTarget",
-                                                                                            buildConfigurations: [
-                                                                                                TestBuildConfiguration("Debug")
-                                                                                            ]
-                                                                                           )
-                                                                    ]
-                                                                   )
-                                                    ]
+        let testWorkspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles"),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx"
+                            ]
+                        )
+                    ],
+                    targets: [
+                        TestAggregateTarget(
+                            "AggregateTarget",
+                            buildConfigurations: [
+                                TestBuildConfiguration("Debug")
+                            ]
+                        )
+                    ]
+                )
+            ]
         ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -4098,7 +4840,8 @@ import SWBTestSupport
             let parameters = BuildParameters(
                 action: .build,
                 configuration: "Debug",
-                overrides: overrides)
+                overrides: overrides
+            )
             let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: testProject, target: testTarget, purpose: .build)
 
             let diagnosticErrors = settings.diagnostics.filter { $0.behavior == .error }
@@ -4138,9 +4881,12 @@ import SWBTestSupport
                             type: .application,
                             buildConfigurations: [
                                 TestBuildConfiguration("Debug")
-                            ])
-                    ])
-            ]).load(getCore())
+                            ]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
 
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -4156,34 +4902,46 @@ import SWBTestSupport
 
     @Test(.requireSDKs(.macOS))
     func eagerCompilationAllowScriptsHandlesSandboxingOptOut() async throws {
-        let testWorkspace = TestWorkspace("Workspace",
-                                          projects: [
-                                            TestProject(
-                                                "aProject",
-                                                groupTree: TestGroup("Sources", path: "Sources", children: [
-                                                    TestFile("A.m"),
-                                                ]),
-                                                targets: [
-                                                    TestStandardTarget(
-                                                        "A", type: .framework,
-                                                        buildConfigurations: [
-                                                            TestBuildConfiguration("Debug", buildSettings: [
-                                                                "GENERATE_INFOPLIST_FILE": "YES",
-                                                                "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
-                                                            ])],
-                                                        buildPhases: [
-                                                            TestSourcesBuildPhase([TestBuildFile("A.m")]),
-                                                            TestShellScriptBuildPhase(
-                                                                name: "A Script",
-                                                                originalObjectID: "A Script",
-                                                                contents: "true",
-                                                                outputs: ["/lunch.txt"],
-                                                                sandboxingOverride: .forceDisabled
-                                                            ),
-                                                        ]),
-                                                ]
-                                            )
-                                          ])
+        let testWorkspace = TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup(
+                        "Sources",
+                        path: "Sources",
+                        children: [
+                            TestFile("A.m")
+                        ]
+                    ),
+                    targets: [
+                        TestStandardTarget(
+                            "A",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "GENERATE_INFOPLIST_FILE": "YES",
+                                        "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [
+                                TestSourcesBuildPhase([TestBuildFile("A.m")]),
+                                TestShellScriptBuildPhase(
+                                    name: "A Script",
+                                    originalObjectID: "A Script",
+                                    contents: "true",
+                                    outputs: ["/lunch.txt"],
+                                    sandboxingOverride: .forceDisabled
+                                ),
+                            ]
+                        )
+                    ]
+                )
+            ]
+        )
 
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -4208,7 +4966,7 @@ import SWBTestSupport
             BuiltinMacros.CCHROOT,
             BuiltinMacros.CONFIGURATION_BUILD_DIR, BuiltinMacros.SHARED_PRECOMPS_DIR,
             BuiltinMacros.CONFIGURATION_TEMP_DIR, BuiltinMacros.TARGET_TEMP_DIR, BuiltinMacros.TEMP_DIR,
-            BuiltinMacros.PROJECT_DIR, BuiltinMacros.BUILT_PRODUCTS_DIR
+            BuiltinMacros.PROJECT_DIR, BuiltinMacros.BUILT_PRODUCTS_DIR,
         ].map {
             (key: $0, value: $0.name)
         }
@@ -4237,7 +4995,8 @@ import SWBTestSupport
                         )
                     ]
                 )
-            ]).load(await getCore())
+            ]
+        ).load(await getCore())
 
         let testProject = testWorkspace.projects[0]
         let testTarget = testProject.targets[0]
@@ -4246,8 +5005,11 @@ import SWBTestSupport
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let parameters = BuildParameters(action: .build, configuration: "Debug")
         let settings = Settings(
-            workspaceContext: context, buildRequestContext: buildRequestContext,
-            parameters: parameters, project: testProject, target: testTarget
+            workspaceContext: context,
+            buildRequestContext: buildRequestContext,
+            parameters: parameters,
+            project: testProject,
+            target: testTarget
         )
         for (key, setValue) in buildSettingsToEnforce {
             let value = settings.globalScope.evaluate(key)
@@ -4283,20 +5045,23 @@ import SWBTestSupport
             (testTarget(name: "55To5", forVersion: "5.5"), "5"),
             (testTarget(name: "5Stays5", forVersion: "5"), "5"),
             (testTarget(name: "60To6", forVersion: "6.0"), "6"),
-            (testTarget(name: "6Stays6", forVersion: "6"), "6")
+            (testTarget(name: "6Stays6", forVersion: "6"), "6"),
         ]
 
         let testWorkspace = try TestWorkspace(
             "Workspace",
-            projects: [TestProject(
-                "aProject",
-                groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
-                buildConfigurations:[
-                    TestBuildConfiguration("Debug")
-                ],
-                targets: expectations.map { $0.0 })
-            ])
-            .load(await getCore())
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
+                    buildConfigurations: [
+                        TestBuildConfiguration("Debug")
+                    ],
+                    targets: expectations.map { $0.0 }
+                )
+            ]
+        )
+        .load(await getCore())
 
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -4314,22 +5079,25 @@ import SWBTestSupport
     func defaultUpcomingFeatures() async throws {
         let testWorkspace = try await TestWorkspace(
             "Workspace",
-            projects: [TestProject(
-                "aProject",
-                groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
-                buildConfigurations:[
-                    TestBuildConfiguration("Debug")
-                ],
-                targets: [
-                    TestStandardTarget(
-                        "SomeTarget",
-                        type: .framework,
-                        buildConfigurations: [TestBuildConfiguration("Debug")],
-                        buildPhases: [TestSourcesBuildPhase(["main.swift"])]
-                    )
-                ]
-            )])
-            .load(getCore())
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
+                    buildConfigurations: [
+                        TestBuildConfiguration("Debug")
+                    ],
+                    targets: [
+                        TestStandardTarget(
+                            "SomeTarget",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug")],
+                            buildPhases: [TestSourcesBuildPhase(["main.swift"])]
+                        )
+                    ]
+                )
+            ]
+        )
+        .load(getCore())
 
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -4358,75 +5126,93 @@ import SWBTestSupport
             // Write an additional SDK.
             let sdksDirPath = tmpDirPath.join("SDKs")
             let additionalSDKPath = sdksDirPath.join("TestSDK.sdk")
-            try await writeSDK(name: additionalSDKPath.basename, parentDir: sdksDirPath, settings: [
-                "CanonicalName": "com.apple.sdk.1.0",
-                "IsBaseSDK": "NO",
-            ])
+            try await writeSDK(
+                name: additionalSDKPath.basename,
+                parentDir: sdksDirPath,
+                settings: [
+                    "CanonicalName": "com.apple.sdk.1.0",
+                    "IsBaseSDK": "NO",
+                ]
+            )
             files[additionalSDKPath.join("Applications/Xcode.app/mock.txt")] = ""
             files[additionalSDKPath.join("usr/mock.txt")] = ""
 
             // Write xcconfig files.
             let projectXcconfigPath = tmpDirPath.join("xcconfigs/Project.xcconfig")
             files[projectXcconfigPath] =
-            "CASCADING = $(PROJECT_XCCONFIG_SETTING) $(inherited)\n" +
-            "PROJECT_XCCONFIG_SETTING = project-xcconfig\n"
+                "CASCADING = $(PROJECT_XCCONFIG_SETTING) $(inherited)\n" + "PROJECT_XCCONFIG_SETTING = project-xcconfig\n"
             let targetXcconfigPath = tmpDirPath.join("xcconfigs/Target.xcconfig")
             files[targetXcconfigPath] =
-            "CASCADING = $(TARGET_XCCONFIG_SETTING) $(inherited)\n" +
-            "CONDITIONAL[sdk=macosx*][arch=x86_64] = $(MAC_SETTING)_$(INTEL_SETTING)\n" +
-            "TARGET_XCCONFIG_SETTING = target-xcconfig\n"
+                "CASCADING = $(TARGET_XCCONFIG_SETTING) $(inherited)\n" + "CONDITIONAL[sdk=macosx*][arch=x86_64] = $(MAC_SETTING)_$(INTEL_SETTING)\n" + "TARGET_XCCONFIG_SETTING = target-xcconfig\n"
 
             // Test the basic settings construction for a trivial test target.
-            let testWorkspace = try TestWorkspace("Workspace", sourceRoot: tmpDirPath.join("aWorkspace"),
-                                                  projects: [TestProject("aProject",
-                                                                         groupTree: TestGroup("SomeFiles",
-                                                                                              children: [
-                                                                                                TestFile("Mock.cpp"),
-                                                                                                TestFile(projectXcconfigPath.str),
-                                                                                                TestFile(targetXcconfigPath.str),
-                                                                                              ]),
-                                                                         buildConfigurations:[
-                                                                            TestBuildConfiguration("Config", baseConfig: "Project.xcconfig", buildSettings: [
-                                                                                "ADDITIONAL_SDKS": "\(additionalSDKPath.str)",
-                                                                                "CASCADING": "$(PROJECT_SETTING) $(inherited)",
-                                                                                "PROJECT_SETTING": "project",
-                                                                                // This setting checks that we only see the target value when inspecting the target.
-                                                                                "PROJECT_AND_MAYBE_TARGET": "$(TARGET_SETTING) $(PROJECT_SETTING)",
-                                                                                "SDKROOT": "macosx",
-                                                                            ]),
-                                                                         ],
-                                                                         targets: [
-                                                                            TestStandardTarget("Target1",
-                                                                                               type: .application,
-                                                                                               buildConfigurations: [
-                                                                                                TestBuildConfiguration("Config", baseConfig: "Target.xcconfig", buildSettings: [
-                                                                                                    "CASCADING": "$(TARGET_SETTING) $(inherited)",
-                                                                                                    "CONDITIONAL": "",
-                                                                                                    "CONDITIONAL[arch=arm64]": "$(ARM_SETTING)",
-                                                                                                    "CONDITIONAL[sdk=macosx*]": "$(MAC_SETTING)",
-                                                                                                    "CONDITIONAL[sdk=ios*]": "$(IOS_SETTING)",
-                                                                                                    "TARGET_SETTING": "target",
-                                                                                                ]),
-                                                                                               ],
-                                                                                               buildPhases: [
-                                                                                                TestSourcesBuildPhase([
-                                                                                                    "Mock.cpp",
-                                                                                                ]),
-                                                                                               ]
-                                                                                              ),
-                                                                         ]
-                                                                        ),
-                                                  ]).load(core)
-            let context = try await contextForTestData(testWorkspace,
-                                                       environment: [
-                                                        "CASCADING": "$(DEFAULTS_SETTING)",
-                                                        "DEFAULTS_SETTING": "defaults",
-                                                        "ARM_SETTING": "arm",
-                                                        "INTEL_SETTING": "intel",
-                                                        "IOS_SETTING": "ios",
-                                                        "MAC_SETTING": "mac",
-                                                       ],
-                                                       files: files
+            let testWorkspace = try TestWorkspace(
+                "Workspace",
+                sourceRoot: tmpDirPath.join("aWorkspace"),
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup(
+                            "SomeFiles",
+                            children: [
+                                TestFile("Mock.cpp"),
+                                TestFile(projectXcconfigPath.str),
+                                TestFile(targetXcconfigPath.str),
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Config",
+                                baseConfig: "Project.xcconfig",
+                                buildSettings: [
+                                    "ADDITIONAL_SDKS": "\(additionalSDKPath.str)",
+                                    "CASCADING": "$(PROJECT_SETTING) $(inherited)",
+                                    "PROJECT_SETTING": "project",
+                                    // This setting checks that we only see the target value when inspecting the target.
+                                    "PROJECT_AND_MAYBE_TARGET": "$(TARGET_SETTING) $(PROJECT_SETTING)",
+                                    "SDKROOT": "macosx",
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "Target1",
+                                type: .application,
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Config",
+                                        baseConfig: "Target.xcconfig",
+                                        buildSettings: [
+                                            "CASCADING": "$(TARGET_SETTING) $(inherited)",
+                                            "CONDITIONAL": "",
+                                            "CONDITIONAL[arch=arm64]": "$(ARM_SETTING)",
+                                            "CONDITIONAL[sdk=macosx*]": "$(MAC_SETTING)",
+                                            "CONDITIONAL[sdk=ios*]": "$(IOS_SETTING)",
+                                            "TARGET_SETTING": "target",
+                                        ]
+                                    )
+                                ],
+                                buildPhases: [
+                                    TestSourcesBuildPhase([
+                                        "Mock.cpp"
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            ).load(core)
+            let context = try await contextForTestData(
+                testWorkspace,
+                environment: [
+                    "CASCADING": "$(DEFAULTS_SETTING)",
+                    "DEFAULTS_SETTING": "defaults",
+                    "ARM_SETTING": "arm",
+                    "INTEL_SETTING": "intel",
+                    "IOS_SETTING": "ios",
+                    "MAC_SETTING": "mac",
+                ],
+                files: files
             )
             let buildRequestContext = BuildRequestContext(workspaceContext: context)
             let testProject = context.workspace.projects[0]
@@ -4464,8 +5250,7 @@ import SWBTestSupport
                 #expect(editorInfo.targetResolvedSettingsValues?["SDKROOT"] == "macosx")
                 if let sdkDir = editorInfo.targetResolvedSettingsValues?["SDK_DIR"] {
                     #expect(sdkDir.contains("/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX"), "unexpected SDK_DIR: \(sdkDir)")
-                }
-                else {
+                } else {
                     Issue.record("SDK_DIR is empty")
                 }
 
@@ -4781,27 +5566,29 @@ import SWBTestSupport
                 "SDKROOT": "iphoneos",
                 "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator watchos watchsimulator",
             ],
-            runDestination: .watchOS) { context, settings, scope in
-                #expect(settings.errors == [])
-                #expect(settings.warnings == [])
-                #expect(scope.evaluate(BuiltinMacros.PLATFORM_NAME) == "watchos")
-                #expect(scope.evaluate(BuiltinMacros.PLATFORM_FAMILY_NAME) == "watchOS")
-                #expect(scope.evaluate(BuiltinMacros.SDKROOT) == context.sdkRegistry.lookup("watchos")?.path)
-                #expect(scope.evaluate(BuiltinMacros.ONLY_ACTIVE_ARCH))
-                #expect(Set(scope.evaluate(BuiltinMacros.ARCHS)) == Set(["arm64_32"]))
-            }
+            runDestination: .watchOS
+        ) { context, settings, scope in
+            #expect(settings.errors == [])
+            #expect(settings.warnings == [])
+            #expect(scope.evaluate(BuiltinMacros.PLATFORM_NAME) == "watchos")
+            #expect(scope.evaluate(BuiltinMacros.PLATFORM_FAMILY_NAME) == "watchOS")
+            #expect(scope.evaluate(BuiltinMacros.SDKROOT) == context.sdkRegistry.lookup("watchos")?.path)
+            #expect(scope.evaluate(BuiltinMacros.ONLY_ACTIVE_ARCH))
+            #expect(Set(scope.evaluate(BuiltinMacros.ARCHS)) == Set(["arm64_32"]))
+        }
     }
 
     @Test(.requireSDKs(.iOS))
     func activeRunDestination_DeviceToSimulator_PublicToPublic() async throws {
         try await testActiveRunDestinationiOS(
-            runDestination: .iOSSimulator) { context, settings, scope in
-                #expect(settings.errors == [])
-                #expect(settings.warnings == [])
-                #expect(scope.evaluate(BuiltinMacros.PLATFORM_NAME) == "iphonesimulator")
-                #expect(scope.evaluate(BuiltinMacros.PLATFORM_FAMILY_NAME) == "iOS")
-                #expect(scope.evaluate(BuiltinMacros.SDKROOT) == context.sdkRegistry.lookup("iphonesimulator")?.path)
-            }
+            runDestination: .iOSSimulator
+        ) { context, settings, scope in
+            #expect(settings.errors == [])
+            #expect(settings.warnings == [])
+            #expect(scope.evaluate(BuiltinMacros.PLATFORM_NAME) == "iphonesimulator")
+            #expect(scope.evaluate(BuiltinMacros.PLATFORM_FAMILY_NAME) == "iOS")
+            #expect(scope.evaluate(BuiltinMacros.SDKROOT) == context.sdkRegistry.lookup("iphonesimulator")?.path)
+        }
     }
 
     /// Regression test for <rdar://problem/49698749> Opt-in: macCatalyst framework targets should not require "SDKROOT = iphoneos” to be set
@@ -4809,23 +5596,28 @@ import SWBTestSupport
     func macCatalystFromMacOSSDK() async throws {
         let testWorkspace = try await TestWorkspace(
             "Workspace",
-            projects: [TestProject(
-                "aProject",
-                groupTree: TestGroup("SomeFiles", children: []),
-                targets: [
-                    TestStandardTarget(
-                        "Target",
-                        type: .application,
-                        buildConfigurations: [
-                            TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "SDKROOT": "macosx",
-                                    "SUPPORTS_MACCATALYST": "YES",
-                                ])
-                        ]),
-                ])
-            ]).load(getCore())
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: []),
+                    targets: [
+                        TestStandardTarget(
+                            "Target",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "macosx",
+                                        "SUPPORTS_MACCATALYST": "YES",
+                                    ]
+                                )
+                            ]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
 
@@ -4842,26 +5634,30 @@ import SWBTestSupport
     func targetConditionals() async throws {
         let testWorkspace = try await TestWorkspace(
             "Workspace",
-            projects: [TestPackageProject(
-                "aProject",
-                groupTree: TestGroup("SomeFiles", children: []),
-                buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "SDKROOT": "macosx",
-                            // config=Debug is added here to ensure target conditionals still compose with existing conditionals.
-                            "OTHER_CFLAGS[target=Target][config=Debug]": "-best",
-                            "OTHER_LDFLAGS[target=Other]": "-other",
-                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                            "SUPPORTS_MACCATALYST": "YES",
-                        ])
-                ],
-                targets: [
-                    TestStandardTarget("Target", type: .application),
-                    TestStandardTarget("Other", type: .application),
-                ])
-            ]).load(getCore())
+            projects: [
+                TestPackageProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: []),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                // config=Debug is added here to ensure target conditionals still compose with existing conditionals.
+                                "OTHER_CFLAGS[target=Target][config=Debug]": "-best",
+                                "OTHER_LDFLAGS[target=Other]": "-other",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                "SUPPORTS_MACCATALYST": "YES",
+                            ]
+                        )
+                    ],
+                    targets: [
+                        TestStandardTarget("Target", type: .application),
+                        TestStandardTarget("Other", type: .application),
+                    ]
+                )
+            ]
+        ).load(getCore())
 
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -4886,27 +5682,34 @@ import SWBTestSupport
             let testWorkspace = TestWorkspace(
                 "Workspace",
                 sourceRoot: tmpDir.join("Test"),
-                projects: [TestPackageProject(
-                    "aProject",
-                    groupTree: TestGroup("SomeFiles", children: [
-                        TestFile("Project.xcconfig"),
-                    ]),
-                    buildConfigurations: [
-                        TestBuildConfiguration(
-                            "Debug",
-                            baseConfig: "Project.xcconfig",
-                            buildSettings: [
-                                "SDKROOT": "macosx",
-                                "OTHER_CFLAGS": "$(inherited) Project",
-                                "OTHER_LDFLAGS[target=Target]": "$(inherited) Project",
-                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                "SUPPORTS_MACCATALYST": "YES",
-                            ])
-                    ],
-                    targets: [
-                        TestStandardTarget("Target", type: .application),
-                    ])
-                ])
+                projects: [
+                    TestPackageProject(
+                        "aProject",
+                        groupTree: TestGroup(
+                            "SomeFiles",
+                            children: [
+                                TestFile("Project.xcconfig")
+                            ]
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                baseConfig: "Project.xcconfig",
+                                buildSettings: [
+                                    "SDKROOT": "macosx",
+                                    "OTHER_CFLAGS": "$(inherited) Project",
+                                    "OTHER_LDFLAGS[target=Target]": "$(inherited) Project",
+                                    "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                    "SUPPORTS_MACCATALYST": "YES",
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestStandardTarget("Target", type: .application)
+                        ]
+                    )
+                ]
+            )
             let workspace = try await testWorkspace.load(getCore())
 
             let context = try await contextForTestData(workspace)
@@ -4916,8 +5719,7 @@ import SWBTestSupport
 
             let projectXcconfigPath = testWorkspace.sourceRoot.join("aProject/Project.xcconfig")
             try await context.fs.writeFileContents(projectXcconfigPath) { stream in
-                stream <<<
-                    """
+                stream <<< """
                     OTHER_CFLAGS = XCConfig
                     OTHER_LDFLAGS[target=Target] = XCConfig
                     """
@@ -4951,30 +5753,35 @@ import SWBTestSupport
     func platformConditionals() async throws {
         let testWorkspace = try await TestWorkspace(
             "Workspace",
-            projects: [TestPackageProject(
-                "aProject",
-                groupTree: TestGroup("SomeFiles", children: []),
-                targets: [
-                    TestStandardTarget(
-                        "Target",
-                        type: .application,
-                        buildConfigurations: [
-                            TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "SDKROOT": "macosx",
-                                    // config=Debug is added here to ensure platform conditionals still compose with existing conditionals.
-                                    "OTHER_CFLAGS[__platform_filter=macos][config=Debug]": "-best",
-                                    "OTHER_CFLAGS[__platform_filter=ios;ios-maccatalyst]": "-unbar",
-                                    "OTHER_LDFLAGS[__platform_filter=macos]": "-macos",
-                                    "OTHER_LDFLAGS[__platform_filter=ios]": "-ios",
-                                    "OTHER_LDFLAGS[__platform_filter=ios-maccatalyst]": "-catalyst",
-                                    "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                    "SUPPORTS_MACCATALYST": "YES",
-                                ])
-                        ]),
-                ])
-            ]).load(getCore())
+            projects: [
+                TestPackageProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: []),
+                    targets: [
+                        TestStandardTarget(
+                            "Target",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "macosx",
+                                        // config=Debug is added here to ensure platform conditionals still compose with existing conditionals.
+                                        "OTHER_CFLAGS[__platform_filter=macos][config=Debug]": "-best",
+                                        "OTHER_CFLAGS[__platform_filter=ios;ios-maccatalyst]": "-unbar",
+                                        "OTHER_LDFLAGS[__platform_filter=macos]": "-macos",
+                                        "OTHER_LDFLAGS[__platform_filter=ios]": "-ios",
+                                        "OTHER_LDFLAGS[__platform_filter=ios-maccatalyst]": "-catalyst",
+                                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                        "SUPPORTS_MACCATALYST": "YES",
+                                    ]
+                                )
+                            ]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
 
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -5004,24 +5811,29 @@ import SWBTestSupport
     func platformConditionalsDriverKit() async throws {
         let testWorkspace = try await TestWorkspace(
             "Workspace",
-            projects: [TestPackageProject(
-                "aProject",
-                groupTree: TestGroup("SomeFiles", children: []),
-                targets: [
-                    TestStandardTarget(
-                        "Target",
-                        type: .application,
-                        buildConfigurations: [
-                            TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "SDKROOT": "driverkit",
-                                    "OTHER_CFLAGS[__platform_filter=driverkit][config=Debug]": "-best",
-                                    "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                ])
-                        ]),
-                ])
-            ]).load(getCore())
+            projects: [
+                TestPackageProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: []),
+                    targets: [
+                        TestStandardTarget(
+                            "Target",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "driverkit",
+                                        "OTHER_CFLAGS[__platform_filter=driverkit][config=Debug]": "-best",
+                                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                    ]
+                                )
+                            ]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
 
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -5038,24 +5850,29 @@ import SWBTestSupport
     func platformConditionalsAreOnlySupportedForPackages() async throws {
         let testWorkspace = try await TestWorkspace(
             "Workspace",
-            projects: [TestProject(
-                "aProject",
-                groupTree: TestGroup("SomeFiles", children: []),
-                targets: [
-                    TestStandardTarget(
-                        "Target",
-                        type: .application,
-                        buildConfigurations: [
-                            TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "SDKROOT": "driverkit",
-                                    "OTHER_CFLAGS[__platform_filter=driverkit][config=Debug]": "-best",
-                                    "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                ])
-                        ]),
-                ])
-            ]).load(getCore())
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: []),
+                    targets: [
+                        TestStandardTarget(
+                            "Target",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "driverkit",
+                                        "OTHER_CFLAGS[__platform_filter=driverkit][config=Debug]": "-best",
+                                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                    ]
+                                )
+                            ]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
 
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -5072,23 +5889,28 @@ import SWBTestSupport
     func platformConditionalsInImpartedSettingsWorkForNonPackages() async throws {
         let testWorkspace = try await TestWorkspace(
             "Workspace",
-            projects: [TestProject(
-                "aProject",
-                groupTree: TestGroup("SomeFiles", children: []),
-                targets: [
-                    TestStandardTarget(
-                        "Target",
-                        type: .application,
-                        buildConfigurations: [
-                            TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "SDKROOT": "driverkit",
-                                    "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                ])
-                        ]),
-                ])
-            ]).load(getCore())
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: []),
+                    targets: [
+                        TestStandardTarget(
+                            "Target",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "driverkit",
+                                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                    ]
+                                )
+                            ]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
 
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -5100,26 +5922,38 @@ import SWBTestSupport
         let buildProperties = SWBCore.ImpartedBuildProperties(ImpartedBuildProperties(buildSettings: [source, conditionalSource]), PIFLoader(data: .plArray([]), namespace: context.core.specRegistry.internalMacroNamespace))
 
         let parameters = BuildParameters(action: .build, configuration: "Debug", activeRunDestination: .driverKit)
-        let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: testProject, target: testTarget,  impartedBuildProperties: [buildProperties])
+        let settings = Settings(workspaceContext: context, buildRequestContext: buildRequestContext, parameters: parameters, project: testProject, target: testTarget, impartedBuildProperties: [buildProperties])
 
         #expect(settings.globalScope.evaluate(BuiltinMacros.OTHER_CFLAGS) == ["-best"])
     }
 
     @Test(.requireSDKs(.macOS))
     func catalystDoesNotBreakOnlyActiveArch() async throws {
-        let testWorkspace = TestWorkspace("Test", projects: [
-            TestProject("Project", groupTree: TestGroup("Sources", path: "Sources", children: [TestFile("best.swift")]), targets: [
-                TestStandardTarget("Target",
-                                   type: .application,
-                                   buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ONLY_ACTIVE_ARCH": "YES",
-                        "SUPPORTS_MACCATALYST": "YES",
-                        "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
-                    ])
-                ])
-            ])
-        ])
+        let testWorkspace = TestWorkspace(
+            "Test",
+            projects: [
+                TestProject(
+                    "Project",
+                    groupTree: TestGroup("Sources", path: "Sources", children: [TestFile("best.swift")]),
+                    targets: [
+                        TestStandardTarget(
+                            "Target",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "ONLY_ACTIVE_ARCH": "YES",
+                                        "SUPPORTS_MACCATALYST": "YES",
+                                        "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
+                                    ]
+                                )
+                            ]
+                        )
+                    ]
+                )
+            ]
+        )
 
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
@@ -5152,47 +5986,68 @@ import SWBTestSupport
                         children: []
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "CASCADING": "$(PROJECT_SETTING) $(CONFIGURATION) $(inherited)",
-                            "PROJECT_SETTING": "project",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
-                        TestBuildConfiguration("Release", buildSettings: [
-                            "CASCADING": "$(PROJECT_SETTING) $(CONFIGURATION) $(inherited)",
-                            "PROJECT_SETTING": "project",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "CASCADING": "$(PROJECT_SETTING) $(CONFIGURATION) $(inherited)",
+                                "PROJECT_SETTING": "project",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                            ]
+                        ),
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "CASCADING": "$(PROJECT_SETTING) $(CONFIGURATION) $(inherited)",
+                                "PROJECT_SETTING": "project",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                            ]
+                        ),
                     ],
                     targets: [
-                        TestStandardTarget("TargetA",
-                                           type: .application,
-                                           buildConfigurations: [
-                                            TestBuildConfiguration("Debug", buildSettings: [
-                                                "CASCADING": "$(TARGET_SETTING) $(inherited)",
-                                                "TARGET_SETTING": "target_a",
-                                            ]),
-                                            TestBuildConfiguration("Release", buildSettings: [
-                                                "CASCADING": "$(TARGET_SETTING) $(inherited)",
-                                                "TARGET_SETTING": "target_a",
-                                            ]),
-                                           ]
-                                          ),
-                        TestStandardTarget("TargetB",
-                                           type: .application,
-                                           buildConfigurations: [
-                                            TestBuildConfiguration("Debug", buildSettings: [
-                                                "CASCADING": "$(TARGET_SETTING) $(inherited)",
-                                                "TARGET_SETTING": "target_b",
-                                            ]),
-                                            TestBuildConfiguration("Release", buildSettings: [
-                                                "CASCADING": "$(TARGET_SETTING) $(inherited)",
-                                                "TARGET_SETTING": "target_a",
-                                            ]),
-                                           ]
-                                          ),
+                        TestStandardTarget(
+                            "TargetA",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "CASCADING": "$(TARGET_SETTING) $(inherited)",
+                                        "TARGET_SETTING": "target_a",
+                                    ]
+                                ),
+                                TestBuildConfiguration(
+                                    "Release",
+                                    buildSettings: [
+                                        "CASCADING": "$(TARGET_SETTING) $(inherited)",
+                                        "TARGET_SETTING": "target_a",
+                                    ]
+                                ),
+                            ]
+                        ),
+                        TestStandardTarget(
+                            "TargetB",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "CASCADING": "$(TARGET_SETTING) $(inherited)",
+                                        "TARGET_SETTING": "target_b",
+                                    ]
+                                ),
+                                TestBuildConfiguration(
+                                    "Release",
+                                    buildSettings: [
+                                        "CASCADING": "$(TARGET_SETTING) $(inherited)",
+                                        "TARGET_SETTING": "target_a",
+                                    ]
+                                ),
+                            ]
+                        ),
                     ]
                 )
-            ]).load(getCore())
+            ]
+        ).load(getCore())
         let project = testWorkspace.projects[0]
         let targetA = project.targets[0]
         let targetB = project.targets[1]
@@ -5208,12 +6063,10 @@ import SWBTestSupport
             if let expectedSettings {
                 #expect(settings === expectedSettings, "did not get the Settings object that was expected", sourceLocation: sourceLocation)
                 #expect(foundSettings[objId] === expectedSettings, "did not get the previously-looked-up Settings object that was expected", sourceLocation: sourceLocation)
-            }
-            else {
+            } else {
                 if foundSettings[objId] != nil {
                     Issue.record("unexpectedly found a previously-looked-up Settings object", sourceLocation: sourceLocation)
-                }
-                else {
+                } else {
                     foundSettings[objId] = settings
                 }
             }
@@ -5255,42 +6108,30 @@ import SWBTestSupport
 
 @Suite fileprivate struct XCConfigTests: CoreBasedTests {
     static let configIncludeCycle: [(Path, String)] = [
-        (.root.join("tmp/A.xcconfig"), (
-            "#include \"B.xcconfig\"\nSETTING_A=VALUE1")),
-        (.root.join("tmp/B.xcconfig"), (
-            "#include \"A.xcconfig\"\nSETTING_B=VALUE2\nSETTING_BA=$(SETTING_A)")),
-        (.root.join("/tmp/C.xcconfig"), (
-            "#include \"C.xcconfig\"\nSETTING_C=VALUE3"))
+        (.root.join("tmp/A.xcconfig"), ("#include \"B.xcconfig\"\nSETTING_A=VALUE1")),
+        (.root.join("tmp/B.xcconfig"), ("#include \"A.xcconfig\"\nSETTING_B=VALUE2\nSETTING_BA=$(SETTING_A)")),
+        (.root.join("/tmp/C.xcconfig"), ("#include \"C.xcconfig\"\nSETTING_C=VALUE3")),
     ]
 
     static let samePathInIncludeGraph: [(Path, String)] = [
-        (.root.join("tmp/A.xcconfig"), (
-            "#include \"B.xcconfig\"\n#include \"C.xcconfig\"")),
-        (.root.join("tmp/B.xcconfig"), (
-            "B_XCCONFIG_USER_SETTING = from-B_xcconfig\n")),
-        (.root.join("tmp/C.xcconfig"), (
-            "C_XCCONFIG_USER_SETTING = from-C_xcconfig\n")),
-        (.root.join("tmp/D.xcconfig"), (
-            "#include \"C.xcconfig\"")),
-        (.root.join("tmp/E.xcconfig"), (
-            "#include \"B.xcconfig\""))
+        (.root.join("tmp/A.xcconfig"), ("#include \"B.xcconfig\"\n#include \"C.xcconfig\"")),
+        (.root.join("tmp/B.xcconfig"), ("B_XCCONFIG_USER_SETTING = from-B_xcconfig\n")),
+        (.root.join("tmp/C.xcconfig"), ("C_XCCONFIG_USER_SETTING = from-C_xcconfig\n")),
+        (.root.join("tmp/D.xcconfig"), ("#include \"C.xcconfig\"")),
+        (.root.join("tmp/E.xcconfig"), ("#include \"B.xcconfig\"")),
     ]
 
     static let missingNestedFileFilesOrdered: [(Path, String)] = [
-        (.root.join("tmp/Test.xcconfig"), (
-            "#include \"xcconfigs/Base1.xcconfig\"\n" +
-            "XCCONFIG_HEADER_SEARCH_PATHS = /tmp/path /tmp/other-path\n")),
-        (.root.join("tmp/xcconfigs/Base1.xcconfig"), (
-            "#include \"\(Path.root.join("tmp/xcconfigs/Base0.xcconfig").strWithPosixSlashes)\"")
-        )
+        (.root.join("tmp/Test.xcconfig"), ("#include \"xcconfigs/Base1.xcconfig\"\n" + "XCCONFIG_HEADER_SEARCH_PATHS = /tmp/path /tmp/other-path\n")),
+        (
+            .root.join("tmp/xcconfigs/Base1.xcconfig"), ("#include \"\(Path.root.join("tmp/xcconfigs/Base0.xcconfig").strWithPosixSlashes)\"")
+        ),
     ]
     static let missingNestedFileFiles = Dictionary(uniqueKeysWithValues: missingNestedFileFilesOrdered)
     static let threeLevelNestedFilesOrdered: [(Path, String)] =
-    XCConfigTests.missingNestedFileFilesOrdered +
-    [
-        (.root.join("tmp/xcconfigs/Base0.xcconfig"), (
-            "XCCONFIG_USER_SETTING = from-xcconfig\n"))
-    ]
+        XCConfigTests.missingNestedFileFilesOrdered + [
+            (.root.join("tmp/xcconfigs/Base0.xcconfig"), ("XCCONFIG_USER_SETTING = from-xcconfig\n"))
+        ]
 
     let threeLevelNestedPaths = Array(XCConfigTests.threeLevelNestedFilesOrdered.map { $0.0 })
     let threeLevelNestedFiles = Dictionary(uniqueKeysWithValues: XCConfigTests.threeLevelNestedFilesOrdered)
@@ -5298,7 +6139,7 @@ import SWBTestSupport
     let samePathInIncludeGraphFiles = Dictionary(uniqueKeysWithValues: XCConfigTests.samePathInIncludeGraph)
 
     func setupTestingContext(_ files: [Path: String], symlinks: [Path: String] = [:]) async throws -> WorkspaceContext {
-        let testWorkspace = try await TestWorkspace("Workspace", projects: [ TestProject("aProject", groupTree: TestGroup("SomeFiles", children: [TestFile(Path.root.join("tmp/Test.xcconfig").str)]), buildConfigurations:[ TestBuildConfiguration("Config1", baseConfig: "Test.xcconfig") ]) ]).load(getCore())
+        let testWorkspace = try await TestWorkspace("Workspace", projects: [TestProject("aProject", groupTree: TestGroup("SomeFiles", children: [TestFile(Path.root.join("tmp/Test.xcconfig").str)]), buildConfigurations: [TestBuildConfiguration("Config1", baseConfig: "Test.xcconfig")])]).load(getCore())
         return try await contextForTestData(testWorkspace, files: files, symlinks: symlinks)
     }
 
@@ -5314,14 +6155,16 @@ import SWBTestSupport
     func simpleCycleInConfigs() async throws {
         let context = try await setupTestingContext(configIncludeCycleFiles)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
-        let expectedDiagnostics = [[
-            "\(Path.root.join("tmp/B.xcconfig").str):1: warning: Skipping the inclusion of 'A.xcconfig' from 'B.xcconfig' as it would create a cycle.",
-            "Cycle Path: 'A.xcconfig' -> 'B.xcconfig' -> 'A.xcconfig'",
-            "Cycle Details:",
-            "'\(Path.root.join("tmp/A.xcconfig").str)' includes '\(Path.root.join("tmp/B.xcconfig").str)'",
-            "'\(Path.root.join("tmp/B.xcconfig").str)' includes '\(Path.root.join("tmp/A.xcconfig").str)'",
-            "",
-        ].joined(separator: "\n")]
+        let expectedDiagnostics = [
+            [
+                "\(Path.root.join("tmp/B.xcconfig").str):1: warning: Skipping the inclusion of 'A.xcconfig' from 'B.xcconfig' as it would create a cycle.",
+                "Cycle Path: 'A.xcconfig' -> 'B.xcconfig' -> 'A.xcconfig'",
+                "Cycle Details:",
+                "'\(Path.root.join("tmp/A.xcconfig").str)' includes '\(Path.root.join("tmp/B.xcconfig").str)'",
+                "'\(Path.root.join("tmp/B.xcconfig").str)' includes '\(Path.root.join("tmp/A.xcconfig").str)'",
+                "",
+            ].joined(separator: "\n")
+        ]
         let info = buildRequestContext.loadSettingsFromConfig(data: ByteString(encodingAsUTF8: "#include \"\(Path.root.join("tmp/A.xcconfig").strWithPosixSlashes)\"\n"), path: Path.root.join("mock/base/path"), namespace: MacroNamespace(), searchPaths: [Path]())
         #expect(info.diagnostics.map { $0.formatLocalizedDescription(.debug) } == expectedDiagnostics)
 
@@ -5336,13 +6179,15 @@ import SWBTestSupport
     func singleFileCycleInConfigs() async throws {
         let context = try await setupTestingContext(configIncludeCycleFiles)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
-        let expectedDiagnostics = [[
-            "\(Path.root.join("tmp/C.xcconfig").str):1: warning: Skipping the inclusion of 'C.xcconfig' from 'C.xcconfig' as it would create a cycle.",
-            "Cycle Path: 'C.xcconfig' -> 'C.xcconfig'",
-            "Cycle Details:",
-            "'\(Path.root.join("tmp/C.xcconfig").str)' includes '\(Path.root.join("tmp/C.xcconfig").str)'",
-            "",
-        ].joined(separator: "\n")]
+        let expectedDiagnostics = [
+            [
+                "\(Path.root.join("tmp/C.xcconfig").str):1: warning: Skipping the inclusion of 'C.xcconfig' from 'C.xcconfig' as it would create a cycle.",
+                "Cycle Path: 'C.xcconfig' -> 'C.xcconfig'",
+                "Cycle Details:",
+                "'\(Path.root.join("tmp/C.xcconfig").str)' includes '\(Path.root.join("tmp/C.xcconfig").str)'",
+                "",
+            ].joined(separator: "\n")
+        ]
         let info = buildRequestContext.loadSettingsFromConfig(data: ByteString(encodingAsUTF8: "#include \"\(Path.root.join("tmp/C.xcconfig").strWithPosixSlashes)\"\n"), path: Path.root.join("mock/base/path"), namespace: MacroNamespace(), searchPaths: [Path]())
         #expect(info.diagnostics.map { $0.formatLocalizedDescription(.debug) } == expectedDiagnostics)
     }
@@ -5351,14 +6196,16 @@ import SWBTestSupport
     func symlinkCycleInConfigs() async throws {
         let context = try await setupTestingContext(configIncludeCycleFiles, symlinks: [Path.root.join("tmp/symlink.xcconfig"): Path.root.join("tmp/A.xcconfig").str])
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
-        let expectedDiagnostics = [[
-            "\(Path.root.join("tmp/B.xcconfig").str):1: warning: Skipping the inclusion of \'A.xcconfig\' from \'B.xcconfig\' as it would create a cycle.",
-            "Cycle Path: \'A.xcconfig\' -> \'B.xcconfig\' -> \'A.xcconfig\'",
-            "Cycle Details:",
-            "\'\(Path.root.join("tmp/A.xcconfig").str)\' includes \'\(Path.root.join("tmp/B.xcconfig").str)\'",
-            "\'\(Path.root.join("tmp/B.xcconfig").str)\' includes \'\(Path.root.join("tmp/A.xcconfig").str)\'",
-            "",
-        ].joined(separator: "\n")]
+        let expectedDiagnostics = [
+            [
+                "\(Path.root.join("tmp/B.xcconfig").str):1: warning: Skipping the inclusion of \'A.xcconfig\' from \'B.xcconfig\' as it would create a cycle.",
+                "Cycle Path: \'A.xcconfig\' -> \'B.xcconfig\' -> \'A.xcconfig\'",
+                "Cycle Details:",
+                "\'\(Path.root.join("tmp/A.xcconfig").str)\' includes \'\(Path.root.join("tmp/B.xcconfig").str)\'",
+                "\'\(Path.root.join("tmp/B.xcconfig").str)\' includes \'\(Path.root.join("tmp/A.xcconfig").str)\'",
+                "",
+            ].joined(separator: "\n")
+        ]
         let info = buildRequestContext.loadSettingsFromConfig(data: ByteString(encodingAsUTF8: "#include \"\(Path.root.join("tmp/A.xcconfig").strWithPosixSlashes)\"\n"), path: Path.root.join("mock/base/path"), namespace: MacroNamespace(), searchPaths: [Path]())
         #expect(info.diagnostics.map { $0.formatLocalizedDescription(.debug) } == expectedDiagnostics)
     }
@@ -5368,11 +6215,11 @@ import SWBTestSupport
         let context = try await setupTestingContext(samePathInIncludeGraphFiles)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let data: String = """
-        #include \"\(Path.root.join("tmp/A.xcconfig").strWithPosixSlashes)\"
-        #include \"\(Path.root.join("tmp/D.xcconfig").strWithPosixSlashes)\"
-        #include \"\(Path.root.join("tmp/E.xcconfig").strWithPosixSlashes)\"
+            #include \"\(Path.root.join("tmp/A.xcconfig").strWithPosixSlashes)\"
+            #include \"\(Path.root.join("tmp/D.xcconfig").strWithPosixSlashes)\"
+            #include \"\(Path.root.join("tmp/E.xcconfig").strWithPosixSlashes)\"
 
-        """
+            """
 
         let info = buildRequestContext.loadSettingsFromConfig(data: ByteString(encodingAsUTF8: data), path: Path.root.join("mock/base/path"), namespace: MacroNamespace(), searchPaths: [Path]())
 
@@ -5391,10 +6238,10 @@ import SWBTestSupport
             .root.join("tmp/B.xcconfig"): "#include \"A\"\nKEY_B = VALUE_B\n",
         ])
         let data: String = """
-        #include "\(Path.root.join("tmp/A").strWithPosixSlashes)"
-        #include "\(Path.root.join("tmp/B").strWithPosixSlashes)"
+            #include "\(Path.root.join("tmp/A").strWithPosixSlashes)"
+            #include "\(Path.root.join("tmp/B").strWithPosixSlashes)"
 
-        """
+            """
 
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
 
@@ -5568,33 +6415,41 @@ import SWBTestSupport
                         children: [
                             TestFile(Path.root.join("tmp/Test.xcconfig").str),
                             TestFile(Path.root.join("tmp/TargetA/TargetConfig.xcconfig").str),
-                        ]),
+                        ]
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration("Config1", baseConfig: "Test.xcconfig")
                     ],
                     targets: [
                         TestStandardTarget("A", type: .application)
-                    ]),
+                    ]
+                ),
                 TestProject(
                     "bProject",
                     sourceRoot: Path.root.join("tmp/TargetB"),
                     groupTree: TestGroup(
                         "SomeFiles",
                         children: [
-                            TestFile(Path.root.join("tmp/TargetB/TargetConfig.xcconfig").str),
-                        ]),
+                            TestFile(Path.root.join("tmp/TargetB/TargetConfig.xcconfig").str)
+                        ]
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration("Config1", baseConfig: "Test.xcconfig")
                     ],
                     targets: [
                         TestStandardTarget("B", type: .application)
-                    ])
-            ]).load(getCore())
-        let context = try await contextForTestData(testWorkspace, files: [
-            .root.join("tmp/Test.xcconfig"): "#include \"TargetConfig\"",
-            .root.join("tmp/TargetA/TargetConfig.xcconfig"): "PRODUCT_NAME = A",
-            .root.join("tmp/TargetB/TargetConfig.xcconfig"): "PRODUCT_NAME = B",
-        ])
+                    ]
+                ),
+            ]
+        ).load(getCore())
+        let context = try await contextForTestData(
+            testWorkspace,
+            files: [
+                .root.join("tmp/Test.xcconfig"): "#include \"TargetConfig\"",
+                .root.join("tmp/TargetA/TargetConfig.xcconfig"): "PRODUCT_NAME = A",
+                .root.join("tmp/TargetB/TargetConfig.xcconfig"): "PRODUCT_NAME = B",
+            ]
+        )
 
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let aSettings = buildRequestContext.getCachedSettings(BuildParameters(configuration: "Config1"), target: testWorkspace.projects[0].targets[0])
diff --git a/Tests/SWBCoreTests/ShellScriptEnvironmentTests.swift b/Tests/SWBCoreTests/ShellScriptEnvironmentTests.swift
index ce638d1f..fe9f5859 100644
--- a/Tests/SWBCoreTests/ShellScriptEnvironmentTests.swift
+++ b/Tests/SWBCoreTests/ShellScriptEnvironmentTests.swift
@@ -23,23 +23,31 @@ import SWBProtocol
         let core = try await getCore()
         let testWorkspace = try TestWorkspace(
             "Workspace",
-            projects: [TestProject(
-                "aProject",
-                groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
-                targets: [
-                    TestStandardTarget(
-                        "Target1",
-                        guid: nil,
-                        type: .application,
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "ARCHS": "arm64",
-                                "BUILD_VARIANTS": "normal",
-                                "PRODUCT_NAME": "Target1",
-                            ])],
-                        buildPhases: [TestSourcesBuildPhase(["main.swift"])])
-                ])
-            ]).load(core)
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            guid: nil,
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "ARCHS": "arm64",
+                                        "BUILD_VARIANTS": "normal",
+                                        "PRODUCT_NAME": "Target1",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["main.swift"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(core)
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -51,7 +59,7 @@ import SWBProtocol
 
         let env = SWBCore.computeScriptEnvironment(.shellScriptPhase, scope: settings.globalScope, settings: settings, workspaceContext: context, allDeploymentTargetMacroNames: [])
 
-        let expected: [String: String] =         [
+        let expected: [String: String] = [
             "ACTION": "build",
             "ALWAYS_SEARCH_USER_PATHS": "YES",
             "BUILD_DIR": srcroot.join("build").str,
@@ -167,40 +175,51 @@ import SWBProtocol
             let toolchainDirPath = tmpDirPath.join("Toolchains")
             let toolchainPath = toolchainDirPath.join("Extra.xctoolchain")
             try fs.createDirectory(toolchainPath, recursive: true)
-            try await fs.writePlist(toolchainPath.join("ToolchainInfo.plist"), [
-                "CFBundleIdentifier": "com.apple.ExtraToolchain",
-                "DefaultBuildSettings": [
-                    "TOOLCHAIN_DEFAULT_BUILD_SETTING_FOO" : "bar",
-                ],
-                "OverrideBuildSettings": [
-                    "TOOLCHAIN_OVERRIDE_BUILD_SETTING_BAZ": "quux",
-                ],
-            ])
+            try await fs.writePlist(
+                toolchainPath.join("ToolchainInfo.plist"),
+                [
+                    "CFBundleIdentifier": "com.apple.ExtraToolchain",
+                    "DefaultBuildSettings": [
+                        "TOOLCHAIN_DEFAULT_BUILD_SETTING_FOO": "bar"
+                    ],
+                    "OverrideBuildSettings": [
+                        "TOOLCHAIN_OVERRIDE_BUILD_SETTING_BAZ": "quux"
+                    ],
+                ]
+            )
 
             // Configure the test data.
             let environment: Environment = [.externalToolchainsDir: toolchainDirPath.str]
             let core = try await Self.makeCore(environment: .init(environment))
             let testWorkspace = try TestWorkspace(
                 "Workspace",
-                projects: [TestProject(
-                    "aProject",
-                    groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
-                    targets: [
-                        TestStandardTarget(
-                            "Target1",
-                            guid: nil,
-                            type: .application,
-                            buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: [
-                                    "ARCHS": "arm64",
-                                    "BUILD_VARIANTS": "normal",
-                                    "PRODUCT_NAME": "Target1",
-                                ])],
-                            buildPhases: [TestSourcesBuildPhase(["main.swift"])
-                                         ]
-                        )
-                    ])
-                ]).load(core)
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
+                        targets: [
+                            TestStandardTarget(
+                                "Target1",
+                                guid: nil,
+                                type: .application,
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "ARCHS": "arm64",
+                                            "BUILD_VARIANTS": "normal",
+                                            "PRODUCT_NAME": "Target1",
+                                        ]
+                                    )
+                                ],
+                                buildPhases: [
+                                    TestSourcesBuildPhase(["main.swift"])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            ).load(core)
             let context = try await contextForTestData(testWorkspace, core: core, environment: .init(environment))
             let buildRequestContext = BuildRequestContext(workspaceContext: context)
             let testProject = context.workspace.projects[0]
@@ -213,7 +232,7 @@ import SWBProtocol
 
             // Check that all of the settings defined as expected in the dictionary above appear as described.
             let expected: [String: String] = [
-                "TOOLCHAIN_DEFAULT_BUILD_SETTING_FOO" : "bar",
+                "TOOLCHAIN_DEFAULT_BUILD_SETTING_FOO": "bar",
                 "TOOLCHAIN_OVERRIDE_BUILD_SETTING_BAZ": "quux",
             ]
 
@@ -231,24 +250,32 @@ import SWBProtocol
     func ensureEnvironmentIsMissingValues() async throws {
         let testWorkspace = try await TestWorkspace(
             "Workspace",
-            projects: [TestProject(
-                "aProject",
-                groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
-                targets: [
-                    TestStandardTarget(
-                        "Target1",
-                        guid: nil,
-                        type: .application,
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "ARCHS": "arm64",
-                                "BUILD_VARIANTS": "normal",
-                                "PRODUCT_NAME": "Target1",
-                                "BUILD_DESCRIPTION_CACHE_DIR": "/var/should/not/export"
-                            ])],
-                        buildPhases: [TestSourcesBuildPhase(["main.swift"])])
-                ])
-            ]).load(getCore())
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("main.swift")]),
+                    targets: [
+                        TestStandardTarget(
+                            "Target1",
+                            guid: nil,
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "ARCHS": "arm64",
+                                        "BUILD_VARIANTS": "normal",
+                                        "PRODUCT_NAME": "Target1",
+                                        "BUILD_DESCRIPTION_CACHE_DIR": "/var/should/not/export",
+                                    ]
+                                )
+                            ],
+                            buildPhases: [TestSourcesBuildPhase(["main.swift"])]
+                        )
+                    ]
+                )
+            ]
+        ).load(getCore())
         let context = try await contextForTestData(testWorkspace)
         let buildRequestContext = BuildRequestContext(workspaceContext: context)
         let testProject = context.workspace.projects[0]
@@ -260,7 +287,7 @@ import SWBProtocol
         let env = SWBCore.computeScriptEnvironment(.shellScriptPhase, scope: settings.globalScope, settings: settings, workspaceContext: context, allDeploymentTargetMacroNames: [])
 
         let shouldNotBeExported = [
-            "BUILD_DESCRIPTION_CACHE_DIR",
+            "BUILD_DESCRIPTION_CACHE_DIR"
         ]
 
         for setting in shouldNotBeExported {
diff --git a/Tests/SWBCoreTests/SpecLoadingTests.swift b/Tests/SWBCoreTests/SpecLoadingTests.swift
index ba135228..2d6f5f53 100644
--- a/Tests/SWBCoreTests/SpecLoadingTests.swift
+++ b/Tests/SWBCoreTests/SpecLoadingTests.swift
@@ -20,7 +20,7 @@ import SWBMacro
 @Suite fileprivate struct SpecLoadingTests: CoreBasedTests {
     var specDataCaches = Registry<Spec, any SpecDataCache>()
 
-    final class TestDataDelegate : SpecParserDelegate {
+    final class TestDataDelegate: SpecParserDelegate {
         final class MockSpecRegistryDelegate: SpecRegistryDelegate, Sendable {
             private let _diagnosticsEngine: DiagnosticsEngine
 
@@ -71,7 +71,7 @@ import SWBMacro
         }
     }
 
-    private func parseTestSpec<T : SpecType>(_ type: T.Type, _ specData: [String: PropertyListItem], _ baseSpec: Spec? = nil, namespace: MacroNamespace? = nil) async throws -> (T, [String], [String]) {
+    private func parseTestSpec<T: SpecType>(_ type: T.Type, _ specData: [String: PropertyListItem], _ baseSpec: Spec? = nil, namespace: MacroNamespace? = nil) async throws -> (T, [String], [String]) {
         let core = try await getCore()
         // Create a mock proxy for the data.
         var identifier = "test"
@@ -196,11 +196,14 @@ import SWBMacro
 
     @Test
     func packageTypeSpecLoading() async throws {
-        let (spec, _, errors) = try await parseTestSpec(PackageTypeSpec.self, [
-            "Identifier": "com.apple.package-type.wrapper.framework",
-            "DefaultBuildSettings": [:],
-            "ProductReference": ["Name": "$(WRAPPER_NAME)", "FileType": "wrapper.framework", "IsLaunchable": "NO"]
-        ])
+        let (spec, _, errors) = try await parseTestSpec(
+            PackageTypeSpec.self,
+            [
+                "Identifier": "com.apple.package-type.wrapper.framework",
+                "DefaultBuildSettings": [:],
+                "ProductReference": ["Name": "$(WRAPPER_NAME)", "FileType": "wrapper.framework", "IsLaunchable": "NO"],
+            ]
+        )
         #expect(spec.identifier == "com.apple.package-type.wrapper.framework")
         #expect(spec.productReferenceFileTypeIdentifier == "wrapper.framework")
         #expect(errors.count == 0)
@@ -212,22 +215,33 @@ import SWBMacro
         let foo = try testNamespace.declareStringListMacro("FOO")
         let bar = try testNamespace.declareStringMacro("BAR")
 
-        let (rootspec, rw, re) = try await parseTestSpec(ProductTypeSpec.self, [
-            "DefaultBuildProperties": [
-                "FOO" : "$(inherited) no",
-                "BAR" : "i386"
+        let (rootspec, rw, re) = try await parseTestSpec(
+            ProductTypeSpec.self,
+            [
+                "DefaultBuildProperties": [
+                    "FOO": "$(inherited) no",
+                    "BAR": "i386",
+                ],
+                "PackageTypes": ["com.apple.product-type.bundle.ui-testing"],
             ],
-            "PackageTypes": ["com.apple.product-type.bundle.ui-testing"]], namespace: testNamespace)
+            namespace: testNamespace
+        )
         #expect(rootspec.defaultPackageTypeIdentifier == "com.apple.product-type.bundle.ui-testing")
         #expect(re == [])
         #expect(rw == [])
         #expect(rootspec.buildSettings.valueAssignments.count == 2)
 
-        let (spec, warnings, errors) = try await parseTestSpec(ProductTypeSpec.self, [
-            "DefaultBuildProperties": [
-                "FOO" : "$(inherited) yes"
+        let (spec, warnings, errors) = try await parseTestSpec(
+            ProductTypeSpec.self,
+            [
+                "DefaultBuildProperties": [
+                    "FOO": "$(inherited) yes"
+                ],
+                "PackageTypes": ["com.apple.product-type.bundle.ui-testing"],
             ],
-            "PackageTypes": ["com.apple.product-type.bundle.ui-testing"]], rootspec, namespace: testNamespace)
+            rootspec,
+            namespace: testNamespace
+        )
         #expect(spec.defaultPackageTypeIdentifier == "com.apple.product-type.bundle.ui-testing")
         #expect(errors == [])
         #expect(warnings == [])
@@ -240,10 +254,14 @@ import SWBMacro
 
     @Test
     func productTypeSpecLoadingWithErrorForMissingDeprecationReason() async throws {
-        let (spec, warnings, errors) = try await parseTestSpec(ProductTypeSpec.self, [
-            "DeprecationLevel" : "error",
-            "DefaultBuildProperties": [:],
-            "PackageTypes": ["com.apple.product-type.bundle.ui-testing"]])
+        let (spec, warnings, errors) = try await parseTestSpec(
+            ProductTypeSpec.self,
+            [
+                "DeprecationLevel": "error",
+                "DefaultBuildProperties": [:],
+                "PackageTypes": ["com.apple.product-type.bundle.ui-testing"],
+            ]
+        )
         #expect(spec.deprecationInfo == nil)
         #expect(warnings.count == 0)
         #expect(errors.count == 1)
@@ -252,11 +270,15 @@ import SWBMacro
 
     @Test
     func productTypeSpecLoadingWithErrorForInvalidDeprecationReason() async throws {
-        let (spec, warnings, errors) = try await parseTestSpec(ProductTypeSpec.self, [
-            "DeprecationReason" : "no longer supported",
-            "DeprecationLevel" : "err",
-            "DefaultBuildProperties": [:],
-            "PackageTypes": ["com.apple.product-type.bundle.ui-testing"]])
+        let (spec, warnings, errors) = try await parseTestSpec(
+            ProductTypeSpec.self,
+            [
+                "DeprecationReason": "no longer supported",
+                "DeprecationLevel": "err",
+                "DefaultBuildProperties": [:],
+                "PackageTypes": ["com.apple.product-type.bundle.ui-testing"],
+            ]
+        )
         #expect(spec.deprecationInfo == nil)
         #expect(warnings.count == 0)
         #expect(errors.count == 1)
@@ -265,11 +287,15 @@ import SWBMacro
 
     @Test
     func productTypeSpecLoadingWithDeprecatedAsErrorValues() async throws {
-        let (spec, warnings, errors) = try await parseTestSpec(ProductTypeSpec.self, [
-            "DeprecationReason" : "no longer supported",
-            "DeprecationLevel" : "ErrOR",
-            "DefaultBuildProperties": [:],
-            "PackageTypes": ["com.apple.product-type.bundle.ui-testing"]])
+        let (spec, warnings, errors) = try await parseTestSpec(
+            ProductTypeSpec.self,
+            [
+                "DeprecationReason": "no longer supported",
+                "DeprecationLevel": "ErrOR",
+                "DefaultBuildProperties": [:],
+                "PackageTypes": ["com.apple.product-type.bundle.ui-testing"],
+            ]
+        )
         #expect(spec.deprecationInfo != nil)
         #expect(spec.deprecationInfo?.level == .error)
         #expect(spec.deprecationInfo?.reason == "no longer supported")
@@ -279,11 +305,15 @@ import SWBMacro
 
     @Test
     func productTypeSpecLoadingWithDeprecatedAsWarningValues() async throws {
-        let (spec, warnings, errors) = try await parseTestSpec(ProductTypeSpec.self, [
-            "DeprecationReason" : "no longer supported",
-            "DeprecationLevel" : "warNing",
-            "DefaultBuildProperties": [:],
-            "PackageTypes": ["com.apple.product-type.bundle.ui-testing"]])
+        let (spec, warnings, errors) = try await parseTestSpec(
+            ProductTypeSpec.self,
+            [
+                "DeprecationReason": "no longer supported",
+                "DeprecationLevel": "warNing",
+                "DefaultBuildProperties": [:],
+                "PackageTypes": ["com.apple.product-type.bundle.ui-testing"],
+            ]
+        )
         #expect(spec.deprecationInfo != nil)
         #expect(spec.deprecationInfo?.level == .warning)
         #expect(spec.deprecationInfo?.reason == "no longer supported")
@@ -301,21 +331,21 @@ import SWBMacro
         #expect(errors.count >= 1)
         XCTAssertMatch(errors[0], .prefix("expected build option definition dictionary"))
 
-        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ ["Name": ["bad"]] ]])
+        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [["Name": ["bad"]]]])
         #expect(errors.count == 2)
         XCTAssertMatch(errors[0], .prefix("expected string value for build option key 'Name'"))
         XCTAssertMatch(errors[1], .prefix("missing build option key 'Name'"))
 
-        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ ["Foo": "Bar"] ]])
+        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [["Foo": "Bar"]]])
         #expect(errors.count == 2)
         XCTAssertMatch(errors[0], .prefix("unknown build option key 'Foo'"))
         XCTAssertMatch(errors[1], .prefix("missing build option key 'Name'"))
 
-        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ ["Name": "Foo", "Type": ["bad"] as PropertyListItem]]])
+        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [["Name": "Foo", "Type": ["bad"] as PropertyListItem]]])
         #expect(errors.count == 1)
         XCTAssertMatch(errors[0], .prefix("invalid build option key 'Type'"))
 
-        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ ["Name": "Foo", "Type": "Missing"] ]])
+        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [["Name": "Foo", "Type": "Missing"]]])
         #expect(errors.count == 1)
         XCTAssertMatch(errors[0], .prefix("unknown build option type 'Missing'"))
     }
@@ -325,7 +355,7 @@ import SWBMacro
         var result: [String: PropertyListItem] = [:]
         result["Name"] = .plString(name)
         result["Type"] = .plString(type)
-        for (key,value) in data {
+        for (key, value) in data {
             result[key] = value
         }
         return result
@@ -333,18 +363,25 @@ import SWBMacro
 
     @Test
     func propertyDomainSpecPropertiesValuesParsing() async throws {
-        var (_, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ OptionData("Foo", "Enumeration", [:]) ]])
+        var (_, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [OptionData("Foo", "Enumeration", [:])]])
         #expect(warnings.count == 1)
         #expect(errors.count == 0)
         XCTAssertMatch(warnings[0], .prefix("missing required build option key 'Values'"))
 
-        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ OptionData("Foo", "String", ["Values": []]) ]])
+        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [OptionData("Foo", "String", ["Values": []])]])
         #expect(errors.count == 1)
         XCTAssertMatch(errors[0], .prefix("invalid build option key 'Values' used with type 'String'"))
 
-        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ OptionData("Foo", "Enumeration", ["Values": [], "AllowedValues": []]),
-                                                                                  OptionData("Foo1", "Enumeration", ["Values": "bad"])],
-                                                                  "Options": []])
+        (_, _, errors) = try await parseTestSpec(
+            BuildSystemSpec.self,
+            [
+                "Properties": [
+                    OptionData("Foo", "Enumeration", ["Values": [], "AllowedValues": []]),
+                    OptionData("Foo1", "Enumeration", ["Values": "bad"]),
+                ],
+                "Options": [],
+            ]
+        )
         #expect(errors.count == 3)
         XCTAssertMatch(errors[0], .prefix("cannot define both 'Properties' and 'Options'"))
         XCTAssertMatch(errors[1], .prefix("cannot specify both 'AllowedValues' and 'Values'"))
@@ -353,7 +390,7 @@ import SWBMacro
 
     @Test
     func propertyDomainSpecPropertiesCommandLineKeysParsing() async throws {
-        var (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ OptionData("Foo", "String", ["CommandLineArgs": [], "CommandLineFlag": "foo", "CommandLinePrefixFlag": "foo"]) ]])
+        var (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [OptionData("Foo", "String", ["CommandLineArgs": [], "CommandLineFlag": "foo", "CommandLinePrefixFlag": "foo"])]])
         #expect(errors.count == 2)
         // FIXME: This order is technically non-deterministic, need a fuzzy comparison.
         XCTAssertMatch(errors[0], .prefix("invalid build option key"))
@@ -361,54 +398,66 @@ import SWBMacro
         XCTAssertMatch(errors[1], .prefix("invalid build option key"))
         XCTAssertMatch(errors[1], .contains("cannot combine with"))
 
-        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ OptionData("Foo", "String", ["CommandLineFlag": "foo", "CommandLinePrefixFlag": "foo"]) ]])
+        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [OptionData("Foo", "String", ["CommandLineFlag": "foo", "CommandLinePrefixFlag": "foo"])]])
         #expect(errors.count == 1)
         XCTAssertMatch(errors[0], .prefix("invalid build option key"))
         XCTAssertMatch(errors[0], .contains("cannot combine with"))
 
-        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ OptionData("Foo", "String", ["CommandLineArgs": PropertyListItem.plData(Array("bad".utf8))]) ]])
+        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [OptionData("Foo", "String", ["CommandLineArgs": PropertyListItem.plData(Array("bad".utf8))])]])
         #expect(errors.count == 1)
         XCTAssertMatch(errors[0], .prefix("expected string, array, or dict value for build option key 'CommandLineArgs'"))
 
-        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ OptionData("Foo", "String", ["CommandLineFlag": ["bad"]]) ]])
+        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [OptionData("Foo", "String", ["CommandLineFlag": ["bad"]])]])
         #expect(errors.count == 1)
         XCTAssertMatch(errors[0], .prefix("expected string value for build option key 'CommandLineFlag'"))
 
-        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ OptionData("Foo", "String", ["CommandLinePrefixFlag": ["bad"]]) ]])
+        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [OptionData("Foo", "String", ["CommandLinePrefixFlag": ["bad"]])]])
         #expect(errors.count == 1)
         XCTAssertMatch(errors[0], .prefix("expected string value for build option key 'CommandLinePrefixFlag'"))
     }
 
     @Test
     func propertyDomainSpecPropertiesCommandLineKeysListTypeParsing() async throws {
-        var (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ OptionData("Foo", "StringList", ["Values": []]) ]])
+        var (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [OptionData("Foo", "StringList", ["Values": []])]])
         #expect(errors.count == 1)
         XCTAssertMatch(errors[0], .prefix("invalid build option key 'Values' used with type 'StringList'"))
 
         // Check list arguments.
-        (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [
-            OptionData("Foo", "StringList", ["CommandLineArgs": "foo"]),
-            OptionData("Foo2", "StringList", ["CommandLineArgs": ["foo2"]]),
-            OptionData("Foo3", "StringList", ["CommandLineArgs": ""]),
-            OptionData("Foo4", "StringList", ["CommandLineArgs": [["bad"]]]) ]])
+        (spec, warnings, errors) = try await parseTestSpec(
+            BuildSystemSpec.self,
+            [
+                "Properties": [
+                    OptionData("Foo", "StringList", ["CommandLineArgs": "foo"]),
+                    OptionData("Foo2", "StringList", ["CommandLineArgs": ["foo2"]]),
+                    OptionData("Foo3", "StringList", ["CommandLineArgs": ""]),
+                    OptionData("Foo4", "StringList", ["CommandLineArgs": [["bad"]]]),
+                ]
+            ]
+        )
         #expect(warnings.count == 0)
         #expect(errors.count == 1)
         #expect(errors.count == 1)
         XCTAssertMatch(errors[0], .prefix("expected string in 'CommandLineArgs' for option 'Foo4'"))
         #expect(spec.buildOptions.count == 4)
         #expect(spec.buildOptions[0].name == "Foo")
-        guard case .args(let fooArg)? = spec.buildOptions[0].otherValueDefn?.commandLineTemplate, fooArg.stringRep == "foo"  else { fatalError("unexpected template") }
+        guard case .args(let fooArg)? = spec.buildOptions[0].otherValueDefn?.commandLineTemplate, fooArg.stringRep == "foo" else { fatalError("unexpected template") }
         #expect(spec.buildOptions[1].name == "Foo2")
         guard case .args(let foo2Args)? = spec.buildOptions[1].otherValueDefn?.commandLineTemplate, foo2Args.stringRep == "foo2" else { fatalError("unexpected template") }
         #expect(spec.buildOptions[2].name == "Foo3")
         guard case .empty? = spec.buildOptions[2].otherValueDefn?.commandLineTemplate else { fatalError() }
 
         // Check flag arguments.
-        (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [
-            OptionData("Foo", "StringList", ["CommandLineFlag": ""]),
-            OptionData("Foo2", "StringList", ["CommandLineFlag": "foo2flag"]),
-            OptionData("Bar", "StringList", ["CommandLinePrefixFlag": ""]),
-            OptionData("Bar2", "StringList", ["CommandLinePrefixFlag": "bar2flag"]),]])
+        (spec, warnings, errors) = try await parseTestSpec(
+            BuildSystemSpec.self,
+            [
+                "Properties": [
+                    OptionData("Foo", "StringList", ["CommandLineFlag": ""]),
+                    OptionData("Foo2", "StringList", ["CommandLineFlag": "foo2flag"]),
+                    OptionData("Bar", "StringList", ["CommandLinePrefixFlag": ""]),
+                    OptionData("Bar2", "StringList", ["CommandLinePrefixFlag": "bar2flag"]),
+                ]
+            ]
+        )
         #expect(warnings.count == 0)
         #expect(errors.count == 0)
         #expect(spec.buildOptions.count == 4)
@@ -419,22 +468,28 @@ import SWBMacro
         #expect(spec.buildOptions[2].name == "Bar")
         guard case .literal? = spec.buildOptions[2].otherValueDefn?.commandLineTemplate else { fatalError("unexpected template") }
         #expect(spec.buildOptions[3].name == "Bar2")
-        guard case  .prefixFlag(let bar2expr)? = spec.buildOptions[3].otherValueDefn?.commandLineTemplate, bar2expr.stringRep == "bar2flag" else { fatalError("unexpected template") }
+        guard case .prefixFlag(let bar2expr)? = spec.buildOptions[3].otherValueDefn?.commandLineTemplate, bar2expr.stringRep == "bar2flag" else { fatalError("unexpected template") }
     }
 
     @Test
     func propertyDomainSpecPropertiesCommandLineKeysScalarTypeValuesParsing() async throws {
-        let z = OptionData("Opt", "Enumeration", ["Values": [
-            [ "Foo1": "Bar"],
-            [ "Value": "Foo2", "Foo1": "Bar" ],
-            [ "Value": "Foo2" ],
-            [ "Value": "Foo3", "DisplayName": "X", "Outputs": "X" ] as PropertyListItem,
-            [ "Value": "Foo4", "CommandLine": ["bad"]] as PropertyListItem,
-            [ "Value": "Foo5", "CommandLine": "good thing", "CommandLineFlag": "bad" ] as PropertyListItem,
-            "Foo5",
-            PropertyListItem.plData(Array("bad".utf8)),
-        ]])
-        var (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ z ]])
+        let z = OptionData(
+            "Opt",
+            "Enumeration",
+            [
+                "Values": [
+                    ["Foo1": "Bar"],
+                    ["Value": "Foo2", "Foo1": "Bar"],
+                    ["Value": "Foo2"],
+                    ["Value": "Foo3", "DisplayName": "X", "Outputs": "X"] as PropertyListItem,
+                    ["Value": "Foo4", "CommandLine": ["bad"]] as PropertyListItem,
+                    ["Value": "Foo5", "CommandLine": "good thing", "CommandLineFlag": "bad"] as PropertyListItem,
+                    "Foo5",
+                    PropertyListItem.plData(Array("bad".utf8)),
+                ]
+            ]
+        )
+        var (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [z]])
         #expect(warnings.count == 0)
         #expect(errors.count == 8)
         XCTAssertMatch(errors[0], .prefix("unknown build option value key 'Foo1' for value '<UNKNOWN>' in option 'Opt'"))
@@ -458,11 +513,23 @@ import SWBMacro
         // The state of Foo5 is undefined due to the error reported above.
 
         // Check CommandLineArgs.
-        (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ OptionData("Opt", "Enumeration", [
-            "Values": [
-                [ "Value": "Foo1", "CommandLineArgs": "bad" ] as PropertyListItem,
-                [ "Value": "Foo2", "CommandLineArgs": ["thing1 thing2", "thing3", ["bad"]] as PropertyListItem] as PropertyListItem,
-            ] as PropertyListItem]) ] as PropertyListItem])
+        (spec, warnings, errors) = try await parseTestSpec(
+            BuildSystemSpec.self,
+            [
+                "Properties": [
+                    OptionData(
+                        "Opt",
+                        "Enumeration",
+                        [
+                            "Values": [
+                                ["Value": "Foo1", "CommandLineArgs": "bad"] as PropertyListItem,
+                                ["Value": "Foo2", "CommandLineArgs": ["thing1 thing2", "thing3", ["bad"]] as PropertyListItem] as PropertyListItem,
+                            ] as PropertyListItem
+                        ]
+                    )
+                ] as PropertyListItem
+            ]
+        )
         #expect(warnings.count == 0)
         #expect(errors.count == 2)
         XCTAssertMatch(errors[0], .prefix("expected array value for build option value key 'CommandLineArgs'"))
@@ -476,12 +543,24 @@ import SWBMacro
         guard case .args(let foo2items)? = values["Foo2"]!.commandLineTemplate, foo2items.stringRep == "thing1\\ thing2 thing3" else { fatalError() }
 
         // Check CommandLineFlag.
-        (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ OptionData("Opt", "Enumeration", [
-            "Values": [
-                [ "Value": ["Bad"]],
-                [ "Value": "Foo1", "CommandLineFlag": ["bad"]] as PropertyListItem,
-                [ "Value": "Foo2", "CommandLineFlag": "good" ] as PropertyListItem,
-            ]]) ]])
+        (spec, warnings, errors) = try await parseTestSpec(
+            BuildSystemSpec.self,
+            [
+                "Properties": [
+                    OptionData(
+                        "Opt",
+                        "Enumeration",
+                        [
+                            "Values": [
+                                ["Value": ["Bad"]],
+                                ["Value": "Foo1", "CommandLineFlag": ["bad"]] as PropertyListItem,
+                                ["Value": "Foo2", "CommandLineFlag": "good"] as PropertyListItem,
+                            ]
+                        ]
+                    )
+                ]
+            ]
+        )
         #expect(warnings.count == 0)
         #expect(errors.count == 3)
         XCTAssertMatch(errors[0], .prefix("invalid build option value key 'Value'"))
@@ -496,8 +575,22 @@ import SWBMacro
         guard case .flag(let foo2expr)? = values["Foo2"]!.commandLineTemplate, foo2expr.stringRep == "good" else { fatalError() }
 
         // Check Boolean specific checks.
-        (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ OptionData("Opt", "Boolean", ["Values": [
-            [ "Value": "Hello" ], [ "Value": "NO" ], [ "Value": "YES" ] ]]) ]])
+        (spec, warnings, errors) = try await parseTestSpec(
+            BuildSystemSpec.self,
+            [
+                "Properties": [
+                    OptionData(
+                        "Opt",
+                        "Boolean",
+                        [
+                            "Values": [
+                                ["Value": "Hello"], ["Value": "NO"], ["Value": "YES"],
+                            ]
+                        ]
+                    )
+                ]
+            ]
+        )
         #expect(warnings.count == 0)
         #expect(errors.count == 1)
         XCTAssertMatch(errors[0], .prefix("unexpected 'Hello' value definition"))
@@ -505,13 +598,18 @@ import SWBMacro
 
     @Test
     func propertyDomainSpecPropertiesCommandLineKeysScalarTypeCommandLineArgsParsing() async throws {
-        var (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [
-            OptionData("Opt0", "String", ["CommandLineArgs": []]),
-            OptionData("Opt1", "String", ["CommandLineArgs": ""]),
-            OptionData("Opt2", "String", ["CommandLineFlag": ""]),
-            OptionData("Opt3", "String", ["CommandLinePrefixFlag": ""]),
-            OptionData("Opt4", "String", [:]),
-        ]])
+        var (spec, warnings, errors) = try await parseTestSpec(
+            BuildSystemSpec.self,
+            [
+                "Properties": [
+                    OptionData("Opt0", "String", ["CommandLineArgs": []]),
+                    OptionData("Opt1", "String", ["CommandLineArgs": ""]),
+                    OptionData("Opt2", "String", ["CommandLineFlag": ""]),
+                    OptionData("Opt3", "String", ["CommandLinePrefixFlag": ""]),
+                    OptionData("Opt4", "String", [:]),
+                ]
+            ]
+        )
         #expect(warnings.count == 0)
         #expect(errors.count == 0)
 
@@ -529,12 +627,17 @@ import SWBMacro
         #expect(spec.buildOptions[4].otherValueDefn == nil)
 
         // This is split just for compile time reasons. :(
-        (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [
-            OptionData("Opt4", "String", ["CommandLineArgs": ["foo"]]),
-            OptionData("Opt5", "String", ["CommandLineArgs": "foo"]),
-            OptionData("Opt6", "String", ["CommandLineFlag": "foo"]),
-            OptionData("Opt7", "String", ["CommandLinePrefixFlag": "foo"]),
-        ]])
+        (spec, warnings, errors) = try await parseTestSpec(
+            BuildSystemSpec.self,
+            [
+                "Properties": [
+                    OptionData("Opt4", "String", ["CommandLineArgs": ["foo"]]),
+                    OptionData("Opt5", "String", ["CommandLineArgs": "foo"]),
+                    OptionData("Opt6", "String", ["CommandLineFlag": "foo"]),
+                    OptionData("Opt7", "String", ["CommandLinePrefixFlag": "foo"]),
+                ]
+            ]
+        )
         #expect(warnings.count == 0)
         #expect(errors.count == 0)
         #expect(spec.buildOptions.count == 4)
@@ -547,19 +650,31 @@ import SWBMacro
         #expect(spec.buildOptions[2].name == "Opt6")
         guard case .flag(let opt2expr)? = spec.buildOptions[2].otherValueDefn?.commandLineTemplate, opt2expr.stringRep == "foo" else { fatalError() }
         #expect(spec.buildOptions[3].name == "Opt7")
-        guard case  .prefixFlag(let opt3expr)? = spec.buildOptions[3].otherValueDefn?.commandLineTemplate, opt3expr.stringRep == "foo" else { fatalError() }
+        guard case .prefixFlag(let opt3expr)? = spec.buildOptions[3].otherValueDefn?.commandLineTemplate, opt3expr.stringRep == "foo" else { fatalError() }
 
         // Check string dict args handling.
-        (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [
-            OptionData("Opt0", "String", ["CommandLineArgs": [
-                "": "",
-                "foo0": "",
-                "foo1": [] as PropertyListItem,
-                "foo2": "hello little",
-                "foo3": ["hello little", ["bad"], "world"] as PropertyListItem,
-                "foo4": ["bad": "bad"],
-                "<<otherwise>>": "otherwise" ] as PropertyListItem]),
-        ]])
+        (spec, warnings, errors) = try await parseTestSpec(
+            BuildSystemSpec.self,
+            [
+                "Properties": [
+                    OptionData(
+                        "Opt0",
+                        "String",
+                        [
+                            "CommandLineArgs": [
+                                "": "",
+                                "foo0": "",
+                                "foo1": [] as PropertyListItem,
+                                "foo2": "hello little",
+                                "foo3": ["hello little", ["bad"], "world"] as PropertyListItem,
+                                "foo4": ["bad": "bad"],
+                                "<<otherwise>>": "otherwise",
+                            ] as PropertyListItem
+                        ]
+                    )
+                ]
+            ]
+        )
         #expect(warnings.count == 0)
         #expect(errors.count == 2)
         XCTAssertMatch(errors[0], .prefix("expected string for 'foo3' in 'CommandLineArgs'"))
@@ -574,11 +689,23 @@ import SWBMacro
         guard case .args(let foo3args)? = values["foo3"]?.commandLineTemplate, foo3args.stringRep == "hello\\ little world" else { fatalError() }
 
         // Check boolean dict args handling.
-        (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [
-            OptionData("Opt0", "Boolean", ["CommandLineArgs": [
-                "NO": "thisisno",
-                "YES": "thisisyes" ]])
-        ]])
+        (spec, warnings, errors) = try await parseTestSpec(
+            BuildSystemSpec.self,
+            [
+                "Properties": [
+                    OptionData(
+                        "Opt0",
+                        "Boolean",
+                        [
+                            "CommandLineArgs": [
+                                "NO": "thisisno",
+                                "YES": "thisisyes",
+                            ]
+                        ]
+                    )
+                ]
+            ]
+        )
         #expect(warnings.count == 0)
         #expect(errors.count == 0)
         #expect(spec.buildOptions.count == 1)
@@ -586,14 +713,25 @@ import SWBMacro
         guard case .args(let yesArgs)? = spec.buildOptions[0].otherValueDefn?.commandLineTemplate, yesArgs.stringRep == "thisisyes" else { fatalError() }
 
         // Check dict value merging.
-        (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [
-            OptionData("Opt0", "Enumeration", ["Values": [
-                ["Value": "Value0"],
-                ["Value": "Value1", "CommandLineFlag": "OK"],
-                ["Value": "Value2"],
-                ["Value": "Empty", "CommandLineFlag": ""]
-            ], "CommandLineArgs": ["Value0": "", "Value1": "BAD", "Value2": "INHERITED", "Value3": "INHERITED2"]]),
-        ]])
+        (spec, warnings, errors) = try await parseTestSpec(
+            BuildSystemSpec.self,
+            [
+                "Properties": [
+                    OptionData(
+                        "Opt0",
+                        "Enumeration",
+                        [
+                            "Values": [
+                                ["Value": "Value0"],
+                                ["Value": "Value1", "CommandLineFlag": "OK"],
+                                ["Value": "Value2"],
+                                ["Value": "Empty", "CommandLineFlag": ""],
+                            ], "CommandLineArgs": ["Value0": "", "Value1": "BAD", "Value2": "INHERITED", "Value3": "INHERITED2"],
+                        ]
+                    )
+                ]
+            ]
+        )
         #expect(warnings.count == 0)
         #expect(errors.count == 1)
         XCTAssertMatch(errors[0], .prefix("invalid key 'Value1' in 'CommandLineArgs', a command line template was already defined"))
@@ -606,13 +744,24 @@ import SWBMacro
         guard case .empty? = values["Empty"]!.commandLineTemplate else { fatalError() }
 
         // Check array value merging.
-        (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [
-            OptionData("Opt0", "Enumeration", ["Values": [
-                ["Value": "Value0"],
-                ["Value": "Value4", "CommandLineFlag": "OK"],
-                ["Value": "Empty", "CommandLineFlag": ""]
-            ], "CommandLineArgs": ["INHERITED"]]),
-        ]])
+        (spec, warnings, errors) = try await parseTestSpec(
+            BuildSystemSpec.self,
+            [
+                "Properties": [
+                    OptionData(
+                        "Opt0",
+                        "Enumeration",
+                        [
+                            "Values": [
+                                ["Value": "Value0"],
+                                ["Value": "Value4", "CommandLineFlag": "OK"],
+                                ["Value": "Empty", "CommandLineFlag": ""],
+                            ], "CommandLineArgs": ["INHERITED"],
+                        ]
+                    )
+                ]
+            ]
+        )
         #expect(warnings.count == 0)
         #expect(errors.count == 0)
         values = spec.buildOptions[0].valueDefns!
@@ -624,14 +773,14 @@ import SWBMacro
 
     @Test
     func propertyDomainSpecPropertiesCommandConditionParsing() async throws {
-        var (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ OptionData("Foo", "String", ["Condition": "$(Bar) == bar"]) ]])
+        var (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [OptionData("Foo", "String", ["Condition": "$(Bar) == bar"])]])
         #expect(errors.count == 0)
 
-        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ OptionData("Foo", "String", ["Condition": ["$(Bar) == bar"]]) ]])
+        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [OptionData("Foo", "String", ["Condition": ["$(Bar) == bar"]])]])
         #expect(errors.count == 1)
         XCTAssertMatch(errors[0], .prefix("expected string value for build option key \'Condition\'"))
 
-        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [ OptionData("Foo", "String", ["Condition": "$(Bar == bar"]) ]])
+        (_, _, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [OptionData("Foo", "String", ["Condition": "$(Bar == bar"])]])
         #expect(errors.count == 1)
         XCTAssertMatch(errors[0], .prefix("unable to parse value for build option key \'Condition\'"))
     }
@@ -639,17 +788,27 @@ import SWBMacro
     @Test
     func propertyDomainSpecPropertiesAdditionalLinkerArgsParsing() async throws {
         do {
-            let (_, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [
-                OptionData("Opt0", "String", ["AdditionalLinkerArgs": []]),
-            ]])
+            let (_, warnings, errors) = try await parseTestSpec(
+                BuildSystemSpec.self,
+                [
+                    "Properties": [
+                        OptionData("Opt0", "String", ["AdditionalLinkerArgs": []])
+                    ]
+                ]
+            )
             #expect(warnings == [])
             XCTAssertMatch(errors, [.prefix("expected dictionary value for build option key 'AdditionalLinkerArgs'")])
         }
 
         do {
-            let (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [
-                OptionData("Opt0", "Enumeration", ["Values": [], "AdditionalLinkerArgs": ["SomeKey": "Value"]]),
-            ]])
+            let (spec, warnings, errors) = try await parseTestSpec(
+                BuildSystemSpec.self,
+                [
+                    "Properties": [
+                        OptionData("Opt0", "Enumeration", ["Values": [], "AdditionalLinkerArgs": ["SomeKey": "Value"]])
+                    ]
+                ]
+            )
             #expect(warnings == [])
             XCTAssertMatch(errors, [])
             #expect(spec.buildOptions.count == 1)
@@ -663,12 +822,24 @@ import SWBMacro
         }
 
         do {
-            let (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [
-                OptionData("Opt0", "Boolean", ["AdditionalLinkerArgs": [
-                    "NO": "NOValue",
-                    "YES": ["YESValue"],
-                    "BAD": "BADValue"]]),
-            ]])
+            let (spec, warnings, errors) = try await parseTestSpec(
+                BuildSystemSpec.self,
+                [
+                    "Properties": [
+                        OptionData(
+                            "Opt0",
+                            "Boolean",
+                            [
+                                "AdditionalLinkerArgs": [
+                                    "NO": "NOValue",
+                                    "YES": ["YESValue"],
+                                    "BAD": "BADValue",
+                                ]
+                            ]
+                        )
+                    ]
+                ]
+            )
             #expect(warnings == [])
             XCTAssertMatch(errors, [.prefix("unexpected 'BAD' linker args")])
             #expect(spec.buildOptions.count == 1)
@@ -688,18 +859,30 @@ import SWBMacro
         }
 
         do {
-            let (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [
-                OptionData("Opt0", "String", [
-                    "CommandLineArgs": [
-                        "": ["xxx"],
-                        "defined": ["xxx"],
-                        "undefined": ["xxx"],
-                        "<<otherwise>>": ["xxx"]],
-                    "AdditionalLinkerArgs": [
-                        "": "EmptyValue",
-                        "defined": ["DefinedValue"],
-                        "<<otherwise>>": ["OtherValue"]]]),
-            ]])
+            let (spec, warnings, errors) = try await parseTestSpec(
+                BuildSystemSpec.self,
+                [
+                    "Properties": [
+                        OptionData(
+                            "Opt0",
+                            "String",
+                            [
+                                "CommandLineArgs": [
+                                    "": ["xxx"],
+                                    "defined": ["xxx"],
+                                    "undefined": ["xxx"],
+                                    "<<otherwise>>": ["xxx"],
+                                ],
+                                "AdditionalLinkerArgs": [
+                                    "": "EmptyValue",
+                                    "defined": ["DefinedValue"],
+                                    "<<otherwise>>": ["OtherValue"],
+                                ],
+                            ]
+                        )
+                    ]
+                ]
+            )
             #expect(warnings == [])
             #expect(errors == [])
             #expect(spec.buildOptions.count == 1)
@@ -709,8 +892,7 @@ import SWBMacro
                 #expect(valueDefns.count == 2)
                 #expect(valueDefns["defined"]?.additionalLinkerArgs?.stringRep == "DefinedValue")
                 #expect(valueDefns["undefined"]?.additionalLinkerArgs?.stringRep == "OtherValue")
-            }
-            else {
+            } else {
                 Issue.record("opt.valueDefns is unexpectedly nil")
             }
 
@@ -727,15 +909,27 @@ import SWBMacro
 
         // Test an edge case where there is only an empty and an otherwise definition.
         do {
-            let (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [
-                OptionData("Opt0", "String", [
-                    "CommandLineArgs": [
-                        "": ["xxx"],
-                        "<<otherwise>>": ["xxx"]],
-                    "AdditionalLinkerArgs": [
-                        "": "EmptyValue",
-                        "<<otherwise>>": ["OtherValue"]]]),
-            ]])
+            let (spec, warnings, errors) = try await parseTestSpec(
+                BuildSystemSpec.self,
+                [
+                    "Properties": [
+                        OptionData(
+                            "Opt0",
+                            "String",
+                            [
+                                "CommandLineArgs": [
+                                    "": ["xxx"],
+                                    "<<otherwise>>": ["xxx"],
+                                ],
+                                "AdditionalLinkerArgs": [
+                                    "": "EmptyValue",
+                                    "<<otherwise>>": ["OtherValue"],
+                                ],
+                            ]
+                        )
+                    ]
+                ]
+            )
             #expect(warnings == [])
             #expect(errors == [])
             #expect(spec.buildOptions.count == 1)
@@ -757,11 +951,17 @@ import SWBMacro
 
     @Test
     func propertyDomainSpecMacroBinding() async throws {
-        let (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [
-            OptionData("Foo", "Boolean", [:]),
-            OptionData("Foo2", "String", [:]),
-            OptionData("Foo3", "StringList", [:]),
-            OptionData("Foo3", "String", [:])]])
+        let (spec, warnings, errors) = try await parseTestSpec(
+            BuildSystemSpec.self,
+            [
+                "Properties": [
+                    OptionData("Foo", "Boolean", [:]),
+                    OptionData("Foo2", "String", [:]),
+                    OptionData("Foo3", "StringList", [:]),
+                    OptionData("Foo3", "String", [:]),
+                ]
+            ]
+        )
         #expect(warnings.count == 0)
         #expect(errors.count == 1)
         XCTAssertMatch(errors[0], .prefix("unable to declare macro for option 'Foo3'"))
@@ -782,9 +982,15 @@ import SWBMacro
 
     @Test
     func propertyDomainSpecMacroDefaultValues() async throws {
-        let (spec, warnings, errors) = try await parseTestSpec(BuildSystemSpec.self, ["Properties": [
-            OptionData("Foo", "Boolean", ["DefaultValue": "NO"]),
-            OptionData("Foo2", "String", ["DefaultValue": ["bad"]])]])
+        let (spec, warnings, errors) = try await parseTestSpec(
+            BuildSystemSpec.self,
+            [
+                "Properties": [
+                    OptionData("Foo", "Boolean", ["DefaultValue": "NO"]),
+                    OptionData("Foo2", "String", ["DefaultValue": ["bad"]]),
+                ]
+            ]
+        )
         #expect(warnings.count == 0)
         #expect(errors.count == 1)
         XCTAssertMatch(errors[0], .prefix("expected string value for build option key 'DefaultValue' for option 'Foo2'"))
@@ -799,15 +1005,28 @@ import SWBMacro
 
     @Test
     func buildSettingWithBasedOnSpec() async throws {
-        let (rootspec, rw, re) = try await parseTestSpec(BuildSettingsSpec.self, ["Properties": [
-            OptionData("FOO", "String", ["DefaultValue": "$(inherited) no"]),
-            OptionData("BAR", "String", ["DefaultValue": "i386"])]])
+        let (rootspec, rw, re) = try await parseTestSpec(
+            BuildSettingsSpec.self,
+            [
+                "Properties": [
+                    OptionData("FOO", "String", ["DefaultValue": "$(inherited) no"]),
+                    OptionData("BAR", "String", ["DefaultValue": "i386"]),
+                ]
+            ]
+        )
         #expect(rootspec.buildOptions.count == 2)
         #expect(rw.count == 0)
         #expect(re.count == 0)
 
-        let (spec, warnings, errors) = try await parseTestSpec(BuildSettingsSpec.self, ["Properties": [
-            OptionData("FOO", "String", ["DefaultValue": "$(inherited) yes"])]], rootspec)
+        let (spec, warnings, errors) = try await parseTestSpec(
+            BuildSettingsSpec.self,
+            [
+                "Properties": [
+                    OptionData("FOO", "String", ["DefaultValue": "$(inherited) yes"])
+                ]
+            ],
+            rootspec
+        )
         #expect(spec.buildOptions.count == 1)
         #expect(warnings.count == 0)
         #expect(errors.count == 0)
@@ -824,20 +1043,30 @@ import SWBMacro
 
     @Test
     func buildPropertiesWithConditionsAndBasedOnSpec() async throws {
-        let (rootspec, rw, re) = try await parseTestSpec(PackageTypeSpec.self, [
-            "DefaultBuildSettings": [
-                "OTHER_CFLAGS": "$(inherited) base_flags",
-                "OTHER_CFLAGS[sdk=iphoneos]": "$(inherited) base_iphoneos",
-                "OTHER_LDFLAGS": "base"
-            ]])
+        let (rootspec, rw, re) = try await parseTestSpec(
+            PackageTypeSpec.self,
+            [
+                "DefaultBuildSettings": [
+                    "OTHER_CFLAGS": "$(inherited) base_flags",
+                    "OTHER_CFLAGS[sdk=iphoneos]": "$(inherited) base_iphoneos",
+                    "OTHER_LDFLAGS": "base",
+                ]
+            ]
+        )
         #expect(rootspec.buildSettings.valueAssignments.count == 3)
         #expect(rw.count == 0)
         #expect(re.count == 0)
 
-        let (spec, warnings, errors) = try await parseTestSpec(PackageTypeSpec.self, [
-            "DefaultBuildSettings": [
-                "OTHER_CFLAGS": "$(inherited) super_flags",
-                "OTHER_CFLAGS[sdk=iphoneos]": "$(inherited) super_iphoneos"]], rootspec)
+        let (spec, warnings, errors) = try await parseTestSpec(
+            PackageTypeSpec.self,
+            [
+                "DefaultBuildSettings": [
+                    "OTHER_CFLAGS": "$(inherited) super_flags",
+                    "OTHER_CFLAGS[sdk=iphoneos]": "$(inherited) super_iphoneos",
+                ]
+            ],
+            rootspec
+        )
         #expect(spec.buildSettings.valueAssignments.count == 3)
         #expect(warnings.count == 0)
         #expect(errors.count == 0)
@@ -859,14 +1088,16 @@ import SWBMacro
 
         // Check diagnostics using synthetic data.
         do {
-            let (spec, warnings, errors) = try await parseTestSpec(GenericCommandLineToolSpec.self,
-                                                             [
-                                                                "Name": "Mock",
-                                                                "RuleName": "Mock [output] [input]",
-                                                                "Type": "Compiler",
-                                                                "CommandLine": ["foo"],
-                                                                "Outputs": ["$(((bogus", "$(OutputPath)"]
-                                                             ])
+            let (spec, warnings, errors) = try await parseTestSpec(
+                GenericCommandLineToolSpec.self,
+                [
+                    "Name": "Mock",
+                    "RuleName": "Mock [output] [input]",
+                    "Type": "Compiler",
+                    "CommandLine": ["foo"],
+                    "Outputs": ["$(((bogus", "$(OutputPath)"],
+                ]
+            )
             #expect(warnings == [])
             XCTAssertMatch(errors, [.prefix("macro parsing error in 'Outputs'")])
 
@@ -888,7 +1119,7 @@ import SWBMacro
         #expect(errors.isEmpty, "Parsing compiler spec resulted in errors: \(errors)")
 
         // Check that unsupported values result in errors.
-        (_, _, errors) = try await parseTestSpec(GenericCompilerSpec.self, ["CommandLine": "", "RuleName": "", "Architectures": "arm64e"])            // Other string values not supported.
+        (_, _, errors) = try await parseTestSpec(GenericCompilerSpec.self, ["CommandLine": "", "RuleName": "", "Architectures": "arm64e"])  // Other string values not supported.
         #expect(errors.count == 1)
         XCTAssertMatch(errors[0], .prefix("unexpected item: \"arm64e\" while parsing key Architectures"))
     }
@@ -927,7 +1158,7 @@ import SWBMacro
 
         // Validate loading of supported language versions
         let swiftCompilerSpec = try core.specRegistry.getSpec() as SwiftCompilerSpec
-        #expect(swiftCompilerSpec.supportedLanguageVersions == [ Version(4,0), Version(4,2), Version(5,0), Version(6, 0)])
+        #expect(swiftCompilerSpec.supportedLanguageVersions == [Version(4, 0), Version(4, 2), Version(5, 0), Version(6, 0)])
     }
 
     @Test
diff --git a/Tests/SWBCoreTests/SpecParserTests.swift b/Tests/SWBCoreTests/SpecParserTests.swift
index 696d6a79..4ef1ad6b 100644
--- a/Tests/SWBCoreTests/SpecParserTests.swift
+++ b/Tests/SWBCoreTests/SpecParserTests.swift
@@ -28,7 +28,7 @@ fileprivate final class MockSpecType: SpecType {
 }
 
 @Suite fileprivate struct SpecParserTests {
-    final class TestDataDelegate : SpecParserDelegate {
+    final class TestDataDelegate: SpecParserDelegate {
         final class MockSpecRegistryDelegate: SpecRegistryDelegate, Sendable {
             private let _diagnosticsEngine: DiagnosticsEngine
 
@@ -100,9 +100,9 @@ fileprivate final class MockSpecType: SpecType {
         let data: [String: PropertyListItem] = [
             "False0": "no", "False1": "No", "False2": "NO", "False3": "0",
             "True0": "yes", "True1": "Yes", "True2": "YES", "True3": "1",
-            "Other0": "BOGUS", "Other1": ["x"]
+            "Other0": "BOGUS", "Other1": ["x"],
         ]
-        let (_,warnings,errors) = await parserForTestData(data) { parser in
+        let (_, warnings, errors) = await parserForTestData(data) { parser in
             #expect(!parser.parseRequiredBool("False0"))
             #expect(!parser.parseRequiredBool("False1"))
             #expect(!parser.parseRequiredBool("False2"))
@@ -130,7 +130,7 @@ fileprivate final class MockSpecType: SpecType {
             "B": "bValue",
             "C": ["x"],
         ]
-        let (_,warnings,errors) = await parserForTestData(data) { parser in
+        let (_, warnings, errors) = await parserForTestData(data) { parser in
             #expect(parser.parseString("A")! == "aValue")
             #expect(parser.parseRequiredString("B") == "bValue")
             #expect(parser.parseString("C") == nil)
@@ -147,10 +147,10 @@ fileprivate final class MockSpecType: SpecType {
     func stringList() async {
         let data: [String: PropertyListItem] = [
             "A": ["a", "b", "c"],
-            "B": ["a", ["b":"c"], "d"],
-            "C": "x"
+            "B": ["a", ["b": "c"], "d"],
+            "C": "x",
         ]
-        let (_,warnings,errors) = await parserForTestData(data) { parser in
+        let (_, warnings, errors) = await parserForTestData(data) { parser in
             #expect(parser.parseStringList("A")! == ["a", "b", "c"])
             #expect(parser.parseRequiredStringList("B") == ["a", "<invalid>", "d"])
             #expect(parser.parseStringList("C") == nil)
@@ -171,7 +171,7 @@ fileprivate final class MockSpecType: SpecType {
             "B": "a b c",
             "C": ["bad": "bad"],
         ]
-        let (_,warnings,errors) = await parserForTestData(data) { parser in
+        let (_, warnings, errors) = await parserForTestData(data) { parser in
             #expect(parser.parseCommandLineString("A")! == ["a", "b", "c"])
             #expect(parser.parseCommandLineString("B")! == ["a", "b", "c"])
             #expect(parser.parseCommandLineString("C") == nil)
@@ -185,8 +185,8 @@ fileprivate final class MockSpecType: SpecType {
 
     @Test
     func extraKeys() async {
-        let data: [String: PropertyListItem] = [ "A": "a", "B": "b" ]
-        let (_,warnings,errors) = await parserForTestData(data) { parser in
+        let data: [String: PropertyListItem] = ["A": "a", "B": "b"]
+        let (_, warnings, errors) = await parserForTestData(data) { parser in
             #expect(parser.parseString("A") == "a")
         }
         #expect(warnings == ["unused key 'B'"])
@@ -205,12 +205,12 @@ fileprivate final class MockSpecType: SpecType {
                 "NAME4[sdk=iphoneos*][arch=arm7]": "iphoneos arm7",
             ] as PropertyListItem,
             "BAD0": ["NAME2": "$(BAD"] as PropertyListItem,
-            "BAD1": ["BAD": ["BAD":"BAD"]] as PropertyListItem,
+            "BAD1": ["BAD": ["BAD": "BAD"]] as PropertyListItem,
             "BAD2": ["BAD": ["OK", ["BAD"]] as PropertyListItem] as PropertyListItem,
             "BAD3": ["BAD": ["$(BAD"]] as PropertyListItem,
-            "BAD4": ["BAD[sdk=": "bad"] as PropertyListItem
+            "BAD4": ["BAD[sdk=": "bad"] as PropertyListItem,
         ]
-        let (_,warnings,errors) = await parserForTestData(data) { parser in
+        let (_, warnings, errors) = await parserForTestData(data) { parser in
             let settings = parser.parseRequiredBuildSettings("A")
             let NAME1 = settings.namespace.lookupMacroDeclaration("NAME1")!
             #expect(settings.lookupMacro(NAME1)?.expression.stringRep == "VALUE")
@@ -219,14 +219,18 @@ fileprivate final class MockSpecType: SpecType {
             let NAME4 = settings.namespace.lookupMacroDeclaration("NAME4")!
             let macro4 = settings.lookupMacro(NAME4)
             #expect(macro4?.expression.stringRep == "macos")
-            #expect(macro4?.conditions?.conditions == [
-                MacroCondition(parameter: settings.namespace.lookupConditionParameter("sdk")!, valuePattern: "macos*"),
-            ])
+            #expect(
+                macro4?.conditions?.conditions == [
+                    MacroCondition(parameter: settings.namespace.lookupConditionParameter("sdk")!, valuePattern: "macos*")
+                ]
+            )
             #expect(macro4?.next?.expression.stringRep == "iphoneos arm7")
-            #expect(macro4?.next?.conditions?.conditions == [
-                MacroCondition(parameter: settings.namespace.lookupConditionParameter("sdk")!, valuePattern: "iphoneos*"),
-                MacroCondition(parameter: settings.namespace.lookupConditionParameter("arch")!, valuePattern: "arm7"),
-            ])
+            #expect(
+                macro4?.next?.conditions?.conditions == [
+                    MacroCondition(parameter: settings.namespace.lookupConditionParameter("sdk")!, valuePattern: "iphoneos*"),
+                    MacroCondition(parameter: settings.namespace.lookupConditionParameter("arch")!, valuePattern: "arm7"),
+                ]
+            )
             #expect(macro4?.next?.next?.expression.stringRep == "base")
             #expect(macro4?.next?.next?.conditions?.conditions == nil)
 
@@ -239,15 +243,18 @@ fileprivate final class MockSpecType: SpecType {
         }
         #expect(warnings == [])
         #expect(errors.count == 7)
-        XCTAssertMatch(errors, [
-            .prefix("macro parsing error for build setting 'NAME2': warning:DeprecatedMacroRefSyntax"),
-            .prefix("macro parsing error for build setting 'NAME2': error:UnterminatedMacroSubexpression"),
-            "inconsistentMacroDefinition(name: \"BAD\", type: SWBMacro.MacroType.userDefined, value: PLDict<[\"BAD\": \"BAD\"]>)",
-            "unexpected value for build setting \'BAD\' while parsing 'BAD2'",
-            .prefix("macro parsing error for build setting 'BAD'"),
-            "invalid setting name: 'BAD[sdk='",
-            "missing required value for key: 'MISSING'"
-        ])
+        XCTAssertMatch(
+            errors,
+            [
+                .prefix("macro parsing error for build setting 'NAME2': warning:DeprecatedMacroRefSyntax"),
+                .prefix("macro parsing error for build setting 'NAME2': error:UnterminatedMacroSubexpression"),
+                "inconsistentMacroDefinition(name: \"BAD\", type: SWBMacro.MacroType.userDefined, value: PLDict<[\"BAD\": \"BAD\"]>)",
+                "unexpected value for build setting \'BAD\' while parsing 'BAD2'",
+                .prefix("macro parsing error for build setting 'BAD'"),
+                "invalid setting name: 'BAD[sdk='",
+                "missing required value for key: 'MISSING'",
+            ]
+        )
     }
 
     /// Arrays of dictionaries are a common idiom in .xcspec files. Usually the dictionaries in question represent objects. It’s common to allow single-element arrays to instead be represented as just the single unwrapped element. Similarly, it’s common to allow a dictionary to be represented by just a flat value, which is treated the same as a dictionary with just the value for the "signature" key.  Examples include the build options array, the values array for each build option, the input-file-types array, etc.
@@ -266,34 +273,42 @@ fileprivate final class MockSpecType: SpecType {
                 "e",
             ],
             "E": [
-                ["1", "2", "3"],
+                ["1", "2", "3"]
             ],
         ]
         // Create a test parser and do some test lookups.
-        let (_,warnings,errors) = await parserForTestData(data) { parser in
+        let (_, warnings, errors) = await parserForTestData(data) { parser in
             // Check that we’re able to deal with various wrapped and unwrapped combinations.
-            #expect(parser.parseArrayOfDicts("A"){ (dict: PropertyListItem) -> (String?) in
-                guard case .plDict(let dict) = dict else { return nil }
-                return dict.keys.sorted(by: <).reduce(""){ "\($0!)\($1)," }
-            }! == ["a,", "b,", "c,d,e,"])
-            #expect(parser.parseArrayOfDicts("B", allowUnarrayedElement: true){ (dict: PropertyListItem) -> (String?) in
-                guard case .plDict(let dict) = dict else { return nil }
-                return dict.keys.sorted(by: <).reduce(""){ "\($0!)\($1)," }
-            }! == ["b,"])
-            #expect(parser.parseArrayOfDicts("C", allowUnarrayedElement: true, impliedElementKey: "key"){ (dict: PropertyListItem) -> (String?) in
-                guard case .plDict(let dict) = dict else { return nil }
-                return dict.keys.sorted(by: <).reduce(""){ "\($0!)\($1)," }
-            }! == ["key,"])
-            #expect(parser.parseArrayOfDicts("D", allowUnarrayedElement: true, impliedElementKey: "key"){ (dict: PropertyListItem) -> (String?) in
-                guard case .plDict(let dict) = dict else { return nil }
-                return dict.keys.sorted(by: <).reduce(""){ "\($0!)\($1)," }
-            }! == ["key,", "key,"])
+            #expect(
+                parser.parseArrayOfDicts("A") { (dict: PropertyListItem) -> (String?) in
+                    guard case .plDict(let dict) = dict else { return nil }
+                    return dict.keys.sorted(by: <).reduce("") { "\($0!)\($1)," }
+                }! == ["a,", "b,", "c,d,e,"]
+            )
+            #expect(
+                parser.parseArrayOfDicts("B", allowUnarrayedElement: true) { (dict: PropertyListItem) -> (String?) in
+                    guard case .plDict(let dict) = dict else { return nil }
+                    return dict.keys.sorted(by: <).reduce("") { "\($0!)\($1)," }
+                }! == ["b,"]
+            )
+            #expect(
+                parser.parseArrayOfDicts("C", allowUnarrayedElement: true, impliedElementKey: "key") { (dict: PropertyListItem) -> (String?) in
+                    guard case .plDict(let dict) = dict else { return nil }
+                    return dict.keys.sorted(by: <).reduce("") { "\($0!)\($1)," }
+                }! == ["key,"]
+            )
+            #expect(
+                parser.parseArrayOfDicts("D", allowUnarrayedElement: true, impliedElementKey: "key") { (dict: PropertyListItem) -> (String?) in
+                    guard case .plDict(let dict) = dict else { return nil }
+                    return dict.keys.sorted(by: <).reduce("") { "\($0!)\($1)," }
+                }! == ["key,", "key,"]
+            )
 
             // Check the looking up missing keys returns nil.
             #expect(parser.parseArrayOfDicts("MISSING") { return $0.description } == nil)
 
             // Check that trying to look up unwrapped values without enabling them returns an empty array.
-            #expect(parser.parseArrayOfDicts("E"){ return $0.description }! == [])
+            #expect(parser.parseArrayOfDicts("E") { return $0.description }! == [])
         }
         #expect(warnings == [])
         #expect(errors.count == 1)
diff --git a/Tests/SWBCoreTests/SpecRegistryTests.swift b/Tests/SWBCoreTests/SpecRegistryTests.swift
index 7342808b..94d4b163 100644
--- a/Tests/SWBCoreTests/SpecRegistryTests.swift
+++ b/Tests/SWBCoreTests/SpecRegistryTests.swift
@@ -75,85 +75,94 @@ import SWBUtil
         }
         // Check 'Identifier' errors.
         try await withRegistryForTestInputs(
-            [("a.xcspec", ["a": "c"]),
-             ("b.xcspec", ["Identifier": ["bad"]])]) { registry, delegate in
-                 #expect(registry.proxiesByDomain.count == 0)
-                 #expect(delegate.errors.count == 2)
-                 #expect(delegate.errors[0].0 == "a.xcspec")
-                 XCTAssertMatch(delegate.errors[0].1, .prefix("missing 'Identifier' field"))
-                 #expect(delegate.errors[1].0 == "b.xcspec")
-                 XCTAssertMatch(delegate.errors[1].1, .prefix("invalid 'Identifier' field"))
-             }
+            [
+                ("a.xcspec", ["a": "c"]),
+                ("b.xcspec", ["Identifier": ["bad"]]),
+            ]) { registry, delegate in
+                #expect(registry.proxiesByDomain.count == 0)
+                #expect(delegate.errors.count == 2)
+                #expect(delegate.errors[0].0 == "a.xcspec")
+                XCTAssertMatch(delegate.errors[0].1, .prefix("missing 'Identifier' field"))
+                #expect(delegate.errors[1].0 == "b.xcspec")
+                XCTAssertMatch(delegate.errors[1].1, .prefix("invalid 'Identifier' field"))
+            }
         // Check 'Type' errors.
         try await withRegistryForTestInputs(
-            [("a.xcspec", ["Identifier": "a"]),
-             ("b.xcspec", ["Identifier": "b", "Type": ["bad"]]),
-             ("c.xcspec", ["Identifier": "c", "Type": "notfound"])]) { registry, delegate in
-                 #expect(registry.proxiesByDomain.count == 0)
-                 #expect(delegate.errors.count == 3)
-                 #expect(delegate.errors[0].0 == "a.xcspec")
-                 XCTAssertMatch(delegate.errors[0].1, .prefix("missing 'Type' field"))
-                 #expect(delegate.errors[1].0 == "b.xcspec")
-                 XCTAssertMatch(delegate.errors[1].1, .prefix("invalid 'Type' field"))
-                 #expect(delegate.errors[2].0 == "c.xcspec")
-                 XCTAssertMatch(delegate.errors[2].1, .prefix("unknown spec 'Type'"))
-             }
+            [
+                ("a.xcspec", ["Identifier": "a"]),
+                ("b.xcspec", ["Identifier": "b", "Type": ["bad"]]),
+                ("c.xcspec", ["Identifier": "c", "Type": "notfound"]),
+            ]) { registry, delegate in
+                #expect(registry.proxiesByDomain.count == 0)
+                #expect(delegate.errors.count == 3)
+                #expect(delegate.errors[0].0 == "a.xcspec")
+                XCTAssertMatch(delegate.errors[0].1, .prefix("missing 'Type' field"))
+                #expect(delegate.errors[1].0 == "b.xcspec")
+                XCTAssertMatch(delegate.errors[1].1, .prefix("invalid 'Type' field"))
+                #expect(delegate.errors[2].0 == "c.xcspec")
+                XCTAssertMatch(delegate.errors[2].1, .prefix("unknown spec 'Type'"))
+            }
         // Check 'Class' errors.
         try await withRegistryForTestInputs(
-            [("a.xcspec", ["Identifier": "a", "Type": "FileType", "Class": ["bad"]]),
-             ("b.xcspec", ["Identifier": "b", "Type": "FileType", "Class": "notfound"])]) { registry, delegate in
-                 #expect(registry.proxiesByDomain.count == 0)
-                 #expect(delegate.errors.count == 2)
-                 #expect(delegate.errors[0].0 == "a.xcspec")
-                 XCTAssertMatch(delegate.errors[0].1, .prefix("invalid 'Class' field"))
-                 #expect(delegate.errors[1].0 == "b.xcspec")
-                 XCTAssertMatch(delegate.errors[1].1, .prefix("unknown spec 'Class'"))
-             }
+            [
+                ("a.xcspec", ["Identifier": "a", "Type": "FileType", "Class": ["bad"]]),
+                ("b.xcspec", ["Identifier": "b", "Type": "FileType", "Class": "notfound"]),
+            ]) { registry, delegate in
+                #expect(registry.proxiesByDomain.count == 0)
+                #expect(delegate.errors.count == 2)
+                #expect(delegate.errors[0].0 == "a.xcspec")
+                XCTAssertMatch(delegate.errors[0].1, .prefix("invalid 'Class' field"))
+                #expect(delegate.errors[1].0 == "b.xcspec")
+                XCTAssertMatch(delegate.errors[1].1, .prefix("unknown spec 'Class'"))
+            }
         // Check 'Domain' and 'BasedOn' errors.
         try await withRegistryForTestInputs([
             ("a.xcspec", ["Identifier": "a", "Type": "FileType", "Domain": ["bad"]]),
             ("b.xcspec", ["Identifier": "b", "Type": "FileType", "BasedOn": ["bad"]]),
-            ("c.xcspec", ["Identifier": "c", "Type": "FileType", "BasedOn": "missing"])]) { registry, delegate in
-                #expect(registry.proxiesByDomain.count == 1)
-                #expect(registry.proxiesByDomain[""]?.proxiesByIdentifier["c"] == nil)
-                #expect(delegate.errors.count == 3)
-                #expect(delegate.errors[0].0 == "a.xcspec")
-                XCTAssertMatch(delegate.errors[0].1, .prefix("invalid 'Domain' field"))
-                #expect(delegate.errors[1].0 == "b.xcspec")
-                XCTAssertMatch(delegate.errors[1].1, .prefix("invalid 'BasedOn' field"))
-                #expect(delegate.errors[2].0 == "c.xcspec")
-                XCTAssertMatch(delegate.errors[2].1, .prefix("missing base spec ':missing'"))
-
-                // Check 'BasedOn' type compatibility.
-                try await withRegistryForTestInputs([
-                    ("a.xcspec", ["Identifier": "a", "Type": "FileType"]),
-                    ("b.xcspec", ["Identifier": "b", "Type": "Architecture", "BasedOn": "a"])]) { registry, delegate in
-                        #expect(delegate.errors.count == 1)
-                        #expect(delegate.errors[0].0 == "b.xcspec")
-                        XCTAssertMatch(delegate.errors[0].1, .prefix("incompatible base spec"))
-                    }
+            ("c.xcspec", ["Identifier": "c", "Type": "FileType", "BasedOn": "missing"]),
+        ]) { registry, delegate in
+            #expect(registry.proxiesByDomain.count == 1)
+            #expect(registry.proxiesByDomain[""]?.proxiesByIdentifier["c"] == nil)
+            #expect(delegate.errors.count == 3)
+            #expect(delegate.errors[0].0 == "a.xcspec")
+            XCTAssertMatch(delegate.errors[0].1, .prefix("invalid 'Domain' field"))
+            #expect(delegate.errors[1].0 == "b.xcspec")
+            XCTAssertMatch(delegate.errors[1].1, .prefix("invalid 'BasedOn' field"))
+            #expect(delegate.errors[2].0 == "c.xcspec")
+            XCTAssertMatch(delegate.errors[2].1, .prefix("missing base spec ':missing'"))
+
+            // Check 'BasedOn' type compatibility.
+            try await withRegistryForTestInputs([
+                ("a.xcspec", ["Identifier": "a", "Type": "FileType"]),
+                ("b.xcspec", ["Identifier": "b", "Type": "Architecture", "BasedOn": "a"]),
+            ]) { registry, delegate in
+                #expect(delegate.errors.count == 1)
+                #expect(delegate.errors[0].0 == "b.xcspec")
+                XCTAssertMatch(delegate.errors[0].1, .prefix("incompatible base spec"))
             }
+        }
         // Check registration errors.
         try await withRegistryForTestInputs(
-            [("a.xcspec", ["Identifier": "a", "Type": "FileType"]),
-             ("b.xcspec", ["Identifier": "a", "Type": "FileType"])]) { registry, delegate in
-                 #expect(registry.proxiesByDomain.count == 1)
-                 #expect(delegate.errors.count == 1)
-
-                 // We have to be prepared for either to be the duplicate, due to concurrent loading.
-                 if let error = delegate.errors.first {
-                     if error.0 == "a.xcspec" {
-                         #expect(error.0 == "a.xcspec")
-                         XCTAssertMatch(error.1, .prefix("spec ':a' already registered"))
-                     } else {
-                         #expect(error.0 == "b.xcspec")
-                         XCTAssertMatch(error.1, .prefix("spec ':a' already registered"))
-                     }
-                 }
-                 else {
-                     Issue.record("Did not find an expected error that spec ':a' is already registered")
-                 }
-             }
+            [
+                ("a.xcspec", ["Identifier": "a", "Type": "FileType"]),
+                ("b.xcspec", ["Identifier": "a", "Type": "FileType"]),
+            ]) { registry, delegate in
+                #expect(registry.proxiesByDomain.count == 1)
+                #expect(delegate.errors.count == 1)
+
+                // We have to be prepared for either to be the duplicate, due to concurrent loading.
+                if let error = delegate.errors.first {
+                    if error.0 == "a.xcspec" {
+                        #expect(error.0 == "a.xcspec")
+                        XCTAssertMatch(error.1, .prefix("spec ':a' already registered"))
+                    } else {
+                        #expect(error.0 == "b.xcspec")
+                        XCTAssertMatch(error.1, .prefix("spec ':a' already registered"))
+                    }
+                } else {
+                    Issue.record("Did not find an expected error that spec ':a' is already registered")
+                }
+            }
     }
 
     @Test
@@ -167,33 +176,36 @@ import SWBUtil
             }
         // Check handling of errors in base specs.
         try await withRegistryForTestInputs(
-            [("a.xcspec", ["Identifier": "a", "Type": "FileType", "BasedOn": "broken"]),
-             ("broken.xcspec", ["Identifier": "broken", "Type": "FileType", "UTI": ["not-a-uti"]])]) { registry, delegate in
-                 #expect(registry.getSpec("a") == nil)
-                 #expect(delegate.warnings.count == 0)
-                 #expect(delegate.errors.count == 2)
-                 #expect(delegate.errors[0].0 == "a.xcspec")
-                 #expect(delegate.errors[0].1 == "unable to load ':a' due to errors loading base spec")
-                 #expect(delegate.errors[1].0 == "broken.xcspec")
-                 XCTAssertMatch(delegate.errors[1].1, .prefix("unexpected item"))
-
-                 // Check repeated loading attempts shouldn't generate new errors.
-                 #expect(registry.getSpec("a") == nil)
-                 #expect(delegate.errors.count == 2)
-             }
+            [
+                ("a.xcspec", ["Identifier": "a", "Type": "FileType", "BasedOn": "broken"]),
+                ("broken.xcspec", ["Identifier": "broken", "Type": "FileType", "UTI": ["not-a-uti"]]),
+            ]) { registry, delegate in
+                #expect(registry.getSpec("a") == nil)
+                #expect(delegate.warnings.count == 0)
+                #expect(delegate.errors.count == 2)
+                #expect(delegate.errors[0].0 == "a.xcspec")
+                #expect(delegate.errors[0].1 == "unable to load ':a' due to errors loading base spec")
+                #expect(delegate.errors[1].0 == "broken.xcspec")
+                XCTAssertMatch(delegate.errors[1].1, .prefix("unexpected item"))
+
+                // Check repeated loading attempts shouldn't generate new errors.
+                #expect(registry.getSpec("a") == nil)
+                #expect(delegate.errors.count == 2)
+            }
         // Check that we don't fail on recursive base specs.
         try await withRegistryForTestInputs(
-            [("a.xcspec", ["Identifier": "a", "Type": "FileType", "BasedOn": "a"]),
-             ("b.xcspec", ["Identifier": "b", "Type": "FileType", "BasedOn": "b"])]) { registry, delegate in
-                 #expect(registry.getSpec("a") == nil)
-                 #expect(delegate.warnings.count == 0)
-                 #expect(delegate.errors.count == 2)
-                 XCTAssertMatch(delegate.errors[0].1, .prefix("encountered cyclic dependency"))
-                 #expect(delegate.errors[1].1 == "unable to load ':a' due to errors loading base spec")
-             }
+            [
+                ("a.xcspec", ["Identifier": "a", "Type": "FileType", "BasedOn": "a"]),
+                ("b.xcspec", ["Identifier": "b", "Type": "FileType", "BasedOn": "b"]),
+            ]) { registry, delegate in
+                #expect(registry.getSpec("a") == nil)
+                #expect(delegate.warnings.count == 0)
+                #expect(delegate.errors.count == 2)
+                XCTAssertMatch(delegate.errors[0].1, .prefix("encountered cyclic dependency"))
+                #expect(delegate.errors[1].1 == "unable to load ':a' due to errors loading base spec")
+            }
     }
 
-
     @Test
     func specScanning() async throws {
         let core = try await getCore()
@@ -209,7 +221,8 @@ import SWBUtil
 
         // Validate we can load options and descriptions of real specs.
         guard let clangSpecBase = clangSpecProxy.load(core.specRegistry),
-              let clangSpec = clangSpecBase as? PropertyDomainSpec else {
+            let clangSpec = clangSpecBase as? PropertyDomainSpec
+        else {
             Issue.record("unable to load clang spec")
             return
         }
@@ -220,7 +233,6 @@ import SWBUtil
         #expect(enableCodeCoverageOption.localizedName == "Enable Additional Vector Extensions")
         XCTAssertMatch((enableCodeCoverageOption.localizedDescription ?? ""), .contains("Enables the use of extended vector instructions"))
 
-
         // Validate that we correctly extract the spec proxy domains.
         if let watchAppProxy = core.specRegistry.lookupProxy("com.apple.product-type.application.watchapp", domain: "iphoneos") {
             #expect(watchAppProxy.domain == "iphoneos")
@@ -231,8 +243,7 @@ import SWBUtil
         // Validate that we load specs based on known extensions (this spec comes from "Core Data.xcspec").
         if let xcdatamodelSpec = core.specRegistry.lookupProxy("wrapper.xcdatamodel") {
             #expect(xcdatamodelSpec.path.fileSuffix == ".xcspec")
-        }
-        else {
+        } else {
             Issue.record("no proxy for file type 'wrapper.xcdatamodel'")
         }
 
@@ -267,7 +278,7 @@ import SWBUtil
             }
 
             for type in typesBySubregistryName.values {
-                let proxyIdentifiers = core.specRegistry.findProxiesInSubregistry(type, domain: domain, includeInherited: true).map{$0.identifier}.sorted()
+                let proxyIdentifiers = core.specRegistry.findProxiesInSubregistry(type, domain: domain, includeInherited: true).map { $0.identifier }.sorted()
                 #expect(proxyIdentifiers == Set(proxyIdentifiers).sorted())
             }
         }
@@ -299,56 +310,57 @@ import SWBUtil
             "EXECUTABLE_NAME": "CFBundleExecutable",
             "CURRENT_PROJECT_VERSION": "CFBundleVersion",
             "PRODUCT_BUNDLE_IDENTIFIER": "CFBundleIdentifier",
-            "MARKETING_VERSION": "CFBundleShortVersionString"
+            "MARKETING_VERSION": "CFBundleShortVersionString",
         ]
 
         let infoPlistKeyOptions = specRegistry.domains.flatMap { domain in
-            return (specRegistry.findSpecs(BuildSettingsSpec.self, domain: domain, includeInherited: false)
-                    + specRegistry.findSpecs(BuildSystemSpec.self, domain: domain, includeInherited: false)
-                    + specRegistry.findSpecs(CommandLineToolSpec.self, domain: domain, includeInherited: false))
-            .flatMap({ $0.flattenedBuildOptions.values })
+            return
+                (specRegistry.findSpecs(BuildSettingsSpec.self, domain: domain, includeInherited: false)
+                + specRegistry.findSpecs(BuildSystemSpec.self, domain: domain, includeInherited: false)
+                + specRegistry.findSpecs(CommandLineToolSpec.self, domain: domain, includeInherited: false))
+                .flatMap({ $0.flattenedBuildOptions.values })
         }.filter { $0.name.hasPrefix("INFOPLIST_KEY_") || legacyKeyMappings.contains($0.name) }
 
         // Check that the URLs of the keys are reachable. This is purposely not enabled by default and is primarily for debugging.
         let unreachableURLs: [(String, String)]
-#if canImport(Darwin)
-        if checkInfoPlistKeyURLReachability {
-            unreachableURLs = try await withThrowingTaskGroup(of: (String, String).self) { group in
-                for keyName in Set(infoPlistKeyOptions.map({ $0.name.hasPrefix("INFOPLIST_KEY_") ? String($0.name.dropFirst("INFOPLIST_KEY_".count)) : (legacyKeyMappings[$0.name] ?? $0.name) })).sorted() {
-                    switch keyName {
-                    case "UISupportedInterfaceOrientations_iPhone", "UISupportedInterfaceOrientations_iPad":
-                        // These map to UISupportedInterfaceOrientations~iPhone and UISupportedInterfaceOrientations~iPad.
-                        continue
-                    case "UIApplicationSceneManifest_Generation", "UILaunchScreen_Generation":
-                        // These map to UIApplicationSceneManifest and UILaunchScreen, which are dictionaries.
-                        continue
-                    case "MetalCaptureEnabled", "NSBluetoothWhileInUseUsageDescription", "NSFileProviderPresenceUsageDescription", "NSFocusStatusUsageDescription", "NSSystemExtensionUsageDescription", "NSVoIPUsageDescription", "OSBundleUsageDescription":
-                        // rdar://91269820 (Missing documentation for some Info.plist keys which are directly supported by Xcode)
-                        continue
-                    default:
-                        break
-                    }
+        #if canImport(Darwin)
+            if checkInfoPlistKeyURLReachability {
+                unreachableURLs = try await withThrowingTaskGroup(of: (String, String).self) { group in
+                    for keyName in Set(infoPlistKeyOptions.map({ $0.name.hasPrefix("INFOPLIST_KEY_") ? String($0.name.dropFirst("INFOPLIST_KEY_".count)) : (legacyKeyMappings[$0.name] ?? $0.name) })).sorted() {
+                        switch keyName {
+                        case "UISupportedInterfaceOrientations_iPhone", "UISupportedInterfaceOrientations_iPad":
+                            // These map to UISupportedInterfaceOrientations~iPhone and UISupportedInterfaceOrientations~iPad.
+                            continue
+                        case "UIApplicationSceneManifest_Generation", "UILaunchScreen_Generation":
+                            // These map to UIApplicationSceneManifest and UILaunchScreen, which are dictionaries.
+                            continue
+                        case "MetalCaptureEnabled", "NSBluetoothWhileInUseUsageDescription", "NSFileProviderPresenceUsageDescription", "NSFocusStatusUsageDescription", "NSSystemExtensionUsageDescription", "NSVoIPUsageDescription", "OSBundleUsageDescription":
+                            // rdar://91269820 (Missing documentation for some Info.plist keys which are directly supported by Xcode)
+                            continue
+                        default:
+                            break
+                        }
 
-                    let url = "https://developer.apple.com/documentation/bundleresources/information-property-list/\(keyName.lowercased())"
+                        let url = "https://developer.apple.com/documentation/bundleresources/information-property-list/\(keyName.lowercased())"
 
-                    group.addTask {
-                        let (_, response) = try await URLSession.shared.data(from: #require(URL(string: url)))
-                        guard let response = response as? HTTPURLResponse, response.statusCode == 200 else {
-                            throw StubError.error("Network failure")
-                        }
+                        group.addTask {
+                            let (_, response) = try await URLSession.shared.data(from: #require(URL(string: url)))
+                            guard let response = response as? HTTPURLResponse, response.statusCode == 200 else {
+                                throw StubError.error("Network failure")
+                            }
 
-                        return (String(keyName), url)
+                            return (String(keyName), url)
+                        }
                     }
-                }
 
-                return try await group.collect()
+                    return try await group.collect()
+                }
+            } else {
+                unreachableURLs = []
             }
-        } else {
+        #else
             unreachableURLs = []
-        }
-#else
-        unreachableURLs = []
-#endif
+        #endif
 
         for (keyName, url) in unreachableURLs {
             Issue.record("\(keyName) - \(url) is not reachable")
diff --git a/Tests/SWBCoreTests/SwiftCompilerTests.swift b/Tests/SWBCoreTests/SwiftCompilerTests.swift
index f37311db..3f4bb934 100644
--- a/Tests/SWBCoreTests/SwiftCompilerTests.swift
+++ b/Tests/SWBCoreTests/SwiftCompilerTests.swift
@@ -279,8 +279,9 @@ fileprivate final class TestSwiftParserDelegate: TaskOutputParserDelegate, Senda
     func messageErrors() async throws {
         do {
             let (delegate, _) = try await makeTestParserWithMessages([
-                [ "foo": "bar" ],
-                [ "kind": "began" ]])
+                ["foo": "bar"],
+                ["kind": "began"],
+            ])
             #expect(delegate.events.count == 2)
             XCTAssertMatch(delegate.events[safe: 0]?.1, .contains("missing kind"))
             XCTAssertMatch(delegate.events[safe: 1]?.1, .contains("missing name"))
@@ -289,10 +290,15 @@ fileprivate final class TestSwiftParserDelegate: TaskOutputParserDelegate, Senda
         // Missing 'pid' is an error.
         do {
             let (delegate, _) = try await makeTestParserWithMessages([
-                [ "kind": "began",
-                  "name": "compile" ],
-                [ "kind": "finished",
-                  "name": "compile" ]])
+                [
+                    "kind": "began",
+                    "name": "compile",
+                ],
+                [
+                    "kind": "finished",
+                    "name": "compile",
+                ],
+            ])
             #expect(delegate.events.count == 2)
             XCTAssertMatch(delegate.events[safe: 0]?.1, .contains("missing pid"))
             XCTAssertMatch(delegate.events[safe: 1]?.1, .contains("missing pid"))
@@ -301,14 +307,19 @@ fileprivate final class TestSwiftParserDelegate: TaskOutputParserDelegate, Senda
         // Duplicate 'pid' is an error.
         do {
             let (delegate, _) = try await makeTestParserWithMessages([
-                [ "kind": "began",
-                  "name": "compile",
-                  "pid": 1,
-                  "command": "foo"],
-                [ "kind": "began",
-                  "name": "compile",
-                  "pid": 1,
-                  "command": "foo"]])
+                [
+                    "kind": "began",
+                    "name": "compile",
+                    "pid": 1,
+                    "command": "foo",
+                ],
+                [
+                    "kind": "began",
+                    "name": "compile",
+                    "pid": 1,
+                    "command": "foo",
+                ],
+            ])
             #expect(delegate.events.count == 2)
             // Check we still start the subtask.
             #expect(delegate.events[safe: 0]?.0 == "startSubtask")
@@ -320,9 +331,12 @@ fileprivate final class TestSwiftParserDelegate: TaskOutputParserDelegate, Senda
         // Bogus 'pid' in 'finished' is an error.
         do {
             let (delegate, _) = try await makeTestParserWithMessages([
-                [ "kind": "finished",
-                  "name": "compile",
-                  "pid": 1 ]])
+                [
+                    "kind": "finished",
+                    "name": "compile",
+                    "pid": 1,
+                ]
+            ])
             #expect(delegate.events.count == 1)
             XCTAssertMatch(delegate.events[safe: 0]?.1, .contains("invalid pid (no subtask record)"))
         }
@@ -335,35 +349,39 @@ fileprivate final class TestSwiftParserDelegate: TaskOutputParserDelegate, Senda
     func unexpectedOutput() async throws {
         do {
             let stream = OutputByteStream()
-            try stream <<< makeMessageFragment([
-                "kind": "began",
-                "name": "compile",
-                "pid": 1,
-                "command": "foo"
-            ])
-            try stream <<< makeMessageFragment([
-                "kind": "signalled",
-                "name": "compile",
-                "pid": 1,
-                "output": "bla bla bla",
-                "error-message": "Segmentation fault: 11"
-            ])
+            try stream
+                <<< makeMessageFragment([
+                    "kind": "began",
+                    "name": "compile",
+                    "pid": 1,
+                    "command": "foo",
+                ])
+            try stream
+                <<< makeMessageFragment([
+                    "kind": "signalled",
+                    "name": "compile",
+                    "pid": 1,
+                    "output": "bla bla bla",
+                    "error-message": "Segmentation fault: 11",
+                ])
             // Check two bogus messages in the middle.
             stream <<< "<unknown>:0: error: unable to execute command: Segmentation fault: 11\n"
             stream <<< "152 not a message cause it ain't got no newline at the front\n"
-            try stream <<< makeMessageFragment([
-                "kind": "began",
-                "name": "compile",
-                "pid": 2,
-                "command": "foo"
-            ])
-            try stream <<< makeMessageFragment([
-                "kind": "finished",
-                "name": "compile",
-                "pid": 2,
-                "output": "bla bla bla",
-                "exit-status": 1
-            ])
+            try stream
+                <<< makeMessageFragment([
+                    "kind": "began",
+                    "name": "compile",
+                    "pid": 2,
+                    "command": "foo",
+                ])
+            try stream
+                <<< makeMessageFragment([
+                    "kind": "finished",
+                    "name": "compile",
+                    "pid": 2,
+                    "output": "bla bla bla",
+                    "exit-status": 1,
+                ])
 
             let (delegate, parser) = try await makeTestParser()
             parser.write(bytes: stream.bytes)
@@ -385,21 +403,28 @@ fileprivate final class TestSwiftParserDelegate: TaskOutputParserDelegate, Senda
     func messageBehaviors() async throws {
         do {
             let (delegate, _) = try await makeTestParserWithMessages([
-                [ "kind": "began",
-                  "name": "compile",
-                  "pid": 1,
-                  "inputs": [Path.root.join("path/to/foo with space.swift").str, "not swift.pch"],
-                  "command": "foo" ],
-                [ "kind": "finished",
-                  "name": "compile",
-                  "inputs": ["foo.swift"],
-                  "pid": 1,
-                  "exit-status": 0,
-                  "output": "foobar"],
-                [ "kind": "skipped",
-                  "name": "compile",
-                  "inputs": ["bar.swift"],
-                  "command": "foo" ]])
+                [
+                    "kind": "began",
+                    "name": "compile",
+                    "pid": 1,
+                    "inputs": [Path.root.join("path/to/foo with space.swift").str, "not swift.pch"],
+                    "command": "foo",
+                ],
+                [
+                    "kind": "finished",
+                    "name": "compile",
+                    "inputs": ["foo.swift"],
+                    "pid": 1,
+                    "exit-status": 0,
+                    "output": "foobar",
+                ],
+                [
+                    "kind": "skipped",
+                    "name": "compile",
+                    "inputs": ["bar.swift"],
+                    "command": "foo",
+                ],
+            ])
             #expect(delegate.events.count == 2)
             #expect(delegate.events[safe: 0]?.0 == "startSubtask")
             #expect(delegate.subtasks.count == 1)
@@ -427,10 +452,12 @@ fileprivate final class TestSwiftParserDelegate: TaskOutputParserDelegate, Senda
     func multipleInputSubtaskTitle() async throws {
         do {
             let (delegate, _) = try await makeTestParserWithMessages([
-                [ "kind": "began",
-                  "name": "compile",
-                  "pid": 1,
-                  "inputs": [Path.root.join("path/to/a.swift").str]]
+                [
+                    "kind": "began",
+                    "name": "compile",
+                    "pid": 1,
+                    "inputs": [Path.root.join("path/to/a.swift").str],
+                ]
             ])
             #expect(delegate.subtasks[safe: 0]?.name == "CompileSwift VARIANT ARCH \(Path.root.join("path/to/a.swift").str.quotedDescription)")
             #expect(delegate.subtasks[safe: 0]?.executionDescription == "Compile a.swift (ARCH)")
@@ -438,13 +465,15 @@ fileprivate final class TestSwiftParserDelegate: TaskOutputParserDelegate, Senda
         }
         do {
             let (delegate, _) = try await makeTestParserWithMessages([
-                [ "kind": "began",
-                  "name": "compile",
-                  "pid": 1,
-                  "inputs": [
-                    Path.root.join("path/to/a.swift").str,
-                    Path.root.join("path/to/b.swift").str
-                  ]]
+                [
+                    "kind": "began",
+                    "name": "compile",
+                    "pid": 1,
+                    "inputs": [
+                        Path.root.join("path/to/a.swift").str,
+                        Path.root.join("path/to/b.swift").str,
+                    ],
+                ]
             ])
             #expect(delegate.subtasks[safe: 0]?.name == "CompileSwift VARIANT ARCH")
             #expect(delegate.subtasks[safe: 0]?.executionDescription == "Compile 2 Swift source files (ARCH)")
@@ -452,14 +481,16 @@ fileprivate final class TestSwiftParserDelegate: TaskOutputParserDelegate, Senda
         }
         do {
             let (delegate, _) = try await makeTestParserWithMessages([
-                [ "kind": "began",
-                  "name": "compile",
-                  "pid": 1,
-                  "inputs": [
-                    Path.root.join("path/to/a.swift").str,
-                    Path.root.join("path/to/b.swift").str,
-                    Path.root.join("path/to/c.swift").str
-                  ]]
+                [
+                    "kind": "began",
+                    "name": "compile",
+                    "pid": 1,
+                    "inputs": [
+                        Path.root.join("path/to/a.swift").str,
+                        Path.root.join("path/to/b.swift").str,
+                        Path.root.join("path/to/c.swift").str,
+                    ],
+                ]
             ])
             #expect(delegate.subtasks[safe: 0]?.name == "CompileSwift VARIANT ARCH")
             #expect(delegate.subtasks[safe: 0]?.executionDescription == "Compile 3 Swift source files (ARCH)")
@@ -471,22 +502,22 @@ fileprivate final class TestSwiftParserDelegate: TaskOutputParserDelegate, Senda
     func executionDescription() async throws {
         do {
             let (delegate, _) = try await makeTestParserWithMessages([
-                [ "kind": "began", "name": "compile", "pid": 1, "inputs": ["/tmp/file.swift"]],
-                [ "kind": "began", "name": "compile", "pid": 2, "inputs": ["/tmp/file1.swift", "/tmp/file2.swift"]],
-                [ "kind": "began", "name": "backend", "pid": 3, "inputs": ["/tmp/file.swift"]],
-                [ "kind": "began", "name": "backend", "pid": 4, "inputs": ["/tmp/file1.swift", "/tmp/file2.swift"]],
-                [ "kind": "began", "name": "merge-module", "pid": 5, "inputs": ["/tmp/file.swift"]],
-                [ "kind": "began", "name": "merge-module", "pid": 6, "inputs": ["/tmp/file1.swift", "/tmp/file2.swift"]],
-                [ "kind": "began", "name": "link", "pid": 7],
-                [ "kind": "began", "name": "generate-pch", "pid": 8, "inputs": ["/tmp/file.swift"]],
-                [ "kind": "began", "name": "generate-pch", "pid": 9, "inputs": ["/tmp/file1.swift", "/tmp/file2.swift"]],
-                [ "kind": "began", "name": "generate-dsym", "pid": 10],
-                [ "kind": "began", "name": "emit-module", "pid": 11, "inputs": ["/tmp/file1.swift"]],
-                [ "kind": "began", "name": "emit-module", "pid": 12, "inputs": ["/tmp/file1.swift", "/tmp/file2.swift"]],
-                [ "kind": "began", "name": "verify-module-interface", "pid": 13, "inputs": ["/tmp/file1.swiftinterface"]],
-                [ "kind": "began", "name": "verify-module-interface", "pid": 14, "inputs": ["/tmp/file1.swiftinterface", "/tmp/file2.swiftinterface"]],
-                [ "kind": "began", "name": "verify-module-interface", "pid": 15, "inputs": ["/tmp/file1.swiftinterface", "/tmp/file2.swiftinterface"]],
-                [ "kind": "began", "name": "generate-pcm", "pid": 16, "inputs": ["/tmp/file.modulemap"]],
+                ["kind": "began", "name": "compile", "pid": 1, "inputs": ["/tmp/file.swift"]],
+                ["kind": "began", "name": "compile", "pid": 2, "inputs": ["/tmp/file1.swift", "/tmp/file2.swift"]],
+                ["kind": "began", "name": "backend", "pid": 3, "inputs": ["/tmp/file.swift"]],
+                ["kind": "began", "name": "backend", "pid": 4, "inputs": ["/tmp/file1.swift", "/tmp/file2.swift"]],
+                ["kind": "began", "name": "merge-module", "pid": 5, "inputs": ["/tmp/file.swift"]],
+                ["kind": "began", "name": "merge-module", "pid": 6, "inputs": ["/tmp/file1.swift", "/tmp/file2.swift"]],
+                ["kind": "began", "name": "link", "pid": 7],
+                ["kind": "began", "name": "generate-pch", "pid": 8, "inputs": ["/tmp/file.swift"]],
+                ["kind": "began", "name": "generate-pch", "pid": 9, "inputs": ["/tmp/file1.swift", "/tmp/file2.swift"]],
+                ["kind": "began", "name": "generate-dsym", "pid": 10],
+                ["kind": "began", "name": "emit-module", "pid": 11, "inputs": ["/tmp/file1.swift"]],
+                ["kind": "began", "name": "emit-module", "pid": 12, "inputs": ["/tmp/file1.swift", "/tmp/file2.swift"]],
+                ["kind": "began", "name": "verify-module-interface", "pid": 13, "inputs": ["/tmp/file1.swiftinterface"]],
+                ["kind": "began", "name": "verify-module-interface", "pid": 14, "inputs": ["/tmp/file1.swiftinterface", "/tmp/file2.swiftinterface"]],
+                ["kind": "began", "name": "verify-module-interface", "pid": 15, "inputs": ["/tmp/file1.swiftinterface", "/tmp/file2.swiftinterface"]],
+                ["kind": "began", "name": "generate-pcm", "pid": 16, "inputs": ["/tmp/file.modulemap"]],
             ])
 
             #expect(delegate.subtasks.count == 16)
@@ -507,7 +538,7 @@ fileprivate final class TestSwiftParserDelegate: TaskOutputParserDelegate, Senda
                 "Verify file1.swiftinterface (ARCH)",
                 "Verify swiftinterface (ARCH)",
                 "Verify swiftinterface (ARCH)",
-                "Compile Clang module file.modulemap (ARCH)"
+                "Compile Clang module file.modulemap (ARCH)",
             ]
 
             for (expectedExecDesc, subtask) in zip(expectedExecDescriptions, delegate.subtasks) {
@@ -522,24 +553,37 @@ fileprivate final class TestSwiftParserDelegate: TaskOutputParserDelegate, Senda
     func multipleDiagnosticOutputSubtask() async throws {
         do {
             let (delegate, _) = try await makeTestParserWithMessages([
-                [ "kind": "began",
-                  "name": "compile",
-                  "pid": 1,
-                  "inputs": ["/path/to/a.swift", "/path/to/b.swift"],
-                  "outputs": [
-                    ["type": "object",
-                     "path": "/path/to/a.o"],
-                    ["type": "object",
-                     "path": "/path/to/b.o"],
-                    ["type": "diagnostics",
-                     "path": "/path/to/a.dia"],
-                    ["type": "diagnostics",
-                     "path": "/path/to/b.dia"]
-                  ]
+                [
+                    "kind": "began",
+                    "name": "compile",
+                    "pid": 1,
+                    "inputs": ["/path/to/a.swift", "/path/to/b.swift"],
+                    "outputs": [
+                        [
+                            "type": "object",
+                            "path": "/path/to/a.o",
+                        ],
+                        [
+                            "type": "object",
+                            "path": "/path/to/b.o",
+                        ],
+                        [
+                            "type": "diagnostics",
+                            "path": "/path/to/a.dia",
+                        ],
+                        [
+                            "type": "diagnostics",
+                            "path": "/path/to/b.dia",
+                        ],
+                    ],
                 ]
             ])
-            #expect(delegate.subtasks[safe: 0]?.serializedDiagnosticsPaths == [Path("/path/to/a.dia"),
-                                                                               Path("/path/to/b.dia")])
+            #expect(
+                delegate.subtasks[safe: 0]?.serializedDiagnosticsPaths == [
+                    Path("/path/to/a.dia"),
+                    Path("/path/to/b.dia"),
+                ]
+            )
         }
     }
 }
diff --git a/Tests/SWBCoreTests/TargetDependencyResolverTests.swift b/Tests/SWBCoreTests/TargetDependencyResolverTests.swift
index d0b55948..3e64cfdf 100644
--- a/Tests/SWBCoreTests/TargetDependencyResolverTests.swift
+++ b/Tests/SWBCoreTests/TargetDependencyResolverTests.swift
@@ -25,14 +25,13 @@ fileprivate enum TargetPlatformSpecializationMode {
     /// The v2 support that uses an explicit opt-in setting: ALLOW_TARGET_PLATFORM_SPECIALIZATION=YES
     case explicit
 
-    func settings(isPackage: Bool = false, _ additional: [String:String] = [:]) -> [String:String] {
+    func settings(isPackage: Bool = false, _ additional: [String: String] = [:]) -> [String: String] {
         var dict = additional
 
         if (self == .sdkroot) || isPackage {
             dict["SDKROOT"] = "auto"
             dict["SDK_VARIANT"] = "auto"
-        }
-        else {
+        } else {
             dict["ALLOW_TARGET_PLATFORM_SPECIALIZATION"] = "YES"
         }
 
@@ -40,7 +39,6 @@ fileprivate enum TargetPlatformSpecializationMode {
     }
 }
 
-
 // MARK: Test cases for utility methods supporting dependency resolution.
 
 @Suite fileprivate struct DependencyResolutionSupportTests: CoreBasedTests {
@@ -49,30 +47,34 @@ fileprivate enum TargetPlatformSpecializationMode {
     func potentialOverride() async throws {
         try await withTemporaryDirectory { tmpDirPath in
             let core = try await self.getCore()
-            let workspace = try TestWorkspace("Workspace",
-                                              projects: [TestProject("aProject",
-                                                                     groupTree: TestGroup("SomeFiles"),
-                                                                     targets: [
-                                                                        TestStandardTarget("anApp", type: .application),
-                                                                     ]
-                                                                    )]
+            let workspace = try TestWorkspace(
+                "Workspace",
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup("SomeFiles"),
+                        targets: [
+                            TestStandardTarget("anApp", type: .application)
+                        ]
+                    )
+                ]
             ).load(core)
             let workspaceContext = WorkspaceContext(core: core, workspace: workspace, fs: localFS, processExecutionCache: .sharedForTesting)
 
             // Configure all the overrides.
             let overrides = [
-                "OVERRIDE": "override_level",
+                "OVERRIDE": "override_level"
             ]
             let commandLineOverrides = [
-                "COMMAND_LINE_OVERRIDE": "commandLineOverride_level",
+                "COMMAND_LINE_OVERRIDE": "commandLineOverride_level"
             ]
             let commandLineConfigOverrides = [
-                "COMMAND_LINE_CONFIG_OVERRIDE": "commandLineConfigOverride_level",
+                "COMMAND_LINE_CONFIG_OVERRIDE": "commandLineConfigOverride_level"
             ]
             let commandLineConfigOverridesPath = tmpDirPath.join("commandLine.xcconfig")
             try localFS.write(commandLineConfigOverridesPath, contents: ByteString(stringLiteral: "COMMAND_LINE_CONFIG_PATH_OVERRIDE = commandLineConfigPathOverride_level"))
             let environmentConfigOverrides = [
-                "ENV_LINE_CONFIG_OVERRIDE": "environmentLineConfigOverride_level",
+                "ENV_LINE_CONFIG_OVERRIDE": "environmentLineConfigOverride_level"
             ]
             let environmentConfigOverridesPath = tmpDirPath.join("environment.xcconfig")
             try localFS.write(environmentConfigOverridesPath, contents: ByteString(stringLiteral: "ENV_LINE_CONFIG_PATH_OVERRIDE = environmentLineConfigPathOverride_level"))
@@ -84,81 +86,87 @@ fileprivate enum TargetPlatformSpecializationMode {
             // Check the expected values of the various overrides
             if let override = buildRequestContext.potentialOverride(for: "OVERRIDE", buildParameters: buildParameters) {
                 #expect(override.value == "override_level")
-                if case .buildParametersOverrides(_) = override.source {} else {
+                if case .buildParametersOverrides(_) = override.source {
+                } else {
                     Issue.record("Source of value of OVERRIDE was not .buildParametersOverrides but was \(override.source)")
                 }
-            }
-            else {
+            } else {
                 Issue.record("Expected value for COMMAND_LINE_OVERRIDE not found")
             }
             if let override = buildRequestContext.potentialOverride(for: "COMMAND_LINE_OVERRIDE", buildParameters: buildParameters) {
                 #expect(override.value == "commandLineOverride_level")
-                if case .commandLineOverrides(_) = override.source {} else {
+                if case .commandLineOverrides(_) = override.source {
+                } else {
                     Issue.record("Source of value of COMMAND_LINE_OVERRIDE was not .commandLineOverrides but was \(override.source)")
                 }
-            }
-            else {
+            } else {
                 Issue.record("Expected value for COMMAND_LINE_OVERRIDE not found")
             }
             if let override = buildRequestContext.potentialOverride(for: "COMMAND_LINE_CONFIG_OVERRIDE", buildParameters: buildParameters) {
                 #expect(override.value == "commandLineConfigOverride_level")
-                if case .commandLineConfigOverrides(_) = override.source {} else {
+                if case .commandLineConfigOverrides(_) = override.source {
+                } else {
                     Issue.record("Source of value of COMMAND_LINE_CONFIG_OVERRIDE was not .commandLineConfigOverrides but was \(override.source)")
                 }
-            }
-            else {
+            } else {
                 Issue.record("Expected value for COMMAND_LINE_CONFIG_OVERRIDE not found")
             }
             if let override = buildRequestContext.potentialOverride(for: "COMMAND_LINE_CONFIG_PATH_OVERRIDE", buildParameters: buildParameters) {
                 #expect(override.value == "commandLineConfigPathOverride_level")
-                if case .commandLineConfigOverridesPath(_,_) = override.source {} else {
+                if case .commandLineConfigOverridesPath(_, _) = override.source {
+                } else {
                     Issue.record("Source of value of COMMAND_LINE_CONFIG_PATH_OVERRIDE was not .commandLineConfigOverridesPath but was \(override.source)")
                 }
-            }
-            else {
+            } else {
                 Issue.record("Expected value for COMMAND_LINE_CONFIG_PATH_OVERRIDE not found")
             }
             if let override = buildRequestContext.potentialOverride(for: "ENV_LINE_CONFIG_OVERRIDE", buildParameters: buildParameters) {
                 #expect(override.value == "environmentLineConfigOverride_level")
-                if case .environmentConfigOverrides(_) = override.source {} else {
+                if case .environmentConfigOverrides(_) = override.source {
+                } else {
                     Issue.record("Source of value of ENV_LINE_CONFIG_OVERRIDE was not .environmentConfigOverrides but was \(override.source)")
                 }
-            }
-            else {
+            } else {
                 Issue.record("Expected value for ENV_LINE_CONFIG_OVERRIDE not found")
             }
             if let override = buildRequestContext.potentialOverride(for: "ENV_LINE_CONFIG_PATH_OVERRIDE", buildParameters: buildParameters) {
                 #expect(override.value == "environmentLineConfigPathOverride_level")
-                if case .environmentConfigOverridesPath(_,_) = override.source {} else {
+                if case .environmentConfigOverridesPath(_, _) = override.source {
+                } else {
                     Issue.record("Source of value of ENV_LINE_CONFIG_PATH_OVERRIDE was not .buildParametersOverrides but was \(override.source)")
                 }
-            }
-            else {
+            } else {
                 Issue.record("Expected value for ENV_LINE_CONFIG_PATH_OVERRIDE not found")
             }
 
             // Also check the case where there is no override.
             if let noSuchOverride = buildRequestContext.potentialOverride(for: "NO_SUCH_OVERRIDE", buildParameters: buildParameters) {
-                Issue.record("Unexpected value '\(noSuchOverride.value)' for NO_SUCH_OVERRIDE from \(noSuchOverride.source)" )
+                Issue.record("Unexpected value '\(noSuchOverride.value)' for NO_SUCH_OVERRIDE from \(noSuchOverride.source)")
             }
         }
     }
 }
 
-
 // MARK: Test cases for resolving explicit dependencies
 
 @Suite fileprivate struct ExplicitDependencyResolutionTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS))
     func twoAppsAndAFramework() async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("Workspace",
-                                          projects: [TestProject("aProject",
-                                                                 groupTree: TestGroup("SomeFiles"),
-                                                                 targets: [
-                                                                    TestStandardTarget("anApp", type: .application, dependencies: ["aFramework"]),
-                                                                    TestStandardTarget("anotherApp", type: .application, dependencies: ["aFramework"]),
-                                                                    TestStandardTarget("aFramework", type: .application)])]).load(core)
+        let workspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles"),
+                    targets: [
+                        TestStandardTarget("anApp", type: .application, dependencies: ["aFramework"]),
+                        TestStandardTarget("anotherApp", type: .application, dependencies: ["aFramework"]),
+                        TestStandardTarget("aFramework", type: .application),
+                    ]
+                )
+            ]
+        ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
         let project = workspace.projects[0]
 
@@ -169,7 +177,7 @@ fileprivate enum TargetPlatformSpecializationMode {
         let buildParameters = BuildParameters(configuration: "Debug")
         let appTarget1 = BuildRequest.BuildTargetInfo(parameters: buildParameters, target: project.targets[0])
         let appTarget2 = BuildRequest.BuildTargetInfo(parameters: buildParameters, target: project.targets[1])
-        let fwkTarget  = BuildRequest.BuildTargetInfo(parameters: buildParameters, target: project.targets[2])
+        let fwkTarget = BuildRequest.BuildTargetInfo(parameters: buildParameters, target: project.targets[2])
         let buildRequest = BuildRequest(parameters: buildParameters, buildTargets: [appTarget1, appTarget2], continueBuildingAfterErrors: true, useParallelTargets: false, useImplicitDependencies: false, useDryRun: false)
         let buildRequestContext = BuildRequestContext(workspaceContext: workspaceContext)
 
@@ -189,13 +197,20 @@ fileprivate enum TargetPlatformSpecializationMode {
     @Test(.requireSDKs(.macOS, .iOS))
     func twoAppsAFrameworkAndDifferentBuildParameters() async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("Workspace",
-                                          projects: [TestProject("aProject",
-                                                                 groupTree: TestGroup("SomeFiles"),
-                                                                 targets: [
-                                                                    TestStandardTarget("anApp", type: .application, dependencies: ["aFramework"]),
-                                                                    TestStandardTarget("anotherApp", type: .application, dependencies: ["aFramework"]),
-                                                                    TestStandardTarget("aFramework", type: .application)])]).load(core)
+        let workspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles"),
+                    targets: [
+                        TestStandardTarget("anApp", type: .application, dependencies: ["aFramework"]),
+                        TestStandardTarget("anotherApp", type: .application, dependencies: ["aFramework"]),
+                        TestStandardTarget("aFramework", type: .application),
+                    ]
+                )
+            ]
+        ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
         let project = workspace.projects[0]
 
@@ -219,13 +234,13 @@ fileprivate enum TargetPlatformSpecializationMode {
         let dependencyClosure = buildGraph.allTargets
         #expect(dependencyClosure.count == 4)
         #expect(dependencyClosure.map({ $0.target.name }) == ["aFramework", "anApp", "aFramework", "anotherApp"])
-        #expect(dependencyClosure[safe: 0]?.target === project.targets[safe: 2])          // The framework target configured for macOS is first
+        #expect(dependencyClosure[safe: 0]?.target === project.targets[safe: 2])  // The framework target configured for macOS is first
         #expect(dependencyClosure[safe: 0]?.parameters == buildParametersmacOS)
-        #expect(dependencyClosure[safe: 1]?.target === project.targets[safe: 0])          // The first app target is second
+        #expect(dependencyClosure[safe: 1]?.target === project.targets[safe: 0])  // The first app target is second
         #expect(dependencyClosure[safe: 1]?.parameters == buildParametersmacOS)
-        #expect(dependencyClosure[safe: 2]?.target === project.targets[safe: 2])          // The framework target configured for iOS is third
+        #expect(dependencyClosure[safe: 2]?.target === project.targets[safe: 2])  // The framework target configured for iOS is third
         #expect(dependencyClosure[safe: 2]?.parameters == buildParametersiOS)
-        #expect(dependencyClosure[safe: 3]?.target === project.targets[safe: 1])          // The second app target is fourth
+        #expect(dependencyClosure[safe: 3]?.target === project.targets[safe: 1])  // The second app target is fourth
         #expect(dependencyClosure[safe: 3]?.parameters == buildParametersiOS)
         #expect(try buildGraph.dependencies(appTarget1) == [try buildGraph.target(for: fwkTargetmacOS)])
         #expect(try buildGraph.dependencies(appTarget2) == [try buildGraph.target(for: fwkTargetiOS)])
@@ -238,14 +253,18 @@ fileprivate enum TargetPlatformSpecializationMode {
     @Test
     func missingExplicitDependency() async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("Workspace",
-                                          projects: [TestProject("aProject",
-                                                                 groupTree: TestGroup("SomeFiles"),
-                                                                 targets: [
-                                                                    TestStandardTarget("anApp", type: .application, dependencies: ["aFramework", "Missing"]),
-                                                                    TestStandardTarget("aFramework", type: .application),
-                                                                 ]
-                                                                )]
+        let workspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles"),
+                    targets: [
+                        TestStandardTarget("anApp", type: .application, dependencies: ["aFramework", "Missing"]),
+                        TestStandardTarget("aFramework", type: .application),
+                    ]
+                )
+            ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
         let project = workspace.projects[0]
@@ -256,7 +275,7 @@ fileprivate enum TargetPlatformSpecializationMode {
         // Configure the targets and create a BuildRequest.
         let buildParameters = BuildParameters(configuration: "Debug")
         let appTarget = BuildRequest.BuildTargetInfo(parameters: buildParameters, target: project.targets[0])
-        let fwkTarget  = BuildRequest.BuildTargetInfo(parameters: buildParameters, target: project.targets[1])
+        let fwkTarget = BuildRequest.BuildTargetInfo(parameters: buildParameters, target: project.targets[1])
         let buildRequest = BuildRequest(parameters: buildParameters, buildTargets: [appTarget], continueBuildingAfterErrors: true, useParallelTargets: false, useImplicitDependencies: false, useDryRun: false)
         let buildRequestContext = BuildRequestContext(workspaceContext: workspaceContext)
 
@@ -278,20 +297,32 @@ fileprivate enum TargetPlatformSpecializationMode {
     @Test
     func excludedExplicitDependency() async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("Workspace",
-            projects: [TestProject("aProject",
-                groupTree: TestGroup("SomeFiles"),
-                targets: [
-                    TestStandardTarget("anApp", type: .application, buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
-                        TestBuildConfiguration("Debug-LimitedDeps", buildSettings: [
-                            "EXCLUDED_EXPLICIT_TARGET_DEPENDENCIES": "excludedFramework",
-                        ]),
-                    ], dependencies: ["aFramework", "excludedFramework"]),
-                    TestStandardTarget("aFramework", type: .framework),
-                    TestStandardTarget("excludedFramework", type: .framework),
-                ]
-            )]
+        let workspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles"),
+                    targets: [
+                        TestStandardTarget(
+                            "anApp",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Debug"),
+                                TestBuildConfiguration(
+                                    "Debug-LimitedDeps",
+                                    buildSettings: [
+                                        "EXCLUDED_EXPLICIT_TARGET_DEPENDENCIES": "excludedFramework"
+                                    ]
+                                ),
+                            ],
+                            dependencies: ["aFramework", "excludedFramework"]
+                        ),
+                        TestStandardTarget("aFramework", type: .framework),
+                        TestStandardTarget("excludedFramework", type: .framework),
+                    ]
+                )
+            ]
         ).load(core)
 
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -335,49 +366,58 @@ fileprivate enum TargetPlatformSpecializationMode {
     @Test(.requireSDKs(.iOS, .watchOS))
     func packageProductBasedSpecialization() async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("Workspace",
-                                          projects: [
-                                            TestProject("aProject",
-                                                        groupTree: TestGroup("SomeFiles"),
-                                                        targets: [
-                                                            TestAggregateTarget("ALL", dependencies: ["iOSFwk", "watchOSFwk"]),
-                                                            TestStandardTarget(
-                                                                "iOSFwk",
-                                                                type: .framework,
-                                                                buildConfigurations: [
-                                                                    TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"]),
-                                                                ],
-                                                                dependencies: ["PackageLibProduct"]
-                                                            ),
-                                                            TestStandardTarget(
-                                                                "watchOSFwk",
-                                                                type: .framework,
-                                                                buildConfigurations: [
-                                                                    TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "watchos"]),
-                                                                ],
-                                                                dependencies: ["PackageLibProduct"]
-                                                            ),
-                                                        ]
-                                                       ),
-                                            TestPackageProject("Package",
-                                                               groupTree: TestGroup("SomeFile"),
-                                                               targets: [
-                                                                TestPackageProductTarget(
-                                                                    "PackageLibProduct",
-                                                                    frameworksBuildPhase: TestFrameworksBuildPhase([
-                                                                        TestBuildFile(.target("PackageLib"))]),
-                                                                    buildConfigurations: [
-                                                                        // Targets need to opt-in to specialization.
-                                                                        TestBuildConfiguration("Debug", buildSettings: [
-                                                                            "SDKROOT": "auto",
-                                                                            "SDK_VARIANT": "auto",
-                                                                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
-                                                                        ]),
-                                                                    ],
-                                                                    dependencies: ["PackageLib"]
-                                                                ),
-                                                                TestStandardTarget("PackageLib", type: .staticLibrary),
-                                                               ])]
+        let workspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles"),
+                    targets: [
+                        TestAggregateTarget("ALL", dependencies: ["iOSFwk", "watchOSFwk"]),
+                        TestStandardTarget(
+                            "iOSFwk",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"])
+                            ],
+                            dependencies: ["PackageLibProduct"]
+                        ),
+                        TestStandardTarget(
+                            "watchOSFwk",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "watchos"])
+                            ],
+                            dependencies: ["PackageLibProduct"]
+                        ),
+                    ]
+                ),
+                TestPackageProject(
+                    "Package",
+                    groupTree: TestGroup("SomeFile"),
+                    targets: [
+                        TestPackageProductTarget(
+                            "PackageLibProduct",
+                            frameworksBuildPhase: TestFrameworksBuildPhase([
+                                TestBuildFile(.target("PackageLib"))
+                            ]),
+                            buildConfigurations: [
+                                // Targets need to opt-in to specialization.
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "auto",
+                                        "SDK_VARIANT": "auto",
+                                        "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
+                                    ]
+                                )
+                            ],
+                            dependencies: ["PackageLib"]
+                        ),
+                        TestStandardTarget("PackageLib", type: .staticLibrary),
+                    ]
+                ),
+            ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
         let project = workspace.projects[0]
@@ -440,7 +480,7 @@ fileprivate enum TargetPlatformSpecializationMode {
                     groupTree: TestGroup(
                         "SomeFiles",
                         children: [
-                            TestFile("AppSource.m"),
+                            TestFile("AppSource.m")
                         ]
                     ),
                     targets: [
@@ -451,41 +491,47 @@ fileprivate enum TargetPlatformSpecializationMode {
                                 TestBuildConfiguration(
                                     "Debug",
                                     buildSettings: mode.settings(["SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)"])
-                                ),
+                                )
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase([
-                                    "AppSource.m",
-                                ]),
+                                    "AppSource.m"
+                                ])
                             ],
                             dependencies: [
                                 TestTargetDependency(
                                     "PackageLibProduct",
-                                    platformFilters: Set([
-                                        PlatformFilter.iOSFilters,
-                                        PlatformFilter.watchOSFilters
-                                    ].flatMap { $0 })
-                                ),
+                                    platformFilters: Set(
+                                        [
+                                            PlatformFilter.iOSFilters,
+                                            PlatformFilter.watchOSFilters,
+                                        ].flatMap { $0 }
+                                    )
+                                )
                             ]
+                        )
+                    ]
+                ),
+                TestPackageProject(
+                    "Package",
+                    groupTree: TestGroup("SomeFiles"),
+                    targets: [
+                        TestPackageProductTarget(
+                            "PackageLibProduct",
+                            frameworksBuildPhase: TestFrameworksBuildPhase([
+                                TestBuildFile(.target("PackageLib"))
+                            ]),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: mode.settings(isPackage: true, ["SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)"])
+                                )
+                            ],
+                            dependencies: ["PackageLib"]
                         ),
-                    ]),
-                TestPackageProject("Package", groupTree: TestGroup("SomeFiles"), targets: [
-                    TestPackageProductTarget(
-                        "PackageLibProduct",
-                        frameworksBuildPhase: TestFrameworksBuildPhase([
-                            TestBuildFile(.target("PackageLib"))
-                        ]),
-                        buildConfigurations: [
-                            TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: mode.settings(isPackage: true, ["SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)"])
-                            ),
-                        ],
-                        dependencies: ["PackageLib"]
-                    ),
-                    TestStandardTarget("PackageLib", type: .staticLibrary),
-                ]
-                                  )
+                        TestStandardTarget("PackageLib", type: .staticLibrary),
+                    ]
+                ),
             ]
         ).load(core)
 
@@ -522,9 +568,9 @@ fileprivate enum TargetPlatformSpecializationMode {
                 type: .dependency
             )
 
-            let universalTarget = try #require(buildGraph.allTargets.first{ $0.target.name == "Universal" })
+            let universalTarget = try #require(buildGraph.allTargets.first { $0.target.name == "Universal" })
             let deps = buildGraph.dependencies(of: universalTarget)
-            #expect(deps.map{ $0.target.name } == expectedDependencies)
+            #expect(deps.map { $0.target.name } == expectedDependencies)
         }
     }
 
@@ -540,13 +586,18 @@ fileprivate enum TargetPlatformSpecializationMode {
 
     private func _testSpecializationWithCommandLineOverrides(_ mode: TargetPlatformSpecializationMode) async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("Workspace", projects: [
-            TestProject("aProject",
-                        groupTree: TestGroup("SomeFiles"),
-                        targets: [
-                            TestStandardTarget("BestTarget", type: .framework, buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: mode.settings(["SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator"]))])
-                        ])
-        ]).load(core)
+        let workspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles"),
+                    targets: [
+                        TestStandardTarget("BestTarget", type: .framework, buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: mode.settings(["SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator"]))])
+                    ]
+                )
+            ]
+        ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
         let project = workspace.projects[0]
 
@@ -583,40 +634,44 @@ fileprivate enum TargetPlatformSpecializationMode {
     @Test
     func packageProductBasedSpecializationUniquing() async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("Workspace",
-                                          projects: [
-                                            TestProject("aProject",
-                                                        groupTree: TestGroup("SomeFiles"),
-                                                        targets: [
-                                                            // We check specialization by having both direct dependencies and ones from a consumer (and we have two instances, to check that order doesn't matter).
-                                                            TestAggregateTarget("ALL", dependencies: ["Lib", "SpecializingConsumer", "Lib2"]),
-                                                            // This is an intermediate target, used to drive specialization.
-                                                            TestStandardTarget(
-                                                                "SpecializingConsumer",
-                                                                type: .framework,
-                                                                buildConfigurations: [
-                                                                    TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"]),
-                                                                ],
-                                                                dependencies: ["PackageProduct"]
-                                                            ),
-                                                        ]
-                                                       ),
-                                            TestPackageProject("Package",
-                                                               groupTree: TestGroup("SomeFiles"),
-                                                               targets: [
-                                                                TestPackageProductTarget(
-                                                                    "PackageProduct",
-                                                                    frameworksBuildPhase: TestFrameworksBuildPhase([
-                                                                        TestBuildFile(.target("Lib")),
-                                                                        TestBuildFile(.target("Lib2"))]),
-                                                                    dependencies: ["Lib", "Lib2"]
-                                                                ),
-                                                                // These are the targets we are testing specialization of.
-                                                                TestStandardTarget("Lib", type: .staticLibrary),
-                                                                TestStandardTarget("Lib2", type: .staticLibrary),
-                                                               ]
-                                                              ),
-                                          ]
+        let workspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles"),
+                    targets: [
+                        // We check specialization by having both direct dependencies and ones from a consumer (and we have two instances, to check that order doesn't matter).
+                        TestAggregateTarget("ALL", dependencies: ["Lib", "SpecializingConsumer", "Lib2"]),
+                        // This is an intermediate target, used to drive specialization.
+                        TestStandardTarget(
+                            "SpecializingConsumer",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"])
+                            ],
+                            dependencies: ["PackageProduct"]
+                        ),
+                    ]
+                ),
+                TestPackageProject(
+                    "Package",
+                    groupTree: TestGroup("SomeFiles"),
+                    targets: [
+                        TestPackageProductTarget(
+                            "PackageProduct",
+                            frameworksBuildPhase: TestFrameworksBuildPhase([
+                                TestBuildFile(.target("Lib")),
+                                TestBuildFile(.target("Lib2")),
+                            ]),
+                            dependencies: ["Lib", "Lib2"]
+                        ),
+                        // These are the targets we are testing specialization of.
+                        TestStandardTarget("Lib", type: .staticLibrary),
+                        TestStandardTarget("Lib2", type: .staticLibrary),
+                    ]
+                ),
+            ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
         let project = workspace.projects[0]
@@ -633,7 +688,7 @@ fileprivate enum TargetPlatformSpecializationMode {
             // Get the dependency closure for the build request and examine it.
             let buildGraph = await TargetGraphFactory(workspaceContext: workspaceContext, buildRequest: buildRequest, buildRequestContext: buildRequestContext, delegate: delegate).graph(type: type)
             let targetList = Array(buildGraph.allTargets.reversed())
-            if type == .linkage { // <rdar://problem/61461826> `TargetLinkageGraph.allTargets` isn't sorted in dependency order
+            if type == .linkage {  // <rdar://problem/61461826> `TargetLinkageGraph.allTargets` isn't sorted in dependency order
                 #expect(targetList.map({ $0.target.name }).sorted() == ["ALL", "Lib", "Lib2", "PackageProduct", "SpecializingConsumer"])
             } else {
                 #expect(targetList.map({ $0.target.name }) == ["ALL", "SpecializingConsumer", "PackageProduct", "Lib2", "Lib"])
@@ -652,32 +707,41 @@ fileprivate enum TargetPlatformSpecializationMode {
                 type: .dynamicLibrary,
                 buildConfigurations: [
                     // Targets need to opt-in to specialization.
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "auto",
-                        "SDK_VARIANT": "auto",
-                        "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "SDKROOT": "auto",
+                            "SDK_VARIANT": "auto",
+                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
+                        ]
+                    )
                 ],
                 buildPhases: [
                     TestFrameworksBuildPhase([
-                        TestBuildFile(.target("PackageLib"))]),
+                        TestBuildFile(.target("PackageLib"))
+                    ]),
                     TestSourcesBuildPhase([
-                        "Package.m",
+                        "Package.m"
                     ]),
                 ],
-                dependencies: ["PackageLib"])
+                dependencies: ["PackageLib"]
+            )
         } else {
             packageProductTarget = TestPackageProductTarget(
                 "PackageLibProduct",
                 frameworksBuildPhase: TestFrameworksBuildPhase([
-                    TestBuildFile(.target("PackageLib"))]),
+                    TestBuildFile(.target("PackageLib"))
+                ]),
                 buildConfigurations: [
                     // Targets need to opt-in to specialization.
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "auto",
-                        "SDK_VARIANT": "auto",
-                        "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "SDKROOT": "auto",
+                            "SDK_VARIANT": "auto",
+                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
+                        ]
+                    )
                 ],
                 dependencies: ["PackageLib"]
             )
@@ -687,141 +751,160 @@ fileprivate enum TargetPlatformSpecializationMode {
         let workspace = try await TestWorkspace(
             "Workspace",
             projects: [
-                TestProject("aProject",
-                            groupTree: TestGroup(
-                                "Sources", path: "Sources",
-                                children: [
-                                    // iOS app files
-                                    TestFile("iosApp/main.m"),
-                                    TestFile("iosApp/CompanionClass.swift"),
-                                    TestFile("iosApp/Main.storyboard"),
-                                    TestFile("iosApp/Assets.xcassets"),
-                                    TestFile("iosApp/Info.plist"),
-
-                                    // watchOS app files
-                                    TestFile("watchosApp/Interface.storyboard"),
-                                    TestFile("watchosApp/Assets.xcassets"),
-                                    TestFile("watchosApp/Info.plist"),
-
-                                    // watchOS extension files
-                                    TestFile("watchosExtension/Controller.m"),
-                                    TestFile("watchosExtension/WatchClass.swift"),
-                                    TestFile("watchosExtension/Assets.xcassets"),
-                                    TestFile("watchosExtension/Info.plist"),
-                                ]),
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup(
+                        "Sources",
+                        path: "Sources",
+                        children: [
+                            // iOS app files
+                            TestFile("iosApp/main.m"),
+                            TestFile("iosApp/CompanionClass.swift"),
+                            TestFile("iosApp/Main.storyboard"),
+                            TestFile("iosApp/Assets.xcassets"),
+                            TestFile("iosApp/Info.plist"),
+
+                            // watchOS app files
+                            TestFile("watchosApp/Interface.storyboard"),
+                            TestFile("watchosApp/Assets.xcassets"),
+                            TestFile("watchosApp/Info.plist"),
+
+                            // watchOS extension files
+                            TestFile("watchosExtension/Controller.m"),
+                            TestFile("watchosExtension/WatchClass.swift"),
+                            TestFile("watchosExtension/Assets.xcassets"),
+                            TestFile("watchosExtension/Info.plist"),
+                        ]
+                    ),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "CODE_SIGN_IDENTITY": "Apple Development",
+                                "SDKROOT": "iphoneos",
+                                "SWIFT_VERSION": swiftVersion,
+                            ]
+                        )
+                    ],
+                    targets: [
+                        TestStandardTarget(
+                            "Watchable",
+                            type: .application,
                             buildConfigurations: [
                                 TestBuildConfiguration(
                                     "Debug",
                                     buildSettings: [
-                                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                                        "CODE_SIGN_IDENTITY": "Apple Development",
-                                        "SDKROOT": "iphoneos",
-                                        "SWIFT_VERSION": swiftVersion,
-                                    ]),
+                                        "INFOPLIST_FILE": "Sources/iosApp/Info.plist",
+                                        "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks",
+                                        "TARGETED_DEVICE_FAMILY": "1,2",
+                                    ]
+                                )
                             ],
-                            targets: [
-                                TestStandardTarget(
-                                    "Watchable",
-                                    type: .application,
-                                    buildConfigurations: [
-                                        TestBuildConfiguration(
-                                            "Debug",
-                                            buildSettings: [
-                                                "INFOPLIST_FILE": "Sources/iosApp/Info.plist",
-                                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks",
-                                                "TARGETED_DEVICE_FAMILY": "1,2",
-                                            ]),
-                                    ],
-                                    buildPhases: [
-                                        TestSourcesBuildPhase([
-                                            "main.m",
-                                            "iosApp/CompanionClass.swift",
-                                        ]),
-                                        TestResourcesBuildPhase([
-                                            "Main.storyboard",
-                                            "iosApp/Assets.xcassets",
-                                        ]),
-                                        TestCopyFilesBuildPhase([
-                                            "Watchable WatchKit App.app",
-                                        ], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch", onlyForDeployment: false
-                                                               ),
-                                    ],
-                                    dependencies: ["Watchable WatchKit App", "PackageLibProduct"]
-                                ),
-                                TestStandardTarget(
-                                    "Watchable WatchKit App",
-                                    type: .watchKitApp,
-                                    buildConfigurations: [
-                                        TestBuildConfiguration(
-                                            "Debug",
-                                            buildSettings: [
-                                                "ARCHS[sdk=watchos*]": "armv7k",
-                                                "ARCHS[sdk=watchsimulator*]": "i386",
-                                                "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
-                                                "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
-                                                "INFOPLIST_FILE": "Sources/watchosApp/Info.plist",
-                                                "SDKROOT": "watchos",
-                                                "SKIP_INSTALL": "YES",
-                                                "TARGETED_DEVICE_FAMILY": "4",
-                                                "WATCHOS_DEPLOYMENT_TARGET": watchosSDKVersion,
-                                            ]),
-                                    ],
-                                    buildPhases: [
-                                        TestResourcesBuildPhase([
-                                            "Interface.storyboard",
-                                            "watchosApp/Assets.xcassets",
-                                        ]),
-                                        TestCopyFilesBuildPhase([
-                                            "Watchable WatchKit Extension.appex",
-                                        ], destinationSubfolder: .plugins, onlyForDeployment: false
-                                                               ),
+                            buildPhases: [
+                                TestSourcesBuildPhase([
+                                    "main.m",
+                                    "iosApp/CompanionClass.swift",
+                                ]),
+                                TestResourcesBuildPhase([
+                                    "Main.storyboard",
+                                    "iosApp/Assets.xcassets",
+                                ]),
+                                TestCopyFilesBuildPhase(
+                                    [
+                                        "Watchable WatchKit App.app"
                                     ],
-                                    dependencies: ["Watchable WatchKit Extension"]
+                                    destinationSubfolder: .builtProductsDir,
+                                    destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch",
+                                    onlyForDeployment: false
                                 ),
-                                TestStandardTarget(
-                                    "Watchable WatchKit Extension",
-                                    type: .watchKitExtension,
-                                    buildConfigurations: [
-                                        TestBuildConfiguration(
-                                            "Debug",
-                                            buildSettings: [
-                                                "ARCHS[sdk=watchos*]": "armv7k",
-                                                "ARCHS[sdk=watchsimulator*]": "i386",
-                                                "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
-                                                "INFOPLIST_FILE": "Sources/watchosExtension/Info.plist",
-                                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
-                                                "SDKROOT": "watchos",
-                                                "SKIP_INSTALL": "YES",
-                                                "SWIFT_VERSION": swiftVersion,
-                                                "TARGETED_DEVICE_FAMILY": "4",
-                                                "WATCHOS_DEPLOYMENT_TARGET": watchosSDKVersion,
-                                            ]),
-                                    ],
-                                    buildPhases: [
-                                        TestSourcesBuildPhase([
-                                            "Controller.m",
-                                            "watchosExtension/WatchClass.swift",
-                                        ]),
-                                        TestResourcesBuildPhase([
-                                            "Interface.storyboard",
-                                            "watchosExtension/Assets.xcassets",
-                                        ]),
+                            ],
+                            dependencies: ["Watchable WatchKit App", "PackageLibProduct"]
+                        ),
+                        TestStandardTarget(
+                            "Watchable WatchKit App",
+                            type: .watchKitApp,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "ARCHS[sdk=watchos*]": "armv7k",
+                                        "ARCHS[sdk=watchsimulator*]": "i386",
+                                        "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
+                                        "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
+                                        "INFOPLIST_FILE": "Sources/watchosApp/Info.plist",
+                                        "SDKROOT": "watchos",
+                                        "SKIP_INSTALL": "YES",
+                                        "TARGETED_DEVICE_FAMILY": "4",
+                                        "WATCHOS_DEPLOYMENT_TARGET": watchosSDKVersion,
+                                    ]
+                                )
+                            ],
+                            buildPhases: [
+                                TestResourcesBuildPhase([
+                                    "Interface.storyboard",
+                                    "watchosApp/Assets.xcassets",
+                                ]),
+                                TestCopyFilesBuildPhase(
+                                    [
+                                        "Watchable WatchKit Extension.appex"
                                     ],
-                                    dependencies: ["PackageLibProduct"]
+                                    destinationSubfolder: .plugins,
+                                    onlyForDeployment: false
                                 ),
-                            ]),
+                            ],
+                            dependencies: ["Watchable WatchKit Extension"]
+                        ),
+                        TestStandardTarget(
+                            "Watchable WatchKit Extension",
+                            type: .watchKitExtension,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "ARCHS[sdk=watchos*]": "armv7k",
+                                        "ARCHS[sdk=watchsimulator*]": "i386",
+                                        "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
+                                        "INFOPLIST_FILE": "Sources/watchosExtension/Info.plist",
+                                        "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
+                                        "SDKROOT": "watchos",
+                                        "SKIP_INSTALL": "YES",
+                                        "SWIFT_VERSION": swiftVersion,
+                                        "TARGETED_DEVICE_FAMILY": "4",
+                                        "WATCHOS_DEPLOYMENT_TARGET": watchosSDKVersion,
+                                    ]
+                                )
+                            ],
+                            buildPhases: [
+                                TestSourcesBuildPhase([
+                                    "Controller.m",
+                                    "watchosExtension/WatchClass.swift",
+                                ]),
+                                TestResourcesBuildPhase([
+                                    "Interface.storyboard",
+                                    "watchosExtension/Assets.xcassets",
+                                ]),
+                            ],
+                            dependencies: ["PackageLibProduct"]
+                        ),
+                    ]
+                ),
                 TestPackageProject(
                     "Package",
                     groupTree: TestGroup(
-                        "Sources", path: "Sources",
+                        "Sources",
+                        path: "Sources",
                         children: [
-                            TestFile("Package.m"),
-                        ]),
+                            TestFile("Package.m")
+                        ]
+                    ),
                     targets: [
                         packageProductTarget,
                         TestStandardTarget("PackageLib", type: .staticLibrary),
-                    ])
-            ]).load(core)
+                    ]
+                ),
+            ]
+        ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
         return (workspace.projects[0], workspaceContext)
     }
@@ -873,36 +956,44 @@ fileprivate enum TargetPlatformSpecializationMode {
     @Test
     func toolchainOverridesDoNotConflictWithSpecialization() async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("Workspace",
-                                          projects: [TestPackageProject("aProject",
-                                                                        groupTree: TestGroup("SomeFiles"),
-                                                                        targets: [
-                                                                            TestAggregateTarget("ALL", dependencies: ["iOSFwk", "PackageLibProduct"]),
-                                                                            TestStandardTarget(
-                                                                                "iOSFwk",
-                                                                                type: .framework,
-                                                                                buildConfigurations: [
-                                                                                    TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"]),
-                                                                                ],
-                                                                                dependencies: ["PackageLibProduct"]
-                                                                            ),
-                                                                            TestPackageProductTarget(
-                                                                                "PackageLibProduct",
-                                                                                frameworksBuildPhase: TestFrameworksBuildPhase([
-                                                                                    TestBuildFile(.target("PackageLib"))]),
-                                                                                buildConfigurations: [
-                                                                                    // Targets need to opt-in to specialization.
-                                                                                    TestBuildConfiguration("Debug", buildSettings: [
-                                                                                        "SDKROOT": "auto",
-                                                                                        "SDK_VARIANT": "auto",
-                                                                                        "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
-                                                                                    ]),
-                                                                                ],
-                                                                                dependencies: ["PackageLib"]
-                                                                            ),
-                                                                            TestStandardTarget("PackageLib", type: .staticLibrary),
-                                                                        ]
-                                                                       )]
+        let workspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestPackageProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles"),
+                    targets: [
+                        TestAggregateTarget("ALL", dependencies: ["iOSFwk", "PackageLibProduct"]),
+                        TestStandardTarget(
+                            "iOSFwk",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"])
+                            ],
+                            dependencies: ["PackageLibProduct"]
+                        ),
+                        TestPackageProductTarget(
+                            "PackageLibProduct",
+                            frameworksBuildPhase: TestFrameworksBuildPhase([
+                                TestBuildFile(.target("PackageLib"))
+                            ]),
+                            buildConfigurations: [
+                                // Targets need to opt-in to specialization.
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "auto",
+                                        "SDK_VARIANT": "auto",
+                                        "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
+                                    ]
+                                )
+                            ],
+                            dependencies: ["PackageLib"]
+                        ),
+                        TestStandardTarget("PackageLib", type: .staticLibrary),
+                    ]
+                )
+            ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
         let project = workspace.projects[0]
@@ -925,42 +1016,50 @@ fileprivate enum TargetPlatformSpecializationMode {
     @Test
     func toolchainOverlaysViaOverridesDoNotConflictWithSpecialization() async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("Workspace",
-                                          projects: [TestPackageProject("aProject",
-                                                                        groupTree: TestGroup("SomeFiles"),
-                                                                        targets: [
-                                                                            TestAggregateTarget("ALL", dependencies: ["iOSFwk", "PackageLibProduct"]),
-                                                                            TestStandardTarget(
-                                                                                "iOSFwk",
-                                                                                type: .framework,
-                                                                                buildConfigurations: [
-                                                                                    TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"]),
-                                                                                ],
-                                                                                dependencies: ["PackageLibProduct"]
-                                                                            ),
-                                                                            TestPackageProductTarget(
-                                                                                "PackageLibProduct",
-                                                                                frameworksBuildPhase: TestFrameworksBuildPhase([
-                                                                                    TestBuildFile(.target("PackageLib"))]),
-                                                                                buildConfigurations: [
-                                                                                    // Targets need to opt-in to specialization.
-                                                                                    TestBuildConfiguration("Debug", buildSettings: [
-                                                                                        "SDKROOT": "auto",
-                                                                                        "SDK_VARIANT": "auto",
-                                                                                        "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
-                                                                                    ]),
-                                                                                ],
-                                                                                dependencies: ["PackageLib"]
-                                                                            ),
-                                                                            TestStandardTarget("PackageLib", type: .staticLibrary),
-                                                                        ]
-                                                                       )]
-        ).load(core)
-        let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
-        let project = workspace.projects[0]
-
-        // Configure the targets and create a BuildRequest.
-        let buildParameters = BuildParameters(configuration: "Debug", activeRunDestination: RunDestinationInfo.macOS, overrides: ["TOOLCHAINS": "com.fake-toolchain-identifier"])
+        let workspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestPackageProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles"),
+                    targets: [
+                        TestAggregateTarget("ALL", dependencies: ["iOSFwk", "PackageLibProduct"]),
+                        TestStandardTarget(
+                            "iOSFwk",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"])
+                            ],
+                            dependencies: ["PackageLibProduct"]
+                        ),
+                        TestPackageProductTarget(
+                            "PackageLibProduct",
+                            frameworksBuildPhase: TestFrameworksBuildPhase([
+                                TestBuildFile(.target("PackageLib"))
+                            ]),
+                            buildConfigurations: [
+                                // Targets need to opt-in to specialization.
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "auto",
+                                        "SDK_VARIANT": "auto",
+                                        "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
+                                    ]
+                                )
+                            ],
+                            dependencies: ["PackageLib"]
+                        ),
+                        TestStandardTarget("PackageLib", type: .staticLibrary),
+                    ]
+                )
+            ]
+        ).load(core)
+        let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
+        let project = workspace.projects[0]
+
+        // Configure the targets and create a BuildRequest.
+        let buildParameters = BuildParameters(configuration: "Debug", activeRunDestination: RunDestinationInfo.macOS, overrides: ["TOOLCHAINS": "com.fake-toolchain-identifier"])
         let allTarget = BuildRequest.BuildTargetInfo(parameters: buildParameters, target: project.targets[0])
         let packageTarget = BuildRequest.BuildTargetInfo(parameters: buildParameters, target: project.targets[2])
         let buildRequest = BuildRequest(parameters: buildParameters, buildTargets: [allTarget, packageTarget], continueBuildingAfterErrors: true, useParallelTargets: false, useImplicitDependencies: false, useDryRun: false)
@@ -977,41 +1076,59 @@ fileprivate enum TargetPlatformSpecializationMode {
     @Test(.requireSDKs(.macOS))
     func macCatalystSpecialization() async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("Workspace", projects: [TestProject("aProject", groupTree: TestGroup("SomeFiles"), targets: [
-            TestAggregateTarget("ALL", dependencies: ["macOSFwk", "macCatalystFwk"]),
-            TestStandardTarget(
-                "macOSFwk",
-                type: .framework,
-                buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"]),
-                ],
-                dependencies: ["PackageLibProduct"]
-            ),
-            TestStandardTarget(
-                "macCatalystFwk",
-                type: .framework,
-                buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SDK_VARIANT": MacCatalystInfo.sdkVariantName]),
-                ],
-                dependencies: ["PackageLibProduct"]
-            ),
-        ]), TestPackageProject("Package", groupTree: TestGroup("SomeFiles"), targets: [
-            TestPackageProductTarget(
-                "PackageLibProduct",
-                frameworksBuildPhase: TestFrameworksBuildPhase([
-                    TestBuildFile(.target("PackageLib"))]),
-                buildConfigurations: [
-                    // Targets need to opt-in to specialization.
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "auto",
-                        "SDK_VARIANT": "auto",
-                        "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
-                    ]),
-                ],
-                dependencies: ["PackageLib"]
-            ),
-            TestStandardTarget("PackageLib", type: .staticLibrary),
-        ])]).load(core)
+        let workspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles"),
+                    targets: [
+                        TestAggregateTarget("ALL", dependencies: ["macOSFwk", "macCatalystFwk"]),
+                        TestStandardTarget(
+                            "macOSFwk",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"])
+                            ],
+                            dependencies: ["PackageLibProduct"]
+                        ),
+                        TestStandardTarget(
+                            "macCatalystFwk",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SDK_VARIANT": MacCatalystInfo.sdkVariantName])
+                            ],
+                            dependencies: ["PackageLibProduct"]
+                        ),
+                    ]
+                ),
+                TestPackageProject(
+                    "Package",
+                    groupTree: TestGroup("SomeFiles"),
+                    targets: [
+                        TestPackageProductTarget(
+                            "PackageLibProduct",
+                            frameworksBuildPhase: TestFrameworksBuildPhase([
+                                TestBuildFile(.target("PackageLib"))
+                            ]),
+                            buildConfigurations: [
+                                // Targets need to opt-in to specialization.
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "auto",
+                                        "SDK_VARIANT": "auto",
+                                        "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
+                                    ]
+                                )
+                            ],
+                            dependencies: ["PackageLib"]
+                        ),
+                        TestStandardTarget("PackageLib", type: .staticLibrary),
+                    ]
+                ),
+            ]
+        ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
         let project = workspace.projects[0]
 
@@ -1058,27 +1175,35 @@ fileprivate enum TargetPlatformSpecializationMode {
         delegate.checkNoDiagnostics()
     }
 
-    func basicPackage(linkage: TestStandardTarget.TargetType = .staticLibrary, additionalBuildSettings: [String:String] = [:]) -> TestProject {
-        return TestPackageProject("aPackage", groupTree: TestGroup("Package"), targets: [
-            TestPackageProductTarget(
-                "PackageLibProduct",
-                frameworksBuildPhase: TestFrameworksBuildPhase([
-                    TestBuildFile(.target("PackageLib"))]),
-                buildConfigurations: [
-                    // Targets need to opt-in to specialization.
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "auto",
-                        "SDK_VARIANT": "auto",
-                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                    ].merging(additionalBuildSettings, uniquingKeysWith: { a, b in a })),
-                ],
-                dependencies: ["PackageLib"]
-            ),
-            TestStandardTarget("PackageLib", type: linkage)
-        ])
+    func basicPackage(linkage: TestStandardTarget.TargetType = .staticLibrary, additionalBuildSettings: [String: String] = [:]) -> TestProject {
+        return TestPackageProject(
+            "aPackage",
+            groupTree: TestGroup("Package"),
+            targets: [
+                TestPackageProductTarget(
+                    "PackageLibProduct",
+                    frameworksBuildPhase: TestFrameworksBuildPhase([
+                        TestBuildFile(.target("PackageLib"))
+                    ]),
+                    buildConfigurations: [
+                        // Targets need to opt-in to specialization.
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SDK_VARIANT": "auto",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                            ].merging(additionalBuildSettings, uniquingKeysWith: { a, b in a })
+                        )
+                    ],
+                    dependencies: ["PackageLib"]
+                ),
+                TestStandardTarget("PackageLib", type: linkage),
+            ]
+        )
     }
 
-    func packageWorkspace(with targets: [any TestTarget], linkage: TestStandardTarget.TargetType = .staticLibrary, additionalBuildSettings: [String:String] = [:], dependenciesForTopLevelAggregateTarget: [String]? = nil) async throws -> (SWBCore.Workspace, WorkspaceContext) {
+    func packageWorkspace(with targets: [any TestTarget], linkage: TestStandardTarget.TargetType = .staticLibrary, additionalBuildSettings: [String: String] = [:], dependenciesForTopLevelAggregateTarget: [String]? = nil) async throws -> (SWBCore.Workspace, WorkspaceContext) {
         let core = try await getCore()
         let allTargets = [TestAggregateTarget("ALL", dependencies: dependenciesForTopLevelAggregateTarget ?? targets.map { $0.name })] + targets.map { $0 as (any TestTarget) }
         let workspace = try TestWorkspace("Workspace", projects: [TestProject("aProject", groupTree: TestGroup("SomeFiles"), targets: allTargets), basicPackage(linkage: linkage, additionalBuildSettings: additionalBuildSettings)]).load(core)
@@ -1088,7 +1213,7 @@ fileprivate enum TargetPlatformSpecializationMode {
 
     fileprivate func computeBuildGraph(of workspace: SWBCore.Workspace, context: WorkspaceContext, buildRequestContext: BuildRequestContext, buildCommand: BuildCommand? = nil, buildParameters: BuildParameters, additionalTargets: [SWBCore.Target] = [], diagnosticFormat: Diagnostic.LocalizedDescriptionFormat = .debugWithoutBehavior, expectedDiagnostics: [String] = [], type: TargetGraphFactory.GraphType, useImplicitDependencies: Bool = false, skipDependencies: Bool = false) async throws -> any TargetGraph {
         let allTarget = workspace.projects[0].targets[0]
-        let buildRequest = BuildRequest(parameters: buildParameters, buildTargets: ([allTarget] + additionalTargets).map { BuildRequest.BuildTargetInfo(parameters: buildParameters, target:$0) }, continueBuildingAfterErrors: true, useParallelTargets: false, useImplicitDependencies: useImplicitDependencies, useDryRun: false, buildCommand: buildCommand ?? .build(style: .buildOnly, skipDependencies: skipDependencies))
+        let buildRequest = BuildRequest(parameters: buildParameters, buildTargets: ([allTarget] + additionalTargets).map { BuildRequest.BuildTargetInfo(parameters: buildParameters, target: $0) }, continueBuildingAfterErrors: true, useParallelTargets: false, useImplicitDependencies: useImplicitDependencies, useDryRun: false, buildCommand: buildCommand ?? .build(style: .buildOnly, skipDependencies: skipDependencies))
 
         let delegate = EmptyTargetDependencyResolverDelegate(workspace: workspace)
         let buildGraph = await TargetGraphFactory(workspaceContext: context, buildRequest: buildRequest, buildRequestContext: buildRequestContext, delegate: delegate).graph(type: type)
@@ -1113,12 +1238,12 @@ fileprivate enum TargetPlatformSpecializationMode {
         return packageProduct
     }
 
-    func frameworkTarget(name: String, buildSettings: [String:String]) -> TestStandardTarget {
+    func frameworkTarget(name: String, buildSettings: [String: String]) -> TestStandardTarget {
         return TestStandardTarget(
             name,
             type: .framework,
-            buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: buildSettings) ],
-            buildPhases: [ TestFrameworksBuildPhase([TestBuildFile(.target("PackageLibProduct"))]) ],
+            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: buildSettings)],
+            buildPhases: [TestFrameworksBuildPhase([TestBuildFile(.target("PackageLibProduct"))])],
             dependencies: ["PackageLibProduct"]
         )
     }
@@ -1129,12 +1254,12 @@ fileprivate enum TargetPlatformSpecializationMode {
             TestStandardTarget(
                 "BestFramework",
                 type: .framework,
-                buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"]) ],
+                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"])],
                 dependencies: ["Aggregate"]
             ),
             TestAggregateTarget(
                 "Aggregate",
-                buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"]) ],
+                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"])],
                 dependencies: ["PackageLibProduct"]
             ),
         ]
@@ -1154,12 +1279,12 @@ fileprivate enum TargetPlatformSpecializationMode {
             TestStandardTarget(
                 "BestFramework",
                 type: .framework,
-                buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"]) ],
+                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"])],
                 dependencies: ["Aggregate"]
             ),
             TestAggregateTarget(
                 "Aggregate",
-                buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"]) ],
+                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"])],
                 dependencies: []
             ),
         ]
@@ -1179,29 +1304,29 @@ fileprivate enum TargetPlatformSpecializationMode {
             TestStandardTarget(
                 "BestFramework",
                 type: .framework,
-                buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "OTHER_LDFLAGS": "-framework Dep" ]) ],
+                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "OTHER_LDFLAGS": "-framework Dep"])],
                 dependencies: ["Intermediate"]
             ),
             TestAggregateTarget(
                 "Intermediate",
-                buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"]) ],
+                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"])],
                 dependencies: ["Aggregate"]
             ),
             TestAggregateTarget(
                 "Aggregate",
-                buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"]) ],
+                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"])],
                 dependencies: ["PackageLibProduct"]
             ),
             TestAggregateTarget(
                 "Aggregate2",
-                buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"]) ],
+                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"])],
                 dependencies: ["BestFramework"]
             ),
             TestStandardTarget(
                 "SomeDependency",
                 type: .framework,
-                buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "PRODUCT_NAME": "Dep" ]) ]
-            )
+                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "PRODUCT_NAME": "Dep"])]
+            ),
         ]
 
         let (workspace, workspaceContext) = try await packageWorkspace(with: targets, linkage: .staticLibrary, dependenciesForTopLevelAggregateTarget: ["Aggregate2"])
@@ -1234,15 +1359,23 @@ fileprivate enum TargetPlatformSpecializationMode {
     func platformSpecialization() async throws {
         let core = try await getCore()
         var testPlatforms = [SWBCore.Platform]()
-        let targets = core.platformRegistry.platforms.filter({ !$0.isSimulator }).compactMap { platform in
-            if let sdkCanonicalName = platform.sdkCanonicalName, core.sdkRegistry.lookup(sdkCanonicalName) != nil {
-                testPlatforms.append(platform)
-                return frameworkTarget(name: "\(platform.name)Fwk", buildSettings: ["SDKROOT": sdkCanonicalName])
-            }
-            return nil
-        } + [frameworkTarget(name: "McFwk", buildSettings: ["SDKROOT": "macosx",
-                                                            "SDK_VARIANT": MacCatalystInfo.sdkVariantName])]
-        #expect(testPlatforms.count > 0)      // ensure this test doesn't pass just because we somehow ended up with no platforms with valid SDKs
+        let targets =
+            core.platformRegistry.platforms.filter({ !$0.isSimulator }).compactMap { platform in
+                if let sdkCanonicalName = platform.sdkCanonicalName, core.sdkRegistry.lookup(sdkCanonicalName) != nil {
+                    testPlatforms.append(platform)
+                    return frameworkTarget(name: "\(platform.name)Fwk", buildSettings: ["SDKROOT": sdkCanonicalName])
+                }
+                return nil
+            } + [
+                frameworkTarget(
+                    name: "McFwk",
+                    buildSettings: [
+                        "SDKROOT": "macosx",
+                        "SDK_VARIANT": MacCatalystInfo.sdkVariantName,
+                    ]
+                )
+            ]
+        #expect(testPlatforms.count > 0)  // ensure this test doesn't pass just because we somehow ended up with no platforms with valid SDKs
 
         let linkages: [TestStandardTarget.TargetType] = [.staticLibrary, .dynamicLibrary]
         for linkage in linkages {
@@ -1258,14 +1391,14 @@ fileprivate enum TargetPlatformSpecializationMode {
                 for type in TargetGraphFactory.GraphType.allCases {
                     //let runDestinationString = "\(runDestination.sdk)" + (runDestination.sdkVariant.map({ $0 != runDestination.sdk ? "-\($0)" : "" }) ?? "")
                     //try await XCTContext.runActivity(named: "graphType:\(type) runDestination:\(runDestinationString) linkage:\(linkage)", block: { _ in
-                        let buildGraph = try await computeBuildGraph(of: workspace, context: workspaceContext, buildRequestContext: buildRequestContext, buildParameters: buildParameters, additionalTargets: [packageLibProductTarget], type: type)
+                    let buildGraph = try await computeBuildGraph(of: workspace, context: workspaceContext, buildRequestContext: buildRequestContext, buildParameters: buildParameters, additionalTargets: [packageLibProductTarget], type: type)
 
-                        for platform in testPlatforms {
-                            verifyPlatform(for: "\(platform.name)Fwk", buildGraph: buildGraph, buildRequestContext: buildRequestContext, graphType: type)
-                        }
+                    for platform in testPlatforms {
+                        verifyPlatform(for: "\(platform.name)Fwk", buildGraph: buildGraph, buildRequestContext: buildRequestContext, graphType: type)
+                    }
 
-                        // Verify the MacCatalyst framework target gets linked with the correct package.
-                        verifyPlatform(for: "McFwk", buildGraph: buildGraph, buildRequestContext: buildRequestContext, graphType: type)
+                    // Verify the MacCatalyst framework target gets linked with the correct package.
+                    verifyPlatform(for: "McFwk", buildGraph: buildGraph, buildRequestContext: buildRequestContext, graphType: type)
                     //})
                 }
             }
@@ -1277,8 +1410,8 @@ fileprivate enum TargetPlatformSpecializationMode {
         let fwkTarget = TestStandardTarget(
             "iOSFwk",
             type: .framework,
-            buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"]) ],
-            buildPhases: [ TestFrameworksBuildPhase([TestBuildFile(.target("PackageLibProduct"))]) ],
+            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"])],
+            buildPhases: [TestFrameworksBuildPhase([TestBuildFile(.target("PackageLibProduct"))])],
             dependencies: ["PackageLibProduct"]
         )
         let (workspace, workspaceContext) = try await packageWorkspace(with: [fwkTarget])
@@ -1302,8 +1435,8 @@ fileprivate enum TargetPlatformSpecializationMode {
         let fwkTarget = TestStandardTarget(
             "iOSFwk",
             type: .framework,
-            buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"]) ],
-            buildPhases: [ TestFrameworksBuildPhase([TestBuildFile(.target("PackageLibProduct"))]) ],
+            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"])],
+            buildPhases: [TestFrameworksBuildPhase([TestBuildFile(.target("PackageLibProduct"))])],
             dependencies: ["PackageLibProduct"]
         )
         let (workspace, workspaceContext) = try await packageWorkspace(with: [fwkTarget])
@@ -1327,8 +1460,8 @@ fileprivate enum TargetPlatformSpecializationMode {
         let fwkTarget = TestStandardTarget(
             "iOSFwk",
             type: .framework,
-            buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"]) ],
-            buildPhases: [ TestFrameworksBuildPhase([TestBuildFile(.target("PackageLibProduct"))]) ],
+            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"])],
+            buildPhases: [TestFrameworksBuildPhase([TestBuildFile(.target("PackageLibProduct"))])],
             dependencies: ["PackageLibProduct"]
         )
         let (workspace, workspaceContext) = try await packageWorkspace(with: [fwkTarget])
@@ -1352,8 +1485,8 @@ fileprivate enum TargetPlatformSpecializationMode {
         let fwkTarget = TestStandardTarget(
             "iOSFwk",
             type: .framework,
-            buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"]) ],
-            buildPhases: [ TestFrameworksBuildPhase([TestBuildFile(.target("PackageLibProduct"))]) ],
+            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"])],
+            buildPhases: [TestFrameworksBuildPhase([TestBuildFile(.target("PackageLibProduct"))])],
             dependencies: ["PackageLibProduct"]
         )
         let (workspace, workspaceContext) = try await packageWorkspace(with: [fwkTarget])
@@ -1375,28 +1508,57 @@ fileprivate enum TargetPlatformSpecializationMode {
     @Test(.requireSDKs(.macOS, .iOS, .watchOS))
     func specializationRespectsSupportedPlatforms() async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("workspace", projects: [
-            TestPackageProject("aPackage", groupTree: TestGroup("Group"), targets: [
-                TestStandardTarget("Library", type: .framework, buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "auto",
-                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                    ])
-                ], dependencies: ["Tool", "WatchApp"]),
-                TestStandardTarget("Tool", type: .commandLineTool, buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "auto",
-                        "SUPPORTED_PLATFORMS": "macosx",
-                    ])
-                ]),
-                TestStandardTarget("WatchApp", type: .watchKitApp, buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "auto",
-                        "SUPPORTED_PLATFORMS": "watchos watchsimulator",
-                    ])
-                ]),
-            ]),
-        ]).load(core)
+        let workspace = try TestWorkspace(
+            "workspace",
+            projects: [
+                TestPackageProject(
+                    "aPackage",
+                    groupTree: TestGroup("Group"),
+                    targets: [
+                        TestStandardTarget(
+                            "Library",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "auto",
+                                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                    ]
+                                )
+                            ],
+                            dependencies: ["Tool", "WatchApp"]
+                        ),
+                        TestStandardTarget(
+                            "Tool",
+                            type: .commandLineTool,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "auto",
+                                        "SUPPORTED_PLATFORMS": "macosx",
+                                    ]
+                                )
+                            ]
+                        ),
+                        TestStandardTarget(
+                            "WatchApp",
+                            type: .watchKitApp,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "auto",
+                                        "SUPPORTED_PLATFORMS": "watchos watchsimulator",
+                                    ]
+                                )
+                            ]
+                        ),
+                    ]
+                )
+            ]
+        ).load(core)
 
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
         let buildRequestContext = BuildRequestContext(workspaceContext: workspaceContext)
@@ -1407,7 +1569,7 @@ fileprivate enum TargetPlatformSpecializationMode {
 
             let expectedSDKs = [
                 "Library": "iphoneos",  // matches run destination
-                "Tool": "macosx",       // is confined to macOS by supported platforms
+                "Tool": "macosx",  // is confined to macOS by supported platforms
                 "WatchApp": "watchos",  // supports a single conceptual platform
             ]
 
@@ -1422,22 +1584,44 @@ fileprivate enum TargetPlatformSpecializationMode {
     @Test(.requireSDKs(.macOS))
     func specializationRespectsSupportedPlatformsWithSDKROOTOverride() async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("workspace", projects: [
-            TestPackageProject("aPackage", groupTree: TestGroup("Group"), targets: [
-                TestStandardTarget("Library", type: .framework, buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "auto",
-                        "SUPPORTED_PLATFORMS": "iphonesimulator iphoneos watchos appletvos",
-                    ])
-                ], dependencies: ["Tool"]),
-                TestStandardTarget("Tool", type: .commandLineTool, buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "auto",
-                        "SUPPORTED_PLATFORMS": "iphonesimulator iphoneos watchos appletvos",
-                    ])
-                ])
-            ]),
-        ]).load(core)
+        let workspace = try TestWorkspace(
+            "workspace",
+            projects: [
+                TestPackageProject(
+                    "aPackage",
+                    groupTree: TestGroup("Group"),
+                    targets: [
+                        TestStandardTarget(
+                            "Library",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "auto",
+                                        "SUPPORTED_PLATFORMS": "iphonesimulator iphoneos watchos appletvos",
+                                    ]
+                                )
+                            ],
+                            dependencies: ["Tool"]
+                        ),
+                        TestStandardTarget(
+                            "Tool",
+                            type: .commandLineTool,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SDKROOT": "auto",
+                                        "SUPPORTED_PLATFORMS": "iphonesimulator iphoneos watchos appletvos",
+                                    ]
+                                )
+                            ]
+                        ),
+                    ]
+                )
+            ]
+        ).load(core)
 
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
         let buildRequestContext = BuildRequestContext(workspaceContext: workspaceContext)
@@ -1468,38 +1652,49 @@ fileprivate enum TargetPlatformSpecializationMode {
 
     @Test
     func previewBuildsUseDynamicTargetReference() async throws {
-        let project = TestPackageProject("aPackage", groupTree: TestGroup("Package"), targets: [
-            TestPackageProductTarget(
-                "PackageLibProduct",
-                frameworksBuildPhase: TestFrameworksBuildPhase([
-                    TestBuildFile(.target("PackageLib"))]),
-                dynamicTargetVariantName: "PackageLibProduct-dynamic",
-                buildConfigurations: [
-                    // Targets need to opt-in to specialization.
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "auto",
-                        "SDK_VARIANT": "auto",
-                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                    ]),
-                ],
-                dependencies: ["PackageLib"]
-            ),
-            TestStandardTarget("PackageLib", type: .objectFile),
-            TestStandardTarget(
-                "PackageLibProduct-dynamic",
-                type: .framework,
-                buildConfigurations: [
-                    // Targets need to opt-in to specialization.
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "auto",
-                        "SDK_VARIANT": "auto",
-                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+        let project = TestPackageProject(
+            "aPackage",
+            groupTree: TestGroup("Package"),
+            targets: [
+                TestPackageProductTarget(
+                    "PackageLibProduct",
+                    frameworksBuildPhase: TestFrameworksBuildPhase([
+                        TestBuildFile(.target("PackageLib"))
                     ]),
-                ],
-                buildPhases: [TestFrameworksBuildPhase([TestBuildFile(.target("PackageLib"))])],
-                dependencies: ["PackageLib"]
-            ),
-        ])
+                    dynamicTargetVariantName: "PackageLibProduct-dynamic",
+                    buildConfigurations: [
+                        // Targets need to opt-in to specialization.
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SDK_VARIANT": "auto",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                            ]
+                        )
+                    ],
+                    dependencies: ["PackageLib"]
+                ),
+                TestStandardTarget("PackageLib", type: .objectFile),
+                TestStandardTarget(
+                    "PackageLibProduct-dynamic",
+                    type: .framework,
+                    buildConfigurations: [
+                        // Targets need to opt-in to specialization.
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SDK_VARIANT": "auto",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                            ]
+                        )
+                    ],
+                    buildPhases: [TestFrameworksBuildPhase([TestBuildFile(.target("PackageLib"))])],
+                    dependencies: ["PackageLib"]
+                ),
+            ]
+        )
         let core = try await getCore()
         let workspace = try TestWorkspace("Workspace", projects: [project]).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -1524,43 +1719,54 @@ fileprivate enum TargetPlatformSpecializationMode {
 
     @Test
     func explicitDependenciesUseDynamicTargets() async throws {
-        let project = TestPackageProject("aPackage", groupTree: TestGroup("Package"), targets: [
-            TestPackageProductTarget(
-                "PackageLibProduct",
-                frameworksBuildPhase: TestFrameworksBuildPhase([
-                    TestBuildFile(.target("PackageLib"))]),
-                dynamicTargetVariantName: "PackageLibProduct-dynamic",
-                buildConfigurations: [
-                    // Targets need to opt-in to specialization.
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "auto",
-                        "SDK_VARIANT": "auto",
-                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                    ]),
-                ],
-                dependencies: ["PackageLib"]
-            ),
-            TestStandardTarget("PackageLib", type: .objectFile),
-            TestStandardTarget(
-                "PackageLibProduct-dynamic",
-                type: .framework,
-                buildConfigurations: [
-                    // Targets need to opt-in to specialization.
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "auto",
-                        "SDK_VARIANT": "auto",
-                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+        let project = TestPackageProject(
+            "aPackage",
+            groupTree: TestGroup("Package"),
+            targets: [
+                TestPackageProductTarget(
+                    "PackageLibProduct",
+                    frameworksBuildPhase: TestFrameworksBuildPhase([
+                        TestBuildFile(.target("PackageLib"))
                     ]),
-                ],
-                buildPhases: [TestFrameworksBuildPhase([TestBuildFile(.target("PackageLib"))])],
-                dependencies: ["PackageLib"]
-            ),
-            TestStandardTarget(
-                "ThePackage",
-                type: .commandLineTool,
-                dependencies: ["PackageLibProduct"]
-            ),
-        ])
+                    dynamicTargetVariantName: "PackageLibProduct-dynamic",
+                    buildConfigurations: [
+                        // Targets need to opt-in to specialization.
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SDK_VARIANT": "auto",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                            ]
+                        )
+                    ],
+                    dependencies: ["PackageLib"]
+                ),
+                TestStandardTarget("PackageLib", type: .objectFile),
+                TestStandardTarget(
+                    "PackageLibProduct-dynamic",
+                    type: .framework,
+                    buildConfigurations: [
+                        // Targets need to opt-in to specialization.
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SDK_VARIANT": "auto",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                            ]
+                        )
+                    ],
+                    buildPhases: [TestFrameworksBuildPhase([TestBuildFile(.target("PackageLib"))])],
+                    dependencies: ["PackageLib"]
+                ),
+                TestStandardTarget(
+                    "ThePackage",
+                    type: .commandLineTool,
+                    dependencies: ["PackageLibProduct"]
+                ),
+            ]
+        )
         let core = try await getCore()
         let workspace = try TestWorkspace("Workspace", projects: [project]).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -1569,13 +1775,14 @@ fileprivate enum TargetPlatformSpecializationMode {
         // This adds `PACKAGE_BUILD_DYNAMICALLY` as an override to activate dynamic variants of targets.
         let buildParametersWithOverrides = BuildParameters(action: .build, configuration: "Debug", activeRunDestination: RunDestinationInfo.iOS, activeArchitecture: nil, overrides: ["PACKAGE_BUILD_DYNAMICALLY": "YES"], commandLineOverrides: [:], commandLineConfigOverrides: [:], environmentConfigOverrides: [:], toolchainOverride: nil, arena: nil)
 
-        let buildRequest = BuildRequest(parameters: buildParametersWithOverrides, buildTargets: (workspace.projects[0].targets).map { BuildRequest.BuildTargetInfo(parameters: buildParametersWithOverrides, target:$0) }, continueBuildingAfterErrors: true, useParallelTargets: false, useImplicitDependencies: false, useDryRun: false, buildCommand: .preview(style: .dynamicReplacement))
+        let buildRequest = BuildRequest(parameters: buildParametersWithOverrides, buildTargets: (workspace.projects[0].targets).map { BuildRequest.BuildTargetInfo(parameters: buildParametersWithOverrides, target: $0) }, continueBuildingAfterErrors: true, useParallelTargets: false, useImplicitDependencies: false, useDryRun: false, buildCommand: .preview(style: .dynamicReplacement))
 
         let resolver = TargetDependencyResolver(
             workspaceContext: workspaceContext,
             buildRequest: buildRequest,
             buildRequestContext: buildRequestContext,
-            delegate: EmptyTargetDependencyResolverDelegate(workspace: workspaceContext.workspace))
+            delegate: EmptyTargetDependencyResolverDelegate(workspace: workspaceContext.workspace)
+        )
 
         let configuredTarget = try ConfiguredTarget(
             parameters: buildParametersWithOverrides,
@@ -1590,17 +1797,28 @@ fileprivate enum TargetPlatformSpecializationMode {
     @Test
     func implicitDependencyDoesNotShadowPackageProductDependency() async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("Workspace", projects: [
-            TestProject("Simple", groupTree: TestGroup("Simple"), targets: [
-                TestAggregateTarget("Best", dependencies: ["App", "Package2"]),
-                TestStandardTarget("App", type: .application, buildPhases: [ TestFrameworksBuildPhase([TestBuildFile(.target("Package"))]) ], dependencies: ["Package"]),
-                TestStandardTarget("Package2", type: .commandLineTool, buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Package"]) ]),
-            ]),
-            TestPackageProject("Package", groupTree: TestGroup("Package"), targets: [
-                TestPackageProductTarget("Package", frameworksBuildPhase: TestFrameworksBuildPhase([TestBuildFile(.target("PackageLib"))]), buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Package"]) ], dependencies: ["PackageLib"]),
-                TestStandardTarget("PackageLib", type: .objectFile)
-            ]),
-        ]).load(core)
+        let workspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "Simple",
+                    groupTree: TestGroup("Simple"),
+                    targets: [
+                        TestAggregateTarget("Best", dependencies: ["App", "Package2"]),
+                        TestStandardTarget("App", type: .application, buildPhases: [TestFrameworksBuildPhase([TestBuildFile(.target("Package"))])], dependencies: ["Package"]),
+                        TestStandardTarget("Package2", type: .commandLineTool, buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Package"])]),
+                    ]
+                ),
+                TestPackageProject(
+                    "Package",
+                    groupTree: TestGroup("Package"),
+                    targets: [
+                        TestPackageProductTarget("Package", frameworksBuildPhase: TestFrameworksBuildPhase([TestBuildFile(.target("PackageLib"))]), buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Package"])], dependencies: ["PackageLib"]),
+                        TestStandardTarget("PackageLib", type: .objectFile),
+                    ]
+                ),
+            ]
+        ).load(core)
 
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
         let buildRequestContext = BuildRequestContext(workspaceContext: workspaceContext)
@@ -1609,7 +1827,7 @@ fileprivate enum TargetPlatformSpecializationMode {
 
         let app = try #require(buildGraph.allTargets.first { $0.target.name == "App" })
         let deps = buildGraph.dependencies(of: app)
-        #expect(deps.map { $0.target.name } == ["Package"]) // Both the CLI tool and the package have the same product name, but different target names.
+        #expect(deps.map { $0.target.name } == ["Package"])  // Both the CLI tool and the package have the same product name, but different target names.
     }
 
     func checkTarget(_ graphType: TargetGraphFactory.GraphType, _ buildRequestContext: BuildRequestContext, _ buildGraph: any TargetGraph, name: String, expectedPlatform: String, sourceLocation: SourceLocation = #_sourceLocation) throws {
@@ -1644,276 +1862,318 @@ fileprivate enum TargetPlatformSpecializationMode {
     }
 
     let specializationWorkspace_basic: TestWorkspace = {
-        return TestWorkspace("Workspace", projects: [
-            TestProject("aProject", groupTree: TestGroup("aGroup"), targets: [
-                TestStandardTarget(
-                    "MacApp",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx" ]) ],
-                    dependencies: ["MultiPlatformFramework", "SinglePlatformFramework"]
-                ),
-                TestStandardTarget(
-                    "PhoneApp",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator" ]) ],
-                    dependencies: ["MultiPlatformFramework", "SinglePlatformFramework"]
-                ),
-
-                TestStandardTarget(
-                    "MultiPlatformFramework",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES" ]) ],
-                    dependencies: []
-                ),
+        return TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("aGroup"),
+                    targets: [
+                        TestStandardTarget(
+                            "MacApp",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx"])],
+                            dependencies: ["MultiPlatformFramework", "SinglePlatformFramework"]
+                        ),
+                        TestStandardTarget(
+                            "PhoneApp",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"])],
+                            dependencies: ["MultiPlatformFramework", "SinglePlatformFramework"]
+                        ),
 
-                TestStandardTarget(
-                    "SinglePlatformFramework",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx" ]) ],
-                    dependencies: []
-                ),
-            ]),
-        ])
+                        TestStandardTarget(
+                            "MultiPlatformFramework",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES"])],
+                            dependencies: []
+                        ),
+
+                        TestStandardTarget(
+                            "SinglePlatformFramework",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx"])],
+                            dependencies: []
+                        ),
+                    ]
+                )
+            ]
+        )
     }()
 
     let specializationWorkspace_aggregate: TestWorkspace = {
-        return TestWorkspace("Workspace", projects: [
-            TestProject("aProject", groupTree: TestGroup("aGroup"), targets: [
-                TestStandardTarget(
-                    "MacApp",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx" ]) ],
-                    dependencies: ["Intermediate", "SpecializedIntermediate"]
-                ),
-                TestStandardTarget(
-                    "PhoneApp",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator" ]) ],
-                    dependencies: ["Intermediate", "SpecializedIntermediate"]
-                ),
+        return TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("aGroup"),
+                    targets: [
+                        TestStandardTarget(
+                            "MacApp",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx"])],
+                            dependencies: ["Intermediate", "SpecializedIntermediate"]
+                        ),
+                        TestStandardTarget(
+                            "PhoneApp",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"])],
+                            dependencies: ["Intermediate", "SpecializedIntermediate"]
+                        ),
 
-                TestAggregateTarget(
-                    "Intermediate",
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"]) ],
-                    dependencies: ["MultiPlatformFramework", "SinglePlatformFramework"]
-                ),
+                        TestAggregateTarget(
+                            "Intermediate",
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"])],
+                            dependencies: ["MultiPlatformFramework", "SinglePlatformFramework"]
+                        ),
 
-                TestAggregateTarget(
-                    "SpecializedIntermediate",
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES"]) ],
-                    dependencies: ["OtherMultiPlatformFramework", "SinglePlatformFramework"]
-                ),
+                        TestAggregateTarget(
+                            "SpecializedIntermediate",
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES"])],
+                            dependencies: ["OtherMultiPlatformFramework", "SinglePlatformFramework"]
+                        ),
 
-                TestStandardTarget(
-                    "MultiPlatformFramework",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES" ]) ],
-                    dependencies: []
-                ),
+                        TestStandardTarget(
+                            "MultiPlatformFramework",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES"])],
+                            dependencies: []
+                        ),
 
-                TestStandardTarget(
-                    "SinglePlatformFramework",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx" ]) ],
-                    dependencies: []
-                ),
+                        TestStandardTarget(
+                            "SinglePlatformFramework",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx"])],
+                            dependencies: []
+                        ),
 
-                TestStandardTarget(
-                    "OtherMultiPlatformFramework",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES" ]) ],
-                    dependencies: []
-                ),
-            ]),
-        ])
+                        TestStandardTarget(
+                            "OtherMultiPlatformFramework",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES"])],
+                            dependencies: []
+                        ),
+                    ]
+                )
+            ]
+        )
     }()
 
     func specializationWorkspace_aggregate(specializedEnabled: Bool) -> TestWorkspace {
         let specializationValue = specializedEnabled ? "YES" : "NO"
 
-        return TestWorkspace("Workspace", projects: [
-            TestProject("aProject", groupTree: TestGroup("aGroup"), targets: [
-                TestStandardTarget(
-                    "MacApp",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx" ]) ],
-                    dependencies: ["Intermediate", "SpecializedIntermediate"]
-                ),
-                TestStandardTarget(
-                    "PhoneApp",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator" ]) ],
-                    dependencies: ["Intermediate", "SpecializedIntermediate"]
-                ),
+        return TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("aGroup"),
+                    targets: [
+                        TestStandardTarget(
+                            "MacApp",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx"])],
+                            dependencies: ["Intermediate", "SpecializedIntermediate"]
+                        ),
+                        TestStandardTarget(
+                            "PhoneApp",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"])],
+                            dependencies: ["Intermediate", "SpecializedIntermediate"]
+                        ),
 
-                TestAggregateTarget(
-                    "Intermediate",
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"]) ],
-                    dependencies: ["MultiPlatformFramework", "SinglePlatformFramework"]
-                ),
+                        TestAggregateTarget(
+                            "Intermediate",
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"])],
+                            dependencies: ["MultiPlatformFramework", "SinglePlatformFramework"]
+                        ),
 
-                TestAggregateTarget(
-                    "SpecializedIntermediate",
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": specializationValue]) ],
-                    dependencies: ["OtherMultiPlatformFramework", "OtherSinglePlatformFramework"]
-                ),
+                        TestAggregateTarget(
+                            "SpecializedIntermediate",
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": specializationValue])],
+                            dependencies: ["OtherMultiPlatformFramework", "OtherSinglePlatformFramework"]
+                        ),
 
-                TestStandardTarget(
-                    "MultiPlatformFramework",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": specializationValue]) ],
-                    dependencies: []
-                ),
+                        TestStandardTarget(
+                            "MultiPlatformFramework",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": specializationValue])],
+                            dependencies: []
+                        ),
 
-                TestStandardTarget(
-                    "SinglePlatformFramework",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx" ]) ],
-                    dependencies: []
-                ),
+                        TestStandardTarget(
+                            "SinglePlatformFramework",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx"])],
+                            dependencies: []
+                        ),
 
-                TestStandardTarget(
-                    "OtherMultiPlatformFramework",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": specializationValue]) ],
-                    dependencies: []
-                ),
+                        TestStandardTarget(
+                            "OtherMultiPlatformFramework",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": specializationValue])],
+                            dependencies: []
+                        ),
 
-                TestStandardTarget(
-                    "OtherSinglePlatformFramework",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"]) ],
-                    dependencies: []
-                ),
-            ]),
-        ])
+                        TestStandardTarget(
+                            "OtherSinglePlatformFramework",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"])],
+                            dependencies: []
+                        ),
+                    ]
+                )
+            ]
+        )
     }
 
     func specializationWorkspace_aggregate_simple(specializedEnabled: Bool) -> TestWorkspace {
         let specializationValue = specializedEnabled ? "YES" : "NO"
 
-        return TestWorkspace("Workspace", projects: [
-            TestProject("aProject", groupTree: TestGroup("aGroup"), targets: [
-                TestStandardTarget(
-                    "MacApp",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx" ]) ],
-                    dependencies: ["SpecializedIntermediate", "SpecializedIntermediate2"]
-                ),
-                TestStandardTarget(
-                    "PhoneApp",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator" ]) ],
-                    dependencies: ["SpecializedIntermediate"]
-                ),
+        return TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("aGroup"),
+                    targets: [
+                        TestStandardTarget(
+                            "MacApp",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx"])],
+                            dependencies: ["SpecializedIntermediate", "SpecializedIntermediate2"]
+                        ),
+                        TestStandardTarget(
+                            "PhoneApp",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"])],
+                            dependencies: ["SpecializedIntermediate"]
+                        ),
 
-                TestAggregateTarget(
-                    "SpecializedIntermediate",
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": specializationValue]) ],
-                    dependencies: ["OtherSinglePlatformFramework"]
-                ),
+                        TestAggregateTarget(
+                            "SpecializedIntermediate",
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": specializationValue])],
+                            dependencies: ["OtherSinglePlatformFramework"]
+                        ),
 
-                TestStandardTarget(
-                    "SpecializedIntermediate2",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": specializationValue]) ],
-                    dependencies: ["OtherSinglePlatformFramework2"]
-                ),
+                        TestStandardTarget(
+                            "SpecializedIntermediate2",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": specializationValue])],
+                            dependencies: ["OtherSinglePlatformFramework2"]
+                        ),
 
-                TestStandardTarget(
-                    "OtherSinglePlatformFramework",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"]) ],
-                    dependencies: []
-                ),
+                        TestStandardTarget(
+                            "OtherSinglePlatformFramework",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"])],
+                            dependencies: []
+                        ),
 
-                TestStandardTarget(
-                    "OtherSinglePlatformFramework2",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"]) ],
-                    dependencies: []
-                ),
-            ]),
-        ])
+                        TestStandardTarget(
+                            "OtherSinglePlatformFramework2",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"])],
+                            dependencies: []
+                        ),
+                    ]
+                )
+            ]
+        )
     }
 
     let specializationWorkspace_specializedAggregate: TestWorkspace = {
-        return TestWorkspace("Workspace", projects: [
-            TestProject("aProject", groupTree: TestGroup("aGroup"), targets: [
-                TestStandardTarget(
-                    "MacApp",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx" ]) ],
-                    dependencies: ["Intermediate"]
-                ),
-                TestStandardTarget(
-                    "PhoneApp",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator" ]) ],
-                    dependencies: ["Intermediate"]
-                ),
+        return TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("aGroup"),
+                    targets: [
+                        TestStandardTarget(
+                            "MacApp",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx"])],
+                            dependencies: ["Intermediate"]
+                        ),
+                        TestStandardTarget(
+                            "PhoneApp",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"])],
+                            dependencies: ["Intermediate"]
+                        ),
 
-                TestAggregateTarget(
-                    "Intermediate",
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES" ]) ],
-                    dependencies: ["MultiPlatformFramework", "SinglePlatformFramework"]
-                ),
+                        TestAggregateTarget(
+                            "Intermediate",
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES"])],
+                            dependencies: ["MultiPlatformFramework", "SinglePlatformFramework"]
+                        ),
 
-                TestStandardTarget(
-                    "MultiPlatformFramework",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES" ]) ],
-                    dependencies: []
-                ),
+                        TestStandardTarget(
+                            "MultiPlatformFramework",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES"])],
+                            dependencies: []
+                        ),
 
-                TestStandardTarget(
-                    "SinglePlatformFramework",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx" ]) ],
-                    dependencies: []
-                ),
-            ]),
-        ])
+                        TestStandardTarget(
+                            "SinglePlatformFramework",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx"])],
+                            dependencies: []
+                        ),
+                    ]
+                )
+            ]
+        )
     }()
 
     let specializationWorkspace_intermediateFramework: TestWorkspace = {
-        return TestWorkspace("Workspace", projects: [
-            TestProject("aProject", groupTree: TestGroup("aGroup"), targets: [
-                TestStandardTarget(
-                    "MacApp",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx" ]) ],
-                    dependencies: ["Intermediate", "MultiPlatformFramework"]
-                ),
-                TestStandardTarget(
-                    "PhoneApp",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator" ]) ],
-                    dependencies: ["Intermediate", "MultiPlatformFramework"]
-                ),
+        return TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("aGroup"),
+                    targets: [
+                        TestStandardTarget(
+                            "MacApp",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx"])],
+                            dependencies: ["Intermediate", "MultiPlatformFramework"]
+                        ),
+                        TestStandardTarget(
+                            "PhoneApp",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"])],
+                            dependencies: ["Intermediate", "MultiPlatformFramework"]
+                        ),
 
-                TestStandardTarget(
-                    "Intermediate",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"]) ],
-                    dependencies: ["MultiPlatformFramework", "SinglePlatformFramework"]
-                ),
+                        TestStandardTarget(
+                            "Intermediate",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"])],
+                            dependencies: ["MultiPlatformFramework", "SinglePlatformFramework"]
+                        ),
 
-                TestStandardTarget(
-                    "MultiPlatformFramework",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES" ]) ],
-                    dependencies: []
-                ),
+                        TestStandardTarget(
+                            "MultiPlatformFramework",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES"])],
+                            dependencies: []
+                        ),
 
-                TestStandardTarget(
-                    "SinglePlatformFramework",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx" ]) ],
-                    dependencies: []
-                ),
-            ]),
-        ])
+                        TestStandardTarget(
+                            "SinglePlatformFramework",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx"])],
+                            dependencies: []
+                        ),
+                    ]
+                )
+            ]
+        )
     }()
 
     func specializationCheck(_ testWorkspace: TestWorkspace, _ targetNames: [String], _ activeRunDestination: RunDestinationInfo, validation: (TargetGraphFactory.GraphType, BuildRequestContext, any TargetGraph, EmptyTargetDependencyResolverDelegate) throws -> Void) async throws {
@@ -2049,9 +2309,11 @@ fileprivate enum TargetPlatformSpecializationMode {
         }
     }
 
-    @Test(.requireSDKs(.iOS, .macOS),
-          // Force ordering due to rdar://108715828; this is specifically for regression testing.
-          .userDefaults(["DisableConcurrentDependencyResolution": "1"]))
+    @Test(
+        .requireSDKs(.iOS, .macOS),
+        // Force ordering due to rdar://108715828; this is specifically for regression testing.
+        .userDefaults(["DisableConcurrentDependencyResolution": "1"])
+    )
     func specialization_MultipleTopLevelTarget_Intermediate_SpecializedLeafFramework_iOS() async throws {
         func check(_ topLevelTargets: [String], expectedPlatform: String) async throws {
             try await specializationCheck(specializationWorkspace_aggregate, topLevelTargets, .iOS) { graphType, buildRequestContext, buildGraph, delegate in
@@ -2264,37 +2526,44 @@ fileprivate enum TargetPlatformSpecializationMode {
 
     @Test(.requireSDKs(.macOS, .iOS))
     func specialization_DependenciesOfSpecializedFrameworksAreNotSpecialized() async throws {
-        let testWorkspace = TestWorkspace("Workspace", projects: [
-            TestProject("aProject", groupTree: TestGroup("aGroup"), targets: [
-                TestStandardTarget(
-                    "MacApp",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx" ]) ],
-                    dependencies: ["MultiPlatformFramework"]
-                ),
-                TestStandardTarget(
-                    "PhoneApp",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator" ]) ],
-                    dependencies: ["MultiPlatformFramework"]
-                ),
+        let testWorkspace = TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("aGroup"),
+                    targets: [
+                        TestStandardTarget(
+                            "MacApp",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx"])],
+                            dependencies: ["MultiPlatformFramework"]
+                        ),
+                        TestStandardTarget(
+                            "PhoneApp",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"])],
+                            dependencies: ["MultiPlatformFramework"]
+                        ),
 
-                TestStandardTarget(
-                    "MultiPlatformFramework",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES" ]) ],
-                    dependencies: ["SinglePlatformFramework"]
-                ),
+                        TestStandardTarget(
+                            "MultiPlatformFramework",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES"])],
+                            dependencies: ["SinglePlatformFramework"]
+                        ),
 
-                // NOTE: This should NOT be specialized as targets are _only_ specialized based on the target's immediate parent. Note that 'MultiPlatformFramework' is also a dependency of the top-level targets that will be specialized.
-                TestStandardTarget(
-                    "SinglePlatformFramework",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx" ]) ],
-                    dependencies: []
-                ),
-            ]),
-        ])
+                        // NOTE: This should NOT be specialized as targets are _only_ specialized based on the target's immediate parent. Note that 'MultiPlatformFramework' is also a dependency of the top-level targets that will be specialized.
+                        TestStandardTarget(
+                            "SinglePlatformFramework",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx"])],
+                            dependencies: []
+                        ),
+                    ]
+                )
+            ]
+        )
 
         try await specializationCheck(testWorkspace, ["MacApp", "PhoneApp"], .macOS) { graphType, buildRequestContext, buildGraph, delegate in
             // The following targets should only be configured once.
@@ -2313,43 +2582,50 @@ fileprivate enum TargetPlatformSpecializationMode {
 
     @Test(.requireSDKs(.macOS, .iOS, .watchOS))
     func specialization_rdar77954162() async throws {
-        let testWorkspace = TestWorkspace("Workspace", projects: [
-            TestProject("aProject", groupTree: TestGroup("aGroup"), targets: [
-                TestStandardTarget(
-                    "PhoneApp",
-                    type: .application,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator" ]) ],
-                    dependencies: ["WatchApp", "Framework"]
-                ),
+        let testWorkspace = TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("aGroup"),
+                    targets: [
+                        TestStandardTarget(
+                            "PhoneApp",
+                            type: .application,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"])],
+                            dependencies: ["WatchApp", "Framework"]
+                        ),
 
-                TestStandardTarget(
-                    "WatchApp",
-                    type: .watchKitApp,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "watchos", "SUPPORTED_PLATFORMS": "watchos watchsimulator"]) ],
-                    dependencies: ["WatchExtension", "Framework"]
-                ),
+                        TestStandardTarget(
+                            "WatchApp",
+                            type: .watchKitApp,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "watchos", "SUPPORTED_PLATFORMS": "watchos watchsimulator"])],
+                            dependencies: ["WatchExtension", "Framework"]
+                        ),
 
-                TestStandardTarget(
-                    "WatchExtension",
-                    type: .watchKitExtension,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "watchos", "SUPPORTED_PLATFORMS": "watchos watchsimulator"]) ],
-                    dependencies: ["Framework"]
-                ),
+                        TestStandardTarget(
+                            "WatchExtension",
+                            type: .watchKitExtension,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "watchos", "SUPPORTED_PLATFORMS": "watchos watchsimulator"])],
+                            dependencies: ["Framework"]
+                        ),
 
-                TestStandardTarget(
-                    "Framework",
-                    type: .framework,
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "watchos watchsimulator iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES" ]) ],
-                    dependencies: ["Aggregate"]
-                ),
+                        TestStandardTarget(
+                            "Framework",
+                            type: .framework,
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "watchos watchsimulator iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES"])],
+                            dependencies: ["Aggregate"]
+                        ),
 
-                TestAggregateTarget(
-                    "Aggregate",
-                    buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx" ]) ],
-                    dependencies: []
-                ),
-            ]),
-        ])
+                        TestAggregateTarget(
+                            "Aggregate",
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx"])],
+                            dependencies: []
+                        ),
+                    ]
+                )
+            ]
+        )
 
         try await specializationCheck(testWorkspace, ["PhoneApp"], .iOS) { graphType, buildRequestContext, buildGraph, delegate in
             // The following targets should only be configured once.
@@ -2370,30 +2646,37 @@ fileprivate enum TargetPlatformSpecializationMode {
         func check(_ activeRunDestination: RunDestinationInfo) async throws {
             let core = try await getCore()
 
-            let workspace = try TestWorkspace("Workspace", projects: [
-                TestProject("aProject", groupTree: TestGroup("aGroup"), targets: [
-                    TestStandardTarget(
-                        "MacApp",
-                        type: .framework,
-                        buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx" ]) ],
-                        dependencies: ["Aggregate"]
-                    ),
-                    TestStandardTarget(
-                        "PhoneApp",
-                        type: .framework,
-                        buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator" ]) ],
-                        dependencies: ["Aggregate"]
-                    ),
+            let workspace = try TestWorkspace(
+                "Workspace",
+                projects: [
+                    TestProject(
+                        "aProject",
+                        groupTree: TestGroup("aGroup"),
+                        targets: [
+                            TestStandardTarget(
+                                "MacApp",
+                                type: .framework,
+                                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx", "SUPPORTED_PLATFORMS": "macosx"])],
+                                dependencies: ["Aggregate"]
+                            ),
+                            TestStandardTarget(
+                                "PhoneApp",
+                                type: .framework,
+                                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator"])],
+                                dependencies: ["Aggregate"]
+                            ),
 
-                    TestStandardTarget(
-                        "Aggregate",
-                        type: .framework,
-                        buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES"]) ],
-                        dependencies: []
-                    ),
+                            TestStandardTarget(
+                                "Aggregate",
+                                type: .framework,
+                                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos", "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator", "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES"])],
+                                dependencies: []
+                            ),
 
-                ]),
-            ]).load(core)
+                        ]
+                    )
+                ]
+            ).load(core)
 
             let buildParameters = BuildParameters(action: .build, configuration: "Debug", activeRunDestination: activeRunDestination)
             let targets = [
@@ -2448,7 +2731,6 @@ fileprivate enum TargetPlatformSpecializationMode {
     }
 }
 
-
 // MARK: Test cases for resolving implicit dependencies
 
 @Suite fileprivate struct ImplicitDependencyResolutionTests: CoreBasedTests {
@@ -2465,23 +2747,23 @@ fileprivate enum TargetPlatformSpecializationMode {
                     groupTree: TestGroup(
                         "G1",
                         children: [
-                            TestFile("aFramework.framework"),
+                            TestFile("aFramework.framework")
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "anApp",
                             type: .application,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"])
                             ],
                             buildPhases: [
                                 TestFrameworksBuildPhase([
-                                    "aFramework.framework",
-                                ]),
+                                    "aFramework.framework"
+                                ])
                             ]
                         )
                     ]
@@ -2490,20 +2772,19 @@ fileprivate enum TargetPlatformSpecializationMode {
                     "P2",
                     groupTree: TestGroup(
                         "G2",
-                        children:[
-                        ]
+                        children: []
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "aFramework",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"])
                             ]
-                        ),
+                        )
                     ]
                 ),
             ]
@@ -2545,23 +2826,23 @@ fileprivate enum TargetPlatformSpecializationMode {
                     groupTree: TestGroup(
                         "G1",
                         children: [
-                            TestFile("IDEStuff.ideplugin/Contents/MacOS/IDEStuff", fileType: "compiled.mach-o.dylib"),
+                            TestFile("IDEStuff.ideplugin/Contents/MacOS/IDEStuff", fileType: "compiled.mach-o.dylib")
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "anApp",
                             type: .application,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"])
                             ],
                             buildPhases: [
                                 TestFrameworksBuildPhase([
-                                    "IDEStuff",
-                                ]),
+                                    "IDEStuff"
+                                ])
                             ]
                         )
                     ]
@@ -2570,21 +2851,20 @@ fileprivate enum TargetPlatformSpecializationMode {
                     "P2",
                     groupTree: TestGroup(
                         "G2",
-                        children:[
-                        ]
+                        children: []
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "IDEStuff",
                             type: .bundle,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "IDEStuff"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "IDEStuff"])
                             ],
                             productReferenceName: "IDEStuff.ideplugin"
-                        ),
+                        )
                     ]
                 ),
             ]
@@ -2631,20 +2911,23 @@ fileprivate enum TargetPlatformSpecializationMode {
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "anApp",
                             type: .application,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"])
                             ],
                             buildPhases: [
-                                TestCopyFilesBuildPhase([
-                                    "aTool",
-                                    "aFramework.framework",
-                                ], destinationSubfolder: .frameworks),
+                                TestCopyFilesBuildPhase(
+                                    [
+                                        "aTool",
+                                        "aFramework.framework",
+                                    ],
+                                    destinationSubfolder: .frameworks
+                                )
                             ]
                         )
                     ]
@@ -2653,30 +2936,29 @@ fileprivate enum TargetPlatformSpecializationMode {
                     "P2",
                     groupTree: TestGroup(
                         "G2",
-                        children:[
-                        ]
+                        children: []
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "aTool",
                             type: .commandLineTool,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aTool"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aTool"])
                             ],
                             buildPhases: [
                                 TestFrameworksBuildPhase([
-                                    "aFramework.framework",
-                                ]),
+                                    "aFramework.framework"
+                                ])
                             ]
                         ),
                         TestStandardTarget(
                             "aFramework",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"])
                             ]
                         ),
                     ]
@@ -2724,23 +3006,26 @@ fileprivate enum TargetPlatformSpecializationMode {
                         children: []
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "aTool",
                             type: .commandLineTool,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aTool"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aTool"])
                             ],
                             buildPhases: [
-                                TestCopyFilesBuildPhase([
-                                    "aTool",
-                                ], destinationSubfolder: .frameworks),
+                                TestCopyFilesBuildPhase(
+                                    [
+                                        "aTool"
+                                    ],
+                                    destinationSubfolder: .frameworks
+                                )
                             ]
                         )
                     ]
-                ),
+                )
             ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -2777,40 +3062,42 @@ fileprivate enum TargetPlatformSpecializationMode {
                     groupTree: TestGroup(
                         "G1",
                         children: [
-                            TestFile("aFramework.framework"),
+                            TestFile("aFramework.framework")
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "anApp",
                             type: .application,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug",
-                                                       buildSettings: [
-                                                        "PRODUCT_NAME": "anApp",
-                                                        "SDKROOT": "macosx",
-                                                       ]
-                                                      ),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "anApp",
+                                        "SDKROOT": "macosx",
+                                    ]
+                                )
                             ],
                             buildPhases: [
                                 TestFrameworksBuildPhase([
-                                    "aFramework.framework",
-                                ]),
+                                    "aFramework.framework"
+                                ])
                             ]
                         ),
                         TestStandardTarget(
                             "osxFramework",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug",
-                                                       buildSettings: [
-                                                        "PRODUCT_NAME": "aFramework",
-                                                        "SUPPORTED_PLATFORMS": "macosx",
-                                                       ]
-                                                      ),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "aFramework",
+                                        "SUPPORTED_PLATFORMS": "macosx",
+                                    ]
+                                )
                             ],
                             productReferenceName: "aFramework.framework"
                         ),
@@ -2818,17 +3105,18 @@ fileprivate enum TargetPlatformSpecializationMode {
                             "iosFramework",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug",
-                                                       buildSettings: [
-                                                        "PRODUCT_NAME": "aFramework",
-                                                        "SUPPORTED_PLATFORMS": "iphoneos",
-                                                       ]
-                                                      ),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "aFramework",
+                                        "SUPPORTED_PLATFORMS": "iphoneos",
+                                    ]
+                                )
                             ],
                             productReferenceName: "aFramework.framework"
                         ),
                     ]
-                ),
+                )
             ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -2872,40 +3160,42 @@ fileprivate enum TargetPlatformSpecializationMode {
                     groupTree: TestGroup(
                         "G1",
                         children: [
-                            TestFile("aFramework.framework"),
+                            TestFile("aFramework.framework")
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "anApp",
                             type: .application,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug",
-                                                       buildSettings: [
-                                                        "PRODUCT_NAME": "anApp",
-                                                        "SDKROOT": "macosx",
-                                                       ]
-                                                      ),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "anApp",
+                                        "SDKROOT": "macosx",
+                                    ]
+                                )
                             ],
                             buildPhases: [
                                 TestFrameworksBuildPhase([
-                                    "aFramework.framework",
-                                ]),
+                                    "aFramework.framework"
+                                ])
                             ]
                         ),
                         TestStandardTarget(
                             "osxFramework",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug",
-                                                       buildSettings: [
-                                                        "PRODUCT_NAME": "aFramework",
-                                                        "SDKROOT": "macosx",
-                                                       ]
-                                                      ),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "aFramework",
+                                        "SDKROOT": "macosx",
+                                    ]
+                                )
                             ],
                             productReferenceName: "aFramework.framework"
                         ),
@@ -2913,17 +3203,18 @@ fileprivate enum TargetPlatformSpecializationMode {
                             "iosFramework",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug",
-                                                       buildSettings: [
-                                                        "PRODUCT_NAME": "aFramework",
-                                                        "SDKROOT": "iphoneos",
-                                                       ]
-                                                      ),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "aFramework",
+                                        "SDKROOT": "iphoneos",
+                                    ]
+                                )
                             ],
                             productReferenceName: "aFramework.framework"
                         ),
                     ]
-                ),
+                )
             ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -2967,61 +3258,67 @@ fileprivate enum TargetPlatformSpecializationMode {
                     groupTree: TestGroup(
                         "Group",
                         children: [
-                            TestFile("Fmwk.framework"),
+                            TestFile("Fmwk.framework")
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "TOOLCHAINS": "default",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "TOOLCHAINS": "default"
+                            ]
+                        )
                     ],
                     targets: [
                         TestStandardTarget(
                             "macOSApplication",
                             type: .application,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug",
-                                                       buildSettings: [
-                                                        "PRODUCT_NAME": "Appl",
-                                                        "SDKROOT": "macosx",
-                                                       ]
-                                                      ),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "Appl",
+                                        "SDKROOT": "macosx",
+                                    ]
+                                )
                             ],
                             buildPhases: [
                                 TestFrameworksBuildPhase([
-                                    "Fmwk.framework",
-                                ]),
+                                    "Fmwk.framework"
+                                ])
                             ]
                         ),
                         TestStandardTarget(
                             "MacCatalystApplication",
                             type: .application,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug",
-                                                       buildSettings: [
-                                                        "PRODUCT_NAME": "iAppl",
-                                                        "SDKROOT": "macosx",
-                                                        "SDK_VARIANT": MacCatalystInfo.sdkVariantName
-                                                       ]
-                                                      ),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "iAppl",
+                                        "SDKROOT": "macosx",
+                                        "SDK_VARIANT": MacCatalystInfo.sdkVariantName,
+                                    ]
+                                )
                             ],
                             buildPhases: [
                                 TestFrameworksBuildPhase([
                                     "Fmwk.framework"
-                                ]),
+                                ])
                             ]
                         ),
                         TestStandardTarget(
                             "MacCatalystFramework",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug",
-                                                       buildSettings: [
-                                                        "PRODUCT_NAME": "Fmwk",
-                                                        "SDKROOT": "macosx",
-                                                        "SDK_VARIANT": MacCatalystInfo.sdkVariantName,
-                                                       ]
-                                                      ),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "Fmwk",
+                                        "SDKROOT": "macosx",
+                                        "SDK_VARIANT": MacCatalystInfo.sdkVariantName,
+                                    ]
+                                )
                             ],
                             productReferenceName: "Fmwk.framework"
                         ),
@@ -3029,18 +3326,19 @@ fileprivate enum TargetPlatformSpecializationMode {
                             "macOSFramework",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug",
-                                                       buildSettings: [
-                                                        "PRODUCT_NAME": "Fmwk",
-                                                        "SDKROOT": "macosx",
-                                                        "SDK_VARIANT": "macos",
-                                                       ]
-                                                      ),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "Fmwk",
+                                        "SDKROOT": "macosx",
+                                        "SDK_VARIANT": "macos",
+                                    ]
+                                )
                             ],
                             productReferenceName: "Fmwk.framework"
                         ),
                     ]
-                ),
+                )
             ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -3066,9 +3364,12 @@ fileprivate enum TargetPlatformSpecializationMode {
 
             // Get the dependency closure for the build request and examine it.
             let dependencyClosure = buildGraph.allTargets
-            #expect(try dependencyClosure.elements == [
-                buildGraph.target(for: macosFwkTarget),
-                buildGraph.target(for: macAppTarget)])
+            #expect(
+                try dependencyClosure.elements == [
+                    buildGraph.target(for: macosFwkTarget),
+                    buildGraph.target(for: macAppTarget),
+                ]
+            )
             #expect(try buildGraph.dependencies(macAppTarget) == [buildGraph.target(for: macosFwkTarget)])
             #expect(try buildGraph.dependencies(macosFwkTarget) == [])
         }
@@ -3081,9 +3382,12 @@ fileprivate enum TargetPlatformSpecializationMode {
 
             // Get the dependency closure for the build request and examine it.
             let dependencyClosure = buildGraph.allTargets
-            #expect(try dependencyClosure.elements == [
-                buildGraph.target(for: uikitFwkTarget),
-                buildGraph.target(for: uikitAppTarget)])
+            #expect(
+                try dependencyClosure.elements == [
+                    buildGraph.target(for: uikitFwkTarget),
+                    buildGraph.target(for: uikitAppTarget),
+                ]
+            )
             #expect(try buildGraph.dependencies(uikitAppTarget) == [buildGraph.target(for: uikitFwkTarget)])
             #expect(try buildGraph.dependencies(uikitFwkTarget) == [])
         }
@@ -3096,11 +3400,14 @@ fileprivate enum TargetPlatformSpecializationMode {
 
             // Get the dependency closure for the build request and examine it.
             let dependencyClosure = buildGraph.allTargets
-            #expect(try dependencyClosure.elements == [
-                buildGraph.target(for: macosFwkTarget),
-                buildGraph.target(for: macAppTarget),
-                buildGraph.target(for: uikitFwkTarget),
-                buildGraph.target(for: uikitAppTarget)])
+            #expect(
+                try dependencyClosure.elements == [
+                    buildGraph.target(for: macosFwkTarget),
+                    buildGraph.target(for: macAppTarget),
+                    buildGraph.target(for: uikitFwkTarget),
+                    buildGraph.target(for: uikitAppTarget),
+                ]
+            )
             #expect(try buildGraph.dependencies(macAppTarget) == [buildGraph.target(for: macosFwkTarget)])
             #expect(try buildGraph.dependencies(macosFwkTarget) == [])
             #expect(try buildGraph.dependencies(uikitAppTarget) == [buildGraph.target(for: uikitFwkTarget)])
@@ -3112,7 +3419,7 @@ fileprivate enum TargetPlatformSpecializationMode {
                 "MacCatalystFramework rejected as an implicit dependency because its SDK_VARIANT 'iosmac' is not equal to this target's SDK_VARIANT 'macos' and it is not zippered. (in target 'macOSApplication' from project 'Project')",
                 "macOSFramework rejected as an implicit dependency because its SDK_VARIANT 'macos' is not equal to this target's SDK_VARIANT 'iosmac' and it is not zippered. (in target 'MacCatalystApplication' from project 'Project')",
                 "macOSFramework rejected as an implicit dependency because its SDK_VARIANT 'macos' is not equal to this target's SDK_VARIANT 'iosmac' and it is not zippered. (in target 'MacCatalystApplication' from project 'Project')",
-                "MacCatalystFramework rejected as an implicit dependency because its SDK_VARIANT 'iosmac' is not equal to this target's SDK_VARIANT 'macos' and it is not zippered. (in target 'macOSApplication' from project 'Project')"
+                "MacCatalystFramework rejected as an implicit dependency because its SDK_VARIANT 'iosmac' is not equal to this target's SDK_VARIANT 'macos' and it is not zippered. (in target 'macOSApplication' from project 'Project')",
             ])
         } else {
             delegate.checkNoDiagnostics()
@@ -3136,39 +3443,41 @@ fileprivate enum TargetPlatformSpecializationMode {
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "anApp",
                             type: .application,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug",
-                                                       buildSettings: [
-                                                        "PRODUCT_NAME": "anApp",
-                                                        "SDKROOT": "iphoneos",
-                                                        "ARCHS": "arm64",
-                                                       ]
-                                                      ),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "anApp",
+                                        "SDKROOT": "iphoneos",
+                                        "ARCHS": "arm64",
+                                    ]
+                                )
                             ],
                             buildPhases: [
                                 TestFrameworksBuildPhase([
                                     "aFramework.framework",
                                     "anotherFramework.framework",
-                                ]),
+                                ])
                             ]
                         ),
                         TestStandardTarget(
                             "iOSFramework",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug",
-                                                       buildSettings: [
-                                                        "PRODUCT_NAME": "aFramework",
-                                                        "SDKROOT": "iphoneos",
-                                                        "ARCHS": "arm64",
-                                                       ]
-                                                      ),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "aFramework",
+                                        "SDKROOT": "iphoneos",
+                                        "ARCHS": "arm64",
+                                    ]
+                                )
                             ],
                             productReferenceName: "aFramework.framework"
                         ),
@@ -3176,13 +3485,14 @@ fileprivate enum TargetPlatformSpecializationMode {
                             "oldFramework",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug",
-                                                       buildSettings: [
-                                                        "PRODUCT_NAME": "anotherFramework",
-                                                        "SDKROOT": "iphoneos",
-                                                        "ARCHS": "arm64e",
-                                                       ]
-                                                      ),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "anotherFramework",
+                                        "SDKROOT": "iphoneos",
+                                        "ARCHS": "arm64e",
+                                    ]
+                                )
                             ],
                             productReferenceName: "anotherFramework.framework"
                         ),
@@ -3190,18 +3500,19 @@ fileprivate enum TargetPlatformSpecializationMode {
                             "updatedOldFramework",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug",
-                                                       buildSettings: [
-                                                        "PRODUCT_NAME": "anotherFramework",
-                                                        "SDKROOT": "iphoneos",
-                                                        "ARCHS": "arm64",
-                                                       ]
-                                                      ),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "anotherFramework",
+                                        "SDKROOT": "iphoneos",
+                                        "ARCHS": "arm64",
+                                    ]
+                                )
                             ],
                             productReferenceName: "anotherFramework.framework"
                         ),
                     ]
-                ),
+                )
             ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -3238,14 +3549,18 @@ fileprivate enum TargetPlatformSpecializationMode {
     @Test
     func implicitDependenciesUseOverridingParameters() async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("Workspace",
-                                          projects: [TestProject("aProject",
-                                                                 groupTree: TestGroup("SomeFiles", children: [TestFile("aFramework.framework")]),
-                                                                 targets: [
-                                                                    TestStandardTarget("anApp", type: .application, buildPhases: [TestFrameworksBuildPhase(["aFramework.framework"])]),
-                                                                    TestStandardTarget("aFramework", type: .application, productReferenceName: "aFramework.framework"),
-                                                                 ]
-                                                                )]
+        let workspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles", children: [TestFile("aFramework.framework")]),
+                    targets: [
+                        TestStandardTarget("anApp", type: .application, buildPhases: [TestFrameworksBuildPhase(["aFramework.framework"])]),
+                        TestStandardTarget("aFramework", type: .application, productReferenceName: "aFramework.framework"),
+                    ]
+                )
+            ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
         let project = workspace.projects[0]
@@ -3254,7 +3569,7 @@ fileprivate enum TargetPlatformSpecializationMode {
         let buildParametersForApp = BuildParameters(configuration: "Debug", overrides: ["SWIFT_MIGRATE_DIR": "/app1"])
         let buildParametersForFwk = BuildParameters(configuration: "Debug", overrides: ["SWIFT_MIGRATE_DIR": "/fwk"])
         let appTarget = BuildRequest.BuildTargetInfo(parameters: buildParametersForApp, target: project.targets[0])
-        let fwkTarget  = BuildRequest.BuildTargetInfo(parameters: buildParametersForFwk, target: project.targets[1])
+        let fwkTarget = BuildRequest.BuildTargetInfo(parameters: buildParametersForFwk, target: project.targets[1])
         let buildRequest = BuildRequest(parameters: BuildParameters(configuration: "Debug"), buildTargets: [appTarget, fwkTarget], continueBuildingAfterErrors: true, useParallelTargets: false, useImplicitDependencies: true, useDryRun: false)
         let buildRequestContext = BuildRequestContext(workspaceContext: workspaceContext)
 
@@ -3291,7 +3606,7 @@ fileprivate enum TargetPlatformSpecializationMode {
             ],
             "TestDelay": [
                 "Settings": [
-                    "OTHER_LDFLAGS": "-delay_framework aFramework -delay-lDynamic -delay-lStatic",
+                    "OTHER_LDFLAGS": "-delay_framework aFramework -delay-lDynamic -delay-lStatic"
                 ],
                 "ExpectedDependencies": [
                     "aFramework",
@@ -3302,7 +3617,7 @@ fileprivate enum TargetPlatformSpecializationMode {
             // There is no -hidden_framework option.
             "TestHidden": [
                 "Settings": [
-                    "OTHER_LDFLAGS": "-hidden-lDynamic -hidden-lStatic",
+                    "OTHER_LDFLAGS": "-hidden-lDynamic -hidden-lStatic"
                 ],
                 "ExpectedDependencies": [
                     "aDynamicLib",
@@ -3311,7 +3626,7 @@ fileprivate enum TargetPlatformSpecializationMode {
             ],
             "TestLazy": [
                 "Settings": [
-                    "OTHER_LDFLAGS": "-lazy_framework aFramework -lazy-lDynamic -lazy-lStatic",
+                    "OTHER_LDFLAGS": "-lazy_framework aFramework -lazy-lDynamic -lazy-lStatic"
                 ],
                 "ExpectedDependencies": [
                     "aFramework",
@@ -3321,7 +3636,7 @@ fileprivate enum TargetPlatformSpecializationMode {
             ],
             "TestMerge": [
                 "Settings": [
-                    "OTHER_LDFLAGS": "-merge_framework aFramework -merge-lDynamic -merge-lStatic",
+                    "OTHER_LDFLAGS": "-merge_framework aFramework -merge-lDynamic -merge-lStatic"
                 ],
                 "ExpectedDependencies": [
                     "aFramework",
@@ -3331,7 +3646,7 @@ fileprivate enum TargetPlatformSpecializationMode {
             ],
             "TestNoMerge": [
                 "Settings": [
-                    "OTHER_LDFLAGS": "-no_merge_framework aFramework -no_merge-lDynamic -no_merge-lStatic",
+                    "OTHER_LDFLAGS": "-no_merge_framework aFramework -no_merge-lDynamic -no_merge-lStatic"
                 ],
                 "ExpectedDependencies": [
                     "aFramework",
@@ -3341,7 +3656,7 @@ fileprivate enum TargetPlatformSpecializationMode {
             ],
             "TestNeeded": [
                 "Settings": [
-                    "OTHER_LDFLAGS": "-needed_framework aFramework -needed-lDynamic -needed-lStatic",
+                    "OTHER_LDFLAGS": "-needed_framework aFramework -needed-lDynamic -needed-lStatic"
                 ],
                 "ExpectedDependencies": [
                     "aFramework",
@@ -3351,17 +3666,17 @@ fileprivate enum TargetPlatformSpecializationMode {
             ],
             "TestReexport": [
                 "Settings": [
-                    "OTHER_LDFLAGS": "-reexport_framework aFramework -reexport-lDynamic -reexport-lStatic",
+                    "OTHER_LDFLAGS": "-reexport_framework aFramework -reexport-lDynamic -reexport-lStatic"
                 ],
                 "ExpectedDependencies": [
                     "aFramework",
                     "aDynamicLib",
                     "aStaticLib",
-                ]
+                ],
             ],
             "TestWeak": [
                 "Settings": [
-                    "OTHER_LDFLAGS": "-weak_framework aFramework -weak-lDynamic -weak-lStatic",
+                    "OTHER_LDFLAGS": "-weak_framework aFramework -weak-lDynamic -weak-lStatic"
                 ],
                 "ExpectedDependencies": [
                     "aFramework",
@@ -3371,7 +3686,7 @@ fileprivate enum TargetPlatformSpecializationMode {
             ],
             "TestAssertWeak": [
                 "Settings": [
-                    "OTHER_LDFLAGS": "-assert_weak_framework aFramework -assert-weak-lDynamic -assert-weak-lStatic",
+                    "OTHER_LDFLAGS": "-assert_weak_framework aFramework -assert-weak-lDynamic -assert-weak-lStatic"
                 ],
                 "ExpectedDependencies": [
                     "aFramework",
@@ -3390,7 +3705,7 @@ fileprivate enum TargetPlatformSpecializationMode {
         ]
         let targetNames = targetInfo.keys.sorted()
         var targets: [any TestTarget] = [
-            TestAggregateTarget("test", dependencies: targetNames),
+            TestAggregateTarget("test", dependencies: targetNames)
         ]
         targetNames.forEach { targetName in
             guard let info = targetInfo[targetName] else {
@@ -3401,16 +3716,18 @@ fileprivate enum TargetPlatformSpecializationMode {
                 Issue.record("Target info record for '\(targetName)' does not have a valid 'Settings' entry")
                 return
             }
-            targets.append(TestStandardTarget(
-                targetName,
-                type: .application,
-                buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: settings
-                    ),
-                ]
-            ))
+            targets.append(
+                TestStandardTarget(
+                    targetName,
+                    type: .application,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: settings
+                        )
+                    ]
+                )
+            )
         }
         // Ensure that more than one target has the same "stem" ("Dynamic"), so that we don't get an ambiguous match including the framework from a -lDynamic argument.  So we never actually match against the 'aFramework2' target, it's just here to test that.
         targets.append(TestStandardTarget("aFramework", type: .application, productReferenceName: "aFramework.framework"))
@@ -3424,13 +3741,16 @@ fileprivate enum TargetPlatformSpecializationMode {
             projects: [
                 TestProject(
                     "aProject",
-                    groupTree: TestGroup("SomeFiles", children: [
-                        TestFile("aFramework.framework"),
-                        TestFile("libDynamic.dylib"),
-                        TestFile("libStatic.a"),
-                    ]),
+                    groupTree: TestGroup(
+                        "SomeFiles",
+                        children: [
+                            TestFile("aFramework.framework"),
+                            TestFile("libDynamic.dylib"),
+                            TestFile("libStatic.a"),
+                        ]
+                    ),
                     targets: targets
-                ),
+                )
             ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -3465,8 +3785,7 @@ fileprivate enum TargetPlatformSpecializationMode {
             }
             if expectedDependencies.isEmpty {
                 #expect(buildGraph.dependencies(of: target).isEmpty)
-            }
-            else {
+            } else {
                 for dependencyName in expectedDependencies {
                     guard let dependencyTarget = (dependencyClosure.first { $0.target.name == dependencyName }) else {
                         Issue.record("Could not find target in dependency closure named '\(dependencyName)' from target info record for '\(targetName)'")
@@ -3492,23 +3811,23 @@ fileprivate enum TargetPlatformSpecializationMode {
                     groupTree: TestGroup(
                         "G1",
                         children: [
-                            TestFile("aFramework.framework"),
+                            TestFile("aFramework.framework")
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "anApp",
                             type: .application,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"])
                             ],
                             buildPhases: [
                                 TestFrameworksBuildPhase([
-                                    TestBuildFile("aFramework.framework", platformFilters: PlatformFilter.macCatalystFilters),
-                                ]),
+                                    TestBuildFile("aFramework.framework", platformFilters: PlatformFilter.macCatalystFilters)
+                                ])
                             ]
                         )
                     ]
@@ -3517,20 +3836,19 @@ fileprivate enum TargetPlatformSpecializationMode {
                     "P2",
                     groupTree: TestGroup(
                         "G2",
-                        children:[
-                        ]
+                        children: []
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "aFramework",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"])
                             ]
-                        ),
+                        )
                     ]
                 ),
             ]
@@ -3570,24 +3888,24 @@ fileprivate enum TargetPlatformSpecializationMode {
                         "G1",
                         children: [
                             TestFile("aFramework.framework"),
-                            TestFile("bFramework", path: "bFramework.framework/Versions/A/bFramework", fileType: "compiled.mach-o.executable", sourceTree: .buildSetting("BUILT_PRODUCTS_DIR"))
+                            TestFile("bFramework", path: "bFramework.framework/Versions/A/bFramework", fileType: "compiled.mach-o.executable", sourceTree: .buildSetting("BUILT_PRODUCTS_DIR")),
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "anApp",
                             type: .application,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"])
                             ],
                             buildPhases: [
                                 TestFrameworksBuildPhase([
                                     "aFramework.framework",
                                     "bFramework",
-                                ]),
+                                ])
                             ]
                         )
                     ]
@@ -3596,39 +3914,38 @@ fileprivate enum TargetPlatformSpecializationMode {
                     "P2",
                     groupTree: TestGroup(
                         "G2",
-                        children:[
-                        ]
+                        children: []
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "aFramework1",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"])
                             ]
                         ),
                         TestStandardTarget(
                             "aFramework2",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"])
                             ]
                         ),
                         TestStandardTarget(
                             "bFramework1",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "bFramework"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "bFramework"])
                             ]
                         ),
                         TestStandardTarget(
                             "bFramework2",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "bFramework"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "bFramework"])
                             ]
                         ),
                     ]
@@ -3656,10 +3973,12 @@ fileprivate enum TargetPlatformSpecializationMode {
         let buildGraph = await TargetGraphFactory(workspaceContext: workspaceContext, buildRequest: buildRequest, buildRequestContext: buildRequestContext, delegate: delegate).graph(type: .dependency)
         let dependencyClosure = buildGraph.allTargets
         #expect(dependencyClosure.map({ $0.target.name }) == ["aFramework1", "bFramework1", "anApp"])
-        #expect(try buildGraph.dependencies(appTarget) == [
-            try buildGraph.target(for: fwkTarget),
-            try buildGraph.target(for: fwkTarget2),
-        ])
+        #expect(
+            try buildGraph.dependencies(appTarget) == [
+                try buildGraph.target(for: fwkTarget),
+                try buildGraph.target(for: fwkTarget2),
+            ]
+        )
         #expect(try buildGraph.dependencies(fwkTarget) == [])
         delegate.checkDiagnostics([
             "[targetIntegrity] Multiple targets match implicit dependency for product reference 'aFramework.framework'. Consider adding an explicit dependency on the intended target to resolve this ambiguity.\nTarget 'aFramework1' (in project 'P2')\nTarget 'aFramework2' (in project 'P2') (in target 'anApp' from project 'P1')",
@@ -3680,27 +3999,30 @@ fileprivate enum TargetPlatformSpecializationMode {
                         "G1",
                         children: [
                             TestFile("aFramework.framework"),
-                            TestFile("bFramework", path: "bFramework.framework/Versions/A/bFramework", fileType: "compiled.mach-o.executable", sourceTree: .buildSetting("BUILT_PRODUCTS_DIR"))
+                            TestFile("bFramework", path: "bFramework.framework/Versions/A/bFramework", fileType: "compiled.mach-o.executable", sourceTree: .buildSetting("BUILT_PRODUCTS_DIR")),
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "anApp",
                             type: .application,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: [
-                                    "PRODUCT_NAME": "anApp",
-                                    "OTHER_LDFLAGS": "-framework FlagFramework -lCool"
-                                ]),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "anApp",
+                                        "OTHER_LDFLAGS": "-framework FlagFramework -lCool",
+                                    ]
+                                )
                             ],
                             buildPhases: [
                                 TestFrameworksBuildPhase([
                                     "aFramework.framework",
                                     "bFramework",
-                                ]),
+                                ])
                             ],
                             dependencies: [
                                 "aFramework1",
@@ -3714,67 +4036,66 @@ fileprivate enum TargetPlatformSpecializationMode {
                     "P2",
                     groupTree: TestGroup(
                         "G2",
-                        children:[
-                        ]
+                        children: []
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "aFramework1",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"])
                             ]
                         ),
                         TestStandardTarget(
                             "aFramework2",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"])
                             ]
                         ),
                         TestStandardTarget(
                             "bFramework1",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "bFramework"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "bFramework"])
                             ]
                         ),
                         TestStandardTarget(
                             "bFramework2",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "bFramework"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "bFramework"])
                             ]
                         ),
                         TestStandardTarget(
                             "flagFramework1",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "FlagFramework"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "FlagFramework"])
                             ]
                         ),
                         TestStandardTarget(
                             "flagFramework2",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "FlagFramework"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "FlagFramework"])
                             ]
                         ),
                         TestStandardTarget(
                             "coolLib1",
                             type: .dynamicLibrary,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Cool"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Cool"])
                             ]
                         ),
                         TestStandardTarget(
                             "coolLib2",
                             type: .staticLibrary,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Cool"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Cool"])
                             ]
                         ),
                     ]
@@ -3804,12 +4125,14 @@ fileprivate enum TargetPlatformSpecializationMode {
         let buildGraph = await TargetGraphFactory(workspaceContext: workspaceContext, buildRequest: buildRequest, buildRequestContext: buildRequestContext, delegate: delegate).graph(type: .dependency)
         let dependencyClosure = buildGraph.allTargets
         #expect(dependencyClosure.map({ $0.target.name }) == ["aFramework1", "bFramework1", "flagFramework2", "coolLib1", "anApp"])
-        #expect(try buildGraph.dependencies(appTarget) == [
-            try buildGraph.target(for: fwkTarget),
-            try buildGraph.target(for: fwkTarget2),
-            try buildGraph.target(for: flagFramework2),
-            try buildGraph.target(for: coolLib1)
-        ])
+        #expect(
+            try buildGraph.dependencies(appTarget) == [
+                try buildGraph.target(for: fwkTarget),
+                try buildGraph.target(for: fwkTarget2),
+                try buildGraph.target(for: flagFramework2),
+                try buildGraph.target(for: coolLib1),
+            ]
+        )
         #expect(try buildGraph.dependencies(fwkTarget) == [])
         delegate.checkNoDiagnostics()
     }
@@ -3830,23 +4153,23 @@ fileprivate enum TargetPlatformSpecializationMode {
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "anApp",
                             type: .application,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"])
                             ],
                             buildPhases: [
                                 TestFrameworksBuildPhase([
-                                    "Base",
-                                ]),
+                                    "Base"
+                                ])
                             ]
                         )
                     ]
-                ),
+                )
             ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -3887,33 +4210,36 @@ fileprivate enum TargetPlatformSpecializationMode {
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "anApp",
                             type: .application,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"])
                             ],
                             buildPhases: [
                                 TestFrameworksBuildPhase([
-                                    "Base",
-                                ]),
+                                    "Base"
+                                ])
                             ]
                         ),
                         TestStandardTarget(
                             "aFramework1",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: [
-                                    "PRODUCT_NAME": "Base",
-                                    "SUPPORTED_PLATFORMS": "watchos watchsimulator",
-                                ]),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "Base",
+                                        "SUPPORTED_PLATFORMS": "watchos watchsimulator",
+                                    ]
+                                )
                             ]
                         ),
                     ]
-                ),
+                )
             ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -3955,24 +4281,24 @@ fileprivate enum TargetPlatformSpecializationMode {
                         "G1",
                         children: [
                             TestFile("Base.framework"),
-                            TestFile("libBase.dylib")
+                            TestFile("libBase.dylib"),
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "anApp",
                             type: .application,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"])
                             ],
                             buildPhases: [
                                 TestFrameworksBuildPhase([
                                     "Base.framework",
                                     "libBase.dylib",
-                                ]),
+                                ])
                             ]
                         )
                     ]
@@ -3981,25 +4307,24 @@ fileprivate enum TargetPlatformSpecializationMode {
                     "P2",
                     groupTree: TestGroup(
                         "G2",
-                        children:[
-                        ]
+                        children: []
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "aFramework1",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Base"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Base"])
                             ]
                         ),
                         TestStandardTarget(
                             "aLibrary1",
                             type: .dynamicLibrary,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Base"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Base"])
                             ]
                         ),
                     ]
@@ -4027,10 +4352,12 @@ fileprivate enum TargetPlatformSpecializationMode {
         let buildGraph = await TargetGraphFactory(workspaceContext: workspaceContext, buildRequest: buildRequest, buildRequestContext: buildRequestContext, delegate: delegate).graph(type: .dependency)
         let dependencyClosure = buildGraph.allTargets
         #expect(dependencyClosure.map({ $0.target.name }) == ["aFramework1", "aLibrary1", "anApp"])
-        #expect(try buildGraph.dependencies(appTarget) == [
-            try buildGraph.target(for: fwkTarget),
-            try buildGraph.target(for: libTarget),
-        ])
+        #expect(
+            try buildGraph.dependencies(appTarget) == [
+                try buildGraph.target(for: fwkTarget),
+                try buildGraph.target(for: libTarget),
+            ]
+        )
         #expect(try buildGraph.dependencies(fwkTarget) == [])
         delegate.checkNoDiagnostics()
     }
@@ -4051,19 +4378,19 @@ fileprivate enum TargetPlatformSpecializationMode {
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "anApp",
                             type: .application,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"])
                             ],
                             buildPhases: [
                                 TestFrameworksBuildPhase([
-                                    "Base",
-                                ]),
+                                    "Base"
+                                ])
                             ]
                         )
                     ]
@@ -4072,25 +4399,24 @@ fileprivate enum TargetPlatformSpecializationMode {
                     "P2",
                     groupTree: TestGroup(
                         "G2",
-                        children:[
-                        ]
+                        children: []
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "aFramework1",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Base"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Base"])
                             ]
                         ),
                         TestStandardTarget(
                             "aLibrary1",
                             type: .dynamicLibrary,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Base"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Base"])
                             ]
                         ),
                     ]
@@ -4117,9 +4443,11 @@ fileprivate enum TargetPlatformSpecializationMode {
         let buildGraph = await TargetGraphFactory(workspaceContext: workspaceContext, buildRequest: buildRequest, buildRequestContext: buildRequestContext, delegate: delegate).graph(type: .dependency)
         let dependencyClosure = buildGraph.allTargets
         #expect(dependencyClosure.map({ $0.target.name }) == ["aFramework1", "anApp"])
-        #expect(try buildGraph.dependencies(appTarget) == [
-            try buildGraph.target(for: fwkTarget),
-        ])
+        #expect(
+            try buildGraph.dependencies(appTarget) == [
+                try buildGraph.target(for: fwkTarget)
+            ]
+        )
         #expect(try buildGraph.dependencies(fwkTarget) == [])
         delegate.checkNoDiagnostics()
     }
@@ -4127,31 +4455,43 @@ fileprivate enum TargetPlatformSpecializationMode {
     @Test
     func packagesDoNotConsiderImplicitDependencies() async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("Workspace", projects: [
-            TestProject("Project", groupTree: TestGroup("RootGroup"),
-                        targets: [
-                            TestStandardTarget(
-                                "Base",
-                                type: .framework,
-                                buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Base"]),
-                                ]
-                            ),
-                        ]),
-            TestPackageProject("Package", groupTree: TestGroup("RootGroup"),
-                               targets: [
-                                TestStandardTarget(
-                                    "Package",
-                                    type: .objectFile,
-                                    buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: [
-                                            "PRODUCT_NAME": "pkg",
-                                            "OTHER_LDFLAGS": "-framework Base",
-                                        ]),
+        let workspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "Project",
+                    groupTree: TestGroup("RootGroup"),
+                    targets: [
+                        TestStandardTarget(
+                            "Base",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Base"])
+                            ]
+                        )
+                    ]
+                ),
+                TestPackageProject(
+                    "Package",
+                    groupTree: TestGroup("RootGroup"),
+                    targets: [
+                        TestStandardTarget(
+                            "Package",
+                            type: .objectFile,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "pkg",
+                                        "OTHER_LDFLAGS": "-framework Base",
                                     ]
-                                ),
-                               ]),
-        ]).load(core)
+                                )
+                            ]
+                        )
+                    ]
+                ),
+            ]
+        ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
 
         let buildParameters = BuildParameters(configuration: "Debug")
@@ -4159,46 +4499,54 @@ fileprivate enum TargetPlatformSpecializationMode {
         let buildRequest = BuildRequest(parameters: buildParameters, buildTargets: [pkgTarget], continueBuildingAfterErrors: true, useParallelTargets: false, useImplicitDependencies: true, useDryRun: false)
         let buildRequestContext = BuildRequestContext(workspaceContext: workspaceContext)
 
-
         for type in TargetGraphFactory.GraphType.allCases {
             let delegate = EmptyTargetDependencyResolverDelegate(workspace: workspaceContext.workspace)
             let buildGraph = await TargetGraphFactory(workspaceContext: workspaceContext, buildRequest: buildRequest, buildRequestContext: buildRequestContext, delegate: delegate).graph(type: type)
-            #expect(buildGraph.allTargets.map({ $0.target.name }) == ["Package"]) // does not contain 'Base' even though we are linking it
+            #expect(buildGraph.allTargets.map({ $0.target.name }) == ["Package"])  // does not contain 'Base' even though we are linking it
         }
     }
 
     @Test
     func implicitDependenciesWithNameCollisionOnPackageTarget() async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("Workspace", projects: [
-            TestProject("Project", groupTree: TestGroup("RootGroup", children: [TestFile("NameCollision.framework")]),
-                        targets: [
-                            TestStandardTarget(
-                                "Base",
-                                type: .framework,
-                                buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Base"]),
-                                ],
-                                buildPhases: [
-                                    TestFrameworksBuildPhase(["NameCollision.framework"])
-                                ],
-                                dependencies: [TestTargetDependency("NameCollision")]
-                            ),
+        let workspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "Project",
+                    groupTree: TestGroup("RootGroup", children: [TestFile("NameCollision.framework")]),
+                    targets: [
+                        TestStandardTarget(
+                            "Base",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "Base"])
+                            ],
+                            buildPhases: [
+                                TestFrameworksBuildPhase(["NameCollision.framework"])
+                            ],
+                            dependencies: [TestTargetDependency("NameCollision")]
+                        ),
 
-                            TestStandardTarget(
-                                "NameCollision",
-                                type: .framework,
-                                buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "NameCollision"]),
-                                ]
-                            ),
-                        ]),
-            TestPackageProject("Package", groupTree: TestGroup("RootGroup"),
-                               targets: [
-                                TestPackageProductTarget("Package", frameworksBuildPhase: TestFrameworksBuildPhase([TestBuildFile(.target("NameCollision"))]), buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "NameCollision"]) ], dependencies: ["NameCollision"]),
-                                TestStandardTarget("NameCollision", type: .framework),
-                               ]),
-        ]).load(core)
+                        TestStandardTarget(
+                            "NameCollision",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "NameCollision"])
+                            ]
+                        ),
+                    ]
+                ),
+                TestPackageProject(
+                    "Package",
+                    groupTree: TestGroup("RootGroup"),
+                    targets: [
+                        TestPackageProductTarget("Package", frameworksBuildPhase: TestFrameworksBuildPhase([TestBuildFile(.target("NameCollision"))]), buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "NameCollision"])], dependencies: ["NameCollision"]),
+                        TestStandardTarget("NameCollision", type: .framework),
+                    ]
+                ),
+            ]
+        ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
 
         let buildParameters = BuildParameters(configuration: "Debug")
@@ -4219,25 +4567,29 @@ fileprivate enum TargetPlatformSpecializationMode {
         }
     }
 
-
-
     @Test
     func consistentlyUseParametersFromBuildRequest() async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("Workspace",
-                                          projects: [
-                                            TestProject("aProject",
-                                                        groupTree: TestGroup("SomeFiles"),
-                                                        targets: [
-                                                            TestStandardTarget("App", type: .application, dependencies: ["Framework", "PackageProduct"]),
-                                                            TestStandardTarget("Framework", type: .framework),
-                                                        ]),
-                                            TestPackageProject("aPackageProject",
-                                                               groupTree: TestGroup("SomeMoreFiles"),
-                                                               targets: [
-                                                                TestPackageProductTarget("PackageProduct", frameworksBuildPhase: TestFrameworksBuildPhase(), buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "auto", "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)"])]),
-                                                               ]),
-                                          ]).load(core)
+        let workspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles"),
+                    targets: [
+                        TestStandardTarget("App", type: .application, dependencies: ["Framework", "PackageProduct"]),
+                        TestStandardTarget("Framework", type: .framework),
+                    ]
+                ),
+                TestPackageProject(
+                    "aPackageProject",
+                    groupTree: TestGroup("SomeMoreFiles"),
+                    targets: [
+                        TestPackageProductTarget("PackageProduct", frameworksBuildPhase: TestFrameworksBuildPhase(), buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "auto", "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)"])])
+                    ]
+                ),
+            ]
+        ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
 
         let buildParameters = BuildParameters(configuration: "Debug", activeRunDestination: RunDestinationInfo.macOS).mergingOverrides(["BEST": "1"])
@@ -4266,7 +4618,8 @@ fileprivate enum TargetPlatformSpecializationMode {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "Sources", path: "Sources",
+                "Sources",
+                path: "Sources",
                 children: [
                     // app files
                     TestFile("app/app.swift"),
@@ -4276,35 +4629,42 @@ fileprivate enum TargetPlatformSpecializationMode {
 
                     // Shared framework files
                     TestFile("shared/lib.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ARCHS": "$(ARCHS_STANDARD)",
-                    "ENABLE_ON_DEMAND_RESOURCES": "NO",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "CODE_SIGN_IDENTITY": "",
-                    "SWIFT_VERSION": swiftVersion,
-                    "SWIFT_INSTALL_OBJC_HEADER": "NO",
-                    "SKIP_INSTALL": "YES",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS": "$(ARCHS_STANDARD)",
+                        "ENABLE_ON_DEMAND_RESOURCES": "NO",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "CODE_SIGN_IDENTITY": "",
+                        "SWIFT_VERSION": swiftVersion,
+                        "SWIFT_INSTALL_OBJC_HEADER": "NO",
+                        "SKIP_INSTALL": "YES",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "macosx",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["app/app.swift"]),
                         TestFrameworksBuildPhase([
                             TestBuildFile("Shared.framework"),
                             TestBuildFile("MultiPlat.framework"),
-                        ])
+                        ]),
                     ],
                     dependencies: []
                 ),
@@ -4312,67 +4672,80 @@ fileprivate enum TargetPlatformSpecializationMode {
                     "MultiPlat Framework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "macosx",
-                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
-                            "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
-                            "PRODUCT_NAME": "MultiPlat",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                                "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
+                                "PRODUCT_NAME": "MultiPlat",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([TestBuildFile("multiplat/multiplat.swift")]),
                         TestFrameworksBuildPhase([
                             TestBuildFile("Shared.framework"),
-                            TestBuildFile("MultiPlatMore.framework")
-                        ])
+                            TestBuildFile("MultiPlatMore.framework"),
+                        ]),
                     ]
                 ),
                 TestStandardTarget(
                     "Shared Framework 1",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "macosx",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                            "PRODUCT_NAME": "Shared",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                                "PRODUCT_NAME": "Shared",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("shared/lib.swift")]),
+                        TestSourcesBuildPhase([TestBuildFile("shared/lib.swift")])
                     ]
                 ),
                 TestStandardTarget(
                     "Shared Framework 2",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "macosx",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                            "PRODUCT_NAME": "Shared",
-                            "SDK_VARIANT": "iosmac",
-                            "EFFECTIVE_PLATFORM_NAME": "-iosmac",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                                "PRODUCT_NAME": "Shared",
+                                "SDK_VARIANT": "iosmac",
+                                "EFFECTIVE_PLATFORM_NAME": "-iosmac",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("shared/lib.swift")]),
+                        TestSourcesBuildPhase([TestBuildFile("shared/lib.swift")])
                     ]
                 ),
                 TestStandardTarget(
                     "Downstream MultiPlat Framework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "macosx",
-                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
-                            "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
-                            "PRODUCT_NAME": "MultiPlatMore",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                                "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
+                                "PRODUCT_NAME": "MultiPlatMore",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("multiplat/multiplat.swift")]),
+                        TestSourcesBuildPhase([TestBuildFile("multiplat/multiplat.swift")])
                     ]
                 ),
-            ])
+            ]
+        )
 
         let workspace = try TestWorkspace("TestWorkspace", projects: [testProject]).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -4391,9 +4764,9 @@ fileprivate enum TargetPlatformSpecializationMode {
 
         if workspaceContext.userPreferences.enableDebugActivityLogs {
             delegate.checkDiagnostics([
-                "Shared Framework 2 rejected as an implicit dependency because its SDK_VARIANT 'iosmac' is not equal to this target\'s SDK_VARIANT 'macos' and it is not zippered. (in target \'App\' from project \'aProject\')", "Shared Framework 2 rejected as an implicit dependency because its SDK_VARIANT 'iosmac' is not equal to this target\'s SDK_VARIANT 'macos' and it is not zippered. (in target \'MultiPlat Framework\' from project \'aProject\')"])
-        }
-        else {
+                "Shared Framework 2 rejected as an implicit dependency because its SDK_VARIANT 'iosmac' is not equal to this target\'s SDK_VARIANT 'macos' and it is not zippered. (in target \'App\' from project \'aProject\')", "Shared Framework 2 rejected as an implicit dependency because its SDK_VARIANT 'iosmac' is not equal to this target\'s SDK_VARIANT 'macos' and it is not zippered. (in target \'MultiPlat Framework\' from project \'aProject\')",
+            ])
+        } else {
             delegate.checkNoDiagnostics()
         }
     }
@@ -4406,43 +4779,51 @@ fileprivate enum TargetPlatformSpecializationMode {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "Sources", path: "Sources",
+                "Sources",
+                path: "Sources",
                 children: [
                     // app files
                     TestFile("app/app.swift"),
 
                     // framework files
                     TestFile("framework/framework.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ARCHS": "$(ARCHS_STANDARD)",
-                    "ENABLE_ON_DEMAND_RESOURCES": "NO",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "CODE_SIGN_IDENTITY": "",
-                    "SDKROOT": "macosx",
-                    "SWIFT_VERSION": swiftVersion,
-                    "SWIFT_INSTALL_OBJC_HEADER": "NO",
-                    "SKIP_INSTALL": "YES",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS": "$(ARCHS_STANDARD)",
+                        "ENABLE_ON_DEMAND_RESOURCES": "NO",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "CODE_SIGN_IDENTITY": "",
+                        "SDKROOT": "macosx",
+                        "SWIFT_VERSION": swiftVersion,
+                        "SWIFT_INSTALL_OBJC_HEADER": "NO",
+                        "SKIP_INSTALL": "YES",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "DefaultApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "App",
-                            // IMPLICIT_DEPENDENCY_DOMAIN = default
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "App"
+                                    // IMPLICIT_DEPENDENCY_DOMAIN = default
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["app/app.swift"]),
                         TestFrameworksBuildPhase([
-                            TestBuildFile("Framework.framework"),
-                        ])
+                            TestBuildFile("Framework.framework")
+                        ]),
                     ],
                     dependencies: []
                 ),
@@ -4450,46 +4831,55 @@ fileprivate enum TargetPlatformSpecializationMode {
                     "DefaultFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "Framework",
-                            // IMPLICIT_DEPENDENCY_DOMAIN = default
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "Framework"
+                                    // IMPLICIT_DEPENDENCY_DOMAIN = default
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("framework/framework.swift")]),
+                        TestSourcesBuildPhase([TestBuildFile("framework/framework.swift")])
                     ]
                 ),
                 TestStandardTarget(
                     "OtherApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "App",
-                            "IMPLICIT_DEPENDENCY_DOMAIN": "other",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "App",
+                                "IMPLICIT_DEPENDENCY_DOMAIN": "other",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["app/app.swift"]),
                         TestFrameworksBuildPhase([
                             TestBuildFile("Framework.framework"),
                             TestBuildFile("ExplicitFramework.framework"),
-                        ])
+                        ]),
                     ],
                     dependencies: [
-                        "ExplicitFramework",
+                        "ExplicitFramework"
                     ]
                 ),
                 TestStandardTarget(
                     "OtherFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "Framework",
-                            "IMPLICIT_DEPENDENCY_DOMAIN": "other",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "Framework",
+                                "IMPLICIT_DEPENDENCY_DOMAIN": "other",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("framework/framework.swift")]),
+                        TestSourcesBuildPhase([TestBuildFile("framework/framework.swift")])
                     ]
                 ),
                 // These targets test that they will not match against anything, because they set their domain to empty.
@@ -4497,33 +4887,39 @@ fileprivate enum TargetPlatformSpecializationMode {
                     "EmptyApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "App",
-                            "IMPLICIT_DEPENDENCY_DOMAIN": "",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "App",
+                                "IMPLICIT_DEPENDENCY_DOMAIN": "",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["app/app.swift"]),
                         TestFrameworksBuildPhase([
                             TestBuildFile("Framework.framework"),
                             TestBuildFile("ExplicitFramework.framework"),
-                        ])
+                        ]),
                     ],
                     dependencies: [
-                        "ExplicitFramework",
+                        "ExplicitFramework"
                     ]
                 ),
                 TestStandardTarget(
                     "EmptyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "Framework",
-                            "IMPLICIT_DEPENDENCY_DOMAIN": "",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "Framework",
+                                "IMPLICIT_DEPENDENCY_DOMAIN": "",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("framework/framework.swift")]),
+                        TestSourcesBuildPhase([TestBuildFile("framework/framework.swift")])
                     ]
                 ),
                 // Test that domains don't affect explicit dependencies.
@@ -4531,16 +4927,20 @@ fileprivate enum TargetPlatformSpecializationMode {
                     "ExplicitFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "ExplicitFramework",
-                            // IMPLICIT_DEPENDENCY_DOMAIN = default
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "ExplicitFramework"
+                                    // IMPLICIT_DEPENDENCY_DOMAIN = default
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("framework/framework.swift")]),
+                        TestSourcesBuildPhase([TestBuildFile("framework/framework.swift")])
                     ]
                 ),
-            ])
+            ]
+        )
         let workspace = try TestWorkspace("TestWorkspace", projects: [testProject]).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
         // Enable this line to test the diagnostics.
@@ -4569,8 +4969,7 @@ fileprivate enum TargetPlatformSpecializationMode {
                     "EmptyFramework rejected as an implicit dependency because its IMPLICIT_DEPENDENCY_DOMAIN is empty (trying to match this target\'s domain \'default\'). (in target \'DefaultApp\' from project \'aProject\')",
                     "OtherFramework rejected as an implicit dependency because its IMPLICIT_DEPENDENCY_DOMAIN \'other\' is not equal to this target\'s domain \'default\'. (in target \'DefaultApp\' from project \'aProject\')",
                 ])
-            }
-            else {
+            } else {
                 delegate.checkNoDiagnostics()
             }
         }
@@ -4597,8 +4996,7 @@ fileprivate enum TargetPlatformSpecializationMode {
                     "DefaultFramework rejected as an implicit dependency because its IMPLICIT_DEPENDENCY_DOMAIN \'default\' is not equal to this target\'s domain \'other\'. (in target \'OtherApp\' from project \'aProject\')",
                     "EmptyFramework rejected as an implicit dependency because its IMPLICIT_DEPENDENCY_DOMAIN is empty (trying to match this target\'s domain \'other\'). (in target \'OtherApp\' from project \'aProject\')",
                 ])
-            }
-            else {
+            } else {
                 delegate.checkNoDiagnostics()
             }
         }
@@ -4622,10 +5020,9 @@ fileprivate enum TargetPlatformSpecializationMode {
 
             if workspaceContext.userPreferences.enableDebugActivityLogs {
                 delegate.checkDiagnostics([
-                    "EmptyApp not resolving implicit dependencies because IMPLICIT_DEPENDENCY_DOMAIN is empty. (in target \'EmptyApp\' from project \'aProject\')",
+                    "EmptyApp not resolving implicit dependencies because IMPLICIT_DEPENDENCY_DOMAIN is empty. (in target \'EmptyApp\' from project \'aProject\')"
                 ])
-            }
-            else {
+            } else {
                 delegate.checkNoDiagnostics()
             }
         }
@@ -4634,61 +5031,68 @@ fileprivate enum TargetPlatformSpecializationMode {
     @Test
     func implicitDependenciesHonorExcludedSourceFileNames() async throws {
         let core = try await getCore()
-        let workspace = try TestWorkspace("Workspace",
-                                          projects: [
-                                            TestProject(
-                                                "Project",
-                                                groupTree: TestGroup("SomeFiles"),
-                                                buildConfigurations: [
-                                                    TestBuildConfiguration("Release"),
-                                                    TestBuildConfiguration("Release-LightDeps"),
-                                                ],
-                                                targets: [
-                                                    TestStandardTarget(
-                                                        "AppTarget",
-                                                        type: .application,
-                                                        buildConfigurations: [
-                                                            TestBuildConfiguration("Release"),
-                                                            TestBuildConfiguration("Release-LightDeps", buildSettings: [
-                                                                "EXCLUDED_SOURCE_FILE_NAMES": "SometimesUsedDependency.framework",
-                                                            ]),
-                                                        ],
-                                                        buildPhases: [
-                                                            TestFrameworksBuildPhase([
-                                                                "AlwaysUsedDependency.framework",
-                                                                "SometimesUsedDependency.framework",
-                                                            ]),
-                                                            TestCopyFilesBuildPhase([
-                                                                "AlwaysUsedDependency.framework",
-                                                                "SometimesUsedDependency.framework",
-                                                            ], destinationSubfolder: .frameworks),
-                                                        ]
-                                                    ),
-                                                    TestStandardTarget(
-                                                        "AlwaysUsedDependency",
-                                                        type: .framework,
-                                                        buildConfigurations: [
-                                                            TestBuildConfiguration("Release"),
-                                                            TestBuildConfiguration("Release-LightDeps"),
-                                                        ],
-                                                        buildPhases: [
-                                                            TestFrameworksBuildPhase(),
-                                                        ]
-                                                    ),
-                                                    TestStandardTarget(
-                                                        "SometimesUsedDependency",
-                                                        type: .framework,
-                                                        buildConfigurations: [
-                                                            TestBuildConfiguration("Release"),
-                                                            TestBuildConfiguration("Release-LightDeps"),
-                                                        ],
-                                                        buildPhases: [
-                                                            TestFrameworksBuildPhase(),
-                                                        ]
-                                                    ),
-                                                ]
-                                            )
-                                          ]
+        let workspace = try TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "Project",
+                    groupTree: TestGroup("SomeFiles"),
+                    buildConfigurations: [
+                        TestBuildConfiguration("Release"),
+                        TestBuildConfiguration("Release-LightDeps"),
+                    ],
+                    targets: [
+                        TestStandardTarget(
+                            "AppTarget",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Release"),
+                                TestBuildConfiguration(
+                                    "Release-LightDeps",
+                                    buildSettings: [
+                                        "EXCLUDED_SOURCE_FILE_NAMES": "SometimesUsedDependency.framework"
+                                    ]
+                                ),
+                            ],
+                            buildPhases: [
+                                TestFrameworksBuildPhase([
+                                    "AlwaysUsedDependency.framework",
+                                    "SometimesUsedDependency.framework",
+                                ]),
+                                TestCopyFilesBuildPhase(
+                                    [
+                                        "AlwaysUsedDependency.framework",
+                                        "SometimesUsedDependency.framework",
+                                    ],
+                                    destinationSubfolder: .frameworks
+                                ),
+                            ]
+                        ),
+                        TestStandardTarget(
+                            "AlwaysUsedDependency",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Release"),
+                                TestBuildConfiguration("Release-LightDeps"),
+                            ],
+                            buildPhases: [
+                                TestFrameworksBuildPhase()
+                            ]
+                        ),
+                        TestStandardTarget(
+                            "SometimesUsedDependency",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Release"),
+                                TestBuildConfiguration("Release-LightDeps"),
+                            ],
+                            buildPhases: [
+                                TestFrameworksBuildPhase()
+                            ]
+                        ),
+                    ]
+                )
+            ]
         ).load(core)
 
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
@@ -4739,21 +5143,24 @@ fileprivate enum TargetPlatformSpecializationMode {
                     groupTree: TestGroup(
                         "G1",
                         children: [
-                            TestFile("aFramework.framework"),
+                            TestFile("aFramework.framework")
                         ]
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "anApp",
                             type: .application,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: [
-                                    "PRODUCT_NAME": "anApp",
-                                    "MODULE_DEPENDENCIES": "'public aFramework' nonExisting",
-                                ]),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "anApp",
+                                        "MODULE_DEPENDENCIES": "'public aFramework' nonExisting",
+                                    ]
+                                )
                             ]
                         )
                     ]
@@ -4762,20 +5169,19 @@ fileprivate enum TargetPlatformSpecializationMode {
                     "P2",
                     groupTree: TestGroup(
                         "G2",
-                        children:[
-                        ]
+                        children: []
                     ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     targets: [
                         TestStandardTarget(
                             "aFramework",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"]),
+                                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"])
                             ]
-                        ),
+                        )
                     ]
                 ),
             ]
@@ -4811,144 +5217,153 @@ fileprivate enum TargetPlatformSpecializationMode {
     @Test(.requireSDKs(.iOS))
     func mergedFrameworkPropertyImposition() async throws {
         let core = try await getCore()
-        let workspace = try await TestWorkspace("Workspace",
-                                                projects: [
-                                                    TestProject(
-                                                        "aProject",
-                                                        groupTree: TestGroup("SomeFiles"),
-                                                        buildConfigurations: [
-                                                            TestBuildConfiguration(
-                                                                "Release",
-                                                                buildSettings: [
-                                                                    "CODE_SIGN_IDENTITY": "-",
-                                                                    "INFOPLIST_FILE": "$(TARGET_NAME)-Info.plist",
-                                                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                                    "SDKROOT": "iphoneos",
-                                                                    "SWIFT_INSTALL_OBJC_HEADER": "NO",
-                                                                    "SWIFT_VERSION": swiftVersion,
-                                                                    "TAPI_EXEC": tapiToolPath.str,
-                                                                ]),
-                                                        ],
-                                                        targets: [
-                                                            // App target
-                                                            TestStandardTarget(
-                                                                "AppTarget",
-                                                                type: .application,
-                                                                buildConfigurations: [
-                                                                    TestBuildConfiguration("Release"),
-                                                                ],
-                                                                buildPhases: [
-                                                                    TestFrameworksBuildPhase([
-                                                                        "MergedFwkTarget.framework",
-                                                                    ]),
-                                                                    // Embed
-                                                                    TestCopyFilesBuildPhase([
-                                                                        "MergedFwkTarget.framework",
-                                                                        "FwkTarget1.framework",
-                                                                        "FwkTarget2.framework",
-                                                                        // FIXME: rdar://105297527: Realistically people will add the dylib here, but we should not copy it if we merged it into the merged framework
-                                                                    ], destinationSubfolder: .frameworks),
-                                                                ],
-                                                                dependencies: ["MergedFwkTarget"]
-                                                            ),
-                                                            // Merged framework target
-                                                            TestStandardTarget(
-                                                                "MergedFwkTarget",
-                                                                type: .framework,
-                                                                buildConfigurations: [
-                                                                    TestBuildConfiguration("Release",
-                                                                                           buildSettings: [
-                                                                                            "AUTOMATICALLY_MERGE_DEPENDENCIES": "YES",
-                                                                                           ]),
-                                                                ],
-                                                                buildPhases: [
-                                                                    TestFrameworksBuildPhase([
-                                                                        "FwkTarget1.framework",
-                                                                        "FwkTarget2.framework",
-                                                                        "libDylibTarget.dylib",
-                                                                        "libStaticLibTarget.a",
-                                                                    ]),
-                                                                    TestCopyFilesBuildPhase([
-                                                                        "XPCServiceTarget.xpc",
-                                                                    ], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(CONTENTS_FOLDER_PATH)/XPCServices"),
-                                                                    TestCopyFilesBuildPhase([
-                                                                        "BundleTarget.bundle",
-                                                                    ], destinationSubfolder: .plugins),
-                                                                ],
-                                                                // We want to test both explicit and implicit dependencies so not all targets are listed here.
-                                                                dependencies: ["FwkTarget1"]
-                                                            ),
-                                                            // Targets which the merged target depends on.  Some of these will be configured as mergeable, and others will not.
-                                                            TestStandardTarget(
-                                                                "FwkTarget1",
-                                                                type: .framework,
-                                                                buildConfigurations: [
-                                                                    TestBuildConfiguration("Release"),
-                                                                ],
-                                                                buildPhases: [
-                                                                    TestFrameworksBuildPhase([
-                                                                    ]),
-                                                                ]
-                                                            ),
-                                                            TestStandardTarget(
-                                                                "FwkTarget2",
-                                                                type: .framework,
-                                                                buildConfigurations: [
-                                                                    TestBuildConfiguration("Release"),
-                                                                ],
-                                                                buildPhases: [
-                                                                    TestFrameworksBuildPhase([
-                                                                    ]),
-                                                                ]
-                                                            ),
-                                                            TestStandardTarget(
-                                                                "DylibTarget",
-                                                                type: .dynamicLibrary,
-                                                                buildConfigurations: [
-                                                                    TestBuildConfiguration("Release"),
-                                                                ],
-                                                                buildPhases: [
-                                                                    TestFrameworksBuildPhase([
-                                                                    ]),
-                                                                ]
-                                                            ),
-                                                            TestStandardTarget(
-                                                                "StaticLibTarget",
-                                                                type: .staticLibrary,
-                                                                buildConfigurations: [
-                                                                    TestBuildConfiguration("Release"),
-                                                                ],
-                                                                buildPhases: [
-                                                                    TestFrameworksBuildPhase([
-                                                                    ]),
-                                                                ]
-                                                            ),
-                                                            TestStandardTarget(
-                                                                // The merged framework embedding an XPC service seems like something that might occur.
-                                                                "XPCServiceTarget",
-                                                                type: .xpcService,
-                                                                buildConfigurations: [
-                                                                    TestBuildConfiguration("Release"),
-                                                                ],
-                                                                buildPhases: [
-                                                                    TestFrameworksBuildPhase([
-                                                                    ]),
-                                                                ]
-                                                            ),
-                                                            TestStandardTarget(
-                                                                // Bundles are largely treated like dylibs, but they cannot be explicitly linked against and must be dlopen()ed.
-                                                                "BundleTarget",
-                                                                type: .bundle,
-                                                                buildConfigurations: [
-                                                                    TestBuildConfiguration("Release"),
-                                                                ],
-                                                                buildPhases: [
-                                                                    TestFrameworksBuildPhase([
-                                                                    ]),
-                                                                ]
-                                                            ),
-                                                        ])
-                                                ]
+        let workspace = try await TestWorkspace(
+            "Workspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup("SomeFiles"),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "CODE_SIGN_IDENTITY": "-",
+                                "INFOPLIST_FILE": "$(TARGET_NAME)-Info.plist",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SDKROOT": "iphoneos",
+                                "SWIFT_INSTALL_OBJC_HEADER": "NO",
+                                "SWIFT_VERSION": swiftVersion,
+                                "TAPI_EXEC": tapiToolPath.str,
+                            ]
+                        )
+                    ],
+                    targets: [
+                        // App target
+                        TestStandardTarget(
+                            "AppTarget",
+                            type: .application,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Release")
+                            ],
+                            buildPhases: [
+                                TestFrameworksBuildPhase([
+                                    "MergedFwkTarget.framework"
+                                ]),
+                                // Embed
+                                TestCopyFilesBuildPhase(
+                                    [
+                                        "MergedFwkTarget.framework",
+                                        "FwkTarget1.framework",
+                                        "FwkTarget2.framework",
+                                        // FIXME: rdar://105297527: Realistically people will add the dylib here, but we should not copy it if we merged it into the merged framework
+                                    ],
+                                    destinationSubfolder: .frameworks
+                                ),
+                            ],
+                            dependencies: ["MergedFwkTarget"]
+                        ),
+                        // Merged framework target
+                        TestStandardTarget(
+                            "MergedFwkTarget",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Release",
+                                    buildSettings: [
+                                        "AUTOMATICALLY_MERGE_DEPENDENCIES": "YES"
+                                    ]
+                                )
+                            ],
+                            buildPhases: [
+                                TestFrameworksBuildPhase([
+                                    "FwkTarget1.framework",
+                                    "FwkTarget2.framework",
+                                    "libDylibTarget.dylib",
+                                    "libStaticLibTarget.a",
+                                ]),
+                                TestCopyFilesBuildPhase(
+                                    [
+                                        "XPCServiceTarget.xpc"
+                                    ],
+                                    destinationSubfolder: .builtProductsDir,
+                                    destinationSubpath: "$(CONTENTS_FOLDER_PATH)/XPCServices"
+                                ),
+                                TestCopyFilesBuildPhase(
+                                    [
+                                        "BundleTarget.bundle"
+                                    ],
+                                    destinationSubfolder: .plugins
+                                ),
+                            ],
+                            // We want to test both explicit and implicit dependencies so not all targets are listed here.
+                            dependencies: ["FwkTarget1"]
+                        ),
+                        // Targets which the merged target depends on.  Some of these will be configured as mergeable, and others will not.
+                        TestStandardTarget(
+                            "FwkTarget1",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Release")
+                            ],
+                            buildPhases: [
+                                TestFrameworksBuildPhase([])
+                            ]
+                        ),
+                        TestStandardTarget(
+                            "FwkTarget2",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Release")
+                            ],
+                            buildPhases: [
+                                TestFrameworksBuildPhase([])
+                            ]
+                        ),
+                        TestStandardTarget(
+                            "DylibTarget",
+                            type: .dynamicLibrary,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Release")
+                            ],
+                            buildPhases: [
+                                TestFrameworksBuildPhase([])
+                            ]
+                        ),
+                        TestStandardTarget(
+                            "StaticLibTarget",
+                            type: .staticLibrary,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Release")
+                            ],
+                            buildPhases: [
+                                TestFrameworksBuildPhase([])
+                            ]
+                        ),
+                        TestStandardTarget(
+                            // The merged framework embedding an XPC service seems like something that might occur.
+                            "XPCServiceTarget",
+                            type: .xpcService,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Release")
+                            ],
+                            buildPhases: [
+                                TestFrameworksBuildPhase([])
+                            ]
+                        ),
+                        TestStandardTarget(
+                            // Bundles are largely treated like dylibs, but they cannot be explicitly linked against and must be dlopen()ed.
+                            "BundleTarget",
+                            type: .bundle,
+                            buildConfigurations: [
+                                TestBuildConfiguration("Release")
+                            ],
+                            buildPhases: [
+                                TestFrameworksBuildPhase([])
+                            ]
+                        ),
+                    ]
+                )
+            ]
         ).load(core)
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
         let project = workspace.projects[0]
@@ -4969,13 +5384,13 @@ fileprivate enum TargetPlatformSpecializationMode {
 
         // Check that MERGEABLE_LIBRARY was imposed on targets it should have been.
         for targetName in ["FwkTarget1", "FwkTarget2", "DylibTarget"] {
-            if let target = targetList.first(where: { $0.target.name == targetName}) {
+            if let target = targetList.first(where: { $0.target.name == targetName }) {
                 #expect(target.parameters.overrides[BuiltinMacros.MERGEABLE_LIBRARY.name] == "YES")
             }
         }
         // Check that MERGEABLE_LIBRARY was *not* imposed on targets it shouldn't have been.
         for targetName in ["StaticLibTarget", "XPCServiceTarget", "BundleTarget"] {
-            if let target = targetList.first(where: { $0.target.name == targetName}) {
+            if let target = targetList.first(where: { $0.target.name == targetName }) {
                 if let value = target.parameters.overrides[BuiltinMacros.MERGEABLE_LIBRARY.name] {
                     Issue.record("\(target.target.name) has unexpected value '\(value)' for \(BuiltinMacros.MERGEABLE_LIBRARY.name)")
                 }
diff --git a/Tests/SWBCoreTests/ToolchainRegistryTests.swift b/Tests/SWBCoreTests/ToolchainRegistryTests.swift
index 678b42dc..1f186ec0 100644
--- a/Tests/SWBCoreTests/ToolchainRegistryTests.swift
+++ b/Tests/SWBCoreTests/ToolchainRegistryTests.swift
@@ -25,11 +25,13 @@ import SWBServiceCore
     ///
     /// - parameter inputs: A list of test inputs, in the form (name, testData). These inputs will be written to files in a temporary directory for testing.
     /// - parameter perform: A block that runs with the registry that results from scanning the inputs, as well as the list of warnings and errors. Each warning and error is a pair of the path basename and the diagnostic message.
-    private func withRegistryForTestInputs(strict: Bool = true,
-                                           _ inputs: [(String, PropertyListItem?)],
-                                           infoPlistName: String = "ToolchainInfo.plist",
-                                           postProcess: (Path) throws -> Void = { _ in },
-                                           perform: (ToolchainRegistry, [(String, String)], [(String, String)]) throws -> Void) async throws {
+    private func withRegistryForTestInputs(
+        strict: Bool = true,
+        _ inputs: [(String, PropertyListItem?)],
+        infoPlistName: String = "ToolchainInfo.plist",
+        postProcess: (Path) throws -> Void = { _ in },
+        perform: (ToolchainRegistry, [(String, String)], [(String, String)]) throws -> Void
+    ) async throws {
         try await withTemporaryDirectory { baseTmpDirPath in
             let tmpDirPath = baseTmpDirPath.join("tmp")
             try fs.createDirectory(tmpDirPath)
@@ -47,7 +49,7 @@ import SWBServiceCore
 
             try postProcess(tmpDirPath)
 
-            class TestDataDelegate : ToolchainRegistryDelegate {
+            class TestDataDelegate: ToolchainRegistryDelegate {
                 private let _diagnosticsEngine = DiagnosticsEngine()
 
                 init(pluginManager: any PluginManager) {
@@ -113,23 +115,25 @@ import SWBServiceCore
     }
 
     func _testLoadingIssues(strict: Bool) async throws {
-        try await withRegistryForTestInputs(strict: strict, [
-            ("unused", nil),
-            ("a.xctoolchain", nil),
-            ("b.xctoolchain", []),
-            ("c.xctoolchain", ["bad": "bad"]),
-            ("d.xctoolchain", ["Identifier": "d"]),
-            ("e.xctoolchain", ["Identifier": "d"]),
-            ("default.xctoolchain", ["Identifier": ToolchainRegistry.defaultToolchainIdentifier]),
-            ("swift.xctoolchain", ["CFBundleIdentifier": "org.swift.3020161115a", "Aliases": ["swift"]]),
-            ("swift-latest.xctoolchain", ["CFBundleIdentifier": "org.swift.latest"]),
-        ]) { registry, warnings, errors in
+        try await withRegistryForTestInputs(
+            strict: strict,
+            [
+                ("unused", nil),
+                ("a.xctoolchain", nil),
+                ("b.xctoolchain", []),
+                ("c.xctoolchain", ["bad": "bad"]),
+                ("d.xctoolchain", ["Identifier": "d"]),
+                ("e.xctoolchain", ["Identifier": "d"]),
+                ("default.xctoolchain", ["Identifier": ToolchainRegistry.defaultToolchainIdentifier]),
+                ("swift.xctoolchain", ["CFBundleIdentifier": "org.swift.3020161115a", "Aliases": ["swift"]]),
+                ("swift-latest.xctoolchain", ["CFBundleIdentifier": "org.swift.latest"]),
+            ]
+        ) { registry, warnings, errors in
             #expect(registry.toolchainsByIdentifier.keys.sorted(by: <) == [ToolchainRegistry.defaultToolchainIdentifier, "d", "org.swift.3020161115a"])
 
             if strict {
                 #expect(warnings.isEmpty)
-            }
-            else {
+            } else {
                 #expect(errors.isEmpty)
             }
 
@@ -170,10 +174,13 @@ import SWBServiceCore
     func loadingDownloadableToolchain() async throws {
         let additionalToolchains: [String] = ["com.apple.dt.toolchain.XcodeDefault"]
 
-        try await withRegistryForTestInputs([
-            ("swift-newer.xctoolchain", ["CFBundleIdentifier": "org.swift.3020161115a", "Version": "3.0.220161211151", "Aliases": ["swift"]]),
-            ("swift-older.xctoolchain", ["CFBundleIdentifier": "org.swift.3020161114a", "Version": "3.0.220161211141", "Aliases": ["swift"]]),
-        ], infoPlistName: "Info.plist") { registry, _, errors in
+        try await withRegistryForTestInputs(
+            [
+                ("swift-newer.xctoolchain", ["CFBundleIdentifier": "org.swift.3020161115a", "Version": "3.0.220161211151", "Aliases": ["swift"]]),
+                ("swift-older.xctoolchain", ["CFBundleIdentifier": "org.swift.3020161114a", "Version": "3.0.220161211141", "Aliases": ["swift"]]),
+            ],
+            infoPlistName: "Info.plist"
+        ) { registry, _, errors in
 
             #expect(Set(registry.toolchainsByIdentifier.keys) == Set(["org.swift.3020161114a", "org.swift.3020161115a"] + additionalToolchains))
             #expect(errors.count == 0, "\(errors)")
@@ -207,9 +214,12 @@ import SWBServiceCore
 
     @Test
     func swiftDeveloperToolchainSet() async throws {
-        try await withRegistryForTestInputs([
-            ("swift-org.xctoolchain", ["CFBundleIdentifier": "org.swift", "Version": "3.0.220161211141", "Aliases": ["swift"]]),
-        ], infoPlistName: "Info.plist") { registry, _, errors in
+        try await withRegistryForTestInputs(
+            [
+                ("swift-org.xctoolchain", ["CFBundleIdentifier": "org.swift", "Version": "3.0.220161211141", "Aliases": ["swift"]])
+            ],
+            infoPlistName: "Info.plist"
+        ) { registry, _, errors in
 
             #expect(errors.count == 0)
             #expect(registry.lookup("org.swift")?.overrideSettings["SWIFT_DEVELOPMENT_TOOLCHAIN"]?.looselyTypedBoolValue == true)
@@ -218,14 +228,21 @@ import SWBServiceCore
 
     @Test
     func customBuildSettings() async throws {
-        try await withRegistryForTestInputs([
-            ("swift-org.xctoolchain", [
-                "CFBundleIdentifier": "org.swift",
-                "Version": "3.0.220161211141",
-                "Aliases": ["swift"],
-                "DefaultBuildSettings": ["dfoo": "DefaultValue"],
-                "OverrideBuildSettings": ["ofoo": "OverrideValue"]]),
-        ], infoPlistName: "Info.plist") { registry, _, errors in
+        try await withRegistryForTestInputs(
+            [
+                (
+                    "swift-org.xctoolchain",
+                    [
+                        "CFBundleIdentifier": "org.swift",
+                        "Version": "3.0.220161211141",
+                        "Aliases": ["swift"],
+                        "DefaultBuildSettings": ["dfoo": "DefaultValue"],
+                        "OverrideBuildSettings": ["ofoo": "OverrideValue"],
+                    ]
+                )
+            ],
+            infoPlistName: "Info.plist"
+        ) { registry, _, errors in
 
             #expect(errors.count == 0)
             #expect(registry.lookup("org.swift")?.defaultSettings["dfoo"]?.stringValue == "DefaultValue")
diff --git a/Tests/SWBCoreTests/WorkspaceDiffTests.swift b/Tests/SWBCoreTests/WorkspaceDiffTests.swift
index 96baf0f0..67bb6204 100644
--- a/Tests/SWBCoreTests/WorkspaceDiffTests.swift
+++ b/Tests/SWBCoreTests/WorkspaceDiffTests.swift
@@ -21,12 +21,15 @@ import SWBCore
         let workspace = try await TestWorkspace(
             "testWorkspace",
             projects: [
-                TestProject("testProject",
-                            groupTree: TestGroup("root"),
-                            targets: [
-                                TestStandardTarget("testTarget", type: .application)
-                            ])
-            ]).load(getCore())
+                TestProject(
+                    "testProject",
+                    groupTree: TestGroup("root"),
+                    targets: [
+                        TestStandardTarget("testTarget", type: .application)
+                    ]
+                )
+            ]
+        ).load(getCore())
 
         let diff = workspace.diff(against: workspace)
 
@@ -37,17 +40,21 @@ import SWBCore
     func missingProject() async throws {
         let workspace = try await TestWorkspace(
             "testWorkspace",
-            projects: []).load(getCore())
+            projects: []
+        ).load(getCore())
 
         let otherWorkspace = try await TestWorkspace(
             "testWorkspace",
             projects: [
-                TestProject("testProject",
-                            groupTree: TestGroup("root"),
-                            targets: [
-                                TestStandardTarget("testTarget", type: .application)
-                            ])
-            ]).load(getCore())
+                TestProject(
+                    "testProject",
+                    groupTree: TestGroup("root"),
+                    targets: [
+                        TestStandardTarget("testTarget", type: .application)
+                    ]
+                )
+            ]
+        ).load(getCore())
 
         let diff = workspace.diff(against: otherWorkspace)
 
@@ -61,16 +68,20 @@ import SWBCore
         let workspace = try await TestWorkspace(
             "testWorkspace",
             projects: [
-                TestProject("testProject",
-                            groupTree: TestGroup("root"),
-                            targets: [
-                                TestStandardTarget("testTarget", type: .application)
-                            ])
-            ]).load(getCore())
+                TestProject(
+                    "testProject",
+                    groupTree: TestGroup("root"),
+                    targets: [
+                        TestStandardTarget("testTarget", type: .application)
+                    ]
+                )
+            ]
+        ).load(getCore())
 
         let otherWorkspace = try await TestWorkspace(
             "testWorkspace",
-            projects: []).load(getCore())
+            projects: []
+        ).load(getCore())
 
         let diff = workspace.diff(against: otherWorkspace)
 
@@ -84,22 +95,28 @@ import SWBCore
         let workspace = try await TestWorkspace(
             "testWorkspace",
             projects: [
-                TestProject("testProject",
-                            guid: "abcd",
-                            groupTree: TestGroup("root"),
-                            targets: [])
-            ]).load(getCore())
+                TestProject(
+                    "testProject",
+                    guid: "abcd",
+                    groupTree: TestGroup("root"),
+                    targets: []
+                )
+            ]
+        ).load(getCore())
 
         let otherWorkspace = try await TestWorkspace(
             "testWorkspace",
             projects: [
-                TestProject("testProject",
-                            guid: "abcd",
-                            groupTree: TestGroup("root"),
-                            targets: [
-                                TestStandardTarget("testTarget", type: .application)
-                            ])
-            ]).load(getCore())
+                TestProject(
+                    "testProject",
+                    guid: "abcd",
+                    groupTree: TestGroup("root"),
+                    targets: [
+                        TestStandardTarget("testTarget", type: .application)
+                    ]
+                )
+            ]
+        ).load(getCore())
 
         let diff = workspace.diff(against: otherWorkspace)
 
@@ -115,22 +132,28 @@ import SWBCore
         let workspace = try await TestWorkspace(
             "testWorkspace",
             projects: [
-                TestProject("testProject",
-                            guid: "abcd",
-                            groupTree: TestGroup("root"),
-                            targets: [
-                                TestStandardTarget("testTarget", type: .application)
-                            ])
-            ]).load(getCore())
+                TestProject(
+                    "testProject",
+                    guid: "abcd",
+                    groupTree: TestGroup("root"),
+                    targets: [
+                        TestStandardTarget("testTarget", type: .application)
+                    ]
+                )
+            ]
+        ).load(getCore())
 
         let otherWorkspace = try await TestWorkspace(
             "testWorkspace",
             projects: [
-                TestProject("testProject",
-                            guid: "abcd",
-                            groupTree: TestGroup("root"),
-                            targets: [])
-            ]).load(getCore())
+                TestProject(
+                    "testProject",
+                    guid: "abcd",
+                    groupTree: TestGroup("root"),
+                    targets: []
+                )
+            ]
+        ).load(getCore())
 
         let diff = workspace.diff(against: otherWorkspace)
 
@@ -146,29 +169,41 @@ import SWBCore
         let workspace = try await TestWorkspace(
             "testWorkspace",
             projects: [
-                TestProject("projectA",
-                            groupTree: TestGroup("whatever"),
-                            targets: [TestStandardTarget("targetA", type: .application)]),
-                TestProject("testProject",
-                            guid: "abcd",
-                            groupTree: TestGroup("root"),
-                            targets: [
-                                TestStandardTarget("testTarget", type: .application)
-                            ])
-            ]).load(getCore())
+                TestProject(
+                    "projectA",
+                    groupTree: TestGroup("whatever"),
+                    targets: [TestStandardTarget("targetA", type: .application)]
+                ),
+                TestProject(
+                    "testProject",
+                    guid: "abcd",
+                    groupTree: TestGroup("root"),
+                    targets: [
+                        TestStandardTarget("testTarget", type: .application)
+                    ]
+                ),
+            ]
+        ).load(getCore())
 
         let otherWorkspace = try await TestWorkspace(
             "testWorkspace",
             projects: [
-                TestProject("testProject",
-                            guid: "abcd",
-                            groupTree: TestGroup("root"),
-                            targets: []),
-                TestProject("projectB",
-                            groupTree: TestGroup("whatever"),
-                            targets: [TestStandardTarget("targetB", type: .application),
-                                      TestStandardTarget("targetC", type: .application)])
-            ]).load(getCore())
+                TestProject(
+                    "testProject",
+                    guid: "abcd",
+                    groupTree: TestGroup("root"),
+                    targets: []
+                ),
+                TestProject(
+                    "projectB",
+                    groupTree: TestGroup("whatever"),
+                    targets: [
+                        TestStandardTarget("targetB", type: .application),
+                        TestStandardTarget("targetC", type: .application),
+                    ]
+                ),
+            ]
+        ).load(getCore())
 
         let diff = workspace.diff(against: otherWorkspace)
 
@@ -188,26 +223,34 @@ import SWBCore
         let workspace = try await TestWorkspace(
             "testWorkspace",
             projects: [
-                TestProject("testProject",
-                            guid: "abcd",
-                            groupTree: TestGroup("root",
-                                                 guid: "G1234",
-                                                 children: [extraFile]),
-                            targets: [
-                                TestStandardTarget("testTarget", guid: "efgh", type: .application)
-                            ])
-            ]).load(getCore())
+                TestProject(
+                    "testProject",
+                    guid: "abcd",
+                    groupTree: TestGroup(
+                        "root",
+                        guid: "G1234",
+                        children: [extraFile]
+                    ),
+                    targets: [
+                        TestStandardTarget("testTarget", guid: "efgh", type: .application)
+                    ]
+                )
+            ]
+        ).load(getCore())
 
         let otherWorkspace = try await TestWorkspace(
             "testWorkspace",
             projects: [
-                TestProject("testProject",
-                            guid: "abcd",
-                            groupTree: TestGroup("root", guid: "G1234"),
-                            targets: [
-                                TestStandardTarget("testTarget", guid: "efgh", type: .application)
-                            ])
-            ]).load(getCore())
+                TestProject(
+                    "testProject",
+                    guid: "abcd",
+                    groupTree: TestGroup("root", guid: "G1234"),
+                    targets: [
+                        TestStandardTarget("testTarget", guid: "efgh", type: .application)
+                    ]
+                )
+            ]
+        ).load(getCore())
 
         let diff = workspace.diff(against: otherWorkspace)
 
@@ -229,26 +272,34 @@ import SWBCore
         let workspace = try await TestWorkspace(
             "testWorkspace",
             projects: [
-                TestProject("testProject",
-                            guid: "abcd",
-                            groupTree: TestGroup("root", guid: "G1234"),
-                            targets: [
-                                TestStandardTarget("testTarget", guid: "efgh", type: .application)
-                            ])
-            ]).load(getCore())
+                TestProject(
+                    "testProject",
+                    guid: "abcd",
+                    groupTree: TestGroup("root", guid: "G1234"),
+                    targets: [
+                        TestStandardTarget("testTarget", guid: "efgh", type: .application)
+                    ]
+                )
+            ]
+        ).load(getCore())
 
         let otherWorkspace = try await TestWorkspace(
             "testWorkspace",
             projects: [
-                TestProject("testProject",
-                            guid: "abcd",
-                            groupTree: TestGroup("root",
-                                                 guid: "G1234",
-                                                 children: [missingFile]),
-                            targets: [
-                                TestStandardTarget("testTarget", guid: "efgh", type: .application)
-                            ])
-            ]).load(getCore())
+                TestProject(
+                    "testProject",
+                    guid: "abcd",
+                    groupTree: TestGroup(
+                        "root",
+                        guid: "G1234",
+                        children: [missingFile]
+                    ),
+                    targets: [
+                        TestStandardTarget("testTarget", guid: "efgh", type: .application)
+                    ]
+                )
+            ]
+        ).load(getCore())
 
         let diff = workspace.diff(against: otherWorkspace)
 
diff --git a/Tests/SWBCoreTests/WorkspaceHeaderIndexTests.swift b/Tests/SWBCoreTests/WorkspaceHeaderIndexTests.swift
index 16176dfb..40f6d986 100644
--- a/Tests/SWBCoreTests/WorkspaceHeaderIndexTests.swift
+++ b/Tests/SWBCoreTests/WorkspaceHeaderIndexTests.swift
@@ -27,20 +27,27 @@ import SWBMacro
             projects: [
                 TestProject(
                     "aProject",
-                    groupTree: TestGroup("Sources", children: [
-                        TestFile("Foo.h"),
-                        TestFile("FooPublic.h"),
-                        TestFile("FooPrivate.h"),
-                        TestFile("Not-Header.cpp"),
-                        // Variant groups are not searched for headers.
-                        TestVariantGroup("Variant-Group", children: [
-                            TestFile("not-really-a-header.h")
-                        ])
-                    ]),
+                    groupTree: TestGroup(
+                        "Sources",
+                        children: [
+                            TestFile("Foo.h"),
+                            TestFile("FooPublic.h"),
+                            TestFile("FooPrivate.h"),
+                            TestFile("Not-Header.cpp"),
+                            // Variant groups are not searched for headers.
+                            TestVariantGroup(
+                                "Variant-Group",
+                                children: [
+                                    TestFile("not-really-a-header.h")
+                                ]
+                            ),
+                        ]
+                    ),
                     buildConfigurations: [TestBuildConfiguration("Debug")],
                     targets: [
                         TestStandardTarget(
-                            "Fwk1", type: .framework,
+                            "Fwk1",
+                            type: .framework,
                             buildPhases: [
                                 TestHeadersBuildPhase([
                                     TestBuildFile("FooPublic.h", headerVisibility: .public),
@@ -49,13 +56,18 @@ import SWBMacro
                                     "Not-Header.cpp",
                                     "Variant-Group",
                                 ])
-                            ]),
+                            ]
+                        ),
                         // A target w/o a headers phase should be ignored.
                         TestStandardTarget(
-                            "EmptyFwk", type: .framework,
-                            buildPhases: [])
-                    ])
-            ])
+                            "EmptyFwk",
+                            type: .framework,
+                            buildPhases: []
+                        ),
+                    ]
+                )
+            ]
+        )
         let workspace = try testWorkspace.load(core)
 
         let index = await WorkspaceHeaderIndex(core: core, workspace: workspace)
diff --git a/Tests/SWBCoreTests/XCFrameworkTests.swift b/Tests/SWBCoreTests/XCFrameworkTests.swift
index d90f4414..d9439c68 100644
--- a/Tests/SWBCoreTests/XCFrameworkTests.swift
+++ b/Tests/SWBCoreTests/XCFrameworkTests.swift
@@ -30,8 +30,7 @@ import SWBMacro
         do {
             let _ = try XCFramework(version: version, libraries: libraries)
             Issue.record("Expected a validation error.", sourceLocation: sourceLocation)
-        }
-        catch {
+        } catch {
             handler(error)
         }
     }
@@ -44,8 +43,7 @@ import SWBMacro
         do {
             let _ = try XCFramework(version: version, libraries: libraries)
             Issue.record("Expected a validation error.", sourceLocation: sourceLocation)
-        }
-        catch {
+        } catch {
             handler(error)
         }
     }
@@ -77,7 +75,7 @@ import SWBMacro
 
         do {
             let libraries: OrderedSet<XCFramework.Library> = [
-                XCFramework.Library(libraryIdentifier: "foo", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Foo.unsupported"), binaryPath: Path("Foo.unsupported"), headersPath: nil),
+                XCFramework.Library(libraryIdentifier: "foo", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Foo.unsupported"), binaryPath: Path("Foo.unsupported"), headersPath: nil)
             ]
 
             assertValidationError(libraries: libraries) { error in
@@ -170,7 +168,7 @@ import SWBMacro
 
         do {
             let libraries = [
-                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("foo.framework"), binaryPath: Path("foo.framework/Versions/A/foo"), headersPath: Path("Headers")),
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("foo.framework"), binaryPath: Path("foo.framework/Versions/A/foo"), headersPath: Path("Headers"))
             ]
 
             assertValidationError(libraries: libraries) { error in
@@ -185,7 +183,7 @@ import SWBMacro
 
         do {
             let libraries = [
-                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("libtest.a"), binaryPath: Path("libtest.a"), headersPath: Path("Headers"), mergeableMetadata: true),
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("libtest.a"), binaryPath: Path("libtest.a"), headersPath: Path("Headers"), mergeableMetadata: true)
             ]
 
             assertValidationError(libraries: libraries) { error in
@@ -199,7 +197,7 @@ import SWBMacro
 
         do {
             let libraries: OrderedSet<XCFramework.Library> = [
-                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos13.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("libtest.dylib"), binaryPath: nil, headersPath: Path("Headers"), mergeableMetadata: true),
+                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos13.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("libtest.dylib"), binaryPath: nil, headersPath: Path("Headers"), mergeableMetadata: true)
             ]
 
             assertValidationError(libraries: libraries) { error in
@@ -215,11 +213,9 @@ import SWBMacro
             let fs = PseudoFS()
             let _ = try XCFramework(path: Path.root.join("tmp/no.xcframework"), fs: fs)
             Issue.record("should have failed loading xcframework")
-        }
-        catch let XCFrameworkValidationError.missingXCFramework(path) {
+        } catch let XCFrameworkValidationError.missingXCFramework(path) {
             #expect(path.str == Path.root.join("tmp/no.xcframework").str)
-        }
-        catch {
+        } catch {
             Issue.record("unexpected error: \(error)")
         }
 
@@ -229,11 +225,9 @@ import SWBMacro
             try fs.createDirectory(xcframeworkPath, recursive: true)
             let _ = try XCFramework(path: xcframeworkPath, fs: fs)
             Issue.record("should have failed loading xcframework")
-        }
-        catch let XCFrameworkValidationError.missingInfoPlist(path) {
+        } catch let XCFrameworkValidationError.missingInfoPlist(path) {
             #expect(path.str == Path.root.join("tmp/foo.xcframework/Info.plist").str)
-        }
-        catch {
+        } catch {
             Issue.record("unexpected error: \(error)")
         }
     }
@@ -268,20 +262,15 @@ import SWBMacro
             let _ = try XCFramework(other: try PropertyList.decode(XCFrameworkInfoPlist_V1.self, from: plist))
 
             Issue.record("expected XCFrameworkError.parsing", sourceLocation: sourceLocation)
-        }
-        catch DecodingError.dataCorrupted(let context) {
+        } catch DecodingError.dataCorrupted(let context) {
             #expect(context.debugDescription == expected)
-        }
-        catch DecodingError.valueNotFound(_, let context) {
+        } catch DecodingError.valueNotFound(_, let context) {
             #expect(context.debugDescription == expected)
-        }
-        catch DecodingError.keyNotFound(_, let context) {
+        } catch DecodingError.keyNotFound(_, let context) {
             #expect(context.debugDescription == expected)
-        }
-        catch DecodingError.typeMismatch(_, let context) {
+        } catch DecodingError.typeMismatch(_, let context) {
             #expect(context.debugDescription == expected)
-        }
-        catch {
+        } catch {
             Issue.record("unexpected error throw: \(error)", sourceLocation: sourceLocation)
         }
     }
@@ -291,11 +280,9 @@ import SWBMacro
             let _ = try XCFramework(other: try PropertyList.decode(XCFrameworkInfoPlist_V1.self, from: plist))
 
             Issue.record("expected XCFrameworkError.parsing", sourceLocation: sourceLocation)
-        }
-        catch let validationError as XCFrameworkValidationError {
+        } catch let validationError as XCFrameworkValidationError {
             #expect(validationError == expected)
-        }
-        catch {
+        } catch {
             Issue.record("unexpected error throw: \(error)", sourceLocation: sourceLocation)
         }
     }
@@ -313,7 +300,7 @@ import SWBMacro
                     "BinaryPath": .plString("XCSample.dylib"),
                     "HeadersPath": .plString("Headers"),
                     "DebugSymbolsPath": .plString("dSYMs"),
-                    "SupportedPlatformVariant": .plString("maccatalyst")
+                    "SupportedPlatformVariant": .plString("maccatalyst"),
                 ]),
                 .plDict([
                     "LibraryIdentifier": .plString("arm64-apple-iphoneos13.0"),
@@ -331,7 +318,7 @@ import SWBMacro
                     // Missing BinaryPath to exercise this case
                     "HeadersPath": .plString("Headers"),
                 ]),
-            ])
+            ]),
         ])
 
         let xcframework: XCFramework
@@ -380,7 +367,7 @@ import SWBMacro
         do {
             let plist: PropertyListItem = .plDict([
                 "XCFrameworkFormatVersion": .plString("15.0"),
-                "AvailableLibraries": .plDict([:])
+                "AvailableLibraries": .plDict([:]),
             ])
             assertParsingError(plist: plist, message: "Expected to decode Array<Any> but found a dictionary instead.")
         }
@@ -388,7 +375,7 @@ import SWBMacro
         do {
             let plist: PropertyListItem = .plDict([
                 "XCFrameworkFormatVersionXXX": .plString("15.0"),
-                "AvailableLibraries": .plArray([])
+                "AvailableLibraries": .plArray([]),
             ])
 
             assertParsingError(plist: plist, message: "No value associated with key CodingKeys(stringValue: \"XCFrameworkFormatVersion\", intValue: nil) (\"XCFrameworkFormatVersion\").")
@@ -397,7 +384,7 @@ import SWBMacro
         do {
             let plist: PropertyListItem = .plDict([
                 "XCFrameworkFormatVersion": .plString("edf3djf"),
-                "AvailableLibraries": .plArray([])
+                "AvailableLibraries": .plArray([]),
             ])
 
             assertValidationError(plist: plist, error: XCFrameworkValidationError.unsupportedVersion(version: "edf3djf"))
@@ -408,8 +395,8 @@ import SWBMacro
                 "XCFrameworkFormatVersion": .plString("1.0"),
                 "AvailableLibraries": .plArray([
                     .plString("LibraryIdentifier"),
-                    .plInt(12)
-                ])
+                    .plInt(12),
+                ]),
             ])
 
             // FIXME: This check should really be expressed in terms of "Swift < 6.0" or something
@@ -427,7 +414,7 @@ import SWBMacro
                     .plDict([
                         "LibraryIdentifierXXX": .plString("")
                     ])
-                ])
+                ]),
             ])
 
             assertParsingError(plist: plist, message: "No value associated with key CodingKeys(stringValue: \"LibraryIdentifier\", intValue: nil) (\"LibraryIdentifier\").")
@@ -440,7 +427,7 @@ import SWBMacro
                     .plDict([
                         "LibraryIdentifier": .plString("")
                     ])
-                ])
+                ]),
             ])
 
             assertParsingError(plist: plist, message: "No value associated with key CodingKeys(stringValue: \"SupportedPlatform\", intValue: nil) (\"SupportedPlatform\").")
@@ -452,9 +439,9 @@ import SWBMacro
                 "AvailableLibraries": .plArray([
                     .plDict([
                         "LibraryIdentifier": .plString("x86_64-apple-macos10.15"),
-                        "SupportedPlatform": .plArray([])
+                        "SupportedPlatform": .plArray([]),
                     ])
-                ])
+                ]),
             ])
 
             assertParsingError(plist: plist, message: "Expected to decode String but found an array instead.")
@@ -467,9 +454,9 @@ import SWBMacro
                     .plDict([
                         "LibraryIdentifier": .plString("x86_64-apple-macos10.15"),
                         "SupportedPlatform": .plString("macosx"),
-                        "SupportedArchitectures": .plString("")
+                        "SupportedArchitectures": .plString(""),
                     ])
-                ])
+                ]),
             ])
 
             // FIXME: This check should really be expressed in terms of "Swift < 6.0" or something
@@ -487,9 +474,9 @@ import SWBMacro
                     .plDict([
                         "LibraryIdentifier": .plString("x86_64-apple-macos10.15"),
                         "SupportedPlatform": .plString("macosx"),
-                        "SupportedArchitectures": .plArray([.plDict([:])])
+                        "SupportedArchitectures": .plArray([.plDict([:])]),
                     ])
-                ])
+                ]),
             ])
 
             assertParsingError(plist: plist, message: "Expected to decode String but found a dictionary instead.")
@@ -502,9 +489,9 @@ import SWBMacro
                     .plDict([
                         "LibraryIdentifier": .plString("x86_64-apple-macos10.15"),
                         "SupportedPlatform": .plString("macosx"),
-                        "SupportedArchitectures": .plArray([.plString("x86_64")])
+                        "SupportedArchitectures": .plArray([.plString("x86_64")]),
                     ])
-                ])
+                ]),
             ])
 
             assertParsingError(plist: plist, message: "No value associated with key CodingKeys(stringValue: \"LibraryPath\", intValue: nil) (\"LibraryPath\").")
@@ -519,9 +506,9 @@ import SWBMacro
                         "SupportedPlatform": .plString("macosx"),
                         "SupportedArchitectures": .plArray([.plString("x86_64")]),
                         "LibraryPath": .plString("libtest.a"),
-                        "HeadersPath": .plArray([])
+                        "HeadersPath": .plArray([]),
                     ])
-                ])
+                ]),
             ])
 
             assertParsingError(plist: plist, message: "Expected to decode String but found an array instead.")
@@ -537,9 +524,9 @@ import SWBMacro
                         "SupportedArchitectures": .plArray([.plString("x86_64")]),
                         "LibraryPath": .plString("libtest.a"),
                         "HeadersPath": .plString("Headers"),
-                        "DebugSymbolsPath": .plArray([])
+                        "DebugSymbolsPath": .plArray([]),
                     ])
-                ])
+                ]),
             ])
 
             assertParsingError(plist: plist, message: "Expected to decode String but found an array instead.")
@@ -556,9 +543,9 @@ import SWBMacro
                         "LibraryPath": .plString("libtest.a"),
                         "HeadersPath": .plString("Headers"),
                         "DebugSymbolsPath": .plString("dSYMs"),
-                        "SupportedPlatformVariant": .plArray([])
+                        "SupportedPlatformVariant": .plArray([]),
                     ])
-                ])
+                ]),
             ])
 
             assertParsingError(plist: plist, message: "Expected to decode String but found an array instead.")
@@ -578,7 +565,7 @@ import SWBMacro
                     "BinaryPath": .plString("XCSample.dylib"),
                     "HeadersPath": .plString("Headers"),
                     "DebugSymbolsPath": .plString("dSYMs"),
-                    "SupportedPlatformVariant": .plString("maccatalyst")
+                    "SupportedPlatformVariant": .plString("maccatalyst"),
                 ]),
                 .plDict([
                     "LibraryIdentifier": .plString("arm64-apple-iphoneos13.0"),
@@ -586,9 +573,9 @@ import SWBMacro
                     "SupportedArchitectures": .plArray([.plString("arm64"), .plString("arm64e")]),
                     "LibraryPath": .plString("XCSample.dylib"),
                     // BinaryPath missing to test this case
-                    "HeadersPath": .plString("Headers")
+                    "HeadersPath": .plString("Headers"),
                 ]),
-            ])
+            ]),
         ])
 
         func validate(_ xcframework: XCFramework) throws {
@@ -673,7 +660,7 @@ import SWBMacro
                     "LibraryPath": .plString("XCSample.dylib"),
                     "BinaryPath": .plString("XCSample.dylib"),
                     "HeadersPath": .plString("Headers"),
-                    "SupportedPlatformVariant": .plString("macabi")
+                    "SupportedPlatformVariant": .plString("macabi"),
                 ]),
                 .plDict([
                     "LibraryIdentifier": .plString("x86_64-apple-macos10.15-another"),
@@ -682,7 +669,7 @@ import SWBMacro
                     "LibraryPath": .plString("XCSample.dylib"),
                     "BinaryPath": .plString("XCSample.dylib"),
                     "HeadersPath": .plString("Headers"),
-                    "SupportedPlatformVariant": .plString("maccatalyst")
+                    "SupportedPlatformVariant": .plString("maccatalyst"),
                 ]),
                 .plDict([
                     "LibraryIdentifier": .plString("x86_64-apple-macos10.15-nobinarypath"),
@@ -691,9 +678,9 @@ import SWBMacro
                     "LibraryPath": .plString("XCSample.dylib"),
                     // No BinaryPath
                     "HeadersPath": .plString("Headers"),
-                    "SupportedPlatformVariant": .plString("maccatalyst")
+                    "SupportedPlatformVariant": .plString("maccatalyst"),
                 ]),
-            ])
+            ]),
         ])
 
         let xcframework: XCFramework
@@ -780,7 +767,6 @@ fileprivate extension Result where Success == XCFramework.Library, Failure == XC
     }
 }
 
-
 @Suite fileprivate struct XCFrameworkCreationParsingErrorsTests {
 
     @Test
@@ -991,8 +977,7 @@ fileprivate struct XCFrameworkCreationCommandTests: CoreBasedTests {
             #expect(library.headersPath == nil)
             if withDebugSymbols {
                 #expect(library.debugSymbolsPath?.str == "dSYMs")
-            }
-            else {
+            } else {
                 #expect(library.debugSymbolsPath == nil)
             }
             #expect(library.libraryType == .framework)
@@ -1154,7 +1139,7 @@ fileprivate struct XCFrameworkCreationCommandTests: CoreBasedTests {
 
     @Test
     func iOSFrameworkWithDebugSymbols_nonswift() async throws {
-        try await _testiOSFramework(useSwift: false,  withDebugSymbols: true)
+        try await _testiOSFramework(useSwift: false, withDebugSymbols: true)
     }
 
     func _testiOSFramework(useSwift: Bool, withDebugSymbols: Bool = true) async throws {
@@ -1165,10 +1150,9 @@ fileprivate struct XCFrameworkCreationCommandTests: CoreBasedTests {
             let debugSymbolPaths: [Path]
             if withDebugSymbols {
                 debugSymbolPaths = [
-                    tmpDir.join(path.basenameWithoutSuffix + ".framework.dSYM"),
+                    tmpDir.join(path.basenameWithoutSuffix + ".framework.dSYM")
                 ]
-            }
-            else {
+            } else {
                 debugSymbolPaths = []
             }
 
@@ -1187,8 +1171,7 @@ fileprivate struct XCFrameworkCreationCommandTests: CoreBasedTests {
             #expect(library.headersPath == nil)
             if withDebugSymbols {
                 #expect(library.debugSymbolsPath?.str == "dSYMs")
-            }
-            else {
+            } else {
                 #expect(library.debugSymbolsPath == nil)
             }
             #expect(library.libraryType == .framework)
@@ -1429,8 +1412,7 @@ fileprivate struct XCFrameworkCreationCommandTests: CoreBasedTests {
             #expect(localFS.exists(outputPath.join(macos.libraryIdentifier).join(macos.libraryPath)))
             if let debugSymbolsPath = macos.debugSymbolsPath {
                 #expect(localFS.exists(outputPath.join(macos.libraryIdentifier).join(debugSymbolsPath).join(macos.libraryPath.str + ".dSYM")))
-            }
-            else {
+            } else {
                 Issue.record("Missing the debug symbols path")
             }
 
@@ -1442,8 +1424,7 @@ fileprivate struct XCFrameworkCreationCommandTests: CoreBasedTests {
             #expect(localFS.exists(outputPath.join(driverkit.libraryIdentifier).join(driverkit.libraryPath)))
             if let debugSymbolsPath = driverkit.debugSymbolsPath {
                 #expect(localFS.exists(outputPath.join(driverkit.libraryIdentifier).join(debugSymbolsPath).join(driverkit.libraryPath.str + ".dSYM")))
-            }
-            else {
+            } else {
                 Issue.record("Missing the debug symbols path")
             }
 
@@ -1456,8 +1437,7 @@ fileprivate struct XCFrameworkCreationCommandTests: CoreBasedTests {
 
             if allowInternalDistribution {
                 #expect(!swiftModuleFilesFound.isEmpty, "The swiftmodule files should not have been removed.")
-            }
-            else {
+            } else {
                 #expect(swiftModuleFilesFound.isEmpty, "The swiftmodule files should have been removed: \(swiftModuleFilesFound)")
             }
         }
@@ -1488,7 +1468,6 @@ fileprivate struct XCFrameworkCreationCommandTests: CoreBasedTests {
 
             let outputPath = tmpDir.join("sample.xcframework")
 
-
             // Create a fake dSYM file as we don't actually need a real one for testing this. However, only do this for some of the platforms to ensure that mixing works properly.
             func createFakeDebugFile(at root: Path, bundle: Bool = false, basename: String? = nil, fileExtension: String = "dSYM") throws -> Path {
                 let dsymRootPath = root.dirname.join("dSYMs")
@@ -1502,8 +1481,7 @@ fileprivate struct XCFrameworkCreationCommandTests: CoreBasedTests {
                     try localFS.createDirectory(dsymPath, recursive: true)
                     try localFS.write(dsymPath.join("part1.\(fileExtension)"), contents: ByteString("mock debug symbols file"))
                     try localFS.write(dsymPath.join("part2.\(fileExtension)"), contents: ByteString("another mock debug symbols file"))
-                }
-                else {
+                } else {
                     try localFS.write(dsymPath, contents: ByteString("mock debug symbols file"))
                 }
 
@@ -1600,8 +1578,7 @@ fileprivate struct XCFrameworkCreationCommandTests: CoreBasedTests {
                 #expect(localFS.exists(iphonesimulatorSwiftModuleDir.join("x86_64.swiftmodule")) == allowInternalDistribution)
                 #expect(localFS.exists(iphonesimulatorSwiftModuleDir.join("sample.swiftinterface")))
                 #expect(localFS.exists(iphonesimulatorSwiftModuleDir.join("x86_64.swiftdoc")))
-            }
-            else {
+            } else {
                 #expect(localFS.exists(outputPath.join(macos.libraryIdentifier).join(macos.headersPath!).join("source.h")))
                 #expect(localFS.exists(outputPath.join(iphoneos.libraryIdentifier).join(iphoneos.headersPath!).join("source.h")))
                 #expect(localFS.exists(outputPath.join(iphonesimulator.libraryIdentifier).join(iphonesimulator.headersPath!).join("source.h")))
@@ -1641,61 +1618,69 @@ fileprivate struct XCFrameworkCreationCommandTests: CoreBasedTests {
         // explicitly missing dSYM
         try fs.createDirectory(Path("/var/tmp/bye.xcarchive/BCSymbolMaps"), recursive: true)
 
-        try testCommandLineRewrite([
-            "-create-xcframework",
-            "-framework", "hi.framework",
-            "-framework", "bye.framework",
-            "-output", "/var/tmp/my.xcframework",
-        ],
-                                   expected: [
-                                    "-create-xcframework",
-                                    "-framework", "hi.framework",
-                                    "-framework", "bye.framework",
-                                    "-output", "/var/tmp/my.xcframework",
-                                   ])
-
-        try testCommandLineRewrite([
-            "-create-xcframework",
-            "-archive", "/var/tmp/hi.xcarchive", "-framework", "hi.framework",
-            "-archive", "/var/tmp/bye.xcarchive", "-framework", "bye.framework",
-            "-output", "/var/tmp/my.xcframework",
-        ],
-                                   expected: [
-                                    "-create-xcframework",
-                                    "-framework", "/var/tmp/hi.xcarchive/Products/Library/Frameworks/hi.framework", "-debug-symbols", "/var/tmp/hi.xcarchive/dSYMs/hi.framework.dSYM",
-                                    "-framework", "/var/tmp/bye.xcarchive/Products/Library/Frameworks/bye.framework", "-debug-symbols", "/var/tmp/bye.xcarchive/dSYMs/bye.framework.dSYM",
-                                    "-output", "/var/tmp/my.xcframework",
-                                   ])
-
-        try testCommandLineRewrite([
-            "-create-xcframework",
-            "-archive", "/var/tmp/hi.xcarchive", "-library", "libhi.a",
-            "-archive", "/var/tmp/hi.xcarchive", "-library", "hi.dylib",
-            "-archive", "/var/tmp/bye.xcarchive", "-library", "libbye.a",
-            "-output", "/var/tmp/my.xcframework",
-        ],
-                                   expected: [
-                                    "-create-xcframework",
-                                    "-library", "/var/tmp/hi.xcarchive/Products/usr/local/lib/libhi.a", "-headers", "/var/tmp/hi.xcarchive/Products/usr/local/include", "-debug-symbols", "/var/tmp/hi.xcarchive/dSYMs/libhi.a.dSYM",
-                                    "-library", "/var/tmp/hi.xcarchive/Products/usr/local/lib/hi.dylib", "-headers", "/var/tmp/hi.xcarchive/Products/usr/local/include",
-                                    "-library", "/var/tmp/bye.xcarchive/Products/usr/local/lib/libbye.a",
-                                    "-output", "/var/tmp/my.xcframework",
-                                   ])
-
-        try testCommandLineRewrite([
-            "-create-xcframework",
-            "-archive", "/var/tmp/hi.xcarchive", "-library", "libhi.a",
-            /* skip -archive and inherit it */ "-library", "hi.dylib",
-            "-archive", "/var/tmp/bye.xcarchive", "-library", "libbye.a",
-            "-output", "/var/tmp/my.xcframework",
-        ],
-                                   expected: [
-                                    "-create-xcframework",
-                                    "-library", "/var/tmp/hi.xcarchive/Products/usr/local/lib/libhi.a", "-headers", "/var/tmp/hi.xcarchive/Products/usr/local/include", "-debug-symbols", "/var/tmp/hi.xcarchive/dSYMs/libhi.a.dSYM",
-                                    "-library", "/var/tmp/hi.xcarchive/Products/usr/local/lib/hi.dylib", "-headers", "/var/tmp/hi.xcarchive/Products/usr/local/include",
-                                    "-library", "/var/tmp/bye.xcarchive/Products/usr/local/lib/libbye.a",
-                                    "-output", "/var/tmp/my.xcframework",
-                                   ])
+        try testCommandLineRewrite(
+            [
+                "-create-xcframework",
+                "-framework", "hi.framework",
+                "-framework", "bye.framework",
+                "-output", "/var/tmp/my.xcframework",
+            ],
+            expected: [
+                "-create-xcframework",
+                "-framework", "hi.framework",
+                "-framework", "bye.framework",
+                "-output", "/var/tmp/my.xcframework",
+            ]
+        )
+
+        try testCommandLineRewrite(
+            [
+                "-create-xcframework",
+                "-archive", "/var/tmp/hi.xcarchive", "-framework", "hi.framework",
+                "-archive", "/var/tmp/bye.xcarchive", "-framework", "bye.framework",
+                "-output", "/var/tmp/my.xcframework",
+            ],
+            expected: [
+                "-create-xcframework",
+                "-framework", "/var/tmp/hi.xcarchive/Products/Library/Frameworks/hi.framework", "-debug-symbols", "/var/tmp/hi.xcarchive/dSYMs/hi.framework.dSYM",
+                "-framework", "/var/tmp/bye.xcarchive/Products/Library/Frameworks/bye.framework", "-debug-symbols", "/var/tmp/bye.xcarchive/dSYMs/bye.framework.dSYM",
+                "-output", "/var/tmp/my.xcframework",
+            ]
+        )
+
+        try testCommandLineRewrite(
+            [
+                "-create-xcframework",
+                "-archive", "/var/tmp/hi.xcarchive", "-library", "libhi.a",
+                "-archive", "/var/tmp/hi.xcarchive", "-library", "hi.dylib",
+                "-archive", "/var/tmp/bye.xcarchive", "-library", "libbye.a",
+                "-output", "/var/tmp/my.xcframework",
+            ],
+            expected: [
+                "-create-xcframework",
+                "-library", "/var/tmp/hi.xcarchive/Products/usr/local/lib/libhi.a", "-headers", "/var/tmp/hi.xcarchive/Products/usr/local/include", "-debug-symbols", "/var/tmp/hi.xcarchive/dSYMs/libhi.a.dSYM",
+                "-library", "/var/tmp/hi.xcarchive/Products/usr/local/lib/hi.dylib", "-headers", "/var/tmp/hi.xcarchive/Products/usr/local/include",
+                "-library", "/var/tmp/bye.xcarchive/Products/usr/local/lib/libbye.a",
+                "-output", "/var/tmp/my.xcframework",
+            ]
+        )
+
+        try testCommandLineRewrite(
+            [
+                "-create-xcframework",
+                "-archive", "/var/tmp/hi.xcarchive", "-library", "libhi.a",
+                /* skip -archive and inherit it */ "-library", "hi.dylib",
+                "-archive", "/var/tmp/bye.xcarchive", "-library", "libbye.a",
+                "-output", "/var/tmp/my.xcframework",
+            ],
+            expected: [
+                "-create-xcframework",
+                "-library", "/var/tmp/hi.xcarchive/Products/usr/local/lib/libhi.a", "-headers", "/var/tmp/hi.xcarchive/Products/usr/local/include", "-debug-symbols", "/var/tmp/hi.xcarchive/dSYMs/libhi.a.dSYM",
+                "-library", "/var/tmp/hi.xcarchive/Products/usr/local/lib/hi.dylib", "-headers", "/var/tmp/hi.xcarchive/Products/usr/local/include",
+                "-library", "/var/tmp/bye.xcarchive/Products/usr/local/lib/libbye.a",
+                "-output", "/var/tmp/my.xcframework",
+            ]
+        )
 
         // This will create an invalid command-line, but the only test consideration here is that the rewriting happens appropriately.
         let expectedCommandLine = [
@@ -1704,12 +1689,14 @@ fileprivate struct XCFrameworkCreationCommandTests: CoreBasedTests {
             "-library", "/var/tmp/hi.xcarchive/Products/usr/local/lib/-allow-internal-distribution", "-headers", "/var/tmp/hi.xcarchive/Products/usr/local/include",
             "-output", "/var/tmp/my.xcframework",
         ]
-        try testCommandLineRewrite([
-            "-create-xcframework",
-            "-archive", "/var/tmp/hi.xcarchive", "-framework", "hi.framework", "-library", "-allow-internal-distribution",
-            "-output", "/var/tmp/my.xcframework",
-        ],
-                                   expected: expectedCommandLine)
+        try testCommandLineRewrite(
+            [
+                "-create-xcframework",
+                "-archive", "/var/tmp/hi.xcarchive", "-framework", "hi.framework", "-library", "-allow-internal-distribution",
+                "-output", "/var/tmp/my.xcframework",
+            ],
+            expected: expectedCommandLine
+        )
 
         let result = XCFramework.parseCommandLine(args: expectedCommandLine, currentWorkingDirectory: cwd, fs: fs)
         #expect(result.error?.message == "error: an xcframework cannot contain both frameworks and libraries.")
@@ -1805,10 +1792,8 @@ fileprivate struct XCFrameworkCreationCommandTests: CoreBasedTests {
         }
     }
 
-
     // MARK: Creating XCFrameworks with mergeable libraries
 
-
     /// Creates several frameworks, some of which contain mergeable libraries, and creates an XCFramework from them.  Then checks that the correct metadata for each library was added to the Info.plist.
     @Test
     func createXCFrameworkWithMergeableLibraries() async throws {
@@ -1881,10 +1866,8 @@ fileprivate struct XCFrameworkCreationCommandTests: CoreBasedTests {
         }
     }
 
-
     // MARK: Testing friendly error messages
 
-
     @Test
     func friendlyErrorMessageForFrameworkNotExisting() async throws {
         let infoLookup = try await getCore()
@@ -1928,4 +1911,3 @@ fileprivate struct XCFrameworkCreationCommandTests: CoreBasedTests {
         }
     }
 }
-
diff --git a/Tests/SWBGenericUnixPlatformTests/SWBGenericUnixPlatformTests.swift b/Tests/SWBGenericUnixPlatformTests/SWBGenericUnixPlatformTests.swift
index 87e97a6e..a4a3d1c7 100644
--- a/Tests/SWBGenericUnixPlatformTests/SWBGenericUnixPlatformTests.swift
+++ b/Tests/SWBGenericUnixPlatformTests/SWBGenericUnixPlatformTests.swift
@@ -59,15 +59,19 @@ fileprivate struct GenerixUnixBuildOperationTests: CoreBasedTests {
                         TestFile("main.c"),
                         TestFile("dynamic.c"),
                         TestFile("static.c"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "CODE_SIGNING_ALLOWED": "NO",
-                        "DEFINES_MODULE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "\(operatingSystem.xcodePlatformName)",
-                        "SUPPORTED_PLATFORMS": "\(operatingSystem.xcodePlatformName)",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "DEFINES_MODULE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "\(operatingSystem.xcodePlatformName)",
+                            "SUPPORTED_PLATFORMS": "\(operatingSystem.xcodePlatformName)",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -81,7 +85,7 @@ fileprivate struct GenerixUnixBuildOperationTests: CoreBasedTests {
                             TestFrameworksBuildPhase([
                                 TestBuildFile(.target("dynamiclib")),
                                 TestBuildFile(.target("staticlib")),
-                            ])
+                            ]),
                         ],
                         dependencies: [
                             "dynamiclib",
@@ -92,15 +96,18 @@ fileprivate struct GenerixUnixBuildOperationTests: CoreBasedTests {
                         "dynamiclib",
                         type: .dynamicLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "DYLIB_INSTALL_NAME_BASE": "$ORIGIN",
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "DYLIB_INSTALL_NAME_BASE": "$ORIGIN",
 
-                                // FIXME: Find a way to make these default
-                                "EXECUTABLE_PREFIX": "lib",
-                            ])
+                                    // FIXME: Find a way to make these default
+                                    "EXECUTABLE_PREFIX": "lib",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["dynamic.c"]),
+                            TestSourcesBuildPhase(["dynamic.c"])
                         ],
                         productReferenceName: "libdynamiclib.so"
                     ),
@@ -108,16 +115,20 @@ fileprivate struct GenerixUnixBuildOperationTests: CoreBasedTests {
                         "staticlib",
                         type: .staticLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                // FIXME: Find a way to make these default
-                                "EXECUTABLE_PREFIX": "lib",
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    // FIXME: Find a way to make these default
+                                    "EXECUTABLE_PREFIX": "lib"
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["static.c"]),
+                            TestSourcesBuildPhase(["static.c"])
                         ]
                     ),
-                ])
+                ]
+            )
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
             let projectDir = tester.workspace.projects[0].sourceRoot
diff --git a/Tests/SWBLLBuildTests/LLBuildTests.swift b/Tests/SWBLLBuildTests/LLBuildTests.swift
index 6f50c9d7..610b213d 100644
--- a/Tests/SWBLLBuildTests/LLBuildTests.swift
+++ b/Tests/SWBLLBuildTests/LLBuildTests.swift
@@ -201,7 +201,8 @@ fileprivate class LoggingDelegate: BuildSystemDelegate {
         // Build the default target.
         #expect(buildSystem.build())
 
-        #expect(delegate.log == [
+        #expect(
+            delegate.log == [
                 "determined-rule-needs-to-run: <BuildKey.Target name=>",
                 "determined-rule-needs-to-run: <BuildKey.Node path=<all>>",
                 "command-status-changed: <all>, to: isScanning",
@@ -211,7 +212,8 @@ fileprivate class LoggingDelegate: BuildSystemDelegate {
                 "command-started: <all>",
                 "command-finished: <all>",
                 "command-status-changed: <all>, to: isComplete",
-            ])
+            ]
+        )
 
         // Ensure coverage of a couple random things we can't test directly.
         #expect(Diagnostic.Kind.note.description == "note")
@@ -243,9 +245,12 @@ fileprivate class LoggingDelegate: BuildSystemDelegate {
             // Build the default target.
             #expect(!buildSystem.build())
 
-            #expect(delegate.log == [
-                "error: unable to configure client",
-                "error: unable to load build file"])
+            #expect(
+                delegate.log == [
+                    "error: unable to configure client",
+                    "error: unable to load build file",
+                ]
+            )
         }
 
         // Check reading a non-existing path.
@@ -257,9 +262,12 @@ fileprivate class LoggingDelegate: BuildSystemDelegate {
             // Build the default target.
             #expect(!buildSystem.build())
 
-            #expect(delegate.log == [
-                "error: unable to open '\(bogusPath.str)'",
-                "error: unable to load build file"])
+            #expect(
+                delegate.log == [
+                    "error: unable to open '\(bogusPath.str)'",
+                    "error: unable to load build file",
+                ]
+            )
         }
     }
 
@@ -301,10 +309,16 @@ fileprivate class LoggingDelegate: BuildSystemDelegate {
             // Build the default target.
             #expect(!buildSystem.build())
 
-            #expect(delegate.log.filter({ $0.hasPrefix("command-process-started") }) == [
-                "command-process-started: �� -- ��"])
-            #expect(delegate.errors == [
-                "commandCannotBuildOutputDueToMissingInputs: <all> <all> [\"relative-path\"]"])
+            #expect(
+                delegate.log.filter({ $0.hasPrefix("command-process-started") }) == [
+                    "command-process-started: �� -- ��"
+                ]
+            )
+            #expect(
+                delegate.errors == [
+                    "commandCannotBuildOutputDueToMissingInputs: <all> <all> [\"relative-path\"]"
+                ]
+            )
         }
     }
 
@@ -342,14 +356,19 @@ fileprivate class LoggingDelegate: BuildSystemDelegate {
 
         do {
             let delegate = LoggingDelegate(fs: fs)
-            let buildSystem = BuildSystem(buildFile: manifestPath, delegate: delegate, environment: [
-                    "ENV_KEY": "ENV_VALUE"])
+            let buildSystem = BuildSystem(
+                buildFile: manifestPath,
+                delegate: delegate,
+                environment: [
+                    "ENV_KEY": "ENV_VALUE"
+                ]
+            )
 
             // Build the default target.
             #expect(buildSystem.build())
 
             // We expect a single output event, with the total environment.
-            let outputEvents = delegate.log.filter{ $0.hasPrefix("command-process-output") }
+            let outputEvents = delegate.log.filter { $0.hasPrefix("command-process-output") }
             #expect(outputEvents.count > 0)
             XCTAssertMatch(outputEvents, [.and(.contains("command-process-output: <all>:"), .contains("ENV_KEY=ENV_VALUE\(literalNewline)"))])
         }
@@ -456,7 +475,7 @@ fileprivate class LoggingDelegate: BuildSystemDelegate {
         #expect(gen.next() == "command-process-finished: \(Path.root.join("fail.txt").str)")
         #expect(gen.next() == "command-finished: \(Path.root.join("fail.txt").str)")
         #expect(gen.next() == "had-command-failure")
-        #expect(gen.map({$0}) == [])
+        #expect(gen.map({ $0 }) == [])
     }
 
     @Test(.requireProcessSpawning) func fileSystemHandling() throws {
@@ -499,9 +518,13 @@ fileprivate class LoggingDelegate: BuildSystemDelegate {
             #expect(!buildSystem.build())
 
             // Verify the input shows as missing.
-            #expect([] != delegate.log.filter({
-                $0 == "commandCannotBuildOutputDueToMissingInputs: <all> <all> [\"\(Path.root.join("input.txt").str.escapedForJSON)\"]"
-                    }), "missing expected error in log: \(delegate.log)")
+            #expect(
+                []
+                    != delegate.log.filter({
+                        $0 == "commandCannotBuildOutputDueToMissingInputs: <all> <all> [\"\(Path.root.join("input.txt").str.escapedForJSON)\"]"
+                    }),
+                "missing expected error in log: \(delegate.log)"
+            )
         }
 
         // Now write the file, and rebuild.
@@ -643,16 +666,18 @@ fileprivate class LoggingDelegate: BuildSystemDelegate {
         // Build the default target.
         #expect(buildSystem.build())
 
-        #expect(delegate.log == [
-            "determined-rule-needs-to-run: <BuildKey.Target name=>",
-            "determined-rule-needs-to-run: <BuildKey.Node path=<all>>",
-            "command-status-changed: <all>, to: isScanning",
-            "determined-rule-needs-to-run: <BuildKey.Command name=<all>>",
-            "command-preparing: <all>",
-            "should-command-start: <all>",
-            "command-finished: <all>",
-            "command-status-changed: <all>, to: isComplete",
-            ])
+        #expect(
+            delegate.log == [
+                "determined-rule-needs-to-run: <BuildKey.Target name=>",
+                "determined-rule-needs-to-run: <BuildKey.Node path=<all>>",
+                "command-status-changed: <all>, to: isScanning",
+                "determined-rule-needs-to-run: <BuildKey.Command name=<all>>",
+                "command-preparing: <all>",
+                "should-command-start: <all>",
+                "command-finished: <all>",
+                "command-status-changed: <all>, to: isComplete",
+            ]
+        )
     }
 
     @Test(.requireLLBuild(apiVersion: 15)) func cycle() throws {
@@ -697,18 +722,20 @@ fileprivate class LoggingDelegate: BuildSystemDelegate {
         // Build the default target.
         #expect(!buildSystem.build())
 
-        #expect(delegate.log == [
-            "determined-rule-needs-to-run: <BuildKey.Target name=>",
-            "determined-rule-needs-to-run: <BuildKey.Node path=<all>>",
-            "command-status-changed: <all>, to: isScanning",
-            "determined-rule-needs-to-run: <BuildKey.Command name=<all>>",
-            "command-preparing: <all>",
-            "determined-rule-needs-to-run: <BuildKey.Node path=foo>",
-            "command-status-changed: foo, to: isScanning",
-            "determined-rule-needs-to-run: <BuildKey.Command name=foo>",
-            "command-preparing: foo",
-            "cycle-detected: [\"\", \"<all>\", \"<all>\", \"foo\", \"foo\", \"<all>\"]",
-            ])
+        #expect(
+            delegate.log == [
+                "determined-rule-needs-to-run: <BuildKey.Target name=>",
+                "determined-rule-needs-to-run: <BuildKey.Node path=<all>>",
+                "command-status-changed: <all>, to: isScanning",
+                "determined-rule-needs-to-run: <BuildKey.Command name=<all>>",
+                "command-preparing: <all>",
+                "determined-rule-needs-to-run: <BuildKey.Node path=foo>",
+                "command-status-changed: foo, to: isScanning",
+                "determined-rule-needs-to-run: <BuildKey.Command name=foo>",
+                "command-preparing: foo",
+                "cycle-detected: [\"\", \"<all>\", \"<all>\", \"foo\", \"foo\", \"<all>\"]",
+            ]
+        )
     }
 }
 
diff --git a/Tests/SWBMacroTests/MacroBasicTests.swift b/Tests/SWBMacroTests/MacroBasicTests.swift
index bc4c3ea0..95e2c6b0 100644
--- a/Tests/SWBMacroTests/MacroBasicTests.swift
+++ b/Tests/SWBMacroTests/MacroBasicTests.swift
@@ -38,7 +38,6 @@ import SWBMacro
         #expect(didCatchExpectedException)
     }
 
-
     @Test
     func macroExpressionCreation() throws {
         let namespace = MacroNamespace(debugDescription: "test")
@@ -83,7 +82,6 @@ import SWBMacro
         #expect(expr3.stringRep == str3)
     }
 
-
     @Test
     func macroExpressionEquality() {
         let namespace = MacroNamespace(debugDescription: "test")
@@ -99,7 +97,6 @@ import SWBMacro
         #expect(expr2 != expr3)
     }
 
-
     @Test
     func macroNamespaceInheritance() throws {
         let lowerNamespace = MacroNamespace(debugDescription: "lower")
@@ -153,7 +150,6 @@ import SWBMacro
         let middlePathDecl = middleNamespace.lookupMacroDeclaration("PathMacro")
         #expect(middlePathDecl == nil)
 
-
         // Make sure we can also declare a path macro in the upper namespace.
         let upperPathListDecl = try upperNamespace.declarePathListMacro("PathListMacro")
         #expect(upperPathListDecl.type == .pathList)
@@ -184,4 +180,3 @@ import SWBMacro
         #expect(middleLookedupCondParam == nil)
     }
 }
-
diff --git a/Tests/SWBMacroTests/MacroConditionExpressionTests.swift b/Tests/SWBMacroTests/MacroConditionExpressionTests.swift
index 40cb82a2..581aa59b 100644
--- a/Tests/SWBMacroTests/MacroConditionExpressionTests.swift
+++ b/Tests/SWBMacroTests/MacroConditionExpressionTests.swift
@@ -380,7 +380,7 @@ import SWBMacro
 }
 
 extension MacroConditionExpression {
-    class func fromString(_ string: String, diagnosticsHandler: @escaping (((String) -> Void)) = {_ in }) -> MacroConditionExpression? {
+    class func fromString(_ string: String, diagnosticsHandler: @escaping (((String) -> Void)) = { _ in }) -> MacroConditionExpression? {
         struct Static {
             static let namespace = MacroNamespace(debugDescription: "test")
         }
diff --git a/Tests/SWBMacroTests/MacroEvaluationTests.swift b/Tests/SWBMacroTests/MacroEvaluationTests.swift
index dce7a883..f30de36a 100644
--- a/Tests/SWBMacroTests/MacroEvaluationTests.swift
+++ b/Tests/SWBMacroTests/MacroEvaluationTests.swift
@@ -534,23 +534,23 @@ import SWBTestSupport
         let Y = try namespace.declareStringMacro("Y")
         table.push(X, literal: "x")
         var conditions = [MacroCondition]()
-        let cond1 = MacroCondition(parameter:param, valuePattern:"pattern*")
+        let cond1 = MacroCondition(parameter: param, valuePattern: "pattern*")
         #expect(cond1.parameter == param);
         #expect(cond1.valuePattern == "pattern*");
         #expect(cond1.description != "");
-        let cond2 = MacroCondition(parameter:param, valuePattern:"pattern*")
+        let cond2 = MacroCondition(parameter: param, valuePattern: "pattern*")
         #expect(cond2.parameter == param);
         #expect(cond2.valuePattern == "pattern*");
         #expect(cond2.description != "");
         #expect(cond1 == cond2)
-        let cond3 = MacroCondition(parameter:param, valuePattern:"pattern*~")
+        let cond3 = MacroCondition(parameter: param, valuePattern: "pattern*~")
         #expect(cond3.parameter == param);
         #expect(cond3.valuePattern == "pattern*~");
         #expect(cond3.description != "");
         #expect(cond1 != cond3)
         #expect(cond2 != cond3)
         conditions.append(cond1)
-        table.push(X, literal: "ⓧ", conditions:MacroConditionSet(conditions: conditions))
+        table.push(X, literal: "ⓧ", conditions: MacroConditionSet(conditions: conditions))
         #expect(table.lookupMacro(X)?.conditions != nil)
         table.push(Y, namespace.parseString("¡$(X)!"))
         table.push(Y, namespace.parseString("$(Y)"))
@@ -630,7 +630,7 @@ import SWBTestSupport
         let _ = try namespace.declareStringListMacro("LIST_WITH_MISSING_VALUE")
 
         // Test a literal empty string.
-        table.push(STRING, literal:"")
+        table.push(STRING, literal: "")
         let scope1 = MacroEvaluationScope(table: table)
         #expect(scope1.evaluate(LIST) == ["-foo", ""])
 
@@ -856,10 +856,12 @@ import SWBTestSupport
             }
 
             init(arrayLiteral elements: TestCase...) {
-                self = .literal(elements.compactMap({ value in
-                    guard case .string(let str) = value else { return nil }
-                    return str
-                }))
+                self = .literal(
+                    elements.compactMap({ value in
+                        guard case .string(let str) = value else { return nil }
+                        return str
+                    })
+                )
             }
         }
 
@@ -877,8 +879,8 @@ import SWBTestSupport
             "😱\u{200D}a",
             TestCase(stringLiteral: Array(repeating: "a", count: 1_000_000).joined(separator: " ")),
             TestCase.literal(Array(repeating: "a", count: 1_000_000)),
-            "caf\u{E9}", // café with pre-composed é
-            "caf\u{65}\u{301}", // café with decomposed é
+            "caf\u{E9}",  // café with pre-composed é
+            "caf\u{65}\u{301}",  // café with decomposed é
             ["caf\u{E9}", "caf\u{65}\u{301}"],
             ["caf\u{65}\u{301}", "caf\u{E9}"],
         ]
@@ -1023,7 +1025,6 @@ extension MacroEvaluationScope {
         let separators: [String]
         let expectations: Expectations
 
-
         init(root: String, components: [String], separators: [String], expectations: Expectations) throws {
             if components.count != separators.count {
                 throw TestPathError.componentSeparatorLengthMismatch
@@ -1047,29 +1048,65 @@ extension MacroEvaluationScope {
         var tps: [TestPath] = []
         do {
             #if !os(Windows)
-            tps = try [
-                TestPath(root: "/", components: [ "this", "is", "a", "path" ], separators: ["/", "/", "/", "/"],
-                         expectations: Expectations(stringEvaluated: "/this/is/a/path", macroEvaluated: "/this/is/a/path", base: nil, file: nil, dir: "/this/is/a")),
-                TestPath(root: "/", components: [ "this", "is", "..", "path" ], separators: ["/", "/", "/", "/"],
-                         expectations: Expectations(stringEvaluated: "/this/is/../path", macroEvaluated: "/this/path", base: nil, file: nil, dir: "/this")),
-                TestPath(root: "", components: [ "I", "have", "no", "root" ], separators: ["/", "/", "/", "/"],
-                         expectations: Expectations(stringEvaluated: "I/have/no/root", macroEvaluated: "I/have/no/root", base: nil, file: nil, dir: "I/have/no" )),
-                TestPath(root: "/", components: [ "I", "have", "a", "trailing", "" ], separators: ["/", "/", "/", "/", "/"],
-                         expectations: Expectations(stringEvaluated: "/I/have/a/trailing/", macroEvaluated: "/I/have/a/trailing", base: nil, file: nil, dir: "/I/have/a/trailing")),
-                TestPath(root: "/", components: [ "this", "is", "a", "file", "file1.txt" ], separators: ["/", "/", "/", "/", "/"],
-                         expectations: Expectations(stringEvaluated: "/this/is/a/file/file1.txt", macroEvaluated: "/this/is/a/file/file1.txt", base: "file1", file: "file1.txt", dir: nil))
-            ]
+                tps = try [
+                    TestPath(
+                        root: "/",
+                        components: ["this", "is", "a", "path"],
+                        separators: ["/", "/", "/", "/"],
+                        expectations: Expectations(stringEvaluated: "/this/is/a/path", macroEvaluated: "/this/is/a/path", base: nil, file: nil, dir: "/this/is/a")
+                    ),
+                    TestPath(
+                        root: "/",
+                        components: ["this", "is", "..", "path"],
+                        separators: ["/", "/", "/", "/"],
+                        expectations: Expectations(stringEvaluated: "/this/is/../path", macroEvaluated: "/this/path", base: nil, file: nil, dir: "/this")
+                    ),
+                    TestPath(
+                        root: "",
+                        components: ["I", "have", "no", "root"],
+                        separators: ["/", "/", "/", "/"],
+                        expectations: Expectations(stringEvaluated: "I/have/no/root", macroEvaluated: "I/have/no/root", base: nil, file: nil, dir: "I/have/no")
+                    ),
+                    TestPath(
+                        root: "/",
+                        components: ["I", "have", "a", "trailing", ""],
+                        separators: ["/", "/", "/", "/", "/"],
+                        expectations: Expectations(stringEvaluated: "/I/have/a/trailing/", macroEvaluated: "/I/have/a/trailing", base: nil, file: nil, dir: "/I/have/a/trailing")
+                    ),
+                    TestPath(
+                        root: "/",
+                        components: ["this", "is", "a", "file", "file1.txt"],
+                        separators: ["/", "/", "/", "/", "/"],
+                        expectations: Expectations(stringEvaluated: "/this/is/a/file/file1.txt", macroEvaluated: "/this/is/a/file/file1.txt", base: "file1", file: "file1.txt", dir: nil)
+                    ),
+                ]
             #else
-            tps = try [
-                TestPath(root: "C:\\", components: [ "this", "is", "a", "path" ], separators: ["\\", "\\", "\\", "\\"],
-                         expectations: Expectations(stringEvaluated: "C:\\this\\is\\a\\path", macroEvaluated: "C:\\this\\is\\a\\path", base: nil, file: nil, dir: "C:\\this\\is\\a")),
-                TestPath(root: "C:\\", components: [ "this", "is", "a", "path" ], separators: ["\\", "\\", "/", "/"],
-                         expectations: Expectations(stringEvaluated: "C:\\this\\is/a/path", macroEvaluated: "C:\\this\\is\\a\\path", base: nil, file: nil, dir: "C:\\this\\is\\a")),
-                TestPath(root: "C:\\", components: [ "this", "is", "..", "path" ], separators: ["\\", "\\", "\\", "\\"],
-                         expectations: Expectations(stringEvaluated: "C:\\this\\is\\..\\path", macroEvaluated: "C:\\this\\path", base: nil, file: nil, dir: "C:\\this")),
-                TestPath(root: "C:\\", components: [ "I", "have", "a", "trailing", "" ], separators: ["\\", "\\", "\\", "\\", "\\"],
-                         expectations: Expectations(stringEvaluated: "C:\\I\\have\\a\\trailing\\", macroEvaluated: "C:\\I\\have\\a\\trailing", base: nil, file: nil, dir: "C:\\I\\have\\a"))
-            ]
+                tps = try [
+                    TestPath(
+                        root: "C:\\",
+                        components: ["this", "is", "a", "path"],
+                        separators: ["\\", "\\", "\\", "\\"],
+                        expectations: Expectations(stringEvaluated: "C:\\this\\is\\a\\path", macroEvaluated: "C:\\this\\is\\a\\path", base: nil, file: nil, dir: "C:\\this\\is\\a")
+                    ),
+                    TestPath(
+                        root: "C:\\",
+                        components: ["this", "is", "a", "path"],
+                        separators: ["\\", "\\", "/", "/"],
+                        expectations: Expectations(stringEvaluated: "C:\\this\\is/a/path", macroEvaluated: "C:\\this\\is\\a\\path", base: nil, file: nil, dir: "C:\\this\\is\\a")
+                    ),
+                    TestPath(
+                        root: "C:\\",
+                        components: ["this", "is", "..", "path"],
+                        separators: ["\\", "\\", "\\", "\\"],
+                        expectations: Expectations(stringEvaluated: "C:\\this\\is\\..\\path", macroEvaluated: "C:\\this\\path", base: nil, file: nil, dir: "C:\\this")
+                    ),
+                    TestPath(
+                        root: "C:\\",
+                        components: ["I", "have", "a", "trailing", ""],
+                        separators: ["\\", "\\", "\\", "\\", "\\"],
+                        expectations: Expectations(stringEvaluated: "C:\\I\\have\\a\\trailing\\", macroEvaluated: "C:\\I\\have\\a\\trailing", base: nil, file: nil, dir: "C:\\I\\have\\a")
+                    ),
+                ]
             #endif
         } catch {
             #expect(Bool(false), "Failed to load test paths: \(error)")
@@ -1096,7 +1133,7 @@ extension MacroEvaluationScope {
 
             // Combined Path
             let macroPath = try namespace.declarePathMacro("MACRO_PATH")
-            let expressionPath  = namespace.parseString(expressionPathString)
+            let expressionPath = namespace.parseString(expressionPathString)
             table.push(macroPath, expressionPath)
 
             // Macro Operators
@@ -1126,7 +1163,7 @@ extension MacroEvaluationScope {
             #expect(scope.evaluate(macroPath).str == testPath.expectations.macroEvaluated)
 
             // Test macro operators
-            #expect(scope.evaluate(macroPathStandardized).str == testPath.expectations.macroEvaluated) //Should be already standardized/normalized
+            #expect(scope.evaluate(macroPathStandardized).str == testPath.expectations.macroEvaluated)  //Should be already standardized/normalized
             if testPath.expectations.file != nil {
                 #expect(scope.evaluate(macroPathFile).str == testPath.expectations.file)
             }
@@ -1136,7 +1173,7 @@ extension MacroEvaluationScope {
             if testPath.expectations.dir != nil {
                 #expect(scope.evaluate(macroPathDir).str == testPath.expectations.dir)
             }
-         }
+        }
     }
 
     @Test
@@ -1145,7 +1182,7 @@ extension MacroEvaluationScope {
         var table = MacroValueAssignmentTable(namespace: namespace)
 
         let macroPathList = try namespace.declarePathListMacro("MACRO_PATH_LIST")
-        table.push(macroPathList, literal: testPaths.map{$0.path})
+        table.push(macroPathList, literal: testPaths.map { $0.path })
 
         //Macro Operators
         //:standardize
@@ -1159,18 +1196,17 @@ extension MacroEvaluationScope {
         //:file
         let macroPathListFile = try namespace.declarePathListMacro("MACRO_PATH_LIST_FILE")
         let expressionPathListFile = namespace.parseStringList("$(MACRO_PATH_LIST:file)")
-        table.push(macroPathListFile , expressionPathListFile)
+        table.push(macroPathListFile, expressionPathListFile)
         //:dir
         let macroPathListDir = try namespace.declarePathListMacro("MACRO_PATH_LIST_DIR")
         let expressionPathListDir = namespace.parseStringList("$(MACRO_PATH_LIST:dir)")
-        table.push(macroPathListDir , expressionPathListDir)
-
+        table.push(macroPathListDir, expressionPathListDir)
 
         // Create a macro evaluation scope for testing.
         let scope = MacroEvaluationScope(table: table)
 
         // Check that all paths have been normalized
-        #expect(scope.evaluate(macroPathList) == testPaths.map{$0.expectations.macroEvaluated})
+        #expect(scope.evaluate(macroPathList) == testPaths.map { $0.expectations.macroEvaluated })
 
         // Check macro operators function as expected, order is same as testPaths
         for (testPathIndex, testPath) in testPaths.enumerated() {
diff --git a/Tests/SWBMacroTests/MacroNamespaceTests.swift b/Tests/SWBMacroTests/MacroNamespaceTests.swift
index f03a4cd3..8e7cfa17 100644
--- a/Tests/SWBMacroTests/MacroNamespaceTests.swift
+++ b/Tests/SWBMacroTests/MacroNamespaceTests.swift
@@ -44,11 +44,14 @@ import SWBMacro
         let tableData: [String: PropertyListItem] = ["CUSTOM_SETTING": .plString("foo value")]
 
         // user defined not allowed
-        #expect(performing: {
-            try namespace.parseTable(tableData, allowUserDefined: false)
-        }, throws: { error in
-            error as? MacroDeclarationError == .unknownMacroDeclarationType(name: "CUSTOM_SETTING")
-        })
+        #expect(
+            performing: {
+                try namespace.parseTable(tableData, allowUserDefined: false)
+            },
+            throws: { error in
+                error as? MacroDeclarationError == .unknownMacroDeclarationType(name: "CUSTOM_SETTING")
+            }
+        )
 
         // allow user defined
         _ = try namespace.parseTable(tableData, allowUserDefined: true)
@@ -57,11 +60,14 @@ import SWBMacro
         // attempt to overwrite user-defined type with known type
         let tableDataMismatched: [String: PropertyListItem] = ["USER_DEFINED_STRING": .plString("foo value")]
         _ = try namespace.parseTable(tableDataMismatched, allowUserDefined: true)
-        #expect(performing: {
-            try namespace.declareStringMacro("USER_DEFINED_STRING")
-        }, throws: { error in
-            error as? MacroDeclarationError == .conflictingMacroDeclarationType(type: .string, previousType: .userDefined, name: "USER_DEFINED_STRING")
-        })
+        #expect(
+            performing: {
+                try namespace.declareStringMacro("USER_DEFINED_STRING")
+            },
+            throws: { error in
+                error as? MacroDeclarationError == .conflictingMacroDeclarationType(type: .string, previousType: .userDefined, name: "USER_DEFINED_STRING")
+            }
+        )
 
         // use associated types to type-map specific macros that would be otherwise user-defined (note these aren't actually treated as user-defined, so we'll set that to false)
         let associatedTypesForKeysMatching: [String: MacroType] = ["_DEFINED_STRING_SETTING": .string]
@@ -82,17 +88,22 @@ import SWBMacro
         // deterministically during serialization, the creation of the MacroValueAssignment linked list
         // must also be deterministic from the input dictionary to ensure they are written deterministically
         // as well.
-        let table = try namespace.parseTable([
-            "SETTING[sdk=macosx*]": "value",
-            "SETTING[sdk=iphoneos*]": "value",
-            "SETTING[sdk=appletvos*]": "value",
-            "SETTING[sdk=watchos*]": "value",
-            "SETTING[sdk=driverkit*]": "value",
-        ], allowUserDefined: true)
+        let table = try namespace.parseTable(
+            [
+                "SETTING[sdk=macosx*]": "value",
+                "SETTING[sdk=iphoneos*]": "value",
+                "SETTING[sdk=appletvos*]": "value",
+                "SETTING[sdk=watchos*]": "value",
+                "SETTING[sdk=driverkit*]": "value",
+            ],
+            allowUserDefined: true
+        )
 
-        #expect(table.dump() == """
-            'SETTING' := [sdk=watchos*]'value' -> [sdk=macosx*]'value' -> [sdk=iphoneos*]'value' -> [sdk=driverkit*]'value' -> [sdk=appletvos*]'value' (type: userDefined)
+        #expect(
+            table.dump() == """
+                'SETTING' := [sdk=watchos*]'value' -> [sdk=macosx*]'value' -> [sdk=iphoneos*]'value' -> [sdk=driverkit*]'value' -> [sdk=appletvos*]'value' (type: userDefined)
 
-            """)
+                """
+        )
     }
 }
diff --git a/Tests/SWBMacroTests/MacroParsingTests.swift b/Tests/SWBMacroTests/MacroParsingTests.swift
index b9b408a8..92e87e7c 100644
--- a/Tests/SWBMacroTests/MacroParsingTests.swift
+++ b/Tests/SWBMacroTests/MacroParsingTests.swift
@@ -19,390 +19,510 @@ import SWBMacro
 @Suite fileprivate struct MacroStringParsingTests {
     @Test
     func macroStringExpressionParsing_SimpleLiterals() {
-        TestMacroStringParsing("", [
-            .literalChars(""),
-        ])
+        TestMacroStringParsing(
+            "",
+            [
+                .literalChars("")
+            ]
+        )
 
         // Simple characters just yield themselves.
-        TestMacroStringParsing("X", [
-            .literalChars("X"),
-        ])
+        TestMacroStringParsing(
+            "X",
+            [
+                .literalChars("X")
+            ]
+        )
 
         // Arbitrary Unicode is fine.
-        TestMacroStringParsing("😀", [
-            .literalChars("😀"),
-        ])
+        TestMacroStringParsing(
+            "😀",
+            [
+                .literalChars("😀")
+            ]
+        )
 
         // Whitespace and punctuation are not special.
-        TestMacroStringParsing(" ", [
-            .literalChars(" "),
-        ])
+        TestMacroStringParsing(
+            " ",
+            [
+                .literalChars(" ")
+            ]
+        )
 
-        TestMacroStringParsing("\'", [
-            .literalChars("\'"),
-        ])
+        TestMacroStringParsing(
+            "\'",
+            [
+                .literalChars("\'")
+            ]
+        )
 
-        TestMacroStringParsing("\\", [
-            .literalChars("\\"),
-        ])
+        TestMacroStringParsing(
+            "\\",
+            [
+                .literalChars("\\")
+            ]
+        )
     }
 
-
     @Test
     func macroStringExpressionParsing_SimpleSubstitutions() {
-        TestMacroStringParsing("$(X)", [
-            .startStringSubstSubexpr,
-            .startMacroName,
-            .literalChars("X"),
-            .endMacroName(wasBracketed: true),
-            .endStringSubstSubexpr,
-        ])
-
-        TestMacroStringParsing("$($(X))", [
-            .startStringSubstSubexpr,
-            .startMacroName,
-            .startStringSubstSubexpr,
-            .startMacroName,
-            .literalChars("X"),
-            .endMacroName(wasBracketed: true),
-            .endStringSubstSubexpr,
-            .endMacroName(wasBracketed: true),
-            .endStringSubstSubexpr,
-        ])
+        TestMacroStringParsing(
+            "$(X)",
+            [
+                .startStringSubstSubexpr,
+                .startMacroName,
+                .literalChars("X"),
+                .endMacroName(wasBracketed: true),
+                .endStringSubstSubexpr,
+            ]
+        )
+
+        TestMacroStringParsing(
+            "$($(X))",
+            [
+                .startStringSubstSubexpr,
+                .startMacroName,
+                .startStringSubstSubexpr,
+                .startMacroName,
+                .literalChars("X"),
+                .endMacroName(wasBracketed: true),
+                .endStringSubstSubexpr,
+                .endMacroName(wasBracketed: true),
+                .endStringSubstSubexpr,
+            ]
+        )
 
         // But we also accept some alternate syntaxes (we'd like to start deprecating these).
-        TestMacroStringParsing("$X", [
-            .startStringSubstSubexpr,
-            .startMacroName,
-            .literalChars("X"),
-            .endMacroName(wasBracketed: false),
-            .endStringSubstSubexpr,
-        ])
-
-        TestMacroStringParsing("${X}", [
-            .startStringSubstSubexpr,
-            .startMacroName,
-            .literalChars("X"),
-            .endMacroName(wasBracketed: true),
-            .endStringSubstSubexpr,
-        ],
-                               expectedDiagnostics: [
-                                (level: MacroExpressionDiagnostic.Level.warning, kind: MacroExpressionDiagnostic.Kind.deprecatedMacroRefSyntax, start: 0, end: 2),
-                               ])
-
-        TestMacroStringParsing("$[X]", [
-            .startStringSubstSubexpr,
-            .startMacroName,
-            .literalChars("X"),
-            .endMacroName(wasBracketed: true),
-            .endStringSubstSubexpr,
-        ],
-                               expectedDiagnostics: [
-                                (level: MacroExpressionDiagnostic.Level.warning, kind: MacroExpressionDiagnostic.Kind.deprecatedMacroRefSyntax, start: 0, end: 2),
-                               ])
-    }
+        TestMacroStringParsing(
+            "$X",
+            [
+                .startStringSubstSubexpr,
+                .startMacroName,
+                .literalChars("X"),
+                .endMacroName(wasBracketed: false),
+                .endStringSubstSubexpr,
+            ]
+        )
+
+        TestMacroStringParsing(
+            "${X}",
+            [
+                .startStringSubstSubexpr,
+                .startMacroName,
+                .literalChars("X"),
+                .endMacroName(wasBracketed: true),
+                .endStringSubstSubexpr,
+            ],
+            expectedDiagnostics: [
+                (level: MacroExpressionDiagnostic.Level.warning, kind: MacroExpressionDiagnostic.Kind.deprecatedMacroRefSyntax, start: 0, end: 2)
+            ]
+        )
 
+        TestMacroStringParsing(
+            "$[X]",
+            [
+                .startStringSubstSubexpr,
+                .startMacroName,
+                .literalChars("X"),
+                .endMacroName(wasBracketed: true),
+                .endStringSubstSubexpr,
+            ],
+            expectedDiagnostics: [
+                (level: MacroExpressionDiagnostic.Level.warning, kind: MacroExpressionDiagnostic.Kind.deprecatedMacroRefSyntax, start: 0, end: 2)
+            ]
+        )
+    }
 
     @Test
     func macroStringExpressionParsing_InterestingCases() {
-        TestMacroStringParsing("$", [
-            .startStringSubstSubexpr,
-            .literalChars("$"),
-            .endStringSubstSubexpr,
-        ],
-                               expectedDiagnostics: [
-                                (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.trailingDollarSign, start: 0, end: 1),
-                               ])
+        TestMacroStringParsing(
+            "$",
+            [
+                .startStringSubstSubexpr,
+                .literalChars("$"),
+                .endStringSubstSubexpr,
+            ],
+            expectedDiagnostics: [
+                (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.trailingDollarSign, start: 0, end: 1)
+            ]
+        )
 
         //  An even number of consecutive "$" characters does not yield a trailing-dollar-sign error — each pair becomes a single "$" sign, leaving none.
-        TestMacroStringParsing("$$", [
-            .startStringSubstSubexpr,
-            .literalChars("$"),
-            .endStringSubstSubexpr,
-        ])
-
-        TestMacroStringParsing("$$$", [
-            .startStringSubstSubexpr,
-            .literalChars("$"),
-            .endStringSubstSubexpr,
-            .startStringSubstSubexpr,
-            .literalChars("$"),
-            .endStringSubstSubexpr,
-        ],
-                               expectedDiagnostics: [
-                                (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.trailingDollarSign, start: 2, end: 3),
-                               ])
-
-        TestMacroStringParsing("$$$$", [
-            .startStringSubstSubexpr,
-            .literalChars("$"),
-            .endStringSubstSubexpr,
-            .startStringSubstSubexpr,
-            .literalChars("$"),
-            .endStringSubstSubexpr
-        ])
-
-        TestMacroStringParsing("$()", [
-            .startStringSubstSubexpr,
-            .startMacroName,
-            .endMacroName(wasBracketed: true),
-            .endStringSubstSubexpr,
-        ],
-                               expectedDiagnostics: [
-                                (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.missingMacroName, start: 2, end: 2),
-                               ])
-
-        TestMacroStringParsing("$X_$(Y)", [
-            .startStringSubstSubexpr,
-            .startMacroName,
-            .literalChars("X_"),
-            .startStringSubstSubexpr,
-            .startMacroName,
-            .literalChars("Y"),
-            .endMacroName(wasBracketed: true),
-            .endStringSubstSubexpr,
-            .endMacroName(wasBracketed: false),
-            .endStringSubstSubexpr,
-        ])
-    }
+        TestMacroStringParsing(
+            "$$",
+            [
+                .startStringSubstSubexpr,
+                .literalChars("$"),
+                .endStringSubstSubexpr,
+            ]
+        )
 
+        TestMacroStringParsing(
+            "$$$",
+            [
+                .startStringSubstSubexpr,
+                .literalChars("$"),
+                .endStringSubstSubexpr,
+                .startStringSubstSubexpr,
+                .literalChars("$"),
+                .endStringSubstSubexpr,
+            ],
+            expectedDiagnostics: [
+                (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.trailingDollarSign, start: 2, end: 3)
+            ]
+        )
+
+        TestMacroStringParsing(
+            "$$$$",
+            [
+                .startStringSubstSubexpr,
+                .literalChars("$"),
+                .endStringSubstSubexpr,
+                .startStringSubstSubexpr,
+                .literalChars("$"),
+                .endStringSubstSubexpr,
+            ]
+        )
+
+        TestMacroStringParsing(
+            "$()",
+            [
+                .startStringSubstSubexpr,
+                .startMacroName,
+                .endMacroName(wasBracketed: true),
+                .endStringSubstSubexpr,
+            ],
+            expectedDiagnostics: [
+                (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.missingMacroName, start: 2, end: 2)
+            ]
+        )
+
+        TestMacroStringParsing(
+            "$X_$(Y)",
+            [
+                .startStringSubstSubexpr,
+                .startMacroName,
+                .literalChars("X_"),
+                .startStringSubstSubexpr,
+                .startMacroName,
+                .literalChars("Y"),
+                .endMacroName(wasBracketed: true),
+                .endStringSubstSubexpr,
+                .endMacroName(wasBracketed: false),
+                .endStringSubstSubexpr,
+            ]
+        )
+    }
 
     @Test
     func macroStringExpressionParsing_Operators() {
-        TestMacroStringParsing("$(X:x:y=$(A:r:s:t):z)", [
-            .startStringSubstSubexpr,
-            .startMacroName,
-            .literalChars("X"),
-            .endMacroName(wasBracketed: true),
-            .retrievalOp("x"),
-            .startReplacementOp("y"),
-            .startStringSubstSubexpr,
-            .startMacroName,
-            .literalChars("A"),
-            .endMacroName(wasBracketed: true),
-            .retrievalOp("r"),
-            .retrievalOp("s"),
-            .retrievalOp("t"),
-            .endStringSubstSubexpr,
-            .endReplacementOp("y"),
-            .retrievalOp("z"),
-            .endStringSubstSubexpr,
-        ])
-
-        TestMacroStringParsing("$(X:${X})", [
-            .startStringSubstSubexpr,
-            .startMacroName,
-            .literalChars("X"),
-            .endMacroName(wasBracketed: true),
-            .endStringSubstSubexpr,
-        ],
-                               expectedDiagnostics: [
-                                (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.invalidOperatorCharacter, start: 4, end: 5),
-                               ])
+        TestMacroStringParsing(
+            "$(X:x:y=$(A:r:s:t):z)",
+            [
+                .startStringSubstSubexpr,
+                .startMacroName,
+                .literalChars("X"),
+                .endMacroName(wasBracketed: true),
+                .retrievalOp("x"),
+                .startReplacementOp("y"),
+                .startStringSubstSubexpr,
+                .startMacroName,
+                .literalChars("A"),
+                .endMacroName(wasBracketed: true),
+                .retrievalOp("r"),
+                .retrievalOp("s"),
+                .retrievalOp("t"),
+                .endStringSubstSubexpr,
+                .endReplacementOp("y"),
+                .retrievalOp("z"),
+                .endStringSubstSubexpr,
+            ]
+        )
+
+        TestMacroStringParsing(
+            "$(X:${X})",
+            [
+                .startStringSubstSubexpr,
+                .startMacroName,
+                .literalChars("X"),
+                .endMacroName(wasBracketed: true),
+                .endStringSubstSubexpr,
+            ],
+            expectedDiagnostics: [
+                (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.invalidOperatorCharacter, start: 4, end: 5)
+            ]
+        )
     }
 }
 
 @Suite fileprivate struct MacroStringListParsingTests {
     @Test
     func macroStringListExpressionParsing_Empty() {
-        TestMacroStringListParsing("", [
-            // nothing
-        ])
+        TestMacroStringListParsing(
+            "",
+            [
+                // nothing
+            ]
+        )
     }
 
-
     @Test
     func macroStringListExpressionParsing_WhitespaceOnly() {
-        TestMacroStringListParsing(" ", [
-            .literalStringFormOnlyChars(" "),
-        ])
+        TestMacroStringListParsing(
+            " ",
+            [
+                .literalStringFormOnlyChars(" ")
+            ]
+        )
 
-        TestMacroStringListParsing(" \t\r \n \t", [
-            .literalStringFormOnlyChars(" \t\r \n \t"),
-        ])
+        TestMacroStringListParsing(
+            " \t\r \n \t",
+            [
+                .literalStringFormOnlyChars(" \t\r \n \t")
+            ]
+        )
 
-        TestMacroStringListParsing("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", [
-            .literalStringFormOnlyChars("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"),
-        ])
+        TestMacroStringListParsing(
+            "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
+            [
+                .literalStringFormOnlyChars("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n")
+            ]
+        )
     }
 
-
     @Test
     func macroStringListExpressionParsing_SimpleTests() {
-        TestMacroStringListParsing("A", [
-            .literalChars("A"),
-        ])
-
-        TestMacroStringListParsing("A B", [
-            .literalChars("A"),
-            .listElementSeparator(" "),
-            .literalChars("B"),
-        ])
-    }
+        TestMacroStringListParsing(
+            "A",
+            [
+                .literalChars("A")
+            ]
+        )
 
+        TestMacroStringListParsing(
+            "A B",
+            [
+                .literalChars("A"),
+                .listElementSeparator(" "),
+                .literalChars("B"),
+            ]
+        )
+    }
 
     @Test
     func macroStringListExpressionParsing_Quoting() {
-        TestMacroStringListParsing("\"\"", [
-            .literalStringFormOnlyChars("\""),
-            .literalChars(""),
-            .literalStringFormOnlyChars("\""),
-        ])
-
-        TestMacroStringListParsing("\"\" \"\"", [
-            .literalStringFormOnlyChars("\""),
-            .literalChars(""),
-            .literalStringFormOnlyChars("\""),
-            .listElementSeparator(" "),
-            .literalStringFormOnlyChars("\""),
-            .literalChars(""),
-            .literalStringFormOnlyChars("\""),
-        ])
-
-        TestMacroStringListParsing("   \"\" \"\"  \n  ", [
-            .literalStringFormOnlyChars("   "),
-            .literalStringFormOnlyChars("\""),
-            .literalChars(""),
-            .literalStringFormOnlyChars("\""),
-            .listElementSeparator(" "),
-            .literalStringFormOnlyChars("\""),
-            .literalChars(""),
-            .literalStringFormOnlyChars("\""),
-            .literalStringFormOnlyChars("  \n  "),
-        ])
-
-        TestMacroStringListParsing("   \"\" \"\"  \n  \\", [
-            .literalStringFormOnlyChars("   "),
-            .literalStringFormOnlyChars("\""),
-            .literalChars(""),
-            .literalStringFormOnlyChars("\""),
-            .listElementSeparator(" "),
-            .literalStringFormOnlyChars("\""),
-            .literalChars(""),
-            .literalStringFormOnlyChars("\""),
-            .listElementSeparator("  \n  "),
-            .literalStringFormOnlyChars("\\"),
-            .literalChars("\\"),
-        ],
-                                   expectedDiagnostics: [
-                                    (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.trailingEscapeCharacter, start: 13, end: 14),
-                                   ])
-
-        TestMacroStringListParsing("   \"\" \"\"  \n  $", [
-            .literalStringFormOnlyChars("   "),
-            .literalStringFormOnlyChars("\""),
-            .literalChars(""),
-            .literalStringFormOnlyChars("\""),
-            .listElementSeparator(" "),
-            .literalStringFormOnlyChars("\""),
-            .literalChars(""),
-            .literalStringFormOnlyChars("\""),
-            .listElementSeparator("  \n  "),
-            .startSubstSubexpr,
-            .literalChars("$"),
-            .endSubstSubexpr,
-        ],
-                                   expectedDiagnostics: [
-                                    (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.trailingDollarSign, start: 13, end: 14),
-                                   ])
-
-        TestMacroStringListParsing("\"", [
-            .literalStringFormOnlyChars("\""),
-        ],
-                                   expectedDiagnostics: [
-                                    (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.unterminatedQuotation, start: 1, end: 1),
-                                   ])
-
-        TestMacroStringListParsing("\'", [
-            .literalStringFormOnlyChars("\'"),
-        ],
-                                   expectedDiagnostics: [
-                                    (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.unterminatedQuotation, start: 1, end: 1),
-                                   ])
-
-        TestMacroStringListParsing("   $(", [
-            .literalStringFormOnlyChars("   "),
-            .startSubstSubexpr,
-            .startMacroName,
-            .endMacroName(wasBracketed: true),
-            .endSubstSubexpr,
-        ],
-                                   expectedDiagnostics: [
-                                    (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.unterminatedMacroSubexpression, start: 3, end: 5),
-                                   ])
-
-        TestMacroStringListParsing("   \"$(", [
-            .literalStringFormOnlyChars("   "),
-            .literalStringFormOnlyChars("\""),
-            .startStringSubstSubexpr,
-            .startMacroName,
-            .endMacroName(wasBracketed: true),
-            .endStringSubstSubexpr,
-        ],
-                                   expectedDiagnostics: [
-                                    (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.unterminatedMacroSubexpression, start: 4, end: 6),
-                                    (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.unterminatedQuotation, start: 6, end: 6),
-                                   ])
-
-        TestMacroStringListParsing("\n\n\n$(X", [
-            .literalStringFormOnlyChars("\n\n\n"),
-            .startSubstSubexpr,
-            .startMacroName,
-            .literalChars("X"),
-            .endMacroName(wasBracketed: true),
-            .endSubstSubexpr,
-        ],
-                                   expectedDiagnostics: [
-                                    (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.unterminatedMacroSubexpression, start: 3, end: 6),
-                                   ])
-
-        TestMacroStringListParsing("\n\n\n'$(X", [
-            .literalStringFormOnlyChars("\n\n\n"),
-            .literalStringFormOnlyChars("'"),
-            .startStringSubstSubexpr,
-            .startMacroName,
-            .literalChars("X"),
-            .endMacroName(wasBracketed: true),
-            .endStringSubstSubexpr,
-        ],
-                                   expectedDiagnostics: [
-                                    (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.unterminatedMacroSubexpression, start: 4, end: 7),
-                                    (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.unterminatedQuotation, start: 7, end: 7),
-                                   ])
-        TestMacroStringListParsing("\"\'\'\"", [
-            .literalStringFormOnlyChars("\""),
-            .literalChars("\'\'"),
-            .literalStringFormOnlyChars("\""),
-        ])
-
-        TestMacroStringListParsing("\'\'", [
-            .literalStringFormOnlyChars("\'"),
-            .literalChars(""),
-            .literalStringFormOnlyChars("\'"),
-        ])
-
-        TestMacroStringListParsing("\'\"\"\'", [
-            .literalStringFormOnlyChars("\'"),
-            .literalChars("\"\""),
-            .literalStringFormOnlyChars("\'"),
-        ])
-
-        TestMacroStringListParsing("\" \"", [
-            .literalStringFormOnlyChars("\""),
-            .literalChars(" "),
-            .literalStringFormOnlyChars("\""),
-        ])
-
-        TestMacroStringListParsing("\' \'", [
-            .literalStringFormOnlyChars("\'"),
-            .literalChars(" "),
-            .literalStringFormOnlyChars("\'"),
-        ])
-
-        TestMacroStringListParsing("\\ ", [
-            .literalStringFormOnlyChars("\\"),
-            .literalChars(" "),
-        ])
+        TestMacroStringListParsing(
+            "\"\"",
+            [
+                .literalStringFormOnlyChars("\""),
+                .literalChars(""),
+                .literalStringFormOnlyChars("\""),
+            ]
+        )
+
+        TestMacroStringListParsing(
+            "\"\" \"\"",
+            [
+                .literalStringFormOnlyChars("\""),
+                .literalChars(""),
+                .literalStringFormOnlyChars("\""),
+                .listElementSeparator(" "),
+                .literalStringFormOnlyChars("\""),
+                .literalChars(""),
+                .literalStringFormOnlyChars("\""),
+            ]
+        )
+
+        TestMacroStringListParsing(
+            "   \"\" \"\"  \n  ",
+            [
+                .literalStringFormOnlyChars("   "),
+                .literalStringFormOnlyChars("\""),
+                .literalChars(""),
+                .literalStringFormOnlyChars("\""),
+                .listElementSeparator(" "),
+                .literalStringFormOnlyChars("\""),
+                .literalChars(""),
+                .literalStringFormOnlyChars("\""),
+                .literalStringFormOnlyChars("  \n  "),
+            ]
+        )
+
+        TestMacroStringListParsing(
+            "   \"\" \"\"  \n  \\",
+            [
+                .literalStringFormOnlyChars("   "),
+                .literalStringFormOnlyChars("\""),
+                .literalChars(""),
+                .literalStringFormOnlyChars("\""),
+                .listElementSeparator(" "),
+                .literalStringFormOnlyChars("\""),
+                .literalChars(""),
+                .literalStringFormOnlyChars("\""),
+                .listElementSeparator("  \n  "),
+                .literalStringFormOnlyChars("\\"),
+                .literalChars("\\"),
+            ],
+            expectedDiagnostics: [
+                (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.trailingEscapeCharacter, start: 13, end: 14)
+            ]
+        )
+
+        TestMacroStringListParsing(
+            "   \"\" \"\"  \n  $",
+            [
+                .literalStringFormOnlyChars("   "),
+                .literalStringFormOnlyChars("\""),
+                .literalChars(""),
+                .literalStringFormOnlyChars("\""),
+                .listElementSeparator(" "),
+                .literalStringFormOnlyChars("\""),
+                .literalChars(""),
+                .literalStringFormOnlyChars("\""),
+                .listElementSeparator("  \n  "),
+                .startSubstSubexpr,
+                .literalChars("$"),
+                .endSubstSubexpr,
+            ],
+            expectedDiagnostics: [
+                (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.trailingDollarSign, start: 13, end: 14)
+            ]
+        )
+
+        TestMacroStringListParsing(
+            "\"",
+            [
+                .literalStringFormOnlyChars("\"")
+            ],
+            expectedDiagnostics: [
+                (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.unterminatedQuotation, start: 1, end: 1)
+            ]
+        )
+
+        TestMacroStringListParsing(
+            "\'",
+            [
+                .literalStringFormOnlyChars("\'")
+            ],
+            expectedDiagnostics: [
+                (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.unterminatedQuotation, start: 1, end: 1)
+            ]
+        )
+
+        TestMacroStringListParsing(
+            "   $(",
+            [
+                .literalStringFormOnlyChars("   "),
+                .startSubstSubexpr,
+                .startMacroName,
+                .endMacroName(wasBracketed: true),
+                .endSubstSubexpr,
+            ],
+            expectedDiagnostics: [
+                (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.unterminatedMacroSubexpression, start: 3, end: 5)
+            ]
+        )
+
+        TestMacroStringListParsing(
+            "   \"$(",
+            [
+                .literalStringFormOnlyChars("   "),
+                .literalStringFormOnlyChars("\""),
+                .startStringSubstSubexpr,
+                .startMacroName,
+                .endMacroName(wasBracketed: true),
+                .endStringSubstSubexpr,
+            ],
+            expectedDiagnostics: [
+                (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.unterminatedMacroSubexpression, start: 4, end: 6),
+                (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.unterminatedQuotation, start: 6, end: 6),
+            ]
+        )
+
+        TestMacroStringListParsing(
+            "\n\n\n$(X",
+            [
+                .literalStringFormOnlyChars("\n\n\n"),
+                .startSubstSubexpr,
+                .startMacroName,
+                .literalChars("X"),
+                .endMacroName(wasBracketed: true),
+                .endSubstSubexpr,
+            ],
+            expectedDiagnostics: [
+                (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.unterminatedMacroSubexpression, start: 3, end: 6)
+            ]
+        )
+
+        TestMacroStringListParsing(
+            "\n\n\n'$(X",
+            [
+                .literalStringFormOnlyChars("\n\n\n"),
+                .literalStringFormOnlyChars("'"),
+                .startStringSubstSubexpr,
+                .startMacroName,
+                .literalChars("X"),
+                .endMacroName(wasBracketed: true),
+                .endStringSubstSubexpr,
+            ],
+            expectedDiagnostics: [
+                (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.unterminatedMacroSubexpression, start: 4, end: 7),
+                (level: MacroExpressionDiagnostic.Level.error, kind: MacroExpressionDiagnostic.Kind.unterminatedQuotation, start: 7, end: 7),
+            ]
+        )
+        TestMacroStringListParsing(
+            "\"\'\'\"",
+            [
+                .literalStringFormOnlyChars("\""),
+                .literalChars("\'\'"),
+                .literalStringFormOnlyChars("\""),
+            ]
+        )
+
+        TestMacroStringListParsing(
+            "\'\'",
+            [
+                .literalStringFormOnlyChars("\'"),
+                .literalChars(""),
+                .literalStringFormOnlyChars("\'"),
+            ]
+        )
+
+        TestMacroStringListParsing(
+            "\'\"\"\'",
+            [
+                .literalStringFormOnlyChars("\'"),
+                .literalChars("\"\""),
+                .literalStringFormOnlyChars("\'"),
+            ]
+        )
+
+        TestMacroStringListParsing(
+            "\" \"",
+            [
+                .literalStringFormOnlyChars("\""),
+                .literalChars(" "),
+                .literalStringFormOnlyChars("\""),
+            ]
+        )
+
+        TestMacroStringListParsing(
+            "\' \'",
+            [
+                .literalStringFormOnlyChars("\'"),
+                .literalChars(" "),
+                .literalStringFormOnlyChars("\'"),
+            ]
+        )
+
+        TestMacroStringListParsing(
+            "\\ ",
+            [
+                .literalStringFormOnlyChars("\\"),
+                .literalChars(" "),
+            ]
+        )
     }
 }
 
@@ -430,105 +550,95 @@ import SWBMacro
     }
 }
 
-
 /// Sample Macro Config Files
 fileprivate let testFileData = [
     "EnsureOldSingleLineBehavior.xcconfig": """
-        A = B
-            C
-        D = E
-        """,
+    A = B
+        C
+    D = E
+    """,
     "Common.xcconfig":
-        "// Common Settings\n" +
-    "OTHER_CFLAGS = bla bla\n",
+        "// Common Settings\n" + "OTHER_CFLAGS = bla bla\n",
     "Debug.xcconfig":
-        "// Debug Settings\n" +
-    "#include \"Common.xcconfig\"\n" +
-    "OTHER_CFLAGS[arch=i386] = $(inherited) more\n",
+        "// Debug Settings\n" + "#include \"Common.xcconfig\"\n" + "OTHER_CFLAGS[arch=i386] = $(inherited) more\n",
     "Release.xcconfig":
-        "// Release Settings\n" +
-    "OTHER_CFLAGS[arch=z80] = $(inherited) 8-bit\n" +
-    "OTHER_CFLAGS[arch=CMOS 65816] = $(inherited) 16-bit\n" +
-    "OTHER_CFLAGS[arch=m68k] = $(inherited) 32-bit\n",
+        "// Release Settings\n" + "OTHER_CFLAGS[arch=z80] = $(inherited) 8-bit\n" + "OTHER_CFLAGS[arch=CMOS 65816] = $(inherited) 16-bit\n" + "OTHER_CFLAGS[arch=m68k] = $(inherited) 32-bit\n",
     "Multiline.xcconfig": """
-        FEATURE_DEFINES_A = $(A) $(B) \\
-        $(C)
-        FEATURE_DEFINES_B = $(D) \\ // comment 1
-        $(E) \\
-        $(F); // note the trailing optional ';'
-        FEATURE_DEFINES_C = \\
-            $(G) \\
-            \\ // comment 3
-            $(H)
-        FEATURE_DEFINES_D = \\ // comment 4
-            $(I);
-        """,
+    FEATURE_DEFINES_A = $(A) $(B) \\
+    $(C)
+    FEATURE_DEFINES_B = $(D) \\ // comment 1
+    $(E) \\
+    $(F); // note the trailing optional ';'
+    FEATURE_DEFINES_C = \\
+        $(G) \\
+        \\ // comment 3
+        $(H)
+    FEATURE_DEFINES_D = \\ // comment 4
+        $(I);
+    """,
     "MultilineError1.xcconfig": """
-        FEATURE_DEFINES_E = // comment 4
-        $(I)
-        """,
+    FEATURE_DEFINES_E = // comment 4
+    $(I)
+    """,
 
     "LineCntInsideDollarParen.xcconfig": """
-        COMPOSE_ME = YES
-        MY_VALUE_YES = "DOES THIS WORK?"
-        MY_VALUE = $(MY_VALUE_\\
-                                   $(COMPOSE_ME))
-        """,
+    COMPOSE_ME = YES
+    MY_VALUE_YES = "DOES THIS WORK?"
+    MY_VALUE = $(MY_VALUE_\\
+                               $(COMPOSE_ME))
+    """,
 
     // Non-terminating backslash is not treated as line-continuation symbol
     "NonterminalBackslash.xcconfig": """
-        SINGLE_LINE = A \\ B \\ C \\ D
-        """,
+    SINGLE_LINE = A \\ B \\ C \\ D
+    """,
 
     // Backslash in conditions is not treated as line-continuation and emits diagnostic messages
     "BackslashInConditions.xcconfig": """
-        VALUE[ \\
-          sdk=iphoneos*, \\
-          arch=arm64 \\
-        ] = big spaces
-        """,
+    VALUE[ \\
+      sdk=iphoneos*, \\
+      arch=arm64 \\
+    ] = big spaces
+    """,
 
     "BasicMultilineExampleA.xcconfig": """
-        MY_VALUE = -f\\
-               -g      \\
-        -h
-        """,
+    MY_VALUE = -f\\
+           -g      \\
+    -h
+    """,
     "BasicMultilineExampleB.xcconfig": """
-        MY_VALUE = -f \\
-        -g \\
-        -h
-        """,
+    MY_VALUE = -f \\
+    -g \\
+    -h
+    """,
     "BasicMultilineExampleCanonical.xcconfig": """
-        MY_VALUE = -f -g -h
-        """,
+    MY_VALUE = -f -g -h
+    """,
 
     "TerminatingBackslashInsideStringLiteral.xcconfig": """
-        MY_STRING = "Now this is a story \\
-               all about how \\
-           my life got flipped, turned upside down"
-        """,
+    MY_STRING = "Now this is a story \\
+           all about how \\
+       my life got flipped, turned upside down"
+    """,
 
     "TerminatingBackslashInsideEmptyLine.xcconfig": """
-        MY_STRING = "hello \\
-          \\
-          I really wanted a new line above, and apparently the \\
-          works in strings."
-        """,
+    MY_STRING = "hello \\
+      \\
+      I really wanted a new line above, and apparently the \\
+      works in strings."
+    """,
 
     "BackslashInBothConditionAndRHS.xcconfig": """
-        MY_VALUE[ \\
-            sdk = iphone* \\
-            config = Debug \\
-        ] = -DEBUG \\
-                -MOREDEBUGZ
-        """,
+    MY_VALUE[ \\
+        sdk = iphone* \\
+        config = Debug \\
+    ] = -DEBUG \\
+            -MOREDEBUGZ
+    """,
 
     "Okay.xcconfig": "FEATURE_DEFINES_E = $(I) \\ // comment 4",
     "All.xcconfig":
-        "// A sample comment for testing's sake\n" +
-    "#include \"Common.xcconfig\"\n" +
-    "#include \"Debug.xcconfig\"\n" +
-    "#include \"Release.xcconfig\"\n",
+        "// A sample comment for testing's sake\n" + "#include \"Common.xcconfig\"\n" + "#include \"Debug.xcconfig\"\n" + "#include \"Release.xcconfig\"\n",
 ]
 
 @Suite fileprivate struct MacroConfigFileParsingTests {
@@ -585,101 +695,101 @@ fileprivate let testFileData = [
         MacroConfigFileParser(byteString: "$(...) \\// comment", path: Path(""), delegate: nil).parse()
 
         // More targeted tests.
-        TestMacroConfigFileParser("ABC123[cpu=z80][sdk=svi318] = $(inherited)  ;  ",
-                                  expectedAssignments: [
-                                    (macro: "ABC123", conditions: [(param: "cpu", pattern: "z80"), (param: "sdk", pattern: "svi318")], value: "$(inherited)"),
-                                  ],
-                                  expectedDiagnostics: [
-                                  ],
-                                  expectedIncludeDirectivesCount: 0
-        )
-        TestMacroConfigFileParser("A=\nA",
-                                  expectedAssignments: [
-                                    (macro: "A", conditions: [], value: ""),
-                                  ],
-                                  expectedDiagnostics: [
-                                    (level: .error, kind: .missingEqualsInAssignment, line: 2),
-                                  ],
-                                  expectedIncludeDirectivesCount: 0
-        )
-        TestMacroConfigFileParser("",
-                                  expectedAssignments: [
-                                  ],
-                                  expectedDiagnostics: [
-                                  ],
-                                  expectedIncludeDirectivesCount: 0
-        )
-        TestMacroConfigFileParser("\n\r",
-                                  expectedAssignments: [
-                                  ],
-                                  expectedDiagnostics: [
-                                  ],
-                                  expectedIncludeDirectivesCount: 0
-        )
-        TestMacroConfigFileParser("\r\r\r\r\r\r\r\r\r\r\r//",
-                                  expectedAssignments: [
-                                  ],
-                                  expectedDiagnostics: [
-                                  ],
-                                  expectedIncludeDirectivesCount: 0
-        )
-        TestMacroConfigFileParser("\r\r\r\r\r\r\r\r\r\r\r\\",
-                                  expectedAssignments: [
-                                  ],
-                                  expectedDiagnostics: [
-                                    (level: .error, kind: .unexpectedCharacter, line: 12),
-                                  ],
-                                  expectedIncludeDirectivesCount: 0
-        )
-        TestMacroConfigFileParser("#include \"Missing.xcconfig\"",
-                                  expectedAssignments: [
-                                  ],
-                                  expectedDiagnostics: [
-                                    (level: .error, kind: .missingIncludedFile, line: 1),
-                                  ],
-                                  expectedIncludeDirectivesCount: 0
-        )
-        TestMacroConfigFileParser("#include? \"Missing.xcconfig\"",
-                                  expectedAssignments: [
-                                  ],
-                                  expectedDiagnostics: [
-                                  ],
-                                  expectedIncludeDirectivesCount: 0
-        )
-        TestMacroConfigFileParser("#include \"All.xcconfig\"",
-                                  expectedAssignments: [(macro: "OTHER_CFLAGS", conditions: [], value: "bla bla"), (macro: "OTHER_CFLAGS", conditions: [], value: "bla bla"), (macro: "OTHER_CFLAGS", conditions: [(param: "arch", pattern: "i386")], value: "$(inherited) more"), (macro: "OTHER_CFLAGS", conditions: [(param: "arch", pattern: "z80")], value: "$(inherited) 8-bit"), (macro: "OTHER_CFLAGS", conditions: [(param: "arch", pattern: "CMOS 65816")], value: "$(inherited) 16-bit"), (macro: "OTHER_CFLAGS", conditions: [(param: "arch", pattern: "m68k")], value: "$(inherited) 32-bit")],
-                                  expectedDiagnostics: [
-                                  ],
-                                  expectedIncludeDirectivesCount: 5
+        TestMacroConfigFileParser(
+            "ABC123[cpu=z80][sdk=svi318] = $(inherited)  ;  ",
+            expectedAssignments: [
+                (macro: "ABC123", conditions: [(param: "cpu", pattern: "z80"), (param: "sdk", pattern: "svi318")], value: "$(inherited)")
+            ],
+            expectedDiagnostics: [],
+            expectedIncludeDirectivesCount: 0
+        )
+        TestMacroConfigFileParser(
+            "A=\nA",
+            expectedAssignments: [
+                (macro: "A", conditions: [], value: "")
+            ],
+            expectedDiagnostics: [
+                (level: .error, kind: .missingEqualsInAssignment, line: 2)
+            ],
+            expectedIncludeDirectivesCount: 0
+        )
+        TestMacroConfigFileParser(
+            "",
+            expectedAssignments: [],
+            expectedDiagnostics: [],
+            expectedIncludeDirectivesCount: 0
+        )
+        TestMacroConfigFileParser(
+            "\n\r",
+            expectedAssignments: [],
+            expectedDiagnostics: [],
+            expectedIncludeDirectivesCount: 0
+        )
+        TestMacroConfigFileParser(
+            "\r\r\r\r\r\r\r\r\r\r\r//",
+            expectedAssignments: [],
+            expectedDiagnostics: [],
+            expectedIncludeDirectivesCount: 0
+        )
+        TestMacroConfigFileParser(
+            "\r\r\r\r\r\r\r\r\r\r\r\\",
+            expectedAssignments: [],
+            expectedDiagnostics: [
+                (level: .error, kind: .unexpectedCharacter, line: 12)
+            ],
+            expectedIncludeDirectivesCount: 0
+        )
+        TestMacroConfigFileParser(
+            "#include \"Missing.xcconfig\"",
+            expectedAssignments: [],
+            expectedDiagnostics: [
+                (level: .error, kind: .missingIncludedFile, line: 1)
+            ],
+            expectedIncludeDirectivesCount: 0
+        )
+        TestMacroConfigFileParser(
+            "#include? \"Missing.xcconfig\"",
+            expectedAssignments: [],
+            expectedDiagnostics: [],
+            expectedIncludeDirectivesCount: 0
+        )
+        TestMacroConfigFileParser(
+            "#include \"All.xcconfig\"",
+            expectedAssignments: [(macro: "OTHER_CFLAGS", conditions: [], value: "bla bla"), (macro: "OTHER_CFLAGS", conditions: [], value: "bla bla"), (macro: "OTHER_CFLAGS", conditions: [(param: "arch", pattern: "i386")], value: "$(inherited) more"), (macro: "OTHER_CFLAGS", conditions: [(param: "arch", pattern: "z80")], value: "$(inherited) 8-bit"), (macro: "OTHER_CFLAGS", conditions: [(param: "arch", pattern: "CMOS 65816")], value: "$(inherited) 16-bit"), (macro: "OTHER_CFLAGS", conditions: [(param: "arch", pattern: "m68k")], value: "$(inherited) 32-bit")],
+            expectedDiagnostics: [],
+            expectedIncludeDirectivesCount: 5
         )
     }
 
     @Test
     func ensureOldSingleLineBehavior() {
-        TestMacroConfigFileParser("#include \"EnsureOldSingleLineBehavior.xcconfig\"",
-                                  expectedAssignments: [(macro: "A", conditions: [], value: "B"), (macro: "D", conditions: [], value: "E")],
-                                  expectedDiagnostics: [(level: MacroConfigFileDiagnostic.Level.error, kind: MacroConfigFileDiagnostic.Kind.missingEqualsInAssignment, line: 2)],
-                                  expectedIncludeDirectivesCount: 1
+        TestMacroConfigFileParser(
+            "#include \"EnsureOldSingleLineBehavior.xcconfig\"",
+            expectedAssignments: [(macro: "A", conditions: [], value: "B"), (macro: "D", conditions: [], value: "E")],
+            expectedDiagnostics: [(level: MacroConfigFileDiagnostic.Level.error, kind: MacroConfigFileDiagnostic.Kind.missingEqualsInAssignment, line: 2)],
+            expectedIncludeDirectivesCount: 1
         )
     }
 
     @Test
     func multiline() {
-        TestMacroConfigFileParser("#include \"Multiline.xcconfig\"",
-                                  expectedAssignments: [
-                                    (macro: "FEATURE_DEFINES_A", conditions: [], value: "$(A) $(B) $(C)"),
-                                    (macro: "FEATURE_DEFINES_B", conditions: [], value: "$(D) $(E) $(F)"),
-                                    (macro: "FEATURE_DEFINES_C", conditions: [], value: "$(G) $(H)"),
-                                    (macro: "FEATURE_DEFINES_D", conditions: [], value: "$(I)")
-                                  ],
-                                  expectedDiagnostics: [],
-                                  expectedIncludeDirectivesCount: 1
-        )
-
-        TestMacroConfigFileParser("#include \"MultilineError1.xcconfig\"",
-                                  expectedAssignments: [(macro: "FEATURE_DEFINES_E", conditions: [], value: "")],
-                                  expectedDiagnostics: [(level: MacroConfigFileDiagnostic.Level.error, kind: MacroConfigFileDiagnostic.Kind.unexpectedCharacter, line: 2)],
-                                  expectedIncludeDirectivesCount: 1
+        TestMacroConfigFileParser(
+            "#include \"Multiline.xcconfig\"",
+            expectedAssignments: [
+                (macro: "FEATURE_DEFINES_A", conditions: [], value: "$(A) $(B) $(C)"),
+                (macro: "FEATURE_DEFINES_B", conditions: [], value: "$(D) $(E) $(F)"),
+                (macro: "FEATURE_DEFINES_C", conditions: [], value: "$(G) $(H)"),
+                (macro: "FEATURE_DEFINES_D", conditions: [], value: "$(I)"),
+            ],
+            expectedDiagnostics: [],
+            expectedIncludeDirectivesCount: 1
+        )
+
+        TestMacroConfigFileParser(
+            "#include \"MultilineError1.xcconfig\"",
+            expectedAssignments: [(macro: "FEATURE_DEFINES_E", conditions: [], value: "")],
+            expectedDiagnostics: [(level: MacroConfigFileDiagnostic.Level.error, kind: MacroConfigFileDiagnostic.Kind.unexpectedCharacter, line: 2)],
+            expectedIncludeDirectivesCount: 1
         )
     }
 
@@ -690,7 +800,8 @@ fileprivate let testFileData = [
             expectedAssignments: [
                 (macro: "COMPOSE_ME", conditions: [], value: "YES"),
                 (macro: "MY_VALUE_YES", conditions: [], value: "\"DOES THIS WORK?\""),
-                (macro: "MY_VALUE", conditions: [], value: "$(MY_VALUE_ $(COMPOSE_ME))")],
+                (macro: "MY_VALUE", conditions: [], value: "$(MY_VALUE_ $(COMPOSE_ME))"),
+            ],
             expectedDiagnostics: [],
             expectedIncludeDirectivesCount: 1
         )
@@ -711,10 +822,13 @@ fileprivate let testFileData = [
         TestMacroConfigFileParser(
             "#include \"BackslashInConditions.xcconfig\"",
             expectedAssignments: [(macro: "sdk", conditions: [], value: "iphoneos*, arch=arm64 ] = big spaces")],
-            expectedDiagnostics:  [
-                (level: MacroConfigFileDiagnostic.Level.error,
-                 kind: MacroConfigFileDiagnostic.Kind.unexpectedCharacter,
-                 line: 1)],
+            expectedDiagnostics: [
+                (
+                    level: MacroConfigFileDiagnostic.Level.error,
+                    kind: MacroConfigFileDiagnostic.Kind.unexpectedCharacter,
+                    line: 1
+                )
+            ],
             expectedIncludeDirectivesCount: 1
         )
     }
@@ -735,22 +849,25 @@ fileprivate let testFileData = [
             expectedIncludeDirectivesCount: 1
         )
 
-        TestMacroConfigFileParser("#include \"BasicMultilineExampleCanonical.xcconfig\"",
-                                  expectedAssignments: [(macro: "MY_VALUE", conditions: [], value: "-f -g -h")],
-                                  expectedDiagnostics: [],
-                                  expectedIncludeDirectivesCount: 1
+        TestMacroConfigFileParser(
+            "#include \"BasicMultilineExampleCanonical.xcconfig\"",
+            expectedAssignments: [(macro: "MY_VALUE", conditions: [], value: "-f -g -h")],
+            expectedDiagnostics: [],
+            expectedIncludeDirectivesCount: 1
         )
     }
 
-
     @Test
     func terminatingBackslashInsideStringLiteral() {
         TestMacroConfigFileParser(
             "#include \"TerminatingBackslashInsideStringLiteral.xcconfig\"",
             expectedAssignments: [
-                (macro: "MY_STRING",
-                 conditions: [],
-                 value: "\"Now this is a story all about how my life got flipped, turned upside down\"")],
+                (
+                    macro: "MY_STRING",
+                    conditions: [],
+                    value: "\"Now this is a story all about how my life got flipped, turned upside down\""
+                )
+            ],
             expectedDiagnostics: [],
             expectedIncludeDirectivesCount: 1
         )
@@ -761,28 +878,34 @@ fileprivate let testFileData = [
         TestMacroConfigFileParser(
             "#include \"TerminatingBackslashInsideEmptyLine.xcconfig\"",
             expectedAssignments: [
-                (macro: "MY_STRING",
-                 conditions: [],
-                 value: "\"hello I really wanted a new line above, and apparently the works in strings.\"")],
+                (
+                    macro: "MY_STRING",
+                    conditions: [],
+                    value: "\"hello I really wanted a new line above, and apparently the works in strings.\""
+                )
+            ],
             expectedDiagnostics: [],
             expectedIncludeDirectivesCount: 1
         )
     }
 
-
     @Test
     func backslashInBothConditionAndRHS() {
-        TestMacroConfigFileParser("#include \"BackslashInBothConditionAndRHS.xcconfig\"",
-                                  expectedAssignments:  [(macro: "sdk", conditions: [], value: "iphone* config = Debug ] = -DEBUG -MOREDEBUGZ")],
-                                  expectedDiagnostics: [
-                                    (level: MacroConfigFileDiagnostic.Level.error,
-                                     kind: MacroConfigFileDiagnostic.Kind.unexpectedCharacter,
-                                     line: 1)],
-                                  expectedIncludeDirectivesCount: 1
+        TestMacroConfigFileParser(
+            "#include \"BackslashInBothConditionAndRHS.xcconfig\"",
+            expectedAssignments: [(macro: "sdk", conditions: [], value: "iphone* config = Debug ] = -DEBUG -MOREDEBUGZ")],
+            expectedDiagnostics: [
+                (
+                    level: MacroConfigFileDiagnostic.Level.error,
+                    kind: MacroConfigFileDiagnostic.Kind.unexpectedCharacter,
+                    line: 1
+                )
+            ],
+            expectedIncludeDirectivesCount: 1
         )
     }
 
-    class ParserDelegate : MacroConfigFileParserDelegate {
+    class ParserDelegate: MacroConfigFileParserDelegate {
         var diagnosticMessages = [String]()
 
         func foundPreprocessorInclusion(_ fileName: String, optional: Bool, parser: MacroConfigFileParser) -> MacroConfigFileParser? {
@@ -807,60 +930,65 @@ fileprivate let testFileData = [
 
     @Test
     func parserProvidesLocationInformation() throws {
-        TestMacroConfigFileParser("#include \"Multiline.xcconfig\"",
-                                  expectedAssignments: [
-                                    (macro: "FEATURE_DEFINES_A", conditions: [], value: "$(A) $(B) $(C)"),
-                                    (macro: "FEATURE_DEFINES_B", conditions: [], value: "$(D) $(E) $(F)"),
-                                    (macro: "FEATURE_DEFINES_C", conditions: [], value: "$(G) $(H)"),
-                                    (macro: "FEATURE_DEFINES_D", conditions: [], value: "$(I)")
-                                  ],
-                                  expectedDiagnostics: [],
-                                  expectedLocations: [
-                                    (macro: "FEATURE_DEFINES_A", path: .init("Multiline.xcconfig"), startLine: 1, endLine: 2, startColumn: 20, endColumn: 37),
-                                    (macro: "FEATURE_DEFINES_B", path: .init("Multiline.xcconfig"), startLine: 3, endLine: 5, startColumn: 20, endColumn: 87),
-                                    (macro: "FEATURE_DEFINES_C", path: .init("Multiline.xcconfig"), startLine: 6, endLine: 9, startColumn: 20, endColumn: 61),
-                                    (macro: "FEATURE_DEFINES_D", path: .init("Multiline.xcconfig"), startLine: 10, endLine: 11, startColumn: 20, endColumn: 45),
-                                  ],
-                                  expectedIncludeDirectivesCount: 1
+        TestMacroConfigFileParser(
+            "#include \"Multiline.xcconfig\"",
+            expectedAssignments: [
+                (macro: "FEATURE_DEFINES_A", conditions: [], value: "$(A) $(B) $(C)"),
+                (macro: "FEATURE_DEFINES_B", conditions: [], value: "$(D) $(E) $(F)"),
+                (macro: "FEATURE_DEFINES_C", conditions: [], value: "$(G) $(H)"),
+                (macro: "FEATURE_DEFINES_D", conditions: [], value: "$(I)"),
+            ],
+            expectedDiagnostics: [],
+            expectedLocations: [
+                (macro: "FEATURE_DEFINES_A", path: .init("Multiline.xcconfig"), startLine: 1, endLine: 2, startColumn: 20, endColumn: 37),
+                (macro: "FEATURE_DEFINES_B", path: .init("Multiline.xcconfig"), startLine: 3, endLine: 5, startColumn: 20, endColumn: 87),
+                (macro: "FEATURE_DEFINES_C", path: .init("Multiline.xcconfig"), startLine: 6, endLine: 9, startColumn: 20, endColumn: 61),
+                (macro: "FEATURE_DEFINES_D", path: .init("Multiline.xcconfig"), startLine: 10, endLine: 11, startColumn: 20, endColumn: 45),
+            ],
+            expectedIncludeDirectivesCount: 1
         )
     }
 
     @Test
     func finalLineAndColumnTracking() {
         // Test empty string
-        TestMacroConfigFileParser("",
-                                  expectedAssignments: [],
-                                  expectedDiagnostics: [],
-                                  expectedIncludeDirectivesCount: 0,
-                                  expectedEndLine: 1,
-                                  expectedEndColumn: 1
+        TestMacroConfigFileParser(
+            "",
+            expectedAssignments: [],
+            expectedDiagnostics: [],
+            expectedIncludeDirectivesCount: 0,
+            expectedEndLine: 1,
+            expectedEndColumn: 1
         )
 
         // Test single line assignment
-        TestMacroConfigFileParser("A = B",
-                                  expectedAssignments: [(macro: "A", conditions: [], value: "B")],
-                                  expectedDiagnostics: [],
-                                  expectedIncludeDirectivesCount: 0,
-                                  expectedEndLine: 1,
-                                  expectedEndColumn: 6
+        TestMacroConfigFileParser(
+            "A = B",
+            expectedAssignments: [(macro: "A", conditions: [], value: "B")],
+            expectedDiagnostics: [],
+            expectedIncludeDirectivesCount: 0,
+            expectedEndLine: 1,
+            expectedEndColumn: 6
         )
 
         // Test multiple lines with empty line at end
-        TestMacroConfigFileParser("A = B\n\n",
-                                  expectedAssignments: [(macro: "A", conditions: [], value: "B")],
-                                  expectedDiagnostics: [],
-                                  expectedIncludeDirectivesCount: 0,
-                                  expectedEndLine: 3,
-                                  expectedEndColumn: 1
+        TestMacroConfigFileParser(
+            "A = B\n\n",
+            expectedAssignments: [(macro: "A", conditions: [], value: "B")],
+            expectedDiagnostics: [],
+            expectedIncludeDirectivesCount: 0,
+            expectedEndLine: 3,
+            expectedEndColumn: 1
         )
 
         // Test with comment-only line at end
-        TestMacroConfigFileParser("A = B\n// This is a comment",
-                                  expectedAssignments: [(macro: "A", conditions: [], value: "B")],
-                                  expectedDiagnostics: [],
-                                  expectedIncludeDirectivesCount: 0,
-                                  expectedEndLine: 2,
-                                  expectedEndColumn: 21
+        TestMacroConfigFileParser(
+            "A = B\n// This is a comment",
+            expectedAssignments: [(macro: "A", conditions: [], value: "B")],
+            expectedDiagnostics: [],
+            expectedIncludeDirectivesCount: 0,
+            expectedEndLine: 2,
+            expectedEndColumn: 21
         )
     }
 }
@@ -874,7 +1002,7 @@ typealias LocationInfo = (macro: String, path: Path, startLine: Int, endLine: In
 private func TestMacroConfigFileParser(_ string: String, expectedAssignments: [AssignmentInfo], expectedDiagnostics: [DiagnosticInfo], expectedLocations: [LocationInfo]? = nil, expectedIncludeDirectivesCount: Int, expectedEndLine: Int? = nil, expectedEndColumn: Int? = nil, sourceLocation: SourceLocation = #_sourceLocation) {
 
     /// We use a custom delegate to test that we’re getting the expected results, which for the sake of convenience are just kept in (name, conds:[(cond-param, cond-value)], value) tuples, i.e. conditions is an array of two-element tuples.
-    class ConfigFileParserTestDelegate : MacroConfigFileParserDelegate {
+    class ConfigFileParserTestDelegate: MacroConfigFileParserDelegate {
         var assignments = Array<AssignmentInfo>()
         var diagnostics = Array<DiagnosticInfo>()
         var locations = Array<LocationInfo>()
@@ -935,39 +1063,38 @@ private func TestMacroConfigFileParser(_ string: String, expectedAssignments: [A
 }
 
 // A bunch of free functions that let us compare our typealiased tuples.
-func ==(lhs: ConditionInfo, rhs: ConditionInfo) -> Bool {
+func == (lhs: ConditionInfo, rhs: ConditionInfo) -> Bool {
     return (lhs.param == rhs.param) && (lhs.pattern == rhs.pattern)
 }
 
-func ==(lhs: [ConditionInfo], rhs: [ConditionInfo]) -> Bool {
+func == (lhs: [ConditionInfo], rhs: [ConditionInfo]) -> Bool {
     return lhs.count == rhs.count && zip(lhs, rhs).filter({ return !($0.0 == $0.1) }).isEmpty
 }
 
-func ==(lhs: AssignmentInfo, rhs: AssignmentInfo) -> Bool {
+func == (lhs: AssignmentInfo, rhs: AssignmentInfo) -> Bool {
     return (lhs.macro == rhs.macro) && (lhs.conditions == rhs.conditions) && (lhs.value == rhs.value)
 }
 
-func ==(lhs: [AssignmentInfo], rhs: [AssignmentInfo]) -> Bool {
+func == (lhs: [AssignmentInfo], rhs: [AssignmentInfo]) -> Bool {
     return lhs.count == rhs.count && zip(lhs, rhs).filter({ return !($0.0 == $0.1) }).isEmpty
 }
 
-func ==(lhs: DiagnosticInfo, rhs: DiagnosticInfo) -> Bool {
+func == (lhs: DiagnosticInfo, rhs: DiagnosticInfo) -> Bool {
     return (lhs.level == rhs.level) && (lhs.kind == rhs.kind) && (lhs.line == rhs.line)
 }
 
-func ==(lhs: [DiagnosticInfo], rhs: [DiagnosticInfo]) -> Bool {
+func == (lhs: [DiagnosticInfo], rhs: [DiagnosticInfo]) -> Bool {
     return lhs.count == rhs.count && zip(lhs, rhs).filter({ return !($0.0 == $0.1) }).isEmpty
 }
 
-func ==(lhs: LocationInfo, rhs: LocationInfo) -> Bool {
+func == (lhs: LocationInfo, rhs: LocationInfo) -> Bool {
     return (lhs.macro == rhs.macro) && (lhs.path == rhs.path) && (lhs.startLine == rhs.startLine) && (lhs.endLine == rhs.endLine) && (lhs.startColumn == rhs.startColumn) && (lhs.endColumn == rhs.endColumn)
 }
 
-func ==(lhs: [LocationInfo], rhs: [LocationInfo]) -> Bool {
+func == (lhs: [LocationInfo], rhs: [LocationInfo]) -> Bool {
     return lhs.count == rhs.count && zip(lhs, rhs).filter({ return !($0.0 == $0.1) }).isEmpty
 }
 
-
 /// Private helper function that parses a string representation as either a string or a string list (depending on the parameter), and checks the resulting parser delegate method call sequence and diagnostics (if applicable) against what’s expected.  This is a private function that’s called by the two internal test functions TestMacroStringParsing() and TestMacroStringListParsing().  The original file name and line number are passed in so that Xcode diagnostics will refer to the call site.  Each diagnostic is provided by the unit test as a tuple containing the level, kind, and associated range (expressed as start and end “distances”, in the manner of Int.Distance, into the original string).
 private func TestMacroParsing(_ string: String, asList: Bool, expectedCallLogEntries: [ParseDelegateCallLogEntry], expectedDiagnosticInfos: [(level: MacroExpressionDiagnostic.Level, kind: MacroExpressionDiagnostic.Kind, start: Int, end: Int)], sourceLocation: SourceLocation = #_sourceLocation) {
     // Create a parser delegate of our special class that records a "method call log" that we can then compare against what's expected.
@@ -979,8 +1106,7 @@ private func TestMacroParsing(_ string: String, asList: Bool, expectedCallLogEnt
     // Parse the input string as either a string or a list, depending on what we were asked to do.
     if asList {
         parser.parseAsStringList()
-    }
-    else {
+    } else {
         parser.parseAsString();
     }
 
@@ -995,23 +1121,20 @@ private func TestMacroParsing(_ string: String, asList: Bool, expectedCallLogEnt
     #expect(delegate.diagnostics == expectedDiagnostics, "expected parse diagnostics \(expectedDiagnostics), but instead got \(delegate.diagnostics)", sourceLocation: sourceLocation)
 }
 
-
 /// Helper function that parses a macro string as a string, and checks the resulting parser delegate method call sequence and diagnostics (if applicable) against what’s expected.
 fileprivate func TestMacroStringParsing(_ string: String, _ expectedCallLogEntries: [ParseDelegateCallLogEntry], expectedDiagnostics: [(level: MacroExpressionDiagnostic.Level, kind: MacroExpressionDiagnostic.Kind, start: Int, end: Int)] = [], sourceLocation: SourceLocation = #_sourceLocation) {
     // Just call our “helper helper” function, asking it to parse the input string as a string (as opposed to a string list).
     TestMacroParsing(string, asList: false, expectedCallLogEntries: expectedCallLogEntries, expectedDiagnosticInfos: expectedDiagnostics, sourceLocation: sourceLocation)
 }
 
-
 ///  Helper function that parses a macro string as a string list, and checks the result and delegate "method call log" against what's expected.
 fileprivate func TestMacroStringListParsing(_ string: String, _ expectedCallLogEntries: [ParseDelegateCallLogEntry], expectedDiagnostics: [(level: MacroExpressionDiagnostic.Level, kind: MacroExpressionDiagnostic.Kind, start: Int, end: Int)] = [], sourceLocation: SourceLocation = #_sourceLocation) {
     // Just call our “helper helper” function, asking it to parse the input string as a string (as opposed to a string list).
     TestMacroParsing(string, asList: true, expectedCallLogEntries: expectedCallLogEntries, expectedDiagnosticInfos: expectedDiagnostics, sourceLocation: sourceLocation)
 }
 
-
 /// For testing purposes. Our delegate (below) keeps a log of the methods that were called, and in what order and with what parameters. Then we can compare that against what was expected.
-fileprivate enum ParseDelegateCallLogEntry : Equatable, CustomDebugStringConvertible {
+fileprivate enum ParseDelegateCallLogEntry: Equatable, CustomDebugStringConvertible {
     case literalChars(String)
     case literalStringFormOnlyChars(String)
     case startSubstSubexpr
@@ -1044,7 +1167,7 @@ fileprivate enum ParseDelegateCallLogEntry : Equatable, CustomDebugStringConvert
 }
 
 /// Necessary until we have <rdar://problem/15202393> Derived conformances for Equatable, Comparable, Hashable, etc.
-fileprivate func ==(lhs: ParseDelegateCallLogEntry, rhs: ParseDelegateCallLogEntry) -> Bool {
+fileprivate func == (lhs: ParseDelegateCallLogEntry, rhs: ParseDelegateCallLogEntry) -> Bool {
     // This is a bit unfortunate, but is necessary due to <rdar://problem/19525557> Enums with associated values should be Equatable if the values are equatable
     switch (lhs, rhs) {
     case (.literalChars(let x), .literalChars(let y)) where x == y: return true
@@ -1075,7 +1198,7 @@ fileprivate func ==(lhs: ParseDelegateCallLogEntry, rhs: ParseDelegateCallLogEnt
 }
 
 ///  For testing purposes.  Helper delegate that keeps a log of the methods that were called, and in what order and with what parameters.  Then we can compare that against what was expected.
-fileprivate final class TestDelegate : MacroExpressionParserDelegate {
+fileprivate final class TestDelegate: MacroExpressionParserDelegate {
     // Keep an array of call log entries, and add to it whenever we get a call.
     var callLogEntries: [ParseDelegateCallLogEntry] = []
     var diagnostics: [MacroExpressionDiagnostic] = []
diff --git a/Tests/SWBProjectModelTests/PIFSerializationTests.swift b/Tests/SWBProjectModelTests/PIFSerializationTests.swift
index 3171a955..afab8671 100644
--- a/Tests/SWBProjectModelTests/PIFSerializationTests.swift
+++ b/Tests/SWBProjectModelTests/PIFSerializationTests.swift
@@ -49,11 +49,11 @@ import SWBProjectModel
 
         // Serialize the aggregate target and check that nothing was lost.
         let targetDict = aggregateTarget.serialize(to: TestSerializer())
-        let dependencies = try #require(targetDict["dependencies"] as? Array<Dictionary<String,Any>>)
+        let dependencies = try #require(targetDict["dependencies"] as? Array<Dictionary<String, Any>>)
         #expect(dependencies.count == 1)
         let firstDependency = try #require(dependencies.first)
         #expect(firstDependency["guid"] as? String == standardTarget.id)
-        let platformFilters = try #require(firstDependency["platformFilters"] as? Array<Dictionary<String,Any>>)
+        let platformFilters = try #require(firstDependency["platformFilters"] as? Array<Dictionary<String, Any>>)
         #expect(platformFilters.count == 1)
         let firstPlatformFilter = try #require(platformFilters.first)
         #expect(firstPlatformFilter["platform"] as? String == "linux")
diff --git a/Tests/SWBProtocolTests/MessageSerializationTests.swift b/Tests/SWBProtocolTests/MessageSerializationTests.swift
index 17445420..30d1225c 100644
--- a/Tests/SWBProtocolTests/MessageSerializationTests.swift
+++ b/Tests/SWBProtocolTests/MessageSerializationTests.swift
@@ -253,7 +253,7 @@ import Testing
     }
 }
 
-fileprivate func assertMsgPackRoundTrip<T>(_ objectExpression: @autoclosure () throws -> T, sourceLocation: SourceLocation = #_sourceLocation, body: ((T, T) throws -> Void)? = nil) rethrows where T : Equatable & Serializable {
+fileprivate func assertMsgPackRoundTrip<T>(_ objectExpression: @autoclosure () throws -> T, sourceLocation: SourceLocation = #_sourceLocation, body: ((T, T) throws -> Void)? = nil) rethrows where T: Equatable & Serializable {
     let object = try objectExpression()
     let serializer = MsgPackSerializer()
     serializer.serialize(object)
@@ -263,7 +263,7 @@ fileprivate func assertMsgPackRoundTrip<T>(_ objectExpression: @autoclosure () t
     }
 }
 
-fileprivate func assertMsgPackMessageRoundTrip<T>(_ objectExpression: @autoclosure () throws -> T, sourceLocation: SourceLocation = #_sourceLocation, body: ((T, T) throws -> Void)? = nil) rethrows where T : Message & Equatable & Serializable {
+fileprivate func assertMsgPackMessageRoundTrip<T>(_ objectExpression: @autoclosure () throws -> T, sourceLocation: SourceLocation = #_sourceLocation, body: ((T, T) throws -> Void)? = nil) rethrows where T: Message & Equatable & Serializable {
     try assertMsgPackRoundTrip(objectExpression(), sourceLocation: sourceLocation, body: body)
     let ipcObject = IPCMessage(try objectExpression())
     let ipcSerializer = MsgPackSerializer()
diff --git a/Tests/SWBQNXPlatformTests/SWBQNXPlatformTests.swift b/Tests/SWBQNXPlatformTests/SWBQNXPlatformTests.swift
index bdce751c..e4aa872c 100644
--- a/Tests/SWBQNXPlatformTests/SWBQNXPlatformTests.swift
+++ b/Tests/SWBQNXPlatformTests/SWBQNXPlatformTests.swift
@@ -31,16 +31,20 @@ fileprivate struct QNXBuildOperationTests: CoreBasedTests {
                         TestFile("main.c"),
                         TestFile("dynamic.c"),
                         TestFile("static.c"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ARCHS": arch,
-                        "CODE_SIGNING_ALLOWED": "NO",
-                        "DEFINES_MODULE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "qnx",
-                        "SUPPORTED_PLATFORMS": "qnx",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ARCHS": arch,
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "DEFINES_MODULE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "qnx",
+                            "SUPPORTED_PLATFORMS": "qnx",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -54,7 +58,7 @@ fileprivate struct QNXBuildOperationTests: CoreBasedTests {
                             TestFrameworksBuildPhase([
                                 TestBuildFile(.target("dynamiclib")),
                                 TestBuildFile(.target("staticlib")),
-                            ])
+                            ]),
                         ],
                         dependencies: [
                             "dynamiclib",
@@ -65,15 +69,18 @@ fileprivate struct QNXBuildOperationTests: CoreBasedTests {
                         "dynamiclib",
                         type: .dynamicLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "DYLIB_INSTALL_NAME_BASE": "$ORIGIN",
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "DYLIB_INSTALL_NAME_BASE": "$ORIGIN",
 
-                                // FIXME: Find a way to make these default
-                                "EXECUTABLE_PREFIX": "lib",
-                            ])
+                                    // FIXME: Find a way to make these default
+                                    "EXECUTABLE_PREFIX": "lib",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["dynamic.c"]),
+                            TestSourcesBuildPhase(["dynamic.c"])
                         ],
                         productReferenceName: "libdynamiclib.so"
                     ),
@@ -81,16 +88,20 @@ fileprivate struct QNXBuildOperationTests: CoreBasedTests {
                         "staticlib",
                         type: .staticLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                // FIXME: Find a way to make these default
-                                "EXECUTABLE_PREFIX": "lib",
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    // FIXME: Find a way to make these default
+                                    "EXECUTABLE_PREFIX": "lib"
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["static.c"]),
+                            TestSourcesBuildPhase(["static.c"])
                         ]
                     ),
-                ])
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
@@ -126,7 +137,7 @@ fileprivate struct QNXBuildOperationTests: CoreBasedTests {
                         .pathEqual(prefix: "-L", tmpDir.join("build/Debug-qnx")),
                         .pathEqual(prefix: "@", tmpDir.join("build/TestProject.build/Debug-qnx/dynamiclib.build/Objects-normal/\(arch)/dynamiclib.LinkFileList")),
                         "-Wl,-h$ORIGIN/libdynamiclib.so",
-                        "-o", .path(tmpDir.join("build/Debug-qnx/libdynamiclib.so"))
+                        "-o", .path(tmpDir.join("build/Debug-qnx/libdynamiclib.so")),
                     ])
                 }
 
@@ -140,7 +151,7 @@ fileprivate struct QNXBuildOperationTests: CoreBasedTests {
                         .pathEqual(prefix: "@", tmpDir.join("build/TestProject.build/Debug-qnx/tool.build/Objects-normal/\(arch)/tool.LinkFileList")),
                         "-ldynamiclib",
                         "-lstaticlib",
-                        "-o", .path(tmpDir.join("build/Debug-qnx/tool"))
+                        "-o", .path(tmpDir.join("build/Debug-qnx/tool")),
                     ])
                 }
 
diff --git a/Tests/SWBTaskConstructionPerfTests/TaskConstructionPerfTests.swift b/Tests/SWBTaskConstructionPerfTests/TaskConstructionPerfTests.swift
index d9ffa8b7..abcb14d6 100644
--- a/Tests/SWBTaskConstructionPerfTests/TaskConstructionPerfTests.swift
+++ b/Tests/SWBTaskConstructionPerfTests/TaskConstructionPerfTests.swift
@@ -29,12 +29,17 @@ fileprivate struct TaskConstructionPerfTests: CoreBasedTests, PerfTests {
             let targets: [TestStandardTarget] = (0..<500).map {
                 let buildPath = tmpDir.join("build/\($0)")
                 return TestStandardTarget(
-                    "CoreFoo\($0)", type: .framework,
+                    "CoreFoo\($0)",
+                    type: .framework,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
-                            buildSettings: ["OBJROOT": buildPath.str, "SYMROOT": buildPath.str, "DSTROOT": buildPath.str])],
-                    buildPhases: [TestSourcesBuildPhase(["foo.c"])], dependencies: ["OtherFramework"])
+                            buildSettings: ["OBJROOT": buildPath.str, "SYMROOT": buildPath.str, "DSTROOT": buildPath.str]
+                        )
+                    ],
+                    buildPhases: [TestSourcesBuildPhase(["foo.c"])],
+                    dependencies: ["OtherFramework"]
+                )
             }
 
             let testWorkspace = TestWorkspace(
@@ -44,10 +49,18 @@ fileprivate struct TaskConstructionPerfTests: CoreBasedTests, PerfTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup("Sources", children: [TestFile("foo.c")]),
-                        buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)",
-                                                                                              "GENERATE_INFOPLIST_FILE": "YES",
-                                                                                              "USE_HEADERMAP": "NO"])],
-                        targets: [TestAggregateTarget("all", dependencies: targets.map(\.name))] + targets)
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "USE_HEADERMAP": "NO",
+                                ]
+                            )
+                        ],
+                        targets: [TestAggregateTarget("all", dependencies: targets.map(\.name))] + targets
+                    )
                 ]
             )
             let tester = try await TaskConstructionTester(self.getCore(), testWorkspace)
diff --git a/Tests/SWBTaskConstructionTests/AppExtensionTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/AppExtensionTaskConstructionTests.swift
index f84215a3..e5c3bd90 100644
--- a/Tests/SWBTaskConstructionTests/AppExtensionTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/AppExtensionTaskConstructionTests.swift
@@ -24,18 +24,23 @@ fileprivate struct AppExtensionTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "Sources", children: [
+                "Sources",
+                children: [
                     TestFile("Source.c"),
                     TestFile("Legacy.appex", fileType: "wrapper.app-extension", sourceTree: .buildSetting("BUILT_PRODUCTS_DIR")),
                     TestFile("Modern.appex", fileType: "wrapper.extensionkit-extension", sourceTree: .buildSetting("BUILT_PRODUCTS_DIR")),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTED_PLATFORMS": "macosx iphoneos",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTED_PLATFORMS": "macosx iphoneos",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -46,12 +51,24 @@ fileprivate struct AppExtensionTaskConstructionTests: CoreBasedTests {
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["Source.c"]),
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile(.target("Legacy"))], destinationSubfolder: .plugins, onlyForDeployment: false),
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile(.target("Modern"))], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(EXTENSIONS_FOLDER_PATH)", onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile(.target("Legacy"))
+                            ],
+                            destinationSubfolder: .plugins,
+                            onlyForDeployment: false
+                        ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile(.target("Modern"))
+                            ],
+                            destinationSubfolder: .builtProductsDir,
+                            destinationSubpath: "$(EXTENSIONS_FOLDER_PATH)",
+                            onlyForDeployment: false
+                        ),
                     ],
-                    dependencies: ["Legacy", "Modern"]),
+                    dependencies: ["Legacy", "Modern"]
+                ),
                 TestStandardTarget(
                     "Legacy",
                     type: .applicationExtension,
@@ -59,8 +76,9 @@ fileprivate struct AppExtensionTaskConstructionTests: CoreBasedTests {
                         TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["Source.c"]),
-                    ]),
+                        TestSourcesBuildPhase(["Source.c"])
+                    ]
+                ),
                 TestStandardTarget(
                     "Modern",
                     type: .extensionKitExtension,
@@ -69,12 +87,24 @@ fileprivate struct AppExtensionTaskConstructionTests: CoreBasedTests {
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["Source.c"]),
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile(.target("Legacy"))], destinationSubfolder: .plugins, onlyForDeployment: false),
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile(.target("Modern"))], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(EXTENSIONS_FOLDER_PATH)", onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile(.target("Legacy"))
+                            ],
+                            destinationSubfolder: .plugins,
+                            onlyForDeployment: false
+                        ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile(.target("Modern"))
+                            ],
+                            destinationSubfolder: .builtProductsDir,
+                            destinationSubpath: "$(EXTENSIONS_FOLDER_PATH)",
+                            onlyForDeployment: false
+                        ),
                     ],
-                    dependencies: ["Legacy", "Modern"]),
+                    dependencies: ["Legacy", "Modern"]
+                ),
                 TestStandardTarget(
                     "Legacy",
                     type: .applicationExtension,
@@ -82,8 +112,9 @@ fileprivate struct AppExtensionTaskConstructionTests: CoreBasedTests {
                         TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["Source.c"]),
-                    ]),
+                        TestSourcesBuildPhase(["Source.c"])
+                    ]
+                ),
                 TestStandardTarget(
                     "Modern",
                     type: .extensionKitExtension,
@@ -91,9 +122,11 @@ fileprivate struct AppExtensionTaskConstructionTests: CoreBasedTests {
                         TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["Source.c"]),
-                    ]),
-            ])
+                        TestSourcesBuildPhase(["Source.c"])
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(BuildParameters(action: .build, configuration: "Debug"), runDestination: .macOS) { results in
@@ -114,21 +147,26 @@ fileprivate struct AppExtensionTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "Sources", children: [
+                "Sources",
+                children: [
                     TestFile("source.swift"),
                     TestFile("Legacy.appex", fileType: "wrapper.app-extension", sourceTree: .buildSetting("BUILT_PRODUCTS_DIR")),
                     TestFile("Modern.appex", fileType: "wrapper.extensionkit-extension", sourceTree: .buildSetting("BUILT_PRODUCTS_DIR")),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTED_PLATFORMS": "macosx iphoneos",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTED_PLATFORMS": "macosx iphoneos",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -139,12 +177,24 @@ fileprivate struct AppExtensionTaskConstructionTests: CoreBasedTests {
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["source.swift"]),
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile(.target("Legacy"))], destinationSubfolder: .plugins, onlyForDeployment: false),
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile(.target("Modern"))], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(EXTENSIONS_FOLDER_PATH)", onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile(.target("Legacy"))
+                            ],
+                            destinationSubfolder: .plugins,
+                            onlyForDeployment: false
+                        ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile(.target("Modern"))
+                            ],
+                            destinationSubfolder: .builtProductsDir,
+                            destinationSubpath: "$(EXTENSIONS_FOLDER_PATH)",
+                            onlyForDeployment: false
+                        ),
                     ],
-                    dependencies: ["Legacy", "Modern"]),
+                    dependencies: ["Legacy", "Modern"]
+                ),
                 TestStandardTarget(
                     "Legacy",
                     type: .applicationExtension,
@@ -152,8 +202,9 @@ fileprivate struct AppExtensionTaskConstructionTests: CoreBasedTests {
                         TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["source.swift"]),
-                    ]),
+                        TestSourcesBuildPhase(["source.swift"])
+                    ]
+                ),
                 TestStandardTarget(
                     "Modern",
                     type: .extensionKitExtension,
@@ -161,9 +212,11 @@ fileprivate struct AppExtensionTaskConstructionTests: CoreBasedTests {
                         TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["source.swift"]),
-                    ]),
-            ])
+                        TestSourcesBuildPhase(["source.swift"])
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(BuildParameters(action: .build, configuration: "Debug"), runDestination: .macOS) { results in
diff --git a/Tests/SWBTaskConstructionTests/AppIntentsMetadataTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/AppIntentsMetadataTaskConstructionTests.swift
index 09d0dd37..fa01f785 100644
--- a/Tests/SWBTaskConstructionTests/AppIntentsMetadataTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/AppIntentsMetadataTaskConstructionTests.swift
@@ -39,8 +39,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     children: [
                         TestFile("source.swift"),
                         TestFile(appShortcutsStringsFileName),
-                        TestFile(assistantIntentsStringsFileName)
-                    ]),
+                        TestFile(assistantIntentsStringsFileName),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -56,7 +57,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -67,15 +69,17 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES",
-                                    "APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING": "NO"
-                                ]),
+                                    "APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING": "NO",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([TestBuildFile(appShortcutsStringsFileName), TestBuildFile(assistantIntentsStringsFileName)]),
                             TestSourcesBuildPhase(["source.swift"]),
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let defaultToolchain = try #require(core.toolchainRegistry.defaultToolchain)
@@ -85,31 +89,31 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("ExtractAppIntentsMetadata")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appintentsmetadataprocessor" {
-                        let commandLineBeforeConst = [executableName.asString,
-                                                      "--toolchain-dir", "\(defaultToolchain.path.str)",
-                                                      "--module-name", "LinkTest",
-                                                      "--sdk-root", core.loadSDK(.iOS).path.str,
-                                                      "--xcode-version", core.xcodeProductBuildVersionString,
-                                                      "--platform-family", "iOS",
-                                                      "--deployment-target", core.loadSDK(.iOS).defaultDeploymentTarget,
-                                                      "--bundle-identifier", "com.foo.bar",
-                                                      "--output", "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app",
-                                                      "--target-triple", "arm64-apple-ios\(core.loadSDK(.iOS).version)",
-                                                      "--binary-file", "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app/LinkTest",
-                                                      "--dependency-file", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/LinkTest_dependency_info.dat",
-                                                      "--stringsdata-file", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/ExtractedAppShortcutsMetadata.stringsdata",
-                                                      "--source-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/LinkTest.SwiftFileList",
-                                                      "--metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyMetadataFileList",
-                                                      "--static-metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyStaticMetadataFileList"]
-
-                        let commandLineAfterConst = (swiftFeatures.has(.constExtractCompleteMetadata) ? ["--compile-time-extraction"] : []) +
-                        ["--deployment-aware-processing", "--validate-assistant-intents"]
+                        executableName == "appintentsmetadataprocessor"
+                    {
+                        let commandLineBeforeConst = [
+                            executableName.asString,
+                            "--toolchain-dir", "\(defaultToolchain.path.str)",
+                            "--module-name", "LinkTest",
+                            "--sdk-root", core.loadSDK(.iOS).path.str,
+                            "--xcode-version", core.xcodeProductBuildVersionString,
+                            "--platform-family", "iOS",
+                            "--deployment-target", core.loadSDK(.iOS).defaultDeploymentTarget,
+                            "--bundle-identifier", "com.foo.bar",
+                            "--output", "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app",
+                            "--target-triple", "arm64-apple-ios\(core.loadSDK(.iOS).version)",
+                            "--binary-file", "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app/LinkTest",
+                            "--dependency-file", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/LinkTest_dependency_info.dat",
+                            "--stringsdata-file", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/ExtractedAppShortcutsMetadata.stringsdata",
+                            "--source-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/LinkTest.SwiftFileList",
+                            "--metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyMetadataFileList",
+                            "--static-metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyStaticMetadataFileList",
+                        ]
+
+                        let commandLineAfterConst = (swiftFeatures.has(.constExtractCompleteMetadata) ? ["--compile-time-extraction"] : []) + ["--deployment-aware-processing", "--validate-assistant-intents"]
                         let commandLine: [String]
                         if swiftFeatures.has(.emitContValuesSidecar) {
-                            commandLine = commandLineBeforeConst +
-                            ["--swift-const-vals-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/LinkTest.SwiftConstValuesFileList"] +
-                            commandLineAfterConst
+                            commandLine = commandLineBeforeConst + ["--swift-const-vals-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/LinkTest.SwiftConstValuesFileList"] + commandLineAfterConst
                         } else {
                             commandLine = commandLineBeforeConst + commandLineAfterConst
                         }
@@ -128,7 +132,7 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                         .namePattern(.suffix("LinkTest.SwiftConstValuesFileList")),
                         .namePattern(.and(.prefix("target-"), .suffix("-ModuleVerifierTaskProducer"))),
                         .namePattern(.and(.prefix("target-"), .suffix("-fused-phase0-copy-bundle-resources&compile-sources"))),
-                        .namePattern(.and(.prefix("target-"), .suffix("-entry")))
+                        .namePattern(.and(.prefix("target-"), .suffix("-entry"))),
                     ]
                     if swiftFeatures.has(.emitContValuesSidecar) {
                         expectedInputs.insert(.namePattern(.suffix("source.swiftconstvalues")), at: 1)
@@ -143,7 +147,7 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                          .path("\(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Metadata.appintents/extract.actionsdata")
                          */
                         .path("\(SRCROOT)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/ExtractedAppShortcutsMetadata.stringsdata"),
-                        .name("ExtractAppIntentsMetadata \(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Metadata.appintents")
+                        .name("ExtractAppIntentsMetadata \(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Metadata.appintents"),
                     ])
 
                     results.checkNoDiagnostics()
@@ -162,16 +166,18 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("ValidateAppShortcutStringsMetadata")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appshortcutstringsprocessor" {
-                        task.checkCommandLine([executableName.asString,
-                                               "--source-file", "\(SRCROOT)/\(appShortcutsStringsFileName)",
-                                               "--source-file", "\(SRCROOT)/\(assistantIntentsStringsFileName)",
-                                               "--input-data-path", "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Metadata.appintents",
-                                               "--platform-family",  "iOS",
-                                               "--deployment-target", core.loadSDK(.iOS).defaultDeploymentTarget,
-                                               "--validate-assistant-intents",
-                                               "--metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyMetadataFileList"
-                                              ])
+                        executableName == "appshortcutstringsprocessor"
+                    {
+                        task.checkCommandLine([
+                            executableName.asString,
+                            "--source-file", "\(SRCROOT)/\(appShortcutsStringsFileName)",
+                            "--source-file", "\(SRCROOT)/\(assistantIntentsStringsFileName)",
+                            "--input-data-path", "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Metadata.appintents",
+                            "--platform-family", "iOS",
+                            "--deployment-target", core.loadSDK(.iOS).defaultDeploymentTarget,
+                            "--validate-assistant-intents",
+                            "--metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyMetadataFileList",
+                        ])
                     }
 
                     task.checkInputs([
@@ -181,11 +187,11 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                         .name("ExtractAppIntentsMetadata \(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Metadata.appintents"),
                         .namePattern(.and(.prefix("target-"), .suffix("-ModuleVerifierTaskProducer"))),
                         .namePattern(.and(.prefix("target-"), .suffix("-fused-phase0-copy-bundle-resources&compile-sources"))),
-                        .namePattern(.and(.prefix("target-"), .suffix("-entry")))
+                        .namePattern(.and(.prefix("target-"), .suffix("-entry"))),
                     ])
 
                     task.checkOutputs([
-                        .namePattern(.and(.prefix("ValidateAppShortcutStringsMetadata target-LinkTest-T-LinkTest-"), .and(.contains("\(SRCROOT)/\(assistantIntentsStringsFileName)"), .contains("\(SRCROOT)/\(appShortcutsStringsFileName)")) )),
+                        .namePattern(.and(.prefix("ValidateAppShortcutStringsMetadata target-LinkTest-T-LinkTest-"), .and(.contains("\(SRCROOT)/\(assistantIntentsStringsFileName)"), .contains("\(SRCROOT)/\(appShortcutsStringsFileName)"))))
                     ])
 
                     results.checkNoDiagnostics()
@@ -209,8 +215,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift"),
-                        TestFile(appShortcutsStringsFileName)
-                    ]),
+                        TestFile(appShortcutsStringsFileName),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -226,7 +233,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -237,14 +245,16 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES"
-                                ]),
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([TestBuildFile(appShortcutsStringsFileName)]),
                             TestSourcesBuildPhase(["source.swift"]),
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let defaultToolchain = try #require(core.toolchainRegistry.defaultToolchain)
@@ -254,30 +264,30 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("ExtractAppIntentsMetadata")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appintentsmetadataprocessor" {
-                        let commandLineBeforeConst = [executableName.asString,
-                                                      "--toolchain-dir", "\(defaultToolchain.path.str)",
-                                                      "--module-name", "LinkTest",
-                                                      "--sdk-root", results.runDestinationSDK.path.str,
-                                                      "--xcode-version", core.xcodeProductBuildVersionString,
-                                                      "--platform-family", "iOS",
-                                                      "--deployment-target", results.runDestinationSDK.defaultDeploymentTarget,
-                                                      "--bundle-identifier", "com.foo.bar",
-                                                      "--output", "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app",
-                                                      "--target-triple", "arm64-apple-ios\(results.runDestinationSDK.version)",
-                                                      "--binary-file", "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app/LinkTest",
-                                                      "--dependency-file", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/LinkTest_dependency_info.dat",
-                                                      "--stringsdata-file", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/ExtractedAppShortcutsMetadata.stringsdata",
-                                                      "--source-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/LinkTest.SwiftFileList",
-                                                      "--metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyMetadataFileList",
-                                                      "--static-metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyStaticMetadataFileList"]
-                        let commandLineAfterConst = (swiftFeatures.has(.constExtractCompleteMetadata) ? ["--compile-time-extraction"] : []) +
-                        ["--deployment-aware-processing", "--validate-assistant-intents"]
+                        executableName == "appintentsmetadataprocessor"
+                    {
+                        let commandLineBeforeConst = [
+                            executableName.asString,
+                            "--toolchain-dir", "\(defaultToolchain.path.str)",
+                            "--module-name", "LinkTest",
+                            "--sdk-root", results.runDestinationSDK.path.str,
+                            "--xcode-version", core.xcodeProductBuildVersionString,
+                            "--platform-family", "iOS",
+                            "--deployment-target", results.runDestinationSDK.defaultDeploymentTarget,
+                            "--bundle-identifier", "com.foo.bar",
+                            "--output", "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app",
+                            "--target-triple", "arm64-apple-ios\(results.runDestinationSDK.version)",
+                            "--binary-file", "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app/LinkTest",
+                            "--dependency-file", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/LinkTest_dependency_info.dat",
+                            "--stringsdata-file", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/ExtractedAppShortcutsMetadata.stringsdata",
+                            "--source-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/LinkTest.SwiftFileList",
+                            "--metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyMetadataFileList",
+                            "--static-metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyStaticMetadataFileList",
+                        ]
+                        let commandLineAfterConst = (swiftFeatures.has(.constExtractCompleteMetadata) ? ["--compile-time-extraction"] : []) + ["--deployment-aware-processing", "--validate-assistant-intents"]
                         let commandLine: [String]
                         if swiftFeatures.has(.emitContValuesSidecar) {
-                            commandLine = commandLineBeforeConst +
-                            ["--swift-const-vals-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/LinkTest.SwiftConstValuesFileList"] +
-                            commandLineAfterConst
+                            commandLine = commandLineBeforeConst + ["--swift-const-vals-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/LinkTest.SwiftConstValuesFileList"] + commandLineAfterConst
                         } else {
                             commandLine = commandLineBeforeConst + commandLineAfterConst
                         }
@@ -296,7 +306,7 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                         .namePattern(.suffix("LinkTest.SwiftConstValuesFileList")),
                         .namePattern(.and(.prefix("target-"), .suffix("-ModuleVerifierTaskProducer"))),
                         .namePattern(.and(.prefix("target-"), .suffix("-fused-phase0-copy-bundle-resources&compile-sources"))),
-                        .namePattern(.and(.prefix("target-"), .suffix("-entry")))
+                        .namePattern(.and(.prefix("target-"), .suffix("-entry"))),
                     ]
                     if swiftFeatures.has(.emitContValuesSidecar) {
                         expectedInputs.insert(.namePattern(.suffix("source.swiftconstvalues")), at: 1)
@@ -311,7 +321,7 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                          .path("\(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Metadata.appintents/extract.actionsdata")
                          */
                         .path("\(SRCROOT)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/ExtractedAppShortcutsMetadata.stringsdata"),
-                        .name("ExtractAppIntentsMetadata \(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Metadata.appintents")
+                        .name("ExtractAppIntentsMetadata \(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Metadata.appintents"),
                     ])
 
                     results.checkNoDiagnostics()
@@ -330,15 +340,17 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("ValidateAppShortcutStringsMetadata")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appshortcutstringsprocessor" {
-                        task.checkCommandLine([executableName.asString,
-                                               "--source-file", "\(SRCROOT)/\(appShortcutsStringsFileName)",
-                                               "--input-data-path", "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Metadata.appintents",
-                                               "--platform-family",  "iOS",
-                                               "--deployment-target", results.runDestinationSDK.defaultDeploymentTarget,
-                                               "--validate-assistant-intents",
-                                               "--metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyMetadataFileList"
-                                              ])
+                        executableName == "appshortcutstringsprocessor"
+                    {
+                        task.checkCommandLine([
+                            executableName.asString,
+                            "--source-file", "\(SRCROOT)/\(appShortcutsStringsFileName)",
+                            "--input-data-path", "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Metadata.appintents",
+                            "--platform-family", "iOS",
+                            "--deployment-target", results.runDestinationSDK.defaultDeploymentTarget,
+                            "--validate-assistant-intents",
+                            "--metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyMetadataFileList",
+                        ])
                     }
 
                     task.checkInputs([
@@ -347,11 +359,11 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                         .name("ExtractAppIntentsMetadata \(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Metadata.appintents"),
                         .namePattern(.and(.prefix("target-"), .suffix("-ModuleVerifierTaskProducer"))),
                         .namePattern(.and(.prefix("target-"), .suffix("-fused-phase0-copy-bundle-resources&compile-sources"))),
-                        .namePattern(.and(.prefix("target-"), .suffix("-entry")))
+                        .namePattern(.and(.prefix("target-"), .suffix("-entry"))),
                     ])
 
                     task.checkOutputs([
-                        .namePattern(.and(.prefix("ValidateAppShortcutStringsMetadata target-LinkTest-T-LinkTest-"), .suffix("\(SRCROOT)/\(appShortcutsStringsFileName)"))),
+                        .namePattern(.and(.prefix("ValidateAppShortcutStringsMetadata target-LinkTest-T-LinkTest-"), .suffix("\(SRCROOT)/\(appShortcutsStringsFileName)")))
                     ])
 
                     results.checkNoDiagnostics()
@@ -360,21 +372,23 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("AppIntentsSSUTraining")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appintentsnltrainingprocessor" {
-                        task.checkCommandLine([executableName.asString,
-                                               "--infoplist-path",
-                                               "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Info.plist",
-                                               "--temp-dir-path",
-                                               "\(SRCROOT)/build/aProject.build/Debug-iphoneos/LinkTest.build/ssu",
-                                               "--bundle-id",
-                                               "com.foo.bar",
-                                               "--product-path",
-                                               "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app",
-                                               "--extracted-metadata-path",
-                                               "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Metadata.appintents",
-                                               "--metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyMetadataFileList",
-                                               "--archive-ssu-assets"
-                                              ])
+                        executableName == "appintentsnltrainingprocessor"
+                    {
+                        task.checkCommandLine([
+                            executableName.asString,
+                            "--infoplist-path",
+                            "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Info.plist",
+                            "--temp-dir-path",
+                            "\(SRCROOT)/build/aProject.build/Debug-iphoneos/LinkTest.build/ssu",
+                            "--bundle-id",
+                            "com.foo.bar",
+                            "--product-path",
+                            "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app",
+                            "--extracted-metadata-path",
+                            "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Metadata.appintents",
+                            "--metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyMetadataFileList",
+                            "--archive-ssu-assets",
+                        ])
                     }
 
                     task.checkInputs([
@@ -385,11 +399,11 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                         .namePattern(.suffix("LinkTest.DependencyMetadataFileList")),
                         .namePattern(.and(.prefix("target-"), .suffix("-ModuleVerifierTaskProducer"))),
                         .namePattern(.and(.prefix("target-"), .suffix("-fused-phase0-copy-bundle-resources&compile-sources"))),
-                        .namePattern(.and(.prefix("target-"), .suffix("-entry")))
+                        .namePattern(.and(.prefix("target-"), .suffix("-entry"))),
                     ])
 
                     task.checkOutputs([
-                        .path("\(SRCROOT)/build/aProject.build/Debug-iphoneos/LinkTest.build/ssu/root.ssu.yaml"),
+                        .path("\(SRCROOT)/build/aProject.build/Debug-iphoneos/LinkTest.build/ssu/root.ssu.yaml")
                     ])
 
                     results.checkNoDiagnostics()
@@ -408,8 +422,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift"),
-                        TestFile(appShortcutsStringsFileName)
-                    ]),
+                        TestFile(appShortcutsStringsFileName),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -425,7 +440,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -436,14 +452,16 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES"
-                                ]),
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([TestBuildFile(appShortcutsStringsFileName)]),
                             TestSourcesBuildPhase(["source.swift"]),
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -451,7 +469,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("AppIntentsSSUTraining")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appintentsnltrainingprocessor" {
+                        executableName == "appintentsnltrainingprocessor"
+                    {
                         task.checkCommandLineDoesNotContain("--deployment-postprocessing")
                     }
                     results.checkNoDiagnostics()
@@ -461,7 +480,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("AppIntentsSSUTraining")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appintentsnltrainingprocessor" {
+                        executableName == "appintentsnltrainingprocessor"
+                    {
                         task.checkCommandLineContains(["--deployment-postprocessing"])
                     }
                     results.checkNoDiagnostics()
@@ -471,7 +491,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("AppIntentsSSUTraining")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appintentsnltrainingprocessor" {
+                        executableName == "appintentsnltrainingprocessor"
+                    {
                         task.checkCommandLineContains(["--deployment-postprocessing"])
                     }
                     results.checkNoDiagnostics()
@@ -490,8 +511,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift"),
-                        TestFile(appShortcutsStringsFileName)
-                    ]),
+                        TestFile(appShortcutsStringsFileName),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -507,7 +529,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -520,15 +543,17 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                     "LM_ENABLE_LINK_GENERATION": "YES",
                                     "LM_ENABLE_APP_NAME_OVERRIDE": "YES",
                                     "LM_ENABLE_STRING_VALIDATION": "NO",
-                                    "APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING": "NO"
-                                ]),
+                                    "APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING": "NO",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([TestBuildFile(appShortcutsStringsFileName)]),
                             TestSourcesBuildPhase(["source.swift"]),
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -537,19 +562,21 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("ValidateAppShortcutStringsMetadata")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appshortcutstringsprocessor" {
-                        task.checkCommandLine([executableName.asString,
-                                               "--source-file",
-                                               "\(SRCROOT)/\(appShortcutsStringsFileName)",
-                                               "--input-data-path",
-                                               "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Metadata.appintents",
-                                               "--disable",
-                                               "--app-name-override",
-                                               "--platform-family",  "iOS",
-                                               "--deployment-target", core.loadSDK(.iOS).defaultDeploymentTarget,
-                                               "--validate-assistant-intents",
-                                               "--metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyMetadataFileList"
-                                              ])
+                        executableName == "appshortcutstringsprocessor"
+                    {
+                        task.checkCommandLine([
+                            executableName.asString,
+                            "--source-file",
+                            "\(SRCROOT)/\(appShortcutsStringsFileName)",
+                            "--input-data-path",
+                            "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Metadata.appintents",
+                            "--disable",
+                            "--app-name-override",
+                            "--platform-family", "iOS",
+                            "--deployment-target", core.loadSDK(.iOS).defaultDeploymentTarget,
+                            "--validate-assistant-intents",
+                            "--metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyMetadataFileList",
+                        ])
                     }
 
                     task.checkInputs([
@@ -558,11 +585,11 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                         .name("ExtractAppIntentsMetadata \(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Metadata.appintents"),
                         .namePattern(.and(.prefix("target-"), .suffix("-ModuleVerifierTaskProducer"))),
                         .namePattern(.and(.prefix("target-"), .suffix("-fused-phase0-copy-bundle-resources&compile-sources"))),
-                        .namePattern(.and(.prefix("target-"), .suffix("-entry")))
+                        .namePattern(.and(.prefix("target-"), .suffix("-entry"))),
                     ])
 
                     task.checkOutputs([
-                        .namePattern(.and(.prefix("ValidateAppShortcutStringsMetadata target-LinkTest-T-LinkTest-"), .suffix("\(SRCROOT)/\(appShortcutsStringsFileName)"))),
+                        .namePattern(.and(.prefix("ValidateAppShortcutStringsMetadata target-LinkTest-T-LinkTest-"), .suffix("\(SRCROOT)/\(appShortcutsStringsFileName)")))
                     ])
 
                     results.checkNoDiagnostics()
@@ -581,7 +608,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift")
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -594,8 +622,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "SDKROOT": "iphoneos",
                             "SWIFT_VERSION": swiftVersion,
-                            "VERSIONING_SYSTEM": "apple-generic"
-                        ]),
+                            "VERSIONING_SYSTEM": "apple-generic",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -606,13 +635,15 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES"
-                                ]),
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["source.swift"]),
+                            TestSourcesBuildPhase(["source.swift"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -636,8 +667,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift"),
-                        TestFile(appShortcutsStringsFileName)
-                    ]),
+                        TestFile(appShortcutsStringsFileName),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -653,7 +685,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -664,14 +697,16 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES"
-                                ]),
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([TestBuildFile(appShortcutsStringsFileName)]),
                             TestSourcesBuildPhase(["source.swift"]),
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -702,8 +737,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "Sources",
                             path: "Sources",
                             children: [
-                                TestFile("fileA1.swift"),
-                            ]),
+                                TestFile("fileA1.swift")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -717,7 +753,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                     "SDKROOT": "iphoneos",
                                     "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
                                     "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                ])
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
@@ -725,11 +762,14 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "fileA1.swift",
-                                    ]),
-                                ]),
-                        ])
-                ])
+                                        "fileA1.swift"
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
@@ -738,8 +778,7 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
 
             // Create the source files.
             try await tester.fs.writeFileContents(SRCROOT.join("Sources/fileA1.swift")) { file in
-                file <<<
-                    """
+                file <<< """
                     public struct A {
                         public init() {}
                     }
@@ -796,8 +835,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift"),
-                        TestFile(appShortcutsStringsFileName)
-                    ]),
+                        TestFile(appShortcutsStringsFileName),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -813,7 +853,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -824,14 +865,16 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES"
-                                ]),
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([TestBuildFile(appShortcutsStringsFileName)]),
                             TestSourcesBuildPhase(["source.swift"]),
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -855,8 +898,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift"),
-                        TestFile(appShortcutsStringsFileName)
-                    ]),
+                        TestFile(appShortcutsStringsFileName),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -871,8 +915,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "SWIFT_EXEC": swiftCompilerPath.str,
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
-                            "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar"
-                        ]),
+                            "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -883,15 +928,17 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING": "NO",
-                                    "LM_ENABLE_LINK_GENERATION": "YES"
-                                ]),
+                                    "LM_ENABLE_LINK_GENERATION": "YES",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([TestBuildFile(appShortcutsStringsFileName)]),
                             TestSourcesBuildPhase(["source.swift"]),
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -912,8 +959,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift"),
-                        TestFile(appShortcutsStringsFileName)
-                    ]),
+                        TestFile(appShortcutsStringsFileName),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -929,7 +977,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -940,14 +989,16 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES"
-                                ]),
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([TestBuildFile(appShortcutsStringsFileName)]),
                             TestSourcesBuildPhase(["source.swift"]),
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -967,8 +1018,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift"),
-                        TestFile(appShortcutsStringsFileName)
-                    ]),
+                        TestFile(appShortcutsStringsFileName),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -984,7 +1036,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -995,15 +1048,17 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES",
-                                    "LM_FORCE_LINK_GENERATION": "YES"
-                                ]),
+                                    "LM_FORCE_LINK_GENERATION": "YES",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([TestBuildFile(appShortcutsStringsFileName)]),
                             TestSourcesBuildPhase(["source.swift"]),
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -1011,7 +1066,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("ExtractAppIntentsMetadata")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appintentsmetadataprocessor" {
+                        executableName == "appintentsmetadataprocessor"
+                    {
                         task.checkCommandLineContains(["--force"])
                     }
                     results.checkNoDiagnostics()
@@ -1030,8 +1086,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift"),
-                        TestFile(appShortcutsStringsFileName)
-                    ]),
+                        TestFile(appShortcutsStringsFileName),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -1044,8 +1101,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "SDKROOT": "iphoneos",
                             "SWIFT_VERSION": swiftVersion,
-                            "VERSIONING_SYSTEM": "apple-generic"
-                        ]),
+                            "VERSIONING_SYSTEM": "apple-generic",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -1056,13 +1114,15 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_METADATA_EXTRACTION": "NO"
-                                ]),
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["source.swift"]),
+                            TestSourcesBuildPhase(["source.swift"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -1085,7 +1145,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift")
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -1101,7 +1162,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -1112,14 +1174,16 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES",
-                                    "LM_COMPILE_TIME_EXTRACTION": "NO"
-                                ]),
+                                    "LM_COMPILE_TIME_EXTRACTION": "NO",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["source.swift"]),
+                            TestSourcesBuildPhase(["source.swift"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -1127,7 +1191,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("ExtractAppIntentsMetadata")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appintentsmetadataprocessor" {
+                        executableName == "appintentsmetadataprocessor"
+                    {
                         task.checkCommandLineDoesNotContain("--compile-time-extraction")
                     }
                     results.checkNoDiagnostics()
@@ -1146,7 +1211,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift")
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -1162,7 +1228,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -1173,14 +1240,16 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES",
-                                    "ENABLE_APPINTENTS_DEPLOYMENT_AWARE_PROCESSING": "NO"
-                                ]),
+                                    "ENABLE_APPINTENTS_DEPLOYMENT_AWARE_PROCESSING": "NO",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["source.swift"]),
+                            TestSourcesBuildPhase(["source.swift"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -1188,7 +1257,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("ExtractAppIntentsMetadata")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appintentsmetadataprocessor" {
+                        executableName == "appintentsmetadataprocessor"
+                    {
                         task.checkCommandLineDoesNotContain("--deployment-aware-processing")
                     }
                     results.checkNoDiagnostics()
@@ -1207,7 +1277,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift")
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -1223,7 +1294,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -1234,14 +1306,16 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES",
-                                    "ENABLE_ASSISTANT_INTENTS_PROVIDER_VALIDATION": "NO"
-                                ]),
+                                    "ENABLE_ASSISTANT_INTENTS_PROVIDER_VALIDATION": "NO",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["source.swift"]),
+                            TestSourcesBuildPhase(["source.swift"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -1249,7 +1323,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("ExtractAppIntentsMetadata")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appintentsmetadataprocessor" {
+                        executableName == "appintentsmetadataprocessor"
+                    {
                         task.checkCommandLineDoesNotContain("---validate-assistant-intents")
                     }
                     results.checkNoDiagnostics()
@@ -1271,7 +1346,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift")
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -1288,7 +1364,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -1299,13 +1376,15 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES"
-                                ]),
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["source.swift"]),
+                            TestSourcesBuildPhase(["source.swift"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let defaultToolchain = try #require(core.toolchainRegistry.defaultToolchain)
@@ -1315,39 +1394,40 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("ExtractAppIntentsMetadata")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appintentsmetadataprocessor" {
-                        let commandLineBeforeConst = [executableName.asString,
-                                                      "--toolchain-dir", "\(defaultToolchain.path.str)",
-                                                      "--module-name", "LinkTest",
-                                                      "--sdk-root", core.loadSDK(.iOS).path.str,
-                                                      "--xcode-version", core.xcodeProductBuildVersionString,
-                                                      "--platform-family", "iOS",
-                                                      "--deployment-target", core.loadSDK(.iOS).defaultDeploymentTarget,
-                                                      "--bundle-identifier", "com.foo.bar",
-                                                      "--output", "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app",
-                                                      "--target-triple", "arm64-apple-ios\(core.loadSDK(.iOS).version)",
-                                                      "--binary-file", "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app/LinkTest",
-                                                      "--dependency-file", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/LinkTest_dependency_info.dat",
-                                                      "--dependency-file", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-debug/arm64/LinkTest_dependency_info.dat",
-                                                      "--stringsdata-file", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/ExtractedAppShortcutsMetadata.stringsdata",
-                                                      "--stringsdata-file", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-debug/arm64/ExtractedAppShortcutsMetadata.stringsdata",
-                                                      "--source-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/LinkTest.SwiftFileList",
-                                                      "--source-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-debug/arm64/LinkTest.SwiftFileList",
-                                                      "--metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyMetadataFileList",
-                                                      "--static-metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyStaticMetadataFileList"]
-
-                        let commandLineAfterConst = (swiftFeatures.has(.constExtractCompleteMetadata) ? ["--compile-time-extraction"] : []) +
-                        ["--deployment-aware-processing", "--validate-assistant-intents"]
+                        executableName == "appintentsmetadataprocessor"
+                    {
+                        let commandLineBeforeConst = [
+                            executableName.asString,
+                            "--toolchain-dir", "\(defaultToolchain.path.str)",
+                            "--module-name", "LinkTest",
+                            "--sdk-root", core.loadSDK(.iOS).path.str,
+                            "--xcode-version", core.xcodeProductBuildVersionString,
+                            "--platform-family", "iOS",
+                            "--deployment-target", core.loadSDK(.iOS).defaultDeploymentTarget,
+                            "--bundle-identifier", "com.foo.bar",
+                            "--output", "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app",
+                            "--target-triple", "arm64-apple-ios\(core.loadSDK(.iOS).version)",
+                            "--binary-file", "\(SRCROOT)/build/Debug-iphoneos/LinkTest.app/LinkTest",
+                            "--dependency-file", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/LinkTest_dependency_info.dat",
+                            "--dependency-file", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-debug/arm64/LinkTest_dependency_info.dat",
+                            "--stringsdata-file", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/ExtractedAppShortcutsMetadata.stringsdata",
+                            "--stringsdata-file", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-debug/arm64/ExtractedAppShortcutsMetadata.stringsdata",
+                            "--source-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/LinkTest.SwiftFileList",
+                            "--source-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-debug/arm64/LinkTest.SwiftFileList",
+                            "--metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyMetadataFileList",
+                            "--static-metadata-file-list", "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/LinkTest.DependencyStaticMetadataFileList",
+                        ]
+
+                        let commandLineAfterConst = (swiftFeatures.has(.constExtractCompleteMetadata) ? ["--compile-time-extraction"] : []) + ["--deployment-aware-processing", "--validate-assistant-intents"]
                         let commandLine: [String]
                         if swiftFeatures.has(.emitContValuesSidecar) {
-                            commandLine = commandLineBeforeConst +
-                            [
-                                "--swift-const-vals-list",
-                                "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/LinkTest.SwiftConstValuesFileList",
-                                "--swift-const-vals-list",
-                                "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-debug/arm64/LinkTest.SwiftConstValuesFileList"
-                            ] +
-                            commandLineAfterConst
+                            commandLine =
+                                commandLineBeforeConst + [
+                                    "--swift-const-vals-list",
+                                    "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/LinkTest.SwiftConstValuesFileList",
+                                    "--swift-const-vals-list",
+                                    "\(tmpDir.str)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-debug/arm64/LinkTest.SwiftConstValuesFileList",
+                                ] + commandLineAfterConst
                         } else {
                             commandLine = commandLineBeforeConst + commandLineAfterConst
                         }
@@ -1368,7 +1448,7 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                         .namePattern(.suffix("LinkTest.SwiftConstValuesFileList")),
                         .namePattern(.and(.prefix("target-"), .suffix("-ModuleVerifierTaskProducer"))),
                         .namePattern(.and(.prefix("target-"), .suffix("-fused-phase0-compile-sources"))),
-                        .namePattern(.and(.prefix("target-"), .suffix("-entry")))
+                        .namePattern(.and(.prefix("target-"), .suffix("-entry"))),
                     ]
                     if swiftFeatures.has(.emitContValuesSidecar) {
                         expectedInputs.insert(.namePattern(.suffix("source.swiftconstvalues")), at: 1)
@@ -1380,7 +1460,7 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-normal/arm64/ExtractedAppShortcutsMetadata.stringsdata"),
                         .path("\(SRCROOT)/build/aProject.build/Debug-iphoneos/LinkTest.build/Objects-debug/arm64/ExtractedAppShortcutsMetadata.stringsdata"),
-                        .name("ExtractAppIntentsMetadata \(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Metadata.appintents")
+                        .name("ExtractAppIntentsMetadata \(SRCROOT)/build/Debug-iphoneos/LinkTest.app/Metadata.appintents"),
                     ])
 
                     results.checkNoDiagnostics()
@@ -1404,7 +1484,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                         TestFile("FrameworkB_File.swift"),
                         TestFile("FrameworkC_File.swift"),
                         TestFile("StaticLibraryA_File.swift"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -1421,7 +1502,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -1432,8 +1514,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES",
-                                    "APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING": "NO"
-                                ]),
+                                    "APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING": "NO",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([TestBuildFile(appShortcutsStringsFileName)]),
@@ -1447,11 +1530,12 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
-                                buildSettings: [:]),
+                                buildSettings: [:]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["StaticLibraryA_File.swift"]),
-                            TestFrameworksBuildPhase([])
+                            TestFrameworksBuildPhase([]),
                         ],
                         dependencies: []
                     ),
@@ -1464,12 +1548,13 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES",
-                                    "APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING": "NO"
-                                ]),
+                                    "APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING": "NO",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["FrameworkA_File.swift"]),
-                            TestFrameworksBuildPhase([])
+                            TestFrameworksBuildPhase([]),
                         ],
                         dependencies: ["FrameworkTargetB", "StaticLibraryTargetA"]
                     ),
@@ -1481,12 +1566,13 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES",
-                                    "APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING": "NO"
-                                ]),
+                                    "APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING": "NO",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["FrameworkB_File.swift"]),
-                            TestFrameworksBuildPhase([])
+                            TestFrameworksBuildPhase([]),
                         ],
                         dependencies: ["FrameworkTargetC"]
                     ),
@@ -1498,15 +1584,17 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES",
-                                    "APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING": "NO"
-                                ]),
+                                    "APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING": "NO",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["FrameworkC_File.swift"]),
-                            TestFrameworksBuildPhase([])
+                            TestFrameworksBuildPhase([]),
                         ]
                     ),
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -1516,7 +1604,7 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     let inputFiles = [
                         "\(SRCROOT)/build/Debug-iphoneos/FrameworkTargetA.framework/Metadata.appintents/extract.actionsdata",
                         "\(SRCROOT)/build/Debug-iphoneos/FrameworkTargetB.framework/Metadata.appintents/extract.actionsdata",
-                        "\(SRCROOT)/build/Debug-iphoneos/FrameworkTargetC.framework/Metadata.appintents/extract.actionsdata"
+                        "\(SRCROOT)/build/Debug-iphoneos/FrameworkTargetC.framework/Metadata.appintents/extract.actionsdata",
                     ]
                     let lines = contents.asString.components(separatedBy: .newlines)
                     #expect(lines == inputFiles + [""])
@@ -1542,8 +1630,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift"),
-                        TestFile(appShortcutsStringsFileName)
-                    ]),
+                        TestFile(appShortcutsStringsFileName),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -1559,7 +1648,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -1570,15 +1660,17 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES",
-                                    "LM_ENABLE_APP_NAME_OVERRIDE": "NO"
-                                ]),
+                                    "LM_ENABLE_APP_NAME_OVERRIDE": "NO",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([TestBuildFile(appShortcutsStringsFileName)]),
                             TestSourcesBuildPhase(["source.swift"]),
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -1586,7 +1678,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("ExtractAppIntentsMetadata")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appintentsmetadataprocessor" {
+                        executableName == "appintentsmetadataprocessor"
+                    {
                         task.checkCommandLineDoesNotContain("--app-shortcuts-app-name-override")
                     }
                     results.checkNoDiagnostics()
@@ -1595,7 +1688,6 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
         }
     }
 
-
     @Test(.requireSDKs(.iOS))
     func appNameOverride() async throws {
         try await withTemporaryDirectory { tmpDir in
@@ -1606,8 +1698,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift"),
-                        TestFile(appShortcutsStringsFileName)
-                    ]),
+                        TestFile(appShortcutsStringsFileName),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -1623,7 +1716,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -1634,15 +1728,17 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES",
-                                    "LM_ENABLE_APP_NAME_OVERRIDE": "YES"
-                                ]),
+                                    "LM_ENABLE_APP_NAME_OVERRIDE": "YES",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([TestBuildFile(appShortcutsStringsFileName)]),
                             TestSourcesBuildPhase(["source.swift"]),
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -1650,7 +1746,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("ExtractAppIntentsMetadata")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appintentsmetadataprocessor" {
+                        executableName == "appintentsmetadataprocessor"
+                    {
                         task.checkCommandLineContains(["--app-shortcuts-app-name-override"])
                     }
                     results.checkNoDiagnostics()
@@ -1669,8 +1766,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift"),
-                        TestFile(appShortcutsStringsFileName)
-                    ]),
+                        TestFile(appShortcutsStringsFileName),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -1686,7 +1784,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -1697,15 +1796,17 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 "Debug",
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES",
-                                    "LM_FILTER_WARNINGS": "YES"
-                                ]),
+                                    "LM_FILTER_WARNINGS": "YES",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([TestBuildFile(appShortcutsStringsFileName)]),
                             TestSourcesBuildPhase(["source.swift"]),
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -1713,7 +1814,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("ExtractAppIntentsMetadata")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appintentsmetadataprocessor" {
+                        executableName == "appintentsmetadataprocessor"
+                    {
                         task.checkCommandLineContains(["--quiet-warnings"])
                     }
                     results.checkNoDiagnostics()
@@ -1732,8 +1834,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift"),
-                        TestFile(appShortcutsStringsFileName)
-                    ]),
+                        TestFile(appShortcutsStringsFileName),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -1749,7 +1852,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -1759,15 +1863,17 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
-                                    "LM_ENABLE_LINK_GENERATION": "YES",
-                                ]),
+                                    "LM_ENABLE_LINK_GENERATION": "YES"
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([TestBuildFile(appShortcutsStringsFileName)]),
                             TestSourcesBuildPhase(["source.swift"]),
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -1775,7 +1881,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("ExtractAppIntentsMetadata")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appintentsmetadataprocessor" {
+                        executableName == "appintentsmetadataprocessor"
+                    {
                         task.checkCommandLineContainsUninterrupted(["--bundle-identifier", "com.foo.bar"])
                     }
                     results.checkNoDiagnostics()
@@ -1794,8 +1901,9 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift"),
-                        TestFile(appShortcutsStringsFileName)
-                    ]),
+                        TestFile(appShortcutsStringsFileName),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -1812,7 +1920,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "VERSIONING_SYSTEM": "apple-generic",
                             "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -1824,14 +1933,16 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                                 buildSettings: [
                                     "LM_ENABLE_LINK_GENERATION": "YES",
                                     "PRODUCT_BUNDLE_IDENTIFIER": "",
-                                ]),
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestResourcesBuildPhase([TestBuildFile(appShortcutsStringsFileName)]),
                             TestSourcesBuildPhase(["source.swift"]),
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -1839,7 +1950,8 @@ fileprivate struct AppIntentsMetadataTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("ExtractAppIntentsMetadata")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appintentsmetadataprocessor" {
+                        executableName == "appintentsmetadataprocessor"
+                    {
                         task.checkCommandLineDoesNotContain("--bundle-identifier")
                     }
                     results.checkNoDiagnostics()
diff --git a/Tests/SWBTaskConstructionTests/ArtifactBundleTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/ArtifactBundleTaskConstructionTests.swift
index 09f9f7f7..a8af0f6d 100644
--- a/Tests/SWBTaskConstructionTests/ArtifactBundleTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/ArtifactBundleTaskConstructionTests.swift
@@ -28,10 +28,12 @@ fileprivate struct ArtifactBundleTaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir.join("srcroot"),
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("SourceFile.swift"),
-                    ]),
+                        TestFile("SourceFile.swift")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -43,17 +45,19 @@ fileprivate struct ArtifactBundleTaskConstructionTests: CoreBasedTests {
                             "SWIFT_EXEC": swiftCompilerPath.str,
                             "LIBTOOL": libtoolPath.str,
                             "SWIFT_ACTIVE_COMPILATION_CONDITIONS[__normalized_unversioned_triple=arm64-apple-macos]": "CONDITION_ACTIVE",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "target",
                         type: .staticLibrary,
                         buildPhases: [
-                            TestSourcesBuildPhase(["SourceFile.swift"]),
+                            TestSourcesBuildPhase(["SourceFile.swift"])
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             await tester.checkBuild(runDestination: .macOSAppleSilicon) { results -> Void in
@@ -79,12 +83,14 @@ fileprivate struct ArtifactBundleTaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir.join("srcroot"),
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("s.swift"),
                         TestFile("c.c"),
                         TestFile("MyLibrary.artifactbundle"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -94,7 +100,8 @@ fileprivate struct ArtifactBundleTaskConstructionTests: CoreBasedTests {
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "SWIFT_VERSION": swiftVersion,
                             "SWIFT_EXEC": swiftCompilerPath.str,
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -105,7 +112,8 @@ fileprivate struct ArtifactBundleTaskConstructionTests: CoreBasedTests {
                             TestFrameworksBuildPhase(["MyLibrary.artifactbundle"]),
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -127,34 +135,34 @@ fileprivate struct ArtifactBundleTaskConstructionTests: CoreBasedTests {
             try fs.write(x86VariantPath.join("include/MyLibrary.h"), contents: "void bar(void);")
             try fs.write(x86VariantPath.join("include/module.modulemap"), contents: "module MyLibrary { header \"MyLibrary.h\" }")
             let infoJSONContent = """
-            {
-              "schemaVersion": "1.2",
-              "artifacts": {
-                "MyLibrary": {
-                  "type": "staticLibrary",
-                  "version": "1.0.0",
-                  "variants": [
-                    {
-                      "path": "macos-arm64/libMyLibrary.a",
-                      "supportedTriples": ["arm64-apple-macos"],
-                      "staticLibraryMetadata": {
-                        "headerPaths": ["macos-arm64/include"],
-                        "moduleMapPath": "macos-arm64/include/module.modulemap"
-                      }
-                    },
-                    {
-                      "path": "macos-x86_64/libMyLibrary.a",
-                      "supportedTriples": ["x86_64-apple-macos"],
-                      "staticLibraryMetadata": {
-                        "headerPaths": ["macos-x86_64/include"],
-                        "moduleMapPath": "macos-x86_64/include/module.modulemap"
-                      }
+                {
+                  "schemaVersion": "1.2",
+                  "artifacts": {
+                    "MyLibrary": {
+                      "type": "staticLibrary",
+                      "version": "1.0.0",
+                      "variants": [
+                        {
+                          "path": "macos-arm64/libMyLibrary.a",
+                          "supportedTriples": ["arm64-apple-macos"],
+                          "staticLibraryMetadata": {
+                            "headerPaths": ["macos-arm64/include"],
+                            "moduleMapPath": "macos-arm64/include/module.modulemap"
+                          }
+                        },
+                        {
+                          "path": "macos-x86_64/libMyLibrary.a",
+                          "supportedTriples": ["x86_64-apple-macos"],
+                          "staticLibraryMetadata": {
+                            "headerPaths": ["macos-x86_64/include"],
+                            "moduleMapPath": "macos-x86_64/include/module.modulemap"
+                          }
+                        }
+                      ]
                     }
-                  ]
+                  }
                 }
-              }
-            }
-            """
+                """
             try fs.write(artifactBundlePath.join("info.json"), contents: ByteString(encodingAsUTF8: infoJSONContent))
 
             await tester.checkBuild(runDestination: .macOSAppleSilicon, fs: fs) { results in
@@ -162,10 +170,10 @@ fileprivate struct ArtifactBundleTaskConstructionTests: CoreBasedTests {
 
                 results.checkTask(.matchRuleType("SwiftDriver Compilation")) { task in
                     task.checkCommandLineContains([
-                        "-Xcc", "-fmodule-map-file=\(SRCROOT)/Sources/MyLibrary.artifactbundle/macos-arm64/include/module.modulemap"
+                        "-Xcc", "-fmodule-map-file=\(SRCROOT)/Sources/MyLibrary.artifactbundle/macos-arm64/include/module.modulemap",
                     ])
                     task.checkCommandLineContains([
-                        "-Xcc", "-I\(SRCROOT)/Sources/MyLibrary.artifactbundle/macos-arm64/include"
+                        "-Xcc", "-I\(SRCROOT)/Sources/MyLibrary.artifactbundle/macos-arm64/include",
                     ])
                 }
 
diff --git a/Tests/SWBTaskConstructionTests/AssetCatalogTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/AssetCatalogTaskConstructionTests.swift
index fa12c93f..ebdc5a40 100644
--- a/Tests/SWBTaskConstructionTests/AssetCatalogTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/AssetCatalogTaskConstructionTests.swift
@@ -33,13 +33,13 @@ fileprivate struct AssetCatalogTaskConstructionTests: CoreBasedTests {
             TestBuildFile("Icon.icon"),
         ]
 
-
         return try await TestProject(
             "aProject",
             sourceRoot: tmpDir,
             groupTree: TestGroup(
                 "SomeFiles",
-                children: testGroupChildren),
+                children: testGroupChildren
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -56,33 +56,39 @@ fileprivate struct AssetCatalogTaskConstructionTests: CoreBasedTests {
                         "BUILD_ACTIVE_RESOURCES_ONLY": "YES",
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": "5.0",
-                    ].addingContents(of: thinningBuildSettings)),
+                    ].addingContents(of: thinningBuildSettings)
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("Test.swift"),
+                            TestBuildFile("Test.swift")
                         ]),
                         TestResourcesBuildPhase(testResourceBuildPhaseFiles),
                     ]
-                ),
-            ], classPrefix: "XC")
+                )
+            ],
+            classPrefix: "XC"
+        )
     }
 
     @Test(.requireSDKs(.iOS))
     func filterForThinningDeviceConfiguration() async throws {
         let actoolPath = try await self.actoolPath
         try await withTemporaryDirectory { tmpDir in
-            let testProject = try await assetCatalogThinningTestProject(tmpDir: tmpDir, thinningBuildSettings: [
-                "ASSETCATALOG_FILTER_FOR_THINNING_DEVICE_CONFIGURATION": "myPhoneABCD,10-B",
-                "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION": "12.1235",
-            ])
+            let testProject = try await assetCatalogThinningTestProject(
+                tmpDir: tmpDir,
+                thinningBuildSettings: [
+                    "ASSETCATALOG_FILTER_FOR_THINNING_DEVICE_CONFIGURATION": "myPhoneABCD,10-B",
+                    "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION": "12.1235",
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -138,11 +144,14 @@ fileprivate struct AssetCatalogTaskConstructionTests: CoreBasedTests {
     func filterForThinningDeviceConfigurationAndDeviceModel() async throws {
         let actoolPath = try await self.actoolPath
         try await withTemporaryDirectory { tmpDir in
-            let testProject = try await assetCatalogThinningTestProject(tmpDir: tmpDir, thinningBuildSettings: [
-                "ASSETCATALOG_FILTER_FOR_THINNING_DEVICE_CONFIGURATION": "myPhoneFooBar12,3-B",
-                "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL": "myPhoneFooBar12,3",
-                "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION": "13.2",
-            ])
+            let testProject = try await assetCatalogThinningTestProject(
+                tmpDir: tmpDir,
+                thinningBuildSettings: [
+                    "ASSETCATALOG_FILTER_FOR_THINNING_DEVICE_CONFIGURATION": "myPhoneFooBar12,3-B",
+                    "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL": "myPhoneFooBar12,3",
+                    "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION": "13.2",
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -199,10 +208,13 @@ fileprivate struct AssetCatalogTaskConstructionTests: CoreBasedTests {
     func filterForDeviceModel() async throws {
         let actoolPath = try await self.actoolPath
         try await withTemporaryDirectory { tmpDir in
-            let testProject = try await assetCatalogThinningTestProject(tmpDir: tmpDir, thinningBuildSettings: [
-                "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL": "myPhoneFooBar12,3",
-                "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION": "13.2",
-            ])
+            let testProject = try await assetCatalogThinningTestProject(
+                tmpDir: tmpDir,
+                thinningBuildSettings: [
+                    "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL": "myPhoneFooBar12,3",
+                    "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION": "13.2",
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -259,8 +271,7 @@ fileprivate struct AssetCatalogTaskConstructionTests: CoreBasedTests {
     func noFilters() async throws {
         let actoolPath = try await self.actoolPath
         try await withTemporaryDirectory { tmpDir in
-            let testProject = try await assetCatalogThinningTestProject(tmpDir: tmpDir, thinningBuildSettings: [:
-                                                                                                               ])
+            let testProject = try await assetCatalogThinningTestProject(tmpDir: tmpDir, thinningBuildSettings: [:])
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -296,29 +307,33 @@ fileprivate struct AssetCatalogTaskConstructionTests: CoreBasedTests {
     @Test(.requireSDKs(.iOS))
     func generateAssetSymbols() async throws {
         try await withTemporaryDirectory { tmpDir in
-            let testProject = try await assetCatalogThinningTestProject(tmpDir: tmpDir, thinningBuildSettings: [
-                "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS": "YES",
-            ])
+            let testProject = try await assetCatalogThinningTestProject(
+                tmpDir: tmpDir,
+                thinningBuildSettings: [
+                    "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS": "YES"
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
             try await tester.checkBuild(runDestination: .iOS) { results in
                 for variant in ["thinned", "unthinned"] {
-                    let actoolCommandLine = try await [actoolPath.str,
-                                                       "\(SRCROOT)/Assets.xcassets",
-                                                       "\(SRCROOT)/Icon.icon",
-                                                       "--compile", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_output/\(variant)",
-                                                       "--output-format", "human-readable-text",
-                                                       "--notices", "--warnings",
-                                                       "--export-dependency-info", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_dependencies_\(variant)",
-                                                       "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_generated_info.plist_\(variant)",
-                                                       "--compress-pngs",
-                                                       "--enable-on-demand-resources", "NO",
-                                                       "--development-region", "English",
-                                                       "--target-device", "iphone",
-                                                       "--minimum-deployment-target", results.runDestinationSDK.defaultDeploymentTarget,
-                                                       "--platform", "iphoneos",
+                    let actoolCommandLine = try await [
+                        actoolPath.str,
+                        "\(SRCROOT)/Assets.xcassets",
+                        "\(SRCROOT)/Icon.icon",
+                        "--compile", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_output/\(variant)",
+                        "--output-format", "human-readable-text",
+                        "--notices", "--warnings",
+                        "--export-dependency-info", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_dependencies_\(variant)",
+                        "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_generated_info.plist_\(variant)",
+                        "--compress-pngs",
+                        "--enable-on-demand-resources", "NO",
+                        "--development-region", "English",
+                        "--target-device", "iphone",
+                        "--minimum-deployment-target", results.runDestinationSDK.defaultDeploymentTarget,
+                        "--platform", "iphoneos",
                     ]
 
                     results.checkTask(.matchRuleType("CompileAssetCatalogVariant"), .matchRuleItem(variant)) { task in
@@ -326,28 +341,31 @@ fileprivate struct AssetCatalogTaskConstructionTests: CoreBasedTests {
                     }
                 }
 
-                let actoolCommandLine = try await [actoolPath.str,
-                                                   "\(SRCROOT)/Assets.xcassets",
-                                                   "\(SRCROOT)/Icon.icon",
-                                                   "--compile", "\(SRCROOT)/build/Debug-iphoneos/App.framework",
-                                                   "--output-format", "human-readable-text",
-                                                   "--notices", "--warnings",
-                                                   "--export-dependency-info", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_dependencies",
-                                                   "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_generated_info.plist",
-                                                   "--compress-pngs",
-                                                   "--enable-on-demand-resources", "NO",
-                                                   "--development-region", "English",
-                                                   "--target-device", "iphone",
-                                                   "--minimum-deployment-target", results.runDestinationSDK.defaultDeploymentTarget,
-                                                   "--platform", "iphoneos",
+                let actoolCommandLine = try await [
+                    actoolPath.str,
+                    "\(SRCROOT)/Assets.xcassets",
+                    "\(SRCROOT)/Icon.icon",
+                    "--compile", "\(SRCROOT)/build/Debug-iphoneos/App.framework",
+                    "--output-format", "human-readable-text",
+                    "--notices", "--warnings",
+                    "--export-dependency-info", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_dependencies",
+                    "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_generated_info.plist",
+                    "--compress-pngs",
+                    "--enable-on-demand-resources", "NO",
+                    "--development-region", "English",
+                    "--target-device", "iphone",
+                    "--minimum-deployment-target", results.runDestinationSDK.defaultDeploymentTarget,
+                    "--platform", "iphoneos",
                 ]
 
-                let symbolsArgs = ["--bundle-identifier", "com.apple.project",
-                                   "--generate-swift-asset-symbol-extensions", "NO",
-                                   "--generate-swift-asset-symbols",
-                                   "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/DerivedSources/GeneratedAssetSymbols.swift",
-                                   "--generate-objc-asset-symbols",
-                                   "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/DerivedSources/GeneratedAssetSymbols.h"]
+                let symbolsArgs = [
+                    "--bundle-identifier", "com.apple.project",
+                    "--generate-swift-asset-symbol-extensions", "NO",
+                    "--generate-swift-asset-symbols",
+                    "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/DerivedSources/GeneratedAssetSymbols.swift",
+                    "--generate-objc-asset-symbols",
+                    "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/DerivedSources/GeneratedAssetSymbols.h",
+                ]
 
                 results.checkTask(.matchRuleType("GenerateAssetSymbols")) { task in
                     task.checkCommandLineContainsUninterrupted(actoolCommandLine + symbolsArgs)
@@ -367,34 +385,38 @@ fileprivate struct AssetCatalogTaskConstructionTests: CoreBasedTests {
     @Test(.requireSDKs(.iOS))
     func generateAssetSymbolsOptions() async throws {
         try await withTemporaryDirectory { tmpDir in
-            let testProject = try await assetCatalogThinningTestProject(tmpDir: tmpDir, thinningBuildSettings: [
-                "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS": "YES",
-                "ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS": "NO",
-                "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOL_FRAMEWORKS": "UIKit AppKit",
-                "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOL_BACKWARDS_DEPLOYMENT_SUPPORT": "YES",
-                "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOL_WARNINGS": "NO",
-                "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOL_ERRORS": "NO",
-            ])
+            let testProject = try await assetCatalogThinningTestProject(
+                tmpDir: tmpDir,
+                thinningBuildSettings: [
+                    "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS": "YES",
+                    "ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS": "NO",
+                    "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOL_FRAMEWORKS": "UIKit AppKit",
+                    "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOL_BACKWARDS_DEPLOYMENT_SUPPORT": "YES",
+                    "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOL_WARNINGS": "NO",
+                    "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOL_ERRORS": "NO",
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
             try await tester.checkBuild(runDestination: .iOS) { results in
                 for variant in ["thinned", "unthinned"] {
-                    let actoolCommandLine = try await [actoolPath.str,
-                                                       "\(SRCROOT)/Assets.xcassets",
-                                                       "\(SRCROOT)/Icon.icon",
-                                                       "--compile", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_output/\(variant)",
-                                                       "--output-format", "human-readable-text",
-                                                       "--notices", "--warnings",
-                                                       "--export-dependency-info", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_dependencies_\(variant)",
-                                                       "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_generated_info.plist_\(variant)",
-                                                       "--compress-pngs",
-                                                       "--enable-on-demand-resources", "NO",
-                                                       "--development-region", "English",
-                                                       "--target-device", "iphone",
-                                                       "--minimum-deployment-target", results.runDestinationSDK.defaultDeploymentTarget,
-                                                       "--platform", "iphoneos",
+                    let actoolCommandLine = try await [
+                        actoolPath.str,
+                        "\(SRCROOT)/Assets.xcassets",
+                        "\(SRCROOT)/Icon.icon",
+                        "--compile", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_output/\(variant)",
+                        "--output-format", "human-readable-text",
+                        "--notices", "--warnings",
+                        "--export-dependency-info", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_dependencies_\(variant)",
+                        "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_generated_info.plist_\(variant)",
+                        "--compress-pngs",
+                        "--enable-on-demand-resources", "NO",
+                        "--development-region", "English",
+                        "--target-device", "iphone",
+                        "--minimum-deployment-target", results.runDestinationSDK.defaultDeploymentTarget,
+                        "--platform", "iphoneos",
                     ]
 
                     results.checkTask(.matchRuleType("CompileAssetCatalogVariant"), .matchRuleItem(variant)) { task in
@@ -402,33 +424,36 @@ fileprivate struct AssetCatalogTaskConstructionTests: CoreBasedTests {
                     }
                 }
 
-                let actoolCommandLine = try await [actoolPath.str,
-                                                   "\(SRCROOT)/Assets.xcassets",
-                                                   "\(SRCROOT)/Icon.icon",
-                                                   "--compile", "\(SRCROOT)/build/Debug-iphoneos/App.framework",
-                                                   "--output-format", "human-readable-text",
-                                                   "--notices", "--warnings",
-                                                   "--export-dependency-info", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_dependencies",
-                                                   "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_generated_info.plist",
-                                                   "--compress-pngs",
-                                                   "--enable-on-demand-resources", "NO",
-                                                   "--development-region", "English",
-                                                   "--target-device", "iphone",
-                                                   "--minimum-deployment-target", results.runDestinationSDK.defaultDeploymentTarget,
-                                                   "--platform", "iphoneos",
+                let actoolCommandLine = try await [
+                    actoolPath.str,
+                    "\(SRCROOT)/Assets.xcassets",
+                    "\(SRCROOT)/Icon.icon",
+                    "--compile", "\(SRCROOT)/build/Debug-iphoneos/App.framework",
+                    "--output-format", "human-readable-text",
+                    "--notices", "--warnings",
+                    "--export-dependency-info", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_dependencies",
+                    "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/assetcatalog_generated_info.plist",
+                    "--compress-pngs",
+                    "--enable-on-demand-resources", "NO",
+                    "--development-region", "English",
+                    "--target-device", "iphone",
+                    "--minimum-deployment-target", results.runDestinationSDK.defaultDeploymentTarget,
+                    "--platform", "iphoneos",
                 ]
 
-                let symbolsArgs = ["--bundle-identifier", "com.apple.project",
-                                   "--generate-asset-symbol-warnings", "NO",
-                                   "--generate-asset-symbol-errors", "NO",
-                                   "--generate-swift-asset-symbol-extensions", "NO",
-                                   "--generate-asset-symbol-framework-support", "UIKit",
-                                   "--generate-asset-symbol-framework-support", "AppKit",
-                                   "--generate-asset-symbol-backwards-deployment-support", "YES",
-                                   "--generate-swift-asset-symbols",
-                                   "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/DerivedSources/GeneratedAssetSymbols.swift",
-                                   "--generate-objc-asset-symbols",
-                                   "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/DerivedSources/GeneratedAssetSymbols.h"]
+                let symbolsArgs = [
+                    "--bundle-identifier", "com.apple.project",
+                    "--generate-asset-symbol-warnings", "NO",
+                    "--generate-asset-symbol-errors", "NO",
+                    "--generate-swift-asset-symbol-extensions", "NO",
+                    "--generate-asset-symbol-framework-support", "UIKit",
+                    "--generate-asset-symbol-framework-support", "AppKit",
+                    "--generate-asset-symbol-backwards-deployment-support", "YES",
+                    "--generate-swift-asset-symbols",
+                    "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/DerivedSources/GeneratedAssetSymbols.swift",
+                    "--generate-objc-asset-symbols",
+                    "\(SRCROOT)/build/aProject.build/Debug-iphoneos/App.build/DerivedSources/GeneratedAssetSymbols.h",
+                ]
 
                 results.checkTask(.matchRuleType("GenerateAssetSymbols")) { task in
                     task.checkCommandLineContainsUninterrupted(actoolCommandLine + symbolsArgs)
diff --git a/Tests/SWBTaskConstructionTests/BuildActionTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/BuildActionTaskConstructionTests.swift
index fb11f62f..f968f73b 100644
--- a/Tests/SWBTaskConstructionTests/BuildActionTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/BuildActionTaskConstructionTests.swift
@@ -38,24 +38,31 @@ fileprivate struct BuildActionTaskConstructionTests: CoreBasedTests {
                     TestFile("libdynamic.dylib"),
                     TestFile("StubFramework.framework"),
                     TestFile("Script-Input-Header.fake-input"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "DEFINES_MODULE": "YES",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "TAPI_EXEC": tapiToolPath.str,
-                ]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "DEFINES_MODULE": "YES",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "TAPI_EXEC": tapiToolPath.str,
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "FrameworkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release", buildSettings: [
-                            "INFOPLIST_FILE": "MyInfo.plist",
-                            "SUPPORTS_TEXT_BASED_API": "YES"
-                        ]),
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "MyInfo.plist",
+                                "SUPPORTS_TEXT_BASED_API": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -66,20 +73,24 @@ fileprivate struct BuildActionTaskConstructionTests: CoreBasedTests {
                             TestBuildFile("FrameworkTarget.h", headerVisibility: .public),
                             TestBuildFile("PublicHeaderFile.h", headerVisibility: .public),
                             TestBuildFile("PrivateHeaderFile.h", headerVisibility: .private),
-                            TestBuildFile("ProjectHeaderFile.h"),   // visibility: project
+                            TestBuildFile("ProjectHeaderFile.h"),  // visibility: project
                         ]),
                         TestResourcesBuildPhase([
-                            "StringsResource.strings",
+                            "StringsResource.strings"
                         ]),
                         TestFrameworksBuildPhase([
-                            "libdynamic.dylib",
+                            "libdynamic.dylib"
                         ]),
-                        TestCopyFilesBuildPhase([
-                            "StubFramework.framework",
-                        ], destinationSubfolder: .frameworks),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "StubFramework.framework"
+                            ],
+                            destinationSubfolder: .frameworks
+                        ),
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -87,12 +98,20 @@ fileprivate struct BuildActionTaskConstructionTests: CoreBasedTests {
         await tester.checkBuild(BuildParameters(action: .installAPI, configuration: "Release"), runDestination: .macOS) { results in
             results.checkTarget("FrameworkTarget") { target in
                 // There should be the expected number of mkdir and symlink tasks.
-                results.checkTasks(.matchTarget(target), .matchRuleType("MkDir"), body: { tasks in
-                    #expect(tasks.count == 5)
-                })
-                results.checkTasks(.matchTarget(target), .matchRuleType("SymLink"), body: { tasks in
-                    #expect(tasks.count == 6)
-                })
+                results.checkTasks(
+                    .matchTarget(target),
+                    .matchRuleType("MkDir"),
+                    body: { tasks in
+                        #expect(tasks.count == 5)
+                    }
+                )
+                results.checkTasks(
+                    .matchTarget(target),
+                    .matchRuleType("SymLink"),
+                    body: { tasks in
+                        #expect(tasks.count == 6)
+                    }
+                )
 
                 results.checkTask(.matchTarget(target), .matchRuleType("GenerateTAPI")) { _ in }
 
@@ -141,17 +160,25 @@ fileprivate struct BuildActionTaskConstructionTests: CoreBasedTests {
 
         // Check an installapi release build with copy files enabled.
         let overrides = [
-            "INSTALLAPI_COPY_PHASE": "YES",
+            "INSTALLAPI_COPY_PHASE": "YES"
         ]
         await tester.checkBuild(BuildParameters(action: .installAPI, configuration: "Release", overrides: overrides), runDestination: .macOS) { results in
             results.checkTarget("FrameworkTarget") { target in
                 // There should be the expected number of mkdir and symlink tasks.
-                results.checkTasks(.matchTarget(target), .matchRuleType("MkDir"), body: { tasks in
-                    #expect(tasks.count == 6)
-                })
-                results.checkTasks(.matchTarget(target), .matchRuleType("SymLink"), body: { tasks in
-                    #expect(tasks.count == 7)
-                })
+                results.checkTasks(
+                    .matchTarget(target),
+                    .matchRuleType("MkDir"),
+                    body: { tasks in
+                        #expect(tasks.count == 6)
+                    }
+                )
+                results.checkTasks(
+                    .matchTarget(target),
+                    .matchRuleType("SymLink"),
+                    body: { tasks in
+                        #expect(tasks.count == 7)
+                    }
+                )
 
                 results.checkTask(.matchTarget(target), .matchRuleType("GenerateTAPI")) { _ in }
 
@@ -225,22 +252,29 @@ fileprivate struct BuildActionTaskConstructionTests: CoreBasedTests {
                     TestFile("StringsResource.strings"),
                     TestFile("libdynamic.dylib"),
                     TestFile("Script-Input-Header.fake-input"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "TAPI_EXEC": tapiToolPath.str,
-                ]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "TAPI_EXEC": tapiToolPath.str,
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "DynamicLibraryTarget",
                     type: .dynamicLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release", buildSettings: [
-                            "SUPPORTS_TEXT_BASED_API": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "SUPPORTS_TEXT_BASED_API": "YES"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -251,65 +285,79 @@ fileprivate struct BuildActionTaskConstructionTests: CoreBasedTests {
                             TestBuildFile("DynamicLibraryTarget.h", headerVisibility: .public),
                             TestBuildFile("PublicHeaderFile.h", headerVisibility: .public),
                             TestBuildFile("PrivateHeaderFile.h", headerVisibility: .private),
-                            TestBuildFile("ProjectHeaderFile.h"),   // visibility: project
+                            TestBuildFile("ProjectHeaderFile.h"),  // visibility: project
                         ]),
                         TestResourcesBuildPhase([
-                            "StringsResource.strings",
+                            "StringsResource.strings"
                         ]),
                         TestFrameworksBuildPhase([
-                            "libdynamic.dylib",
+                            "libdynamic.dylib"
                         ]),
-                    ]),
+                    ]
+                ),
                 TestStandardTarget(
                     "DoesNotSupportTextBasedAPI",
                     type: .dynamicLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release", buildSettings: [
-                            "ALLOW_UNSUPPORTED_TEXT_BASED_API": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "ALLOW_UNSUPPORTED_TEXT_BASED_API": "YES"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "SourceOne.m",
+                            "SourceOne.m"
                         ]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("DoesNotSupportTextBasedAPI.h", headerVisibility: .public),
-                        ])
-                    ]),
+                            TestBuildFile("DoesNotSupportTextBasedAPI.h", headerVisibility: .public)
+                        ]),
+                    ]
+                ),
                 TestStandardTarget(
                     "UsesNonStandardExtension",
                     type: .dynamicLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release", buildSettings: [
-                            "EXECUTABLE_EXTENSION": "videodecoder",
-                            "SUPPORTS_TEXT_BASED_API": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "EXECUTABLE_EXTENSION": "videodecoder",
+                                "SUPPORTS_TEXT_BASED_API": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "SourceOne.m",
+                            "SourceOne.m"
                         ]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("UsesNonStandardExtension.h", headerVisibility: .public),
-                        ])
-                    ]),
+                            TestBuildFile("UsesNonStandardExtension.h", headerVisibility: .public)
+                        ]),
+                    ]
+                ),
                 TestStandardTarget(
                     "StaticLibraryTarget",
                     type: .staticLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release", buildSettings: [
-                            "SUPPORTS_TEXT_BASED_API": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "SUPPORTS_TEXT_BASED_API": "YES"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "SourceOne.m",
+                            "SourceOne.m"
                         ]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("StaticLibraryTarget.h", headerVisibility: .public),
-                        ])
-                    ]),
-            ])
+                            TestBuildFile("StaticLibraryTarget.h", headerVisibility: .public)
+                        ]),
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -383,7 +431,7 @@ fileprivate struct BuildActionTaskConstructionTests: CoreBasedTests {
 
         // Check an installapi release build with copy files enabled.
         let overrides = [
-            "INSTALLAPI_COPY_PHASE": "YES",
+            "INSTALLAPI_COPY_PHASE": "YES"
         ]
         await tester.checkBuild(BuildParameters(action: .installAPI, configuration: "Release", overrides: overrides), runDestination: .macOS) { results in
             results.checkTarget("DynamicLibraryTarget") { target in
@@ -444,20 +492,24 @@ fileprivate struct BuildActionTaskConstructionTests: CoreBasedTests {
                     TestFile("libdynamic.dylib"),
                     TestFile("StubFramework.framework"),
                     TestFile("Script-Input-Header.fake-input"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "DEFINES_MODULE": "YES",
-                    "CODE_SIGN_IDENTITY": "-",
-                ]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "DEFINES_MODULE": "YES",
+                        "CODE_SIGN_IDENTITY": "-",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "FrameworkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"]),
+                        TestBuildConfiguration("Release", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -468,25 +520,39 @@ fileprivate struct BuildActionTaskConstructionTests: CoreBasedTests {
                             TestBuildFile("FrameworkTarget.h", headerVisibility: .public),
                             TestBuildFile("PublicHeaderFile.h", headerVisibility: .public),
                             TestBuildFile("PrivateHeaderFile.h", headerVisibility: .private),
-                            TestBuildFile("ProjectHeaderFile.h"),    // visibility: project
+                            TestBuildFile("ProjectHeaderFile.h"),  // visibility: project
                         ]),
                         TestResourcesBuildPhase([
-                            "StringsResource.strings",
+                            "StringsResource.strings"
                         ]),
                         TestFrameworksBuildPhase([
-                            "libdynamic.dylib",
+                            "libdynamic.dylib"
                         ]),
-                        TestCopyFilesBuildPhase([
-                            "StubFramework.framework",
-                        ], destinationSubfolder: .frameworks),
-                        TestShellScriptBuildPhase(name: "Run Script", originalObjectID: "Foo", contents: "echo \"Running script\"\nexit 0\n",
-                                                  inputs: ["Script-Input-Header.fake-input"], outputs: ["$(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)/Script-Header.h"]),
-                        TestShellScriptBuildPhase(name: "Always Run Script", originalObjectID: "Bar", contents: "echo \"Running script\"\nexit 0\n",
-                                                  inputs: ["Script-Input-Header.fake-input"], outputs: ["$(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)/Script2-Header.h"],
-                                                  alwaysRunForInstallHdrs: true),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "StubFramework.framework"
+                            ],
+                            destinationSubfolder: .frameworks
+                        ),
+                        TestShellScriptBuildPhase(
+                            name: "Run Script",
+                            originalObjectID: "Foo",
+                            contents: "echo \"Running script\"\nexit 0\n",
+                            inputs: ["Script-Input-Header.fake-input"],
+                            outputs: ["$(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)/Script-Header.h"]
+                        ),
+                        TestShellScriptBuildPhase(
+                            name: "Always Run Script",
+                            originalObjectID: "Bar",
+                            contents: "echo \"Running script\"\nexit 0\n",
+                            inputs: ["Script-Input-Header.fake-input"],
+                            outputs: ["$(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)/Script2-Header.h"],
+                            alwaysRunForInstallHdrs: true
+                        ),
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -494,12 +560,20 @@ fileprivate struct BuildActionTaskConstructionTests: CoreBasedTests {
         await tester.checkBuild(BuildParameters(action: .installHeaders, configuration: "Release"), runDestination: .macOS) { results in
             results.checkTarget("FrameworkTarget") { target in
                 // There should be the expected number of mkdir and symlink tasks.
-                results.checkTasks(.matchTarget(target), .matchRuleType("MkDir"), body: { tasks in
-                    #expect(tasks.count == 5)
-                })
-                results.checkTasks(.matchTarget(target), .matchRuleType("SymLink"), body: { tasks in
-                    #expect(tasks.count == 5)
-                })
+                results.checkTasks(
+                    .matchTarget(target),
+                    .matchRuleType("MkDir"),
+                    body: { tasks in
+                        #expect(tasks.count == 5)
+                    }
+                )
+                results.checkTasks(
+                    .matchTarget(target),
+                    .matchRuleType("SymLink"),
+                    body: { tasks in
+                        #expect(tasks.count == 5)
+                    }
+                )
 
                 // There should be three CpHeader tasks.
                 results.checkTask(.matchTarget(target), .matchRule(["CpHeader", "/tmp/aProject.dst/Library/Frameworks/FrameworkTarget.framework/Versions/A/PrivateHeaders/PrivateHeaderFile.h", "\(SRCROOT)/PrivateHeaderFile.h"])) { task in
@@ -532,7 +606,7 @@ fileprivate struct BuildActionTaskConstructionTests: CoreBasedTests {
                         .namePattern(.prefix("target-")),
                     ])
                     task.checkOutputs([
-                        .path("/tmp/aProject.dst/Library/Frameworks/FrameworkTarget.framework/Versions/A/Headers/Script2-Header.h"),
+                        .path("/tmp/aProject.dst/Library/Frameworks/FrameworkTarget.framework/Versions/A/Headers/Script2-Header.h")
                     ])
                 }
 
@@ -578,12 +652,20 @@ fileprivate struct BuildActionTaskConstructionTests: CoreBasedTests {
         await tester.checkBuild(BuildParameters(action: .installHeaders, configuration: "Release", overrides: overrides), runDestination: .macOS) { results in
             results.checkTarget("FrameworkTarget") { target in
                 // There should be the expected number of mkdir and symlink tasks.
-                results.checkTasks(.matchTarget(target), .matchRuleType("MkDir"), body: { tasks in
-                    #expect(tasks.count == 6)
-                })
-                results.checkTasks(.matchTarget(target), .matchRuleType("SymLink"), body: { tasks in
-                    #expect(tasks.count == 6)
-                })
+                results.checkTasks(
+                    .matchTarget(target),
+                    .matchRuleType("MkDir"),
+                    body: { tasks in
+                        #expect(tasks.count == 6)
+                    }
+                )
+                results.checkTasks(
+                    .matchTarget(target),
+                    .matchRuleType("SymLink"),
+                    body: { tasks in
+                        #expect(tasks.count == 6)
+                    }
+                )
 
                 // There should be two CpHeader tasks.
                 results.checkTask(.matchTarget(target), .matchRule(["CpHeader", "/tmp/aProject.dst/Library/Frameworks/FrameworkTarget.framework/Versions/A/PrivateHeaders/PrivateHeaderFile.h", "\(SRCROOT)/PrivateHeaderFile.h"])) { task in
@@ -629,7 +711,7 @@ fileprivate struct BuildActionTaskConstructionTests: CoreBasedTests {
                         .namePattern(.prefix("target-")),
                     ])
                     task.checkOutputs([
-                        .path("/tmp/aProject.dst/Library/Frameworks/FrameworkTarget.framework/Versions/A/Headers/Script-Header.h"),
+                        .path("/tmp/aProject.dst/Library/Frameworks/FrameworkTarget.framework/Versions/A/Headers/Script-Header.h")
                     ])
                 }
 
@@ -648,7 +730,7 @@ fileprivate struct BuildActionTaskConstructionTests: CoreBasedTests {
                         .namePattern(.prefix("target-")),
                     ])
                     task.checkOutputs([
-                        .path("/tmp/aProject.dst/Library/Frameworks/FrameworkTarget.framework/Versions/A/Headers/Script2-Header.h"),
+                        .path("/tmp/aProject.dst/Library/Frameworks/FrameworkTarget.framework/Versions/A/Headers/Script2-Header.h")
                     ])
                 }
 
@@ -679,7 +761,6 @@ fileprivate struct BuildActionTaskConstructionTests: CoreBasedTests {
         }
     }
 
-
     /// Test running an install on a product to a location which contains an upwards path component ('..'), as path normalization and task validation criteria nullification can results in some build artifacts not being produced if paths don't line up.
     @Test(.requireSDKs(.macOS))
     func installWithUpwardsPath() async throws {
@@ -697,49 +778,70 @@ fileprivate struct BuildActionTaskConstructionTests: CoreBasedTests {
                     TestFile("Service.xpc"),
                     TestFile("Extension.appex"),
                     TestFile("Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "RETAIN_RAW_BINARIES": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "RETAIN_RAW_BINARIES": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "FrameworkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release", buildSettings: [
-                            "INFOPLIST_FILE": "Info.plist",
-                            // The INSTALL_PATH definition here is the point of the test - we want to make sure tasks get created when there's a '..' in the path.
-                            "INSTALL_PATH": "/Applications/SomeOtherApp.app/Frameworks/../InternalFrameworks",
-                        ]),
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "Info.plist",
+                                // The INSTALL_PATH definition here is the point of the test - we want to make sure tasks get created when there's a '..' in the path.
+                                "INSTALL_PATH": "/Applications/SomeOtherApp.app/Frameworks/../InternalFrameworks",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "SourceOne.m",
+                            "SourceOne.m"
                         ]),
                         TestHeadersBuildPhase([
                             TestBuildFile("PublicHeaderFile.h", headerVisibility: .public),
                             TestBuildFile("PrivateHeaderFile.h", headerVisibility: .private),
                         ]),
                         TestResourcesBuildPhase([
-                            "StringsResource.strings",
+                            "StringsResource.strings"
                         ]),
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile("StubFramework.framework", codeSignOnCopy: true),
-                        ], destinationSubfolder: .frameworks, onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("StubFramework.framework", codeSignOnCopy: true)
+                            ],
+                            destinationSubfolder: .frameworks,
+                            onlyForDeployment: false
+                        ),
                         // The destination here matches how the "XPCServices" popup in the build phase UI populates it.  See <rdar://problem/15366863>
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile("Service.xpc", codeSignOnCopy: true),
-                        ], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(CONTENTS_FOLDER_PATH)/XPCServices", onlyForDeployment: false),
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile("Extension.appex", codeSignOnCopy: true),
-                        ], destinationSubfolder: .plugins, onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("Service.xpc", codeSignOnCopy: true)
+                            ],
+                            destinationSubfolder: .builtProductsDir,
+                            destinationSubpath: "$(CONTENTS_FOLDER_PATH)/XPCServices",
+                            onlyForDeployment: false
+                        ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("Extension.appex", codeSignOnCopy: true)
+                            ],
+                            destinationSubfolder: .plugins,
+                            onlyForDeployment: false
+                        ),
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
diff --git a/Tests/SWBTaskConstructionTests/BuildPhaseFusionTests.swift b/Tests/SWBTaskConstructionTests/BuildPhaseFusionTests.swift
index 92b1559c..fa2a93d4 100644
--- a/Tests/SWBTaskConstructionTests/BuildPhaseFusionTests.swift
+++ b/Tests/SWBTaskConstructionTests/BuildPhaseFusionTests.swift
@@ -27,11 +27,13 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir.join("srcroot"),
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("SourceFile.swift"),
                         TestFile("Image.png"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -42,7 +44,8 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                             "SWIFT_VERSION": swiftVersion,
                             "SWIFT_EXEC": swiftCompilerPath.str,
                             "IGNORE_BUILD_PHASES": "YES",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -54,7 +57,8 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                             TestResourcesBuildPhase(["Image.png"]),
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             await tester.checkBuild(runDestination: .macOS) { results -> Void in
@@ -84,11 +88,13 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir.join("srcroot"),
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("SourceFile.c"),
                         TestFile("Image.png"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -96,7 +102,8 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                             "GENERATE_INFOPLIST_FILE": "YES",
                             "CODE_SIGN_IDENTITY": "",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -107,7 +114,8 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                             TestResourcesBuildPhase(["Image.png"]),
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             await tester.checkBuild(runDestination: .macOS) { results -> Void in
@@ -139,11 +147,13 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir.join("srcroot"),
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("SourceFile.c"),
                         TestFile("Image.png"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -151,7 +161,8 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                             "GENERATE_INFOPLIST_FILE": "YES",
                             "CODE_SIGN_IDENTITY": "",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -163,7 +174,8 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                             TestResourcesBuildPhase(["Image.png"]),
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             await tester.checkBuild(runDestination: .macOS) { results -> Void in
@@ -187,11 +199,13 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir.join("srcroot"),
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("SourceFile.c"),
                         TestFile("Image.png"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Enabled",
@@ -200,14 +214,16 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                             "CODE_SIGN_IDENTITY": "",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "FUSE_BUILD_SCRIPT_PHASES": "YES",
-                        ]),
+                        ]
+                    ),
                     TestBuildConfiguration(
                         "Disabled",
                         buildSettings: [
                             "GENERATE_INFOPLIST_FILE": "YES",
                             "CODE_SIGN_IDENTITY": "",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
+                        ]
+                    ),
                 ],
                 targets: [
                     TestStandardTarget(
@@ -225,7 +241,8 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                             TestShellScriptBuildPhase(name: "S7", originalObjectID: "S7", contents: "", inputs: [], outputs: [], alwaysOutOfDate: false),
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             await tester.checkBuild(BuildParameters(configuration: "Enabled"), runDestination: .macOS) { results -> Void in
@@ -304,14 +321,16 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir.join("srcroot"),
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("SourceFile.c"),
                         TestFile("Image.png"),
                         TestFile("f1.txt"),
                         TestFile("f2.txt"),
                         TestFile("f3.txt"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -319,7 +338,8 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                             "GENERATE_INFOPLIST_FILE": "YES",
                             "CODE_SIGN_IDENTITY": "",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -333,8 +353,9 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                             TestCopyFilesBuildPhase(["f3.txt"], destinationSubfolder: .resources, onlyForDeployment: false),
                             TestShellScriptBuildPhase(name: "S1", originalObjectID: "S1", contents: "", inputs: [], outputs: ["foo"], alwaysOutOfDate: false),
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             await tester.checkBuild(runDestination: .macOS) { results -> Void in
@@ -369,11 +390,13 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir.join("srcroot"),
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("SourceFile.c"),
                         TestFile("Image.png"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -382,7 +405,8 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                             "CODE_SIGN_IDENTITY": "",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "FUSE_BUILD_PHASES": "NO",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -393,7 +417,8 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                             TestResourcesBuildPhase(["Image.png"]),
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             await tester.checkBuild(runDestination: .macOS) { results -> Void in
@@ -417,26 +442,35 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
+                            "Sources",
+                            path: "Sources",
+                            children: [
                                 TestFile("CoreFoo.h"),
                                 TestFile("CoreFoo.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "CODE_SIGN_IDENTITY": "",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGN_IDENTITY": "",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase(["CoreFoo.m"]),
                                     TestHeadersBuildPhase([TestBuildFile("CoreFoo.h", headerVisibility: .public)]),
-                                ])
-                        ])
-                ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             // The header copy should be moved before compile, and should not depend on target-entry.
             try await TaskConstructionTester(getCore(), testWorkspace).checkBuild(runDestination: .macOS) { results in
@@ -444,7 +478,7 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                 results.checkTask(.matchTargetName("CoreFoo"), .matchRuleType("CpHeader")) { headerTask in
                     headerTask.checkInputs([
                         .namePattern(.suffix("CoreFoo.h/")),
-                        .namePattern(.suffix("-immediate"))
+                        .namePattern(.suffix("-immediate")),
                     ])
                     results.checkTaskDoesNotFollow(headerTask, .matchTargetName("CoreFoo"), .matchRuleType("CompileC"))
                 }
@@ -462,30 +496,41 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
+                            "Sources",
+                            path: "Sources",
+                            children: [
                                 TestFile("CoreFoo.h"),
                                 TestFile("CoreBar.h", path: "/tmp/CoreBar.h"),
                                 TestFile("CoreFoo.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "CODE_SIGN_IDENTITY": "",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGN_IDENTITY": "",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase(["CoreFoo.m"]),
                                     TestShellScriptBuildPhase(name: "Generate CoreBar.h", originalObjectID: "", outputs: ["/tmp/CoreBar.h"], alwaysOutOfDate: false),
-                                    TestHeadersBuildPhase([TestBuildFile("CoreBar.h", headerVisibility: .public),
-                                                           TestBuildFile("CoreFoo.h", headerVisibility: .public)]),
-                                ])
-                        ])
-                ])
+                                    TestHeadersBuildPhase([
+                                        TestBuildFile("CoreBar.h", headerVisibility: .public),
+                                        TestBuildFile("CoreFoo.h", headerVisibility: .public),
+                                    ]),
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             // The header copy should not be relocated.
             try await TaskConstructionTester(getCore(), testWorkspace).checkBuild(runDestination: .macOS) { results in
@@ -507,30 +552,41 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
+                            "Sources",
+                            path: "Sources",
+                            children: [
                                 TestFile("CoreFoo.h"),
                                 TestFile("CoreBar.h"),
                                 TestFile("CoreFoo.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "CODE_SIGN_IDENTITY": "",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGN_IDENTITY": "",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase(["CoreFoo.m"]),
                                     TestShellScriptBuildPhase(name: "Generate CoreBar.h", originalObjectID: "", outputs: ["/tmp/whatever.txt"], alwaysOutOfDate: false),
-                                    TestHeadersBuildPhase([TestBuildFile("CoreBar.h", headerVisibility: .public),
-                                                           TestBuildFile("CoreFoo.h", headerVisibility: .public)]),
-                                ])
-                        ])
-                ])
+                                    TestHeadersBuildPhase([
+                                        TestBuildFile("CoreBar.h", headerVisibility: .public),
+                                        TestBuildFile("CoreFoo.h", headerVisibility: .public),
+                                    ]),
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             // The header copy should be moved before compile, and should not depend on target-entry.
             try await TaskConstructionTester(getCore(), testWorkspace).checkBuild(runDestination: .macOS) { results in
@@ -538,7 +594,7 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                 results.checkTask(.matchTargetName("CoreFoo"), .matchRuleType("CpHeader"), .matchRulePattern([.contains("CoreFoo.h")])) { headerTask in
                     headerTask.checkInputs([
                         .namePattern(.suffix("CoreFoo.h/")),
-                        .namePattern(.suffix("-immediate"))
+                        .namePattern(.suffix("-immediate")),
                     ])
                     results.checkTaskDoesNotFollow(headerTask, .matchTargetName("CoreFoo"), .matchRuleType("CompileC"))
                 }
@@ -556,30 +612,41 @@ fileprivate struct BuildPhaseFusionTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
+                            "Sources",
+                            path: "Sources",
+                            children: [
                                 TestFile("CoreFoo.h"),
                                 TestFile("CoreBar.h", path: "/tmp/CoreBar.h"),
                                 TestFile("CoreFoo.m"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "CODE_SIGN_IDENTITY": "",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ENABLE_USER_SCRIPT_SANDBOXING": "NO",
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGN_IDENTITY": "",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ENABLE_USER_SCRIPT_SANDBOXING": "NO",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildPhases: [
                                     TestSourcesBuildPhase(["CoreFoo.m"]),
                                     TestShellScriptBuildPhase(name: "Generate CoreBar.h", originalObjectID: "", outputs: ["/tmp/whatever.txt"], alwaysOutOfDate: false),
-                                    TestHeadersBuildPhase([TestBuildFile("CoreBar.h", headerVisibility: .public),
-                                                           TestBuildFile("CoreFoo.h", headerVisibility: .public)]),
-                                ])
-                        ])
-                ])
+                                    TestHeadersBuildPhase([
+                                        TestBuildFile("CoreBar.h", headerVisibility: .public),
+                                        TestBuildFile("CoreFoo.h", headerVisibility: .public),
+                                    ]),
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             // The header copy should not be relocated.
             try await TaskConstructionTester(getCore(), testWorkspace).checkBuild(runDestination: .macOS) { results in
diff --git a/Tests/SWBTaskConstructionTests/BuildRuleTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/BuildRuleTaskConstructionTests.swift
index ce18631f..e7334487 100644
--- a/Tests/SWBTaskConstructionTests/BuildRuleTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/BuildRuleTaskConstructionTests.swift
@@ -28,29 +28,33 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("SomeProj.fake-project"),
                     TestFile("SomeProj.fake-neutral"),
                     TestFile("OtherProj.fake-project"),
                     TestFile("file.m"),
                     TestFile("file.mm"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug",
-                                       buildSettings: [
-                                        "IBC_EXEC": ibtoolPath.str,
-                                        "BUILD_VARIANTS": "normal debug profile",
-                                        "GENERATE_INFOPLIST_FILE": "YES",
-                                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                                       ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "IBC_EXEC": ibtoolPath.str,
+                        "BUILD_VARIANTS": "normal debug profile",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "SomeFwk",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -59,24 +63,39 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
                             "file.mm",
                         ]),
                         TestResourcesBuildPhase([
-                            "SomeProj.fake-project",
+                            "SomeProj.fake-project"
                         ]),
-                        TestCopyFilesBuildPhase([
-                            "OtherProj.fake-project",
-                        ], destinationSubfolder: .frameworks, onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "OtherProj.fake-project"
+                            ],
+                            destinationSubfolder: .frameworks,
+                            onlyForDeployment: false
+                        ),
                     ],
                     buildRules: [
                         TestBuildRule(filePattern: "*.fake-project", compilerIdentifier: "com.apple.compilers.pbxcp"),
-                        TestBuildRule(filePattern: "*.fake-neutral", script: "cp ${SCRIPT_INPUT_FILE} ${SCRIPT_OUTPUT_FILE_0}", outputs: [
-                            "$(DERIVED_FILES_DIR)/$(INPUT_FILE_NAME).c"
-                        ], runOncePerArchitecture: false),
-                        TestBuildRule(fileTypeIdentifier: "sourcecode.c.objc", script: "cp ${SCRIPT_INPUT_FILE} ${SCRIPT_OUTPUT_FILE_0}", outputs: [
-                            "$(DERIVED_FILES_DIR)/$(INPUT_FILE_NAME).x"
-                        ], runOncePerArchitecture: false),
+                        TestBuildRule(
+                            filePattern: "*.fake-neutral",
+                            script: "cp ${SCRIPT_INPUT_FILE} ${SCRIPT_OUTPUT_FILE_0}",
+                            outputs: [
+                                "$(DERIVED_FILES_DIR)/$(INPUT_FILE_NAME).c"
+                            ],
+                            runOncePerArchitecture: false
+                        ),
+                        TestBuildRule(
+                            fileTypeIdentifier: "sourcecode.c.objc",
+                            script: "cp ${SCRIPT_INPUT_FILE} ${SCRIPT_OUTPUT_FILE_0}",
+                            outputs: [
+                                "$(DERIVED_FILES_DIR)/$(INPUT_FILE_NAME).x"
+                            ],
+                            runOncePerArchitecture: false
+                        ),
                         TestBuildRule(fileTypeIdentifier: "sourcecode.cpp.objcpp", compilerIdentifier: "com.apple.xcode.tools.ibtool.compiler"),
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -128,14 +147,17 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
                     TestFile("suffix.txt"),
                     TestFile("example.fake-ts"),
                     TestFile("mock.c"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug",
-                                       buildSettings: [
-                                        "BUILD_VARIANTS": "debug",
-                                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                                        "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
-                                       ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "BUILD_VARIANTS": "debug",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -145,18 +167,21 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
                         TestSourcesBuildPhase([
                             TestBuildFile("example.fake-ts"),
                             TestBuildFile("mock.c"),
-                        ]),
+                        ])
                     ],
                     buildRules: [
-                        TestBuildRule(filePattern: "*.fake-ts",
-                                      script: #"bash "${SRCROOT}/fake-typescript-compiler.fake-sh""#,
-                                      inputs: ["$(SRCROOT)/fake-typescript-compiler.fake-sh"],
-                                      inputFileLists: ["$(SRCROOT)/extra-input-files.xcfilelist", "$(SRCROOT)/license.xcfilelist"],
-                                      outputs: ["$(INPUT_FILE_PATH).fake-js"],
-                                      outputFileLists: ["$(SRCROOT)/extra-output-files-odd.xcfilelist", "$(SRCROOT)/extra-output-files-even.xcfilelist"]),
+                        TestBuildRule(
+                            filePattern: "*.fake-ts",
+                            script: #"bash "${SRCROOT}/fake-typescript-compiler.fake-sh""#,
+                            inputs: ["$(SRCROOT)/fake-typescript-compiler.fake-sh"],
+                            inputFileLists: ["$(SRCROOT)/extra-input-files.xcfilelist", "$(SRCROOT)/license.xcfilelist"],
+                            outputs: ["$(INPUT_FILE_PATH).fake-js"],
+                            outputFileLists: ["$(SRCROOT)/extra-output-files-odd.xcfilelist", "$(SRCROOT)/extra-output-files-even.xcfilelist"]
+                        )
                     ]
                 )
-            ])
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -214,7 +239,7 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
             "FAKE_PATH_LICENSE_YEAR": Path(SRCROOT).join("license-year.txt").str,
             "FAKE_PATH_LICENSE_TEXT": Path(SRCROOT).join("license-text.txt").str,
             "FAKE_PATH_PREFIX": Path(SRCROOT).join("prefix.txt").str,
-            "FAKE_PATH_SUFFIX": Path(SRCROOT).join("suffix.txt").str
+            "FAKE_PATH_SUFFIX": Path(SRCROOT).join("suffix.txt").str,
         ]
 
         // Check the build.
@@ -227,11 +252,13 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
 
                         let inputFileListPath = Path(SRCROOT).join("build/coolWebsite.build/Debug\(effectivePlatformName)/TypeScriptApp.build/InputFileList").str
                         let outputFileListPath = Path(SRCROOT).join("build/coolWebsite.build/Debug\(effectivePlatformName)/TypeScriptApp.build/OutputFileList").str
-                        task.checkRuleInfo(["RuleScriptExecution",
-                                            Path(SRCROOT).join("example.fake-ts.fake-js").str,
-                                            Path(SRCROOT).join("example.fake-ts").str,
-                                            "debug",
-                                            results.runDestinationTargetArchitecture])
+                        task.checkRuleInfo([
+                            "RuleScriptExecution",
+                            Path(SRCROOT).join("example.fake-ts.fake-js").str,
+                            Path(SRCROOT).join("example.fake-ts").str,
+                            "debug",
+                            results.runDestinationTargetArchitecture,
+                        ])
                         if enableSandboxingInTest {
                             #expect(task.commandLine.first == "/usr/bin/sandbox-exec")
                         } else {
@@ -248,25 +275,44 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
                             .path(Path(SRCROOT).join("extra-output-files-even.xcfilelist").str),
                             .path(Path(SRCROOT).join("prefix.txt").str),
                             .path(Path(SRCROOT).join("suffix.txt").str),
-                            .pathPattern(.and(
-                                .prefix(inputFileListPath),
-                                .suffix("-extra-input-files-resolved.xcfilelist"))),
+                            .pathPattern(
+                                .and(
+                                    .prefix(inputFileListPath),
+                                    .suffix("-extra-input-files-resolved.xcfilelist")
+                                )
+                            ),
                             .path(Path(SRCROOT).join("license-year.txt").str),
                             .path(Path(SRCROOT).join("license-text.txt").str),
-                            .pathPattern(.and(
-                                .prefix(inputFileListPath),
-                                .suffix("-license-resolved.xcfilelist"))),
-                            .pathPattern(.and(
-                                .prefix(outputFileListPath), .suffix("-extra-output-files-odd-resolved.xcfilelist"))),
-                            .pathPattern(.and(
-                                .prefix(outputFileListPath), .suffix("-extra-output-files-even-resolved.xcfilelist"))),
-                            .any
+                            .pathPattern(
+                                .and(
+                                    .prefix(inputFileListPath),
+                                    .suffix("-license-resolved.xcfilelist")
+                                )
+                            ),
+                            .pathPattern(
+                                .and(
+                                    .prefix(outputFileListPath),
+                                    .suffix("-extra-output-files-odd-resolved.xcfilelist")
+                                )
+                            ),
+                            .pathPattern(
+                                .and(
+                                    .prefix(outputFileListPath),
+                                    .suffix("-extra-output-files-even-resolved.xcfilelist")
+                                )
+                            ),
+                            .any,
                         ]
 
                         if enableSandboxingInTest {
-                            inputs.append(.pathPattern(.and(
-                                .prefix(Path(SRCROOT).join("build/coolWebsite.build/Debug\(effectivePlatformName)/TypeScriptApp.build/").str),
-                                .suffix(".sb"))))
+                            inputs.append(
+                                .pathPattern(
+                                    .and(
+                                        .prefix(Path(SRCROOT).join("build/coolWebsite.build/Debug\(effectivePlatformName)/TypeScriptApp.build/").str),
+                                        .suffix(".sb")
+                                    )
+                                )
+                            )
                         }
 
                         inputs.append(.any)
@@ -297,7 +343,6 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
                             "SCRIPT_INPUT_FILE_LIST_0": .and(.prefix(inputFileListPath), .suffix("-extra-input-files-resolved.xcfilelist")),
                             "SCRIPT_INPUT_FILE_LIST_1": .and(.prefix(inputFileListPath), .suffix("-license-resolved.xcfilelist")),
 
-
                             "SCRIPT_OUTPUT_FILE_LIST_COUNT": .equal("2"),
                             "SCRIPT_OUTPUT_FILE_LIST_0": .and(.prefix(outputFileListPath), .suffix("-extra-output-files-odd-resolved.xcfilelist")),
                             "SCRIPT_OUTPUT_FILE_LIST_1": .and(.prefix(outputFileListPath), .suffix("-extra-output-files-even-resolved.xcfilelist")),
@@ -321,7 +366,8 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Custom.fake-lang"),
                     TestFile("regular.defs"),
@@ -330,18 +376,25 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
                     TestFile("header.h"),
                     genC1,
                     TestGroup(
-                        "Subdir", path: "Subdir",
+                        "Subdir",
+                        path: "Subdir",
                         children: [
-                            genC2,
-                        ]),
-                ]),
+                            genC2
+                        ]
+                    ),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
-                    "Tool", type: .commandLineTool,
+                    "Tool",
+                    type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "MIG_EXEC": migPath.str,
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "MIG_EXEC": migPath.str
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -352,31 +405,52 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
                             TestBuildFile("header.h"),
                             TestBuildFile(genC1),
                             TestBuildFile(genC2),
-                        ]),
+                        ])
                     ],
                     buildRules: [
-                        TestBuildRule(filePattern: "*/*.fake-lang", script: "true", outputs: [
-                            "$(DERIVED_FILES_DIR)-$(CURRENT_VARIANT)/$(CURRENT_ARCH)/foo1.c",
-                            "$(DERIVED_FILES_DIR)-$(CURRENT_VARIANT)/$(CURRENT_ARCH)/foo2.c",
-                        ], outputFilesCompilerFlags: [
-                            ["-flag1"],
-                            ["-flag2", "-flag3"],
-                        ]),
-                        TestBuildRule(filePattern: "*/custom.defs */special.defs", script: "true", outputs: [
-                            "$(DERIVED_FILES_DIR)-$(CURRENT_VARIANT)/$(CURRENT_ARCH)/$(INPUT_FILE_BASE)User.c",
-                        ], outputFilesCompilerFlags: [
-                            ["-specialFlag"],
-                        ]),
-                        TestBuildRule(filePattern: "*.h", script: "true", outputs: [
-                            "$(DERIVED_FILES_DIR)$(CURRENT_ARCH)/$(INPUT_FILE_BASE)_gen.cpp",
-                        ], outputFilesCompilerFlags: [
-                            ["-DHEADER_GEN=1"],
-                        ]),
-                        TestBuildRule(filePattern: "*.fake-c", script: "true", outputs: [
-                            "$(DERIVED_FILES_DIR)/$(INPUT_FILE_DIR)/$(INPUT_FILE_BASE).c",
-                        ]),
+                        TestBuildRule(
+                            filePattern: "*/*.fake-lang",
+                            script: "true",
+                            outputs: [
+                                "$(DERIVED_FILES_DIR)-$(CURRENT_VARIANT)/$(CURRENT_ARCH)/foo1.c",
+                                "$(DERIVED_FILES_DIR)-$(CURRENT_VARIANT)/$(CURRENT_ARCH)/foo2.c",
+                            ],
+                            outputFilesCompilerFlags: [
+                                ["-flag1"],
+                                ["-flag2", "-flag3"],
+                            ]
+                        ),
+                        TestBuildRule(
+                            filePattern: "*/custom.defs */special.defs",
+                            script: "true",
+                            outputs: [
+                                "$(DERIVED_FILES_DIR)-$(CURRENT_VARIANT)/$(CURRENT_ARCH)/$(INPUT_FILE_BASE)User.c"
+                            ],
+                            outputFilesCompilerFlags: [
+                                ["-specialFlag"]
+                            ]
+                        ),
+                        TestBuildRule(
+                            filePattern: "*.h",
+                            script: "true",
+                            outputs: [
+                                "$(DERIVED_FILES_DIR)$(CURRENT_ARCH)/$(INPUT_FILE_BASE)_gen.cpp"
+                            ],
+                            outputFilesCompilerFlags: [
+                                ["-DHEADER_GEN=1"]
+                            ]
+                        ),
+                        TestBuildRule(
+                            filePattern: "*.fake-c",
+                            script: "true",
+                            outputs: [
+                                "$(DERIVED_FILES_DIR)/$(INPUT_FILE_DIR)/$(INPUT_FILE_BASE).c"
+                            ]
+                        ),
                     ]
-                )])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -426,23 +500,23 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
             results.checkTask(.matchRuleType("RuleScriptExecution"), .matchRuleItem("\(SRCROOT)/Sources/Gen.fake-c")) { task in
                 task.checkRuleInfo(["RuleScriptExecution", "\(SRCROOT)/build/aProject.build/Debug/Tool.build/DerivedSources/tmp/Test/aProject/Sources/Gen.c", "\(SRCROOT)/Sources/Gen.fake-c", "normal", results.runDestinationTargetArchitecture])
                 task.checkOutputs(contain: [
-                    .path("\(SRCROOT)/build/aProject.build/Debug/Tool.build/DerivedSources/tmp/Test/aProject/Sources/Gen.c"),
+                    .path("\(SRCROOT)/build/aProject.build/Debug/Tool.build/DerivedSources/tmp/Test/aProject/Sources/Gen.c")
                 ])
             }
             results.checkTask(.matchRuleType("CompileC"), .matchRuleItem("\(SRCROOT)/build/aProject.build/Debug/Tool.build/DerivedSources/tmp/Test/aProject/Sources/Gen.c")) { task in
                 task.checkOutputs(contain: [
-                    .path("\(SRCROOT)/build/aProject.build/Debug/Tool.build/Objects-normal/\(results.runDestinationTargetArchitecture)/Gen-\(BuildPhaseWithBuildFiles.filenameUniquefierSuffixFor(path: Path("\(SRCROOT)/Sources/Gen.fake-c"))).o"),
+                    .path("\(SRCROOT)/build/aProject.build/Debug/Tool.build/Objects-normal/\(results.runDestinationTargetArchitecture)/Gen-\(BuildPhaseWithBuildFiles.filenameUniquefierSuffixFor(path: Path("\(SRCROOT)/Sources/Gen.fake-c"))).o")
                 ])
             }
             results.checkTask(.matchRuleType("RuleScriptExecution"), .matchRuleItem("\(SRCROOT)/Sources/Subdir/Gen.fake-c")) { task in
                 task.checkRuleInfo(["RuleScriptExecution", "\(SRCROOT)/build/aProject.build/Debug/Tool.build/DerivedSources/tmp/Test/aProject/Sources/Subdir/Gen.c", "\(SRCROOT)/Sources/Subdir/Gen.fake-c", "normal", results.runDestinationTargetArchitecture])
                 task.checkOutputs(contain: [
-                    .path("\(SRCROOT)/build/aProject.build/Debug/Tool.build/DerivedSources/tmp/Test/aProject/Sources/Subdir/Gen.c"),
+                    .path("\(SRCROOT)/build/aProject.build/Debug/Tool.build/DerivedSources/tmp/Test/aProject/Sources/Subdir/Gen.c")
                 ])
             }
             results.checkTask(.matchRuleType("CompileC"), .matchRuleItem("\(SRCROOT)/build/aProject.build/Debug/Tool.build/DerivedSources/tmp/Test/aProject/Sources/Subdir/Gen.c")) { task in
                 task.checkOutputs(contain: [
-                    .path("\(SRCROOT)/build/aProject.build/Debug/Tool.build/Objects-normal/\(results.runDestinationTargetArchitecture)/Gen-\(BuildPhaseWithBuildFiles.filenameUniquefierSuffixFor(path: Path("\(SRCROOT)/Sources/Subdir/Gen.fake-c"))).o"),
+                    .path("\(SRCROOT)/build/aProject.build/Debug/Tool.build/Objects-normal/\(results.runDestinationTargetArchitecture)/Gen-\(BuildPhaseWithBuildFiles.filenameUniquefierSuffixFor(path: Path("\(SRCROOT)/Sources/Subdir/Gen.fake-c"))).o")
                 ])
             }
         }
@@ -457,12 +531,16 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("Foo.fake-bar"),
                     TestFile("main.c"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -471,8 +549,9 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
                     buildConfigurations: [TestBuildConfiguration("Release")],
                     buildPhases: [TestSourcesBuildPhase(["Foo.fake-bar", "main.c"])],
                     buildRules: [TestBuildRule(filePattern: "*.fake-bar", script: "echo foo", outputs: [])]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -487,34 +566,46 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Multiple.fake-lang"),
-                ]),
+                    TestFile("Multiple.fake-lang")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "CODE_SIGN_IDENTITY": ""
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "CODE_SIGN_IDENTITY": "",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "Multiple.fake-lang",
                             "Multiple.fake-lang",
-                        ]),
+                        ])
                     ],
-                    buildRules: [TestBuildRule(filePattern: "*/*.fake-lang", script: "echo hi", outputs: [
-                        "$(TARGET_BUILD_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_DIR)/$(INPUT_FILE_BASE).data",
-                    ])]
-                ),
-            ])
+                    buildRules: [
+                        TestBuildRule(
+                            filePattern: "*/*.fake-lang",
+                            script: "echo hi",
+                            outputs: [
+                                "$(TARGET_BUILD_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_DIR)/$(INPUT_FILE_BASE).data"
+                            ]
+                        )
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -543,19 +634,25 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: srcroot,
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("main.c"),
                     TestFile("error.c", path: "\(srcroot.str)/build/aProject.build/Debug/Tool.build/DerivedSources/error.c"),
                     TestFile("custom.fake-lang"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
-                    "Tool", type: .commandLineTool,
+                    "Tool",
+                    type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -563,14 +660,20 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
                             TestBuildFile("error.c"),
                             TestBuildFile("custom.fake-lang"),
                             TestBuildFile("main.c"),
-                        ]),
+                        ])
                     ],
                     buildRules: [
-                        TestBuildRule(filePattern: "*/*.fake-lang", script: "true", outputs: [
-                            "$(DERIVED_FILE_DIR)/error.c",
-                        ]),
+                        TestBuildRule(
+                            filePattern: "*/*.fake-lang",
+                            script: "true",
+                            outputs: [
+                                "$(DERIVED_FILE_DIR)/error.c"
+                            ]
+                        )
                     ]
-                )])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(runDestination: .macOS) { results in
@@ -585,38 +688,48 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("file.fake-x"),
-                ]),
+                    TestFile("file.fake-x")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug",
-                                       buildSettings: [
-                                        "BUILD_VARIANTS": "normal debug profile",
-                                        "GENERATE_INFOPLIST_FILE": "YES",
-                                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                                        "VERSIONING_SYSTEM": "apple-generic"
-                                       ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "BUILD_VARIANTS": "normal debug profile",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "VERSIONING_SYSTEM": "apple-generic",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "SomeFwk",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "file.fake-x",
-                        ]),
+                            "file.fake-x"
+                        ])
                     ],
                     buildRules: [
-                        TestBuildRule(filePattern: "$(DERIVED_FILE_DIR)/$(PRODUCT_NAME)_vers.c", script: "touch \"$SCRIPT_OUTPUT_FILE_0\"", outputs: [
-                            "$(DERIVED_FILE_DIR)/$(FULL_PRODUCT_NAME)_vers1.c"
-                        ], runOncePerArchitecture: false)
+                        TestBuildRule(
+                            filePattern: "$(DERIVED_FILE_DIR)/$(PRODUCT_NAME)_vers.c",
+                            script: "touch \"$SCRIPT_OUTPUT_FILE_0\"",
+                            outputs: [
+                                "$(DERIVED_FILE_DIR)/$(FULL_PRODUCT_NAME)_vers1.c"
+                            ],
+                            runOncePerArchitecture: false
+                        )
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -653,15 +766,19 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("test.c"),
                     TestFile("test.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -673,8 +790,10 @@ fileprivate struct BuildRuleTaskConstructionTests: CoreBasedTests {
                     ],
                     buildRules: [
                         TestBuildRule(fileTypeIdentifier: "sourcecode.c", compilerIdentifier: "com.apple.compilers.pbxcp")
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(BuildParameters(action: .build, configuration: "Debug"), runDestination: .macOS, fs: PseudoFS()) { results in
diff --git a/Tests/SWBTaskConstructionTests/BuildToolTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/BuildToolTaskConstructionTests.swift
index 8fa327a8..32d7f456 100644
--- a/Tests/SWBTaskConstructionTests/BuildToolTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/BuildToolTaskConstructionTests.swift
@@ -31,13 +31,15 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Header.h"),
                     TestFile("Header.hpp"),
                     TestFile("ModuleMap.modulemap"),
                     TestFile("Entitlements.entitlements"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -46,7 +48,8 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "APPLY_RULES_IN_COPY_FILES": "YES",
                         "COPY_HEADERS_RUN_UNIFDEF": "YES",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -62,10 +65,16 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                         ]),
                         // Copy Files doesn't use COPY_HEADERS_RUN_UNIFDEF even if
                         // APPLY_RULES_IN_COPY_FILES is set.
-                        TestCopyFilesBuildPhase([
-                            "Header.h",
-                        ], destinationSubfolder: .resources, destinationSubpath: "", onlyForDeployment: false),
-                    ]),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Header.h"
+                            ],
+                            destinationSubfolder: .resources,
+                            destinationSubpath: "",
+                            onlyForDeployment: false
+                        ),
+                    ]
+                ),
                 TestStandardTarget(
                     "CustomBuildRule",
                     type: .application,
@@ -73,27 +82,34 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
-                                "COPY_HEADERS_RUN_UNIFDEF": "NO",
-                            ]),
+                                "COPY_HEADERS_RUN_UNIFDEF": "NO"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         // The Headers build phase only uses COPY_HEADERS_RUN_UNIFDEF
                         // and doesn't pay attention to build rules.
                         TestHeadersBuildPhase([
-                            TestBuildFile("Header.h", headerVisibility: .public),
+                            TestBuildFile("Header.h", headerVisibility: .public)
                         ]),
                         // A custom build rule will make files unifdef independent of
                         // COPY_HEADERS_RUN_UNIFDEF and the spec's InputFileTypes.
-                        TestCopyFilesBuildPhase([
-                            "Header.h",
-                            "ModuleMap.modulemap",
-                            "Entitlements.entitlements",
-                        ], destinationSubfolder: .resources, destinationSubpath: "", onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Header.h",
+                                "ModuleMap.modulemap",
+                                "Entitlements.entitlements",
+                            ],
+                            destinationSubfolder: .resources,
+                            destinationSubpath: "",
+                            onlyForDeployment: false
+                        ),
                     ],
                     buildRules: [
                         TestBuildRule(fileTypeIdentifier: "sourcecode.c.h", compilerIdentifier: "public.build-task.unifdef"),
                         TestBuildRule(fileTypeIdentifier: "text.plist.entitlements", compilerIdentifier: "public.build-task.unifdef"),
-                    ]),
+                    ]
+                ),
                 TestStandardTarget(
                     "NoApplyRules",
                     type: .application,
@@ -101,21 +117,29 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
-                                "APPLY_RULES_IN_COPY_FILES": "NO",
-                            ]),
+                                "APPLY_RULES_IN_COPY_FILES": "NO"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         // Copy Files will not unifdef unless APPLY_RULES_IN_COPY_FILES is set.
-                        TestCopyFilesBuildPhase([
-                            "Header.h",
-                            "ModuleMap.modulemap",
-                        ], destinationSubfolder: .resources, destinationSubpath: "", onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Header.h",
+                                "ModuleMap.modulemap",
+                            ],
+                            destinationSubfolder: .resources,
+                            destinationSubpath: "",
+                            onlyForDeployment: false
+                        )
                     ],
                     buildRules: [
                         TestBuildRule(fileTypeIdentifier: "sourcecode.c.h", compilerIdentifier: "public.build-task.unifdef"),
                         TestBuildRule(fileTypeIdentifier: "sourcecode.module-map", compilerIdentifier: "public.build-task.unifdef"),
-                    ]),
-            ])
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -159,28 +183,39 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
     /// Check that unhandled files in source phases generate a diagnostic.
     @Test(.requireSDKs(.macOS))
     func missingRuleDiagnostic() async throws {
-        let testProject = TestProject("aProject",
-                                      groupTree: TestGroup("SomeFiles", path: "Sources",
-                                                           children: [
-                                                            TestFile("SourceFile1.fake-ext"),
-                                                            TestFile("SourceFile2.fake-ext")]),
-                                      buildConfigurations: [
-                                        TestBuildConfiguration("Debug",
-                                                               buildSettings: [
-                                                                "GENERATE_INFOPLIST_FILE": "YES",
-                                                                "CODE_SIGN_IDENTITY": "",
-                                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                               ])],
-                                      targets: [
-                                        TestStandardTarget("AppTarget",
-                                                           type: .application,
-                                                           buildPhases: [
-                                                            TestSourcesBuildPhase([
-                                                                "SourceFile1.fake-ext",
-                                                                .init("SourceFile2.fake-ext", shouldWarnIfNoRuleToProcess: false)
-                                                            ])
-                                                           ])
-                                      ])
+        let testProject = TestProject(
+            "aProject",
+            groupTree: TestGroup(
+                "SomeFiles",
+                path: "Sources",
+                children: [
+                    TestFile("SourceFile1.fake-ext"),
+                    TestFile("SourceFile2.fake-ext"),
+                ]
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "CODE_SIGN_IDENTITY": "",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
+            ],
+            targets: [
+                TestStandardTarget(
+                    "AppTarget",
+                    type: .application,
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            "SourceFile1.fake-ext",
+                            .init("SourceFile2.fake-ext", shouldWarnIfNoRuleToProcess: false),
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(runDestination: .macOS) { results in
@@ -205,14 +240,17 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("SourceOne.m"),
                     TestFile("\(targetName).xcmappingmodel"),
-                    TestVersionGroup("\(targetName).xcdatamodeld",
-                                     children: [
-                                        TestFile("\(targetName)-4.6.xcdatamodel"),
-                                        TestFile("\(targetName)-5.0.xcdatamodel"),
-                                        TestFile("\(targetName).xcdatamodel"),
-                                     ]),
+                    TestVersionGroup(
+                        "\(targetName).xcdatamodeld",
+                        children: [
+                            TestFile("\(targetName)-4.6.xcdatamodel"),
+                            TestFile("\(targetName)-5.0.xcdatamodel"),
+                            TestFile("\(targetName).xcdatamodel"),
+                        ]
+                    ),
                     TestFile("MyInfo.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -220,24 +258,26 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                         "CODE_SIGN_IDENTITY": "",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "TAPI_EXEC": tapiToolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"]),
+                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("SourceOne.m"),
                             TestBuildFile("FrameworkTarget.xcmappingmodel", additionalArgs: ["--mapc-no-warnings"]),
                             TestBuildFile("FrameworkTarget.xcdatamodeld", additionalArgs: ["--no-warnings"]),
-                        ]),
+                        ])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -245,20 +285,27 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
 
         /// Client to generate files from the core data model.
         final class TestCoreDataCompilerTaskPlanningClientDelegate: MockTestTaskPlanningClientDelegate, @unchecked Sendable {
-            override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+            override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
                 if commandLine.first.map(Path.init)?.basename != "momc" {
                     return try await super.executeExternalTool(commandLine: commandLine, workingDirectory: workingDirectory, environment: environment)
                 }
                 if let modelName = commandLine[safe: commandLine.count - 2].map(Path.init)?.basenameWithoutSuffix,
-                   let outputDir = commandLine.last.map(Path.init) {
-                    return .result(status: .exit(0), stdout: Data([
-                        outputDir.join("\(modelName)+CoreDataModel.h"),
-                        outputDir.join("\(modelName)+CoreDataModel.m"),
-                        outputDir.join("EntityOne+CoreDataClass.h"),
-                        outputDir.join("EntityOne+CoreDataClass.m"),
-                        outputDir.join("EntityOne+CoreDataProperties.h"),
-                        outputDir.join("EntityOne+CoreDataProperties.m"),
-                    ].map { $0.str }.joined(separator: "\n").utf8), stderr: .init())
+                    let outputDir = commandLine.last.map(Path.init)
+                {
+                    return .result(
+                        status: .exit(0),
+                        stdout: Data(
+                            [
+                                outputDir.join("\(modelName)+CoreDataModel.h"),
+                                outputDir.join("\(modelName)+CoreDataModel.m"),
+                                outputDir.join("EntityOne+CoreDataClass.h"),
+                                outputDir.join("EntityOne+CoreDataClass.m"),
+                                outputDir.join("EntityOne+CoreDataProperties.h"),
+                                outputDir.join("EntityOne+CoreDataProperties.m"),
+                            ].map { $0.str }.joined(separator: "\n").utf8
+                        ),
+                        stderr: .init()
+                    )
                 }
                 throw StubError.error("Could not determine generated file paths for Core Data code generation: Unit test should implement its own instance of TaskPlanningClientDelegate.")
             }
@@ -278,7 +325,7 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                                 .path("\(SRCROOT)/\(targetName).xcdatamodeld"),
                                 .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
                                 .namePattern(.and(.prefix("target-"), .suffix("-begin-compiling"))),
-                                .name("WorkspaceHeaderMapVFSFilesWritten")
+                                .name("WorkspaceHeaderMapVFSFilesWritten"),
                             ])
                             task.checkOutputs([
                                 .path("\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreDataGenerated/\(targetName)/\(targetName)+CoreDataModel.h"),
@@ -331,10 +378,10 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                                 .path("\(SRCROOT)/\(targetName).xcdatamodeld"),
                                 .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
                                 .namePattern(.and(.prefix("target-"), .suffix("-begin-compiling"))),
-                                .name("WorkspaceHeaderMapVFSFilesWritten")
+                                .name("WorkspaceHeaderMapVFSFilesWritten"),
                             ])
                             task.checkOutputs([
-                                .path("\(SRCROOT)/build/Debug/\(targetName).framework/Versions/A/Resources/\(targetName).momd"),
+                                .path("\(SRCROOT)/build/Debug/\(targetName).framework/Versions/A/Resources/\(targetName).momd")
                             ])
                         }
 
@@ -346,10 +393,10 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                                 .path("\(SRCROOT)/\(targetName).xcmappingmodel"),
                                 .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
                                 .namePattern(.and(.prefix("target-"), .suffix("-begin-compiling"))),
-                                .name("WorkspaceHeaderMapVFSFilesWritten")
+                                .name("WorkspaceHeaderMapVFSFilesWritten"),
                             ])
                             task.checkOutputs([
-                                .path("\(SRCROOT)/build/Debug/\(targetName).framework/Versions/A/Resources/\(targetName).cdm"),
+                                .path("\(SRCROOT)/build/Debug/\(targetName).framework/Versions/A/Resources/\(targetName).cdm")
                             ])
                         }
                     }
@@ -428,7 +475,8 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                         TestFile("SmartStuff2.mlpackage"),
                         TestFile("SmartStuff3.mlmodel"),
                         TestFile("MyInfo.plist"),
-                    ].compactMap { $0 }),
+                    ].compactMap { $0 }
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -441,39 +489,46 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                             "TAPI_EXEC": tapiToolPath.str,
                             "COREML_CODEGEN_SWIFT_VERSION": swiftVersion,
                             "COREML_CODEGEN_SWIFT_GLOBAL_MODULE": "YES",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         targetName,
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"]),
+                            TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([]),
-                            TestSourcesBuildPhase([
-                                "SourceOne.swift",
-                                TestBuildFile("SmartStuff.mlmodel", intentsCodegenVisibility: visibility),
-                                TestBuildFile("SmartStuff2.mlpackage", intentsCodegenVisibility: visibility),
-                                TestBuildFile("SmartStuff3.mlmodel",
-                                              additionalArgs: ["--encrypt", "/path/to.key"],
-                                              intentsCodegenVisibility: visibility),
-                            ].compactMap { $0 })
+                            TestSourcesBuildPhase(
+                                [
+                                    "SourceOne.swift",
+                                    TestBuildFile("SmartStuff.mlmodel", intentsCodegenVisibility: visibility),
+                                    TestBuildFile("SmartStuff2.mlpackage", intentsCodegenVisibility: visibility),
+                                    TestBuildFile(
+                                        "SmartStuff3.mlmodel",
+                                        additionalArgs: ["--encrypt", "/path/to.key"],
+                                        intentsCodegenVisibility: visibility
+                                    ),
+                                ].compactMap { $0 }
+                            ),
                         ],
                         predominantSourceCodeLanguage: .swift
-                    ),
-                ])
+                    )
+                ]
+            )
             return try TaskConstructionTester(core, testProject)
         }
 
         /// Client to generate files from the CoreML model.
         final class TestCoreMLCompilerTaskPlanningClientDelegate: MockTestTaskPlanningClientDelegate, @unchecked Sendable {
-            override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+            override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
                 if commandLine.first.map(Path.init)?.basename == "coremlc",
-                   let outputDir = commandLine[safe: 3].map(Path.init),
-                   let input = commandLine.firstIndex(where: { $0.hasSuffix(".mlmodel") || $0.hasSuffix(".mlpackage") }).map({ Path(commandLine[$0]) }),
-                   let language = commandLine.elementAfterElements(["--language"]) {
+                    let outputDir = commandLine[safe: 3].map(Path.init),
+                    let input = commandLine.firstIndex(where: { $0.hasSuffix(".mlmodel") || $0.hasSuffix(".mlpackage") }).map({ Path(commandLine[$0]) }),
+                    let language = commandLine.elementAfterElements(["--language"])
+                {
                     let modelName = input.basenameWithoutSuffix
                     switch language {
                     case "Swift":
@@ -541,17 +596,21 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                     // There should be one DataModelCompile task.
                     results.checkTask(.matchTarget(target), .matchRuleType("CoreMLModelCompile"), .matchRuleItemBasename("SmartStuff.mlmodel")) { task in
                         task.checkRuleInfo(["CoreMLModelCompile", "\(srcroot)/build/Debug/\(targetName).framework/Versions/A/Resources/", "\(srcroot)/SmartStuff.mlmodel"])
-                        task.checkSandboxedCommandLine([coremlcPath.str, "compile", "\(srcroot)/SmartStuff.mlmodel", "\(srcroot)/build/Debug/\(targetName).framework/Versions/A/Resources/", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
-                                                        "--sdkroot",
-                                                        core.loadSDK(.macOS).path.str,
-                                                        "--platform", "macos", "--output-partial-info-plist", "\(srcroot)/build/aProject.build/Debug/\(targetName).build/SmartStuff-CoreMLPartialInfo.plist", "--container", "bundle-resources"].compactMap { $0 })
+                        task.checkSandboxedCommandLine(
+                            [
+                                coremlcPath.str, "compile", "\(srcroot)/SmartStuff.mlmodel", "\(srcroot)/build/Debug/\(targetName).framework/Versions/A/Resources/", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
+                                "--sdkroot",
+                                core.loadSDK(.macOS).path.str,
+                                "--platform", "macos", "--output-partial-info-plist", "\(srcroot)/build/aProject.build/Debug/\(targetName).build/SmartStuff-CoreMLPartialInfo.plist", "--container", "bundle-resources",
+                            ].compactMap { $0 }
+                        )
                         task.checkInputs([
                             .path("\(srcroot)/SmartStuff.mlmodel"),
                             .path("\(srcroot)/SmartStuff.mlmodel"),
                             .namePattern(.and(.prefix("target-"), .suffix("-copy-headers"))),
                             .pathPattern(.and(.prefix("\(srcroot)/build/aProject.build/Debug/FrameworkTarget.build"), .suffix(".sb"))),
                             .namePattern(.and(.prefix("target-"), .suffix("-begin-compiling"))),
-                            .name("WorkspaceHeaderMapVFSFilesWritten")
+                            .name("WorkspaceHeaderMapVFSFilesWritten"),
                         ])
                         task.checkOutputs([
                             .path("\(srcroot)/build/Debug/\(targetName).framework/Versions/A/Resources/SmartStuff.mlmodelc"),
@@ -560,18 +619,22 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                     }
                     results.checkTask(.matchTarget(target), .matchRuleType("CoreMLModelCompile"), .matchRuleItemBasename("SmartStuff2.mlpackage")) { task in
                         task.checkRuleInfo(["CoreMLModelCompile", "\(srcroot)/build/Debug/\(targetName).framework/Versions/A/Resources/", "\(srcroot)/SmartStuff2.mlpackage"])
-                        task.checkSandboxedCommandLine([coremlcPath.str, "compile", "\(srcroot)/SmartStuff2.mlpackage", "\(srcroot)/build/Debug/\(targetName).framework/Versions/A/Resources/", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
-                                                        "--sdkroot",
-                                                        core.loadSDK(.macOS).path.str,
-                                                        "--platform", "macos", "--output-partial-info-plist", "\(srcroot)/build/aProject.build/Debug/\(targetName).build/SmartStuff2-CoreMLPartialInfo.plist",
-                                                        "--container", "bundle-resources"].compactMap { $0 })
+                        task.checkSandboxedCommandLine(
+                            [
+                                coremlcPath.str, "compile", "\(srcroot)/SmartStuff2.mlpackage", "\(srcroot)/build/Debug/\(targetName).framework/Versions/A/Resources/", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
+                                "--sdkroot",
+                                core.loadSDK(.macOS).path.str,
+                                "--platform", "macos", "--output-partial-info-plist", "\(srcroot)/build/aProject.build/Debug/\(targetName).build/SmartStuff2-CoreMLPartialInfo.plist",
+                                "--container", "bundle-resources",
+                            ].compactMap { $0 }
+                        )
                         task.checkInputs([
                             .path("\(srcroot)/SmartStuff2.mlpackage"),
                             .path("\(srcroot)/SmartStuff2.mlpackage"),
                             .namePattern(.and(.prefix("target-"), .suffix("-copy-headers"))),
                             .pathPattern(.and(.prefix("\(srcroot)/build/aProject.build/Debug/FrameworkTarget.build"), .suffix(".sb"))),
                             .namePattern(.and(.prefix("target-"), .suffix("-begin-compiling"))),
-                            .name("WorkspaceHeaderMapVFSFilesWritten")
+                            .name("WorkspaceHeaderMapVFSFilesWritten"),
                         ])
                         task.checkOutputs([
                             .path("\(srcroot)/build/Debug/\(targetName).framework/Versions/A/Resources/SmartStuff2.mlmodelc"),
@@ -580,10 +643,14 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                     }
                     results.checkTask(.matchTarget(target), .matchRuleType("CoreMLModelCompile"), .matchRuleItemBasename("SmartStuff3.mlmodel")) { task in
                         task.checkRuleInfo(["CoreMLModelCompile", "\(srcroot)/build/Debug/\(targetName).framework/Versions/A/Resources/", "\(srcroot)/SmartStuff3.mlmodel"])
-                        task.checkSandboxedCommandLine([coremlcPath.str, "compile", "\(srcroot)/SmartStuff3.mlmodel", "\(srcroot)/build/Debug/\(targetName).framework/Versions/A/Resources/", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
-                                                        "--sdkroot",
-                                                        core.loadSDK(.macOS).path.str,
-                                                        "--platform", "macos", "--output-partial-info-plist", "\(srcroot)/build/aProject.build/Debug/\(targetName).build/SmartStuff3-CoreMLPartialInfo.plist", "--container", "bundle-resources"].compactMap { $0 })
+                        task.checkSandboxedCommandLine(
+                            [
+                                coremlcPath.str, "compile", "\(srcroot)/SmartStuff3.mlmodel", "\(srcroot)/build/Debug/\(targetName).framework/Versions/A/Resources/", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
+                                "--sdkroot",
+                                core.loadSDK(.macOS).path.str,
+                                "--platform", "macos", "--output-partial-info-plist", "\(srcroot)/build/aProject.build/Debug/\(targetName).build/SmartStuff3-CoreMLPartialInfo.plist", "--container", "bundle-resources",
+                            ].compactMap { $0 }
+                        )
                         task.checkInputs([
                             .path("\(srcroot)/SmartStuff3.mlmodel"),
                             .path("\(srcroot)/SmartStuff3.mlmodel"),
@@ -591,7 +658,7 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                             .namePattern(.and(.prefix("target-"), .suffix("-copy-headers"))),
                             .pathPattern(.and(.prefix("\(srcroot)/build/aProject.build/Debug/FrameworkTarget.build"), .suffix(".sb"))),
                             .namePattern(.and(.prefix("target-"), .suffix("-begin-compiling"))),
-                            .name("WorkspaceHeaderMapVFSFilesWritten")
+                            .name("WorkspaceHeaderMapVFSFilesWritten"),
                         ])
                         task.checkOutputs([
                             .path("\(srcroot)/build/Debug/\(targetName).framework/Versions/A/Resources/SmartStuff3.mlmodelc"),
@@ -600,13 +667,17 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                     }
                     // There should be a ProcessInfoPlistFile task which incorporates the PartialInfo.plist generated by coremlc.
                     results.checkTask(.matchTarget(target), .matchRuleType("ProcessInfoPlistFile")) { task in
-                        task.checkCommandLine(["builtin-infoPlistUtility", "\(srcroot)/MyInfo.plist", "-producttype", "com.apple.product-type.framework", "-expandbuildsettings", "-platform", "macosx", "-additionalcontentfile", "\(srcroot)/build/aProject.build/Debug/\(targetName).build/SmartStuff-CoreMLPartialInfo.plist",
-                                               "-additionalcontentfile",
-                                               "\(srcroot)/build/aProject.build/Debug/\(targetName).build/SmartStuff2-CoreMLPartialInfo.plist",
-                                               "-additionalcontentfile",
-                                               "\(srcroot)/build/aProject.build/Debug/\(targetName).build/SmartStuff3-CoreMLPartialInfo.plist",
-                                               "-o",
-                                               "\(srcroot)/build/Debug/\(targetName).framework/Versions/A/Resources/Info.plist"].compactMap { $0 })
+                        task.checkCommandLine(
+                            [
+                                "builtin-infoPlistUtility", "\(srcroot)/MyInfo.plist", "-producttype", "com.apple.product-type.framework", "-expandbuildsettings", "-platform", "macosx", "-additionalcontentfile", "\(srcroot)/build/aProject.build/Debug/\(targetName).build/SmartStuff-CoreMLPartialInfo.plist",
+                                "-additionalcontentfile",
+                                "\(srcroot)/build/aProject.build/Debug/\(targetName).build/SmartStuff2-CoreMLPartialInfo.plist",
+                                "-additionalcontentfile",
+                                "\(srcroot)/build/aProject.build/Debug/\(targetName).build/SmartStuff3-CoreMLPartialInfo.plist",
+                                "-o",
+                                "\(srcroot)/build/Debug/\(targetName).framework/Versions/A/Resources/Info.plist",
+                            ].compactMap { $0 }
+                        )
                     }
                 }
 
@@ -625,11 +696,13 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
             results.checkNoDiagnostics()
         }
 
-        func verifyTask(for visibilityBeingTested: IntentsCodegenVisibility,
-                        with results: TaskConstructionTester.PlanningResults,
-                        in target: ConfiguredTarget,
-                        matching conditions: TaskCondition...,
-                        body: (any PlannedTask) -> Void) {
+        func verifyTask(
+            for visibilityBeingTested: IntentsCodegenVisibility,
+            with results: TaskConstructionTester.PlanningResults,
+            in target: ConfiguredTarget,
+            matching conditions: TaskCondition...,
+            body: (any PlannedTask) -> Void
+        ) {
             if visibilityBeingTested == .noCodegen {
                 results.checkNoTask([.matchTarget(target)] + conditions)
             } else {
@@ -637,7 +710,7 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
             }
         }
 
-        func checkBuild(action: BuildAction, overrides: [String:String] = [:]) async throws {
+        func checkBuild(action: BuildAction, overrides: [String: String] = [:]) async throws {
             for visibilityBeingTested in IntentsCodegenVisibility.allCases {
                 let tester = try await taskConstructionTesterForProject(with: visibilityBeingTested)
                 let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -649,53 +722,65 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                         // There should be a CoreMLModelCodegen task.
                         verifyTask(for: visibilityBeingTested, with: results, in: target, matching: .matchRuleType("CoreMLModelCodegen"), .matchRuleItemBasename("SmartStuff.mlmodel")) { task in
                             task.checkRuleInfo(["CoreMLModelCodegen", "\(SRCROOT)/SmartStuff.mlmodel"])
-                            task.checkSandboxedCommandLine([coremlcPath.str, "generate", "\(SRCROOT)/SmartStuff.mlmodel", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
-                                                            "--sdkroot",
-                                                            core.loadSDK(.macOS).path.str,
-                                                            "--platform", "macos", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/SmartStuff-CoreMLPartialInfo.plist", "--container", "bundle-resources", "--language", "Swift", "--swift-version", swiftVersion, visibilityBeingTested == .public ? "--public-access" : nil, "--globalmodule"].compactMap { $0 })
+                            task.checkSandboxedCommandLine(
+                                [
+                                    coremlcPath.str, "generate", "\(SRCROOT)/SmartStuff.mlmodel", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
+                                    "--sdkroot",
+                                    core.loadSDK(.macOS).path.str,
+                                    "--platform", "macos", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/SmartStuff-CoreMLPartialInfo.plist", "--container", "bundle-resources", "--language", "Swift", "--swift-version", swiftVersion, visibilityBeingTested == .public ? "--public-access" : nil, "--globalmodule",
+                                ].compactMap { $0 }
+                            )
                             task.checkInputs([
                                 .path("\(SRCROOT)/SmartStuff.mlmodel"),
                                 .namePattern(.and(.prefix("target-"), .suffix("-copy-headers"))),
                                 .pathPattern(.and(.prefix("\(SRCROOT)/build/aProject.build/Debug/FrameworkTarget.build"), .suffix(".sb"))),
                                 .namePattern(.and(.prefix("target-"), .suffix("-begin-compiling"))),
-                                .name("WorkspaceHeaderMapVFSFilesWritten")
+                                .name("WorkspaceHeaderMapVFSFilesWritten"),
                             ])
                             task.checkOutputs([
-                                .path("\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff/SmartStuff.swift"),
+                                .path("\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff/SmartStuff.swift")
                             ])
                         }
                         verifyTask(for: visibilityBeingTested, with: results, in: target, matching: .matchRuleType("CoreMLModelCodegen"), .matchRuleItemBasename("SmartStuff2.mlpackage")) { task in
                             task.checkRuleInfo(["CoreMLModelCodegen", "\(SRCROOT)/SmartStuff2.mlpackage"])
-                            task.checkSandboxedCommandLine([coremlcPath.str, "generate", "\(SRCROOT)/SmartStuff2.mlpackage", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff2", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
-                                                            "--sdkroot",
-                                                            core.loadSDK(.macOS).path.str,
-                                                            "--platform", "macos", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/SmartStuff2-CoreMLPartialInfo.plist", "--container", "bundle-resources", "--language", "Swift", "--swift-version", swiftVersion, visibilityBeingTested == .public ? "--public-access" : nil, "--globalmodule"].compactMap { $0 })
+                            task.checkSandboxedCommandLine(
+                                [
+                                    coremlcPath.str, "generate", "\(SRCROOT)/SmartStuff2.mlpackage", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff2", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
+                                    "--sdkroot",
+                                    core.loadSDK(.macOS).path.str,
+                                    "--platform", "macos", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/SmartStuff2-CoreMLPartialInfo.plist", "--container", "bundle-resources", "--language", "Swift", "--swift-version", swiftVersion, visibilityBeingTested == .public ? "--public-access" : nil, "--globalmodule",
+                                ].compactMap { $0 }
+                            )
                             task.checkInputs([
                                 .path("\(SRCROOT)/SmartStuff2.mlpackage"),
                                 .namePattern(.and(.prefix("target-"), .suffix("-copy-headers"))),
                                 .pathPattern(.and(.prefix("\(SRCROOT)/build/aProject.build/Debug/FrameworkTarget.build"), .suffix(".sb"))),
                                 .namePattern(.and(.prefix("target-"), .suffix("-begin-compiling"))),
-                                .name("WorkspaceHeaderMapVFSFilesWritten")
+                                .name("WorkspaceHeaderMapVFSFilesWritten"),
                             ])
                             task.checkOutputs([
-                                .path("\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff2/SmartStuff2.swift"),
+                                .path("\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff2/SmartStuff2.swift")
                             ])
                         }
                         verifyTask(for: visibilityBeingTested, with: results, in: target, matching: .matchRuleType("CoreMLModelCodegen"), .matchRuleItemBasename("SmartStuff3.mlmodel")) { task in
                             task.checkRuleInfo(["CoreMLModelCodegen", "\(SRCROOT)/SmartStuff3.mlmodel"])
-                            task.checkSandboxedCommandLine([coremlcPath.str, "generate", "\(SRCROOT)/SmartStuff3.mlmodel", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff3", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
-                                                            "--sdkroot",
-                                                            core.loadSDK(.macOS).path.str,
-                                                            "--platform", "macos", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/SmartStuff3-CoreMLPartialInfo.plist", "--container", "bundle-resources", "--encrypt", "/path/to.key", "--language", "Swift", "--swift-version", swiftVersion, visibilityBeingTested == .public ? "--public-access" : nil, "--globalmodule"].compactMap { $0 })
+                            task.checkSandboxedCommandLine(
+                                [
+                                    coremlcPath.str, "generate", "\(SRCROOT)/SmartStuff3.mlmodel", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff3", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
+                                    "--sdkroot",
+                                    core.loadSDK(.macOS).path.str,
+                                    "--platform", "macos", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/SmartStuff3-CoreMLPartialInfo.plist", "--container", "bundle-resources", "--encrypt", "/path/to.key", "--language", "Swift", "--swift-version", swiftVersion, visibilityBeingTested == .public ? "--public-access" : nil, "--globalmodule",
+                                ].compactMap { $0 }
+                            )
                             task.checkInputs([
                                 .path("\(SRCROOT)/SmartStuff3.mlmodel"),
                                 .namePattern(.and(.prefix("target-"), .suffix("-copy-headers"))),
                                 .pathPattern(.and(.prefix("\(SRCROOT)/build/aProject.build/Debug/FrameworkTarget.build"), .suffix(".sb"))),
                                 .namePattern(.and(.prefix("target-"), .suffix("-begin-compiling"))),
-                                .name("WorkspaceHeaderMapVFSFilesWritten")
+                                .name("WorkspaceHeaderMapVFSFilesWritten"),
                             ])
                             task.checkOutputs([
-                                .path("\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff3/SmartStuff3.swift"),
+                                .path("\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff3/SmartStuff3.swift")
                             ])
                         }
                         if action == .build || action == .installAPI {
@@ -731,16 +816,20 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                         // There should be a CoreMLModelCodegen task.
                         verifyTask(for: visibilityBeingTested, with: results, in: target, matching: .matchRuleType("CoreMLModelCodegen"), .matchRuleItemBasename("SmartStuff.mlmodel")) { task in
                             task.checkRuleInfo(["CoreMLModelCodegen", "\(SRCROOT)/SmartStuff.mlmodel"])
-                            task.checkSandboxedCommandLine([coremlcPath.str, "generate", "\(SRCROOT)/SmartStuff.mlmodel", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
-                                                            "--sdkroot",
-                                                            core.loadSDK(.macOS).path.str,
-                                                            "--platform", "macos", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/SmartStuff-CoreMLPartialInfo.plist", "--container", "bundle-resources", "--language", "Objective-C"].compactMap { $0 })
+                            task.checkSandboxedCommandLine(
+                                [
+                                    coremlcPath.str, "generate", "\(SRCROOT)/SmartStuff.mlmodel", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
+                                    "--sdkroot",
+                                    core.loadSDK(.macOS).path.str,
+                                    "--platform", "macos", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/SmartStuff-CoreMLPartialInfo.plist", "--container", "bundle-resources", "--language", "Objective-C",
+                                ].compactMap { $0 }
+                            )
                             task.checkInputs([
                                 .path("\(SRCROOT)/SmartStuff.mlmodel"),
                                 .namePattern(.and(.prefix("target-"), .suffix("-copy-headers"))),
                                 .pathPattern(.and(.prefix("\(SRCROOT)/build/aProject.build/Debug/FrameworkTarget.build"), .suffix(".sb"))),
                                 .namePattern(.and(.prefix("target-"), .suffix("-begin-compiling"))),
-                                .name("WorkspaceHeaderMapVFSFilesWritten")
+                                .name("WorkspaceHeaderMapVFSFilesWritten"),
                             ])
                             task.checkOutputs([
                                 .path("\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff/SmartStuff.h"),
@@ -749,16 +838,20 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                         }
                         verifyTask(for: visibilityBeingTested, with: results, in: target, matching: .matchRuleType("CoreMLModelCodegen"), .matchRuleItemBasename("SmartStuff2.mlpackage")) { task in
                             task.checkRuleInfo(["CoreMLModelCodegen", "\(SRCROOT)/SmartStuff2.mlpackage"])
-                            task.checkSandboxedCommandLine([coremlcPath.str, "generate", "\(SRCROOT)/SmartStuff2.mlpackage", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff2", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
-                                                            "--sdkroot",
-                                                            core.loadSDK(.macOS).path.str,
-                                                            "--platform", "macos", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/SmartStuff2-CoreMLPartialInfo.plist", "--container", "bundle-resources", "--language", "Objective-C"].compactMap { $0 })
+                            task.checkSandboxedCommandLine(
+                                [
+                                    coremlcPath.str, "generate", "\(SRCROOT)/SmartStuff2.mlpackage", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff2", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
+                                    "--sdkroot",
+                                    core.loadSDK(.macOS).path.str,
+                                    "--platform", "macos", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/SmartStuff2-CoreMLPartialInfo.plist", "--container", "bundle-resources", "--language", "Objective-C",
+                                ].compactMap { $0 }
+                            )
                             task.checkInputs([
                                 .path("\(SRCROOT)/SmartStuff2.mlpackage"),
                                 .namePattern(.and(.prefix("target-"), .suffix("-copy-headers"))),
                                 .pathPattern(.and(.prefix("\(SRCROOT)/build/aProject.build/Debug/FrameworkTarget.build"), .suffix(".sb"))),
                                 .namePattern(.and(.prefix("target-"), .suffix("-begin-compiling"))),
-                                .name("WorkspaceHeaderMapVFSFilesWritten")
+                                .name("WorkspaceHeaderMapVFSFilesWritten"),
                             ])
                             task.checkOutputs([
                                 .path("\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff2/SmartStuff2.h"),
@@ -767,16 +860,20 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                         }
                         verifyTask(for: visibilityBeingTested, with: results, in: target, matching: .matchRuleType("CoreMLModelCodegen"), .matchRuleItemBasename("SmartStuff3.mlmodel")) { task in
                             task.checkRuleInfo(["CoreMLModelCodegen", "\(SRCROOT)/SmartStuff3.mlmodel"])
-                            task.checkSandboxedCommandLine([coremlcPath.str, "generate", "\(SRCROOT)/SmartStuff3.mlmodel", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff3", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
-                                                            "--sdkroot",
-                                                            core.loadSDK(.macOS).path.str,
-                                                            "--platform", "macos", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/SmartStuff3-CoreMLPartialInfo.plist", "--container", "bundle-resources", "--encrypt", "/path/to.key", "--language", "Objective-C"].compactMap { $0 })
+                            task.checkSandboxedCommandLine(
+                                [
+                                    coremlcPath.str, "generate", "\(SRCROOT)/SmartStuff3.mlmodel", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff3", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
+                                    "--sdkroot",
+                                    core.loadSDK(.macOS).path.str,
+                                    "--platform", "macos", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/SmartStuff3-CoreMLPartialInfo.plist", "--container", "bundle-resources", "--encrypt", "/path/to.key", "--language", "Objective-C",
+                                ].compactMap { $0 }
+                            )
                             task.checkInputs([
                                 .path("\(SRCROOT)/SmartStuff3.mlmodel"),
                                 .namePattern(.and(.prefix("target-"), .suffix("-copy-headers"))),
                                 .pathPattern(.and(.prefix("\(SRCROOT)/build/aProject.build/Debug/FrameworkTarget.build"), .suffix(".sb"))),
                                 .namePattern(.and(.prefix("target-"), .suffix("-begin-compiling"))),
-                                .name("WorkspaceHeaderMapVFSFilesWritten")
+                                .name("WorkspaceHeaderMapVFSFilesWritten"),
                             ])
                             task.checkOutputs([
                                 .path("\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff3/SmartStuff3.h"),
@@ -789,8 +886,8 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                                 // Framework-style inclusions
                                 switch visibilityBeingTested {
                                 case .public,
-                                        .project,
-                                        .private:
+                                    .project,
+                                    .private:
                                     headermap.checkEntry("\(targetName)/SmartStuff.h", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff/SmartStuff.h")
                                     headermap.checkEntry("\(targetName)/SmartStuff2.h", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff2/SmartStuff2.h")
                                     headermap.checkEntry("\(targetName)/SmartStuff3.h", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff3/SmartStuff3.h")
@@ -849,53 +946,65 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                         // There should be a CoreMLModelCodegen task.
                         verifyTask(for: visibilityBeingTested, with: results, in: target, matching: .matchRuleType("CoreMLModelCodegen"), .matchRuleItemBasename("SmartStuff.mlmodel")) { task in
                             task.checkRuleInfo(["CoreMLModelCodegen", "\(SRCROOT)/SmartStuff.mlmodel"])
-                            task.checkSandboxedCommandLine([coremlcPath.str, "generate", "\(SRCROOT)/SmartStuff.mlmodel", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
-                                                            "--sdkroot",
-                                                            core.loadSDK(.macOS).path.str,
-                                                            "--platform", "macos", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/SmartStuff-CoreMLPartialInfo.plist", "--container", "bundle-resources", "--language", "Swift", "--swift-version", swiftVersion, visibilityBeingTested == .public ? "--public-access" : nil, "--globalmodule"].compactMap { $0 })
+                            task.checkSandboxedCommandLine(
+                                [
+                                    coremlcPath.str, "generate", "\(SRCROOT)/SmartStuff.mlmodel", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
+                                    "--sdkroot",
+                                    core.loadSDK(.macOS).path.str,
+                                    "--platform", "macos", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/SmartStuff-CoreMLPartialInfo.plist", "--container", "bundle-resources", "--language", "Swift", "--swift-version", swiftVersion, visibilityBeingTested == .public ? "--public-access" : nil, "--globalmodule",
+                                ].compactMap { $0 }
+                            )
                             task.checkInputs([
                                 .path("\(SRCROOT)/SmartStuff.mlmodel"),
                                 .namePattern(.and(.prefix("target-"), .suffix("-copy-headers"))),
                                 .pathPattern(.and(.prefix("\(SRCROOT)/build/aProject.build/Debug/FrameworkTarget.build"), .suffix(".sb"))),
                                 .namePattern(.and(.prefix("target-"), .suffix("-begin-compiling"))),
-                                .name("WorkspaceHeaderMapVFSFilesWritten")
+                                .name("WorkspaceHeaderMapVFSFilesWritten"),
                             ])
                             task.checkOutputs([
-                                .path("\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff/SmartStuff.swift"),
+                                .path("\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff/SmartStuff.swift")
                             ])
                         }
                         verifyTask(for: visibilityBeingTested, with: results, in: target, matching: .matchRuleType("CoreMLModelCodegen"), .matchRuleItemBasename("SmartStuff2.mlpackage")) { task in
                             task.checkRuleInfo(["CoreMLModelCodegen", "\(SRCROOT)/SmartStuff2.mlpackage"])
-                            task.checkSandboxedCommandLine([coremlcPath.str, "generate", "\(SRCROOT)/SmartStuff2.mlpackage", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff2", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
-                                                            "--sdkroot",
-                                                            core.loadSDK(.macOS).path.str,
-                                                            "--platform", "macos", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/SmartStuff2-CoreMLPartialInfo.plist", "--container", "bundle-resources", "--language", "Swift", "--swift-version", swiftVersion, visibilityBeingTested == .public ? "--public-access" : nil, "--globalmodule"].compactMap { $0 })
+                            task.checkSandboxedCommandLine(
+                                [
+                                    coremlcPath.str, "generate", "\(SRCROOT)/SmartStuff2.mlpackage", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff2", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
+                                    "--sdkroot",
+                                    core.loadSDK(.macOS).path.str,
+                                    "--platform", "macos", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/SmartStuff2-CoreMLPartialInfo.plist", "--container", "bundle-resources", "--language", "Swift", "--swift-version", swiftVersion, visibilityBeingTested == .public ? "--public-access" : nil, "--globalmodule",
+                                ].compactMap { $0 }
+                            )
                             task.checkInputs([
                                 .path("\(SRCROOT)/SmartStuff2.mlpackage"),
                                 .namePattern(.and(.prefix("target-"), .suffix("-copy-headers"))),
                                 .pathPattern(.and(.prefix("\(SRCROOT)/build/aProject.build/Debug/FrameworkTarget.build"), .suffix(".sb"))),
                                 .namePattern(.and(.prefix("target-"), .suffix("-begin-compiling"))),
-                                .name("WorkspaceHeaderMapVFSFilesWritten")
+                                .name("WorkspaceHeaderMapVFSFilesWritten"),
                             ])
                             task.checkOutputs([
-                                .path("\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff2/SmartStuff2.swift"),
+                                .path("\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff2/SmartStuff2.swift")
                             ])
                         }
                         verifyTask(for: visibilityBeingTested, with: results, in: target, matching: .matchRuleType("CoreMLModelCodegen"), .matchRuleItemBasename("SmartStuff3.mlmodel")) { task in
                             task.checkRuleInfo(["CoreMLModelCodegen", "\(SRCROOT)/SmartStuff3.mlmodel"])
-                            task.checkSandboxedCommandLine([coremlcPath.str, "generate", "\(SRCROOT)/SmartStuff3.mlmodel", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff3", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
-                                                            "--sdkroot",
-                                                            core.loadSDK(.macOS).path.str,
-                                                            "--platform", "macos", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/SmartStuff3-CoreMLPartialInfo.plist", "--container", "bundle-resources", "--encrypt", "/path/to.key", "--language", "Swift", "--swift-version", swiftVersion, visibilityBeingTested == .public ? "--public-access" : nil, "--globalmodule"].compactMap { $0 })
+                            task.checkSandboxedCommandLine(
+                                [
+                                    coremlcPath.str, "generate", "\(SRCROOT)/SmartStuff3.mlmodel", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff3", "--deployment-target", core.loadSDK(.macOS).defaultDeploymentTarget,
+                                    "--sdkroot",
+                                    core.loadSDK(.macOS).path.str,
+                                    "--platform", "macos", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/SmartStuff3-CoreMLPartialInfo.plist", "--container", "bundle-resources", "--encrypt", "/path/to.key", "--language", "Swift", "--swift-version", swiftVersion, visibilityBeingTested == .public ? "--public-access" : nil, "--globalmodule",
+                                ].compactMap { $0 }
+                            )
                             task.checkInputs([
                                 .path("\(SRCROOT)/SmartStuff3.mlmodel"),
                                 .namePattern(.and(.prefix("target-"), .suffix("-copy-headers"))),
                                 .pathPattern(.and(.prefix("\(SRCROOT)/build/aProject.build/Debug/FrameworkTarget.build"), .suffix(".sb"))),
                                 .namePattern(.and(.prefix("target-"), .suffix("-begin-compiling"))),
-                                .name("WorkspaceHeaderMapVFSFilesWritten")
+                                .name("WorkspaceHeaderMapVFSFilesWritten"),
                             ])
                             task.checkOutputs([
-                                .path("\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff3/SmartStuff3.swift"),
+                                .path("\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/CoreMLGenerated/SmartStuff3/SmartStuff3.swift")
                             ])
                         }
                         if action == .build || action == .installAPI {
@@ -971,7 +1080,8 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                         TestFile("SourceOne.swift"),
                         TestFile("Intents.intentdefinition"),
                         TestFile("MyInfo.plist"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -980,14 +1090,15 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "SWIFT_EXEC": swiftCompilerPath.str,
                             "SWIFT_VERSION": swiftVersion,
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         targetName,
                         type: targetType,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"]),
+                            TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"])
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([]),
@@ -997,8 +1108,10 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                             ]),
                         ],
                         predominantSourceCodeLanguage: .swift
-                    ),
-                ], classPrefix: "XC")
+                    )
+                ],
+                classPrefix: "XC"
+            )
             return try await TaskConstructionTester(getCore(), testProject)
         }
 
@@ -1055,7 +1168,7 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                             .path("\(srcroot)/Intents.intentdefinition"),
                             .namePattern(.and(.prefix("target-"), .suffix("-copy-headers"))),
                             .namePattern(.and(.prefix("target-"), .suffix("-begin-compiling"))),
-                            .name("WorkspaceHeaderMapVFSFilesWritten")
+                            .name("WorkspaceHeaderMapVFSFilesWritten"),
                         ])
                         switch codegenLanguage {
                         case .objectiveC:
@@ -1071,7 +1184,7 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                             args += specialArgs
                             task.checkCommandLine(args)
                             task.checkOutputs([
-                                .path("\(srcroot)/build/aProject.build/Debug/\(targetName).build/DerivedSources/IntentDefinitionGenerated/Intents/XCOrderBurgerIntent.swift"),
+                                .path("\(srcroot)/build/aProject.build/Debug/\(targetName).build/DerivedSources/IntentDefinitionGenerated/Intents/XCOrderBurgerIntent.swift")
                             ])
                         default:
                             Issue.record("unexpected codegen language: \(codegenLanguage)")
@@ -1139,10 +1252,10 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                         .path("\(srcroot)/Intents.intentdefinition"),
                         .namePattern(.and(.prefix("target-"), .suffix("-copy-headers"))),
                         .namePattern(.and(.prefix("target-"), .suffix("-begin-compiling"))),
-                        .name("WorkspaceHeaderMapVFSFilesWritten")
+                        .name("WorkspaceHeaderMapVFSFilesWritten"),
                     ])
                     task.checkOutputs([
-                        .path("\(srcroot)/build/Debug/\(targetName).framework/Versions/A/Resources/Intents.intentdefinition"),
+                        .path("\(srcroot)/build/Debug/\(targetName).framework/Versions/A/Resources/Intents.intentdefinition")
                     ])
                 }
 
@@ -1172,12 +1285,13 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                 self.moduleName = moduleName
             }
 
-            override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+            override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
                 if commandLine.first.map(Path.init)?.basename == "intentbuilderc",
-                   let outputDir = commandLine.elementAfterElements(["-output"]).map(Path.init),
-                   let classPrefix = commandLine.elementAfterElements(["-classPrefix"]),
-                   let language = commandLine.elementAfterElements(["-language"]),
-                   let visibility = commandLine.elementAfterElements(["-visibility"]) {
+                    let outputDir = commandLine.elementAfterElements(["-output"]).map(Path.init),
+                    let classPrefix = commandLine.elementAfterElements(["-classPrefix"]),
+                    let language = commandLine.elementAfterElements(["-language"]),
+                    let visibility = commandLine.elementAfterElements(["-visibility"])
+                {
                     if visibility != self.visibility.rawValue {
                         throw StubError.error("Undefined visibility '\(visibility)'")
                     }
@@ -1270,32 +1384,38 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("SourceFile.m"),
                     TestFile("Some.metal"),
                     TestFile("Others.metal"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "GENERATE_INFOPLIST_FILE": "YES",
-                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                "SDKROOT": "macosx",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SDKROOT": "macosx",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("SourceFile.m"),
                             TestBuildFile("Some.metal", additionalArgs: ["-DHello"]),
                             TestBuildFile("Others.metal"),
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
         let MACOSX_DEPLOYMENT_TARGET = core.loadSDK(.macOS).defaultDeploymentTarget
@@ -1374,7 +1494,7 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                 // There should be two CompileMetalFile tasks.
                 try results.checkTask(.matchTarget(target), .matchRuleType("CompileMetalFile"), .matchRuleItemBasename("Some.metal")) { task in
                     let outFile = "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/Metal/Some.air"
-                    let commandLineArgs = ["metal", "-c", "-target", "air64-apple-macos\(MACOSX_DEPLOYMENT_TARGET)", "-I\(SRCROOT)/build/Debug/include", "-F\(SRCROOT)/build/Debug", "-isysroot", core.loadSDK(.macOS).path.str, "-fmetal-math-mode=fast", "-fmetal-math-fp32-functions=fast", "-serialize-diagnostics", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/Metal/Some.dia", "-o", outFile] + (perFileFlagsAvailableWorkaround ? ["-DHello"] : [])  + ["-MMD", "-MT", "dependencies", "-MF", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/Metal/Some.dat", "\(SRCROOT)/Sources/Some.metal"]
+                    let commandLineArgs = ["metal", "-c", "-target", "air64-apple-macos\(MACOSX_DEPLOYMENT_TARGET)", "-I\(SRCROOT)/build/Debug/include", "-F\(SRCROOT)/build/Debug", "-isysroot", core.loadSDK(.macOS).path.str, "-fmetal-math-mode=fast", "-fmetal-math-fp32-functions=fast", "-serialize-diagnostics", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/Metal/Some.dia", "-o", outFile] + (perFileFlagsAvailableWorkaround ? ["-DHello"] : []) + ["-MMD", "-MT", "dependencies", "-MF", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/Metal/Some.dat", "\(SRCROOT)/Sources/Some.metal"]
 
                     task.checkRuleInfo(["CompileMetalFile", "\(SRCROOT)/Sources/Some.metal"])
                     task.checkCommandLine(commandLineArgs)
@@ -1464,32 +1584,38 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Foo.c"),
                     TestFile("Foo.metal", guid: "UPPER"),
                     TestFile("foo.metal", guid: "LOWER"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "GENERATE_INFOPLIST_FILE": "YES",
-                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                "SDKROOT": "macosx",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SDKROOT": "macosx",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("Foo.c"),
                             TestBuildFile("Foo.metal"),
                             TestBuildFile("foo.metal"),
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1510,28 +1636,34 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
     func metalCompilerLanguageRevision() async throws {
         let core = try await getCore()
 
-        func checkLanguageRevision(sdkName:String, languageRevision:String, expectedOption:String) async throws {
+        func checkLanguageRevision(sdkName: String, languageRevision: String, expectedOption: String) async throws {
             let targetName = "MetalStuff"
             let testProject = TestProject(
                 "aProject",
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
-                    children: [TestFile("foo.metal")]),
+                    "SomeFiles",
+                    path: "Sources",
+                    children: [TestFile("foo.metal")]
+                ),
                 targets: [
                     TestStandardTarget(
                         targetName,
                         type: .staticLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug",
-                                                   buildSettings: [
-                                                    "SDKROOT": sdkName,
-                                                    "MTL_LANGUAGE_REVISION": languageRevision,
-                                                   ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": sdkName,
+                                    "MTL_LANGUAGE_REVISION": languageRevision,
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase([TestBuildFile("foo.metal")]),
-                        ])
-                ])
+                            TestSourcesBuildPhase([TestBuildFile("foo.metal")])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try TaskConstructionTester(core, testProject)
 
@@ -1556,55 +1688,56 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
             }
         }
 
-        let optionForLanguage = [ ["macosx", "UseDeploymentTarget"] : "",
-                                  ["macosx", "Metal11"] : "-std=macos-metal1.1",
-                                  ["macosx", "Metal12"] : "-std=macos-metal1.2",
-                                  ["macosx", "Metal20"] : "-std=macos-metal2.0",
-                                  ["macosx", "Metal21"] : "-std=macos-metal2.1",
-                                  ["macosx", "Metal22"] : "-std=macos-metal2.2",
-                                  ["macosx", "Metal23"] : "-std=macos-metal2.3",
-                                  ["macosx", "Metal24"] : "-std=macos-metal2.4",
-                                  ["macosx", "Metal30"] : "-std=metal3.0",
-                                  ["macosx", "Metal31"] : "-std=metal3.1",
-                                  ["macosx", "Metal32"] : "-std=metal3.2",
-                                  ["macosx", "Metal40"] : "-std=metal4.0",
-
-                                  ["iphoneos", "UseDeploymentTarget"] : "",
-                                  ["iphoneos", "iOSMetal10"] : "-std=ios-metal1.0",
-                                  ["iphoneos", "Metal11"] : "-std=ios-metal1.1",
-                                  ["iphoneos", "Metal12"] : "-std=ios-metal1.2",
-                                  ["iphoneos", "Metal20"] : "-std=ios-metal2.0",
-                                  ["iphoneos", "Metal21"] : "-std=ios-metal2.1",
-                                  ["iphoneos", "Metal22"] : "-std=ios-metal2.2",
-                                  ["iphoneos", "Metal23"] : "-std=ios-metal2.3",
-                                  ["iphoneos", "Metal24"] : "-std=ios-metal2.4",
-                                  ["iphoneos", "Metal30"] : "-std=metal3.0",
-                                  ["iphoneos", "Metal31"] : "-std=metal3.1",
-                                  ["iphoneos", "Metal32"] : "-std=metal3.2",
-                                  ["iphoneos", "Metal40"] : "-std=metal4.0",
-
-                                  ["appletvos", "UseDeploymentTarget"] : "",
-                                  ["appletvos", "Metal11"] : "-std=ios-metal1.1",
-                                  ["appletvos", "Metal12"] : "-std=ios-metal1.2",
-                                  ["appletvos", "Metal20"] : "-std=ios-metal2.0",
-                                  ["appletvos", "Metal21"] : "-std=ios-metal2.1",
-                                  ["appletvos", "Metal22"] : "-std=ios-metal2.2",
-                                  ["appletvos", "Metal23"] : "-std=ios-metal2.3",
-                                  ["appletvos", "Metal24"] : "-std=ios-metal2.4",
-                                  ["appletvos", "Metal30"] : "-std=metal3.0",
-                                  ["appletvos", "Metal31"] : "-std=metal3.1",
-                                  ["appletvos", "Metal32"] : "-std=metal3.2",
-                                  ["appletvos", "Metal40"] : "-std=metal4.0",
-
-                                  ["xros", "UseDeploymentTarget"] : "",
-                                  ["xros", "Metal31"] : "-std=metal3.1",
-                                  ["xros", "Metal32"] : "-std=metal3.2",
-                                  ["xros", "Metal40"] : "-std=metal4.0",
+        let optionForLanguage = [
+            ["macosx", "UseDeploymentTarget"]: "",
+            ["macosx", "Metal11"]: "-std=macos-metal1.1",
+            ["macosx", "Metal12"]: "-std=macos-metal1.2",
+            ["macosx", "Metal20"]: "-std=macos-metal2.0",
+            ["macosx", "Metal21"]: "-std=macos-metal2.1",
+            ["macosx", "Metal22"]: "-std=macos-metal2.2",
+            ["macosx", "Metal23"]: "-std=macos-metal2.3",
+            ["macosx", "Metal24"]: "-std=macos-metal2.4",
+            ["macosx", "Metal30"]: "-std=metal3.0",
+            ["macosx", "Metal31"]: "-std=metal3.1",
+            ["macosx", "Metal32"]: "-std=metal3.2",
+            ["macosx", "Metal40"]: "-std=metal4.0",
+
+            ["iphoneos", "UseDeploymentTarget"]: "",
+            ["iphoneos", "iOSMetal10"]: "-std=ios-metal1.0",
+            ["iphoneos", "Metal11"]: "-std=ios-metal1.1",
+            ["iphoneos", "Metal12"]: "-std=ios-metal1.2",
+            ["iphoneos", "Metal20"]: "-std=ios-metal2.0",
+            ["iphoneos", "Metal21"]: "-std=ios-metal2.1",
+            ["iphoneos", "Metal22"]: "-std=ios-metal2.2",
+            ["iphoneos", "Metal23"]: "-std=ios-metal2.3",
+            ["iphoneos", "Metal24"]: "-std=ios-metal2.4",
+            ["iphoneos", "Metal30"]: "-std=metal3.0",
+            ["iphoneos", "Metal31"]: "-std=metal3.1",
+            ["iphoneos", "Metal32"]: "-std=metal3.2",
+            ["iphoneos", "Metal40"]: "-std=metal4.0",
+
+            ["appletvos", "UseDeploymentTarget"]: "",
+            ["appletvos", "Metal11"]: "-std=ios-metal1.1",
+            ["appletvos", "Metal12"]: "-std=ios-metal1.2",
+            ["appletvos", "Metal20"]: "-std=ios-metal2.0",
+            ["appletvos", "Metal21"]: "-std=ios-metal2.1",
+            ["appletvos", "Metal22"]: "-std=ios-metal2.2",
+            ["appletvos", "Metal23"]: "-std=ios-metal2.3",
+            ["appletvos", "Metal24"]: "-std=ios-metal2.4",
+            ["appletvos", "Metal30"]: "-std=metal3.0",
+            ["appletvos", "Metal31"]: "-std=metal3.1",
+            ["appletvos", "Metal32"]: "-std=metal3.2",
+            ["appletvos", "Metal40"]: "-std=metal4.0",
+
+            ["xros", "UseDeploymentTarget"]: "",
+            ["xros", "Metal31"]: "-std=metal3.1",
+            ["xros", "Metal32"]: "-std=metal3.2",
+            ["xros", "Metal40"]: "-std=metal4.0",
         ]
 
         for (language, expectedOption) in optionForLanguage {
             let (sdkName, languageRevision) = (language[0], language[1])
-            try await checkLanguageRevision(sdkName:sdkName, languageRevision:languageRevision, expectedOption:expectedOption)
+            try await checkLanguageRevision(sdkName: sdkName, languageRevision: languageRevision, expectedOption: expectedOption)
         }
     }
 
@@ -1612,28 +1745,34 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
     func metalCompilerEnableModules() async throws {
         let core = try await getCore()
 
-        func checkEnableModules(enableModules:String, expectedOption:String) async throws {
+        func checkEnableModules(enableModules: String, expectedOption: String) async throws {
             let targetName = "MetalStuff"
             let testProject = TestProject(
                 "aProject",
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
-                    children: [TestFile("foo.metal")]),
+                    "SomeFiles",
+                    path: "Sources",
+                    children: [TestFile("foo.metal")]
+                ),
                 targets: [
                     TestStandardTarget(
                         targetName,
                         type: .staticLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug",
-                                                   buildSettings: [
-                                                    "SDKROOT": "macosx",
-                                                    "MTL_ENABLE_MODULES": enableModules,
-                                                   ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SDKROOT": "macosx",
+                                    "MTL_ENABLE_MODULES": enableModules,
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase([TestBuildFile("foo.metal")]),
-                        ])
-                ])
+                            TestSourcesBuildPhase([TestBuildFile("foo.metal")])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try TaskConstructionTester(core, testProject)
 
@@ -1650,13 +1789,14 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
             }
         }
 
-        let optionForEnableModules = [ "YES"    : "-fmodules=all",
-                                       "STDLIB" : "",
-                                       "NO"     : "-fmodules=none",
+        let optionForEnableModules = [
+            "YES": "-fmodules=all",
+            "STDLIB": "",
+            "NO": "-fmodules=none",
         ]
 
         for (enableModules, expectedOption) in optionForEnableModules {
-            try await checkEnableModules(enableModules:enableModules, expectedOption:expectedOption)
+            try await checkEnableModules(enableModules: enableModules, expectedOption: expectedOption)
         }
     }
 
@@ -1666,23 +1806,29 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
-                children: [TestFile("foo.metal")]),
+                "SomeFiles",
+                path: "Sources",
+                children: [TestFile("foo.metal")]
+            ),
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .staticLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                                "MTL_OPTIMIZATION_LEVEL": "default",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "MTL_OPTIMIZATION_LEVEL": "default",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("foo.metal")]),
-                    ])
-            ])
+                        TestSourcesBuildPhase([TestBuildFile("foo.metal")])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -1701,23 +1847,29 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
-                children: [TestFile("foo.metal")]),
+                "SomeFiles",
+                path: "Sources",
+                children: [TestFile("foo.metal")]
+            ),
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .staticLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                                "MTL_OPTIMIZATION_LEVEL": "s",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "MTL_OPTIMIZATION_LEVEL": "s",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("foo.metal")]),
-                    ])
-            ])
+                        TestSourcesBuildPhase([TestBuildFile("foo.metal")])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -1730,29 +1882,39 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
         }
     }
 
-    func checkBasicOption(core:Core, property:String, value:String,
-                          expectedOptions:[String]) async throws {
+    func checkBasicOption(
+        core: Core,
+        property: String,
+        value: String,
+        expectedOptions: [String]
+    ) async throws {
         let targetName = "MetalStuff"
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
-                children: [TestFile("foo.metal")]),
+                "SomeFiles",
+                path: "Sources",
+                children: [TestFile("foo.metal")]
+            ),
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .staticLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                                property: value,
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                property: value,
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("foo.metal")]),
-                    ])
-            ])
+                        TestSourcesBuildPhase([TestBuildFile("foo.metal")])
+                    ]
+                )
+            ]
+        )
 
         let tester = try TaskConstructionTester(core, testProject)
 
@@ -1769,14 +1931,20 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
     func metalCompilerMathModes() async throws {
         let core = try await getCore()
 
-        let options = [ "UseLanguageDefault" : [],
-                        "RELAXED" : ["-fmetal-math-mode=relaxed"],
-                        "FAST" : ["-fmetal-math-mode=fast"],
-                        "SAFE" : ["-fmetal-math-mode=safe"] ]
+        let options = [
+            "UseLanguageDefault": [],
+            "RELAXED": ["-fmetal-math-mode=relaxed"],
+            "FAST": ["-fmetal-math-mode=fast"],
+            "SAFE": ["-fmetal-math-mode=safe"],
+        ]
 
         for (value, expectedOptions) in options {
-            try await checkBasicOption(core:core, property:"MTL_MATH_MODE",
-                                       value:value, expectedOptions:expectedOptions)
+            try await checkBasicOption(
+                core: core,
+                property: "MTL_MATH_MODE",
+                value: value,
+                expectedOptions: expectedOptions
+            )
         }
     }
 
@@ -1784,13 +1952,19 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
     func metalCompilerFP32MathFunctions() async throws {
         let core = try await getCore()
 
-        let options = [ "UseLanguageDefault" : [],
-                        "FAST" : ["-fmetal-math-fp32-functions=fast"],
-                        "PRECISE" : ["-fmetal-math-fp32-functions=precise"] ]
+        let options = [
+            "UseLanguageDefault": [],
+            "FAST": ["-fmetal-math-fp32-functions=fast"],
+            "PRECISE": ["-fmetal-math-fp32-functions=precise"],
+        ]
 
         for (value, expectedOptions) in options {
-            try await checkBasicOption(core:core, property:"MTL_MATH_FP32_FUNCTIONS",
-                                       value:value, expectedOptions:expectedOptions)
+            try await checkBasicOption(
+                core: core,
+                property: "MTL_MATH_FP32_FUNCTIONS",
+                value: value,
+                expectedOptions: expectedOptions
+            )
         }
     }
 
@@ -1801,14 +1975,24 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
     func metalCompilerFastMath() async throws {
         let core = try await getCore()
 
-        let options = [ "YES" : [ "-fmetal-math-mode=fast",
-                                  "-fmetal-math-fp32-functions=fast" ],
-                        "NO" : [ "-fmetal-math-mode=safe",
-                                 "-fmetal-math-fp32-functions=precise" ] ]
+        let options = [
+            "YES": [
+                "-fmetal-math-mode=fast",
+                "-fmetal-math-fp32-functions=fast",
+            ],
+            "NO": [
+                "-fmetal-math-mode=safe",
+                "-fmetal-math-fp32-functions=precise",
+            ],
+        ]
 
         for (value, expectedOption) in options {
-            try await checkBasicOption(core:core, property:"MTL_FAST_MATH",
-                                       value:value, expectedOptions:expectedOption)
+            try await checkBasicOption(
+                core: core,
+                property: "MTL_FAST_MATH",
+                value: value,
+                expectedOptions: expectedOption
+            )
         }
     }
 
@@ -1819,32 +2003,39 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Scanner.l"),
                     TestFile("Parser.y"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "ARCHS": "arm64",
-                                                "CODE_SIGN_IDENTITY": "",
-                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                "SDKROOT": "iphoneos",
-                                                "LEXFLAGS": "--header-file=\"$(DERIVED_FILE_DIR)/LexOut.h\"",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ARCHS": "arm64",
+                                "CODE_SIGN_IDENTITY": "",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SDKROOT": "iphoneos",
+                                "LEXFLAGS": "--header-file=\"$(DERIVED_FILE_DIR)/LexOut.h\"",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("Scanner.l"),
-                            TestBuildFile("Parser.y")]
-                                             ),
-                    ])
-            ])
+                            TestBuildFile("Parser.y"),
+                        ]
+                        )
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Check the tasks.
@@ -1874,27 +2065,39 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                     return
                 }
                 // Make sure they have the inputs and outputs we expect.
-                XCTAssertMatch(lexTask.inputs.map({ $0.name }), [
+                XCTAssertMatch(
+                    lexTask.inputs.map({ $0.name }),
+                    [
                         .equal("Scanner.l"),
                         .and(.prefix("target"), .suffix("Producer")),
                         .and(.prefix("target"), .suffix("-begin-compiling")),
-                    ])
-                XCTAssertMatch(lexTask.outputs.map({ $0.name }), [
+                    ]
+                )
+                XCTAssertMatch(
+                    lexTask.outputs.map({ $0.name }),
+                    [
                         .equal("Scanner.yy.c"),
                         .equal("LexOut.h"),
-                    ])
+                    ]
+                )
                 #expect(lexCompileTasks.count == 1)
                 for lexCompileTask in lexCompileTasks {
-                    XCTAssertMatch(lexCompileTask.inputs.map({ $0.name }), [
+                    XCTAssertMatch(
+                        lexCompileTask.inputs.map({ $0.name }),
+                        [
                             .equal("Scanner.yy.c"),
                             .and(.prefix("target"), .suffix("-generated-headers")),
                             .and(.prefix("target"), .suffix("-swift-generated-headers")),
                             .and(.prefix("target"), .suffix("Producer")),
                             .and(.prefix("target"), .suffix("-begin-compiling")),
-                        ])
-                    XCTAssertMatch(lexCompileTask.outputs.map({ $0.name }), [
-                            .equal("Scanner.yy.o"),
-                        ])
+                        ]
+                    )
+                    XCTAssertMatch(
+                        lexCompileTask.outputs.map({ $0.name }),
+                        [
+                            .equal("Scanner.yy.o")
+                        ]
+                    )
                 }
 
                 // Find the yacc task and its resulting compile task.
@@ -1911,34 +2114,48 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                     return
                 }
                 // Make sure they have the inputs and outputs we expect.
-                XCTAssertMatch(yaccTask.inputs.map({ $0.name }), [
+                XCTAssertMatch(
+                    yaccTask.inputs.map({ $0.name }),
+                    [
                         .equal("Parser.y"),
                         .and(.prefix("target"), .suffix("Producer")),
                         .and(.prefix("target"), .suffix("-begin-compiling")),
-                    ])
-                XCTAssertMatch(yaccTask.outputs.map({ $0.name }), [
+                    ]
+                )
+                XCTAssertMatch(
+                    yaccTask.outputs.map({ $0.name }),
+                    [
                         .equal("y.tab.c"),
                         .equal("y.tab.h"),
-                    ])
+                    ]
+                )
                 #expect(yaccCompileTasks.count == 1)
                 for yaccCompileTask in yaccCompileTasks {
-                    XCTAssertMatch(yaccCompileTask.inputs.map({ $0.name }), [
+                    XCTAssertMatch(
+                        yaccCompileTask.inputs.map({ $0.name }),
+                        [
                             .equal("y.tab.c"),
                             .and(.prefix("target"), .suffix("-generated-headers")),
                             .and(.prefix("target"), .suffix("-swift-generated-headers")),
                             .and(.prefix("target"), .suffix("Producer")),
                             .and(.prefix("target"), .suffix("-begin-compiling")),
-                        ])
-                    XCTAssertMatch(yaccCompileTask.outputs.map({ $0.name }), [
-                            .equal("y.tab.o"),
-                        ])
+                        ]
+                    )
+                    XCTAssertMatch(
+                        yaccCompileTask.outputs.map({ $0.name }),
+                        [
+                            .equal("y.tab.o")
+                        ]
+                    )
                 }
 
                 // Validate that the linker and lipo tasks are set up.
                 results.checkTasks(.matchTarget(target), .matchRuleType("Ld")) { tasks in
                     #expect(tasks.count == 1)
                     for task in tasks {
-                        XCTAssertMatch(task.inputs.map({ $0.name }), [
+                        XCTAssertMatch(
+                            task.inputs.map({ $0.name }),
+                            [
                                 .equal("Scanner.yy.o"),
                                 .equal("y.tab.o"),
                                 .suffix(".LinkFileList"),
@@ -1947,7 +2164,8 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                                 .and(.prefix("target"), .suffix("-swift-generated-headers")),
                                 .and(.prefix("target"), .suffix("Producer")),
                                 .and(.prefix("target"), .suffix("-begin-linking")),
-                            ])
+                            ]
+                        )
                         task.checkOutputs([
                             .name("CoreFoo"),
                             .name("Linked Binary /tmp/Test/aProject/build/Debug-iphoneos/CoreFoo.framework/CoreFoo"),
@@ -1974,34 +2192,39 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Foo.cl"),
-                ]),
+                    TestFile("Foo.cl")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug",
-                                       buildSettings: [
-                                        "ARCHS": "x86_64 x86_64h",
-                                        "VALID_ARCHS": "$(inherited) x86_64h",
-                                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                                        "CODE_SIGN_IDENTITY": "-",
-                                        "SWIFT_VERSION": swiftVersion,
-                                        "USE_HEADERMAP": "NO",
-                                        "LIBTOOL": libtoolPath.str,
-                                       ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS": "x86_64 x86_64h",
+                        "VALID_ARCHS": "$(inherited) x86_64h",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "SWIFT_VERSION": swiftVersion,
+                        "USE_HEADERMAP": "NO",
+                        "LIBTOOL": libtoolPath.str,
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Foo",
                     type: .staticLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["Foo.cl",]),
+                        TestSourcesBuildPhase(["Foo.cl"])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -2013,14 +2236,14 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                     task.checkInputs([.path("\(SRCROOT)/Sources/Foo.cl"), .any, .any, .any])
                     task.checkOutputs([
                         .pathPattern(.suffix("Foo.cl.c")),
-                        .pathPattern(.suffix("Foo.cl.h"))
+                        .pathPattern(.suffix("Foo.cl.h")),
                     ])
                     task.checkCommandLine([
                         "/System/Library/Frameworks/OpenCL.framework/Libraries/openclc",
                         "-x", "cl", "-cl-std=CL1.1", "-cl-auto-vectorize-enable",
                         "-gcl-bc-dir", "OpenCL",
                         "-emit-gcl", "\(SRCROOT)/Sources/Foo.cl",
-                        "-gcl-output-dir", "\(SRCROOT)/build/aProject.build/Debug/Foo.build/DerivedSources"
+                        "-gcl-output-dir", "\(SRCROOT)/build/aProject.build/Debug/Foo.build/DerivedSources",
                     ])
                 }
 
@@ -2044,7 +2267,8 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                             "-I\(SRCROOT)/build/aProject.build/Debug/Foo.build/DerivedSources-normal",
                             "-I\(SRCROOT)/build/aProject.build/Debug/Foo.build/DerivedSources",
                             "-F\(SRCROOT)/build/Debug", "-arch", arch, "-emit-llvm", "-c",
-                            "\(SRCROOT)/Sources/Foo.cl", "-o", "\(SRCROOT)/build/Debug/OpenCL/Foo.cl.\(arch).bc"])
+                            "\(SRCROOT)/Sources/Foo.cl", "-o", "\(SRCROOT)/build/Debug/OpenCL/Foo.cl.\(arch).bc",
+                        ])
                     }
                 }
             }
@@ -2062,29 +2286,34 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
             let testProject = TestProject(
                 "aProject",
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("ClassOne.m"),
-                    ]),
+                        TestFile("ClassOne.m")
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug",
-                                           buildSettings: [
-                                            "GENERATE_INFOPLIST_FILE": "YES",
-                                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                                           ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Application",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug"),
+                            TestBuildConfiguration("Debug")
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["ClassOne.m",]),
+                            TestSourcesBuildPhase(["ClassOne.m"])
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -2130,30 +2359,35 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
             let testProject = TestProject(
                 "aProject",
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("ClassOne.m"),
                         TestFile("ClassTwo.mm"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug",
-                                           buildSettings: [
-                                            "GENERATE_INFOPLIST_FILE": "YES",
-                                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                                           ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Application",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug"),
+                            TestBuildConfiguration("Debug")
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["ClassOne.m","ClassTwo.mm",]),
+                            TestSourcesBuildPhase(["ClassOne.m", "ClassTwo.mm"])
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -2199,30 +2433,35 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
             let testProject = TestProject(
                 "aProject",
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("ClassOne.m"),
-                    ]),
+                        TestFile("ClassOne.m")
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug",
-                                           buildSettings: [
-                                            "GENERATE_INFOPLIST_FILE": "YES",
-                                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                                            "OTHER_CFLAGS": "-x objective-c++"
-                                           ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "OTHER_CFLAGS": "-x objective-c++",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Application",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug"),
+                            TestBuildConfiguration("Debug")
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["ClassOne.m",]),
+                            TestSourcesBuildPhase(["ClassOne.m"])
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -2268,29 +2507,34 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
             let testProject = TestProject(
                 "aProject",
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("ClassOne.m"),
-                    ]),
+                        TestFile("ClassOne.m")
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug",
-                                           buildSettings: [
-                                            "GENERATE_INFOPLIST_FILE": "YES",
-                                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                                           ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Application",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug"),
+                            TestBuildConfiguration("Debug")
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase([TestBuildFile("ClassOne.m", additionalArgs: ["-x", "objective-c++"])]),
+                            TestSourcesBuildPhase([TestBuildFile("ClassOne.m", additionalArgs: ["-x", "objective-c++"])])
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -2336,30 +2580,35 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
             let testProject = TestProject(
                 "aProject",
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("ClassOne.m"),
-                    ]),
+                        TestFile("ClassOne.m")
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug",
-                                           buildSettings: [
-                                            "GENERATE_INFOPLIST_FILE": "YES",
-                                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                                            "GCC_INPUT_FILETYPE": "sourcecode.cpp.objcpp"
-                                           ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "GCC_INPUT_FILETYPE": "sourcecode.cpp.objcpp",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Application",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug"),
+                            TestBuildConfiguration("Debug")
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["ClassOne.m",]),
+                            TestSourcesBuildPhase(["ClassOne.m"])
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -2405,31 +2654,36 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
             let testProject = TestProject(
                 "aProject",
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("ClassOne.m"),
-                    ]),
+                        TestFile("ClassOne.m")
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug",
-                                           buildSettings: [
-                                            "GENERATE_INFOPLIST_FILE": "YES",
-                                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                                            "GCC_INPUT_FILETYPE": "sourcecode.cpp.objcpp",
-                                            "OTHER_CPLUSPLUSFLAGS": "-x c",
-                                           ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "GCC_INPUT_FILETYPE": "sourcecode.cpp.objcpp",
+                            "OTHER_CPLUSPLUSFLAGS": "-x c",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Application",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug"),
+                            TestBuildConfiguration("Debug")
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase([TestBuildFile("ClassOne.m", additionalArgs: ["-x", "c++"])]),
+                            TestSourcesBuildPhase([TestBuildFile("ClassOne.m", additionalArgs: ["-x", "c++"])])
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -2475,31 +2729,36 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
             let testProject = TestProject(
                 "aProject",
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("ClassOne.m"),
-                    ]),
+                        TestFile("ClassOne.m")
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug",
-                                           buildSettings: [
-                                            "GENERATE_INFOPLIST_FILE": "YES",
-                                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                                            "GCC_INPUT_FILETYPE": "fake",
-                                            "OTHER_CPLUSPLUSFLAGS": "-x c",
-                                           ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "GCC_INPUT_FILETYPE": "fake",
+                            "OTHER_CPLUSPLUSFLAGS": "-x c",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Application",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug"),
+                            TestBuildConfiguration("Debug")
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase([TestBuildFile("ClassOne.m", additionalArgs: ["-x", "c++"])]),
+                            TestSourcesBuildPhase([TestBuildFile("ClassOne.m", additionalArgs: ["-x", "c++"])])
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -2544,40 +2803,44 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
         }
     }
 
-
     @Test(.requireSDKs(.macOS))
     func linkMissingProjectReference() async throws {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("ClassOne.m"),
-                ]),
+                    TestFile("ClassOne.m")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug",
-                                       buildSettings: [
-                                        "GENERATE_INFOPLIST_FILE": "YES",
-                                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                                       ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Application",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["ClassOne.m",]),
+                        TestSourcesBuildPhase(["ClassOne.m"]),
                         TestFrameworksBuildPhase([
                             TestBuildFile(.namedReference(name: "UIKit.framework", fileTypeIdentifier: "wrapper.framework")),
                             TestBuildFile(.namedReference(name: "libssl.a", fileTypeIdentifier: "archive.ar")),
                             TestBuildFile(.namedReference(name: "libxml2.dylib", fileTypeIdentifier: "compiled.mach-o.dylib")),
-                        ])
+                        ]),
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(runDestination: .macOS) { results in
@@ -2598,30 +2861,35 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("ClassOne.m"),
-                ]),
+                    TestFile("ClassOne.m")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug",
-                                       buildSettings: [
-                                        "GENERATE_INFOPLIST_FILE": "YES",
-                                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                                        "OTHER_LDFLAGS": "-sectcreate __TEXT __info_plist /path/of/Info.plist -sectcreate a b /c.plist arg arg -sectcreate c d /e.plist"
-                                       ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "OTHER_LDFLAGS": "-sectcreate __TEXT __info_plist /path/of/Info.plist -sectcreate a b /c.plist arg arg -sectcreate c d /e.plist",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Application",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["ClassOne.m",]),
+                        TestSourcesBuildPhase(["ClassOne.m"])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         let fs = PseudoFS()
@@ -2651,7 +2919,8 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("CFile1.c", fileType: "sourcecode.c.c"),
                     TestFile("CFile2.c", fileType: "sourcecode.c.c.preprocessed"),
@@ -2662,20 +2931,23 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                     TestFile("ObjCPlusPlusFile1.mm", fileType: "sourcecode.cpp.objcpp"),
                     TestFile("ObjCPlusPlusFile2.mm", fileType: "sourcecode.cpp.objcpp.preprocessed"),
                     TestFile("Assembly.asm", fileType: "sourcecode.asm.asm"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug",
-                                       buildSettings: [
-                                        "GENERATE_INFOPLIST_FILE": "YES",
-                                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                                       ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Application",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -2688,10 +2960,11 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                             "ObjCPlusPlusFile1.mm",
                             "ObjCPlusPlusFile2.mm",
                             "Assembly.asm",
-                        ]),
+                        ])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Check the build.
@@ -2737,34 +3010,37 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
-                children: [
-                ]),
+                "SomeFiles",
+                path: "Sources",
+                children: []
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug",
-                                       buildSettings: [
-                                        "CODE_SIGNING_ALLOWED": "NO",
-                                        "BUILD_VARIANTS": "normal debug profile",
-                                        "EXCLUDED_SOURCE_FILE_NAMES": "*",
-                                        "GENERATE_INFOPLIST_FILE": "YES",
-                                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                                        "SKIP_INSTALL": "YES",
-                                        "VERSIONING_SYSTEM": "apple-generic"
-                                       ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "BUILD_VARIANTS": "normal debug profile",
+                        "EXCLUDED_SOURCE_FILE_NAMES": "*",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SKIP_INSTALL": "YES",
+                        "VERSIONING_SYSTEM": "apple-generic",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "SomeFwk",
                     type: .dynamicLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([
-                        ]),
+                        TestSourcesBuildPhase([])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Check the build.
@@ -2783,35 +3059,40 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("file.m", guid: "PACKAGE:Foo/Bar/Pkg:PHASE_1::REF_1"),
                     TestFile("file.mm", guid: "PACKAGE:Foo/Bar/Pkg:PHASE_2::REF_2"),
                     TestFile("file.c", guid: "PACKAGE:../../..:PHASE_3::REF_3"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug",
-                                       buildSettings: [
-                                        "BUILD_VARIANTS": "normal",
-                                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                                       ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "BUILD_VARIANTS": "normal",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyLibrary",
                     type: .dynamicLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "file.m",
                             "file.mm",
                             "file.c",
-                        ]),
+                        ])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Check the build.
@@ -2838,11 +3119,13 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Info.plist"),
                     TestFile("baz.storyboard"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -2850,26 +3133,31 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                         "IBC_EXEC": ibtoolPath.str,
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "CONFIGURATION_BUILD_DIR": "$(SYMROOT)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "CODE_SIGN_IDENTITY": "",
-                                                "SDKROOT": "macosx",
-                                                "INFOPLIST_FILE": "Sources/Info.plist",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "CODE_SIGN_IDENTITY": "",
+                                "SDKROOT": "macosx",
+                                "INFOPLIST_FILE": "Sources/Info.plist",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
-                            "baz.storyboard",
-                        ]),
-                    ])
-            ])
+                            "baz.storyboard"
+                        ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -2882,10 +3170,12 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                     task.checkInputs([
                         .path("\(SRCROOT)/Sources/baz.storyboard"),
                         .namePattern(.and(.prefix("target"), .suffix("Producer"))),
-                        .namePattern(.prefix("target-"))])
+                        .namePattern(.prefix("target-")),
+                    ])
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/baz.storyboardc"),
-                        .path("\(SRCROOT)/build/aProject.build/Debug/App.build/baz-SBPartialInfo.plist"),])
+                        .path("\(SRCROOT)/build/aProject.build/Debug/App.build/baz-SBPartialInfo.plist"),
+                    ])
                 }
 
                 // Verify that the LinkStoryboards task was created as expected with the storyboardc file as input.
@@ -2894,10 +3184,10 @@ fileprivate struct BuildToolTaskConstructionTests: CoreBasedTests {
                     task.checkInputs([
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/baz.storyboardc"),
                         .namePattern(.and(.prefix("target"), .suffix("Producer"))),
-                        .namePattern(.prefix("target-"))
+                        .namePattern(.prefix("target-")),
                     ])
                     task.checkOutputs([
-                        .path("\(SRCROOT)/build/App.app/Contents/Resources/baz.storyboardc"),
+                        .path("\(SRCROOT)/build/App.app/Contents/Resources/baz.storyboardc")
                     ])
                 }
             }
diff --git a/Tests/SWBTaskConstructionTests/ClangModulesTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/ClangModulesTaskConstructionTests.swift
index f42c34de..1d4eda7a 100644
--- a/Tests/SWBTaskConstructionTests/ClangModulesTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/ClangModulesTaskConstructionTests.swift
@@ -36,7 +36,8 @@ fileprivate struct ClangModulesTaskConstructionTests: CoreBasedTests {
                         TestFile("c.cpp"),
                         TestFile("d.mm"),
                         TestFile("e.s"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -45,18 +46,20 @@ fileprivate struct ClangModulesTaskConstructionTests: CoreBasedTests {
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "CLANG_USE_RESPONSE_FILE": "NO",
                             "CLANG_ENABLE_MODULES": "YES",
-                            "CC": clangCompilerPath.str
-                        ]),
+                            "CC": clangCompilerPath.str,
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Test",
                         type: .staticLibrary,
                         buildPhases: [
-                            TestSourcesBuildPhase(["a.c", "b.m", "c.cpp", "d.mm", "e.s"]),
+                            TestSourcesBuildPhase(["a.c", "b.m", "c.cpp", "d.mm", "e.s"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
diff --git a/Tests/SWBTaskConstructionTests/ClangResponseFileTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/ClangResponseFileTaskConstructionTests.swift
index 7f39a4ab..bf2318bd 100644
--- a/Tests/SWBTaskConstructionTests/ClangResponseFileTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/ClangResponseFileTaskConstructionTests.swift
@@ -34,7 +34,8 @@ fileprivate struct ClangResponseFileTaskConstructionTests: CoreBasedTests {
                         TestFile("a.c"),
                         TestFile("b.c"),
                         TestFile("c.c"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -42,18 +43,20 @@ fileprivate struct ClangResponseFileTaskConstructionTests: CoreBasedTests {
                             "LIBTOOL": libtoolPath.str,
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "CLANG_USE_RESPONSE_FILE": "YES",
-                            "CC": clangCompilerPath.str
-                        ]),
+                            "CC": clangCompilerPath.str,
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Test",
                         type: .staticLibrary,
                         buildPhases: [
-                            TestSourcesBuildPhase(["a.c", "b.c", "c.c"]),
+                            TestSourcesBuildPhase(["a.c", "b.c", "c.c"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -92,7 +95,8 @@ fileprivate struct ClangResponseFileTaskConstructionTests: CoreBasedTests {
                         TestFile("a.c"),
                         TestFile("b.c"),
                         TestFile("c.c"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -101,17 +105,19 @@ fileprivate struct ClangResponseFileTaskConstructionTests: CoreBasedTests {
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "CC": "\(tmpDir.join("efi-clang").str)",
                             "CLANG_USE_RESPONSE_FILE": "YES",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Test",
                         type: .staticLibrary,
                         buildPhases: [
-                            TestSourcesBuildPhase(["a.c", "b.c", "c.c"]),
+                            TestSourcesBuildPhase(["a.c", "b.c", "c.c"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -136,7 +142,8 @@ fileprivate struct ClangResponseFileTaskConstructionTests: CoreBasedTests {
                         TestFile("a.c"),
                         TestFile("b.c"),
                         TestFile("c.c"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -148,18 +155,20 @@ fileprivate struct ClangResponseFileTaskConstructionTests: CoreBasedTests {
                             "CLANG_ENABLE_MODULES": "YES",
                             "CLANG_ENABLE_EXPLICIT_MODULES": "NO",
                             "CLANG_MODULES_DISABLE_PRIVATE_WARNING": "YES",
-                            "CC": clangCompilerPath.str
-                        ]),
+                            "CC": clangCompilerPath.str,
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Test",
                         type: .staticLibrary,
                         buildPhases: [
-                            TestSourcesBuildPhase(["a.c", "b.c", "c.c"]),
+                            TestSourcesBuildPhase(["a.c", "b.c", "c.c"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -167,14 +176,15 @@ fileprivate struct ClangResponseFileTaskConstructionTests: CoreBasedTests {
                 results.checkWriteAuxiliaryFileTask(.matchRuleItemPattern(.suffix("-common-args.resp"))) { task, contents in
                     let stringContents = contents.asString
                     #expect(stringContents.contains("-target"))
-                    let blocksFlag = switch runDestination {
+                    let blocksFlag =
+                        switch runDestination {
                         case .macOSIntel:
                             "-fasm-blocks"
                         case .linux:
                             "-fblocks"
                         default:
                             " "
-                    }
+                        }
                     #expect(stringContents.contains(blocksFlag))
                     #expect(!stringContents.contains("-MMD"))
                     #expect(!stringContents.contains("-fcolor-diagnostics"))
@@ -205,7 +215,8 @@ fileprivate struct ClangResponseFileTaskConstructionTests: CoreBasedTests {
                         TestFile("a.c"),
                         TestFile("b.m"),
                         TestFile("c.m"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -213,18 +224,20 @@ fileprivate struct ClangResponseFileTaskConstructionTests: CoreBasedTests {
                             "LIBTOOL": libtoolPath.str,
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "CLANG_USE_RESPONSE_FILE": "YES",
-                            "CC": clangCompilerPath.str
-                        ]),
+                            "CC": clangCompilerPath.str,
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Test",
                         type: .staticLibrary,
                         buildPhases: [
-                            TestSourcesBuildPhase(["a.c", "b.m", "c.m"]),
+                            TestSourcesBuildPhase(["a.c", "b.m", "c.m"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -262,8 +275,9 @@ fileprivate struct ClangResponseFileTaskConstructionTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("a.c"),
-                    ]),
+                        TestFile("a.c")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -272,18 +286,20 @@ fileprivate struct ClangResponseFileTaskConstructionTests: CoreBasedTests {
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "CLANG_USE_RESPONSE_FILE": "YES",
                             "RUN_CLANG_STATIC_ANALYZER": "YES",
-                            "CC": clangCompilerPath.str
-                        ]),
+                            "CC": clangCompilerPath.str,
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Test",
                         type: .staticLibrary,
                         buildPhases: [
-                            TestSourcesBuildPhase(["a.c"]),
+                            TestSourcesBuildPhase(["a.c"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -317,8 +333,9 @@ fileprivate struct ClangResponseFileTaskConstructionTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("a.c"),
-                    ]),
+                        TestFile("a.c")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -331,18 +348,20 @@ fileprivate struct ClangResponseFileTaskConstructionTests: CoreBasedTests {
                             "CLANG_ENABLE_EXPLICIT_MODULES": "NO",
                             "CLANG_MODULES_DISABLE_PRIVATE_WARNING": "YES",
                             "CC": clangCompilerPath.str,
-                            "OTHER_CFLAGS": "-Xclang -Wno-shorten-64-to-32" // matches a precompiled-header neutral pattern, but uses -Xclang
-                        ]),
+                            "OTHER_CFLAGS": "-Xclang -Wno-shorten-64-to-32",  // matches a precompiled-header neutral pattern, but uses -Xclang
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Test",
                         type: .staticLibrary,
                         buildPhases: [
-                            TestSourcesBuildPhase(["a.c"]),
+                            TestSourcesBuildPhase(["a.c"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
diff --git a/Tests/SWBTaskConstructionTests/ClangStatCacheTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/ClangStatCacheTaskConstructionTests.swift
index 1d9873c9..5c42551f 100644
--- a/Tests/SWBTaskConstructionTests/ClangStatCacheTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/ClangStatCacheTaskConstructionTests.swift
@@ -34,37 +34,48 @@ fileprivate struct ClangStatCacheTaskConstructionTests: CoreBasedTests {
                             TestFile("file.swift"),
                             TestFile("file2.swift"),
                             TestFile("file3.c"),
-                        ]),
-                    buildConfigurations: [TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "SWIFT_VERSION": swiftVersion,
-                            "CODE_SIGNING_ALLOWED": "NO",
-                        ])],
+                        ]
+                    ),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SWIFT_VERSION": swiftVersion,
+                                "CODE_SIGNING_ALLOWED": "NO",
+                            ]
+                        )
+                    ],
                     targets: [
                         TestStandardTarget(
                             "Framework",
                             type: .framework,
-                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT":"iphoneos"])],
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"])],
                             buildPhases: [
-                                TestSourcesBuildPhase(["file.swift"]),
-                            ], dependencies: ["Tool", "Framework2"]),
+                                TestSourcesBuildPhase(["file.swift"])
+                            ],
+                            dependencies: ["Tool", "Framework2"]
+                        ),
                         TestStandardTarget(
                             "Framework2",
                             type: .framework,
-                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT":"iphoneos"])],
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "iphoneos"])],
                             buildPhases: [
-                                TestSourcesBuildPhase(["file3.c"]),
-                            ]),
+                                TestSourcesBuildPhase(["file3.c"])
+                            ]
+                        ),
                         TestStandardTarget(
                             "Tool",
                             type: .commandLineTool,
-                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT":"macosx"])],
+                            buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"])],
                             buildPhases: [
-                                TestSourcesBuildPhase(["file2.swift"]),
-                            ]),
-                    ])])
+                                TestSourcesBuildPhase(["file2.swift"])
+                            ]
+                        ),
+                    ]
+                )
+            ]
+        )
 
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testWorkspace)
@@ -119,30 +130,40 @@ fileprivate struct ClangStatCacheTaskConstructionTests: CoreBasedTests {
                         children: [
                             TestFile("file.swift"),
                             TestFile("file2.swift"),
-                        ]),
-                    buildConfigurations: [TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "SWIFT_VERSION": swiftVersion,
-                            "CODE_SIGNING_ALLOWED": "NO",
-                        ])],
+                        ]
+                    ),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SWIFT_VERSION": swiftVersion,
+                                "CODE_SIGNING_ALLOWED": "NO",
+                            ]
+                        )
+                    ],
                     targets: [
                         TestStandardTarget(
                             "Framework",
                             type: .framework,
                             buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDK_STAT_CACHE_VERBOSE_LOGGING": "YES"])],
                             buildPhases: [
-                                TestSourcesBuildPhase(["file.swift"]),
-                            ], dependencies: ["Framework2"]),
+                                TestSourcesBuildPhase(["file.swift"])
+                            ],
+                            dependencies: ["Framework2"]
+                        ),
                         TestStandardTarget(
                             "Framework2",
                             type: .framework,
                             buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SDK_STAT_CACHE_VERBOSE_LOGGING": "NO"])],
                             buildPhases: [
-                                TestSourcesBuildPhase(["file2.swift"]),
-                            ]),
-                    ])])
+                                TestSourcesBuildPhase(["file2.swift"])
+                            ]
+                        ),
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
         await tester.checkBuild(runDestination: .macOS, fs: localFS) { results in
@@ -164,24 +185,32 @@ fileprivate struct ClangStatCacheTaskConstructionTests: CoreBasedTests {
                     groupTree: TestGroup(
                         "Sources",
                         children: [
-                            TestFile("file.swift"),
-                        ]),
-                    buildConfigurations: [TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "SWIFT_VERSION": swiftVersion,
-                            "CODE_SIGNING_ALLOWED": "NO",
-                            "SDK_STAT_CACHE_VERBOSE_LOGGING": "YES"
-                        ])],
+                            TestFile("file.swift")
+                        ]
+                    ),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SWIFT_VERSION": swiftVersion,
+                                "CODE_SIGNING_ALLOWED": "NO",
+                                "SDK_STAT_CACHE_VERBOSE_LOGGING": "YES",
+                            ]
+                        )
+                    ],
                     targets: [
                         TestStandardTarget(
                             "Framework",
                             type: .framework,
                             buildPhases: [
-                                TestSourcesBuildPhase(["file.swift"]),
-                            ]),
-                    ])])
+                                TestSourcesBuildPhase(["file.swift"])
+                            ]
+                        )
+                    ]
+                )
+            ]
+        )
 
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testWorkspace)
@@ -203,22 +232,30 @@ fileprivate struct ClangStatCacheTaskConstructionTests: CoreBasedTests {
                     groupTree: TestGroup(
                         "Sources",
                         children: [
-                            TestFile("file.m"),
-                        ]),
-                    buildConfigurations: [TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "CODE_SIGNING_ALLOWED": "NO",
-                        ])],
+                            TestFile("file.m")
+                        ]
+                    ),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "CODE_SIGNING_ALLOWED": "NO",
+                            ]
+                        )
+                    ],
                     targets: [
                         TestStandardTarget(
                             "Framework",
                             type: .framework,
                             buildPhases: [
-                                TestSourcesBuildPhase(["file.m"]),
-                            ]),
-                    ])])
+                                TestSourcesBuildPhase(["file.m"])
+                            ]
+                        )
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
         await tester.checkBuild(runDestination: .macOS, fs: localFS) { results in
diff --git a/Tests/SWBTaskConstructionTests/ClangStaticAnalyzerTests.swift b/Tests/SWBTaskConstructionTests/ClangStaticAnalyzerTests.swift
index 9695319b..2dc9993f 100644
--- a/Tests/SWBTaskConstructionTests/ClangStaticAnalyzerTests.swift
+++ b/Tests/SWBTaskConstructionTests/ClangStaticAnalyzerTests.swift
@@ -27,16 +27,26 @@ fileprivate struct ClangStaticAnalyzerTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             defaultConfigurationName: "Release",
-            groupTree: TestGroup("Foo", children: [
-                TestFile("foo.c"),
-                TestFile("bar.s"),
-            ]),
-            targets: [TestStandardTarget("Lib", type: .dynamicLibrary,
-                                         buildPhases: [
-                                            TestSourcesBuildPhase([
-                                                "foo.c",
-                                                "bar.s", // should not get analyzed
-                                            ])])])
+            groupTree: TestGroup(
+                "Foo",
+                children: [
+                    TestFile("foo.c"),
+                    TestFile("bar.s"),
+                ]
+            ),
+            targets: [
+                TestStandardTarget(
+                    "Lib",
+                    type: .dynamicLibrary,
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            "foo.c",
+                            "bar.s",  // should not get analyzed
+                        ])
+                    ]
+                )
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -83,14 +93,15 @@ fileprivate struct ClangStaticAnalyzerTests: CoreBasedTests {
             }
         }
         let runDestination: RunDestinationInfo = .host
-        let architectures: [String] = switch runDestination {
-        case .macOS:
-            ["armv7", "x86_64"]
-        case .linux, .windows:
-            ["aarch64, x86_64"]
-        default:
-            [""]
-        }
+        let architectures: [String] =
+            switch runDestination {
+            case .macOS:
+                ["armv7", "x86_64"]
+            case .linux, .windows:
+                ["aarch64, x86_64"]
+            default:
+                [""]
+            }
 
         if architectures.count == 2 {
             // Test that analyzing multiple archs produces only one analyze rule.
@@ -99,7 +110,7 @@ fileprivate struct ClangStaticAnalyzerTests: CoreBasedTests {
                 "ONLY_ACTIVE_ARCH": "NO",
                 "RUN_CLANG_STATIC_ANALYZER": "YES",
                 "CLANG_STATIC_ANALYZER_MODE": "deep",
-                "VALID_ARCHS": architectures.joined(separator: " ")
+                "VALID_ARCHS": architectures.joined(separator: " "),
             ]
             await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: overrides), runDestination: .host) { results in
                 results.checkTarget("Lib") { target in
@@ -130,14 +141,24 @@ fileprivate struct ClangStaticAnalyzerTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             defaultConfigurationName: "Release",
-            groupTree: TestGroup("Foo", children: [
-                TestFile("foo.c"),
-            ]),
-            targets: [TestStandardTarget("Lib", type: .dynamicLibrary,
-                                         buildPhases: [
-                                            TestSourcesBuildPhase([
-                                                "foo.c",
-                                            ])])])
+            groupTree: TestGroup(
+                "Foo",
+                children: [
+                    TestFile("foo.c")
+                ]
+            ),
+            targets: [
+                TestStandardTarget(
+                    "Lib",
+                    type: .dynamicLibrary,
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            "foo.c"
+                        ])
+                    ]
+                )
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
 
         try await TaskConstructionTester(getCore(), testWorkspace).checkBuild(BuildParameters(configuration: "Debug", overrides: ["RUN_CLANG_STATIC_ANALYZER": "YES", "CLANG_ANALYZER_EXEC": "clang-custom"]), runDestination: .macOS) { results in
@@ -156,36 +177,50 @@ fileprivate struct ClangStaticAnalyzerTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             defaultConfigurationName: "Release",
-            groupTree: TestGroup("Foo", children: [
-                TestFile("foo.c"),
-            ]),
+            groupTree: TestGroup(
+                "Foo",
+                children: [
+                    TestFile("foo.c")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
-                TestStandardTarget("AnalyzedLib",
-                                   type: .dynamicLibrary,
-                                   buildPhases: [
-                                    TestSourcesBuildPhase([
-                                        "foo.c",
-                                    ])
-                                   ],
-                                   dependencies: ["UnanalyzedLib"]),
-                TestStandardTarget("UnanalyzedLib",
-                                   type: .dynamicLibrary,
-                                   buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: [
-                                        "SKIP_CLANG_STATIC_ANALYZER": "YES",
-                                    ])
-                                   ],
-                                   buildPhases: [
-                                    TestSourcesBuildPhase([
-                                        "foo.c",
-                                    ])
-                                   ])
-            ])
+                TestStandardTarget(
+                    "AnalyzedLib",
+                    type: .dynamicLibrary,
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            "foo.c"
+                        ])
+                    ],
+                    dependencies: ["UnanalyzedLib"]
+                ),
+                TestStandardTarget(
+                    "UnanalyzedLib",
+                    type: .dynamicLibrary,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_CLANG_STATIC_ANALYZER": "YES"
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            "foo.c"
+                        ])
+                    ]
+                ),
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
 
         try await TaskConstructionTester(getCore(), testWorkspace).checkBuild(BuildParameters(configuration: "Debug", overrides: ["RUN_CLANG_STATIC_ANALYZER": "YES"]), runDestination: .macOS) { results in
diff --git a/Tests/SWBTaskConstructionTests/ClangTests.swift b/Tests/SWBTaskConstructionTests/ClangTests.swift
index 1cc88430..0e2aeda6 100644
--- a/Tests/SWBTaskConstructionTests/ClangTests.swift
+++ b/Tests/SWBTaskConstructionTests/ClangTests.swift
@@ -37,7 +37,8 @@ fileprivate struct ClangTests: CoreBasedTests {
                     children: [
                         TestFile("ClassOne.cpp"),
                         TestFile("Info.plist"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -45,25 +46,26 @@ fileprivate struct ClangTests: CoreBasedTests {
                             "CODE_SIGN_IDENTITY": "-",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "CLANG_CXX_LIBRARY": cppLibrarySetting,
-                            "CLANG_USE_RESPONSE_FILE": "NO"
-                        ]),
+                            "CLANG_USE_RESPONSE_FILE": "NO",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "CommandLineToolTarget",
                         type: .commandLineTool,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "Info.plist"]),
+                            TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "Info.plist"])
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                "ClassOne.cpp",
-                            ]),
-                            TestFrameworksBuildPhase([
+                                "ClassOne.cpp"
                             ]),
+                            TestFrameworksBuildPhase([]),
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             return testProject
         }
         let core = try await getCore()
@@ -145,12 +147,13 @@ fileprivate struct ClangTests: CoreBasedTests {
     @Test(.skipHostOS(.windows, "clang-cache is not available on Windows"), .skipHostOS(.linux, "test is incompatible with linux fallback system toolchain mechanism"), .requireSDKs(.host))
     func clangCacheEnableLauncher() async throws {
         let runDestination: RunDestinationInfo = .host
-        let clangCachePath: String = switch runDestination {
-        case .macOS:
-            "Toolchains/XcodeDefault.xctoolchain/usr/bin/clang-cache"
-        default:
-            "usr/bin/clang-cache"
-        }
+        let clangCachePath: String =
+            switch runDestination {
+            case .macOS:
+                "Toolchains/XcodeDefault.xctoolchain/usr/bin/clang-cache"
+            default:
+                "usr/bin/clang-cache"
+            }
         let mockClangPath: String = "/mytoolchain/bin/clang"
 
         func getTestProject(_ extraSettings: [String: String] = [:]) -> TestProject {
@@ -159,30 +162,33 @@ fileprivate struct ClangTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("test.c"),
-                    ]),
+                        TestFile("test.c")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "CLANG_CACHE_ENABLE_LAUNCHER": "YES",
-                        ].addingContents(of: extraSettings)),
+                        ].addingContents(of: extraSettings)
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "ToolTarget",
                         type: .commandLineTool,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug"),
+                            TestBuildConfiguration("Debug")
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                "test.c",
-                            ]),
+                                "test.c"
+                            ])
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             return testProject
         }
         let core = try await getCore()
@@ -196,7 +202,7 @@ fileprivate struct ClangTests: CoreBasedTests {
                 super.init()
             }
 
-            override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+            override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
                 if commandLine.first == mockClangPath {
                     return .result(status: .exit(0), stdout: Data(), stderr: Data())
                 }
@@ -217,7 +223,7 @@ fileprivate struct ClangTests: CoreBasedTests {
             let fs = PseudoFS()
             try await fs.writeFileContents(Path(mockClangPath)) { $0 <<< "binary" }
             try await fs.writeFileContents(core.developerPath.path.join(clangCachePath)) { $0 <<< "binary" }
-            let tester = try TaskConstructionTester(core, getTestProject(["CC" : Path(mockClangPath).str]))
+            let tester = try TaskConstructionTester(core, getTestProject(["CC": Path(mockClangPath).str]))
 
             await tester.checkBuild(runDestination: .host, fs: fs, clientDelegate: ClientDelegate(mockClangPath)) { results in
                 results.checkError(.contains("'clang-cache' was not found next to compiler"))
@@ -226,7 +232,7 @@ fileprivate struct ClangTests: CoreBasedTests {
         do {
             let fs = PseudoFS()
             try await fs.writeFileContents(clangCompilerPath) { $0 <<< "binary" }
-            let tester = try TaskConstructionTester(core, getTestProject(["CLANG_CACHE_FALLBACK_IF_UNAVAILABLE" : "YES"]))
+            let tester = try TaskConstructionTester(core, getTestProject(["CLANG_CACHE_FALLBACK_IF_UNAVAILABLE": "YES"]))
 
             await tester.checkBuild(runDestination: .host, fs: fs) { results in
                 results.checkTarget("ToolTarget") { target -> Void in
@@ -242,10 +248,13 @@ fileprivate struct ClangTests: CoreBasedTests {
             let fs = PseudoFS()
             try await fs.writeFileContents(Path(mockClangPath)) { $0 <<< "binary" }
             try await fs.writeFileContents(core.developerPath.path.join(clangCachePath)) { $0 <<< "binary" }
-            let tester = try TaskConstructionTester(core, getTestProject([
-                "CC" : Path(mockClangPath).str,
-                "CLANG_CACHE_FALLBACK_IF_UNAVAILABLE" : "YES",
-            ]))
+            let tester = try TaskConstructionTester(
+                core,
+                getTestProject([
+                    "CC": Path(mockClangPath).str,
+                    "CLANG_CACHE_FALLBACK_IF_UNAVAILABLE": "YES",
+                ])
+            )
 
             await tester.checkBuild(runDestination: .host, fs: fs, clientDelegate: ClientDelegate(mockClangPath)) { results in
                 results.checkTarget("ToolTarget") { target -> Void in
@@ -291,8 +300,9 @@ fileprivate struct ClangTests: CoreBasedTests {
             groupTree: TestGroup(
                 "SomeFiles",
                 children: [
-                    TestFile("test.c"),
-                ]),
+                    TestFile("test.c")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -300,22 +310,24 @@ fileprivate struct ClangTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "LIBTOOL": libtoolPath.str,
-                    ])
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Library",
                     type: .staticLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "test.c",
-                        ]),
+                            "test.c"
+                        ])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(runDestination: .host) { results in
@@ -331,7 +343,6 @@ fileprivate struct ClangTests: CoreBasedTests {
         }
     }
 
-
     @Test(.requireSDKs(.host))
     func indexOptions() async throws {
         try await withTemporaryDirectory { tmpDir in
@@ -342,7 +353,8 @@ fileprivate struct ClangTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("File1.c")
-                    ]),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "Test",
@@ -357,13 +369,14 @@ fileprivate struct ClangTests: CoreBasedTests {
                                     "INDEX_STORE_ONLY_PROJECT_FILES": "YES",
                                     "CLANG_INDEX_STORE_IGNORE_MACROS": "YES",
                                 ]
-                            ),
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["File1.c"]),
+                            TestSourcesBuildPhase(["File1.c"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -399,7 +412,8 @@ fileprivate struct ClangTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("File1.c")
-                    ]),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "Test",
@@ -413,15 +427,16 @@ fileprivate struct ClangTests: CoreBasedTests {
                                     "INDEX_STORE_COMPRESS": "YES",
                                     "INDEX_STORE_ONLY_PROJECT_FILES": "YES",
                                     "CLANG_INDEX_STORE_IGNORE_MACROS": "YES",
-                                    "OTHER_CFLAGS": "-DCLANG_INDEX_STORE_ENABLE=$(CLANG_INDEX_STORE_ENABLE) -DCOMPILER_INDEX_STORE_ENABLE=$(COMPILER_INDEX_STORE_ENABLE)"
+                                    "OTHER_CFLAGS": "-DCLANG_INDEX_STORE_ENABLE=$(CLANG_INDEX_STORE_ENABLE) -DCOMPILER_INDEX_STORE_ENABLE=$(COMPILER_INDEX_STORE_ENABLE)",
                                 ]
-                            ),
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["File1.c"]),
+                            TestSourcesBuildPhase(["File1.c"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
diff --git a/Tests/SWBTaskConstructionTests/CodeCoverageTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/CodeCoverageTaskConstructionTests.swift
index cc858d60..7d254efc 100644
--- a/Tests/SWBTaskConstructionTests/CodeCoverageTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/CodeCoverageTaskConstructionTests.swift
@@ -23,33 +23,37 @@ fileprivate struct CodeCoverageTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("SourceFile.m"),
                     TestFile("SwiftFile.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug",
-                                       buildSettings: [
-                                        "GENERATE_INFOPLIST_FILE": "YES",
-                                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                                        "SWIFT_EXEC": swiftCompilerPath.str,
-                                        "SWIFT_VERSION": swiftVersion,
-                                        "CLANG_USE_RESPONSE_FILE": "NO",
-                                       ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "CLANG_USE_RESPONSE_FILE": "NO",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Target",
                     type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "SourceFile.m",
                             "SwiftFile.swift",
-                        ]),
+                        ])
                     ],
                     dependencies: [
                         TestTargetDependency("NoCoverageTarget")
@@ -59,18 +63,22 @@ fileprivate struct CodeCoverageTaskConstructionTests: CoreBasedTests {
                     "NoCoverageTarget",
                     type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ENABLE_CODE_COVERAGE" : "NO",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ENABLE_CODE_COVERAGE": "NO"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "SourceFile.m",
                             "SwiftFile.swift",
-                        ]),
+                        ])
                     ]
                 ),
-            ])
+            ]
+        )
         let tester = try TaskConstructionTester(try await getCore(), testProject)
 
         // Check that coverage flags are present when compiling and linking with CLANG_COVERAGE_MAPPING set
@@ -134,5 +142,5 @@ fileprivate struct CodeCoverageTaskConstructionTests: CoreBasedTests {
                 results.checkNoDiagnostics()
             }
         }
-        }
+    }
 }
diff --git a/Tests/SWBTaskConstructionTests/CodeSignTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/CodeSignTaskConstructionTests.swift
index 65bc5eb1..6836b824 100644
--- a/Tests/SWBTaskConstructionTests/CodeSignTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/CodeSignTaskConstructionTests.swift
@@ -32,15 +32,19 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("SourceFile.m"),
                     TestFile("Tool.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "CREATE_INFOPLIST_SECTION_IN_BINARY": "YES",
-                    "INFOPLIST_FILE": "Tool.plist",
-                    "INFOPLIST_PREPROCESS": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "CREATE_INFOPLIST_SECTION_IN_BINARY": "YES",
+                        "INFOPLIST_FILE": "Tool.plist",
+                        "INFOPLIST_PREPROCESS": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -48,8 +52,9 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                     type: .commandLineTool,
                     buildConfigurations: [TestBuildConfiguration("Release")],
                     buildPhases: [TestSourcesBuildPhase(["SourceFile.m"])]
-                ),
-            ])
+                )
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
@@ -77,7 +82,8 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                         TestFile("ExternalDeep.framework"),
                         TestFile("External.bundle"),
                         TestFile("ExternalDeep.bundle"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -86,7 +92,8 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                             "CODE_SIGN_IDENTITY": "-",
                             "GENERATE_INFOPLIST_FILE": "YES",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestAggregateTarget(
@@ -97,23 +104,31 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                         "ToolTarget",
                         type: .commandLineTool,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_PKGINFO_FILE": "YES",
-                                "SHALLOW_BUNDLE": "YES",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_PKGINFO_FILE": "YES",
+                                    "SHALLOW_BUNDLE": "YES",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                "SourceFile.m",
+                                "SourceFile.m"
                             ]),
-                            TestCopyFilesBuildPhase([
-                                TestBuildFile("AppCore.framework", codeSignOnCopy: true),
-                                TestBuildFile("AppCoreDeep.framework", codeSignOnCopy: true),
-                                TestBuildFile("External.framework", codeSignOnCopy: true),
-                                TestBuildFile("ExternalDeep.framework", codeSignOnCopy: true),
-                                TestBuildFile("External.bundle", codeSignOnCopy: true),
-                                TestBuildFile("ExternalDeep.bundle", codeSignOnCopy: true),
-                            ], destinationSubfolder: .frameworks, destinationSubpath: "Shallow", onlyForDeployment: false),
+                            TestCopyFilesBuildPhase(
+                                [
+                                    TestBuildFile("AppCore.framework", codeSignOnCopy: true),
+                                    TestBuildFile("AppCoreDeep.framework", codeSignOnCopy: true),
+                                    TestBuildFile("External.framework", codeSignOnCopy: true),
+                                    TestBuildFile("ExternalDeep.framework", codeSignOnCopy: true),
+                                    TestBuildFile("External.bundle", codeSignOnCopy: true),
+                                    TestBuildFile("ExternalDeep.bundle", codeSignOnCopy: true),
+                                ],
+                                destinationSubfolder: .frameworks,
+                                destinationSubpath: "Shallow",
+                                onlyForDeployment: false
+                            ),
                         ],
                         dependencies: ["AppCore", "AppCoreDeep"]
                     ),
@@ -121,23 +136,31 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                         "ToolTargetDeep",
                         type: .commandLineTool,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_PKGINFO_FILE": "YES",
-                                "SHALLOW_BUNDLE": "NO",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_PKGINFO_FILE": "YES",
+                                    "SHALLOW_BUNDLE": "NO",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                "SourceFile.m",
+                                "SourceFile.m"
                             ]),
-                            TestCopyFilesBuildPhase([
-                                TestBuildFile("AppCore.framework", codeSignOnCopy: true),
-                                TestBuildFile("AppCoreDeep.framework", codeSignOnCopy: true),
-                                TestBuildFile("External.framework", codeSignOnCopy: true),
-                                TestBuildFile("ExternalDeep.framework", codeSignOnCopy: true),
-                                TestBuildFile("External.bundle", codeSignOnCopy: true),
-                                TestBuildFile("ExternalDeep.bundle", codeSignOnCopy: true),
-                            ], destinationSubfolder: .frameworks, destinationSubpath: "Deep", onlyForDeployment: false),
+                            TestCopyFilesBuildPhase(
+                                [
+                                    TestBuildFile("AppCore.framework", codeSignOnCopy: true),
+                                    TestBuildFile("AppCoreDeep.framework", codeSignOnCopy: true),
+                                    TestBuildFile("External.framework", codeSignOnCopy: true),
+                                    TestBuildFile("ExternalDeep.framework", codeSignOnCopy: true),
+                                    TestBuildFile("External.bundle", codeSignOnCopy: true),
+                                    TestBuildFile("ExternalDeep.bundle", codeSignOnCopy: true),
+                                ],
+                                destinationSubfolder: .frameworks,
+                                destinationSubpath: "Deep",
+                                onlyForDeployment: false
+                            ),
                         ],
                         dependencies: ["AppCore", "AppCoreDeep"]
                     ),
@@ -145,26 +168,35 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                         "AppCore",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "SHALLOW_BUNDLE": "YES",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SHALLOW_BUNDLE": "YES"
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["SourceFile.m"]),
-                        ]),
+                            TestSourcesBuildPhase(["SourceFile.m"])
+                        ]
+                    ),
                     TestStandardTarget(
                         "AppCoreDeep",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "SHALLOW_BUNDLE": "NO",
-                                "FRAMEWORK_VERSION": "B",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SHALLOW_BUNDLE": "NO",
+                                    "FRAMEWORK_VERSION": "B",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["SourceFile.m"]),
-                        ])
-                ])
+                            TestSourcesBuildPhase(["SourceFile.m"])
+                        ]
+                    ),
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -198,7 +230,7 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                             .name("Copy \(SRCROOT)/build/Debug/Shallow/AppCore.framework"),
                             .path("\(SRCROOT)/build/Debug/Shallow/AppCore.framework/AppCore"),
                             .namePattern(.suffix("-phase0-compile-sources")),
-                            .namePattern(.suffix("-entry"))
+                            .namePattern(.suffix("-entry")),
                         ])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/Shallow/AppCore.framework"),
@@ -216,7 +248,7 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                             .name("Copy \(SRCROOT)/build/Debug/Shallow/AppCoreDeep.framework"),
                             .path("\(SRCROOT)/build/Debug/Shallow/AppCoreDeep.framework/Versions/B/AppCoreDeep"),
                             .namePattern(.suffix("-phase0-compile-sources")),
-                            .namePattern(.suffix("-entry"))
+                            .namePattern(.suffix("-entry")),
                         ])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/Shallow/AppCoreDeep.framework/Versions/B"),
@@ -234,7 +266,7 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                             .name("Copy \(SRCROOT)/build/Debug/Shallow/External.framework"),
                             .path("\(SRCROOT)/build/Debug/Shallow/External.framework/External"),
                             .namePattern(.suffix("-phase0-compile-sources")),
-                            .namePattern(.suffix("-entry"))
+                            .namePattern(.suffix("-entry")),
                         ])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/Shallow/External.framework"),
@@ -252,7 +284,7 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                             .name("Copy \(SRCROOT)/build/Debug/Shallow/ExternalDeep.framework"),
                             .path("\(SRCROOT)/build/Debug/Shallow/ExternalDeep.framework/Versions/C/ExternalDeep"),
                             .namePattern(.suffix("-phase0-compile-sources")),
-                            .namePattern(.suffix("-entry"))
+                            .namePattern(.suffix("-entry")),
                         ])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/Shallow/ExternalDeep.framework/Versions/C"),
@@ -270,7 +302,7 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                             .name("Copy \(SRCROOT)/build/Debug/Shallow/External.bundle"),
                             .path("\(SRCROOT)/build/Debug/Shallow/External.bundle/External"),
                             .namePattern(.suffix("-phase0-compile-sources")),
-                            .namePattern(.suffix("-entry"))
+                            .namePattern(.suffix("-entry")),
                         ])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/Shallow/External.bundle"),
@@ -288,7 +320,7 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                             .name("Copy \(SRCROOT)/build/Debug/Shallow/ExternalDeep.bundle"),
                             .path("\(SRCROOT)/build/Debug/Shallow/ExternalDeep.bundle/Contents/MacOS/ExternalDeep"),
                             .namePattern(.suffix("-phase0-compile-sources")),
-                            .namePattern(.suffix("-entry"))
+                            .namePattern(.suffix("-entry")),
                         ])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/Shallow/ExternalDeep.bundle"),
@@ -308,7 +340,7 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                             .name("Copy \(SRCROOT)/build/Debug/Deep/AppCore.framework"),
                             .path("\(SRCROOT)/build/Debug/Deep/AppCore.framework/AppCore"),
                             .namePattern(.suffix("-phase0-compile-sources")),
-                            .namePattern(.suffix("-entry"))
+                            .namePattern(.suffix("-entry")),
                         ])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/Deep/AppCore.framework"),
@@ -326,7 +358,7 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                             .name("Copy \(SRCROOT)/build/Debug/Deep/AppCoreDeep.framework"),
                             .path("\(SRCROOT)/build/Debug/Deep/AppCoreDeep.framework/Versions/B/AppCoreDeep"),
                             .namePattern(.suffix("-phase0-compile-sources")),
-                            .namePattern(.suffix("-entry"))
+                            .namePattern(.suffix("-entry")),
                         ])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/Deep/AppCoreDeep.framework/Versions/B"),
@@ -344,7 +376,7 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                             .name("Copy \(SRCROOT)/build/Debug/Deep/External.framework"),
                             .path("\(SRCROOT)/build/Debug/Deep/External.framework/External"),
                             .namePattern(.suffix("-phase0-compile-sources")),
-                            .namePattern(.suffix("-entry"))
+                            .namePattern(.suffix("-entry")),
                         ])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/Deep/External.framework"),
@@ -362,7 +394,7 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                             .name("Copy \(SRCROOT)/build/Debug/Deep/ExternalDeep.framework"),
                             .path("\(SRCROOT)/build/Debug/Deep/ExternalDeep.framework/Versions/C/ExternalDeep"),
                             .namePattern(.suffix("-phase0-compile-sources")),
-                            .namePattern(.suffix("-entry"))
+                            .namePattern(.suffix("-entry")),
                         ])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/Deep/ExternalDeep.framework/Versions/C"),
@@ -380,7 +412,7 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                             .name("Copy \(SRCROOT)/build/Debug/Deep/External.bundle"),
                             .path("\(SRCROOT)/build/Debug/Deep/External.bundle/External"),
                             .namePattern(.suffix("-phase0-compile-sources")),
-                            .namePattern(.suffix("-entry"))
+                            .namePattern(.suffix("-entry")),
                         ])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/Deep/External.bundle"),
@@ -398,7 +430,7 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                             .name("Copy \(SRCROOT)/build/Debug/Deep/ExternalDeep.bundle"),
                             .path("\(SRCROOT)/build/Debug/Deep/ExternalDeep.bundle/Contents/MacOS/ExternalDeep"),
                             .namePattern(.suffix("-phase0-compile-sources")),
-                            .namePattern(.suffix("-entry"))
+                            .namePattern(.suffix("-entry")),
                         ])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/Deep/ExternalDeep.bundle"),
@@ -411,30 +443,38 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
 
                 results.checkTarget("AppCore") { target in
                     // There should be the expected mkdir tasks for the framework.
-                    results.checkTasks(.matchTarget(target), .matchRuleType("MkDir"), body: { (tasks) -> Void in
-                        let sortedTasks = tasks.sorted { $0.ruleInfo.lexicographicallyPrecedes($1.ruleInfo) }
-                        #expect(sortedTasks.count == 1)
-                        sortedTasks[0].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCore.framework")])
-
-                        // Validate we also construct command lines.
-                        sortedTasks[0].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCore.framework"])
-                    })
+                    results.checkTasks(
+                        .matchTarget(target),
+                        .matchRuleType("MkDir"),
+                        body: { (tasks) -> Void in
+                            let sortedTasks = tasks.sorted { $0.ruleInfo.lexicographicallyPrecedes($1.ruleInfo) }
+                            #expect(sortedTasks.count == 1)
+                            sortedTasks[0].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCore.framework")])
+
+                            // Validate we also construct command lines.
+                            sortedTasks[0].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCore.framework"])
+                        }
+                    )
                 }
 
                 results.checkTarget("AppCoreDeep") { target in
                     // There should be the expected mkdir tasks for the framework.
-                    results.checkTasks(.matchTarget(target), .matchRuleType("MkDir"), body: { (tasks) -> Void in
-                        let sortedTasks = tasks.sorted { $0.ruleInfo.lexicographicallyPrecedes($1.ruleInfo) }
-                        #expect(sortedTasks.count == 4)
-                        sortedTasks[0].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCoreDeep.framework")])
-                        sortedTasks[1].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCoreDeep.framework/Versions")])
-                        sortedTasks[2].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCoreDeep.framework/Versions/B")])
-
-                        // Validate we also construct command lines.
-                        sortedTasks[0].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCoreDeep.framework"])
-                        sortedTasks[1].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCoreDeep.framework/Versions"])
-                        sortedTasks[2].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCoreDeep.framework/Versions/B"])
-                    })
+                    results.checkTasks(
+                        .matchTarget(target),
+                        .matchRuleType("MkDir"),
+                        body: { (tasks) -> Void in
+                            let sortedTasks = tasks.sorted { $0.ruleInfo.lexicographicallyPrecedes($1.ruleInfo) }
+                            #expect(sortedTasks.count == 4)
+                            sortedTasks[0].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCoreDeep.framework")])
+                            sortedTasks[1].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCoreDeep.framework/Versions")])
+                            sortedTasks[2].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCoreDeep.framework/Versions/B")])
+
+                            // Validate we also construct command lines.
+                            sortedTasks[0].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCoreDeep.framework"])
+                            sortedTasks[1].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCoreDeep.framework/Versions"])
+                            sortedTasks[2].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCoreDeep.framework/Versions/B"])
+                        }
+                    )
                 }
 
                 // Check there are no other targets.
@@ -470,19 +510,23 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                             // For Script Phase: Run Me (FileLists)
                             TestFile("in3.xcfilelist"),
                             TestFile("out3.xcfilelist"),
-                        ]),
-                    buildConfigurations: [TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "CODE_SIGN_IDENTITY": "-",
-                            "INFOPLIST_FILE": "Info.plist",
-
-                            "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING": "YES",
-                            "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING_FOR_SCRIPT_OUTPUTS": "YES",
-
-                            "OTHER_CODE_SIGN_FLAGS": "--entitlements /tmp/Test/aProject/build/aProject.build/custom-entitlements.plist",
-                        ])],
+                        ]
+                    ),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "CODE_SIGN_IDENTITY": "-",
+                                "INFOPLIST_FILE": "Info.plist",
+
+                                "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING": "YES",
+                                "ENABLE_ADDITIONAL_CODESIGN_INPUT_TRACKING_FOR_SCRIPT_OUTPUTS": "YES",
+
+                                "OTHER_CODE_SIGN_FLAGS": "--entitlements /tmp/Test/aProject/build/aProject.build/custom-entitlements.plist",
+                            ]
+                        )
+                    ],
                     targets: [
                         TestStandardTarget(
                             "Tool",
@@ -494,8 +538,12 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                                 TestShellScriptBuildPhase(name: "Run Me", shellPath: "/bin/bash", originalObjectID: "RunMe1", contents: "touch ${SCRIPT_OUTPUT_FILE_0}", inputs: ["$(SRCROOT)/input1.txt"], outputs: ["$(DERIVED_FILE_DIR)/out1"]),
                                 TestShellScriptBuildPhase(name: "Run Me (Outputs)", shellPath: "/bin/bash", originalObjectID: "RunMe2", contents: "touch ${SCRIPT_OUTPUT_FILE_0}", inputs: ["$(SRCROOT)/input2.txt"], outputs: ["$(TARGET_BUILD_DIR)/Tool.app/Contents/Resources/out2.txt"]),
                                 TestShellScriptBuildPhase(name: "Run Me (FileList)", shellPath: "/bin/bash", originalObjectID: "RunMe3", contents: "touch $TARGET_BUILD_DIR/Tool.app/Contents/Resources/out3.txt", inputs: [], inputFileLists: ["$(SRCROOT)/in3.xcfilelist"], outputs: [], outputFileLists: ["$(SRCROOT)/out3.xcfilelist"]),
-                            ]),
-                    ])])
+                            ]
+                        )
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -549,13 +597,17 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("SourceFile.m"),
                     TestFile("Tool.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -563,8 +615,9 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                     type: .framework,
                     buildConfigurations: [TestBuildConfiguration("Release", buildSettings: ["SDKROOT": "macosx"])],
                     buildPhases: [TestSourcesBuildPhase(["SourceFile.m"])]
-                ),
-            ])
+                )
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
@@ -627,10 +680,10 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
         }
 
         // Check that flags without a dedicated build setting are passed through as expected.
-        await tester.checkBuild(BuildParameters(action: .install, configuration: "Release", overrides: ["ENABLE_LIBRARY_VALIDATION": "YES", "ENABLE_HARDENED_RUNTIME": "YES", "CODE_SIGN_RESTRICT": "YES", "OTHER_CODE_SIGN_FLAGS": "--options kill,hard,host,expires,linker-signed"]), runDestination: .macOS) { results in // ignore-unacceptable-language; codesign tool option
+        await tester.checkBuild(BuildParameters(action: .install, configuration: "Release", overrides: ["ENABLE_LIBRARY_VALIDATION": "YES", "ENABLE_HARDENED_RUNTIME": "YES", "CODE_SIGN_RESTRICT": "YES", "OTHER_CODE_SIGN_FLAGS": "--options kill,hard,host,expires,linker-signed"]), runDestination: .macOS) { results in  // ignore-unacceptable-language; codesign tool option
             results.checkTarget("macOSFramework") { target in
                 results.checkTask(.matchTarget(target), .matchRuleType("CodeSign")) { task in
-                    task.checkCommandLineMatches(["/usr/bin/codesign", "--force", "--sign", "-", "--options", "expires,hard,host,kill,library,linker-signed,restrict,runtime", "--entitlements", .suffix("macOSFramework.framework.xcent"), "--generate-entitlement-der", "/tmp/aProject.dst/Library/Frameworks/macOSFramework.framework/Versions/A"]) // ignore-unacceptable-language; codesign tool option
+                    task.checkCommandLineMatches(["/usr/bin/codesign", "--force", "--sign", "-", "--options", "expires,hard,host,kill,library,linker-signed,restrict,runtime", "--entitlements", .suffix("macOSFramework.framework.xcent"), "--generate-entitlement-der", "/tmp/aProject.dst/Library/Frameworks/macOSFramework.framework/Versions/A"])  // ignore-unacceptable-language; codesign tool option
                 }
             }
 
@@ -638,10 +691,10 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
         }
 
         // Check that flags without a dedicated build setting are passed through as expected, in conjunction with DISABLE_FREEFORM_CODE_SIGN_OPTION_FLAGS removing disabled, known ones.
-        await tester.checkBuild(BuildParameters(action: .install, configuration: "Release", overrides: ["ENABLE_LIBRARY_VALIDATION": "NO", "ENABLE_HARDENED_RUNTIME": "NO", "CODE_SIGN_RESTRICT": "YES", "OTHER_CODE_SIGN_FLAGS": "--options kill,hard,host,expires,linker-signed"]), runDestination: .macOS) { results in // ignore-unacceptable-language; codesign tool option
+        await tester.checkBuild(BuildParameters(action: .install, configuration: "Release", overrides: ["ENABLE_LIBRARY_VALIDATION": "NO", "ENABLE_HARDENED_RUNTIME": "NO", "CODE_SIGN_RESTRICT": "YES", "OTHER_CODE_SIGN_FLAGS": "--options kill,hard,host,expires,linker-signed"]), runDestination: .macOS) { results in  // ignore-unacceptable-language; codesign tool option
             results.checkTarget("macOSFramework") { target in
                 results.checkTask(.matchTarget(target), .matchRuleType("CodeSign")) { task in
-                    task.checkCommandLineMatches(["/usr/bin/codesign", "--force", "--sign", "-", "--options", "expires,hard,host,kill,linker-signed,restrict", "--entitlements", .suffix("macOSFramework.framework.xcent"), "--generate-entitlement-der", "/tmp/aProject.dst/Library/Frameworks/macOSFramework.framework/Versions/A"]) // ignore-unacceptable-language; codesign tool option
+                    task.checkCommandLineMatches(["/usr/bin/codesign", "--force", "--sign", "-", "--options", "expires,hard,host,kill,linker-signed,restrict", "--entitlements", .suffix("macOSFramework.framework.xcent"), "--generate-entitlement-der", "/tmp/aProject.dst/Library/Frameworks/macOSFramework.framework/Versions/A"])  // ignore-unacceptable-language; codesign tool option
                 }
             }
 
@@ -660,33 +713,39 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("SourceFile.m"),
                     TestFile("Tool.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "Apple Development",
-                    "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "Apple Development",
+                        "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                               ]
-                                              ),
+                        TestBuildConfiguration(
+                            "Config",
+                            buildSettings: [
+                                "SDKROOT": "macosx"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "SourceFile.m",
-                        ]),
+                            "SourceFile.m"
+                        ])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
         let srcRoot = tester.workspace.projects[0].sourceRoot
@@ -708,11 +767,13 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
             func checkEntitlementsDictionary(action: BuildAction, overrides: [String: String] = [:], check: ([String: PropertyListItem]) throws -> Void, sourceLocation: SourceLocation = #_sourceLocation) async throws {
                 // These provisioning overrides replace the default ones that come from TaskConstructionTester.computeProvisioningInputs().
                 let appIdentifierPrefix = "F154D0C"
-                let provisioningOverrides = ProvisioningTaskInputs(signedEntitlements: .plDict([
-                    "application-identifier": .plString("\(appIdentifierPrefix).com.apple.dt.App"),
-                    "com.apple.developer.team-identifier": .plString(appIdentifierPrefix),
-                    "com.apple.security.get-task-allow": "YES",
-                ]))
+                let provisioningOverrides = ProvisioningTaskInputs(
+                    signedEntitlements: .plDict([
+                        "application-identifier": .plString("\(appIdentifierPrefix).com.apple.dt.App"),
+                        "com.apple.developer.team-identifier": .plString(appIdentifierPrefix),
+                        "com.apple.security.get-task-allow": "YES",
+                    ])
+                )
 
                 // Test that it does not get removed in a debug build.
                 try await tester.checkBuild(BuildParameters(action: action, configuration: "Config", overrides: overrides), runDestination: .macOS, provisioningOverrides: provisioningOverrides, fs: fs) { results in
@@ -752,7 +813,7 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
         }
     }
 
-    @Test(.requireSDKs(.macOS), .userDefaults(["AppSandboxConflictingValuesEmitsWarning":"1"]))
+    @Test(.requireSDKs(.macOS), .userDefaults(["AppSandboxConflictingValuesEmitsWarning": "1"]))
     func appSandboxEntitlementAndBuildSettingConflictEmitsExpectedDiagnostics() async throws {
         let testProject = TestProject(
             "aProject",
@@ -761,33 +822,39 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("SourceFile.m"),
                     TestFile("Tool.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "Apple Development",
-                    "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
-                    "GENERATE_INFOPLIST_FILE": "YES"
-                ]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "Apple Development",
+                        "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                               ]
-                                              ),
+                        TestBuildConfiguration(
+                            "Config",
+                            buildSettings: [
+                                "SDKROOT": "macosx"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "SourceFile.m",
-                        ]),
+                            "SourceFile.m"
+                        ])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
         let srcRoot = tester.workspace.projects[0].sourceRoot
@@ -799,9 +866,11 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
 
         func results(action: BuildAction, overrides: [String: String] = [:], appSandboxEntitlementValueOverride: Bool, resultsCompletion: (TaskConstructionTester.PlanningResults) -> Void, sourceLocation: SourceLocation = #_sourceLocation) async throws {
 
-            let provisioningOverrides = ProvisioningTaskInputs(signedEntitlements: .plDict([
-                "com.apple.security.app-sandbox": .plBool(appSandboxEntitlementValueOverride),
-            ]))
+            let provisioningOverrides = ProvisioningTaskInputs(
+                signedEntitlements: .plDict([
+                    "com.apple.security.app-sandbox": .plBool(appSandboxEntitlementValueOverride)
+                ])
+            )
 
             await tester.checkBuild(BuildParameters(action: action, configuration: "Config", overrides: overrides), runDestination: .macOS, provisioningOverrides: provisioningOverrides, fs: fs) { results in
                 results.checkTarget("App") { target in
@@ -812,17 +881,17 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
         }
 
         // When build setting and entitlement values agree, then there should be no diagnostics
-        try await results(action: .build, overrides: ["ENABLE_APP_SANDBOX":"YES"], appSandboxEntitlementValueOverride: true) { results in
+        try await results(action: .build, overrides: ["ENABLE_APP_SANDBOX": "YES"], appSandboxEntitlementValueOverride: true) { results in
             results.checkNoDiagnostics()
         }
 
         // When build setting and entitlement values agree, then there should be no diagnostics
-        try await results(action: .build, overrides: ["ENABLE_APP_SANDBOX":"NO"], appSandboxEntitlementValueOverride: false) { results in
+        try await results(action: .build, overrides: ["ENABLE_APP_SANDBOX": "NO"], appSandboxEntitlementValueOverride: false) { results in
             results.checkNoDiagnostics()
         }
 
         // When build setting and entitlement values disagree, we expect diagnostics
-        try await results(action: .build, overrides: ["ENABLE_APP_SANDBOX":"YES"], appSandboxEntitlementValueOverride: false) { results in
+        try await results(action: .build, overrides: ["ENABLE_APP_SANDBOX": "YES"], appSandboxEntitlementValueOverride: false) { results in
             results.checkWarning(
                 .equal(
                     "The \'ENABLE_APP_SANDBOX\' build setting is set to \'YES\', but entitlement \'com.apple.security.app-sandbox\' is set to \'NO\' in your entitlements file.\n/tmp/aWorkspace/aProject/Entitlements.plist: To enable \'ENABLE_APP_SANDBOX\', remove the entitlement from your entitlements file.\nTo disable \'ENABLE_APP_SANDBOX\', remove the entitlement from your entitlements file and disable \'ENABLE_APP_SANDBOX\' in  build settings. (in target \'App\' from project \'aProject\')"
@@ -831,7 +900,7 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
         }
 
         // When build setting and entitlement values disagree, we expect diagnostics
-        try await results(action: .build, overrides: ["ENABLE_APP_SANDBOX":"NO"], appSandboxEntitlementValueOverride: true) { results in
+        try await results(action: .build, overrides: ["ENABLE_APP_SANDBOX": "NO"], appSandboxEntitlementValueOverride: true) { results in
             results.checkNoDiagnostics()
         }
     }
@@ -845,22 +914,33 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("SourceFile.m"),
                     TestFile("Tool.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "Apple Development",
-                    "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "Apple Development",
+                        "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestAggregateTarget("All", dependencies: ["App", "macOSFramework", "watchOSFramework"]),
                 TestStandardTarget(
                     "App",
                     type: .application,
-                    buildConfigurations: [TestBuildConfiguration("Release", buildSettings: ["SDKROOT": "iphoneos",
-                                                                                            "SUPPORTS_MACCATALYST": "YES"])],
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "SDKROOT": "iphoneos",
+                                "SUPPORTS_MACCATALYST": "YES",
+                            ]
+                        )
+                    ],
                     buildPhases: [TestSourcesBuildPhase(["SourceFile.m"])]
                 ),
                 TestStandardTarget(
@@ -875,7 +955,8 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                     buildConfigurations: [TestBuildConfiguration("Release", buildSettings: ["SDKROOT": "watchos"])],
                     buildPhases: [TestSourcesBuildPhase(["SourceFile.m"])]
                 ),
-            ])
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
         let srcRoot = tester.workspace.projects[0].sourceRoot
@@ -994,15 +1075,19 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                     TestFile("SelfLaunchConstraint.plist"),
                     TestFile("ParentLaunchConstraint.plist"),
                     TestFile("ResponsibleLaunchConstraint.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "CREATE_INFOPLIST_SECTION_IN_BINARY": "YES",
-                    "INFOPLIST_FILE": "Tool.plist",
-                    "INFOPLIST_PREPROCESS": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "CREATE_INFOPLIST_SECTION_IN_BINARY": "YES",
+                        "INFOPLIST_FILE": "Tool.plist",
+                        "INFOPLIST_PREPROCESS": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -1010,8 +1095,9 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                     type: .commandLineTool,
                     buildConfigurations: [TestBuildConfiguration("Release")],
                     buildPhases: [TestSourcesBuildPhase(["SourceFile.m"])]
-                ),
-            ])
+                )
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
@@ -1033,7 +1119,6 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
             }
         }
 
-
         // Check --launch-constraint-responsible is passed when the build setting is configured
         await tester.checkBuild(BuildParameters(action: .install, configuration: "Release", overrides: ["LAUNCH_CONSTRAINT_RESPONSIBLE": "/tmp/ResponsibleLaunchConstraint.plist"]), runDestination: .macOS) { results in
             results.checkTarget("Tool") { target in
@@ -1066,15 +1151,19 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                     TestFile("SelfLaunchConstraint.plist"),
                     TestFile("ParentLaunchConstraint.plist"),
                     TestFile("ResponsibleLaunchConstraint.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "CREATE_INFOPLIST_SECTION_IN_BINARY": "YES",
-                    "INFOPLIST_FILE": "Tool.plist",
-                    "INFOPLIST_PREPROCESS": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "CREATE_INFOPLIST_SECTION_IN_BINARY": "YES",
+                        "INFOPLIST_FILE": "Tool.plist",
+                        "INFOPLIST_PREPROCESS": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -1082,8 +1171,9 @@ fileprivate struct CodeSignTaskConstructionTests: CoreBasedTests {
                     type: .commandLineTool,
                     buildConfigurations: [TestBuildConfiguration("Release")],
                     buildPhases: [TestSourcesBuildPhase(["SourceFile.m"])]
-                ),
-            ])
+                )
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
diff --git a/Tests/SWBTaskConstructionTests/CompilationCachingTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/CompilationCachingTaskConstructionTests.swift
index 863cd6ea..6017ef2c 100644
--- a/Tests/SWBTaskConstructionTests/CompilationCachingTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/CompilationCachingTaskConstructionTests.swift
@@ -26,20 +26,24 @@ fileprivate struct CompilationCachingTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("SourceFile.m"),
                     TestFile("Another.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CC": clangCompilerPath.str,
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "CLANG_ENABLE_MODULES": "YES",
-                    "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                    "CLANG_ENABLE_COMPILE_CACHE": "YES",
-                    "SWIFT_ENABLE_COMPILE_CACHE": "YES",
-                    "COMPILATION_CACHE_ENABLE_PLUGIN": "YES",
-                    "COMPILATION_CACHE_REMOTE_SERVICE_PATH": "/tmp/cc",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CC": clangCompilerPath.str,
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "CLANG_ENABLE_MODULES": "YES",
+                        "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
+                        "CLANG_ENABLE_COMPILE_CACHE": "YES",
+                        "SWIFT_ENABLE_COMPILE_CACHE": "YES",
+                        "COMPILATION_CACHE_ENABLE_PLUGIN": "YES",
+                        "COMPILATION_CACHE_REMOTE_SERVICE_PATH": "/tmp/cc",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -57,9 +61,12 @@ fileprivate struct CompilationCachingTaskConstructionTests: CoreBasedTests {
                     "ToolRemoteObjC",
                     type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "COMPILATION_CACHE_REMOTE_SUPPORTED_LANGUAGES": "objective-c",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "COMPILATION_CACHE_REMOTE_SUPPORTED_LANGUAGES": "objective-c"
+                            ]
+                        )
                     ],
                     buildPhases: [TestSourcesBuildPhase(["SourceFile.m", "Another.swift"])]
                 ),
@@ -67,9 +74,12 @@ fileprivate struct CompilationCachingTaskConstructionTests: CoreBasedTests {
                     "ToolRemoteSwift",
                     type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "COMPILATION_CACHE_REMOTE_SUPPORTED_LANGUAGES": "swift",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "COMPILATION_CACHE_REMOTE_SUPPORTED_LANGUAGES": "swift"
+                            ]
+                        )
                     ],
                     buildPhases: [TestSourcesBuildPhase(["SourceFile.m", "Another.swift"])]
                 ),
@@ -77,13 +87,17 @@ fileprivate struct CompilationCachingTaskConstructionTests: CoreBasedTests {
                     "ToolRemoteBoth",
                     type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "COMPILATION_CACHE_REMOTE_SUPPORTED_LANGUAGES": "swift objective-c",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "COMPILATION_CACHE_REMOTE_SUPPORTED_LANGUAGES": "swift objective-c"
+                            ]
+                        )
                     ],
                     buildPhases: [TestSourcesBuildPhase(["SourceFile.m", "Another.swift"])]
                 ),
-            ])
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
diff --git a/Tests/SWBTaskConstructionTests/CustomTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/CustomTaskConstructionTests.swift
index 7dfea111..31006e78 100644
--- a/Tests/SWBTaskConstructionTests/CustomTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/CustomTaskConstructionTests.swift
@@ -22,11 +22,13 @@ fileprivate struct CustomTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("input.txt"),
                     TestFile("main.c"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -34,11 +36,13 @@ fileprivate struct CustomTaskConstructionTests: CoreBasedTests {
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "SDKROOT": "auto",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["main.c"])
                     ],
@@ -51,10 +55,12 @@ fileprivate struct CustomTaskConstructionTests: CoreBasedTests {
                             inputs: ["$(SRCROOT)/Sources/input.txt"],
                             outputs: [Path.root.join("output").str],
                             enableSandboxing: false,
-                            preparesForIndexing: false)
+                            preparesForIndexing: false
+                        )
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(runDestination: .host) { results in
             results.checkNoDiagnostics()
@@ -75,11 +81,13 @@ fileprivate struct CustomTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("input.txt"),
                     TestFile("input2.txt"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -87,11 +95,13 @@ fileprivate struct CustomTaskConstructionTests: CoreBasedTests {
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "SDKROOT": "auto",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [],
                     customTasks: [
                         TestCustomTask(
@@ -102,7 +112,8 @@ fileprivate struct CustomTaskConstructionTests: CoreBasedTests {
                             inputs: ["$(SRCROOT)/Sources/input.txt"],
                             outputs: ["/output"],
                             enableSandboxing: false,
-                            preparesForIndexing: false),
+                            preparesForIndexing: false
+                        ),
                         TestCustomTask(
                             commandLine: ["tool2", "-bar", "-foo"],
                             environment: ["ENVVAR": "VALUE"],
@@ -111,10 +122,12 @@ fileprivate struct CustomTaskConstructionTests: CoreBasedTests {
                             inputs: ["$(SRCROOT)/Sources/input2.txt"],
                             outputs: ["/output2"],
                             enableSandboxing: false,
-                            preparesForIndexing: false)
+                            preparesForIndexing: false
+                        ),
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(runDestination: .host) { results in
             results.checkNoDiagnostics()
@@ -136,10 +149,12 @@ fileprivate struct CustomTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("input.txt"),
-                ]),
+                    TestFile("input.txt")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -147,11 +162,13 @@ fileprivate struct CustomTaskConstructionTests: CoreBasedTests {
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "SDKROOT": "auto",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [],
                     customTasks: [
                         TestCustomTask(
@@ -162,10 +179,12 @@ fileprivate struct CustomTaskConstructionTests: CoreBasedTests {
                             inputs: ["$(SRCROOT)/Sources/input.txt"],
                             outputs: [],
                             enableSandboxing: false,
-                            preparesForIndexing: false),
+                            preparesForIndexing: false
+                        )
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(runDestination: .host) { results in
             results.checkNoDiagnostics()
@@ -185,11 +204,13 @@ fileprivate struct CustomTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("input.txt"),
                     TestFile("main.c"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -198,11 +219,13 @@ fileprivate struct CustomTaskConstructionTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "SDKROOT": "auto",
                         "MY_SETTING": "FOO",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["main.c"])
                     ],
@@ -215,10 +238,12 @@ fileprivate struct CustomTaskConstructionTests: CoreBasedTests {
                             inputs: ["$(SRCROOT)/Sources/input.txt"],
                             outputs: [Path.root.join("output").str],
                             enableSandboxing: false,
-                            preparesForIndexing: false)
+                            preparesForIndexing: false
+                        )
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(runDestination: .host) { results in
             results.checkNoDiagnostics()
@@ -234,12 +259,14 @@ fileprivate struct CustomTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("input.txt"),
                     TestFile("input2.txt"),
                     TestFile("main.c"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -247,11 +274,13 @@ fileprivate struct CustomTaskConstructionTests: CoreBasedTests {
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "SDKROOT": "auto",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["main.c"])
                     ],
@@ -264,7 +293,8 @@ fileprivate struct CustomTaskConstructionTests: CoreBasedTests {
                             inputs: ["$(SRCROOT)/Sources/input.txt"],
                             outputs: [Path.root.join("output").str],
                             enableSandboxing: false,
-                            preparesForIndexing: false),
+                            preparesForIndexing: false
+                        ),
                         TestCustomTask(
                             commandLine: ["tool", "-foo", "-bar"],
                             environment: ["ENVVAR": "VALUE"],
@@ -273,10 +303,12 @@ fileprivate struct CustomTaskConstructionTests: CoreBasedTests {
                             inputs: ["$(SRCROOT)/Sources/input2.txt"],
                             outputs: [Path.root.join("output2").str],
                             enableSandboxing: false,
-                            preparesForIndexing: false)
+                            preparesForIndexing: false
+                        ),
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(runDestination: .host) { results in
             // Ensure we don't incorrectly diagnose duplicate custom tasks
diff --git a/Tests/SWBTaskConstructionTests/DebugInformationTests.swift b/Tests/SWBTaskConstructionTests/DebugInformationTests.swift
index 802efa2c..8b2287ba 100644
--- a/Tests/SWBTaskConstructionTests/DebugInformationTests.swift
+++ b/Tests/SWBTaskConstructionTests/DebugInformationTests.swift
@@ -27,11 +27,13 @@ fileprivate struct DebugInformationTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("CFile.c"),
                     TestFile("SwiftFile.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Config",
@@ -41,18 +43,22 @@ fileprivate struct DebugInformationTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "CFile.c",
                             "SwiftFile.swift",
-                        ]),
-                    ]),
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Test the default version.
@@ -76,7 +82,7 @@ fileprivate struct DebugInformationTests: CoreBasedTests {
         }
 
         // Test explicitly setting to DWARF 4.
-        await tester.checkBuild(BuildParameters(configuration: "Config", overrides: ["DEBUG_INFORMATION_VERSION" : "dwarf4"]), runDestination: .host) { results in
+        await tester.checkBuild(BuildParameters(configuration: "Config", overrides: ["DEBUG_INFORMATION_VERSION": "dwarf4"]), runDestination: .host) { results in
             // Check clang.
             results.checkTask(.matchRuleType("CompileC")) { task in
                 task.checkCommandLineContains(["-g", "-gdwarf-4"])
@@ -94,7 +100,7 @@ fileprivate struct DebugInformationTests: CoreBasedTests {
         }
 
         // Test explicitly setting to DWARF 5.
-        await tester.checkBuild(BuildParameters(configuration: "Config", overrides: ["DEBUG_INFORMATION_VERSION" : "dwarf5"]), runDestination: .host) { results in
+        await tester.checkBuild(BuildParameters(configuration: "Config", overrides: ["DEBUG_INFORMATION_VERSION": "dwarf5"]), runDestination: .host) { results in
             // Check clang.
             results.checkTask(.matchRuleType("CompileC")) { task in
                 task.checkCommandLineContains(["-g", "-gdwarf-5"])
@@ -112,7 +118,7 @@ fileprivate struct DebugInformationTests: CoreBasedTests {
         }
 
         // Test disabling debug information.
-        await tester.checkBuild(BuildParameters(configuration: "Config", overrides: ["DEBUG_INFORMATION_FORMAT" : "", "DEBUG_INFORMATION_VERSION" : "dwarf5"]), runDestination: .host) { results in
+        await tester.checkBuild(BuildParameters(configuration: "Config", overrides: ["DEBUG_INFORMATION_FORMAT": "", "DEBUG_INFORMATION_VERSION": "dwarf5"]), runDestination: .host) { results in
             // Check clang.
             results.checkTask(.matchRuleType("CompileC")) { task in
                 task.checkCommandLineDoesNotContain("-g")
@@ -138,24 +144,31 @@ fileprivate struct DebugInformationTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("main.c"),
-                ]),
+                    TestFile("main.c")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.c"])]),
-            ])
+                        TestSourcesBuildPhase(["main.c"])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Check behavior with dSYMs disabled.
@@ -184,10 +197,17 @@ fileprivate struct DebugInformationTests: CoreBasedTests {
 
         // Check install behavior with dSYMs enabled.
         let buildVariants = ["debug", "normal"]
-        try await tester.checkBuild(BuildParameters(action: .install, configuration: "Debug", overrides: [
-            "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
-            "BUILD_VARIANTS": buildVariants.joined(separator: " "),
-        ]), runDestination: .host) { results in
+        try await tester.checkBuild(
+            BuildParameters(
+                action: .install,
+                configuration: "Debug",
+                overrides: [
+                    "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
+                    "BUILD_VARIANTS": buildVariants.joined(separator: " "),
+                ]
+            ),
+            runDestination: .host
+        ) { results in
             // Check tasks for each build variant.
             for buildVariant in buildVariants {
                 if try ProcessInfo.processInfo.hostOperatingSystem() == .macOS {
@@ -216,11 +236,18 @@ fileprivate struct DebugInformationTests: CoreBasedTests {
         }
 
         // Check install behavior with `DWARF_DSYM_FILE_SHOULD_ACCOMPANY_PRODUCT` enabled.
-        try await tester.checkBuild(BuildParameters(action: .install, configuration: "Debug", overrides: [
-            "DWARF_DSYM_FILE_SHOULD_ACCOMPANY_PRODUCT": "YES",
-            "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
-            "BUILD_VARIANTS": buildVariants.joined(separator: " "),
-        ]), runDestination: .host) { results in
+        try await tester.checkBuild(
+            BuildParameters(
+                action: .install,
+                configuration: "Debug",
+                overrides: [
+                    "DWARF_DSYM_FILE_SHOULD_ACCOMPANY_PRODUCT": "YES",
+                    "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
+                    "BUILD_VARIANTS": buildVariants.joined(separator: " "),
+                ]
+            ),
+            runDestination: .host
+        ) { results in
             if try ProcessInfo.processInfo.hostOperatingSystem() == .macOS {
                 var dsymutilTasks = [any PlannedTask]()
                 results.checkTask(.matchRuleType("GenerateDSYMFile"), .matchRuleItemBasename("CoreFoo")) { task in
@@ -250,11 +277,18 @@ fileprivate struct DebugInformationTests: CoreBasedTests {
         }
 
         // Check build behavior with `DWARF_DSYM_FILE_SHOULD_ACCOMPANY_PRODUCT` enabled.
-        try await tester.checkBuild(BuildParameters(action: .build, configuration: "Debug", overrides: [
-            "DWARF_DSYM_FILE_SHOULD_ACCOMPANY_PRODUCT": "YES",
-            "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
-            "BUILD_VARIANTS": buildVariants.joined(separator: " "),
-        ]), runDestination: .host) { results in
+        try await tester.checkBuild(
+            BuildParameters(
+                action: .build,
+                configuration: "Debug",
+                overrides: [
+                    "DWARF_DSYM_FILE_SHOULD_ACCOMPANY_PRODUCT": "YES",
+                    "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
+                    "BUILD_VARIANTS": buildVariants.joined(separator: " "),
+                ]
+            ),
+            runDestination: .host
+        ) { results in
             if try ProcessInfo.processInfo.hostOperatingSystem() == .macOS {
                 results.checkTask(.matchRuleType("GenerateDSYMFile"), .matchRuleItemBasename("CoreFoo")) { task in
                     task.checkRuleInfo(["GenerateDSYMFile", "/tmp/Test/aProject/build/Debug/CoreFoo.framework.dSYM", "/tmp/Test/aProject/build/Debug/CoreFoo.framework/Versions/A/CoreFoo"])
@@ -279,10 +313,12 @@ fileprivate struct DebugInformationTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("main.c"),
-                ]),
+                    TestFile("main.c")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -290,21 +326,29 @@ fileprivate struct DebugInformationTests: CoreBasedTests {
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "ALWAYS_SEARCH_USER_PATHS": "NO",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.c"])]),
+                        TestSourcesBuildPhase(["main.c"])
+                    ]
+                ),
                 TestStandardTarget(
-                    "OtherTarget", type: .framework,
+                    "OtherTarget",
+                    type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [ "PRODUCT_NAME": "CoreFoo", "TARGET_BUILD_DIR": "/tmp/Test/aProject/build/Debug/Other" ]),
+                        TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "CoreFoo", "TARGET_BUILD_DIR": "/tmp/Test/aProject/build/Debug/Other"])
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.c"])]),
-            ])
+                        TestSourcesBuildPhase(["main.c"])
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         let buildParameters = BuildParameters(configuration: "Debug", overrides: ["DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym"])
@@ -334,10 +378,12 @@ fileprivate struct DebugInformationTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("main.c"),
-                ]),
+                    TestFile("main.c")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -346,14 +392,19 @@ fileprivate struct DebugInformationTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "ALWAYS_SEARCH_USER_PATHS": "NO",
                         "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.c"])]),
-            ])
+                        TestSourcesBuildPhase(["main.c"])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         let buildParameters = BuildParameters(configuration: "Debug")
diff --git a/Tests/SWBTaskConstructionTests/DependencyScopingTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/DependencyScopingTaskConstructionTests.swift
index 0503247e..33f1de73 100644
--- a/Tests/SWBTaskConstructionTests/DependencyScopingTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/DependencyScopingTaskConstructionTests.swift
@@ -31,36 +31,47 @@ fileprivate struct DependencyScopingTaskConstructionTests: CoreBasedTests {
                             TestFile("file.c"),
                             TestFile("file2.c"),
                             TestFile("file3.c"),
-                        ]),
-                    buildConfigurations: [TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "CODE_SIGNING_ALLOWED": "NO",
-                        ])],
+                        ]
+                    ),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "CODE_SIGNING_ALLOWED": "NO",
+                            ]
+                        )
+                    ],
                     targets: [
                         TestStandardTarget(
                             "StaticLibrary",
                             type: .staticLibrary,
                             buildConfigurations: [TestBuildConfiguration("Debug")],
                             buildPhases: [
-                                TestSourcesBuildPhase(["file.c"]),
-                            ], dependencies: ["StaticLibrary2", "StaticLibrary3"]),
+                                TestSourcesBuildPhase(["file.c"])
+                            ],
+                            dependencies: ["StaticLibrary2", "StaticLibrary3"]
+                        ),
                         TestStandardTarget(
                             "StaticLibrary2",
                             type: .staticLibrary,
                             buildConfigurations: [TestBuildConfiguration("Debug")],
                             buildPhases: [
-                                TestSourcesBuildPhase(["file3.c"]),
-                            ]),
+                                TestSourcesBuildPhase(["file3.c"])
+                            ]
+                        ),
                         TestStandardTarget(
                             "StaticLibrary3",
                             type: .staticLibrary,
                             buildConfigurations: [TestBuildConfiguration("Debug")],
                             buildPhases: [
-                                TestSourcesBuildPhase(["file2.c"]),
-                            ]),
-                    ])])
+                                TestSourcesBuildPhase(["file2.c"])
+                            ]
+                        ),
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
         let params = BuildParameters(configuration: "Debug")
@@ -111,36 +122,48 @@ fileprivate struct DependencyScopingTaskConstructionTests: CoreBasedTests {
                             TestFile("file.c"),
                             TestFile("file2.c"),
                             TestFile("file3.c"),
-                        ]),
-                    buildConfigurations: [TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "CODE_SIGNING_ALLOWED": "NO",
-                        ])],
+                        ]
+                    ),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "CODE_SIGNING_ALLOWED": "NO",
+                            ]
+                        )
+                    ],
                     targets: [
                         TestStandardTarget(
                             "StaticLibrary",
                             type: .staticLibrary,
                             buildConfigurations: [TestBuildConfiguration("Debug")],
                             buildPhases: [
-                                TestSourcesBuildPhase(["file.c"]),
-                            ], dependencies: ["Framework2"]),
+                                TestSourcesBuildPhase(["file.c"])
+                            ],
+                            dependencies: ["Framework2"]
+                        ),
                         TestStandardTarget(
                             "StaticLibrary2",
                             type: .staticLibrary,
                             buildConfigurations: [TestBuildConfiguration("Debug")],
                             buildPhases: [
-                                TestSourcesBuildPhase(["file3.c"]),
-                            ], dependencies: ["StaticLibrary3"]),
+                                TestSourcesBuildPhase(["file3.c"])
+                            ],
+                            dependencies: ["StaticLibrary3"]
+                        ),
                         TestStandardTarget(
                             "StaticLibrary3",
                             type: .staticLibrary,
                             buildConfigurations: [TestBuildConfiguration("Debug")],
                             buildPhases: [
-                                TestSourcesBuildPhase(["file2.c"]),
-                            ]),
-                    ])])
+                                TestSourcesBuildPhase(["file2.c"])
+                            ]
+                        ),
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
         let params = BuildParameters(configuration: "Debug")
diff --git a/Tests/SWBTaskConstructionTests/DependencyVerificationTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/DependencyVerificationTaskConstructionTests.swift
index f4efda72..cfaad0cb 100644
--- a/Tests/SWBTaskConstructionTests/DependencyVerificationTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/DependencyVerificationTaskConstructionTests.swift
@@ -33,7 +33,7 @@ fileprivate struct DependencyVerificationTaskConstructionTests: CoreBasedTests {
     func addsTraceArgsWhenValidationEnabled(depKind: String) async throws {
         try await testWith([
             "\(depKind)_DEPENDENCIES": "Foo",
-            "VALIDATE_\(depKind)_DEPENDENCIES": "YES_ERROR"
+            "VALIDATE_\(depKind)_DEPENDENCIES": "YES_ERROR",
         ]) { tester, srcroot in
             await tester.checkBuild(runDestination: .macOS, fs: localFS) { results in
                 results.checkTask(.compileC(target, fileName: source)) { task in
@@ -69,7 +69,8 @@ fileprivate struct DependencyVerificationTaskConstructionTests: CoreBasedTests {
                 "TestGroup",
                 children: [
                     TestFile(source)
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -88,7 +89,8 @@ fileprivate struct DependencyVerificationTaskConstructionTests: CoreBasedTests {
                         TestSourcesBuildPhase([TestBuildFile(source)])
                     ]
                 )
-            ])
+            ]
+        )
 
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
diff --git a/Tests/SWBTaskConstructionTests/DocumentationTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/DocumentationTaskConstructionTests.swift
index cbd38481..d824c214 100644
--- a/Tests/SWBTaskConstructionTests/DocumentationTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/DocumentationTaskConstructionTests.swift
@@ -31,9 +31,9 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
     }
 
     private static let sourceLanguageConfigurationsToTest: [SourceLanguageConfiguration] = [
-        .init(withSwift: true,  withObjectiveCLevel: nil),
+        .init(withSwift: true, withObjectiveCLevel: nil),
         .init(withSwift: false, withObjectiveCLevel: .public),
-        .init(withSwift: true,  withObjectiveCLevel: .public),
+        .init(withSwift: true, withObjectiveCLevel: .public),
     ]
 
     @Test(.requireSDKs(.macOS))
@@ -73,16 +73,20 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS))
     func buildActionsWithoutBuildComponentDoesNotBuildDocumentationWhenBuildSettingIsSet() async throws {
         try await ObjectiveCSymbolExtractorImplementationSelector.runWithAllImplementations {
-            let buildActionsWithoutBuildComponents = BuildAction.allCases.filter{ !$0.buildComponents.contains("build") }
+            let buildActionsWithoutBuildComponents = BuildAction.allCases.filter { !$0.buildComponents.contains("build") }
 
             #expect(!buildActionsWithoutBuildComponents.isEmpty, "This test should check at least one build action")
 
             let sourceLanguages = SourceLanguageConfiguration(withSwift: true, withObjectiveCLevel: .public)
             for buildAction in buildActionsWithoutBuildComponents {
-                let (tester, fs, _) = try await setUpTesterForTestProject(withDocsCatalog: true, sourceLanguages: sourceLanguages, extraBuildSettings: [
-                    "RUN_DOCUMENTATION_COMPILER": "YES",
-                    "SUPPORTS_TEXT_BASED_API": "YES" // This is needed to avoid some diagnostics
-                ])
+                let (tester, fs, _) = try await setUpTesterForTestProject(
+                    withDocsCatalog: true,
+                    sourceLanguages: sourceLanguages,
+                    extraBuildSettings: [
+                        "RUN_DOCUMENTATION_COMPILER": "YES",
+                        "SUPPORTS_TEXT_BASED_API": "YES",  // This is needed to avoid some diagnostics
+                    ]
+                )
 
                 // Check the debug build.
                 await tester.checkBuild(BuildParameters(action: buildAction, configuration: "Debug"), runDestination: .anyMac, fs: fs) { results in
@@ -102,10 +106,14 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
         try await ObjectiveCSymbolExtractorImplementationSelector.runWithAllImplementations {
 
             let sourceLanguages = SourceLanguageConfiguration(withSwift: true, withObjectiveCLevel: .public)
-            let (tester, fs, _) = try await setUpTesterForTestProject(withDocsCatalog: true, sourceLanguages: sourceLanguages, extraBuildSettings: [
-                "SKIP_BUILDING_DOCUMENTATION": "YES",
-                "SUPPORTS_TEXT_BASED_API": "YES" // This is needed to avoid some diagnostics
-            ])
+            let (tester, fs, _) = try await setUpTesterForTestProject(
+                withDocsCatalog: true,
+                sourceLanguages: sourceLanguages,
+                extraBuildSettings: [
+                    "SKIP_BUILDING_DOCUMENTATION": "YES",
+                    "SUPPORTS_TEXT_BASED_API": "YES",  // This is needed to avoid some diagnostics
+                ]
+            )
 
             // Check the debug build.
             await tester.checkBuild(BuildParameters(action: .docBuild, configuration: "Debug"), runDestination: .anyMac, fs: fs) { results in
@@ -123,10 +131,14 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
     func buildWithSymbolExtractWithoutDocumentation() async throws {
         try await ObjectiveCSymbolExtractorImplementationSelector.runWithAllImplementations {
             let sourceLanguages = SourceLanguageConfiguration(withSwift: true, withObjectiveCLevel: .public)
-            let (tester, fs, SRCROOT) = try await setUpTesterForTestProject(withDocsCatalog: true, sourceLanguages: sourceLanguages, extraBuildSettings: [
-                "RUN_SYMBOL_GRAPH_EXTRACT": "YES",
-                "SYMBOL_GRAPH_EXTRACTOR_OUTPUT_BASE": "/symbol_graph_extractor_output_base"
-            ])
+            let (tester, fs, SRCROOT) = try await setUpTesterForTestProject(
+                withDocsCatalog: true,
+                sourceLanguages: sourceLanguages,
+                extraBuildSettings: [
+                    "RUN_SYMBOL_GRAPH_EXTRACT": "YES",
+                    "SYMBOL_GRAPH_EXTRACTOR_OUTPUT_BASE": "/symbol_graph_extractor_output_base",
+                ]
+            )
 
             // Check the debug build.
             try await tester.checkBuild(BuildParameters(action: .build, configuration: "Debug"), runDestination: .anyMac, fs: fs) { results in
@@ -145,16 +157,20 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS))
     func buildActionsWithoutBuildComponentDoesNotBuildRunSymbolExtractWhenBuildSettingIsSet() async throws {
         try await ObjectiveCSymbolExtractorImplementationSelector.runWithAllImplementations {
-            let buildActionsWithoutBuildComponents = BuildAction.allCases.filter{ !$0.buildComponents.contains("build") }
+            let buildActionsWithoutBuildComponents = BuildAction.allCases.filter { !$0.buildComponents.contains("build") }
 
             #expect(!buildActionsWithoutBuildComponents.isEmpty, "This test should check at least one build action")
 
             let sourceLanguages = SourceLanguageConfiguration(withSwift: true, withObjectiveCLevel: .public)
             for buildAction in buildActionsWithoutBuildComponents {
-                let (tester, fs, _) = try await setUpTesterForTestProject(withDocsCatalog: true, sourceLanguages: sourceLanguages, extraBuildSettings: [
-                    "RUN_SYMBOL_GRAPH_EXTRACT": "YES",
-                    "SUPPORTS_TEXT_BASED_API": "YES" // This is needed to avoid some diagnostics
-                ])
+                let (tester, fs, _) = try await setUpTesterForTestProject(
+                    withDocsCatalog: true,
+                    sourceLanguages: sourceLanguages,
+                    extraBuildSettings: [
+                        "RUN_SYMBOL_GRAPH_EXTRACT": "YES",
+                        "SUPPORTS_TEXT_BASED_API": "YES",  // This is needed to avoid some diagnostics
+                    ]
+                )
 
                 // Check the debug build.
                 await tester.checkBuild(BuildParameters(action: buildAction, configuration: "Debug"), runDestination: .anyMac, fs: fs) { results in
@@ -282,7 +298,7 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                     // There shouldn't be any task construction diagnostics.
                     results.checkNoDiagnostics()
 
-                    try await checkDocumentationTasksAreConstructed(sourceLanguages: sourceLanguages, withDocsCatalog: true, zipperedAlternateProduct: nil, core: tester.core, results: results, SRCROOT: SRCROOT, customTemplatePath: "/path/to/some/template") // the custom template is normalized
+                    try await checkDocumentationTasksAreConstructed(sourceLanguages: sourceLanguages, withDocsCatalog: true, zipperedAlternateProduct: nil, core: tester.core, results: results, SRCROOT: SRCROOT, customTemplatePath: "/path/to/some/template")  // the custom template is normalized
                 }
             }
         }
@@ -420,11 +436,15 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
     func buildDocumentationWithContradictingObjectiveCRelatedBuildSettings() async throws {
         try await ObjectiveCSymbolExtractorImplementationSelector.runWithAllImplementations {
             for sourceLanguages in Self.sourceLanguageConfigurationsToTest where sourceLanguages.withSwift == true {
-                let (tester, fs, SRCROOT) = try await setUpTesterForTestProject(withDocsCatalog: true, sourceLanguages: sourceLanguages, extraBuildSettings: [
-                    // These two settings are contradictory
-                    "DOCC_EXTRACT_OBJC_INFO_FOR_SWIFT_SYMBOLS": "YES",
-                    "SWIFT_INSTALL_OBJC_HEADER": "NO"
-                ])
+                let (tester, fs, SRCROOT) = try await setUpTesterForTestProject(
+                    withDocsCatalog: true,
+                    sourceLanguages: sourceLanguages,
+                    extraBuildSettings: [
+                        // These two settings are contradictory
+                        "DOCC_EXTRACT_OBJC_INFO_FOR_SWIFT_SYMBOLS": "YES",
+                        "SWIFT_INSTALL_OBJC_HEADER": "NO",
+                    ]
+                )
 
                 // Check the debug build.
                 try await tester.checkBuild(BuildParameters(action: .docBuild, configuration: "Debug"), runDestination: .anyMac, fs: fs) { results in
@@ -465,10 +485,14 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
     func objectiveCDeclarationsForSwiftSymbolsWithoutModule() async throws {
         try await ObjectiveCSymbolExtractorImplementationSelector.runWithAllImplementations {
             for sourceLanguages in Self.sourceLanguageConfigurationsToTest {
-                let (tester, fs, SRCROOT) = try await setUpTesterForTestProject(withDocsCatalog: true, sourceLanguages: sourceLanguages, extraBuildSettings: [
-                    "DOCC_EXTRACT_SWIFT_INFO_FOR_OBJC_SYMBOLS": "YES",
-                    "DEFINES_MODULE": "NO"
-                ])
+                let (tester, fs, SRCROOT) = try await setUpTesterForTestProject(
+                    withDocsCatalog: true,
+                    sourceLanguages: sourceLanguages,
+                    extraBuildSettings: [
+                        "DOCC_EXTRACT_SWIFT_INFO_FOR_OBJC_SYMBOLS": "YES",
+                        "DEFINES_MODULE": "NO",
+                    ]
+                )
 
                 // Check the debug build.
                 try await tester.checkBuild(BuildParameters(action: .docBuild, configuration: "Debug"), runDestination: .anyMac, fs: fs) { results in
@@ -563,7 +587,6 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
         }
     }
 
-
     @Test(.requireSDKs(.macOS))
     func buildAppDocumentationWithoutHeaderBuildPhase() async throws {
         try await ObjectiveCSymbolExtractorImplementationSelector.runWithAllImplementations {
@@ -626,7 +649,7 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
             sourceLanguages: sourceLanguages,
             extraBuildSettings: [
                 "BUILD_VARIANTS": "normal asan",
-                "OTHER_SWIFT_FLAGS[variant=asan]": "-sanitize=address"
+                "OTHER_SWIFT_FLAGS[variant=asan]": "-sanitize=address",
             ]
         )
 
@@ -731,7 +754,7 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
             case .staticLibrary, .dynamicLibrary, .objectFile:
                 return [builtProductsDir + "/usr/local/include"]
             case .commandLineTool:
-                return nil // command-line tools have no product headers
+                return nil  // command-line tools have no product headers
             case .application:
                 expectedProductHeaderParentDir = builtProductsDir + "/Framework.app/Contents"
             case .xpcService:
@@ -832,14 +855,14 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                 TestBuildFile("ExcludedObjCHeaderFilePublic.h", headerVisibility: .public),
             ])
             testSourcesBuildPhaseFiles.append("ObjCSourceFile.m")
-            fallthrough // Public implies private and project
+            fallthrough  // Public implies private and project
 
         case .private?:
             testFiles.append(TestFile("ObjCHeaderFilePrivate.h"))
             testHeaderBuildPhaseFiles.append(TestBuildFile("ObjCHeaderFilePrivate.h", headerVisibility: .private))
-            fallthrough // Private implies project
+            fallthrough  // Private implies project
 
-        case .some: // project visibility
+        case .some:  // project visibility
             testFiles.append(TestFile("ObjCHeaderFileProject.h"))
             testHeaderBuildPhaseFiles.append(TestBuildFile("ObjCHeaderFileProject.h", headerVisibility: nil))
 
@@ -892,7 +915,7 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                                 // Set the real TAPI tool path so that we can check its version to determine what version of the "headers info" JSON file to pass to `tapi extractapi`.
                                 "TAPI_EXEC": tapiToolPath.str,
                                 "LIBTOOL": libtoolPath.str,
-                                "INFOPLIST_FILE":"SomeFiles/Info.plist",
+                                "INFOPLIST_FILE": "SomeFiles/Info.plist",
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "PRODUCT_BUNDLE_IDENTIFIER": "test.bundle.identifier",
                                 "CURRENT_PROJECT_VERSION": "0.0.1",
@@ -927,7 +950,7 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                             buildSettings: [
                                 // Set the real TAPI tool path so that we can check its version to determine what version of the "headers info" JSON file to pass to `tapi extractapi`.
                                 "TAPI_EXEC": tapiToolPath.str,
-                                "INFOPLIST_FILE":"SomeFiles/Info.plist",
+                                "INFOPLIST_FILE": "SomeFiles/Info.plist",
                                 "MODULEMAP_PATH": "platform_specific_dependency_module_map_path",
                             ]
                         )
@@ -942,12 +965,12 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                             buildSettings: [
                                 // Set the real TAPI tool path so that we can check its version to determine what version of the "headers info" JSON file to pass to `tapi extractapi`.
                                 "TAPI_EXEC": tapiToolPath.str,
-                                "INFOPLIST_FILE":"SomeFiles/Info.plist",
+                                "INFOPLIST_FILE": "SomeFiles/Info.plist",
                                 "MODULEMAP_PATH": "expected_dependency_module_map_path",
                             ]
                         )
                     ]
-                )
+                ),
             ]
         )
 
@@ -997,7 +1020,7 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
         SRCROOT: String,
         customTemplatePath: String? = nil,
         expectedDisplayName: String = "Framework",
-        expectedDocCatalogIdentifier: String = "test.bundle.identifier", // this default value is the same as target's bundle identifier.
+        expectedDocCatalogIdentifier: String = "test.bundle.identifier",  // this default value is the same as target's bundle identifier.
         expectedHostingBasePath: String? = nil,
         expectedToTransformForStaticHosting: Bool = true,
         expectedTargetValues: ExpectedTargetValues? = nil,
@@ -1113,7 +1136,7 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                         task.checkOutputs([
                             .path(objectsNormalDir + "/Framework Swift Compilation Finished"),
                             .path(objectsNormalDir + "/SwiftSourceFile.o"),
-                            .path(objectsNormalDir + "/SwiftSourceFile.swiftconstvalues")
+                            .path(objectsNormalDir + "/SwiftSourceFile.swiftconstvalues"),
                         ])
                     }
 
@@ -1146,8 +1169,7 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                 }
             }
 
-            if (sourceLanguages.withObjectiveC && expectedTargetValues.expectedToProcessAnyHeaders) || expectedTargetValues.expectedToProcessGeneratedSwiftInterfaceHeader == .always
-            {
+            if (sourceLanguages.withObjectiveC && expectedTargetValues.expectedToProcessAnyHeaders) || expectedTargetValues.expectedToProcessGeneratedSwiftInterfaceHeader == .always {
                 let expectedToProcessGeneratedSwiftInterfaceHeader: Bool
                 switch expectedTargetValues.expectedToProcessGeneratedSwiftInterfaceHeader {
                 case .always:
@@ -1163,15 +1185,16 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
 
                     // Check the headers info file write task
                     try results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", headersInfoPath])) {
-                        task, content in
+                        task,
+                        content in
 
                         task.checkCommandLine([
                             "write-file",
-                            headersInfoPath
+                            headersInfoPath,
                         ])
 
                         task.checkInputs([
-                            .namePattern(.and(.prefix("target-Framework-T-Framework-"), .suffix("--immediate"))),
+                            .namePattern(.and(.prefix("target-Framework-T-Framework-"), .suffix("--immediate")))
                         ])
 
                         task.checkOutputs([
@@ -1236,12 +1259,12 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                         if SWBFeatureFlag.enableClangExtractAPI.value {
                             task.checkCommandLineContains([
                                 "clang",
-                                "-extract-api"
+                                "-extract-api",
                             ])
 
                             task.checkCommandLineContainsUninterrupted([
                                 "-o",
-                                symbolGraphPath
+                                symbolGraphPath,
                             ])
                         } else {
                             task.checkCommandLineContainsUninterrupted([
@@ -1254,7 +1277,7 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                         }
 
                         task.checkCommandLineContains([
-                            "--target=\(targetTriple)",
+                            "--target=\(targetTriple)"
                         ])
 
                         task.checkCommandLineContainsUninterrupted([
@@ -1264,7 +1287,7 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                         if expectedTargetValues.expectedToExtractWithModuleSupport {
                             task.checkCommandLineContains([
                                 "-fmodules",
-                                "-fmodules-cache-path=module_cache_dir"
+                                "-fmodules-cache-path=module_cache_dir",
                             ])
                         } else {
                             task.checkCommandLineDoesNotContain("-fmodules")
@@ -1272,7 +1295,7 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                         }
                         if expectedTargetValues.expectedToExtractWithARCSupport {
                             task.checkCommandLineContains([
-                                "-fobjc-arc",
+                                "-fobjc-arc"
                             ])
                         } else {
                             task.checkCommandLineDoesNotContain("-fobjc-arc")
@@ -1280,7 +1303,7 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
 
                         task.checkCommandLineContains([
                             "-Fframework_search_paths1",
-                            "-Fframework_search_paths2"
+                            "-Fframework_search_paths2",
                         ])
                         task.checkCommandLineContains([
                             "-Iheader_search_paths1",
@@ -1289,13 +1312,13 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
 
                         task.checkCommandLineContains([
                             "-I\(frameworkBuildDir)/Framework-own-target-headers.hmap",
-                            "-I\(frameworkBuildDir)/Framework-all-target-headers.hmap"
+                            "-I\(frameworkBuildDir)/Framework-all-target-headers.hmap",
                         ])
                         task.checkCommandLineContains([
                             "-iquote",
                             "\(frameworkBuildDir)/Framework-generated-files.hmap",
                             "-iquote",
-                            "\(frameworkBuildDir)/Framework-project-headers.hmap"
+                            "\(frameworkBuildDir)/Framework-project-headers.hmap",
                         ])
 
                         if targetTriplePlatform == "-ios-macabi" {
@@ -1324,11 +1347,13 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                             task.checkCommandLineContainsUninterrupted(["-x", "objective-c-header"])
                         }
 
-                        task.checkInputs(contain: [
-                            SWBFeatureFlag.enableClangExtractAPI.value ? nil : .path(frameworkBuildDir + "/Framework-extractapi-headers.json"),
-                            .namePattern(.and(.prefix("target-Framework-T-Framework-"), .suffix("--ModuleVerifierTaskProducer"))),
-                            .namePattern(.and(.prefix("target-Framework-T-Framework-"), .suffix("--entry")))
-                        ].compactMap({ $0 }))
+                        task.checkInputs(
+                            contain: [
+                                SWBFeatureFlag.enableClangExtractAPI.value ? nil : .path(frameworkBuildDir + "/Framework-extractapi-headers.json"),
+                                .namePattern(.and(.prefix("target-Framework-T-Framework-"), .suffix("--ModuleVerifierTaskProducer"))),
+                                .namePattern(.and(.prefix("target-Framework-T-Framework-"), .suffix("--entry"))),
+                            ].compactMap({ $0 })
+                        )
 
                         task.checkCommandLineDoesNotContain(
                             "-fmodule-map-file=platform_specific_dependency_module_map_path"
@@ -1342,31 +1367,31 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                             case let (publicHeadersDir?, privateHeadersDir?):
                                 if expectedTargetValues.expectedToProcessPublicHeaders {
                                     task.checkInputs(contain: [
-                                        .path("\(publicHeadersDir)/Framework.h"),
+                                        .path("\(publicHeadersDir)/Framework.h")
                                     ])
                                 } else {
                                     task.checkNoInputs(contain: [
-                                        .path("\(publicHeadersDir)/Framework.h"),
+                                        .path("\(publicHeadersDir)/Framework.h")
                                     ])
                                 }
 
                                 if expectedTargetValues.expectedToProcessPrivateHeaders {
                                     task.checkInputs(contain: [
-                                        .path("\(privateHeadersDir)/ObjCHeaderFilePrivate.h"),
+                                        .path("\(privateHeadersDir)/ObjCHeaderFilePrivate.h")
                                     ])
                                 } else {
                                     task.checkNoInputs(contain: [
-                                        .path("\(privateHeadersDir)/ObjCHeaderFilePrivate.h"),
+                                        .path("\(privateHeadersDir)/ObjCHeaderFilePrivate.h")
                                     ])
                                 }
 
                                 if expectedTargetValues.expectedToProcessProjectVisibleHeaders {
                                     task.checkInputs(contain: [
-                                        .path("/tmp/Test/aProject/ObjCHeaderFileProject.h"),
+                                        .path("/tmp/Test/aProject/ObjCHeaderFileProject.h")
                                     ])
                                 } else {
                                     task.checkNoInputs(contain: [
-                                        .path("/tmp/Test/aProject/ObjCHeaderFileProject.h"),
+                                        .path("/tmp/Test/aProject/ObjCHeaderFileProject.h")
                                     ])
                                 }
                                 task.checkNoInputs(contain: [
@@ -1376,26 +1401,26 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                             case let (headersDir?, nil):
                                 if expectedTargetValues.expectedToProcessPublicHeaders {
                                     task.checkInputs(contain: [
-                                        .path("\(headersDir)/Framework.h"),
+                                        .path("\(headersDir)/Framework.h")
                                     ])
                                 } else {
                                     task.checkNoInputs(contain: [
-                                        .path("\(headersDir)/Framework.h"),
+                                        .path("\(headersDir)/Framework.h")
                                     ])
                                 }
 
                                 if expectedTargetValues.expectedToProcessPrivateHeaders {
                                     task.checkInputs(contain: [
-                                        .path("\(headersDir)/ObjCHeaderFilePrivate.h"),
+                                        .path("\(headersDir)/ObjCHeaderFilePrivate.h")
                                     ])
                                 } else {
                                     task.checkNoInputs(contain: [
-                                        .path("\(headersDir)/ObjCHeaderFilePrivate.h"),
+                                        .path("\(headersDir)/ObjCHeaderFilePrivate.h")
                                     ])
                                 }
 
                                 task.checkNoInputs(contain: [
-                                    .path("/tmp/Test/aProject/ObjCHeaderFileProject.h"),
+                                    .path("/tmp/Test/aProject/ObjCHeaderFileProject.h")
                                 ])
                                 task.checkNoInputs(contain: [
                                     .path("\(headersDir)/iOSOnlyObjCHeaderFilePublic.h"),
@@ -1407,11 +1432,11 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                         }
                         if expectedToProcessGeneratedSwiftInterfaceHeader {
                             task.checkInputs(contain: [
-                                .pathPattern(.suffix("/Framework-Swift.h")),
+                                .pathPattern(.suffix("/Framework-Swift.h"))
                             ])
                         } else {
                             task.checkNoInputs(contain: [
-                                .pathPattern(.suffix("/Framework-Swift.h")),
+                                .pathPattern(.suffix("/Framework-Swift.h"))
                             ])
                         }
 
@@ -1429,14 +1454,14 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                                 core.developerPath.path.dirname.join("SharedFrameworks/CoreDocumentation.framework/Resources/sdkdb_to_symgraph").str,
                                 sdkdbOutputPath,
                                 "Framework",
-                                symbolGraphPath
+                                symbolGraphPath,
                             ])
 
                             task.checkInputs([
                                 .path(sdkdbOutputPath),
 
-                                    .namePattern(.and(.prefix("target-Framework-T-Framework-"), .suffix("--ModuleVerifierTaskProducer"))),
-                                .namePattern(.and(.prefix("target-Framework-T-Framework-"), .suffix("--entry")))
+                                .namePattern(.and(.prefix("target-Framework-T-Framework-"), .suffix("--ModuleVerifierTaskProducer"))),
+                                .namePattern(.and(.prefix("target-Framework-T-Framework-"), .suffix("--entry"))),
                             ])
 
                             task.checkOutputs([
@@ -1473,12 +1498,12 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                         ])
                         task.checkCommandLineContainsUninterrupted([
                             "-swift-version",
-                            "5"
+                            "5",
                         ])
 
                         task.checkCommandLineContains([
                             "-Fframework_search_paths1",
-                            "-Fframework_search_paths2"
+                            "-Fframework_search_paths2",
                         ])
                         task.checkCommandLineContains([
                             "-Iheader_search_paths1",
@@ -1499,7 +1524,7 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                             "-I",
                             "\(frameworkBuildDir)/Framework-generated-files.hmap",
                             "-I",
-                            "\(frameworkBuildDir)/Framework-project-headers.hmap"
+                            "\(frameworkBuildDir)/Framework-project-headers.hmap",
                         ])
 
                         if targetTriplePlatform == "-ios-macabi" {
@@ -1561,7 +1586,7 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
 
                     if let expectedHostingBasePath = expectedHostingBasePath {
                         expectedCommandLine += [
-                            "--hosting-base-path", expectedHostingBasePath
+                            "--hosting-base-path", expectedHostingBasePath,
                         ]
                     }
 
@@ -1615,7 +1640,7 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                         ])
                         if !sourceLanguages.withObjectiveC {
                             task.checkInputs(contain: [
-                                .namePattern(.and(.prefix("target-Framework-T-Framework-"), .suffix("--ModuleVerifierTaskProducer"))),
+                                .namePattern(.and(.prefix("target-Framework-T-Framework-"), .suffix("--ModuleVerifierTaskProducer")))
                             ])
                         }
 
@@ -1654,10 +1679,10 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                         .path
                     task.checkOutputs([
                         .path(outputDir),
-                        .path(diagnosticFileOutputPath)
+                        .path(diagnosticFileOutputPath),
                     ])
                     task.checkEnvironment([
-                        "DOCC_HTML_DIR": customTemplatePath.map { .equal($0)} ?? .none
+                        "DOCC_HTML_DIR": customTemplatePath.map { .equal($0) } ?? .none
                     ])
                 }
             }
@@ -1685,7 +1710,7 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
                         task.checkCommandLineDoesNotContain(symbolGraphOutputDir)
 
                         task.checkNoOutputs(contain: [
-                            .path(frameworkBuildDir + "/symbol-graph/swift/\(targetTriple)/Framework.symbols.json"),
+                            .path(frameworkBuildDir + "/symbol-graph/swift/\(targetTriple)/Framework.symbols.json")
                         ])
                     }
                 }
@@ -1707,9 +1732,10 @@ fileprivate struct DocumentationTaskConstructionTests: CoreBasedTests {
         var targetTriple = "\(arch)-apple\(targetTriplePlatform)"
         if forObjectiveC {
             // The tapi target triple includes the deployment target
-            targetTriple = targetTriplePlatform == "-ios-macabi"
-            ? targetTriple.replacingOccurrences(of: "-ios-macabi", with: "-ios\(core.macCatalystSDKVariant.defaultDeploymentTarget)-macabi")
-            : targetTriple + core.loadSDK(.macOS).defaultDeploymentTarget
+            targetTriple =
+                targetTriplePlatform == "-ios-macabi"
+                ? targetTriple.replacingOccurrences(of: "-ios-macabi", with: "-ios\(core.macCatalystSDKVariant.defaultDeploymentTarget)-macabi")
+                : targetTriple + core.loadSDK(.macOS).defaultDeploymentTarget
         }
 
         let symbolGraphSubDir = forObjectiveC ? "clang" : "swift"
diff --git a/Tests/SWBTaskConstructionTests/DriverKitTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/DriverKitTaskConstructionTests.swift
index 24cf219d..c3a3602b 100644
--- a/Tests/SWBTaskConstructionTests/DriverKitTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/DriverKitTaskConstructionTests.swift
@@ -26,14 +26,16 @@ fileprivate struct DriverKitTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("interface.iig"),
                     TestFile("project.iig"),
                     TestFile("private.iig"),
                     TestFile("public.iig"),
                     TestFile("main.c"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -48,20 +50,21 @@ fileprivate struct DriverKitTaskConstructionTests: CoreBasedTests {
                         "IIG_CXX_LANGUAGE_STANDARD": "c++17",
                         "COPY_HEADERS_RUN_UNIFDEF": runUnifdef ? "YES" : "NO",
                         "COPY_HEADERS_UNIFDEF_FLAGS": runUnifdef ? "-DHIDE_FOO" : "",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "DextTarget",
                     type: .driverExtension,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "interface.iig",
                             "main.c",
-                        ]),
+                        ])
                     ],
                     dependencies: ["LibraryTarget"]
                 ),
@@ -69,7 +72,7 @@ fileprivate struct DriverKitTaskConstructionTests: CoreBasedTests {
                     "LibraryTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -77,10 +80,11 @@ fileprivate struct DriverKitTaskConstructionTests: CoreBasedTests {
                             "project.iig",
                             TestBuildFile("private.iig", headerVisibility: .private),
                             TestBuildFile("public.iig", headerVisibility: .public),
-                        ]),
+                        ])
                     ]
-                )
-            ])
+                ),
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let srcRoot = tester.workspace.projects[0].sourceRoot
@@ -181,14 +185,16 @@ fileprivate struct DriverKitTaskConstructionTests: CoreBasedTests {
             let testProject = try await TestProject(
                 "aProject",
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("interface.iig"),
                         TestFile("project.iig"),
                         TestFile("private.iig"),
                         TestFile("public.iig"),
                         TestFile("main.c"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -202,14 +208,15 @@ fileprivate struct DriverKitTaskConstructionTests: CoreBasedTests {
                             "TAPI_EXEC": tapiToolPath.str,
                             "IIG_EXEC": iigPath.str,
                             "IIG_CXX_LANGUAGE_STANDARD": "c++17",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "LibraryTarget",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug"),
+                            TestBuildConfiguration("Debug")
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
@@ -217,10 +224,11 @@ fileprivate struct DriverKitTaskConstructionTests: CoreBasedTests {
                                 "project.iig",
                                 TestBuildFile("private.iig", headerVisibility: .private),
                                 TestBuildFile("public.iig", headerVisibility: .public),
-                            ]),
+                            ])
                         ]
                     )
-                ])
+                ]
+            )
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
             let srcRoot = tester.workspace.projects[0].sourceRoot
@@ -302,10 +310,12 @@ fileprivate struct DriverKitTaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("main.c"),
-                    ]),
+                        TestFile("main.c")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -313,22 +323,24 @@ fileprivate struct DriverKitTaskConstructionTests: CoreBasedTests {
                             "GENERATE_INFOPLIST_FILE": "YES",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "SDKROOT": "driverkit",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "DextTarget",
                         type: .driverExtension,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug"),
+                            TestBuildConfiguration("Debug")
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                "main.c",
-                            ]),
+                                "main.c"
+                            ])
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             let fs = PseudoFS()
diff --git a/Tests/SWBTaskConstructionTests/EagerCompilationTests.swift b/Tests/SWBTaskConstructionTests/EagerCompilationTests.swift
index fe8f01bb..385b8084 100644
--- a/Tests/SWBTaskConstructionTests/EagerCompilationTests.swift
+++ b/Tests/SWBTaskConstructionTests/EagerCompilationTests.swift
@@ -29,87 +29,139 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
 
             return try await TestProject(
                 "aProject",
-                groupTree: TestGroup("Sources", path: "Sources", children: [
-                    TestFile("A.m"),
-                    TestFile("A.fake-data"),
-                    TestFile("B.m"),
-                    TestFile("C.m"),
-                    TestFile("D.m"),
-                    TestFile("E.h"),
-                    TestFile("E.m"),
-                    TestFile("F.m"),
-                    TestFile("F.modulemap"),
-                    TestFile("G.m"),
-                    TestFile("G.modulemap"),
-                    TestFile("H.swift"),
-                ] + allEFiles),
-                buildConfigurations: [TestBuildConfiguration(
-                    "Debug",
-                    buildSettings: [
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ALWAYS_SEARCH_USER_PATHS": "false",
-                        "EAGER_COMPILATION_REQUIRE": "true", // to verify there is no warning for targets with no scripts
-                        "SWIFT_EXEC": swiftCompilerPath.str,
-                        "SWIFT_VERSION": swiftVersion,
-                        "EAGER_PARALLEL_COMPILATION_DISABLE": "YES",
-                        "TAPI_EXEC": tapiToolPath.str,
-                    ]
-                )],
+                groupTree: TestGroup(
+                    "Sources",
+                    path: "Sources",
+                    children: [
+                        TestFile("A.m"),
+                        TestFile("A.fake-data"),
+                        TestFile("B.m"),
+                        TestFile("C.m"),
+                        TestFile("D.m"),
+                        TestFile("E.h"),
+                        TestFile("E.m"),
+                        TestFile("F.m"),
+                        TestFile("F.modulemap"),
+                        TestFile("G.m"),
+                        TestFile("G.modulemap"),
+                        TestFile("H.swift"),
+                    ] + allEFiles
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ALWAYS_SEARCH_USER_PATHS": "false",
+                            "EAGER_COMPILATION_REQUIRE": "true",  // to verify there is no warning for targets with no scripts
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": swiftVersion,
+                            "EAGER_PARALLEL_COMPILATION_DISABLE": "YES",
+                            "TAPI_EXEC": tapiToolPath.str,
+                        ]
+                    )
+                ],
                 targets: [
-                    TestStandardTarget("A", type: .framework, buildPhases: [
-                        TestSourcesBuildPhase([
-                            TestBuildFile("A.m")
-                        ]),
-                        TestCopyFilesBuildPhase([TestBuildFile("A.fake-data")],
-                                                destinationSubfolder: .builtProductsDir,
-                                                destinationSubpath: "$(PUBLIC_HEADERS_FOLDER_PATH)",
-                                                onlyForDeployment: false)
-                    ], dependencies: ["E", "F", "G"]),
-                    TestStandardTarget("B", type: .framework, buildPhases: [
-                        TestSourcesBuildPhase([
-                            TestBuildFile("B.m")
-                        ])
-                    ], dependencies: ["A"]),
-                    TestStandardTarget("C", type: .framework, buildPhases: [
-                        TestSourcesBuildPhase([
-                            TestBuildFile("C.m")
-                        ])
-                    ]),
-                    TestStandardTarget("D", type: .framework, buildPhases: [
-                        TestSourcesBuildPhase([
-                            TestBuildFile("D.m")
-                        ])
-                    ], dependencies: ["B", "C"]),
-                    TestStandardTarget("E", type: .framework, buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("E.m")]),
-                        TestCopyFilesBuildPhase([TestBuildFile("E.h", headerVisibility: .public)] + allEBuildFiles,
-                                                destinationSubfolder: .builtProductsDir,
-                                                destinationSubpath: "$(PUBLIC_HEADERS_FOLDER_PATH)",
-                                                onlyForDeployment: false),
-                    ]),
-                    TestStandardTarget("F", type: .framework, buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("F.m")]),
-                        TestCopyFilesBuildPhase([TestBuildFile("F.modulemap")],
-                                                destinationSubfolder: .builtProductsDir,
-                                                destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Modules",
-                                                onlyForDeployment: false),
-                    ]),
-                    TestStandardTarget("G", type: .framework,
-                                       buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: [
-                                        "DEFINES_MODULE": "YES",
-                                        "MODULEMAP_FILE_CONTENTS": "foo",
-                                       ])],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase([TestBuildFile("G.m")]),
-                                       ]
-                                      ),
-                    TestStandardTarget("H", type: .framework, buildPhases: [
-                        TestSourcesBuildPhase([
-                            TestBuildFile("H.swift")
-                        ])
-                    ], dependencies: ["E", "F", "G"]),
-                ])
+                    TestStandardTarget(
+                        "A",
+                        type: .framework,
+                        buildPhases: [
+                            TestSourcesBuildPhase([
+                                TestBuildFile("A.m")
+                            ]),
+                            TestCopyFilesBuildPhase(
+                                [TestBuildFile("A.fake-data")],
+                                destinationSubfolder: .builtProductsDir,
+                                destinationSubpath: "$(PUBLIC_HEADERS_FOLDER_PATH)",
+                                onlyForDeployment: false
+                            ),
+                        ],
+                        dependencies: ["E", "F", "G"]
+                    ),
+                    TestStandardTarget(
+                        "B",
+                        type: .framework,
+                        buildPhases: [
+                            TestSourcesBuildPhase([
+                                TestBuildFile("B.m")
+                            ])
+                        ],
+                        dependencies: ["A"]
+                    ),
+                    TestStandardTarget(
+                        "C",
+                        type: .framework,
+                        buildPhases: [
+                            TestSourcesBuildPhase([
+                                TestBuildFile("C.m")
+                            ])
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "D",
+                        type: .framework,
+                        buildPhases: [
+                            TestSourcesBuildPhase([
+                                TestBuildFile("D.m")
+                            ])
+                        ],
+                        dependencies: ["B", "C"]
+                    ),
+                    TestStandardTarget(
+                        "E",
+                        type: .framework,
+                        buildPhases: [
+                            TestSourcesBuildPhase([TestBuildFile("E.m")]),
+                            TestCopyFilesBuildPhase(
+                                [TestBuildFile("E.h", headerVisibility: .public)] + allEBuildFiles,
+                                destinationSubfolder: .builtProductsDir,
+                                destinationSubpath: "$(PUBLIC_HEADERS_FOLDER_PATH)",
+                                onlyForDeployment: false
+                            ),
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "F",
+                        type: .framework,
+                        buildPhases: [
+                            TestSourcesBuildPhase([TestBuildFile("F.m")]),
+                            TestCopyFilesBuildPhase(
+                                [TestBuildFile("F.modulemap")],
+                                destinationSubfolder: .builtProductsDir,
+                                destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Modules",
+                                onlyForDeployment: false
+                            ),
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "G",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "DEFINES_MODULE": "YES",
+                                    "MODULEMAP_FILE_CONTENTS": "foo",
+                                ]
+                            )
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase([TestBuildFile("G.m")])
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "H",
+                        type: .framework,
+                        buildPhases: [
+                            TestSourcesBuildPhase([
+                                TestBuildFile("H.swift")
+                            ])
+                        ],
+                        dependencies: ["E", "F", "G"]
+                    ),
+                ]
+            )
         }
     }
 
@@ -122,7 +174,7 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
         let checks = [
             ("B", ["A"]),
             ("C", ["B"]),
-            ("D", ["A", "B", "C"])
+            ("D", ["A", "B", "C"]),
         ]
 
         await tester.checkBuild(parameters, runDestination: .macOS, buildRequest: buildRequest) { results in
@@ -227,27 +279,43 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
     func eagerCompilationWithScriptsAfterCompiling() async throws {
         let testProject = TestProject(
             "aProject",
-            groupTree: TestGroup("Sources", path: "Sources", children: [
-                TestFile("A.m"),
-                TestFile("B.m"),
-            ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "ALWAYS_SEARCH_USER_PATHS": "false",
+            groupTree: TestGroup(
+                "Sources",
+                path: "Sources",
+                children: [
+                    TestFile("A.m"),
+                    TestFile("B.m"),
                 ]
-            )],
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ALWAYS_SEARCH_USER_PATHS": "false",
+                    ]
+                )
+            ],
             targets: [
-                TestStandardTarget("A", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("A.m")]),
-                    TestShellScriptBuildPhase(name: "A Script", originalObjectID: "A Script", contents: "true", alwaysOutOfDate: true)
-                ]),
-                TestStandardTarget("B", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("B.m")])
-                ], dependencies: ["A"]),
-            ])
+                TestStandardTarget(
+                    "A",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("A.m")]),
+                        TestShellScriptBuildPhase(name: "A Script", originalObjectID: "A Script", contents: "true", alwaysOutOfDate: true),
+                    ]
+                ),
+                TestStandardTarget(
+                    "B",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("B.m")])
+                    ],
+                    dependencies: ["A"]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let parameters = BuildParameters(configuration: "Debug")
@@ -273,27 +341,43 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
     func eagerCompilationWithScriptsBeforeCompiling() async throws {
         let testProject = TestProject(
             "aProject",
-            groupTree: TestGroup("Sources", path: "Sources", children: [
-                TestFile("A.m"),
-                TestFile("B.m"),
-            ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "ALWAYS_SEARCH_USER_PATHS": "false",
+            groupTree: TestGroup(
+                "Sources",
+                path: "Sources",
+                children: [
+                    TestFile("A.m"),
+                    TestFile("B.m"),
                 ]
-            )],
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ALWAYS_SEARCH_USER_PATHS": "false",
+                    ]
+                )
+            ],
             targets: [
-                TestStandardTarget("A", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("A.m")]),
-                ]),
-                TestStandardTarget("B", type: .framework, buildPhases: [
-                    TestShellScriptBuildPhase(name: "B Script", originalObjectID: "B Script", contents: "true", alwaysOutOfDate: true),
-                    TestSourcesBuildPhase([TestBuildFile("B.m")]),
-                ], dependencies: ["A"]),
-            ])
+                TestStandardTarget(
+                    "A",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("A.m")])
+                    ]
+                ),
+                TestStandardTarget(
+                    "B",
+                    type: .framework,
+                    buildPhases: [
+                        TestShellScriptBuildPhase(name: "B Script", originalObjectID: "B Script", contents: "true", alwaysOutOfDate: true),
+                        TestSourcesBuildPhase([TestBuildFile("B.m")]),
+                    ],
+                    dependencies: ["A"]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let parameters = BuildParameters(configuration: "Debug")
@@ -323,30 +407,46 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
     func eagerCompilationWithScriptsAllowed() async throws {
         let testProject = TestProject(
             "aProject",
-            groupTree: TestGroup("Sources", path: "Sources", children: [
-                TestFile("A.m"),
-                TestFile("B.m"),
-            ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "ALWAYS_SEARCH_USER_PATHS": "false",
-                    "EAGER_COMPILATION_ALLOW_SCRIPTS": "true",
-                    "EAGER_COMPILATION_REQUIRE": "true",
+            groupTree: TestGroup(
+                "Sources",
+                path: "Sources",
+                children: [
+                    TestFile("A.m"),
+                    TestFile("B.m"),
                 ]
-            )],
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ALWAYS_SEARCH_USER_PATHS": "false",
+                        "EAGER_COMPILATION_ALLOW_SCRIPTS": "true",
+                        "EAGER_COMPILATION_REQUIRE": "true",
+                    ]
+                )
+            ],
             targets: [
-                TestStandardTarget("A", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("A.m")]),
-                    TestShellScriptBuildPhase(name: "A Script", originalObjectID: "A Script", contents: "true", alwaysOutOfDate: true),
-                ]),
-                TestStandardTarget("B", type: .framework, buildPhases: [
-                    TestShellScriptBuildPhase(name: "B Script", originalObjectID: "B Script", contents: "true", alwaysOutOfDate: true),
-                    TestSourcesBuildPhase([TestBuildFile("B.m")]),
-                ], dependencies: ["A"]),
-            ])
+                TestStandardTarget(
+                    "A",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("A.m")]),
+                        TestShellScriptBuildPhase(name: "A Script", originalObjectID: "A Script", contents: "true", alwaysOutOfDate: true),
+                    ]
+                ),
+                TestStandardTarget(
+                    "B",
+                    type: .framework,
+                    buildPhases: [
+                        TestShellScriptBuildPhase(name: "B Script", originalObjectID: "B Script", contents: "true", alwaysOutOfDate: true),
+                        TestSourcesBuildPhase([TestBuildFile("B.m")]),
+                    ],
+                    dependencies: ["A"]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let parameters = BuildParameters(configuration: "Debug")
@@ -371,29 +471,45 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
     func eagerCompilationBasicsWithSandboxedScripts() async throws {
         let testProject = TestProject(
             "aProject",
-            groupTree: TestGroup("Sources", path: "Sources", children: [
-                TestFile("A.m"),
-                TestFile("B.m"),
-            ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "ALWAYS_SEARCH_USER_PATHS": "false",
-                    "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+            groupTree: TestGroup(
+                "Sources",
+                path: "Sources",
+                children: [
+                    TestFile("A.m"),
+                    TestFile("B.m"),
                 ]
-            )],
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ALWAYS_SEARCH_USER_PATHS": "false",
+                        "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                    ]
+                )
+            ],
             targets: [
-                TestStandardTarget("A", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("A.m")]),
-                    TestShellScriptBuildPhase(name: "A Script", originalObjectID: "A Script", contents: "true", alwaysOutOfDate: true),
-                ]),
-                TestStandardTarget("B", type: .framework, buildPhases: [
-                    TestShellScriptBuildPhase(name: "B Script", originalObjectID: "B Script", contents: "true", alwaysOutOfDate: true),
-                    TestSourcesBuildPhase([TestBuildFile("B.m")]),
-                ], dependencies: ["A"]),
-            ])
+                TestStandardTarget(
+                    "A",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("A.m")]),
+                        TestShellScriptBuildPhase(name: "A Script", originalObjectID: "A Script", contents: "true", alwaysOutOfDate: true),
+                    ]
+                ),
+                TestStandardTarget(
+                    "B",
+                    type: .framework,
+                    buildPhases: [
+                        TestShellScriptBuildPhase(name: "B Script", originalObjectID: "B Script", contents: "true", alwaysOutOfDate: true),
+                        TestSourcesBuildPhase([TestBuildFile("B.m")]),
+                    ],
+                    dependencies: ["A"]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let parameters = BuildParameters(configuration: "Debug")
@@ -418,26 +534,41 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
     func sandboxingDoesNotImplyEagerCompilationForAggregateTargetScripts() async throws {
         let testProject = TestProject(
             "aProject",
-            groupTree: TestGroup("Sources", path: "Sources", children: [
-                TestFile("A.m"),
-            ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "ALWAYS_SEARCH_USER_PATHS": "false",
-                    "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+            groupTree: TestGroup(
+                "Sources",
+                path: "Sources",
+                children: [
+                    TestFile("A.m")
                 ]
-            )],
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ALWAYS_SEARCH_USER_PATHS": "false",
+                        "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                    ]
+                )
+            ],
             targets: [
-                TestAggregateTarget("Aggregate", buildPhases: [
-                    TestShellScriptBuildPhase(name: "Script", originalObjectID: "Script", contents: "true", alwaysOutOfDate: true),
-                ], dependencies: ["A"]),
-                TestStandardTarget("A", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("A.m")]),
-                ]),
-            ])
+                TestAggregateTarget(
+                    "Aggregate",
+                    buildPhases: [
+                        TestShellScriptBuildPhase(name: "Script", originalObjectID: "Script", contents: "true", alwaysOutOfDate: true)
+                    ],
+                    dependencies: ["A"]
+                ),
+                TestStandardTarget(
+                    "A",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("A.m")])
+                    ]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let parameters = BuildParameters(configuration: "Debug")
@@ -455,28 +586,44 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
     func headerGeneratingShellScriptsAreCompilationRequirements() async throws {
         let testProject = TestProject(
             "aProject",
-            groupTree: TestGroup("Sources", path: "Sources", children: [
-                TestFile("A.m"),
-                TestFile("B.m"),
-            ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "ALWAYS_SEARCH_USER_PATHS": "false",
-                    "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+            groupTree: TestGroup(
+                "Sources",
+                path: "Sources",
+                children: [
+                    TestFile("A.m"),
+                    TestFile("B.m"),
                 ]
-            )],
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ALWAYS_SEARCH_USER_PATHS": "false",
+                        "ENABLE_USER_SCRIPT_SANDBOXING": "YES",
+                    ]
+                )
+            ],
             targets: [
-                TestStandardTarget("A", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("A.m")]),
-                    TestShellScriptBuildPhase(name: "A Script", originalObjectID: "A Script", contents: "touch /foo/bar.h", outputs: ["/foo/bar.h"], alwaysOutOfDate: false),
-                ]),
-                TestStandardTarget("B", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("B.m")]),
-                ], dependencies: ["A"]),
-            ])
+                TestStandardTarget(
+                    "A",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("A.m")]),
+                        TestShellScriptBuildPhase(name: "A Script", originalObjectID: "A Script", contents: "touch /foo/bar.h", outputs: ["/foo/bar.h"], alwaysOutOfDate: false),
+                    ]
+                ),
+                TestStandardTarget(
+                    "B",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("B.m")])
+                    ],
+                    dependencies: ["A"]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let parameters = BuildParameters(configuration: "Debug")
@@ -497,30 +644,52 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
         let core = try await getCore()
         let testProject = TestProject(
             "aProject",
-            groupTree: TestGroup("Sources", path: "Sources", children: [
-                TestFile("A.m"),
-                TestFile("B.m"),
-            ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "ALWAYS_SEARCH_USER_PATHS": "false",
+            groupTree: TestGroup(
+                "Sources",
+                path: "Sources",
+                children: [
+                    TestFile("A.m"),
+                    TestFile("B.m"),
                 ]
-            )],
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ALWAYS_SEARCH_USER_PATHS": "false",
+                    ]
+                )
+            ],
             targets: [
-                TestStandardTarget("A", type: .application, buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("A.m")]),
-                ]),
-                TestStandardTarget("B", type: .unitTest, buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                    "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/A.app/Contents/MacOS/A",
-                    "BUNDLE_LOADER": "$(TEST_HOST)",
-                ])], buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("B.m")]),
-                ], dependencies: ["A"]),
-            ])
+                TestStandardTarget(
+                    "A",
+                    type: .application,
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("A.m")])
+                    ]
+                ),
+                TestStandardTarget(
+                    "B",
+                    type: .unitTest,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/A.app/Contents/MacOS/A",
+                                "BUNDLE_LOADER": "$(TEST_HOST)",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("B.m")])
+                    ],
+                    dependencies: ["A"]
+                ),
+            ]
+        )
 
         let tester = try TaskConstructionTester(core, testProject)
         let parameters = BuildParameters(configuration: "Debug")
@@ -566,28 +735,50 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
     func eagerCompilationWithDeploymentLocation() async throws {
         let testProject = TestProject(
             "aProject",
-            groupTree: TestGroup("Sources", path: "Sources", children: [
-                TestFile("A.m"),
-                TestFile("B.m"),
-            ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "ALWAYS_SEARCH_USER_PATHS": "false",
+            groupTree: TestGroup(
+                "Sources",
+                path: "Sources",
+                children: [
+                    TestFile("A.m"),
+                    TestFile("B.m"),
                 ]
-            )],
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ALWAYS_SEARCH_USER_PATHS": "false",
+                    ]
+                )
+            ],
             targets: [
-                TestStandardTarget("A", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("A.m")]),
-                ]),
-                TestStandardTarget("B", type: .framework, buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: [
-                    "DEPLOYMENT_LOCATION": "true",
-                ])], buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("B.m")]),
-                ], dependencies: ["A"]),
-            ])
+                TestStandardTarget(
+                    "A",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("A.m")])
+                    ]
+                ),
+                TestStandardTarget(
+                    "B",
+                    type: .framework,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "DEPLOYMENT_LOCATION": "true"
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("B.m")])
+                    ],
+                    dependencies: ["A"]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let parameters = BuildParameters(configuration: "Debug")
@@ -614,33 +805,61 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
     func eagerCompilationRequiredWithDeploymentLocationAndNestedInstallPaths() async throws {
         let testProject = TestProject(
             "aProject",
-            groupTree: TestGroup("Sources", path: "Sources", children: [
-                TestFile("A.m"),
-                TestFile("B.m"),
-            ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "ALWAYS_SEARCH_USER_PATHS": "false",
-                    "EAGER_COMPILATION_REQUIRE": "true",
+            groupTree: TestGroup(
+                "Sources",
+                path: "Sources",
+                children: [
+                    TestFile("A.m"),
+                    TestFile("B.m"),
                 ]
-            )],
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ALWAYS_SEARCH_USER_PATHS": "false",
+                        "EAGER_COMPILATION_REQUIRE": "true",
+                    ]
+                )
+            ],
             targets: [
-                TestStandardTarget("A", type: .framework, buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: [
-                    "DEPLOYMENT_LOCATION": "true",
-                    "INSTALL_PATH": "/Library/Frameworks"
-                ])], buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("A.m")]),
-                ]),
-                TestStandardTarget("B", type: .framework, buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: [
-                    "DEPLOYMENT_LOCATION": "true",
-                    "INSTALL_PATH": "/Library/Frameworks/A.framework/Versions/A/Frameworks"
-                ])], buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("B.m")]),
-                ], dependencies: ["A"]),
-            ])
+                TestStandardTarget(
+                    "A",
+                    type: .framework,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "DEPLOYMENT_LOCATION": "true",
+                                "INSTALL_PATH": "/Library/Frameworks",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("A.m")])
+                    ]
+                ),
+                TestStandardTarget(
+                    "B",
+                    type: .framework,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "DEPLOYMENT_LOCATION": "true",
+                                "INSTALL_PATH": "/Library/Frameworks/A.framework/Versions/A/Frameworks",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("B.m")])
+                    ],
+                    dependencies: ["A"]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let parameters = BuildParameters(configuration: "Debug")
@@ -656,32 +875,59 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
     func eagerCompilationDisabledByTarget() async throws {
         let testProject = TestProject(
             "aProject",
-            groupTree: TestGroup("Sources", path: "Sources", children: [
-                TestFile("A.m"),
-                TestFile("B.m"),
-                TestFile("C.m"),
-            ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "ALWAYS_SEARCH_USER_PATHS": "false",
+            groupTree: TestGroup(
+                "Sources",
+                path: "Sources",
+                children: [
+                    TestFile("A.m"),
+                    TestFile("B.m"),
+                    TestFile("C.m"),
                 ]
-            )],
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ALWAYS_SEARCH_USER_PATHS": "false",
+                    ]
+                )
+            ],
             targets: [
-                TestStandardTarget("A", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("A.m")]),
-                ]),
-                TestStandardTarget("B", type: .framework, buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: [
-                    "EAGER_COMPILATION_DISABLE": "true",
-                ])], buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("B.m")]),
-                ], dependencies: ["A"]),
-                TestStandardTarget("C", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("C.m")]),
-                ], dependencies: ["B"])
-            ])
+                TestStandardTarget(
+                    "A",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("A.m")])
+                    ]
+                ),
+                TestStandardTarget(
+                    "B",
+                    type: .framework,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "EAGER_COMPILATION_DISABLE": "true"
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("B.m")])
+                    ],
+                    dependencies: ["A"]
+                ),
+                TestStandardTarget(
+                    "C",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("C.m")])
+                    ],
+                    dependencies: ["B"]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let parameters = BuildParameters(configuration: "Debug")
@@ -717,29 +963,51 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
     func eagerCompilationDisabledAndRequiredByTarget() async throws {
         let testProject = TestProject(
             "aProject",
-            groupTree: TestGroup("Sources", path: "Sources", children: [
-                TestFile("A.m"),
-                TestFile("B.m"),
-            ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "ALWAYS_SEARCH_USER_PATHS": "false",
-                    "EAGER_COMPILATION_REQUIRE": "true",
+            groupTree: TestGroup(
+                "Sources",
+                path: "Sources",
+                children: [
+                    TestFile("A.m"),
+                    TestFile("B.m"),
                 ]
-            )],
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ALWAYS_SEARCH_USER_PATHS": "false",
+                        "EAGER_COMPILATION_REQUIRE": "true",
+                    ]
+                )
+            ],
             targets: [
-                TestStandardTarget("A", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("A.m")]),
-                ]),
-                TestStandardTarget("B", type: .framework, buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: [
-                    "EAGER_COMPILATION_DISABLE": "true",
-                ])], buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("B.m")]),
-                ], dependencies: ["A"]),
-            ])
+                TestStandardTarget(
+                    "A",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("A.m")])
+                    ]
+                ),
+                TestStandardTarget(
+                    "B",
+                    type: .framework,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "EAGER_COMPILATION_DISABLE": "true"
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("B.m")])
+                    ],
+                    dependencies: ["A"]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let parameters = BuildParameters(configuration: "Debug")
@@ -755,28 +1023,44 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
     func eagerCompilationRequiredByTarget() async throws {
         let testProject = TestProject(
             "aProject",
-            groupTree: TestGroup("Sources", path: "Sources", children: [
-                TestFile("A.m"),
-                TestFile("B.m"),
-            ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "ALWAYS_SEARCH_USER_PATHS": "false",
-                    "EAGER_COMPILATION_REQUIRE": "true",
+            groupTree: TestGroup(
+                "Sources",
+                path: "Sources",
+                children: [
+                    TestFile("A.m"),
+                    TestFile("B.m"),
                 ]
-            )],
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ALWAYS_SEARCH_USER_PATHS": "false",
+                        "EAGER_COMPILATION_REQUIRE": "true",
+                    ]
+                )
+            ],
             targets: [
-                TestStandardTarget("A", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("A.m")]),
-                    TestShellScriptBuildPhase(name: "Run Script", originalObjectID: "abcd", contents: "echo foo", alwaysOutOfDate: true),
-                ]),
-                TestStandardTarget("B", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("B.m")]),
-                ], dependencies: ["A"]),
-            ])
+                TestStandardTarget(
+                    "A",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("A.m")]),
+                        TestShellScriptBuildPhase(name: "Run Script", originalObjectID: "abcd", contents: "echo foo", alwaysOutOfDate: true),
+                    ]
+                ),
+                TestStandardTarget(
+                    "B",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("B.m")])
+                    ],
+                    dependencies: ["A"]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let parameters = BuildParameters(configuration: "Debug")
@@ -799,23 +1083,36 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
                     TestFile("A.h"),
                     TestFile("A.c"),
                     TestFile("B.c"),
-                ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "ALWAYS_SEARCH_USER_PATHS": "false",
-                    "EAGER_COMPILATION_REQUIRE": "YES",
-                ])],
+                ]
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ALWAYS_SEARCH_USER_PATHS": "false",
+                        "EAGER_COMPILATION_REQUIRE": "YES",
+                    ]
+                )
+            ],
             targets: [
-                TestStandardTarget("A", type: .framework, buildPhases: [
-                    TestHeadersBuildPhase([TestBuildFile("A.h", headerVisibility: .public)]),
-                    TestSourcesBuildPhase([TestBuildFile("A.c")]),
-                ]),
-                TestStandardTarget("B", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([TestBuildFile("B.c")]),
-                ], dependencies: ["A"]),
+                TestStandardTarget(
+                    "A",
+                    type: .framework,
+                    buildPhases: [
+                        TestHeadersBuildPhase([TestBuildFile("A.h", headerVisibility: .public)]),
+                        TestSourcesBuildPhase([TestBuildFile("A.c")]),
+                    ]
+                ),
+                TestStandardTarget(
+                    "B",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("B.c")])
+                    ],
+                    dependencies: ["A"]
+                ),
             ]
         )
 
@@ -856,23 +1153,36 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
                     children: [
                         TestFile("A.c"),
                         TestFile("B.c"),
-                    ]),
-                buildConfigurations: [TestBuildConfiguration(
-                    "Debug",
-                    buildSettings: [
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ALWAYS_SEARCH_USER_PATHS": "false",
-                        "EAGER_COMPILATION_REQUIRE": "NO",
-                    ])],
+                    ]
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ALWAYS_SEARCH_USER_PATHS": "false",
+                            "EAGER_COMPILATION_REQUIRE": "NO",
+                        ]
+                    )
+                ],
                 targets: [
-                    TestStandardTarget("A", type: .framework, buildPhases: [
-                        TestShellScriptBuildPhase(name: "Run Script Phase", originalObjectID: "abc", contents: "echo \"Hello world\"", inputs: [], outputs: [sourceRoot.join("Sources").join("A.h").str]),
-                        TestSourcesBuildPhase([TestBuildFile("A.c")])
-                    ]),
-                    TestStandardTarget("B", type: .framework, buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("B.c")])
-                    ], dependencies: ["A"]),
+                    TestStandardTarget(
+                        "A",
+                        type: .framework,
+                        buildPhases: [
+                            TestShellScriptBuildPhase(name: "Run Script Phase", originalObjectID: "abc", contents: "echo \"Hello world\"", inputs: [], outputs: [sourceRoot.join("Sources").join("A.h").str]),
+                            TestSourcesBuildPhase([TestBuildFile("A.c")]),
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "B",
+                        type: .framework,
+                        buildPhases: [
+                            TestSourcesBuildPhase([TestBuildFile("B.c")])
+                        ],
+                        dependencies: ["A"]
+                    ),
                 ]
             )
 
@@ -922,23 +1232,36 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
                         TestFile("A.swift"),
                         TestFile("B.h"),
                         TestFile("B.c"),
-                    ]),
-                buildConfigurations: [TestBuildConfiguration(
-                    "Debug",
-                    buildSettings: [
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ALWAYS_SEARCH_USER_PATHS": "false",
-                        "SWIFT_EXEC": swiftCompilerPath.str,
-                        "SWIFT_VERSION": "5.1",
-                    ])],
+                    ]
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ALWAYS_SEARCH_USER_PATHS": "false",
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": "5.1",
+                        ]
+                    )
+                ],
                 targets: [
-                    TestStandardTarget("A", type: .framework, buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("A.c"), TestBuildFile("A.swift")])
-                    ]),
-                    TestStandardTarget("B", type: .framework, buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("B.c")])
-                    ], dependencies: ["A"]),
+                    TestStandardTarget(
+                        "A",
+                        type: .framework,
+                        buildPhases: [
+                            TestSourcesBuildPhase([TestBuildFile("A.c"), TestBuildFile("A.swift")])
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "B",
+                        type: .framework,
+                        buildPhases: [
+                            TestSourcesBuildPhase([TestBuildFile("B.c")])
+                        ],
+                        dependencies: ["A"]
+                    ),
                 ]
             )
 
@@ -994,29 +1317,52 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
                         TestFile("D.swift"),
                         TestFile("D.h"),
                         TestFile("D.c"),
-                    ]),
-                buildConfigurations: [TestBuildConfiguration(
-                    "Debug",
-                    buildSettings: [
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ALWAYS_SEARCH_USER_PATHS": "false",
-                        "SWIFT_EXEC": swiftCompilerPath.str,
-                        "SWIFT_VERSION": "5.1",
-                    ])],
+                    ]
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ALWAYS_SEARCH_USER_PATHS": "false",
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": "5.1",
+                        ]
+                    )
+                ],
                 targets: [
-                    TestStandardTarget("A", type: .framework, buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("A.c"), TestBuildFile("A.swift")])
-                    ]),
-                    TestStandardTarget("B", type: .framework, buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("B.c")])
-                    ], dependencies: ["A"]),
-                    TestStandardTarget("C", type: .framework, buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("C.c")])
-                    ], dependencies: ["A"]),
-                    TestStandardTarget("D", type: .framework, buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("D.c"), TestBuildFile("D.swift")])
-                    ], dependencies: ["C"]),
+                    TestStandardTarget(
+                        "A",
+                        type: .framework,
+                        buildPhases: [
+                            TestSourcesBuildPhase([TestBuildFile("A.c"), TestBuildFile("A.swift")])
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "B",
+                        type: .framework,
+                        buildPhases: [
+                            TestSourcesBuildPhase([TestBuildFile("B.c")])
+                        ],
+                        dependencies: ["A"]
+                    ),
+                    TestStandardTarget(
+                        "C",
+                        type: .framework,
+                        buildPhases: [
+                            TestSourcesBuildPhase([TestBuildFile("C.c")])
+                        ],
+                        dependencies: ["A"]
+                    ),
+                    TestStandardTarget(
+                        "D",
+                        type: .framework,
+                        buildPhases: [
+                            TestSourcesBuildPhase([TestBuildFile("D.c"), TestBuildFile("D.swift")])
+                        ],
+                        dependencies: ["C"]
+                    ),
                 ]
             )
 
@@ -1051,7 +1397,7 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
                     .gateTask("A", suffix: "begin-compiling"),
                     .emitSwiftCompilationRequirements("A"),
                     .compileC("A", fileName: "A.c"),
-                    .gateTask("A", suffix: "end")
+                    .gateTask("A", suffix: "end"),
                 ])
 
                 // target A module ready
@@ -1091,12 +1437,16 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
                 ])
 
                 // compiling should be done in parallel
-                noDependency(from: .compileC("B", fileName: "B.c"),
-                             to: .compileC("A", fileName: "A.c"))
+                noDependency(
+                    from: .compileC("B", fileName: "B.c"),
+                    to: .compileC("A", fileName: "A.c")
+                )
 
                 // modules ready should not depend on compiling C
-                noDependency(from: .gateTask("A", suffix: "modules-ready"),
-                             to: .compileC("A", fileName: "A.c"))
+                noDependency(
+                    from: .gateTask("A", suffix: "modules-ready"),
+                    to: .compileC("A", fileName: "A.c")
+                )
             }
         }
     }
@@ -1118,31 +1468,47 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
                         TestFile("A.pch"),
                         TestFile("B.c"),
                         TestFile("B.pch"),
-                    ]),
-                buildConfigurations: [TestBuildConfiguration(
-                    "Debug",
-                    buildSettings: [
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ALWAYS_SEARCH_USER_PATHS": "false",
-                        "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
-                    ])],
+                    ]
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ALWAYS_SEARCH_USER_PATHS": "false",
+                            "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
+                        ]
+                    )
+                ],
                 targets: [
-                    TestStandardTarget("A",
-                                       type: .framework,
-                                       buildConfigurations: [TestBuildConfiguration("Debug",
-                                                                                    buildSettings: ["GCC_PREFIX_HEADER": "Sources/A.pch"])],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase([TestBuildFile("A.c")])
-                                       ]),
-                    TestStandardTarget("B",
-                                       type: .framework,
-                                       buildConfigurations: [TestBuildConfiguration("Debug",
-                                                                                    buildSettings: ["GCC_PREFIX_HEADER": "Sources/B.pch"])],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase([TestBuildFile("B.c")])
-                                       ],
-                                       dependencies: ["A"]),
+                    TestStandardTarget(
+                        "A",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: ["GCC_PREFIX_HEADER": "Sources/A.pch"]
+                            )
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase([TestBuildFile("A.c")])
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "B",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: ["GCC_PREFIX_HEADER": "Sources/B.pch"]
+                            )
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase([TestBuildFile("B.c")])
+                        ],
+                        dependencies: ["A"]
+                    ),
                 ]
             )
 
@@ -1192,61 +1558,72 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
                         TestFile("B.swift"),
                         TestFile("C.h"),
                         TestFile("C.m"),
-                    ]),
-                buildConfigurations: [TestBuildConfiguration(
-                    "Debug",
-                    buildSettings: [
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ALWAYS_SEARCH_USER_PATHS": "false",
-                        "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
-                        "SWIFT_EXEC": swiftCompilerPath.str,
-                        "SWIFT_VERSION": "5.2",
-                        "INTENTS_CODEGEN_LANGUAGE": "Objective-C",
-                        "COREML_CODEGEN_LANGUAGE": "Objective-C",
-                    ])],
+                    ]
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ALWAYS_SEARCH_USER_PATHS": "false",
+                            "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": "5.2",
+                            "INTENTS_CODEGEN_LANGUAGE": "Objective-C",
+                            "COREML_CODEGEN_LANGUAGE": "Objective-C",
+                        ]
+                    )
+                ],
                 targets: [
-                    TestStandardTarget("CodegenFramework",
-                                       type: .framework,
-                                       buildConfigurations: [TestBuildConfiguration("Debug")],
-                                       buildPhases: [
-                                        TestHeadersBuildPhase([]),
-                                        TestSourcesBuildPhase([
-                                            TestBuildFile("A.intentdefinition", intentsCodegenVisibility: .public),
-                                            TestBuildFile("A.mlmodel", intentsCodegenVisibility: .public),
-                                        ])
-                                       ]
-                                      ),
-                    TestStandardTarget("A",
-                                       type: .framework,
-                                       buildConfigurations: [TestBuildConfiguration("Debug")],
-                                       buildPhases: [
-                                        TestHeadersBuildPhase([TestBuildFile("A.h", headerVisibility: .public)]),
-                                        TestSourcesBuildPhase([
-                                            TestBuildFile("A.c"),
-                                            TestBuildFile("A.swift"),
-                                            TestBuildFile("A.intentdefinition", intentsCodegenVisibility: .public),
-                                        ])
-                                       ]),
-                    TestStandardTarget("B",
-                                       type: .framework,
-                                       buildConfigurations: [TestBuildConfiguration("Debug")],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase([
-                                            TestBuildFile("B.c"),
-                                            TestBuildFile("B.swift"),
-                                        ])
-                                       ],
-                                       dependencies: ["A"]),
-                    TestStandardTarget("C",
-                                       type: .applicationExtension,
-                                       buildConfigurations: [TestBuildConfiguration("Debug")],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase([
-                                            TestBuildFile("C.m"),
-                                        ])
-                                       ],
-                                       dependencies: ["CodegenFramework"]),
+                    TestStandardTarget(
+                        "CodegenFramework",
+                        type: .framework,
+                        buildConfigurations: [TestBuildConfiguration("Debug")],
+                        buildPhases: [
+                            TestHeadersBuildPhase([]),
+                            TestSourcesBuildPhase([
+                                TestBuildFile("A.intentdefinition", intentsCodegenVisibility: .public),
+                                TestBuildFile("A.mlmodel", intentsCodegenVisibility: .public),
+                            ]),
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "A",
+                        type: .framework,
+                        buildConfigurations: [TestBuildConfiguration("Debug")],
+                        buildPhases: [
+                            TestHeadersBuildPhase([TestBuildFile("A.h", headerVisibility: .public)]),
+                            TestSourcesBuildPhase([
+                                TestBuildFile("A.c"),
+                                TestBuildFile("A.swift"),
+                                TestBuildFile("A.intentdefinition", intentsCodegenVisibility: .public),
+                            ]),
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "B",
+                        type: .framework,
+                        buildConfigurations: [TestBuildConfiguration("Debug")],
+                        buildPhases: [
+                            TestSourcesBuildPhase([
+                                TestBuildFile("B.c"),
+                                TestBuildFile("B.swift"),
+                            ])
+                        ],
+                        dependencies: ["A"]
+                    ),
+                    TestStandardTarget(
+                        "C",
+                        type: .applicationExtension,
+                        buildConfigurations: [TestBuildConfiguration("Debug")],
+                        buildPhases: [
+                            TestSourcesBuildPhase([
+                                TestBuildFile("C.m")
+                            ])
+                        ],
+                        dependencies: ["CodegenFramework"]
+                    ),
                 ]
             )
 
@@ -1256,14 +1633,15 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
             let buildRequest = BuildRequest(parameters: parameters, buildTargets: tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }), continueBuildingAfterErrors: true, useParallelTargets: true, useImplicitDependencies: false, useDryRun: false)
 
             final class Delegate: MockTestTaskPlanningClientDelegate, @unchecked Sendable {
-                override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+                override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
                     switch commandLine.first.map(Path.init)?.basename {
                     case "intentbuilderc"?:
                         do {
                             if let outputDir = commandLine.elementAfterElements(["-output"]).map(Path.init),
-                               let classPrefix = commandLine.elementAfterElements(["-classPrefix"]),
-                               let language = commandLine.elementAfterElements(["-language"]),
-                               let visibility = commandLine.elementAfterElements(["-visibility"]) {
+                                let classPrefix = commandLine.elementAfterElements(["-classPrefix"]),
+                                let language = commandLine.elementAfterElements(["-language"]),
+                                let visibility = commandLine.elementAfterElements(["-visibility"])
+                            {
                                 if visibility != "public" {
                                     throw StubError.error("Visibility should be public")
                                 }
@@ -1358,39 +1736,47 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
                         TestFile("A.c"),
                         TestFile("B.c"),
                         TestFile("B.swift"),
-                    ]),
-                buildConfigurations: [TestBuildConfiguration(
-                    "Debug",
-                    buildSettings: [
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ALWAYS_SEARCH_USER_PATHS": "false",
-                        "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
-                        "SWIFT_EXEC": swiftCompilerPath.str,
-                        "SWIFT_VERSION": "5.2",
-                    ])],
+                    ]
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ALWAYS_SEARCH_USER_PATHS": "false",
+                            "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": "5.2",
+                        ]
+                    )
+                ],
                 targets: [
-                    TestStandardTarget("A",
-                                       type: .framework,
-                                       buildConfigurations: [TestBuildConfiguration("Debug")],
-                                       buildPhases: [
-                                        TestHeadersBuildPhase([TestBuildFile("A.h", headerVisibility: .public)]),
-                                        TestSourcesBuildPhase([
-                                            TestBuildFile("A.c"),
-                                            TestBuildFile("A.swift"),
-                                            TestBuildFile("A.y"),
-                                        ])
-                                       ]),
-                    TestStandardTarget("B",
-                                       type: .framework,
-                                       buildConfigurations: [TestBuildConfiguration("Debug")],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase([
-                                            TestBuildFile("B.c"),
-                                            TestBuildFile("B.swift"),
-                                        ])
-                                       ],
-                                       dependencies: ["A"]),
+                    TestStandardTarget(
+                        "A",
+                        type: .framework,
+                        buildConfigurations: [TestBuildConfiguration("Debug")],
+                        buildPhases: [
+                            TestHeadersBuildPhase([TestBuildFile("A.h", headerVisibility: .public)]),
+                            TestSourcesBuildPhase([
+                                TestBuildFile("A.c"),
+                                TestBuildFile("A.swift"),
+                                TestBuildFile("A.y"),
+                            ]),
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "B",
+                        type: .framework,
+                        buildConfigurations: [TestBuildConfiguration("Debug")],
+                        buildPhases: [
+                            TestSourcesBuildPhase([
+                                TestBuildFile("B.c"),
+                                TestBuildFile("B.swift"),
+                            ])
+                        ],
+                        dependencies: ["A"]
+                    ),
                 ]
             )
 
@@ -1446,42 +1832,50 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
                         TestFile("A.c"),
                         TestFile("B.c"),
                         TestFile("B.swift"),
-                    ]),
-                buildConfigurations: [TestBuildConfiguration(
-                    "Debug",
-                    buildSettings: [
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ALWAYS_SEARCH_USER_PATHS": "false",
-                        "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
-                        "SWIFT_EXEC": swiftCompilerPath.str,
-                        "SWIFT_VERSION": "5.2",
-                    ])],
+                    ]
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ALWAYS_SEARCH_USER_PATHS": "false",
+                            "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": "5.2",
+                        ]
+                    )
+                ],
                 targets: [
-                    TestStandardTarget("A",
-                                       type: .framework,
-                                       buildConfigurations: [TestBuildConfiguration("Debug")],
-                                       buildPhases: [
-                                        TestHeadersBuildPhase([TestBuildFile("A.h", headerVisibility: .public)]),
-                                        TestSourcesBuildPhase([
-                                            TestBuildFile("A.c"),
-                                            TestBuildFile("A.swift"),
-                                            TestBuildFile("A.fake-foo"),
-                                        ])
-                                       ],
-                                       buildRules: [
-                                        TestBuildRule(filePattern: "*.fake-foo", script: "cp ${SCRIPT_INPUT_FILE} ${SCRIPT_OUTPUT_FILE_0}", outputs: ["$(DERIVED_FILE_DIR)/$(INPUT_FILE_NAME).h"])
-                                       ]),
-                    TestStandardTarget("B",
-                                       type: .framework,
-                                       buildConfigurations: [TestBuildConfiguration("Debug")],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase([
-                                            TestBuildFile("B.c"),
-                                            TestBuildFile("B.swift"),
-                                        ])
-                                       ],
-                                       dependencies: ["A"]),
+                    TestStandardTarget(
+                        "A",
+                        type: .framework,
+                        buildConfigurations: [TestBuildConfiguration("Debug")],
+                        buildPhases: [
+                            TestHeadersBuildPhase([TestBuildFile("A.h", headerVisibility: .public)]),
+                            TestSourcesBuildPhase([
+                                TestBuildFile("A.c"),
+                                TestBuildFile("A.swift"),
+                                TestBuildFile("A.fake-foo"),
+                            ]),
+                        ],
+                        buildRules: [
+                            TestBuildRule(filePattern: "*.fake-foo", script: "cp ${SCRIPT_INPUT_FILE} ${SCRIPT_OUTPUT_FILE_0}", outputs: ["$(DERIVED_FILE_DIR)/$(INPUT_FILE_NAME).h"])
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "B",
+                        type: .framework,
+                        buildConfigurations: [TestBuildConfiguration("Debug")],
+                        buildPhases: [
+                            TestSourcesBuildPhase([
+                                TestBuildFile("B.c"),
+                                TestBuildFile("B.swift"),
+                            ])
+                        ],
+                        dependencies: ["A"]
+                    ),
                 ]
             )
 
@@ -1532,47 +1926,57 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
                         TestFile("A.c"),
                         TestFile("B.c"),
                         TestFile("B.swift"),
-                    ]),
-                buildConfigurations: [TestBuildConfiguration(
-                    "Debug",
-                    buildSettings: [
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ALWAYS_SEARCH_USER_PATHS": "false",
-                        "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
-                        "SWIFT_EXEC": swiftCompilerPath.str,
-                        "SWIFT_VERSION": "5.2",
-                    ])],
+                    ]
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ALWAYS_SEARCH_USER_PATHS": "false",
+                            "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": "5.2",
+                        ]
+                    )
+                ],
                 targets: [
-                    TestStandardTarget("A",
-                                       type: .framework,
-                                       buildConfigurations: [TestBuildConfiguration("Debug")],
-                                       buildPhases: [
-                                        TestHeadersBuildPhase([TestBuildFile("A.h", headerVisibility: .public)]),
-                                        TestShellScriptBuildPhase(name: "Generate Header",
-                                                                  originalObjectID: "foobar123",
-                                                                  contents: """
-                                                                cat << EOF > #{SCRIPT_OUTPUT_FILE_0}
-                                                                @import Foundation;
-                                                                NSString *_Nonnull globalGeneratedFunction() { return @"I'm generated."; }
-                                                                EOF
-                                                                """,
-                                                                  outputs: ["$(DERIVED_FILE_DIR)/Generated/OutputFile.h"]),
-                                        TestSourcesBuildPhase([
-                                            TestBuildFile("A.c"),
-                                            TestBuildFile("A.swift"),
-                                        ])
-                                       ]),
-                    TestStandardTarget("B",
-                                       type: .framework,
-                                       buildConfigurations: [TestBuildConfiguration("Debug")],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase([
-                                            TestBuildFile("B.c"),
-                                            TestBuildFile("B.swift"),
-                                        ])
-                                       ],
-                                       dependencies: ["A"]),
+                    TestStandardTarget(
+                        "A",
+                        type: .framework,
+                        buildConfigurations: [TestBuildConfiguration("Debug")],
+                        buildPhases: [
+                            TestHeadersBuildPhase([TestBuildFile("A.h", headerVisibility: .public)]),
+                            TestShellScriptBuildPhase(
+                                name: "Generate Header",
+                                originalObjectID: "foobar123",
+                                contents: """
+                                    cat << EOF > #{SCRIPT_OUTPUT_FILE_0}
+                                    @import Foundation;
+                                    NSString *_Nonnull globalGeneratedFunction() { return @"I'm generated."; }
+                                    EOF
+                                    """,
+                                outputs: ["$(DERIVED_FILE_DIR)/Generated/OutputFile.h"]
+                            ),
+                            TestSourcesBuildPhase([
+                                TestBuildFile("A.c"),
+                                TestBuildFile("A.swift"),
+                            ]),
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "B",
+                        type: .framework,
+                        buildConfigurations: [TestBuildConfiguration("Debug")],
+                        buildPhases: [
+                            TestSourcesBuildPhase([
+                                TestBuildFile("B.c"),
+                                TestBuildFile("B.swift"),
+                            ])
+                        ],
+                        dependencies: ["A"]
+                    ),
                 ]
             )
 
@@ -1613,37 +2017,49 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS))
     func generateHeaderTaskOrdering() async throws {
         try await withTemporaryDirectory { srcroot in
-            let testProject = TestProject("aProject",
-                                          sourceRoot: srcroot,
-                                          groupTree: TestGroup("SomeFiles", path: "Sources",
-                                                               children: [
-                                                                TestFile("A.h"),
-                                                               ]),
-                                          buildConfigurations: [
-                                            TestBuildConfiguration("Debug",
-                                                                   buildSettings: [
-                                                                    "GENERATE_INFOPLIST_FILE": "YES",
-                                                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                                    "EAGER_COMPILATION_REQUIRE": "YES",
-                                                                    "EAGER_COMPILATION_ALLOW_SCRIPTS": "YES",
-                                                                   ]),
-                                          ],
-                                          targets: [
-                                            TestStandardTarget("A",
-                                                               type: .framework,
-                                                               buildConfigurations: [
-                                                                TestBuildConfiguration("Debug"),
-                                                               ],
-                                                               buildPhases: [
-                                                                TestShellScriptBuildPhase(name: "Generate A.h",
-                                                                                          originalObjectID: "script1",
-                                                                                          contents: "echo \"\" > ${SCRIPT_OUTPUT_FILE_0}",
-                                                                                          inputs: [],
-                                                                                          outputs: [srcroot.join("Sources").join("A.h").str]),
-                                                                TestHeadersBuildPhase([
-                                                                    TestBuildFile("A.h", headerVisibility: .public)]),
-                                                               ]),
-                                          ])
+            let testProject = TestProject(
+                "aProject",
+                sourceRoot: srcroot,
+                groupTree: TestGroup(
+                    "SomeFiles",
+                    path: "Sources",
+                    children: [
+                        TestFile("A.h")
+                    ]
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "EAGER_COMPILATION_REQUIRE": "YES",
+                            "EAGER_COMPILATION_ALLOW_SCRIPTS": "YES",
+                        ]
+                    )
+                ],
+                targets: [
+                    TestStandardTarget(
+                        "A",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug")
+                        ],
+                        buildPhases: [
+                            TestShellScriptBuildPhase(
+                                name: "Generate A.h",
+                                originalObjectID: "script1",
+                                contents: "echo \"\" > ${SCRIPT_OUTPUT_FILE_0}",
+                                inputs: [],
+                                outputs: [srcroot.join("Sources").join("A.h").str]
+                            ),
+                            TestHeadersBuildPhase([
+                                TestBuildFile("A.h", headerVisibility: .public)
+                            ]),
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -1665,55 +2081,68 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
     func swiftEagerCompilation() async throws {
         // This tests only the task construction side of eager compilation
         try await withTemporaryDirectory { tmpDir in
-            let testProject = try await TestProject("aProject",
-                                                    sourceRoot: tmpDir,
-                                                    groupTree: TestGroup("SomeFiles", path: "Sources",
-                                                                         children: [
-                                                                            TestFile("A.swift"),
-                                                                            TestFile("B.swift"),
-                                                                            TestFile("C.swift"),
-                                                                         ]),
-                                                    buildConfigurations: [
-                                                        TestBuildConfiguration("Debug",
-                                                                               buildSettings: [
-                                                                                "GENERATE_INFOPLIST_FILE": "YES",
-                                                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                                                                "SWIFT_VERSION": swiftVersion,
-                                                                                "TAPI_EXEC": tapiToolPath.str,
-
-                                                                                "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                                                               ]),
-                                                    ],
-                                                    targets: [
-                                                        TestStandardTarget("A",
-                                                                           type: .framework,
-                                                                           buildConfigurations: [
-                                                                            TestBuildConfiguration("Debug"),
-                                                                           ],
-                                                                           buildPhases: [
-                                                                            TestSourcesBuildPhase(["A.swift"]),
-                                                                           ]),
-
-                                                        TestStandardTarget("B",
-                                                                           type: .framework,
-                                                                           buildConfigurations: [
-                                                                            TestBuildConfiguration("Debug"),
-                                                                           ],
-                                                                           buildPhases: [
-                                                                            TestSourcesBuildPhase(["B.swift"]),
-                                                                           ],
-                                                                           dependencies: ["A"]),
-
-                                                        TestStandardTarget("C",
-                                                                           type: .framework,
-                                                                           buildConfigurations: [
-                                                                            TestBuildConfiguration("Debug"),
-                                                                           ],
-                                                                           buildPhases: [
-                                                                            TestSourcesBuildPhase(["C.swift"]),
-                                                                           ]),
-                                                    ])
+            let testProject = try await TestProject(
+                "aProject",
+                sourceRoot: tmpDir,
+                groupTree: TestGroup(
+                    "SomeFiles",
+                    path: "Sources",
+                    children: [
+                        TestFile("A.swift"),
+                        TestFile("B.swift"),
+                        TestFile("C.swift"),
+                    ]
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": swiftVersion,
+                            "TAPI_EXEC": tapiToolPath.str,
+
+                            "SWIFT_USE_INTEGRATED_DRIVER": "YES",
+                        ]
+                    )
+                ],
+                targets: [
+                    TestStandardTarget(
+                        "A",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug")
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["A.swift"])
+                        ]
+                    ),
+
+                    TestStandardTarget(
+                        "B",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug")
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["B.swift"])
+                        ],
+                        dependencies: ["A"]
+                    ),
+
+                    TestStandardTarget(
+                        "C",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug")
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["C.swift"])
+                        ]
+                    ),
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let parameters = BuildParameters(configuration: "Debug")
@@ -1730,11 +2159,11 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
                     let compilationRequirementTargetB = results.getTask(.matchTargetName("B"), .matchRuleType(compilationRequirementRuleInfoType)),
                     let compilationRequirementTargetC = results.getTask(.matchTargetName("C"), .matchRuleType(compilationRequirementRuleInfoType)),
 
-                        let compilationTargetA = results.getTask(.matchTargetName("A"), .matchRuleType(compilationRuleInfoType)),
+                    let compilationTargetA = results.getTask(.matchTargetName("A"), .matchRuleType(compilationRuleInfoType)),
                     let compilationTargetB = results.getTask(.matchTargetName("B"), .matchRuleType(compilationRuleInfoType)),
                     let compilationTargetC = results.getTask(.matchTargetName("C"), .matchRuleType(compilationRuleInfoType)),
 
-                        let linkingTargetA = results.getTask(.matchTargetName("A"), .matchRuleType(linkingRuleInfoType)),
+                    let linkingTargetA = results.getTask(.matchTargetName("A"), .matchRuleType(linkingRuleInfoType)),
                     let linkingTargetB = results.getTask(.matchTargetName("B"), .matchRuleType(linkingRuleInfoType)),
                     let linkingTargetC = results.getTask(.matchTargetName("C"), .matchRuleType(linkingRuleInfoType))
                 else {
@@ -1799,7 +2228,8 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
                 children: [
                     TestFile("Swift.swift"),
                     TestFile("ObjC.m"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -1809,14 +2239,19 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
                         "SWIFT_OBJC_INTERFACE_HEADER_NAME": "Header-Swift.h",
-                    ])],
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildPhases: [
-                        TestSourcesBuildPhase(["Swift.swift", "ObjC.m"]),
-                    ])])
+                        TestSourcesBuildPhase(["Swift.swift", "ObjC.m"])
+                    ]
+                )
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
@@ -1842,55 +2277,68 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
     func swiftEagerCompilation_WMO() async throws {
         // This tests only the task construction side of eager compilation
         try await withTemporaryDirectory { tmpDir in
-            let testProject = try await TestProject("aProject",
-                                                    sourceRoot: tmpDir,
-                                                    groupTree: TestGroup("SomeFiles", path: "Sources",
-                                                                         children: [
-                                                                            TestFile("A.swift"),
-                                                                            TestFile("B.swift"),
-                                                                            TestFile("C.swift"),
-                                                                         ]),
-                                                    buildConfigurations: [
-                                                        TestBuildConfiguration("Debug",
-                                                                               buildSettings: [
-                                                                                "GENERATE_INFOPLIST_FILE": "YES",
-                                                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                                                                "SWIFT_VERSION": swiftVersion,
-                                                                                "SWIFT_ENABLE_LIBRARY_EVOLUTION": "YES",
-                                                                                "TAPI_EXEC": tapiToolPath.str,
-                                                                                "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                                                               ]),
-                                                    ],
-                                                    targets: [
-                                                        TestStandardTarget("A",
-                                                                           type: .framework,
-                                                                           buildConfigurations: [
-                                                                            TestBuildConfiguration("Debug"),
-                                                                           ],
-                                                                           buildPhases: [
-                                                                            TestSourcesBuildPhase(["A.swift"]),
-                                                                           ]),
-
-                                                        TestStandardTarget("B",
-                                                                           type: .framework,
-                                                                           buildConfigurations: [
-                                                                            TestBuildConfiguration("Debug"),
-                                                                           ],
-                                                                           buildPhases: [
-                                                                            TestSourcesBuildPhase(["B.swift"]),
-                                                                           ],
-                                                                           dependencies: ["A"]),
-
-                                                        TestStandardTarget("C",
-                                                                           type: .framework,
-                                                                           buildConfigurations: [
-                                                                            TestBuildConfiguration("Debug"),
-                                                                           ],
-                                                                           buildPhases: [
-                                                                            TestSourcesBuildPhase(["C.swift"]),
-                                                                           ]),
-                                                    ])
+            let testProject = try await TestProject(
+                "aProject",
+                sourceRoot: tmpDir,
+                groupTree: TestGroup(
+                    "SomeFiles",
+                    path: "Sources",
+                    children: [
+                        TestFile("A.swift"),
+                        TestFile("B.swift"),
+                        TestFile("C.swift"),
+                    ]
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": swiftVersion,
+                            "SWIFT_ENABLE_LIBRARY_EVOLUTION": "YES",
+                            "TAPI_EXEC": tapiToolPath.str,
+                            "SWIFT_USE_INTEGRATED_DRIVER": "YES",
+                        ]
+                    )
+                ],
+                targets: [
+                    TestStandardTarget(
+                        "A",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug")
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["A.swift"])
+                        ]
+                    ),
+
+                    TestStandardTarget(
+                        "B",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug")
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["B.swift"])
+                        ],
+                        dependencies: ["A"]
+                    ),
+
+                    TestStandardTarget(
+                        "C",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug")
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["C.swift"])
+                        ]
+                    ),
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let parameters = BuildParameters(configuration: "Debug")
@@ -1907,11 +2355,11 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
                     let compilationRequirementTargetB = results.getTask(.matchTargetName("B"), .matchRuleType(compilationRequirementRuleInfoType)),
                     let compilationRequirementTargetC = results.getTask(.matchTargetName("C"), .matchRuleType(compilationRequirementRuleInfoType)),
 
-                        let compilationTargetA = results.getTask(.matchTargetName("A"), .matchRuleType(compilationRuleInfoType)),
+                    let compilationTargetA = results.getTask(.matchTargetName("A"), .matchRuleType(compilationRuleInfoType)),
                     let compilationTargetB = results.getTask(.matchTargetName("B"), .matchRuleType(compilationRuleInfoType)),
                     let compilationTargetC = results.getTask(.matchTargetName("C"), .matchRuleType(compilationRuleInfoType)),
 
-                        let linkingTargetA = results.getTask(.matchTargetName("A"), .matchRuleType(linkingRuleInfoType)),
+                    let linkingTargetA = results.getTask(.matchTargetName("A"), .matchRuleType(linkingRuleInfoType)),
                     let linkingTargetB = results.getTask(.matchTargetName("B"), .matchRuleType(linkingRuleInfoType)),
                     let linkingTargetC = results.getTask(.matchTargetName("C"), .matchRuleType(linkingRuleInfoType))
                 else {
@@ -1971,56 +2419,69 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS), .requireLLBuild(apiVersion: 12))
     func swiftEagerCompilation_explicitModules() async throws {
         try await withTemporaryDirectory { tmpDir in
-            let testProject = try await TestProject("aProject",
-                                                    sourceRoot: tmpDir,
-                                                    groupTree: TestGroup("SomeFiles", path: "Sources",
-                                                                         children: [
-                                                                            TestFile("A.swift"),
-                                                                            TestFile("B.swift"),
-                                                                            TestFile("C.swift"),
-                                                                         ]),
-                                                    buildConfigurations: [
-                                                        TestBuildConfiguration("Debug",
-                                                                               buildSettings: [
-                                                                                "GENERATE_INFOPLIST_FILE": "YES",
-                                                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                                                                "SWIFT_VERSION": swiftVersion,
-                                                                                "TAPI_EXEC": tapiToolPath.str,
-
-                                                                                "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                                                                                "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                                                                               ]),
-                                                    ],
-                                                    targets: [
-                                                        TestStandardTarget("A",
-                                                                           type: .framework,
-                                                                           buildConfigurations: [
-                                                                            TestBuildConfiguration("Debug"),
-                                                                           ],
-                                                                           buildPhases: [
-                                                                            TestSourcesBuildPhase(["A.swift"]),
-                                                                           ]),
-
-                                                        TestStandardTarget("B",
-                                                                           type: .framework,
-                                                                           buildConfigurations: [
-                                                                            TestBuildConfiguration("Debug"),
-                                                                           ],
-                                                                           buildPhases: [
-                                                                            TestSourcesBuildPhase(["B.swift"]),
-                                                                           ],
-                                                                           dependencies: ["A"]),
-
-                                                        TestStandardTarget("C",
-                                                                           type: .framework,
-                                                                           buildConfigurations: [
-                                                                            TestBuildConfiguration("Debug"),
-                                                                           ],
-                                                                           buildPhases: [
-                                                                            TestSourcesBuildPhase(["C.swift"]),
-                                                                           ]),
-                                                    ])
+            let testProject = try await TestProject(
+                "aProject",
+                sourceRoot: tmpDir,
+                groupTree: TestGroup(
+                    "SomeFiles",
+                    path: "Sources",
+                    children: [
+                        TestFile("A.swift"),
+                        TestFile("B.swift"),
+                        TestFile("C.swift"),
+                    ]
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": swiftVersion,
+                            "TAPI_EXEC": tapiToolPath.str,
+
+                            "SWIFT_USE_INTEGRATED_DRIVER": "YES",
+                            "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
+                        ]
+                    )
+                ],
+                targets: [
+                    TestStandardTarget(
+                        "A",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug")
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["A.swift"])
+                        ]
+                    ),
+
+                    TestStandardTarget(
+                        "B",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug")
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["B.swift"])
+                        ],
+                        dependencies: ["A"]
+                    ),
+
+                    TestStandardTarget(
+                        "C",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug")
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["C.swift"])
+                        ]
+                    ),
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let parameters = BuildParameters(configuration: "Debug")
@@ -2037,11 +2498,11 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
                     let compilationRequirementTargetB = results.getTask(.matchTargetName("B"), .matchRuleType(compilationRequirementRuleInfoType)),
                     let compilationRequirementTargetC = results.getTask(.matchTargetName("C"), .matchRuleType(compilationRequirementRuleInfoType)),
 
-                        let compilationTargetA = results.getTask(.matchTargetName("A"), .matchRuleType(compilationRuleInfoType)),
+                    let compilationTargetA = results.getTask(.matchTargetName("A"), .matchRuleType(compilationRuleInfoType)),
                     let compilationTargetB = results.getTask(.matchTargetName("B"), .matchRuleType(compilationRuleInfoType)),
                     let compilationTargetC = results.getTask(.matchTargetName("C"), .matchRuleType(compilationRuleInfoType)),
 
-                        let linkingTargetA = results.getTask(.matchTargetName("A"), .matchRuleType(linkingRuleInfoType)),
+                    let linkingTargetA = results.getTask(.matchTargetName("A"), .matchRuleType(linkingRuleInfoType)),
                     let linkingTargetB = results.getTask(.matchTargetName("B"), .matchRuleType(linkingRuleInfoType)),
                     let linkingTargetC = results.getTask(.matchTargetName("C"), .matchRuleType(linkingRuleInfoType))
                 else {
@@ -2049,7 +2510,6 @@ fileprivate struct EagerCompilationTests: CoreBasedTests {
                     return
                 }
 
-
                 func copyModuleFiles(targetName: String) throws -> [any PlannedTask] {
                     [".swiftmodule", ".swiftinterface", ".private.swiftmodule", ".swiftdoc"].flatMap {
                         results.getTasks(.matchTargetName(targetName), .matchRuleType("Copy"), .matchRuleItemPattern(.suffix("\(targetName)\($0)")))
diff --git a/Tests/SWBTaskConstructionTests/EagerLinkingTests.swift b/Tests/SWBTaskConstructionTests/EagerLinkingTests.swift
index dbb24cd9..4ff4f025 100644
--- a/Tests/SWBTaskConstructionTests/EagerLinkingTests.swift
+++ b/Tests/SWBTaskConstructionTests/EagerLinkingTests.swift
@@ -24,92 +24,141 @@ fileprivate struct EagerLinkingTests: CoreBasedTests {
     private var objcTestProject: TestProject {
         return TestProject(
             "aProject",
-            groupTree: TestGroup("Sources", path: "Sources", children: [
-                TestFile("A.m"),
-                TestFile("B.m"),
-                TestFile("C.m"),
-                TestFile("D.m"),
-            ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "EAGER_LINKING": "YES",
-                    "EAGER_LINKING_REQUIRE": "YES",
+            groupTree: TestGroup(
+                "Sources",
+                path: "Sources",
+                children: [
+                    TestFile("A.m"),
+                    TestFile("B.m"),
+                    TestFile("C.m"),
+                    TestFile("D.m"),
                 ]
-            )],
-            targets: [
-                TestStandardTarget("A", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([
-                        TestBuildFile("A.m")
-                    ])
-                ], dependencies: ["B", "C"]),
-                TestStandardTarget("B", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([
-                        TestBuildFile("B.m")
-                    ])
-                ]),
-                TestStandardTarget("C", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([
-                        TestBuildFile("C.m")
-                    ])
-                ], dependencies: ["D"]),
-                TestStandardTarget("D", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([
-                        TestBuildFile("D.m")
-                    ])
-                ])
-            ])
-    }
-
-    private var swiftTestProject: TestProject {
-        get async throws {
-            let tapiToolPath = try await self.tapiToolPath
-            return try await TestProject(
-                "aProject",
-                groupTree: TestGroup("Sources", path: "Sources", children: [
-                    TestFile("A.swift"),
-                    TestFile("B.swift"),
-                    TestFile("C.swift"),
-                    TestFile("D.swift"),
-                ]),
-                buildConfigurations: [TestBuildConfiguration(
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SWIFT_USE_INTEGRATED_DRIVER": "YES",
                         "EAGER_LINKING": "YES",
                         "EAGER_LINKING_REQUIRE": "YES",
-                        "SWIFT_EXEC": swiftCompilerPath.str,
-                        "SWIFT_VERSION": swiftVersion,
-                        "TAPI_EXEC": tapiToolPath.str,
                     ]
-                )],
-                targets: [
-                    TestStandardTarget("A", type: .framework, buildPhases: [
+                )
+            ],
+            targets: [
+                TestStandardTarget(
+                    "A",
+                    type: .framework,
+                    buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("A.swift")
+                            TestBuildFile("A.m")
                         ])
-                    ], dependencies: ["B", "C"]),
-                    TestStandardTarget("B", type: .framework,
-                                       buildPhases: [
-                                        TestSourcesBuildPhase([
-                                            TestBuildFile("B.swift")
-                                        ])
-                                       ]),
-                    TestStandardTarget("C", type: .framework, buildPhases: [
+                    ],
+                    dependencies: ["B", "C"]
+                ),
+                TestStandardTarget(
+                    "B",
+                    type: .framework,
+                    buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("C.swift")
+                            TestBuildFile("B.m")
                         ])
-                    ], dependencies: ["D"]),
-                    TestStandardTarget("D", type: .dynamicLibrary, buildPhases: [
+                    ]
+                ),
+                TestStandardTarget(
+                    "C",
+                    type: .framework,
+                    buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("D.swift")
+                            TestBuildFile("C.m")
                         ])
-                    ])
-                ])
+                    ],
+                    dependencies: ["D"]
+                ),
+                TestStandardTarget(
+                    "D",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            TestBuildFile("D.m")
+                        ])
+                    ]
+                ),
+            ]
+        )
+    }
+
+    private var swiftTestProject: TestProject {
+        get async throws {
+            let tapiToolPath = try await self.tapiToolPath
+            return try await TestProject(
+                "aProject",
+                groupTree: TestGroup(
+                    "Sources",
+                    path: "Sources",
+                    children: [
+                        TestFile("A.swift"),
+                        TestFile("B.swift"),
+                        TestFile("C.swift"),
+                        TestFile("D.swift"),
+                    ]
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SWIFT_USE_INTEGRATED_DRIVER": "YES",
+                            "EAGER_LINKING": "YES",
+                            "EAGER_LINKING_REQUIRE": "YES",
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": swiftVersion,
+                            "TAPI_EXEC": tapiToolPath.str,
+                        ]
+                    )
+                ],
+                targets: [
+                    TestStandardTarget(
+                        "A",
+                        type: .framework,
+                        buildPhases: [
+                            TestSourcesBuildPhase([
+                                TestBuildFile("A.swift")
+                            ])
+                        ],
+                        dependencies: ["B", "C"]
+                    ),
+                    TestStandardTarget(
+                        "B",
+                        type: .framework,
+                        buildPhases: [
+                            TestSourcesBuildPhase([
+                                TestBuildFile("B.swift")
+                            ])
+                        ]
+                    ),
+                    TestStandardTarget(
+                        "C",
+                        type: .framework,
+                        buildPhases: [
+                            TestSourcesBuildPhase([
+                                TestBuildFile("C.swift")
+                            ])
+                        ],
+                        dependencies: ["D"]
+                    ),
+                    TestStandardTarget(
+                        "D",
+                        type: .dynamicLibrary,
+                        buildPhases: [
+                            TestSourcesBuildPhase([
+                                TestBuildFile("D.swift")
+                            ])
+                        ]
+                    ),
+                ]
+            )
         }
     }
 
@@ -184,48 +233,75 @@ fileprivate struct EagerLinkingTests: CoreBasedTests {
     func objCTaskDependenciesEagerLinkingEnabledForAllButOneTarget() async throws {
         let project = TestProject(
             "aProject",
-            groupTree: TestGroup("Sources", path: "Sources", children: [
-                TestFile("A.m"),
-                TestFile("B.m"),
-                TestFile("C.m"),
-                TestFile("D.m"),
-            ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "EAGER_LINKING": "YES",
+            groupTree: TestGroup(
+                "Sources",
+                path: "Sources",
+                children: [
+                    TestFile("A.m"),
+                    TestFile("B.m"),
+                    TestFile("C.m"),
+                    TestFile("D.m"),
                 ]
-            )],
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "EAGER_LINKING": "YES",
+                    ]
+                )
+            ],
             targets: [
-                TestStandardTarget("A", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([
-                        TestBuildFile("A.m")
-                    ])
-                ], dependencies: ["B", "C"]),
-                TestStandardTarget("B", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([
-                        TestBuildFile("B.m")
-                    ])
-                ]),
-                TestStandardTarget("C", type: .framework, buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "EAGER_LINKING": "NO",
-                        ]
-                    )], buildPhases: [
+                TestStandardTarget(
+                    "A",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            TestBuildFile("A.m")
+                        ])
+                    ],
+                    dependencies: ["B", "C"]
+                ),
+                TestStandardTarget(
+                    "B",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            TestBuildFile("B.m")
+                        ])
+                    ]
+                ),
+                TestStandardTarget(
+                    "C",
+                    type: .framework,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "EAGER_LINKING": "NO"
+                            ]
+                        )
+                    ],
+                    buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("C.m")
                         ])
-                    ], dependencies: ["D"]),
-                TestStandardTarget("D", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([
-                        TestBuildFile("D.m")
-                    ])
-                ])
-            ])
+                    ],
+                    dependencies: ["D"]
+                ),
+                TestStandardTarget(
+                    "D",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            TestBuildFile("D.m")
+                        ])
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), project)
         try await tester.checkBuild(runDestination: .macOS) { results in
             let compileATask = try #require(results.getTask(.matchTargetName("A"), .matchRuleItem("CompileC")))
@@ -299,62 +375,76 @@ fileprivate struct EagerLinkingTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Fwk.swift"),
                     TestFile("App.swift"),
-                    TestFile("Fwk.docc")
-                ]),
+                    TestFile("Fwk.docc"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "LIBTOOL": libtoolPath.str,
-                    "DOCC_EXEC": doccToolPath.str,
-                    "DYLIB_CURRENT_VERSION": "2.0",
-                    "DYLIB_COMPATIBILITY_VERSION": "1.0",
-                    "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                    "EAGER_LINKING": "YES",
-                    "DEFINES_MODULE": "YES",
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "LIBTOOL": libtoolPath.str,
+                        "DOCC_EXEC": doccToolPath.str,
+                        "DYLIB_CURRENT_VERSION": "2.0",
+                        "DYLIB_COMPATIBILITY_VERSION": "1.0",
+                        "SWIFT_USE_INTEGRATED_DRIVER": "YES",
+                        "EAGER_LINKING": "YES",
+                        "DEFINES_MODULE": "YES",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.swift"])
-                    ]),
+                    ]
+                ),
                 TestStandardTarget(
                     "DocumentedFwk",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.swift", "Fwk.docc"])
-                    ]),
+                    ]
+                ),
                 TestStandardTarget(
                     "FwkLinkingStaticLib",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.swift"]),
-                        TestFrameworksBuildPhase([TestBuildFile(.target("StaticLib"))])
-                    ], dependencies: ["StaticLib"]),
+                        TestFrameworksBuildPhase([TestBuildFile(.target("StaticLib"))]),
+                    ],
+                    dependencies: ["StaticLib"]
+                ),
                 TestStandardTarget(
                     "StaticLib",
                     type: .staticLibrary,
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.swift"])
-                    ]),
+                    ]
+                ),
 
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildPhases: [
                         TestSourcesBuildPhase(["App.swift"]),
-                        TestFrameworksBuildPhase([TestBuildFile(.target("Fwk"))])
-                    ], dependencies: ["Fwk"])
-            ])
+                        TestFrameworksBuildPhase([TestBuildFile(.target("Fwk"))]),
+                    ],
+                    dependencies: ["Fwk"]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(BuildParameters(action: .build, configuration: "Debug"), runDestination: .macOS, targetName: "Fwk") { results in
@@ -541,54 +631,81 @@ fileprivate struct EagerLinkingTests: CoreBasedTests {
     func swiftTaskDependenciesEagerLinkingEnabledForAllButOneTarget() async throws {
         let testProject = try await TestProject(
             "aProject",
-            groupTree: TestGroup("Sources", path: "Sources", children: [
-                TestFile("A.swift"),
-                TestFile("B.swift"),
-                TestFile("C.swift"),
-                TestFile("D.swift"),
-            ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                    "EAGER_LINKING": "YES",
-                    "EAGER_LINKING_REQUIRE": "YES",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "TAPI_EXEC": tapiToolPath.str
+            groupTree: TestGroup(
+                "Sources",
+                path: "Sources",
+                children: [
+                    TestFile("A.swift"),
+                    TestFile("B.swift"),
+                    TestFile("C.swift"),
+                    TestFile("D.swift"),
                 ]
-            )],
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SWIFT_USE_INTEGRATED_DRIVER": "YES",
+                        "EAGER_LINKING": "YES",
+                        "EAGER_LINKING_REQUIRE": "YES",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "TAPI_EXEC": tapiToolPath.str,
+                    ]
+                )
+            ],
             targets: [
-                TestStandardTarget("A", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([
-                        TestBuildFile("A.swift")
-                    ])
-                ], dependencies: ["B", "C"]),
-                TestStandardTarget("B", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([
-                        TestBuildFile("B.swift")
-                    ])
-                ]),
-                TestStandardTarget("C", type: .framework, buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "EAGER_LINKING": "NO",
-                            "EAGER_LINKING_REQUIRE": "NO",
-                        ]
-                    )], buildPhases: [
+                TestStandardTarget(
+                    "A",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            TestBuildFile("A.swift")
+                        ])
+                    ],
+                    dependencies: ["B", "C"]
+                ),
+                TestStandardTarget(
+                    "B",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            TestBuildFile("B.swift")
+                        ])
+                    ]
+                ),
+                TestStandardTarget(
+                    "C",
+                    type: .framework,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "EAGER_LINKING": "NO",
+                                "EAGER_LINKING_REQUIRE": "NO",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("C.swift")
                         ])
-                    ], dependencies: ["D"]),
-                TestStandardTarget("D", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase([
-                        TestBuildFile("D.swift")
-                    ])
-                ])
-            ])
+                    ],
+                    dependencies: ["D"]
+                ),
+                TestStandardTarget(
+                    "D",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            TestBuildFile("D.swift")
+                        ])
+                    ]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         try await tester.checkBuild(runDestination: .macOS) { results in
diff --git a/Tests/SWBTaskConstructionTests/ExportLocTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/ExportLocTaskConstructionTests.swift
index d20b18a1..12c5dcb2 100644
--- a/Tests/SWBTaskConstructionTests/ExportLocTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/ExportLocTaskConstructionTests.swift
@@ -28,7 +28,7 @@ fileprivate struct ExportLocTaskConstructionTests: CoreBasedTests {
                 "SomeFiles",
                 children: [
                     TestFile("test.swift"),
-                    TestFile("AppTarget/Info.plist")
+                    TestFile("AppTarget/Info.plist"),
                 ]
             ),
             buildConfigurations: [
diff --git a/Tests/SWBTaskConstructionTests/GenerateAppPlaygroundAssetCatalogTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/GenerateAppPlaygroundAssetCatalogTaskConstructionTests.swift
index 10e657f9..9cbdf930 100644
--- a/Tests/SWBTaskConstructionTests/GenerateAppPlaygroundAssetCatalogTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/GenerateAppPlaygroundAssetCatalogTaskConstructionTests.swift
@@ -27,29 +27,33 @@ fileprivate struct GenerateAppPlaygroundAssetCatalogTaskConstructionTests: CoreB
         let testProject = try await TestProject(
             "AssetCatalogGenerationNotEnabled",
             groupTree: TestGroup(
-                "Sources", children: [
+                "Sources",
+                children: [
                     TestFile("Source.swift")
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTED_PLATFORMS": "macosx",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTED_PLATFORMS": "macosx",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Foo",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["Source.swift"]),
+                        TestSourcesBuildPhase(["Source.swift"])
                     ]
                 )
             ]
@@ -69,30 +73,34 @@ fileprivate struct GenerateAppPlaygroundAssetCatalogTaskConstructionTests: CoreB
         let testProject = try await TestProject(
             "AssetCatalogGenerationDisabled",
             groupTree: TestGroup(
-                "Sources", children: [
+                "Sources",
+                children: [
                     TestFile("Source.swift")
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "APP_PLAYGROUND_GENERATE_ASSET_CATALOG": "NO",
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTED_PLATFORMS": "macosx",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "APP_PLAYGROUND_GENERATE_ASSET_CATALOG": "NO",
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTED_PLATFORMS": "macosx",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Foo",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["Source.swift"]),
+                        TestSourcesBuildPhase(["Source.swift"])
                     ]
                 )
             ]
@@ -112,35 +120,39 @@ fileprivate struct GenerateAppPlaygroundAssetCatalogTaskConstructionTests: CoreB
         let testProject = try await TestProject(
             "AssetCatalogGenerationEnabled",
             groupTree: TestGroup(
-                "Sources", children: [
-                    TestFile("Source.swift"),
+                "Sources",
+                children: [
+                    TestFile("Source.swift")
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ASSETCATALOG_EXEC": actoolPath.str,
-                    "APP_PLAYGROUND_GENERATE_ASSET_CATALOG": "YES",
-                    "APP_PLAYGROUND_GENERATED_ASSET_CATALOG_PLACEHOLDER_APPICON": "magicWand",
-                    "APP_PLAYGROUND_GENERATED_ASSET_CATALOG_PRESET_ACCENT_COLOR": "orange",
-                    "ASSETCATALOG_COMPILER_APPICON_NAME": "__PlaceholderAppIcon",
-                    "ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME": "__PresetAccentColor",
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTED_PLATFORMS": "macosx",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ASSETCATALOG_EXEC": actoolPath.str,
+                        "APP_PLAYGROUND_GENERATE_ASSET_CATALOG": "YES",
+                        "APP_PLAYGROUND_GENERATED_ASSET_CATALOG_PLACEHOLDER_APPICON": "magicWand",
+                        "APP_PLAYGROUND_GENERATED_ASSET_CATALOG_PRESET_ACCENT_COLOR": "orange",
+                        "ASSETCATALOG_COMPILER_APPICON_NAME": "__PlaceholderAppIcon",
+                        "ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME": "__PresetAccentColor",
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTED_PLATFORMS": "macosx",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Foo",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["Source.swift"]),
+                        TestSourcesBuildPhase(["Source.swift"])
                     ]
                 )
             ]
@@ -171,33 +183,37 @@ fileprivate struct GenerateAppPlaygroundAssetCatalogTaskConstructionTests: CoreB
         let testProject = try await TestProject(
             "AssetCatalogGenerationWithOtherAssetCatalog",
             groupTree: TestGroup(
-                "Sources", children: [
+                "Sources",
+                children: [
                     TestFile("Source.swift"),
                     TestFile("Assets.xcassets"),
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ASSETCATALOG_EXEC": actoolPath.str,
-                    "APP_PLAYGROUND_GENERATE_ASSET_CATALOG": "YES",
-                    "APP_PLAYGROUND_GENERATED_ASSET_CATALOG_PLACEHOLDER_APPICON": "magicWand",
-                    "APP_PLAYGROUND_GENERATED_ASSET_CATALOG_PRESET_ACCENT_COLOR": "orange",
-                    "ASSETCATALOG_COMPILER_APPICON_NAME": "__PlaceholderAppIcon",
-                    "ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME": "__PresetAccentColor",
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTED_PLATFORMS": "macosx",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ASSETCATALOG_EXEC": actoolPath.str,
+                        "APP_PLAYGROUND_GENERATE_ASSET_CATALOG": "YES",
+                        "APP_PLAYGROUND_GENERATED_ASSET_CATALOG_PLACEHOLDER_APPICON": "magicWand",
+                        "APP_PLAYGROUND_GENERATED_ASSET_CATALOG_PRESET_ACCENT_COLOR": "orange",
+                        "ASSETCATALOG_COMPILER_APPICON_NAME": "__PlaceholderAppIcon",
+                        "ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME": "__PresetAccentColor",
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTED_PLATFORMS": "macosx",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Foo",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["Source.swift"]),
diff --git a/Tests/SWBTaskConstructionTests/HeadermapTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/HeadermapTaskConstructionTests.swift
index 6e5f1d9f..6d218a38 100644
--- a/Tests/SWBTaskConstructionTests/HeadermapTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/HeadermapTaskConstructionTests.swift
@@ -44,39 +44,44 @@ fileprivate struct HeadermapTaskConstructionTests: CoreBasedTests {
                             projectHeader1,
                             projectHeader2,
                             TestFile("ProjectHeader.h"),
-                        ]),
+                        ]
+                    ),
                     TestGroup(
                         "Internal",
                         path: "Internal",
                         children: [
                             privateHeader2,
                             TestFile("PrivateHeader.h"),
-                        ]),
+                        ]
+                    ),
                     TestGroup(
                         "Public",
                         path: "Public",
                         children: [
                             publicHeader1,
                             TestFile("PublicHeader.h"),
-                        ]),
-                ]),
+                        ]
+                    ),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"]),
+                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.m",
+                            "main.m"
                         ]),
                         TestHeadersBuildPhase([
                             TestBuildFile(publicHeader1, headerVisibility: .public),
@@ -88,8 +93,9 @@ fileprivate struct HeadermapTaskConstructionTests: CoreBasedTests {
                             TestBuildFile("ProjectHeader.h"),
                         ]),
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -134,15 +140,18 @@ fileprivate struct HeadermapTaskConstructionTests: CoreBasedTests {
                         children: [
                             execHeader,
                             TestFile("main.c"),
-                        ]),
+                        ]
+                    ),
                     TestGroup(
                         "Fwk",
                         path: "fwk",
                         children: [
                             fwkHeader,
                             TestFile("something.c"),
-                        ]),
-                ]),
+                        ]
+                    ),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -150,35 +159,39 @@ fileprivate struct HeadermapTaskConstructionTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "DEFINES_MODULE": "YES",
                         "ALWAYS_SEARCH_USER_PATHS": "NO",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "fwk",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"]),
+                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "something.c",
+                            "something.c"
                         ]),
                         TestHeadersBuildPhase([
-                            TestBuildFile(fwkHeader, headerVisibility: .public),
+                            TestBuildFile(fwkHeader, headerVisibility: .public)
                         ]),
-                    ]),
+                    ]
+                ),
                 TestStandardTarget(
                     "exec",
                     type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.c",
-                        ]),
-                    ]),
-            ])
+                            "main.c"
+                        ])
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         let parameters = BuildParameters(configuration: "Debug")
@@ -203,7 +216,8 @@ fileprivate struct HeadermapTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Custom1.fake-lang"),
                     TestFile("Custom2.fake-lang"),
@@ -224,7 +238,8 @@ fileprivate struct HeadermapTaskConstructionTests: CoreBasedTests {
                     TestFile("APIHeader2.h"),
                     TestFile("SPIHeader1.h"),
                     TestFile("SPIHeader2.h"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -233,16 +248,21 @@ fileprivate struct HeadermapTaskConstructionTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "ALWAYS_SEARCH_USER_PATHS": "NO",
                         "CODE_SIGN_IDENTITY": "",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "Tool", type: .framework,
+                    "Tool",
+                    type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "macosx",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
@@ -263,16 +283,25 @@ fileprivate struct HeadermapTaskConstructionTests: CoreBasedTests {
                         ]),
                     ],
                     buildRules: [
-                        TestBuildRule(filePattern: "*/*.fake-lang", script: "true", outputs: [
-                            "${DERIVED_SOURCES_DIR}/${INPUT_FILE_BASE}",
-                        ]),
-                        TestBuildRule(filePattern: "*.fake-gperf", script: "true", outputs: [
-                            "${DERIVED_SOURCES_DIR}/${INPUT_FILE_BASE}",
-                        ]),
+                        TestBuildRule(
+                            filePattern: "*/*.fake-lang",
+                            script: "true",
+                            outputs: [
+                                "${DERIVED_SOURCES_DIR}/${INPUT_FILE_BASE}"
+                            ]
+                        ),
+                        TestBuildRule(
+                            filePattern: "*.fake-gperf",
+                            script: "true",
+                            outputs: [
+                                "${DERIVED_SOURCES_DIR}/${INPUT_FILE_BASE}"
+                            ]
+                        ),
                     ]
                 ),
                 TestStandardTarget(
-                    "Lib", type: .dynamicLibrary,
+                    "Lib",
+                    type: .dynamicLibrary,
                     buildPhases: [
                         TestHeadersBuildPhase([
                             TestBuildFile("LibHeader.h", headerVisibility: .public),
@@ -283,10 +312,11 @@ fileprivate struct HeadermapTaskConstructionTests: CoreBasedTests {
                             TestBuildFile("ProjHeader1.h"),
                             TestBuildFile("ProjHeader2.h"),
                             TestBuildFile("ProjHeader3.h"),
-                        ]),
+                        ])
                     ]
                 ),
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         let headermapBasenames = [
@@ -307,57 +337,57 @@ fileprivate struct HeadermapTaskConstructionTests: CoreBasedTests {
                         hmapContents.append(headermap.rawBytes)
 
                         //XCTContext.runActivity(named: "Validate headermap contents for \(basename)") { _ in
-                            switch basename {
-                            case "project-headers":
-                                headermap.checkEntry("ProjHeader1.h", "/tmp/Test/aProject/Sources/ProjHeader1.h")
-                                headermap.checkEntry("ProjHeader2.h", "/tmp/Test/aProject/Sources/ProjHeader2.h")
-                                headermap.checkEntry("ProjHeader3.h", "/tmp/Test/aProject/Sources/ProjHeader3.h")
-                                headermap.checkEntry("TargetHeader1.h", "/tmp/Test/aProject/Sources/TargetHeader1.h")
-                                headermap.checkEntry("TargetHeader2.h", "/tmp/Test/aProject/Sources/TargetHeader2.h")
-                                headermap.checkEntry("TargetHeader3.h", "/tmp/Test/aProject/Sources/TargetHeader3.h")
-                                headermap.checkEntry("LibHeader.h", "Lib/LibHeader.h")
-                                headermap.checkEntry("APIHeader1.h", "Lib/APIHeader1.h")
-                                headermap.checkEntry("APIHeader2.h", "Lib/APIHeader2.h")
-                                headermap.checkEntry("SPIHeader1.h", "Lib/SPIHeader1.h")
-                                headermap.checkEntry("SPIHeader2.h", "Lib/SPIHeader2.h")
-                                break
-                            case "own-target-headers":
-                                headermap.checkEntry("Tool/TargetHeader1.h", "/tmp/Test/aProject/Sources/TargetHeader1.h")
-                                headermap.checkEntry("Tool/TargetHeader2.h", "/tmp/Test/aProject/Sources/TargetHeader2.h")
-                                headermap.checkEntry("Tool/TargetHeader3.h", "/tmp/Test/aProject/Sources/TargetHeader3.h")
-                                headermap.checkEntry("TargetHeader1.h", "/tmp/Test/aProject/Sources/TargetHeader1.h")
-                                headermap.checkEntry("TargetHeader2.h", "/tmp/Test/aProject/Sources/TargetHeader2.h")
-                                headermap.checkEntry("TargetHeader3.h", "/tmp/Test/aProject/Sources/TargetHeader3.h")
-                                break
-                            case "all-target-headers", "all-non-framework-target-headers":
-                                headermap.checkEntry("Lib/LibHeader.h", "/tmp/Test/aProject/Sources/LibHeader.h")
-                                headermap.checkEntry("Lib/APIHeader1.h", "/tmp/Test/aProject/Sources/APIHeader1.h")
-                                headermap.checkEntry("Lib/APIHeader2.h", "/tmp/Test/aProject/Sources/APIHeader2.h")
-                                headermap.checkEntry("Lib/SPIHeader1.h", "/tmp/Test/aProject/Sources/SPIHeader1.h")
-                                headermap.checkEntry("Lib/SPIHeader2.h", "/tmp/Test/aProject/Sources/SPIHeader2.h")
-                                break
-                            case "generated-files":
-                                headermap.checkEntry("Custom1", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/Custom1")
-                                headermap.checkEntry("Custom2", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/Custom2")
-                                headermap.checkEntry("Custom3", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/Custom3")
-                                headermap.checkEntry("Tool/Custom1", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/Custom1")
-                                headermap.checkEntry("Tool/Custom2", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/Custom2")
-                                headermap.checkEntry("Tool/Custom3", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/Custom3")
-                                headermap.checkEntry("Tool/regular1.h", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/\(results.runDestinationTargetArchitecture)/regular1.h")
-                                headermap.checkEntry("Tool/regular1User.c", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/\(results.runDestinationTargetArchitecture)/regular1User.c")
-                                headermap.checkEntry("Tool/some1", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/some1")
-                                headermap.checkEntry("Tool/some2", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/some2")
-                                headermap.checkEntry("regular1.h", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/\(results.runDestinationTargetArchitecture)/regular1.h")
-                                headermap.checkEntry("regular1User.c", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/\(results.runDestinationTargetArchitecture)/regular1User.c")
-                                headermap.checkEntry("some1", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/some1")
-                                headermap.checkEntry("some2", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/some2")
-                                break
-                            default:
-                                Issue.record("Unhandled headermap")
-                                break
-                            }
+                        switch basename {
+                        case "project-headers":
+                            headermap.checkEntry("ProjHeader1.h", "/tmp/Test/aProject/Sources/ProjHeader1.h")
+                            headermap.checkEntry("ProjHeader2.h", "/tmp/Test/aProject/Sources/ProjHeader2.h")
+                            headermap.checkEntry("ProjHeader3.h", "/tmp/Test/aProject/Sources/ProjHeader3.h")
+                            headermap.checkEntry("TargetHeader1.h", "/tmp/Test/aProject/Sources/TargetHeader1.h")
+                            headermap.checkEntry("TargetHeader2.h", "/tmp/Test/aProject/Sources/TargetHeader2.h")
+                            headermap.checkEntry("TargetHeader3.h", "/tmp/Test/aProject/Sources/TargetHeader3.h")
+                            headermap.checkEntry("LibHeader.h", "Lib/LibHeader.h")
+                            headermap.checkEntry("APIHeader1.h", "Lib/APIHeader1.h")
+                            headermap.checkEntry("APIHeader2.h", "Lib/APIHeader2.h")
+                            headermap.checkEntry("SPIHeader1.h", "Lib/SPIHeader1.h")
+                            headermap.checkEntry("SPIHeader2.h", "Lib/SPIHeader2.h")
+                            break
+                        case "own-target-headers":
+                            headermap.checkEntry("Tool/TargetHeader1.h", "/tmp/Test/aProject/Sources/TargetHeader1.h")
+                            headermap.checkEntry("Tool/TargetHeader2.h", "/tmp/Test/aProject/Sources/TargetHeader2.h")
+                            headermap.checkEntry("Tool/TargetHeader3.h", "/tmp/Test/aProject/Sources/TargetHeader3.h")
+                            headermap.checkEntry("TargetHeader1.h", "/tmp/Test/aProject/Sources/TargetHeader1.h")
+                            headermap.checkEntry("TargetHeader2.h", "/tmp/Test/aProject/Sources/TargetHeader2.h")
+                            headermap.checkEntry("TargetHeader3.h", "/tmp/Test/aProject/Sources/TargetHeader3.h")
+                            break
+                        case "all-target-headers", "all-non-framework-target-headers":
+                            headermap.checkEntry("Lib/LibHeader.h", "/tmp/Test/aProject/Sources/LibHeader.h")
+                            headermap.checkEntry("Lib/APIHeader1.h", "/tmp/Test/aProject/Sources/APIHeader1.h")
+                            headermap.checkEntry("Lib/APIHeader2.h", "/tmp/Test/aProject/Sources/APIHeader2.h")
+                            headermap.checkEntry("Lib/SPIHeader1.h", "/tmp/Test/aProject/Sources/SPIHeader1.h")
+                            headermap.checkEntry("Lib/SPIHeader2.h", "/tmp/Test/aProject/Sources/SPIHeader2.h")
+                            break
+                        case "generated-files":
+                            headermap.checkEntry("Custom1", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/Custom1")
+                            headermap.checkEntry("Custom2", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/Custom2")
+                            headermap.checkEntry("Custom3", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/Custom3")
+                            headermap.checkEntry("Tool/Custom1", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/Custom1")
+                            headermap.checkEntry("Tool/Custom2", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/Custom2")
+                            headermap.checkEntry("Tool/Custom3", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/Custom3")
+                            headermap.checkEntry("Tool/regular1.h", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/\(results.runDestinationTargetArchitecture)/regular1.h")
+                            headermap.checkEntry("Tool/regular1User.c", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/\(results.runDestinationTargetArchitecture)/regular1User.c")
+                            headermap.checkEntry("Tool/some1", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/some1")
+                            headermap.checkEntry("Tool/some2", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/some2")
+                            headermap.checkEntry("regular1.h", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/\(results.runDestinationTargetArchitecture)/regular1.h")
+                            headermap.checkEntry("regular1User.c", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/\(results.runDestinationTargetArchitecture)/regular1User.c")
+                            headermap.checkEntry("some1", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/some1")
+                            headermap.checkEntry("some2", "/tmp/Test/aProject/build/aProject.build/Debug/Tool.build/DerivedSources/some2")
+                            break
+                        default:
+                            Issue.record("Unhandled headermap")
+                            break
+                        }
 
-                            headermap.checkNoEntries()
+                        headermap.checkNoEntries()
                         //}
                     }
                 }
@@ -382,15 +412,18 @@ fileprivate struct HeadermapTaskConstructionTests: CoreBasedTests {
         func buildConfiguration(withName name: String, extraSettings: [String: String]) async throws -> TestBuildConfiguration {
             let clangCompilerPath = try await self.clangCompilerPath
             let libClangPath = try await self.libClangPath
-            return try await TestBuildConfiguration(name, buildSettings: [
-                "CC": clangCompilerPath.str,
-                "CLANG_EXPLICIT_MODULES_LIBCLANG_PATH": libClangPath.str,
-                "CLANG_USE_RESPONSE_FILE": "NO",
-                "GENERATE_INFOPLIST_FILE": "YES",
-                "PRODUCT_NAME": "$(TARGET_NAME)",
-                "SWIFT_EXEC": swiftCompilerPath.str,
-                "SWIFT_VERSION": swiftVersion,
-            ].merging(extraSettings, uniquingKeysWith: { a, b in a }))
+            return try await TestBuildConfiguration(
+                name,
+                buildSettings: [
+                    "CC": clangCompilerPath.str,
+                    "CLANG_EXPLICIT_MODULES_LIBCLANG_PATH": libClangPath.str,
+                    "CLANG_USE_RESPONSE_FILE": "NO",
+                    "GENERATE_INFOPLIST_FILE": "YES",
+                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                    "SWIFT_EXEC": swiftCompilerPath.str,
+                    "SWIFT_VERSION": swiftVersion,
+                ].merging(extraSettings, uniquingKeysWith: { a, b in a })
+            )
         }
 
         let testProject = try await TestProject(
@@ -401,7 +434,8 @@ fileprivate struct HeadermapTaskConstructionTests: CoreBasedTests {
                     TestFile("main.c"),
                     TestFile("source.swift"),
                     TestFile("Framework.h"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "Application",
@@ -420,8 +454,9 @@ fileprivate struct HeadermapTaskConstructionTests: CoreBasedTests {
                         TestSourcesBuildPhase([
                             "main.c",
                             "source.swift",
-                        ]),
-                    ]),
+                        ])
+                    ]
+                ),
                 TestStandardTarget(
                     "Framework",
                     type: .framework,
@@ -437,10 +472,12 @@ fileprivate struct HeadermapTaskConstructionTests: CoreBasedTests {
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("Framework.h", headerVisibility: .public),
-                        ]),
-                    ]),
-            ])
+                            TestBuildFile("Framework.h", headerVisibility: .public)
+                        ])
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         func checkBuild(configurationName: String, clangUsesAllTargetHeaders: Bool, swiftUsesAllTargetHeaders: Bool, buildRequest: BuildRequest? = nil, sourceLocation: SourceLocation = #_sourceLocation) async {
             let targetName = (buildRequest == nil) ? "Application" : nil
@@ -502,46 +539,62 @@ fileprivate struct HeadermapTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("main.c"),
                     TestFile("Header.h"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "Application",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Default", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
-                        TestBuildConfiguration("Off", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_TARGETS_NOT_BEING_BUILT": "NO",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
-                        TestBuildConfiguration("On", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_TARGETS_NOT_BEING_BUILT": "YES",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
+                        TestBuildConfiguration(
+                            "Default",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                            ]
+                        ),
+                        TestBuildConfiguration(
+                            "Off",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_TARGETS_NOT_BEING_BUILT": "NO",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                            ]
+                        ),
+                        TestBuildConfiguration(
+                            "On",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_TARGETS_NOT_BEING_BUILT": "YES",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                            ]
+                        ),
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.c",
-                        ]),
-                    ]),
+                            "main.c"
+                        ])
+                    ]
+                ),
                 TestStandardTarget(
                     "Framework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("Header.h", headerVisibility: .public),
-                        ]),
-                    ]),
-            ])
+                            TestBuildFile("Header.h", headerVisibility: .public)
+                        ])
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         for configurationName in ["Default", "Off", "On"] {
diff --git a/Tests/SWBTaskConstructionTests/HostBuildToolTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/HostBuildToolTaskConstructionTests.swift
index a98cc2dd..7de3da30 100644
--- a/Tests/SWBTaskConstructionTests/HostBuildToolTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/HostBuildToolTaskConstructionTests.swift
@@ -25,10 +25,14 @@ fileprivate struct HostBuildToolTaskConstructionTests: CoreBasedTests {
     func basics() async throws {
         let testProject = try await TestProject(
             "aProject",
-            groupTree: TestGroup("Foo", children: [
-                TestFile("tool.swift"),
-                TestFile("frame.swift"),
-            ]), buildConfigurations: [
+            groupTree: TestGroup(
+                "Foo",
+                children: [
+                    TestFile("tool.swift"),
+                    TestFile("frame.swift"),
+                ]
+            ),
+            buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
@@ -36,28 +40,40 @@ fileprivate struct HostBuildToolTaskConstructionTests: CoreBasedTests {
                         "SWIFT_VERSION": swiftVersion,
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
-                TestStandardTarget("HostTool", type: .hostBuildTool, buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "SDKROOT": "auto",
-                        ])], buildPhases: [
-                            TestSourcesBuildPhase(["tool.swift"])
-                        ]),
-                TestStandardTarget("Framework", type: .framework, buildPhases: [
-                    TestSourcesBuildPhase(["frame.swift"])
-                ], dependencies: [
-                    "HostTool"
-                ]),
+                TestStandardTarget(
+                    "HostTool",
+                    type: .hostBuildTool,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto"
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase(["tool.swift"])
+                    ]
+                ),
+                TestStandardTarget(
+                    "Framework",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase(["frame.swift"])
+                    ],
+                    dependencies: [
+                        "HostTool"
+                    ]
+                ),
             ]
         )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
-
         await tester.checkBuild(runDestination: .anyMac, targetName: "Framework") { results in
             results.checkNoDiagnostics()
             results.checkTarget("Framework") { frameworkTarget in
@@ -83,11 +99,15 @@ fileprivate struct HostBuildToolTaskConstructionTests: CoreBasedTests {
     func hostToolBuildsForHostPlatform() async throws {
         let testProject = try await TestProject(
             "aProject",
-            groupTree: TestGroup("Foo", children: [
-                TestFile("dep.swift"),
-                TestFile("tool.swift"),
-                TestFile("frame.swift"),
-            ]), buildConfigurations: [
+            groupTree: TestGroup(
+                "Foo",
+                children: [
+                    TestFile("dep.swift"),
+                    TestFile("tool.swift"),
+                    TestFile("frame.swift"),
+                ]
+            ),
+            buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
@@ -96,41 +116,63 @@ fileprivate struct HostBuildToolTaskConstructionTests: CoreBasedTests {
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "CODE_SIGN_IDENTITY": "Apple Development",
-                    ]),
+                    ]
+                )
             ],
             targets: [
-                TestStandardTarget("HostToolDependency", type: .framework, buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator"
-                        ]),
-                ], buildPhases: [
-                    TestSourcesBuildPhase(["dep.swift"])
-                ]),
-                TestStandardTarget("HostTool", type: .hostBuildTool, buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "SDKROOT": "auto",
-                        ])], buildPhases: [
-                            TestSourcesBuildPhase(["tool.swift"])
-                        ], dependencies: [
-                            "HostToolDependency"
-                        ]),
-                TestStandardTarget("Framework", type: .framework, buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator"
-                        ]),
-                ], buildPhases: [
-                    TestSourcesBuildPhase(["frame.swift"])
-                ], dependencies: [
-                    "HostTool"
-                ]),
+                TestStandardTarget(
+                    "HostToolDependency",
+                    type: .framework,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase(["dep.swift"])
+                    ]
+                ),
+                TestStandardTarget(
+                    "HostTool",
+                    type: .hostBuildTool,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto"
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase(["tool.swift"])
+                    ],
+                    dependencies: [
+                        "HostToolDependency"
+                    ]
+                ),
+                TestStandardTarget(
+                    "Framework",
+                    type: .framework,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase(["frame.swift"])
+                    ],
+                    dependencies: [
+                        "HostTool"
+                    ]
+                ),
             ]
         )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
@@ -196,13 +238,17 @@ fileprivate struct HostBuildToolTaskConstructionTests: CoreBasedTests {
     func swiftMacroPluginLoadingFlags() async throws {
         let testProject = try await TestProject(
             "aProject",
-            groupTree: TestGroup("Foo", children: [
-                TestFile("dep.swift"),
-                TestFile("tool.swift"),
-                TestFile("frame.swift"),
-                TestFile("frame2.swift"),
-                TestFile("app.swift"),
-            ]), buildConfigurations: [
+            groupTree: TestGroup(
+                "Foo",
+                children: [
+                    TestFile("dep.swift"),
+                    TestFile("tool.swift"),
+                    TestFile("frame.swift"),
+                    TestFile("frame2.swift"),
+                    TestFile("app.swift"),
+                ]
+            ),
+            buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
@@ -211,64 +257,99 @@ fileprivate struct HostBuildToolTaskConstructionTests: CoreBasedTests {
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "CODE_SIGN_IDENTITY": "Apple Development",
-                    ]),
+                    ]
+                )
             ],
             targets: [
-                TestStandardTarget("HostToolDependency", type: .framework, buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator"
-                        ]),
-                ], buildPhases: [
-                    TestSourcesBuildPhase(["dep.swift"])
-                ]),
-                TestStandardTarget("HostTool", type: .hostBuildTool, buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "SDKROOT": "auto",
-                            "SWIFT_IMPLEMENTS_MACROS_FOR_MODULE_NAMES": "Framework",
-                        ])], buildPhases: [
-                            TestSourcesBuildPhase(["tool.swift"])
-                        ], dependencies: [
-                            "HostToolDependency"
-                        ]),
-                TestStandardTarget("Framework", type: .framework, buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator"
-                        ]),
-                ], buildPhases: [
-                    TestSourcesBuildPhase(["frame.swift"])
-                ], dependencies: [
-                    "HostTool"
-                ]),
-                TestStandardTarget("Framework2", type: .framework, buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator"
-                        ]),
-                ], buildPhases: [
-                    TestSourcesBuildPhase(["frame2.swift"])
-                ]),
-                TestStandardTarget("App", type: .application, buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator"
-                        ]),
-                ], buildPhases: [
-                    TestSourcesBuildPhase(["app.swift"])
-                ], dependencies: [
-                    "Framework", "Framework2"
-                ]),
+                TestStandardTarget(
+                    "HostToolDependency",
+                    type: .framework,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase(["dep.swift"])
+                    ]
+                ),
+                TestStandardTarget(
+                    "HostTool",
+                    type: .hostBuildTool,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SWIFT_IMPLEMENTS_MACROS_FOR_MODULE_NAMES": "Framework",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase(["tool.swift"])
+                    ],
+                    dependencies: [
+                        "HostToolDependency"
+                    ]
+                ),
+                TestStandardTarget(
+                    "Framework",
+                    type: .framework,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase(["frame.swift"])
+                    ],
+                    dependencies: [
+                        "HostTool"
+                    ]
+                ),
+                TestStandardTarget(
+                    "Framework2",
+                    type: .framework,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase(["frame2.swift"])
+                    ]
+                ),
+                TestStandardTarget(
+                    "App",
+                    type: .application,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase(["app.swift"])
+                    ],
+                    dependencies: [
+                        "Framework", "Framework2",
+                    ]
+                ),
             ]
         )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
@@ -313,11 +394,15 @@ fileprivate struct HostBuildToolTaskConstructionTests: CoreBasedTests {
     func swiftMacroBinaryPluginLoadingFlags() async throws {
         let testProject = try await TestProject(
             "aProject",
-            groupTree: TestGroup("Foo", children: [
-                TestFile("frame.swift"),
-                TestFile("frame2.swift"),
-                TestFile("app.swift"),
-            ]), buildConfigurations: [
+            groupTree: TestGroup(
+                "Foo",
+                children: [
+                    TestFile("frame.swift"),
+                    TestFile("frame2.swift"),
+                    TestFile("app.swift"),
+                ]
+            ),
+            buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
@@ -326,42 +411,62 @@ fileprivate struct HostBuildToolTaskConstructionTests: CoreBasedTests {
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "CODE_SIGN_IDENTITY": "Apple Development",
-                    ]),
+                    ]
+                )
             ],
             targets: [
-                TestStandardTarget("Framework", type: .framework, buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
-                            "SWIFT_LOAD_BINARY_MACROS": "/path/to/macroa#MacroA /path/to/macrob#MacroB1,MacroB2"
-                        ]),
-                ], buildPhases: [
-                    TestSourcesBuildPhase(["frame.swift"])
-                ]),
-                TestStandardTarget("Framework2", type: .framework, buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator"
-                        ]),
-                ], buildPhases: [
-                    TestSourcesBuildPhase(["frame2.swift"])
-                ]),
-                TestStandardTarget("App", type: .application, buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator"
-                        ]),
-                ], buildPhases: [
-                    TestSourcesBuildPhase(["app.swift"])
-                ], dependencies: [
-                    "Framework", "Framework2"
-                ]),
+                TestStandardTarget(
+                    "Framework",
+                    type: .framework,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                                "SWIFT_LOAD_BINARY_MACROS": "/path/to/macroa#MacroA /path/to/macrob#MacroB1,MacroB2",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase(["frame.swift"])
+                    ]
+                ),
+                TestStandardTarget(
+                    "Framework2",
+                    type: .framework,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase(["frame2.swift"])
+                    ]
+                ),
+                TestStandardTarget(
+                    "App",
+                    type: .application,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase(["app.swift"])
+                    ],
+                    dependencies: [
+                        "Framework", "Framework2",
+                    ]
+                ),
             ]
         )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
@@ -410,29 +515,41 @@ fileprivate struct HostBuildToolTaskConstructionTests: CoreBasedTests {
     func swiftMacroSwiftSyntaxSearchPaths() async throws {
         let testProject = try await TestProject(
             "aProject",
-            groupTree: TestGroup("Foo", children: [
-                TestFile("tool.swift"),
-            ]), buildConfigurations: [
+            groupTree: TestGroup(
+                "Foo",
+                children: [
+                    TestFile("tool.swift")
+                ]
+            ),
+            buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "SWIFT_VERSION": swiftVersion,
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SWIFT_EXEC": swiftCompilerPath.str
-                    ]),
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                    ]
+                )
             ],
             targets: [
-                TestStandardTarget("HostTool", type: .hostBuildTool, buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "SDKROOT": "auto",
-                            "SWIFT_IMPLEMENTS_MACROS_FOR_MODULE_NAMES": "Framework",
-                            "SWIFT_ADD_TOOLCHAIN_SWIFTSYNTAX_SEARCH_PATHS": "YES",
-                        ])], buildPhases: [
-                            TestSourcesBuildPhase(["tool.swift"])
-                        ]),
+                TestStandardTarget(
+                    "HostTool",
+                    type: .hostBuildTool,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SWIFT_IMPLEMENTS_MACROS_FOR_MODULE_NAMES": "Framework",
+                                "SWIFT_ADD_TOOLCHAIN_SWIFTSYNTAX_SEARCH_PATHS": "YES",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase(["tool.swift"])
+                    ]
+                )
             ]
         )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
diff --git a/Tests/SWBTaskConstructionTests/InAppPurchaseContentTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/InAppPurchaseContentTaskConstructionTests.swift
index 6b338d2a..b86e7595 100644
--- a/Tests/SWBTaskConstructionTests/InAppPurchaseContentTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/InAppPurchaseContentTaskConstructionTests.swift
@@ -23,10 +23,12 @@ fileprivate struct InAppPurchaseContentTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("resource.dat"),
-                ]),
+                    TestFile("resource.dat")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -34,21 +36,25 @@ fileprivate struct InAppPurchaseContentTaskConstructionTests: CoreBasedTests {
                         "INSTALL_PATH": "$(LOCAL_LIBRARY_DIR)/InAppPurchaseContent",
                         "INFOPLIST_FILE": "MyIAP/ContentInfo.plist",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyIAP",
                     type: .inAppPurchaseContent,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "macosx"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
-                            "resource.dat",
-                        ]),
+                            "resource.dat"
+                        ])
                     ],
                     dependencies: ["MyIAPEmbedded"]
                 ),
@@ -56,17 +62,21 @@ fileprivate struct InAppPurchaseContentTaskConstructionTests: CoreBasedTests {
                     "MyIAPEmbedded",
                     type: .inAppPurchaseContent,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "iphoneos"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "iphoneos"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
-                            "resource.dat",
-                        ]),
+                            "resource.dat"
+                        ])
                     ]
                 ),
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let srcRoot = tester.workspace.projects[0].sourceRoot
 
diff --git a/Tests/SWBTaskConstructionTests/IndexBuildTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/IndexBuildTaskConstructionTests.swift
index fd95be85..54f70dcf 100644
--- a/Tests/SWBTaskConstructionTests/IndexBuildTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/IndexBuildTaskConstructionTests.swift
@@ -26,38 +26,49 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             "macApp",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx"
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.c",]),
+                TestSourcesBuildPhase(["main.c"]),
                 TestFrameworksBuildPhase(["FwkTarget.framework"]),
-            ])
+            ]
+        )
 
         let iosApp = TestStandardTarget(
             "iosApp",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "iphoneos",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "iphoneos"
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.c",]),
-            ])
+                TestSourcesBuildPhase(["main.c"])
+            ]
+        )
 
         let fwkTarget_mac = TestStandardTarget(
             "FwkTarget_mac",
             type: .framework,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                    "PRODUCT_NAME": "FwkTarget",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx",
+                        "PRODUCT_NAME": "FwkTarget",
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.c",]),
+                TestSourcesBuildPhase(["main.c"])
             ]
         )
 
@@ -65,13 +76,16 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             "FwkTarget_ios",
             type: .framework,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "iphoneos",
-                    "PRODUCT_NAME": "FwkTarget",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "iphoneos",
+                        "PRODUCT_NAME": "FwkTarget",
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.c",]),
+                TestSourcesBuildPhase(["main.c"])
             ]
         )
 
@@ -80,8 +94,9 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             groupTree: TestGroup(
                 "SomeFiles",
                 children: [
-                    TestFile("main.c"),
-                ]),
+                    TestFile("main.c")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -89,13 +104,16 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "ALWAYS_SEARCH_USER_PATHS": "NO",
-                    ])],
+                    ]
+                )
+            ],
             targets: [
                 macApp,
                 iosApp,
                 fwkTarget_mac,
                 fwkTarget_ios,
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Check that we get tasks for all the supported platforms, independent of the run destination in the build request.
@@ -153,18 +171,21 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             "FrameworkTarget1",
             type: .framework,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "iphoneos",
-                    "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
-                    "INFOPLIST_FILE": "MyInfo.plist",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "iphoneos",
+                        "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                        "INFOPLIST_FILE": "MyInfo.plist",
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase([
-                    "main.c",
+                    "main.c"
                 ]),
                 TestHeadersBuildPhase([
-                    TestBuildFile("FrameworkTarget.h", headerVisibility: .public),
+                    TestBuildFile("FrameworkTarget.h", headerVisibility: .public)
                 ]),
             ]
         )
@@ -173,18 +194,21 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             "FrameworkTarget2",
             type: .framework,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                    "SUPPORTED_PLATFORMS": "macosx",
-                    "INFOPLIST_FILE": "MyInfo.plist",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx",
+                        "SUPPORTED_PLATFORMS": "macosx",
+                        "INFOPLIST_FILE": "MyInfo.plist",
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase([
-                    "main.c",
+                    "main.c"
                 ]),
                 TestHeadersBuildPhase([
-                    TestBuildFile("FrameworkTarget.h", headerVisibility: .public),
+                    TestBuildFile("FrameworkTarget.h", headerVisibility: .public)
                 ]),
             ]
         )
@@ -193,19 +217,22 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             "FrameworkTarget3",
             type: .framework,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "unknown",
-                    "SUPPORTED_PLATFORMS": "unknown",
-                    "INFOPLIST_FILE": "MyInfo.plist",
-                    "PRODUCT_NAME": "FrameworkTarget3"
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "unknown",
+                        "SUPPORTED_PLATFORMS": "unknown",
+                        "INFOPLIST_FILE": "MyInfo.plist",
+                        "PRODUCT_NAME": "FrameworkTarget3",
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase([
-                    "main.c",
+                    "main.c"
                 ]),
                 TestHeadersBuildPhase([
-                    TestBuildFile("FrameworkTarget.h", headerVisibility: .public),
+                    TestBuildFile("FrameworkTarget.h", headerVisibility: .public)
                 ]),
             ]
         )
@@ -214,19 +241,22 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             "FrameworkTarget4",
             type: .framework,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                    "SUPPORTED_PLATFORMS": "macosx",
-                    "INFOPLIST_FILE": "MyInfo.plist",
-                    "EFFECTIVE_PLATFORM_NAME": "-custom",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx",
+                        "SUPPORTED_PLATFORMS": "macosx",
+                        "INFOPLIST_FILE": "MyInfo.plist",
+                        "EFFECTIVE_PLATFORM_NAME": "-custom",
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase([
-                    "main.c",
+                    "main.c"
                 ]),
                 TestHeadersBuildPhase([
-                    TestBuildFile("FrameworkTarget4.h", headerVisibility: .public),
+                    TestBuildFile("FrameworkTarget4.h", headerVisibility: .public)
                 ]),
             ]
         )
@@ -240,14 +270,19 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                     TestFile("FrameworkTarget.h"),
                     TestFile("FrameworkTarget4.h"),
                     TestFile("MyInfo.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "ALWAYS_SEARCH_USER_PATHS": "NO",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ALWAYS_SEARCH_USER_PATHS": "NO",
+                    ]
+                )
             ],
-            targets: [fwkTarget1, fwkTarget2, fwkTarget3, fwkTarget4])
+            targets: [fwkTarget1, fwkTarget2, fwkTarget3, fwkTarget4]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -266,7 +301,7 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
 
         try await tester.checkIndexBuild() { results in
             func checkVFSContents(_ task: any PlannedTask, _ target: ConfiguredTarget, _ platformDir: String, _ contents: ByteString, sourceLocation: SourceLocation = #_sourceLocation) {
-                func recursivelyForEachDict(_ item: PropertyListItem, _ body: ([String:PropertyListItem]) -> Void) {
+                func recursivelyForEachDict(_ item: PropertyListItem, _ body: ([String: PropertyListItem]) -> Void) {
                     if let item = item.dictValue {
                         body(item)
                         for (_, value) in item {
@@ -443,35 +478,43 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("main.c"),
                     TestFile("FrameworkTarget.h"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "ALWAYS_SEARCH_USER_PATHS": "NO",
-                    "DEPLOYMENT_LOCATION": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ALWAYS_SEARCH_USER_PATHS": "NO",
+                        "DEPLOYMENT_LOCATION": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFrame",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "macosx",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                            "DEPLOYMENT_LOCATION": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                                "DEPLOYMENT_LOCATION": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.c",
+                            "main.c"
                         ]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("FrameworkTarget.h", headerVisibility: .public),
+                            TestBuildFile("FrameworkTarget.h", headerVisibility: .public)
                         ]),
                     ]
-                ),
-            ])
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -504,7 +547,8 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             "aProject",
             groupTree: TestGroup(
                 "SomeFiles",
-                children: [ TestFile("main.swift") ]),
+                children: [TestFile("main.swift")]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration("Debug", buildSettings: buildSettings)
             ],
@@ -516,12 +560,14 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
-                                "OTHER_SWIFT_FLAGS": "$(inherited) -vfsoverlay /must/be/after/fallback/overlay.yaml",
-                            ])
+                                "OTHER_SWIFT_FLAGS": "$(inherited) -vfsoverlay /must/be/after/fallback/overlay.yaml"
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([ "main.swift" ])
-                    ]),
+                        TestSourcesBuildPhase(["main.swift"])
+                    ]
+                ),
                 TestStandardTarget(
                     "AppTargetNoRemap",
                     type: .application,
@@ -529,13 +575,16 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
-                                "INDEX_DISABLE_VFS_DIRECTORY_REMAP": "YES",
-                            ])
+                                "INDEX_DISABLE_VFS_DIRECTORY_REMAP": "YES"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["main.swift"])
-                    ])
-            ])
+                    ]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         try await tester.checkIndexBuild() { results in
@@ -638,7 +687,8 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             "aProject",
             groupTree: TestGroup(
                 "SomeFiles",
-                children: [ TestFile("main.swift") ]),
+                children: [TestFile("main.swift")]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration("Debug", buildSettings: buildSettings)
             ],
@@ -650,9 +700,11 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                         TestBuildConfiguration("Debug", buildSettings: buildSettings)
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([ "main.swift" ])
-                    ])
-            ])
+                        TestSourcesBuildPhase(["main.swift"])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(runDestination: .anyMac) { results in
@@ -681,9 +733,12 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             "Target1",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "Mod",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "Mod"
+                    ]
+                )
             ],
             buildPhases: [TestSourcesBuildPhase(["a.swift"])]
         )
@@ -691,10 +746,13 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             "Target2",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "Mod",
-                    "EFFECTIVE_PLATFORM_NAME": "-custom"
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "Mod",
+                        "EFFECTIVE_PLATFORM_NAME": "-custom",
+                    ]
+                )
             ],
             buildPhases: [TestSourcesBuildPhase(["a.swift"])]
         )
@@ -703,15 +761,19 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             "proj",
             groupTree: TestGroup(
                 "SomeFiles",
-                children: [ TestFile("a.swift") ]),
+                children: [TestFile("a.swift")]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "SDKROOT": "macosx",
-                    "SUPPORTED_PLATFORMS": "macosx",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "SDKROOT": "macosx",
+                        "SUPPORTED_PLATFORMS": "macosx",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                    ]
+                )
             ],
             targets: [target1, target2]
         )
@@ -751,7 +813,8 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             "aProject",
             groupTree: TestGroup(
                 "SomeFiles",
-                children: [ TestFile("main.c") ]),
+                children: [TestFile("main.c")]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -761,7 +824,9 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                         "ALWAYS_SEARCH_USER_PATHS": "NO",
                         "CC": clangCompilerPath.str,
                         "CLANG_USE_RESPONSE_FILE": "NO",
-                    ])],
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
@@ -770,12 +835,14 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
-                                "OTHER_CFLAGS": "$(inherited) -ivfsoverlay /must/be/after/fallback/overlay.yaml",
-                            ])
+                                "OTHER_CFLAGS": "$(inherited) -ivfsoverlay /must/be/after/fallback/overlay.yaml"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["main.c"])
-                    ]),
+                    ]
+                ),
                 TestStandardTarget(
                     "AppTargetNoRemap",
                     type: .application,
@@ -783,13 +850,16 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
-                                "INDEX_DISABLE_VFS_DIRECTORY_REMAP": "YES",
-                            ])
+                                "INDEX_DISABLE_VFS_DIRECTORY_REMAP": "YES"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["main.c"])
-                    ])
-            ])
+                    ]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         try await tester.checkIndexBuild() { results in
@@ -853,24 +923,30 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "Sources",
                     children: [
-                        TestFile("file.c"),
-                    ]),
-                buildConfigurations: [TestBuildConfiguration(
-                    "Debug",
-                    buildSettings: [
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "CLANG_ENABLE_COMPILE_CACHE": "YES",
-                        "CLANG_COMPILE_CACHE_PATH": tmpDirPath.join("CompilationCache").str,
-                    ])],
+                        TestFile("file.c")
+                    ]
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "CLANG_ENABLE_COMPILE_CACHE": "YES",
+                            "CLANG_COMPILE_CACHE_PATH": tmpDirPath.join("CompilationCache").str,
+                        ]
+                    )
+                ],
                 targets: [
                     TestStandardTarget(
                         "App",
                         type: .application,
                         buildPhases: [
-                            TestSourcesBuildPhase(["file.c"]),
-                        ]),
-                ])
+                            TestSourcesBuildPhase(["file.c"])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             try await tester.checkIndexBuild() { results in
@@ -889,7 +965,8 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("interface.iig"),
                     TestFile("main.c"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -898,7 +975,9 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "ALWAYS_SEARCH_USER_PATHS": "NO",
                         "IIG_EXEC": iigPath.str,
-                    ])],
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "DextTarget",
@@ -911,8 +990,10 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                             "interface.iig",
                             "main.c",
                         ])
-                    ])
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -940,7 +1021,8 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                 "aProject",
                 groupTree: TestGroup(
                     "SomeFiles",
-                    children: [ TestFile("main.c") ]),
+                    children: [TestFile("main.c")]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -950,15 +1032,19 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                             "CLANG_ENABLE_MODULES": "YES",
                             "CLANG_ENABLE_EXPLICIT_MODULES": enableExplicitModules ? "YES" : "NO",
                             "CC": clangCompilerPath.str,
-                        ])],
+                        ]
+                    )
+                ],
                 targets: [
                     TestStandardTarget(
                         "AppTarget",
                         type: .application,
                         buildPhases: [
                             TestSourcesBuildPhase(["main.c"])
-                        ]),
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
             try await tester.checkIndexBuild { results in
                 try results.checkTask(.matchTargetName("AppTarget"), .matchRuleItem("CompileC")) { task in
@@ -988,7 +1074,8 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("main.c"),
                     TestFile("FrameworkTarget.h"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Staging",
@@ -998,7 +1085,9 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                         "ALWAYS_SEARCH_USER_PATHS": "NO",
                         "GCC_PREPROCESSOR_DEFINITIONS": "$(CONFIGURATION)",
                         "CLANG_USE_RESPONSE_FILE": "NO",
-                    ])],
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
@@ -1006,16 +1095,20 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                     buildPhases: [
                         TestSourcesBuildPhase(["main.c"]),
                         TestFrameworksBuildPhase(["Fwk.framework"]),
-                    ]),
+                    ]
+                ),
                 TestStandardTarget(
-                    "Fwk", type: .framework,
+                    "Fwk",
+                    type: .framework,
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("FrameworkTarget.h", headerVisibility: .public),
+                            TestBuildFile("FrameworkTarget.h", headerVisibility: .public)
                         ]),
-                        TestSourcesBuildPhase(["main.c"])
-                    ])
-            ])
+                        TestSourcesBuildPhase(["main.c"]),
+                    ]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1049,34 +1142,49 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             "AppTarget",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "iphoneos",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "iphoneos"
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase([
-                    "main.c",
+                    "main.c"
                 ]),
                 TestShellScriptBuildPhase(
-                    name: "ScriptNoOut", originalObjectID: "ScriptNoOut", contents: "exit 0", inputs: [], outputs: [])
-            ])
+                    name: "ScriptNoOut",
+                    originalObjectID: "ScriptNoOut",
+                    contents: "exit 0",
+                    inputs: [],
+                    outputs: []
+                ),
+            ]
+        )
 
-        let testProject =  TestProject(
+        let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
                 "SomeFiles",
                 children: [
-                    TestFile("main.c"),
-                ]),
+                    TestFile("main.c")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "ALWAYS_SEARCH_USER_PATHS": "NO",
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ALWAYS_SEARCH_USER_PATHS": "NO",
+                    ]
+                )
+            ],
             targets: [
-                appTarget,
-            ])
+                appTarget
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         try await tester.checkIndexBuild(runDestination: .iOS) { results in
@@ -1091,67 +1199,86 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             "catalystApp",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "iphoneos",
-                    "SUPPORTS_MACCATALYST": "YES",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "iphoneos",
+                        "SUPPORTS_MACCATALYST": "YES",
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase([
-                    "main.c",
-                ]),
+                    "main.c"
+                ])
             ],
             dependencies: [
-                "script1",
-            ])
+                "script1"
+            ]
+        )
 
         let appTarget = TestStandardTarget(
             "AppTarget1",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                    "SUPPORTED_PLATFORMS": "macosx",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx",
+                        "SUPPORTED_PLATFORMS": "macosx",
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase([
-                    "main.c",
-                ]),
+                    "main.c"
+                ])
             ],
             dependencies: [
-                "script1",
-            ])
+                "script1"
+            ]
+        )
 
         let scriptTarget = TestAggregateTarget(
             "script1",
             buildPhases: [
                 TestShellScriptBuildPhase(
-                    name: "Script1", originalObjectID: "Script1", contents: "echo Script1 > \"${DERIVED_FILE_DIR}/script1-output\"", inputs: [], outputs: [
+                    name: "Script1",
+                    originalObjectID: "Script1",
+                    contents: "echo Script1 > \"${DERIVED_FILE_DIR}/script1-output\"",
+                    inputs: [],
+                    outputs: [
                         "$(DERIVED_FILE_DIR)/script1-output"
-                    ])
+                    ]
+                )
             ]
         )
 
-        let testProject =  TestProject(
+        let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
                 "SomeFiles",
                 children: [
-                    TestFile("main.c"),
-                ]),
+                    TestFile("main.c")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "SDKROOT": "macosx",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "ALWAYS_SEARCH_USER_PATHS": "NO",
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "SDKROOT": "macosx",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ALWAYS_SEARCH_USER_PATHS": "NO",
+                    ]
+                )
+            ],
             targets: [
                 catalystAppTarget,
                 appTarget,
                 scriptTarget,
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         try await tester.checkIndexBuild { results in
@@ -1186,11 +1313,14 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             "catalystApp",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                    "SUPPORTED_PLATFORMS": "macosx",
-                    "SUPPORTS_MACCATALYST": "YES",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx",
+                        "SUPPORTED_PLATFORMS": "macosx",
+                        "SUPPORTS_MACCATALYST": "YES",
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase(["main.swift"]),
@@ -1199,16 +1329,20 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
         )
 
         let zipperedFrameTarget = TestStandardTarget(
-            "zipperFrame", type: .framework,
+            "zipperFrame",
+            type: .framework,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "macosx",
-                    "SUPPORTED_PLATFORMS": "macosx",
-                    "IS_ZIPPERED": "YES",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "macosx",
+                        "SUPPORTED_PLATFORMS": "macosx",
+                        "IS_ZIPPERED": "YES",
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.swift"]),
+                TestSourcesBuildPhase(["main.swift"])
             ]
         )
 
@@ -1217,22 +1351,28 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             groupTree: TestGroup(
                 "SomeFiles",
                 children: [
-                    TestFile("main.swift"),
-                ]),
+                    TestFile("main.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "SDKROOT": "macosx",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    // Ensure that the index build forces distinct build directories for macOS vs macCatalyst, even if the project overrides and sets the same EFFECTIVE_PLATFORM_NAME.
-                    "EFFECTIVE_PLATFORM_NAME[sdk=macos*]": "-mac",
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "SDKROOT": "macosx",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        // Ensure that the index build forces distinct build directories for macOS vs macCatalyst, even if the project overrides and sets the same EFFECTIVE_PLATFORM_NAME.
+                        "EFFECTIVE_PLATFORM_NAME[sdk=macos*]": "-mac",
+                    ]
+                )
+            ],
             targets: [
                 catalystAppTarget,
                 zipperedFrameTarget,
-            ])
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         try await tester.checkIndexBuild { results in
@@ -1271,14 +1411,19 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("main.swift"),
                     TestFile("main.m"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "GENERATE_RESOURCE_ACCESSORS": "YES",
-                    "USE_HEADERMAP": "NO"]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "GENERATE_RESOURCE_ACCESSORS": "YES",
+                        "USE_HEADERMAP": "NO",
+                    ]
+                )
             ],
             targets: [
                 TestAggregateTarget(
@@ -1286,17 +1431,21 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                     dependencies: ["tool", "objctool"]
                 ),
                 TestStandardTarget(
-                    "tool", type: .application,
+                    "tool",
+                    type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "USE_HEADERMAP": "NO",
-                            "DEFINES_MODULE": "YES",
-                            "PACKAGE_RESOURCE_BUNDLE_NAME": "tool_resources",
-                            "EMBED_PACKAGE_RESOURCE_BUNDLE_NAMES": "tool_resources",
-                            "CODE_SIGNING_ALLOWED": "NO",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "USE_HEADERMAP": "NO",
+                                "DEFINES_MODULE": "YES",
+                                "PACKAGE_RESOURCE_BUNDLE_NAME": "tool_resources",
+                                "EMBED_PACKAGE_RESOURCE_BUNDLE_NAMES": "tool_resources",
+                                "CODE_SIGNING_ALLOWED": "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["main.swift"]),
@@ -1305,31 +1454,41 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                     dependencies: ["toolslib"]
                 ),
                 TestStandardTarget(
-                    "objctool", type: .commandLineTool,
+                    "objctool",
+                    type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "USE_HEADERMAP": "NO",
-                            "DEFINES_MODULE": "YES",
-                            "PACKAGE_RESOURCE_BUNDLE_NAME": "tool_resources",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "USE_HEADERMAP": "NO",
+                                "DEFINES_MODULE": "YES",
+                                "PACKAGE_RESOURCE_BUNDLE_NAME": "tool_resources",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.m"]),
+                        TestSourcesBuildPhase(["main.m"])
                     ]
                 ),
                 TestStandardTarget(
-                    "toolslib", type: .dynamicLibrary,
+                    "toolslib",
+                    type: .dynamicLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "PACKAGE_RESOURCE_BUNDLE_NAME": "tools_resources",
-                        ], impartedBuildProperties: TestImpartedBuildProperties(buildSettings: [
-                            "EMBED_PACKAGE_RESOURCE_BUNDLE_NAMES": "$(inherited) tool_resources",
-                        ])
-                                              )]
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "PACKAGE_RESOURCE_BUNDLE_NAME": "tools_resources",
+                            ],
+                            impartedBuildProperties: TestImpartedBuildProperties(buildSettings: [
+                                "EMBED_PACKAGE_RESOURCE_BUNDLE_NAMES": "$(inherited) tool_resources"
+                            ])
+                        )
+                    ]
                 ),
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         try await tester.checkIndexBuild(workspaceOperation: false) { results in
@@ -1367,20 +1526,25 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             "multiVariantTarget",
             type: .application,
             buildPhases: [
-                TestSourcesBuildPhase(["main.swift"]),
-            ])
+                TestSourcesBuildPhase(["main.swift"])
+            ]
+        )
 
         let singleIndexVariantTarget = TestStandardTarget(
             "singleIndexVariantTarget",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "INDEX_BUILD_VARIANT": "dev",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "INDEX_BUILD_VARIANT": "dev"
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main2.swift"]),
-            ])
+                TestSourcesBuildPhase(["main2.swift"])
+            ]
+        )
 
         let testProject = try await TestProject(
             "aProject",
@@ -1401,12 +1565,14 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                         "OTHER_SWIFT_FLAGS[variant=dev]": "-DSOME_DEV_FLAG",
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
-                    ])
+                    ]
+                )
             ],
             targets: [
                 multiVariantTarget,
                 singleIndexVariantTarget,
-            ])
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -1436,20 +1602,24 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             "testTarget",
             type: .application,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "RUN_CLANG_STATIC_ANALYZER": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "RUN_CLANG_STATIC_ANALYZER": "YES"
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.c"]),
-            ])
+                TestSourcesBuildPhase(["main.c"])
+            ]
+        )
 
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
                 "Files",
                 children: [
-                    TestFile("main.c"),
+                    TestFile("main.c")
                 ]
             ),
             buildConfigurations: [
@@ -1458,11 +1628,13 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                     buildSettings: [
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ])
+                    ]
+                )
             ],
             targets: [
-                testTarget,
-            ])
+                testTarget
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -1483,31 +1655,39 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             "HasImplicitModMap",
             type: .framework,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "DEFINES_MODULE": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "DEFINES_MODULE": "YES"
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase(["main.c"]),
                 TestHeadersBuildPhase([
                     TestBuildFile("HasImplicitModMap.h", headerVisibility: .public)
-                ])
-            ])
+                ]),
+            ]
+        )
 
         // A target with explicit module maps that get copied into the product.
         let targetExplicitModMap = TestStandardTarget(
             "HasExplicitModMap",
             type: .framework,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "DEFINES_MODULE": "YES",
-                    "MODULEMAP_FILE": "ExplicitMod.modulemap",
-                    "MODULEMAP_PRIVATE_FILE": "ExplicitMod.private.modulemap",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "DEFINES_MODULE": "YES",
+                        "MODULEMAP_FILE": "ExplicitMod.modulemap",
+                        "MODULEMAP_PRIVATE_FILE": "ExplicitMod.private.modulemap",
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["main.c"]),
-            ])
+                TestSourcesBuildPhase(["main.c"])
+            ]
+        )
 
         // A target with an explicit module map that gets extended before being
         // copied into the product.
@@ -1515,15 +1695,19 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
             "HasExtendedExplicitModMap",
             type: .framework,
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "DEFINES_MODULE": "YES",
-                    "SWIFT_INSTALL_OBJC_HEADER": "YES",
-                    "MODULEMAP_FILE": "ExtExplicitMod.modulemap",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "DEFINES_MODULE": "YES",
+                        "SWIFT_INSTALL_OBJC_HEADER": "YES",
+                        "MODULEMAP_FILE": "ExtExplicitMod.modulemap",
+                    ]
+                )
             ],
             buildPhases: [
-                TestSourcesBuildPhase(["a.swift"]),
-            ])
+                TestSourcesBuildPhase(["a.swift"])
+            ]
+        )
 
         let testProject = try await TestProject(
             "aProject",
@@ -1547,13 +1731,15 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                         "SUPPORTED_PLATFORMS": "macosx",
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
-                    ])
+                    ]
+                )
             ],
             targets: [
                 targetImplicitModMap,
                 targetExplicitModMap,
                 targetExtendedExplicitModMap,
-            ])
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         try await tester.checkIndexBuild { results in
@@ -1568,13 +1754,15 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                     "HasImplicitModMap.framework/Versions/A/Modules/module.modulemap"
                 )
                 results.checkTask(
-                    .matchTarget(target), .matchRuleItem("WriteAuxiliaryFile"),
+                    .matchTarget(target),
+                    .matchRuleItem("WriteAuxiliaryFile"),
                     .matchRuleItemPattern(intermediateModMap)
                 ) { task in
                     task.checkOutputs(contain: [.pathPattern(intermediateModMap)])
                 }
                 results.checkTask(
-                    .matchTarget(target), .matchRuleItem("Copy"),
+                    .matchTarget(target),
+                    .matchRuleItem("Copy"),
                     .matchRuleItemPattern(frameworkModMap)
                 ) { task in
                     task.checkInputs(contain: [.pathPattern(intermediateModMap)])
@@ -1604,28 +1792,32 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                     "HasExplicitModMap.framework/Versions/A/Modules/module.private.modulemap"
                 )
                 results.checkTask(
-                    .matchTarget(target), .matchRuleItem("Copy"),
+                    .matchTarget(target),
+                    .matchRuleItem("Copy"),
                     .matchRuleItemPattern(srcModMap)
                 ) { task in
                     task.checkInputs(contain: [.pathPattern(srcModMap)])
                     task.checkOutputs(contain: [.pathPattern(intermediateModMap)])
                 }
                 results.checkTask(
-                    .matchTarget(target), .matchRuleItem("Copy"),
+                    .matchTarget(target),
+                    .matchRuleItem("Copy"),
                     .matchRuleItemPattern(srcPrivateModMap)
                 ) { task in
                     task.checkInputs(contain: [.pathPattern(srcPrivateModMap)])
                     task.checkOutputs(contain: [.pathPattern(intermediatePrivateModMap)])
                 }
                 results.checkTask(
-                    .matchTarget(target), .matchRuleItem("Copy"),
+                    .matchTarget(target),
+                    .matchRuleItem("Copy"),
                     .matchRuleItemPattern(frameworkModMap)
                 ) { task in
                     task.checkInputs(contain: [.pathPattern(intermediateModMap)])
                     task.checkOutputs(contain: [.pathPattern(frameworkModMap)])
                 }
                 results.checkTask(
-                    .matchTarget(target), .matchRuleItem("Copy"),
+                    .matchTarget(target),
+                    .matchRuleItem("Copy"),
                     .matchRuleItemPattern(frameworkPrivateModMap)
                 ) { task in
                     task.checkInputs(contain: [.pathPattern(intermediatePrivateModMap)])
@@ -1652,7 +1844,8 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                     "HasExtendedExplicitModMap.framework/Versions/A/Modules/module.modulemap"
                 )
                 results.checkTask(
-                    .matchTarget(target), .matchRuleItem("Concatenate"),
+                    .matchTarget(target),
+                    .matchRuleItem("Concatenate"),
                     .matchRuleItemPattern(srcModMap),
                     .matchRuleItemPattern(intermediateModMap)
                 ) { task in
@@ -1660,23 +1853,26 @@ fileprivate struct IndexBuildTaskConstructionTests: CoreBasedTests {
                     task.checkOutputs(contain: [.pathPattern(intermediateModMap)])
                 }
                 results.checkTask(
-                    .matchTarget(target), .matchRuleItem("WriteAuxiliaryFile"),
+                    .matchTarget(target),
+                    .matchRuleItem("WriteAuxiliaryFile"),
                     .matchRuleItemPattern(unextensionModMap)
                 ) { task in
                     task.checkOutputs(contain: [.pathPattern(unextensionModMap)])
                 }
                 results.checkTask(
-                    .matchTarget(target), .matchRuleItem("Concatenate"),
+                    .matchTarget(target),
+                    .matchRuleItem("Concatenate"),
                     .matchRuleItemPattern(srcModMap),
                     .matchRuleItemPattern(unextendedModMap)
                 ) { task in
                     task.checkInputs(contain: [
-                        .pathPattern(srcModMap), .pathPattern(unextensionModMap)
+                        .pathPattern(srcModMap), .pathPattern(unextensionModMap),
                     ])
                     task.checkOutputs(contain: [.pathPattern(unextendedModMap)])
                 }
                 results.checkTask(
-                    .matchTarget(target), .matchRuleItem("Copy"),
+                    .matchTarget(target),
+                    .matchRuleItem("Copy"),
                     .matchRuleItemPattern(frameworkModMap)
                 ) { task in
                     task.checkInputs(contain: [.pathPattern(intermediateModMap)])
diff --git a/Tests/SWBTaskConstructionTests/InfoPlistTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/InfoPlistTaskConstructionTests.swift
index 2021613d..f1aefebe 100644
--- a/Tests/SWBTaskConstructionTests/InfoPlistTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/InfoPlistTaskConstructionTests.swift
@@ -31,37 +31,44 @@ fileprivate struct InfoPlistTaskConstructionTests: CoreBasedTests {
                     TestFile("infoplist-prefix.h"),
                     TestFile("SourceFile.m"),
                     TestFile("Tool.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "CREATE_INFOPLIST_SECTION_IN_BINARY": "YES",
-                    "INFOPLIST_FILE": "Tool.plist",
-                    "INFOPLIST_PREPROCESS": "YES",
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "CREATE_INFOPLIST_SECTION_IN_BINARY": "YES",
+                        "INFOPLIST_FILE": "Tool.plist",
+                        "INFOPLIST_PREPROCESS": "YES",
 
-                    // These should be ignored for plist preprocessing
-                    "GCC_PREPROCESSOR_DEFINITIONS": "FOO=GCC_PREPROCESSOR_DEFINITIONS BAR=GCC_PREPROCESSOR_DEFINITIONS",
-                    "CPP_OTHER_PREPROCESSOR_FLAGS": "-CPP_OTHER_PREPROCESSOR_FLAGS1 -CPP_OTHER_PREPROCESSOR_FLAGS2",
-                    "CPP_PREFIX_HEADER": "cpp-prefix.h",
-                ]),
-                TestBuildConfiguration("Release", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "CREATE_INFOPLIST_SECTION_IN_BINARY": "YES",
-                    "INFOPLIST_FILE": "Tool.plist",
-                    "INFOPLIST_PREPROCESS": "YES",
+                        // These should be ignored for plist preprocessing
+                        "GCC_PREPROCESSOR_DEFINITIONS": "FOO=GCC_PREPROCESSOR_DEFINITIONS BAR=GCC_PREPROCESSOR_DEFINITIONS",
+                        "CPP_OTHER_PREPROCESSOR_FLAGS": "-CPP_OTHER_PREPROCESSOR_FLAGS1 -CPP_OTHER_PREPROCESSOR_FLAGS2",
+                        "CPP_PREFIX_HEADER": "cpp-prefix.h",
+                    ]
+                ),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "CREATE_INFOPLIST_SECTION_IN_BINARY": "YES",
+                        "INFOPLIST_FILE": "Tool.plist",
+                        "INFOPLIST_PREPROCESS": "YES",
 
-                    // These should be ignored for plist preprocessing
-                    "GCC_PREPROCESSOR_DEFINITIONS": "FOO=GCC_PREPROCESSOR_DEFINITIONS BAR=GCC_PREPROCESSOR_DEFINITIONS",
-                    "CPP_OTHER_PREPROCESSOR_FLAGS": "-CPP_OTHER_PREPROCESSOR_FLAGS1 -CPP_OTHER_PREPROCESSOR_FLAGS2",
-                    "CPP_PREFIX_HEADER": "cpp-prefix.h",
+                        // These should be ignored for plist preprocessing
+                        "GCC_PREPROCESSOR_DEFINITIONS": "FOO=GCC_PREPROCESSOR_DEFINITIONS BAR=GCC_PREPROCESSOR_DEFINITIONS",
+                        "CPP_OTHER_PREPROCESSOR_FLAGS": "-CPP_OTHER_PREPROCESSOR_FLAGS1 -CPP_OTHER_PREPROCESSOR_FLAGS2",
+                        "CPP_PREFIX_HEADER": "cpp-prefix.h",
 
-                    // These should take effect for plist preprocessing
-                    "INFOPLIST_PREPROCESSOR_DEFINITIONS": "FOO=INFOPLIST_PREPROCESSOR_DEFINITIONS BAR=INFOPLIST_PREPROCESSOR_DEFINITIONS",
-                    "INFOPLIST_OTHER_PREPROCESSOR_FLAGS": "-INFOPLIST_OTHER_PREPROCESSOR_FLAGS1 -INFOPLIST_OTHER_PREPROCESSOR_FLAGS2",
-                    "INFOPLIST_PREFIX_HEADER": "$(PROJECT_DIR)/infoplist-prefix.h",
-                ]),
+                        // These should take effect for plist preprocessing
+                        "INFOPLIST_PREPROCESSOR_DEFINITIONS": "FOO=INFOPLIST_PREPROCESSOR_DEFINITIONS BAR=INFOPLIST_PREPROCESSOR_DEFINITIONS",
+                        "INFOPLIST_OTHER_PREPROCESSOR_FLAGS": "-INFOPLIST_OTHER_PREPROCESSOR_FLAGS1 -INFOPLIST_OTHER_PREPROCESSOR_FLAGS2",
+                        "INFOPLIST_PREFIX_HEADER": "$(PROJECT_DIR)/infoplist-prefix.h",
+                    ]
+                ),
             ],
             targets: [
                 TestAggregateTarget("All", dependencies: ["Tool", "App"]),
@@ -74,8 +81,8 @@ fileprivate struct InfoPlistTaskConstructionTests: CoreBasedTests {
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "SourceFile.m",
-                        ]),
+                            "SourceFile.m"
+                        ])
                     ]
                 ),
                 TestStandardTarget(
@@ -87,11 +94,12 @@ fileprivate struct InfoPlistTaskConstructionTests: CoreBasedTests {
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "SourceFile.m",
-                        ]),
+                            "SourceFile.m"
+                        ])
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -157,7 +165,8 @@ fileprivate struct InfoPlistTaskConstructionTests: CoreBasedTests {
                         "builtin-mergeInfoPlist",
                         "\(SRCROOT)/build/aProject.build/Release/App.build/Preprocessed-Info.plist",
                         "\(SRCROOT)/build/aProject.build/Release/App.build/normal/arm64/Preprocessed-Info.plist",
-                        "\(SRCROOT)/build/aProject.build/Release/App.build/normal/x86_64/Preprocessed-Info.plist"])
+                        "\(SRCROOT)/build/aProject.build/Release/App.build/normal/x86_64/Preprocessed-Info.plist",
+                    ])
                     task.checkInputs([
                         .path("\(SRCROOT)/build/aProject.build/Release/App.build/normal/arm64/Preprocessed-Info.plist"),
                         .path("\(SRCROOT)/build/aProject.build/Release/App.build/normal/x86_64/Preprocessed-Info.plist"),
diff --git a/Tests/SWBTaskConstructionTests/InstallAPITaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/InstallAPITaskConstructionTests.swift
index 71ba02c9..80477fdd 100644
--- a/Tests/SWBTaskConstructionTests/InstallAPITaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/InstallAPITaskConstructionTests.swift
@@ -29,51 +29,73 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Mock.c")]),
+                    TestFile("Mock.c")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "-",
-                    "DONT_GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                    "SKIP_INSTALL": "NO",
-                    "TAPI_EXEC": tapiToolPath.str])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "-",
+                        "DONT_GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                        "SKIP_INSTALL": "NO",
+                        "TAPI_EXEC": tapiToolPath.str,
+                    ]
+                )
+            ],
             targets: [
                 TestAggregateTarget(
                     "ALL",
                     dependencies: [
-                        "Tool", "Fwk", "FwkNoPlist", "FwkNoSrc", "Dylib", "DylibNoSrc"]),
+                        "Tool", "Fwk", "FwkNoPlist", "FwkNoSrc", "Dylib", "DylibNoSrc",
+                    ]
+                ),
                 TestStandardTarget(
                     "Tool",
                     type: .commandLineTool,
                     buildPhases: [
-                        TestSourcesBuildPhase(["Mock.c"])]),
+                        TestSourcesBuildPhase(["Mock.c"])
+                    ]
+                ),
                 TestStandardTarget(
                     "Fwk",
                     type: .framework,
                     buildConfigurations: [TestBuildConfiguration("Fwk", buildSettings: ["INFOPLIST_FILE": "Info.plist"])],
                     buildPhases: [
-                        TestSourcesBuildPhase(["Mock.c"])]),
+                        TestSourcesBuildPhase(["Mock.c"])
+                    ]
+                ),
                 TestStandardTarget(
                     "FwkNoPlist",
                     type: .framework,
                     buildPhases: [
-                        TestSourcesBuildPhase(["Mock.c"])]),
+                        TestSourcesBuildPhase(["Mock.c"])
+                    ]
+                ),
                 TestStandardTarget(
                     "FwkNoSrc",
                     type: .framework,
-                    buildPhases: []),
+                    buildPhases: []
+                ),
                 TestStandardTarget(
                     "Dylib",
                     type: .dynamicLibrary,
                     buildPhases: [
-                        TestSourcesBuildPhase(["Mock.c"])]),
+                        TestSourcesBuildPhase(["Mock.c"])
+                    ]
+                ),
                 TestStandardTarget(
                     "DylibNoSrc",
                     type: .dynamicLibrary,
-                    buildPhases: [])])
+                    buildPhases: []
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         let fs = PseudoFS()
@@ -103,20 +125,28 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Fwk.h"),
-                    TestFile("Fwk.c")]),
+                    TestFile("Fwk.c"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "-",
-                    "INFOPLIST_FILE": "Info.plist",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "TAPI_VERIFY_MODE": "ErrorsOnly",
-                    "TAPI_USE_SRCROOT": "NO",
-                    "SKIP_INSTALL": "NO"])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "-",
+                        "INFOPLIST_FILE": "Info.plist",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "TAPI_VERIFY_MODE": "ErrorsOnly",
+                        "TAPI_USE_SRCROOT": "NO",
+                        "SKIP_INSTALL": "NO",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
@@ -124,7 +154,12 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.c"]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("Fwk.h", headerVisibility: .public)])])])
+                            TestBuildFile("Fwk.h", headerVisibility: .public)
+                        ]),
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         let fs = PseudoFS()
@@ -143,13 +178,15 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             results.checkTask(.matchRuleType("CpHeader")) { task in
                 task.checkCommandLineMatches([
                     "builtin-copy", .anySequence, "/TEST/Sources/Fwk.h",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers",
+                ])
             }
             results.checkTask(.matchRuleType("SymLink"), .matchRuleItemBasename("Fwk.tbd")) { task in
                 task.checkCommandLine([
                     "/bin/ln", "-sfh",
                     "Versions/Current/Fwk.tbd",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd",
+                ])
             }
             results.checkTask(.matchRuleType("GenerateTAPI")) { task in
                 // check TAPI options.
@@ -158,7 +195,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
 
                     "-target", StringPattern.prefix("\(results.runDestinationTargetArchitecture)-apple"),
 
-                        .anySequence,
+                    .anySequence,
 
                     "-x", "objective-c", .anySequence,
                     "--demangle", .anySequence,
@@ -170,7 +207,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
 
                     // Check IO options.
                     "/tmp/aProject.dst/Library/Frameworks/Fwk.framework",
-                    "-filelist" ,"/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
+                    "-filelist", "/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
                     "-o",
                     "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd",
                 ])
@@ -192,13 +229,15 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             results.checkTask(.matchRuleType("CpHeader")) { task in
                 task.checkCommandLineMatches([
                     "builtin-copy", .anySequence, "/TEST/Sources/Fwk.h",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers",
+                ])
             }
             results.checkTask(.matchRuleType("SymLink"), .matchRuleItemBasename("Fwk.tbd")) { task in
                 task.checkCommandLine([
                     "/bin/ln", "-sfh",
                     "Versions/Current/Fwk.tbd",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd",
+                ])
             }
             var generateTapiTask: (any PlannedTask)! = nil
             results.checkTask(.matchRuleType("GenerateTAPI")) { task in
@@ -211,14 +250,14 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
 
                     "-target", StringPattern.prefix("\(results.runDestinationTargetArchitecture)-apple"),
 
-                        .anySequence,
+                    .anySequence,
 
                     // Check search paths.
                     "-F/TEST/build/Debug/BuiltProducts",
                     "-L/TEST/build/Debug/BuiltProducts",
                     "-I/TEST/build/Debug/BuiltProducts/include",
 
-                        .anySequence,
+                    .anySequence,
 
                     // Check IO options.
                     "/tmp/aProject.dst/Library/Frameworks/Fwk.framework",
@@ -231,7 +270,8 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             results.checkTask(.matchRuleType("CodeSign"), .matchRuleItemBasename("Fwk.tbd")) { task in
                 task.checkCommandLineMatches([
                     .suffix("codesign"), .anySequence,
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd",
+                ])
             }
             results.checkNoTask(.matchRuleType("GenerateDSYMFile"), .matchRuleItemBasename("Fwk.framework.dSYM"))
 
@@ -267,24 +307,32 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Fwk.h"),
-                    TestFile("Fwk.c")]),
+                    TestFile("Fwk.c"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "-",
-                    "INFOPLIST_FILE": "Info.plist",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "TAPI_LANGUAGE": "objective-c++",
-                    "TAPI_LANGUAGE_STANDARD": "c++20",
-                    "TAPI_DEMANGLE": "NO",
-                    "TAPI_EXTRA_PRIVATE_HEADERS": "**/tmp/FooSecret.h FrameworkHeaders/FooPrivate.h",
-                    "TAPI_VERIFY_MODE": "ErrorsOnly",
-                    "TAPI_USE_SRCROOT": "NO",
-                    "SKIP_INSTALL": "NO"])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "-",
+                        "INFOPLIST_FILE": "Info.plist",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "TAPI_LANGUAGE": "objective-c++",
+                        "TAPI_LANGUAGE_STANDARD": "c++20",
+                        "TAPI_DEMANGLE": "NO",
+                        "TAPI_EXTRA_PRIVATE_HEADERS": "**/tmp/FooSecret.h FrameworkHeaders/FooPrivate.h",
+                        "TAPI_VERIFY_MODE": "ErrorsOnly",
+                        "TAPI_USE_SRCROOT": "NO",
+                        "SKIP_INSTALL": "NO",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
@@ -292,7 +340,12 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.c"]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("Fwk.h", headerVisibility: .public)])])])
+                            TestBuildFile("Fwk.h", headerVisibility: .public)
+                        ]),
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         let fs = PseudoFS()
@@ -311,13 +364,15 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             results.checkTask(.matchRuleType("CpHeader")) { task in
                 task.checkCommandLineMatches([
                     "builtin-copy", .anySequence, "/TEST/Sources/Fwk.h",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers",
+                ])
             }
             results.checkTask(.matchRuleType("SymLink"), .matchRuleItemBasename("Fwk.tbd")) { task in
                 task.checkCommandLine([
                     "/bin/ln", "-sfh",
                     "Versions/Current/Fwk.tbd",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd",
+                ])
             }
             results.checkTask(.matchRuleType("GenerateTAPI")) { task in
                 // check TAPI options.
@@ -326,7 +381,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
 
                     "-target", StringPattern.prefix("\(results.runDestinationTargetArchitecture)-apple"),
 
-                        .anySequence,
+                    .anySequence,
 
                     "-x", "objective-c++", .anySequence,
                     "-std=c++20", .anySequence,
@@ -343,7 +398,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
 
                     // Check IO options.
                     "/tmp/aProject.dst/Library/Frameworks/Fwk.framework",
-                    "-filelist" ,"/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
+                    "-filelist", "/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
                     "-o",
                     "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd",
                 ])
@@ -363,13 +418,15 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             results.checkTask(.matchRuleType("CpHeader")) { task in
                 task.checkCommandLineMatches([
                     "builtin-copy", .anySequence, "/TEST/Sources/Fwk.h",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers",
+                ])
             }
             results.checkTask(.matchRuleType("SymLink"), .matchRuleItemBasename("Fwk.tbd")) { task in
                 task.checkCommandLine([
                     "/bin/ln", "-sfh",
                     "Versions/Current/Fwk.tbd",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd",
+                ])
             }
             var generateTapiTask: (any PlannedTask)! = nil
             results.checkTask(.matchRuleType("GenerateTAPI")) { task in
@@ -382,7 +439,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
 
                     "-target", StringPattern.prefix("\(results.runDestinationTargetArchitecture)-apple"),
 
-                        .anySequence,
+                    .anySequence,
 
                     "-x", "objective-c++", .anySequence,
                     "-std=c++20", .anySequence,
@@ -397,7 +454,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     "-L/TEST/build/Debug/BuiltProducts",
                     "-I/TEST/build/Debug/BuiltProducts/include",
 
-                        .anySequence,
+                    .anySequence,
 
                     // Check IO options.
                     "/tmp/aProject.dst/Library/Frameworks/Fwk.framework",
@@ -411,7 +468,8 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             results.checkTask(.matchRuleType("CodeSign"), .matchRuleItemBasename("Fwk.tbd")) { task in
                 task.checkCommandLineMatches([
                     .suffix("codesign"), .anySequence,
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd",
+                ])
             }
 
             // Also check the ordering of postprocessing tasks.
@@ -440,30 +498,37 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
         }
     }
 
-
     @Test(.requireSDKs(.macOS))
     func frameworkBasicsProjectHeadersEnabled() async throws {
         let testProject = try await TestProject(
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Fwk.h"),
                     TestFile("FwkInternal.h"),
-                    TestFile("Fwk.c")]),
+                    TestFile("Fwk.c"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "INFOPLIST_FILE": "Info.plist",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "GCC_GENERATE_DEBUGGING_SYMBOLS" : "YES",
-                    "DEBUG_INFORMATION_FORMAT" : "dwarf-with-dsym",
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "TAPI_ENABLE_PROJECT_HEADERS": "YES",
-                    "TAPI_VERIFY_MODE": "ErrorsOnly",
-                    "TAPI_USE_SRCROOT": "NO",
-                    "SKIP_INSTALL": "NO"])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "INFOPLIST_FILE": "Info.plist",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES",
+                        "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "TAPI_ENABLE_PROJECT_HEADERS": "YES",
+                        "TAPI_VERIFY_MODE": "ErrorsOnly",
+                        "TAPI_USE_SRCROOT": "NO",
+                        "SKIP_INSTALL": "NO",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
@@ -472,7 +537,12 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                         TestSourcesBuildPhase(["Fwk.c"]),
                         TestHeadersBuildPhase([
                             TestBuildFile("Fwk.h", headerVisibility: .public),
-                            TestBuildFile("FwkInternal.h")])])])
+                            TestBuildFile("FwkInternal.h"),
+                        ]),
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         let fs = PseudoFS()
@@ -486,28 +556,29 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
         let expectedHeaders: PropertyListItem = .plArray([
             .plDict([
                 "type": .plString("public"),
-                "path": .plString("/TEST/build/Debug/Fwk.framework/Headers/Fwk.h")
+                "path": .plString("/TEST/build/Debug/Fwk.framework/Headers/Fwk.h"),
             ]),
             .plDict([
                 "type": .plString("project"),
-                "path": .plString("/TEST/Sources/FwkInternal.h")
-            ])
+                "path": .plString("/TEST/Sources/FwkInternal.h"),
+            ]),
         ])
 
-
         // Check the `installapi` build.
         try await tester.checkBuild(BuildParameters(action: .installAPI, configuration: "Debug"), runDestination: .macOS, fs: fs) { results in
             results.checkNoDiagnostics()
             results.checkTask(.matchRuleType("CpHeader")) { task in
                 task.checkCommandLineMatches([
                     "builtin-copy", .anySequence, "/TEST/Sources/Fwk.h",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers",
+                ])
             }
             results.checkTask(.matchRuleType("SymLink"), .matchRuleItemBasename("Fwk.tbd")) { task in
                 task.checkCommandLine([
                     "/bin/ln", "-sfh",
                     "Versions/Current/Fwk.tbd",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd",
+                ])
             }
             try results.checkWriteAuxiliaryFileTask(.matchRuleType("WriteAuxiliaryFile"), .matchRuleItemBasename("Fwk.json")) { task, contents in
                 let data = try PropertyList.fromJSONData(contents)
@@ -531,7 +602,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     "-F/TEST/build/Debug",
                     "-L/TEST/build/Debug",
 
-                        .anySequence,
+                    .anySequence,
 
                     // Check SRCROOT search paths
                     "-iquote", "/TEST/build/aProject.build/Debug/Fwk.build/Fwk-generated-files.hmap",
@@ -539,10 +610,10 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     "-I/TEST/build/aProject.build/Debug/Fwk.build/Fwk-all-target-headers.hmap",
                     "-iquote", "/TEST/build/aProject.build/Debug/Fwk.build/Fwk-project-headers.hmap",
 
-                        .anySequence,
+                    .anySequence,
 
                     // Check IO options.
-                    "-filelist" ,"/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
+                    "-filelist", "/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
                     "-o",
                     "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd",
 
@@ -564,17 +635,22 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             results.checkTask(.matchRuleType("CpHeader")) { task in
                 task.checkCommandLineMatches([
                     "builtin-copy", .anySequence, "/TEST/Sources/Fwk.h",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers",
+                ])
             }
             results.checkTask(.matchRuleType("SymLink"), .matchRuleItemBasename("Fwk.tbd")) { task in
                 task.checkCommandLine([
                     "/bin/ln", "-sfh",
                     "Versions/Current/Fwk.tbd",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd",
+                ])
             }
             results.checkTask(.matchRuleType("GenerateDSYMFile"), .matchRuleItemBasename("Fwk.framework.dSYM")) { task in
-                task.checkCommandLine([ "dsymutil", "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk",
-                                        "-o", "/TEST/build/Debug/Fwk.framework.dSYM"]) }
+                task.checkCommandLine([
+                    "dsymutil", "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk",
+                    "-o", "/TEST/build/Debug/Fwk.framework.dSYM",
+                ])
+            }
             results.checkTask(.matchRuleType("GenerateTAPI")) { task in
                 // check TAPI options.
                 task.checkCommandLineMatches([
@@ -585,13 +661,13 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
 
                     "-target", StringPattern.prefix("\(results.runDestinationTargetArchitecture)-apple"),
 
-                        .anySequence,
+                    .anySequence,
 
                     // Check build products search paths
                     "-F/TEST/build/Debug/BuiltProducts",
                     "-L/TEST/build/Debug/BuiltProducts",
 
-                        .anySequence,
+                    .anySequence,
 
                     // Check SRCROOT search paths
                     "-iquote", "/TEST/build/aProject.build/Debug/Fwk.build/Fwk-generated-files.hmap",
@@ -599,10 +675,10 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     "-I/TEST/build/aProject.build/Debug/Fwk.build/Fwk-all-target-headers.hmap",
                     "-iquote", "/TEST/build/aProject.build/Debug/Fwk.build/Fwk-project-headers.hmap",
 
-                        .anySequence,
+                    .anySequence,
 
                     // Check IO options.
-                    "-filelist" ,"/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
+                    "-filelist", "/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
                     "-o",
                     "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd",
                 ])
@@ -616,16 +692,24 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Fwk.h"),
-                    TestFile("Fwk.c")]),
+                    TestFile("Fwk.c"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "GENERATE_TEXT_BASED_STUBS": "YES",
-                    "SKIP_INSTALL": "NO"])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "GENERATE_TEXT_BASED_STUBS": "YES",
+                        "SKIP_INSTALL": "NO",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
@@ -633,7 +717,12 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.c"]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("Fwk.h", headerVisibility: .public)])])])
+                            TestBuildFile("Fwk.h", headerVisibility: .public)
+                        ]),
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Check the `install` build performs the stubify step.
@@ -651,7 +740,8 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     // Check IO options.
                     "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk",
                     "-o",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd",
+                ])
             }
         }
     }
@@ -663,21 +753,29 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Core.h"),
                     TestFile("CoreInternal.h"),
-                    TestFile("Core.c")]),
+                    TestFile("Core.c"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "-",
-                    "EXECUTABLE_PREFIX": "lib",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "TAPI_VERIFY_MODE": "ErrorsOnly",
-                    "TAPI_USE_SRCROOT": "NO",
-                    "SKIP_INSTALL": "NO"])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "-",
+                        "EXECUTABLE_PREFIX": "lib",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "TAPI_VERIFY_MODE": "ErrorsOnly",
+                        "TAPI_USE_SRCROOT": "NO",
+                        "SKIP_INSTALL": "NO",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Core",
@@ -686,7 +784,12 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                         TestSourcesBuildPhase(["Core.c"]),
                         TestHeadersBuildPhase([
                             TestBuildFile("Core.h", headerVisibility: .public),
-                            TestBuildFile("CoreInternal.h")])])])
+                            TestBuildFile("CoreInternal.h"),
+                        ]),
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         let tapiVersion = try await discoveredTAPIToolInfo(at: tapiToolPath).toolVersion ?? Version()
@@ -694,7 +797,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
         let expectedHeaders: PropertyListItem = .plArray([
             .plDict([
                 "type": .plString("public"),
-                "path": .plString("/tmp/aProject.dst/usr/local/include/Core.h")
+                "path": .plString("/tmp/aProject.dst/usr/local/include/Core.h"),
             ])
         ])
 
@@ -708,7 +811,8 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             results.checkTask(.matchRuleType("CpHeader")) { task in
                 task.checkCommandLineMatches([
                     "builtin-copy", .anySequence, "/TEST/Sources/Core.h",
-                    "/tmp/aProject.dst/usr/local/include"])
+                    "/tmp/aProject.dst/usr/local/include",
+                ])
             }
             try results.checkWriteAuxiliaryFileTask(.matchRuleType("WriteAuxiliaryFile"), .matchRuleItemBasename("Core.json")) { task, contents in
                 let data = try PropertyList.fromJSONData(contents)
@@ -735,13 +839,13 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     "-L/TEST/build/Debug",
                     "-I/TEST/build/Debug/include",
 
-                        .anySequence,
+                    .anySequence,
 
                     // Check IO options.
                     "-filelist", "/TEST/build/aProject.build/Debug/Core.build/Core.json",
                     "-o",
                     "/tmp/aProject.dst/usr/local/lib/libCore.tbd", .anySequence,
-                    "--product-name=Core"
+                    "--product-name=Core",
 
                 ])
             }
@@ -753,7 +857,8 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             results.checkTask(.matchRuleType("CpHeader")) { task in
                 task.checkCommandLineMatches([
                     "builtin-copy", .anySequence, "/TEST/Sources/Core.h",
-                    "/tmp/aProject.dst/usr/local/include"])
+                    "/tmp/aProject.dst/usr/local/include",
+                ])
             }
             try results.checkWriteAuxiliaryFileTask(.matchRuleType("WriteAuxiliaryFile"), .matchRuleItemBasename("Core.json")) { task, contents in
                 let data = try PropertyList.fromJSONData(contents)
@@ -782,19 +887,20 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     "-L/TEST/build/Debug",
                     "-I/TEST/build/Debug/include",
 
-                        .anySequence,
+                    .anySequence,
 
                     // Check IO options.
                     "-filelist", "/TEST/build/aProject.build/Debug/Core.build/Core.json",
                     "-o",
                     "/tmp/aProject.dst/usr/local/lib/libCore.tbd", .anySequence,
-                    "--product-name=Core"
+                    "--product-name=Core",
                 ])
             }
             results.checkTask(.matchRuleType("CodeSign"), .matchRuleItemBasename("libCore.tbd")) { task in
                 task.checkCommandLineMatches([
                     .suffix("codesign"), .anySequence,
-                    "/tmp/aProject.dst/usr/local/lib/libCore.tbd"])
+                    "/tmp/aProject.dst/usr/local/lib/libCore.tbd",
+                ])
             }
         }
     }
@@ -806,21 +912,29 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Core.h"),
                     TestFile("CoreInternal.h"),
-                    TestFile("Core.c")]),
+                    TestFile("Core.c"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "EXECUTABLE_PREFIX": "lib",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "TAPI_ENABLE_PROJECT_HEADERS":  "YES",
-                    "TAPI_VERIFY_MODE": "ErrorsOnly",
-                    "TAPI_USE_SRCROOT": "NO",
-                    "SKIP_INSTALL": "NO"])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "EXECUTABLE_PREFIX": "lib",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "TAPI_ENABLE_PROJECT_HEADERS": "YES",
+                        "TAPI_VERIFY_MODE": "ErrorsOnly",
+                        "TAPI_USE_SRCROOT": "NO",
+                        "SKIP_INSTALL": "NO",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Core",
@@ -829,7 +943,12 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                         TestSourcesBuildPhase(["Core.c"]),
                         TestHeadersBuildPhase([
                             TestBuildFile("Core.h", headerVisibility: .public),
-                            TestBuildFile("CoreInternal.h")])])])
+                            TestBuildFile("CoreInternal.h"),
+                        ]),
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         let tapiVersion = try await discoveredTAPIToolInfo(at: tapiToolPath).toolVersion ?? Version()
@@ -837,12 +956,12 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
         let expectedHeaders: PropertyListItem = .plArray([
             .plDict([
                 "type": .plString("public"),
-                "path": .plString("/tmp/aProject.dst/usr/local/include/Core.h")
+                "path": .plString("/tmp/aProject.dst/usr/local/include/Core.h"),
             ]),
             .plDict([
                 "type": .plString("project"),
-                "path": .plString("/TEST/Sources/CoreInternal.h")
-            ])
+                "path": .plString("/TEST/Sources/CoreInternal.h"),
+            ]),
         ])
 
         // Check the `installapi` build.
@@ -880,12 +999,11 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     "-iquote", "/TEST/build/aProject.build/Debug/Core.build/Core-project-headers.hmap",
                     .anySequence,
 
-
                     // Check IO options.
                     "-filelist", "/TEST/build/aProject.build/Debug/Core.build/Core.json",
                     "-o",
                     "/tmp/aProject.dst/usr/local/lib/libCore.tbd", .anySequence,
-                    "--product-name=Core"
+                    "--product-name=Core",
                 ])
             }
         }
@@ -896,7 +1014,8 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             results.checkTask(.matchRuleType("CpHeader")) { task in
                 task.checkCommandLineMatches([
                     "builtin-copy", .anySequence, "/TEST/Sources/Core.h",
-                    "/tmp/aProject.dst/usr/local/include"])
+                    "/tmp/aProject.dst/usr/local/include",
+                ])
             }
             try results.checkWriteAuxiliaryFileTask(.matchRuleType("WriteAuxiliaryFile"), .matchRuleItemBasename("Core.json")) { task, contents in
                 let data = try PropertyList.fromJSONData(contents)
@@ -936,29 +1055,36 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     "-filelist", "/TEST/build/aProject.build/Debug/Core.build/Core.json",
                     "-o",
                     "/tmp/aProject.dst/usr/local/lib/libCore.tbd", .anySequence,
-                    "--product-name=Core"
+                    "--product-name=Core",
                 ])
             }
         }
     }
 
-
     @Test(.requireSDKs(.macOS))
     func dylibStubifyMode() async throws {
         let testProject = TestProject(
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Core.h"),
-                    TestFile("Core.c")]),
+                    TestFile("Core.c"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "EXECUTABLE_PREFIX": "lib",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "GENERATE_TEXT_BASED_STUBS": "YES",
-                    "SKIP_INSTALL": "NO"])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "EXECUTABLE_PREFIX": "lib",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "GENERATE_TEXT_BASED_STUBS": "YES",
+                        "SKIP_INSTALL": "NO",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Core",
@@ -966,7 +1092,12 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     buildPhases: [
                         TestSourcesBuildPhase(["Core.c"]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("Core.h", headerVisibility: .public)])])])
+                            TestBuildFile("Core.h", headerVisibility: .public)
+                        ]),
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Check the `install` build performs the stubify step.
@@ -984,7 +1115,8 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     // Check IO options.
                     "/tmp/aProject.dst/usr/local/lib/libCore.dylib",
                     "-o",
-                    "/tmp/aProject.dst/usr/local/lib/libCore.tbd"])
+                    "/tmp/aProject.dst/usr/local/lib/libCore.tbd",
+                ])
             }
         }
     }
@@ -996,37 +1128,51 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Core.h"),
-                    TestFile("Core.c")]),
+                    TestFile("Core.c"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "EXECUTABLE_PREFIX": "lib",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "GENERATE_TEXT_BASED_STUBS": "YES",
-                    "SKIP_INSTALL": "NO",
-                    "LIBTOOL": libtoolPath.str,
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "EXECUTABLE_PREFIX": "lib",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "GENERATE_TEXT_BASED_STUBS": "YES",
+                        "SKIP_INSTALL": "NO",
+                        "LIBTOOL": libtoolPath.str,
+                    ]
+                )
+            ],
             targets: [
                 TestAggregateTarget(
                     "All",
-                    dependencies: ["CoreKit", "Core", "CoreKitWrongType", "CoreWrongType"]),
+                    dependencies: ["CoreKit", "Core", "CoreKitWrongType", "CoreWrongType"]
+                ),
                 TestStandardTarget(
                     "CoreKit",
                     type: .staticFramework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Core.c"]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("Core.h", headerVisibility: .public)])]),
+                            TestBuildFile("Core.h", headerVisibility: .public)
+                        ]),
+                    ]
+                ),
                 TestStandardTarget(
                     "Core",
                     type: .staticLibrary,
                     buildPhases: [
                         TestSourcesBuildPhase(["Core.c"]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("Core.h", headerVisibility: .public)])]),
+                            TestBuildFile("Core.h", headerVisibility: .public)
+                        ]),
+                    ]
+                ),
                 TestStandardTarget(
                     "CoreKitWrongType",
                     type: .framework,
@@ -1036,7 +1182,10 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     buildPhases: [
                         TestSourcesBuildPhase(["Core.c"]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("Core.h", headerVisibility: .public)])]),
+                            TestBuildFile("Core.h", headerVisibility: .public)
+                        ]),
+                    ]
+                ),
                 TestStandardTarget(
                     "CoreWrongType",
                     type: .dynamicLibrary,
@@ -1046,7 +1195,12 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     buildPhases: [
                         TestSourcesBuildPhase(["Core.c"]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("Core.h", headerVisibility: .public)])])])
+                            TestBuildFile("Core.h", headerVisibility: .public)
+                        ]),
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Check the `install` build performs the stubify step.
@@ -1063,14 +1217,20 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
-                children: [TestFile("Fwk.c"), TestFile("Fwk.h")]),
+                "SomeFiles",
+                path: "Sources",
+                children: [TestFile("Fwk.c"), TestFile("Fwk.h")]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SKIP_INSTALL": "NO",
-                    "TAPI_EXEC": tapiToolPath.str,
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SKIP_INSTALL": "NO",
+                        "TAPI_EXEC": tapiToolPath.str,
+                    ]
+                )
+            ],
             targets: [
                 TestAggregateTarget(
                     "ALL",
@@ -1083,110 +1243,155 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                         "BadFwk",
                         "BadDynamicLib",
                         "BadStaticLibWrongType",
-                        "BadStaticFrameworkWrongType"]),
+                        "BadStaticFrameworkWrongType",
+                    ]
+                ),
 
                 // These frameworks are ok because they have no installed headers.
                 TestStandardTarget(
                     "OkFwk1",
                     type: .framework,
-                    buildPhases: []),
+                    buildPhases: []
+                ),
                 TestStandardTarget(
                     "OkFwk2",
                     type: .framework,
-                    buildPhases: [TestHeadersBuildPhase([])]),
+                    buildPhases: [TestHeadersBuildPhase([])]
+                ),
                 TestStandardTarget(
                     "OkFwk3",
                     type: .framework,
-                    buildPhases: [TestHeadersBuildPhase([
-                        TestBuildFile("Fwk.h")])]),
+                    buildPhases: [
+                        TestHeadersBuildPhase([
+                            TestBuildFile("Fwk.h")
+                        ])
+                    ]
+                ),
 
                 TestStandardTarget(
                     "OkBecauseIsApp1",
                     type: .application,
-                    buildPhases: []),
+                    buildPhases: []
+                ),
 
                 TestStandardTarget(
                     "OkBecauseIsApp2",
                     type: .application,
-                    buildPhases: [TestHeadersBuildPhase([])]),
+                    buildPhases: [TestHeadersBuildPhase([])]
+                ),
 
                 TestStandardTarget(
                     "OkBecauseIsApp3",
                     type: .application,
-                    buildPhases: [TestHeadersBuildPhase([
-                        TestBuildFile("Fwk.h")])]),
-
+                    buildPhases: [
+                        TestHeadersBuildPhase([
+                            TestBuildFile("Fwk.h")
+                        ])
+                    ]
+                ),
 
                 // This library should be skipped because it is static and contains no Swift sources.
                 TestStandardTarget(
                     "OkBecauseIsStatic1",
                     type: .staticLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PUBLIC_HEADERS_FOLDER_PATH": "/usr/local/static1/include",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PUBLIC_HEADERS_FOLDER_PATH": "/usr/local/static1/include"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("Fwk.c")]),
+                            TestBuildFile("Fwk.c")
+                        ]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("Fwk.h", headerVisibility: .public)])]),
+                            TestBuildFile("Fwk.h", headerVisibility: .public)
+                        ]),
+                    ]
+                ),
 
                 // This library should be skipped because it is static and contains no Swift sources.
                 TestStandardTarget(
                     "OkBecauseIsStatic2",
                     type: .dynamicLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "MACH_O_TYPE": "staticlib",
-                            "PUBLIC_HEADERS_FOLDER_PATH": "/usr/local/static2/include",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "MACH_O_TYPE": "staticlib",
+                                "PUBLIC_HEADERS_FOLDER_PATH": "/usr/local/static2/include",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("Fwk.c")]),
+                            TestBuildFile("Fwk.c")
+                        ]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("Fwk.h", headerVisibility: .public)])]),
+                            TestBuildFile("Fwk.h", headerVisibility: .public)
+                        ]),
+                    ]
+                ),
 
                 // This library should produce an error because it is static and contains no Swift sources.
                 TestStandardTarget(
                     "BadStaticLib1",
                     type: .staticLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PUBLIC_HEADERS_FOLDER_PATH": "/usr/local/badstatic1/include",
-                            "SUPPORTS_TEXT_BASED_API": "YES",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PUBLIC_HEADERS_FOLDER_PATH": "/usr/local/badstatic1/include",
+                                "SUPPORTS_TEXT_BASED_API": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("Fwk.c")]),
+                            TestBuildFile("Fwk.c")
+                        ]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("Fwk.h", headerVisibility: .public)])]),
+                            TestBuildFile("Fwk.h", headerVisibility: .public)
+                        ]),
+                    ]
+                ),
 
                 // This library should produce an error because it is static and contains no Swift sources.
                 TestStandardTarget(
                     "BadStaticLib2",
                     type: .dynamicLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "MACH_O_TYPE": "staticlib",
-                            "PUBLIC_HEADERS_FOLDER_PATH": "/usr/local/badstatic2/include",
-                            "SUPPORTS_TEXT_BASED_API": "YES",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "MACH_O_TYPE": "staticlib",
+                                "PUBLIC_HEADERS_FOLDER_PATH": "/usr/local/badstatic2/include",
+                                "SUPPORTS_TEXT_BASED_API": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("Fwk.c")]),
+                            TestBuildFile("Fwk.c")
+                        ]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("Fwk.h", headerVisibility: .public)])]),
+                            TestBuildFile("Fwk.h", headerVisibility: .public)
+                        ]),
+                    ]
+                ),
 
                 // This framework should be skipped because it contains no sources (and thus won't generate an actual binary).
                 TestStandardTarget(
                     "BadFwkNoSrc",
                     type: .framework,
-                    buildPhases: [TestHeadersBuildPhase([
-                        TestBuildFile("Fwk.h", headerVisibility: .public)])]),
+                    buildPhases: [
+                        TestHeadersBuildPhase([
+                            TestBuildFile("Fwk.h", headerVisibility: .public)
+                        ])
+                    ]
+                ),
 
                 // This framework should produce an error.
                 TestStandardTarget(
@@ -1194,9 +1399,13 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("Fwk.c")]),
+                            TestBuildFile("Fwk.c")
+                        ]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("Fwk.h", headerVisibility: .public)])]),
+                            TestBuildFile("Fwk.h", headerVisibility: .public)
+                        ]),
+                    ]
+                ),
 
                 // This library should produce an error.
                 TestStandardTarget(
@@ -1204,32 +1413,45 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     type: .dynamicLibrary,
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("Fwk.c")]),
+                            TestBuildFile("Fwk.c")
+                        ]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("Fwk.h", headerVisibility: .public)])]),
+                            TestBuildFile("Fwk.h", headerVisibility: .public)
+                        ]),
+                    ]
+                ),
 
                 // Only dynamic libraries and frameworks are supported
                 TestStandardTarget(
                     "BadStaticLibWrongType",
                     type: .dynamicLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "MACH_O_TYPE": "mh_execute",
-                            "SUPPORTS_TEXT_BASED_API": "YES",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "MACH_O_TYPE": "mh_execute",
+                                "SUPPORTS_TEXT_BASED_API": "YES",
+                            ]
+                        )
                     ],
-                    buildPhases: [TestSourcesBuildPhase([TestBuildFile("Fwk.c")])]),
+                    buildPhases: [TestSourcesBuildPhase([TestBuildFile("Fwk.c")])]
+                ),
                 TestStandardTarget(
                     "BadStaticFrameworkWrongType",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "MACH_O_TYPE": "mh_execute",
-                            "SUPPORTS_TEXT_BASED_API": "YES",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "MACH_O_TYPE": "mh_execute",
+                                "SUPPORTS_TEXT_BASED_API": "YES",
+                            ]
+                        )
                     ],
-                    buildPhases: [TestSourcesBuildPhase([TestBuildFile("Fwk.c")])]),
-            ])
+                    buildPhases: [TestSourcesBuildPhase([TestBuildFile("Fwk.c")])]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(BuildParameters(action: .installAPI, configuration: "Debug"), runDestination: .macOS) { results in
@@ -1245,37 +1467,47 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Foo.swift"),
-                ]),
+                    TestFile("Foo.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                    "SKIP_INSTALL": "NO",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "MACH_O_TYPE": "staticlib"
-                ])],
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                        "SKIP_INSTALL": "NO",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "MACH_O_TYPE": "staticlib",
+                    ]
+                )
+            ],
             targets: [
                 TestAggregateTarget(
                     "ALL",
-                    dependencies: ["FooDynamicLib", "FooStaticLib"]),
+                    dependencies: ["FooDynamicLib", "FooStaticLib"]
+                ),
                 TestStandardTarget(
                     "FooDynamicLib",
                     type: .dynamicLibrary,
                     buildPhases: [
                         TestSourcesBuildPhase(["Foo.swift"])
-                    ]),
+                    ]
+                ),
                 TestStandardTarget(
                     "FooStaticLib",
                     type: .staticLibrary,
                     buildPhases: [
                         TestSourcesBuildPhase(["Foo.swift"])
-                    ]),
-            ])
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         func checkTarget(results: TaskConstructionTester.PlanningResults, target: ConfiguredTarget) {
             results.checkNoDiagnostics()
@@ -1286,7 +1518,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                 task.checkCommandLineMatches([
                     "builtin-Swift-Compilation-Requirements", "--", .suffix("swiftc"), "-module-name", .anySequence, .and(.prefix("@"), .suffix("SwiftFileList")), .anySequence,
                     // Check we forced WMO mode.
-                    "-whole-module-optimization", .anySequence
+                    "-whole-module-optimization", .anySequence,
                 ])
 
                 // We shouldn't have a '-c'.
@@ -1310,30 +1542,38 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Foo.swift")
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                    "SKIP_INSTALL": "NO",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "REEXPORTED_LIBRARY_NAMES": "libA libB",
-                    "REEXPORTED_LIBRARY_PATHS": "/tmp/libA /tmp/libB",
-                    "REEXPORTED_FRAMEWORK_NAMES": "SubFrameA SubFrameB",
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                        "SKIP_INSTALL": "NO",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "REEXPORTED_LIBRARY_NAMES": "libA libB",
+                        "REEXPORTED_LIBRARY_PATHS": "/tmp/libA /tmp/libB",
+                        "REEXPORTED_FRAMEWORK_NAMES": "SubFrameA SubFrameB",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "FooFramework",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Foo.swift"])
-                    ])
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(BuildParameters(action: .installAPI, configuration: "Debug"), runDestination: .macOS) { results in
             // Check that the VFS is generated.
@@ -1360,26 +1600,32 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Fwk.swift"),
-                    TestFile("App.swift")
-                ]),
+                    TestFile("App.swift"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                    "SKIP_INSTALL": "NO",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "TAPI_VERIFY_MODE": "ErrorsOnly",
-                    "TAPI_USE_SRCROOT": "NO",
-                    "TAPI_SHARED_CACHE_ELIGIBLE": "NO",
-                    "TAPI_ENABLE_MODULES": "YES",
-                    "DYLIB_CURRENT_VERSION": "2.0",
-                    "DYLIB_COMPATIBILITY_VERSION": "1.0",
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                        "SKIP_INSTALL": "NO",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "TAPI_VERIFY_MODE": "ErrorsOnly",
+                        "TAPI_USE_SRCROOT": "NO",
+                        "TAPI_SHARED_CACHE_ELIGIBLE": "NO",
+                        "TAPI_ENABLE_MODULES": "YES",
+                        "DYLIB_CURRENT_VERSION": "2.0",
+                        "DYLIB_COMPATIBILITY_VERSION": "1.0",
+                    ]
+                )
+            ],
             targets: [
                 TestAggregateTarget("All", dependencies: ["App", "Fwk"]),
                 TestStandardTarget(
@@ -1387,15 +1633,18 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.swift"])
-                    ]),
+                    ]
+                ),
 
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildPhases: [
                         TestSourcesBuildPhase(["App.swift"])
-                    ])
-            ])
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let tapiVersion = try await discoveredTAPIToolInfo(at: tapiToolPath).toolVersion ?? Version()
 
@@ -1420,7 +1669,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                         "-Xfrontend", "-tbd-compatibility-version", "-Xfrontend", "1.0", .anySequence,
                         // Check we forced WMO mode.
                         "-whole-module-optimization", .anySequence,
-                        "-emit-objc-header", "-emit-objc-header-path", "/TEST/build/aProject.build/Debug/Fwk.build/Objects-normal/\(results.runDestinationTargetArchitecture)/Fwk-Swift.h"
+                        "-emit-objc-header", "-emit-objc-header-path", "/TEST/build/aProject.build/Debug/Fwk.build/Objects-normal/\(results.runDestinationTargetArchitecture)/Fwk-Swift.h",
                     ])
 
                     // We shouldn't have a '-c'.
@@ -1435,14 +1684,14 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
 
                         "-target", StringPattern.prefix("\(results.runDestinationTargetArchitecture)-apple"),
 
-                            .anySequence,
+                        .anySequence,
 
                         // Check search paths.
                         "-F/TEST/build/Debug",
                         "-L/TEST/build/Debug",
                         "-I/TEST/build/Debug/include",
 
-                            .anySequence,
+                        .anySequence,
 
                         // Check IO options.
                         "/tmp/aProject.dst/Library/Frameworks/Fwk.framework",
@@ -1453,8 +1702,8 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                         StringPattern.and(.prefix("-L/"), .contains(".xctoolchain/")),
                         StringPattern.and(.prefix("-L/"), .suffix(".sdk/usr/lib/swift")),
                         "-exclude-public-header", "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers/Fwk-Swift.h",
-                        "-swift-installapi-interface", .suffix("\(results.runDestinationTargetArchitecture)/Swift-API.tbd")
-                    ] )
+                        "-swift-installapi-interface", .suffix("\(results.runDestinationTargetArchitecture)/Swift-API.tbd"),
+                    ])
 
                     // Check version specific options
                     if tapiVersion >= Version(1600, 0, 6) {
@@ -1493,35 +1742,42 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "ProjectName",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("File2.swift"),
-                ]),
+                    TestFile("File2.swift")
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "TargetName",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "ProductName",
-                            "ARCHS": "x86_64",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": swiftVersion,
-                            "TAPI_EXEC": tapiToolPath.str,
-                            "SUPPORTS_TEXT_BASED_API": "YES",
-                            "SDKROOT": sdkRoot
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "ProductName",
+                                "ARCHS": "x86_64",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                                "TAPI_EXEC": tapiToolPath.str,
+                                "SUPPORTS_TEXT_BASED_API": "YES",
+                                "SDKROOT": sdkRoot,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("File2.swift"),
-                        ]),
+                            TestBuildFile("File2.swift")
+                        ])
                     ],
                     buildRules: [
-                        TestBuildRule(filePattern: "*.swift",
-                                      script: "cp $INPUT_FILE_PATH /tmp/b",
-                                      outputs: ["/tmp/b"])
+                        TestBuildRule(
+                            filePattern: "*.swift",
+                            script: "cp $INPUT_FILE_PATH /tmp/b",
+                            outputs: ["/tmp/b"]
+                        )
                     ]
                 )
             ]
@@ -1554,32 +1810,37 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "ProjectName",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("File2.swift"),
-                ]),
+                    TestFile("File2.swift")
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "TargetName",
                     type: .dynamicLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "ProductName",
-                            "ARCHS": "x86_64",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": swiftVersion,
-                            "TAPI_EXEC": tapiToolPath.str,
-                            "TAPI_VERIFY_MODE": "ErrorsOnly",
-                            "TAPI_USE_SRCROOT": "NO",
-                            "SUPPORTS_TEXT_BASED_API": "YES",
-                            "SDKROOT": sdkRoot
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "ProductName",
+                                "ARCHS": "x86_64",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                                "TAPI_EXEC": tapiToolPath.str,
+                                "TAPI_VERIFY_MODE": "ErrorsOnly",
+                                "TAPI_USE_SRCROOT": "NO",
+                                "SUPPORTS_TEXT_BASED_API": "YES",
+                                "SDKROOT": sdkRoot,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("File2.swift"),
-                        ]),
+                            TestBuildFile("File2.swift")
+                        ])
                     ]
                 )
             ]
@@ -1610,7 +1871,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                         "-Xfrontend", "-experimental-skip-non-inlinable-function-bodies", .anySequence,
                         // Check we forced WMO mode.
                         "-whole-module-optimization", .anySequence,
-                        "-emit-objc-header", "-emit-objc-header-path", .suffix("x86_64/ProductName-Swift.h")
+                        "-emit-objc-header", "-emit-objc-header-path", .suffix("x86_64/ProductName-Swift.h"),
                     ])
 
                     // We shouldn't have a '-c'.
@@ -1625,20 +1886,20 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
 
                         "-target", StringPattern.prefix("x86_64-apple"),
 
-                            .anySequence,
+                        .anySequence,
 
                         // Check search paths.
                         "-F/TEST/build/Debug",
                         "-L/TEST/build/Debug",
                         "-I/TEST/build/Debug/include",
 
-                            .anySequence,
+                        .anySequence,
 
                         "-o", "/tmp/ProjectName.dst/usr/local/lib/ProductName.tbd",
                         StringPattern.and(.prefix("-L/"), .contains(".xctoolchain/")),
                         StringPattern.and(.prefix("-L/"), .suffix(".sdk/usr/lib/swift")),
                         "-exclude-public-header", "/TEST/build/ProjectName.build/Debug/TargetName.build/DerivedSources/ProductName-Swift.h",
-                        "-swift-installapi-interface", .suffix("x86_64/Swift-API.tbd"), .anySequence, "--product-name=ProductName"
+                        "-swift-installapi-interface", .suffix("x86_64/Swift-API.tbd"), .anySequence, "--product-name=ProductName",
                     ])
 
                     task.checkCommandLineNoMatch([.suffix("File2.swift")])
@@ -1659,28 +1920,39 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Fwk.swift")]),
+                    TestFile("Fwk.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ARCHS": "arm64 arm64e",
-                    "SDKROOT": "iphoneos",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                    "SKIP_INSTALL": "NO",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "TAPI_VERIFY_MODE": "ErrorsOnly",
-                    "TAPI_USE_SRCROOT": "NO",
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS": "arm64 arm64e",
+                        "SDKROOT": "iphoneos",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                        "SKIP_INSTALL": "NO",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "TAPI_VERIFY_MODE": "ErrorsOnly",
+                        "TAPI_USE_SRCROOT": "NO",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
                     type: .framework,
                     buildPhases: [
-                        TestSourcesBuildPhase(["Fwk.swift"])])])
+                        TestSourcesBuildPhase(["Fwk.swift"])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Check the `installapi` build.
@@ -1704,7 +1976,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                         "-Xfrontend", "-tbd-install_name", "-Xfrontend", "/Library/Frameworks/Fwk.framework/Fwk", .anySequence,
                         // Check we forced WMO mode.
                         "-whole-module-optimization", .anySequence,
-                        "-emit-objc-header", "-emit-objc-header-path", .equal("/TEST/build/aProject.build/Debug-iphoneos/Fwk.build/Objects-normal/\(arch)/Fwk-Swift.h")
+                        "-emit-objc-header", "-emit-objc-header-path", .equal("/TEST/build/aProject.build/Debug-iphoneos/Fwk.build/Objects-normal/\(arch)/Fwk-Swift.h"),
                     ])
 
                     // We shouldn't have a '-c'.
@@ -1718,39 +1990,46 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             // Check that we generated correct TAPI installapi invocation.
             results.checkTask(.matchRuleType("GenerateTAPI"), .matchRuleItemBasename("Fwk.tbd")) { task in
                 // check TAPI options.
-                task.checkCommandLineMatches([
-                    StringPattern.equal(tapiToolPath.str), "installapi", "--verify-mode=ErrorsOnly", .anySequence] +
+                task.checkCommandLineMatches(
+                    [
+                        StringPattern.equal(tapiToolPath.str), "installapi", "--verify-mode=ErrorsOnly", .anySequence,
+                    ]
+                        +
 
-                                             archs.map{ [StringPattern.equal("-target"), StringPattern.prefix("\($0)-apple")] }.joined() +
+                        archs.map { [StringPattern.equal("-target"), StringPattern.prefix("\($0)-apple")] }.joined() +
 
-                                             [.anySequence,
+                        [
+                            .anySequence,
 
-                                              // Check search paths.
-                                              "-F/TEST/build/Debug-iphoneos",
-                                              "-L/TEST/build/Debug-iphoneos",
-                                              "-I/TEST/build/Debug-iphoneos/include", .anySequence,
+                            // Check search paths.
+                            "-F/TEST/build/Debug-iphoneos",
+                            "-L/TEST/build/Debug-iphoneos",
+                            "-I/TEST/build/Debug-iphoneos/include", .anySequence,
 
-                                              // Check IO options.
-                                              "/tmp/aProject.dst/Library/Frameworks/Fwk.framework",
+                            // Check IO options.
+                            "/tmp/aProject.dst/Library/Frameworks/Fwk.framework",
 
-                                              "-filelist", "/TEST/build/aProject.build/Debug-iphoneos/Fwk.build/Fwk.json",
-                                              "-o", "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd",
+                            "-filelist", "/TEST/build/aProject.build/Debug-iphoneos/Fwk.build/Fwk.json",
+                            "-o", "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd",
 
-                                              // Check Swift options.
-                                              StringPattern.and(.prefix("-L/"), .contains(".xctoolchain/")),
-                                              StringPattern.and(.prefix("-L/"), .suffix(".sdk/usr/lib/swift")),
-                                              "-exclude-public-header", "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Headers/Fwk-Swift.h",
-                                              "-swift-installapi-interface", .suffix("arm64/Swift-API.tbd"),
-                                              "-swift-installapi-interface", .suffix("arm64e/Swift-API.tbd")
-                                             ])
+                            // Check Swift options.
+                            StringPattern.and(.prefix("-L/"), .contains(".xctoolchain/")),
+                            StringPattern.and(.prefix("-L/"), .suffix(".sdk/usr/lib/swift")),
+                            "-exclude-public-header", "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Headers/Fwk-Swift.h",
+                            "-swift-installapi-interface", .suffix("arm64/Swift-API.tbd"),
+                            "-swift-installapi-interface", .suffix("arm64e/Swift-API.tbd"),
+                        ]
+                )
             }
 
             // Check that we generate a copy of the compatibility header.
             results.checkTask(.matchRuleType("SwiftMergeGeneratedHeaders"), .matchRuleItemBasename("Fwk-Swift.h")) { task in
-                task.checkCommandLine(["builtin-swiftHeaderTool",
-                                       "-arch", "arm64", "/TEST/build/aProject.build/Debug-iphoneos/Fwk.build/Objects-normal/arm64/Fwk-Swift.h",
-                                       "-arch", "arm64e", "/TEST/build/aProject.build/Debug-iphoneos/Fwk.build/Objects-normal/arm64e/Fwk-Swift.h",
-                                       "-o", "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Headers/Fwk-Swift.h"])
+                task.checkCommandLine([
+                    "builtin-swiftHeaderTool",
+                    "-arch", "arm64", "/TEST/build/aProject.build/Debug-iphoneos/Fwk.build/Objects-normal/arm64/Fwk-Swift.h",
+                    "-arch", "arm64e", "/TEST/build/aProject.build/Debug-iphoneos/Fwk.build/Objects-normal/arm64e/Fwk-Swift.h",
+                    "-o", "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Headers/Fwk-Swift.h",
+                ])
             }
         }
     }
@@ -1763,29 +2042,39 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Fwk.swift"),
-                    TestVariantGroup("Intents.intentdefinition", children: [
-                        TestFile("Base.lproj/Intents.intentdefinition"),
-                        TestFile("en.lproj/Intents.strings", regionVariantName: "en"),
-                        TestFile("de.lproj/Intents.strings", regionVariantName: "de"),
-                    ])]),
+                    TestVariantGroup(
+                        "Intents.intentdefinition",
+                        children: [
+                            TestFile("Base.lproj/Intents.intentdefinition"),
+                            TestFile("en.lproj/Intents.strings", regionVariantName: "en"),
+                            TestFile("de.lproj/Intents.strings", regionVariantName: "de"),
+                        ]
+                    ),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ARCHS": "arm64 arm64e",
-                    "BUILD_VARIANTS": "normal asan",
-                    "SDKROOT": "iphoneos",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                    "SKIP_INSTALL": "NO",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "TAPI_VERIFY_MODE": "ErrorsOnly",
-                    "TAPI_USE_SRCROOT": "NO",
-                    "INTENTS_CODEGEN_LANGUAGE": "Swift",
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS": "arm64 arm64e",
+                        "BUILD_VARIANTS": "normal asan",
+                        "SDKROOT": "iphoneos",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                        "SKIP_INSTALL": "NO",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "TAPI_VERIFY_MODE": "ErrorsOnly",
+                        "TAPI_USE_SRCROOT": "NO",
+                        "INTENTS_CODEGEN_LANGUAGE": "Swift",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
@@ -1793,16 +2082,22 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "Fwk.swift",
-                            TestBuildFile("Intents.intentdefinition", intentsCodegenVisibility: .public)]),])])
+                            TestBuildFile("Intents.intentdefinition", intentsCodegenVisibility: .public),
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         final class Delegate: MockTestTaskPlanningClientDelegate, @unchecked Sendable {
-            override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+            override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
                 if commandLine.first.map(Path.init)?.basename == "intentbuilderc",
-                   let outputDir = commandLine.elementAfterElements(["-output"]).map(Path.init),
-                   let classPrefix = commandLine.elementAfterElements(["-classPrefix"]),
-                   let language = commandLine.elementAfterElements(["-language"]),
-                   let visibility = commandLine.elementAfterElements(["-visibility"]) {
+                    let outputDir = commandLine.elementAfterElements(["-output"]).map(Path.init),
+                    let classPrefix = commandLine.elementAfterElements(["-classPrefix"]),
+                    let language = commandLine.elementAfterElements(["-language"]),
+                    let visibility = commandLine.elementAfterElements(["-visibility"])
+                {
                     if visibility != "public" {
                         throw StubError.error("Visibility should be public")
                     }
@@ -1842,7 +2137,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                             "-Xfrontend", "-tbd-install_name", "-Xfrontend", "/Library/Frameworks/Fwk.framework/\(variant == "normal" ? "Fwk" : "Fwk_\(variant)")", .anySequence,
                             // Check we forced WMO mode.
                             "-whole-module-optimization", .anySequence,
-                            "-emit-objc-header", "-emit-objc-header-path", .equal("/TEST/build/aProject.build/Debug-iphoneos/Fwk.build/Objects-\(variant)/\(arch)/Fwk-Swift.h")
+                            "-emit-objc-header", "-emit-objc-header-path", .equal("/TEST/build/aProject.build/Debug-iphoneos/Fwk.build/Objects-\(variant)/\(arch)/Fwk-Swift.h"),
                         ])
 
                         // We shouldn't have a '-c'.
@@ -1858,39 +2153,46 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                 // Check that we generated correct TAPI installapi invocation.
                 results.checkTask(.matchRuleType("GenerateTAPI"), .matchRuleItemBasename(tapiTBDName)) { task in
                     // check TAPI options.
-                    task.checkCommandLineMatches([
-                        StringPattern.equal(tapiToolPath.str), "installapi", "--verify-mode=ErrorsOnly", .anySequence] +
-
-                                                 archs.map{ [StringPattern.equal("-target"), StringPattern.prefix("\($0)-apple")] }.joined() +
-
-                                                 [.anySequence,
-
-                                                  // Check search paths.
-                                                  "-F/TEST/build/Debug-iphoneos",
-                                                  "-L/TEST/build/Debug-iphoneos",
-                                                  "-I/TEST/build/Debug-iphoneos/include", .anySequence,
-
-                                                  // Check IO options.
-                                                  "/tmp/aProject.dst/Library/Frameworks/Fwk.framework",
-                                                  "-filelist", "/TEST/build/aProject.build/Debug-iphoneos/Fwk.build/Fwk.json",
-                                                  "-o", "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/\(tapiTBDName)",
-
-                                                  // Check Swift options.
-                                                  StringPattern.and(.prefix("-L/"), .contains(".xctoolchain/")),
-                                                  StringPattern.and(.prefix("-L/"), .suffix(".sdk/usr/lib/swift")),
-                                                  "-exclude-public-header", "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Headers/Fwk-Swift.h",
-                                                  "-swift-installapi-interface", .suffix("arm64/Swift-API.tbd"),
-                                                  "-swift-installapi-interface", .suffix("arm64e/Swift-API.tbd")
-                                                 ])
+                    task.checkCommandLineMatches(
+                        [
+                            StringPattern.equal(tapiToolPath.str), "installapi", "--verify-mode=ErrorsOnly", .anySequence,
+                        ]
+                            +
+
+                            archs.map { [StringPattern.equal("-target"), StringPattern.prefix("\($0)-apple")] }.joined() +
+
+                            [
+                                .anySequence,
+
+                                // Check search paths.
+                                "-F/TEST/build/Debug-iphoneos",
+                                "-L/TEST/build/Debug-iphoneos",
+                                "-I/TEST/build/Debug-iphoneos/include", .anySequence,
+
+                                // Check IO options.
+                                "/tmp/aProject.dst/Library/Frameworks/Fwk.framework",
+                                "-filelist", "/TEST/build/aProject.build/Debug-iphoneos/Fwk.build/Fwk.json",
+                                "-o", "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/\(tapiTBDName)",
+
+                                // Check Swift options.
+                                StringPattern.and(.prefix("-L/"), .contains(".xctoolchain/")),
+                                StringPattern.and(.prefix("-L/"), .suffix(".sdk/usr/lib/swift")),
+                                "-exclude-public-header", "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Headers/Fwk-Swift.h",
+                                "-swift-installapi-interface", .suffix("arm64/Swift-API.tbd"),
+                                "-swift-installapi-interface", .suffix("arm64e/Swift-API.tbd"),
+                            ]
+                    )
                 }
             }
 
             // Check that we generate a copy of the compatibility header.
             results.checkTask(.matchRuleType("SwiftMergeGeneratedHeaders"), .matchRuleItemBasename("Fwk-Swift.h")) { task in
-                task.checkCommandLine(["builtin-swiftHeaderTool",
-                                       "-arch", "arm64", "/TEST/build/aProject.build/Debug-iphoneos/Fwk.build/Objects-normal/arm64/Fwk-Swift.h",
-                                       "-arch", "arm64e", "/TEST/build/aProject.build/Debug-iphoneos/Fwk.build/Objects-normal/arm64e/Fwk-Swift.h",
-                                       "-o", "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Headers/Fwk-Swift.h"])
+                task.checkCommandLine([
+                    "builtin-swiftHeaderTool",
+                    "-arch", "arm64", "/TEST/build/aProject.build/Debug-iphoneos/Fwk.build/Objects-normal/arm64/Fwk-Swift.h",
+                    "-arch", "arm64e", "/TEST/build/aProject.build/Debug-iphoneos/Fwk.build/Objects-normal/arm64e/Fwk-Swift.h",
+                    "-o", "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Headers/Fwk-Swift.h",
+                ])
             }
 
             results.checkTask(.matchRuleType("IntentDefinitionCodegen")) { task in
@@ -1908,33 +2210,48 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Src.swift")]),
+                    TestFile("Src.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SKIP_INSTALL": "NO",
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SKIP_INSTALL": "NO",
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "BadApp",
                     type: .application,
                     buildPhases: [
-                        TestSourcesBuildPhase(["Src.swift"])],
-                    dependencies: ["BadDylib", "BadFwk"]),
+                        TestSourcesBuildPhase(["Src.swift"])
+                    ],
+                    dependencies: ["BadDylib", "BadFwk"]
+                ),
                 TestStandardTarget(
                     "BadDylib",
                     type: .dynamicLibrary,
                     buildPhases: [
-                        TestSourcesBuildPhase(["Src.swift"])]),
+                        TestSourcesBuildPhase(["Src.swift"])
+                    ]
+                ),
                 TestStandardTarget(
                     "BadFwk",
                     type: .framework,
                     buildPhases: [
-                        TestSourcesBuildPhase(["Src.swift"])])])
+                        TestSourcesBuildPhase(["Src.swift"])
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Check the `installapi` build.
@@ -1958,49 +2275,67 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Src.swift")]),
+                    TestFile("Src.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SDKROOT": "iphoneos",
-                    "SKIP_INSTALL": "NO",
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "TAPI_EXEC": tapiToolPath.str,
-
-                    "INSTALLAPI_IGNORE_SKIP_INSTALL": "YES",
-
-                    // Conventional settings when using Swift InstallAPI
-                    "SWIFT_OBJC_INTERFACE_HEADER_NAME": "",
-                    "SWIFT_INSTALL_OBJC_HEADER": "NO",
-                    "DEFINES_MODULE": "NO",
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SDKROOT": "iphoneos",
+                        "SKIP_INSTALL": "NO",
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "TAPI_EXEC": tapiToolPath.str,
+
+                        "INSTALLAPI_IGNORE_SKIP_INSTALL": "YES",
+
+                        // Conventional settings when using Swift InstallAPI
+                        "SWIFT_OBJC_INTERFACE_HEADER_NAME": "",
+                        "SWIFT_INSTALL_OBJC_HEADER": "NO",
+                        "DEFINES_MODULE": "NO",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "BadApp",
                     type: .application,
                     buildPhases: [
-                        TestSourcesBuildPhase(["Src.swift"])],
-                    dependencies: ["FwkPrivate", "FwkPublic"]),
+                        TestSourcesBuildPhase(["Src.swift"])
+                    ],
+                    dependencies: ["FwkPrivate", "FwkPublic"]
+                ),
                 TestStandardTarget(
                     "FwkPrivate",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES"
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["Src.swift"])]),
+                        TestSourcesBuildPhase(["Src.swift"])
+                    ]
+                ),
                 TestStandardTarget(
                     "FwkPublic",
                     type: .framework,
                     buildPhases: [
-                        TestSourcesBuildPhase(["Src.swift"])],
-                    dependencies: ["FwkPrivate"])])
+                        TestSourcesBuildPhase(["Src.swift"])
+                    ],
+                    dependencies: ["FwkPrivate"]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Check the `installapi` build.
@@ -2063,63 +2398,71 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "ProjectName",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("File2.swift"),
-                ]),
+                    TestFile("File2.swift")
+                ]
+            ),
             targets: [
                 TestAggregateTarget("Aggregate", dependencies: ["PackageProduct"]),
                 TestStandardTarget(
                     "TargetName",
                     type: .objectFile,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "ProductName",
-                            "ARCHS": "x86_64",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": swiftVersion,
-                            "TAPI_EXEC": tapiToolPath.str,
-                            "TAPI_VERIFY_MODE": "ErrorsOnly",
-                            "TAPI_USE_SRCROOT": "NO",
-                            "SDKROOT": sdkRoot,
-                            // These will be provided in the PIF by SwiftPM.
-                            "SUPPORTS_TEXT_BASED_API": "YES",
-                            "TAPI_DYLIB_INSTALL_NAME": "ProductName",
-                            // This will need to be passed by the user to make InstallAPI for packages opt-in.
-                            "INSTALLAPI_IGNORE_SKIP_INSTALL": "YES"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "ProductName",
+                                "ARCHS": "x86_64",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                                "TAPI_EXEC": tapiToolPath.str,
+                                "TAPI_VERIFY_MODE": "ErrorsOnly",
+                                "TAPI_USE_SRCROOT": "NO",
+                                "SDKROOT": sdkRoot,
+                                // These will be provided in the PIF by SwiftPM.
+                                "SUPPORTS_TEXT_BASED_API": "YES",
+                                "TAPI_DYLIB_INSTALL_NAME": "ProductName",
+                                // This will need to be passed by the user to make InstallAPI for packages opt-in.
+                                "INSTALLAPI_IGNORE_SKIP_INSTALL": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("File2.swift"),
-                        ]),
+                            TestBuildFile("File2.swift")
+                        ])
                     ]
                 ),
                 TestStandardTarget(
                     "PackageProduct",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "ProductName",
-                            "ARCHS": "x86_64",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": swiftVersion,
-                            "TAPI_EXEC": tapiToolPath.str,
-                            "TAPI_VERIFY_MODE": "ErrorsOnly",
-                            "TAPI_USE_SRCROOT": "NO",
-                            "SDKROOT": sdkRoot,
-                            // These will be provided in the PIF by SwiftPM.
-                            "SUPPORTS_TEXT_BASED_API": "YES",
-                            "TAPI_DYLIB_INSTALL_NAME": "ProductName",
-                            // This will need to be passed by the user to make InstallAPI for packages opt-in.
-                            "INSTALLAPI_IGNORE_SKIP_INSTALL": "YES"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "ProductName",
+                                "ARCHS": "x86_64",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                                "TAPI_EXEC": tapiToolPath.str,
+                                "TAPI_VERIFY_MODE": "ErrorsOnly",
+                                "TAPI_USE_SRCROOT": "NO",
+                                "SDKROOT": sdkRoot,
+                                // These will be provided in the PIF by SwiftPM.
+                                "SUPPORTS_TEXT_BASED_API": "YES",
+                                "TAPI_DYLIB_INSTALL_NAME": "ProductName",
+                                // This will need to be passed by the user to make InstallAPI for packages opt-in.
+                                "INSTALLAPI_IGNORE_SKIP_INSTALL": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestFrameworksBuildPhase([TestBuildFile(.target("TargetName"))]),
-                        TestSourcesBuildPhase([]), // we need a sources build phase for `willProduceBinary` to return true
+                        TestSourcesBuildPhase([]),  // we need a sources build phase for `willProduceBinary` to return true
                     ]
                 ),
             ]
@@ -2150,25 +2493,32 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Fwk.h"),
                     TestFile("FwkInternal.h"),
-                    TestFile("Fwk.c")]),
+                    TestFile("Fwk.c"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "INFOPLIST_FILE": "Info.plist",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "CC": clangCompilerPath.str,
-                    "CLANG_EXPLICIT_MODULES_LIBCLANG_PATH": libClangPath.str,
-                    "SKIP_INSTALL": "NO",
-                    "DEFINES_MODULE": "YES",
-                    "CLANG_ENABLE_MODULES": "YES",
-                    "TAPI_VERIFY_MODE": "ErrorsOnly",
-                    "TAPI_USE_SRCROOT": "YES"
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "INFOPLIST_FILE": "Info.plist",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "CC": clangCompilerPath.str,
+                        "CLANG_EXPLICIT_MODULES_LIBCLANG_PATH": libClangPath.str,
+                        "SKIP_INSTALL": "NO",
+                        "DEFINES_MODULE": "YES",
+                        "CLANG_ENABLE_MODULES": "YES",
+                        "TAPI_VERIFY_MODE": "ErrorsOnly",
+                        "TAPI_USE_SRCROOT": "YES",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
@@ -2177,7 +2527,12 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                         TestSourcesBuildPhase(["Fwk.c"]),
                         TestHeadersBuildPhase([
                             TestBuildFile("Fwk.h", headerVisibility: .public),
-                            TestBuildFile("FwkInternal.h")])])])
+                            TestBuildFile("FwkInternal.h"),
+                        ]),
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         let fs = PseudoFS()
@@ -2189,7 +2544,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
         let expectedHeaders: PropertyListItem = .plArray([
             .plDict([
                 "type": .plString("public"),
-                "path": .plString("/TEST/build/Debug/Fwk.framework/Headers/Fwk.h")
+                "path": .plString("/TEST/build/Debug/Fwk.framework/Headers/Fwk.h"),
             ])
         ])
         // Check the `installapi` build.
@@ -2198,13 +2553,15 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             results.checkTask(.matchRuleType("CpHeader")) { task in
                 task.checkCommandLineMatches([
                     "builtin-copy", .anySequence, "/TEST/Sources/Fwk.h",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers",
+                ])
             }
             results.checkTask(.matchRuleType("SymLink"), .matchRuleItemBasename("Fwk.tbd")) { task in
                 task.checkCommandLine([
                     "/bin/ln", "-sfh",
                     "Versions/Current/Fwk.tbd",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd",
+                ])
             }
             try results.checkWriteAuxiliaryFileTask(.matchRuleType("WriteAuxiliaryFile"), .matchRuleItemBasename("Fwk.json")) { task, contents in
                 let data = try PropertyList.fromJSONData(contents)
@@ -2227,7 +2584,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     "-F/TEST/build/Debug",
                     "-L/TEST/build/Debug",
 
-                        .anySequence,
+                    .anySequence,
 
                     // Check SRCROOT search paths
                     "-iquote", "/TEST/build/aProject.build/Debug/Fwk.build/Fwk-generated-files.hmap",
@@ -2235,11 +2592,10 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     "-I/TEST/build/aProject.build/Debug/Fwk.build/Fwk-all-target-headers.hmap",
                     "-iquote", "/TEST/build/aProject.build/Debug/Fwk.build/Fwk-project-headers.hmap",
 
-                        .anySequence,
-
+                    .anySequence,
 
                     // Check IO options.
-                    "-filelist" ,"/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
+                    "-filelist", "/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
                     "-o",
                     "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd",
                 ])
@@ -2252,13 +2608,15 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             results.checkTask(.matchRuleType("CpHeader")) { task in
                 task.checkCommandLineMatches([
                     "builtin-copy", .anySequence, "/TEST/Sources/Fwk.h",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers",
+                ])
             }
             results.checkTask(.matchRuleType("SymLink"), .matchRuleItemBasename("Fwk.tbd")) { task in
                 task.checkCommandLine([
                     "/bin/ln", "-sfh",
                     "Versions/Current/Fwk.tbd",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd",
+                ])
             }
 
             results.checkTask(.matchRuleType("GenerateTAPI")) { task in
@@ -2271,13 +2629,13 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
 
                     "-target", StringPattern.prefix("\(results.runDestinationTargetArchitecture)-apple"),
 
-                        .anySequence,
+                    .anySequence,
 
                     // Check build products search paths
                     "-F/TEST/build/Debug/BuiltProducts",
                     "-L/TEST/build/Debug/BuiltProducts",
 
-                        .anySequence,
+                    .anySequence,
 
                     // Check SRCROOT search paths
                     "-iquote", "/TEST/build/aProject.build/Debug/Fwk.build/Fwk-generated-files.hmap",
@@ -2285,10 +2643,10 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     "-I/TEST/build/aProject.build/Debug/Fwk.build/Fwk-all-target-headers.hmap",
                     "-iquote", "/TEST/build/aProject.build/Debug/Fwk.build/Fwk-project-headers.hmap",
 
-                        .anySequence,
+                    .anySequence,
 
                     // Check IO options.
-                    "-filelist" ,"/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
+                    "-filelist", "/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
                     "-o",
                     "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd",
                 ])
@@ -2303,22 +2661,30 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Fwk.h"),
                     TestFile("Fwk-iOS.h"),
                     TestFile("Fwk-Excluded.h"),
-                    TestFile("Fwk.c")]),
+                    TestFile("Fwk.c"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SDKROOT": "auto",
-                    "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
-                    "INFOPLIST_FILE": "Info.plist",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "TAPI_ENABLE_PROJECT_HEADERS": "YES",
-                    "EXCLUDED_SOURCE_FILE_NAMES": "Fwk-Excluded.h"])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SDKROOT": "auto",
+                        "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                        "INFOPLIST_FILE": "Info.plist",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "TAPI_ENABLE_PROJECT_HEADERS": "YES",
+                        "EXCLUDED_SOURCE_FILE_NAMES": "Fwk-Excluded.h",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
@@ -2328,7 +2694,12 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                         TestHeadersBuildPhase([
                             TestBuildFile("Fwk.h", headerVisibility: .public),
                             TestBuildFile("Fwk-iOS.h", headerVisibility: .public, platformFilters: PlatformFilter.iOSFilters),
-                            TestBuildFile("Fwk-Excluded.h", headerVisibility: .public)])])])
+                            TestBuildFile("Fwk-Excluded.h", headerVisibility: .public),
+                        ]),
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         let fs = PseudoFS()
@@ -2338,19 +2709,19 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
         let expectedMacOSHeaders: PropertyListItem = .plArray([
             .plDict([
                 "type": .plString("public"),
-                "path": .plString("/TEST/build/Debug/Fwk.framework/Headers/Fwk.h")
+                "path": .plString("/TEST/build/Debug/Fwk.framework/Headers/Fwk.h"),
             ])
         ])
 
         let expectedIOSHeaders: PropertyListItem = .plArray([
             .plDict([
                 "type": .plString("public"),
-                "path": .plString("/TEST/build/Debug-iphoneos/Fwk.framework/Headers/Fwk.h")
+                "path": .plString("/TEST/build/Debug-iphoneos/Fwk.framework/Headers/Fwk.h"),
             ]),
             .plDict([
                 "type": .plString("public"),
-                "path": .plString("/TEST/build/Debug-iphoneos/Fwk.framework/Headers/Fwk-iOS.h")
-            ])
+                "path": .plString("/TEST/build/Debug-iphoneos/Fwk.framework/Headers/Fwk-iOS.h"),
+            ]),
         ])
 
         try await tester.checkBuild(BuildParameters(action: .installAPI, configuration: "Debug"), runDestination: .macOS, fs: fs) { results in
@@ -2383,7 +2754,8 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
         let tapiToolPath = try await self.tapiToolPath
         let tapiVersion = try await discoveredTAPIToolInfo(at: tapiToolPath).toolVersion
         guard let version = tapiVersion,
-              version >= TAPIToolSpec.dSYMSupportRequiredVersion else {
+            version >= TAPIToolSpec.dSYMSupportRequiredVersion
+        else {
             return
         }
 
@@ -2391,24 +2763,32 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Fwk.h"),
-                    TestFile("Fwk.c")]),
+                    TestFile("Fwk.c"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "-",
-                    "INFOPLIST_FILE": "Info.plist",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                    "GCC_GENERATE_DEBUGGING_SYMBOLS" : "YES",
-                    "DEBUG_INFORMATION_FORMAT" : "dwarf-with-dsym",
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "TAPI_LANGUAGE": "objective-c++",
-                    "TAPI_VERIFY_MODE": "ErrorsOnly",
-                    "TAPI_USE_SRCROOT": "NO",
-                    "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks",
-                    "SKIP_INSTALL": "NO"])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "-",
+                        "INFOPLIST_FILE": "Info.plist",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                        "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES",
+                        "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "TAPI_LANGUAGE": "objective-c++",
+                        "TAPI_VERIFY_MODE": "ErrorsOnly",
+                        "TAPI_USE_SRCROOT": "NO",
+                        "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks",
+                        "SKIP_INSTALL": "NO",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
@@ -2416,7 +2796,12 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.c"]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("Fwk.h", headerVisibility: .public)])])])
+                            TestBuildFile("Fwk.h", headerVisibility: .public)
+                        ]),
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         let fs = PseudoFS()
@@ -2433,7 +2818,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
 
                     "-target", StringPattern.prefix("\(results.runDestinationTargetArchitecture)-apple"),
 
-                        .anySequence,
+                    .anySequence,
                     "-rpath", "@executable_path/../Frameworks", .anySequence,
                     "-rpath", "@loader_path/../Frameworks", .anySequence,
 
@@ -2441,7 +2826,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
 
                     // Check IO options.
                     "/tmp/aProject.dst/Library/Frameworks/Fwk.framework",
-                    "-filelist" ,"/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
+                    "-filelist", "/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
                     "-o",
                     "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd",
                 ])
@@ -2459,17 +2844,21 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             results.checkTask(.matchRuleType("CpHeader")) { task in
                 task.checkCommandLineMatches([
                     "builtin-copy", .anySequence, "/TEST/Sources/Fwk.h",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers",
+                ])
             }
             results.checkTask(.matchRuleType("SymLink"), .matchRuleItemBasename("Fwk.tbd")) { task in
                 task.checkCommandLine([
                     "/bin/ln", "-sfh",
                     "Versions/Current/Fwk.tbd",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd",
+                ])
             }
             results.checkTask(.matchRuleType("GenerateDSYMFile"), .matchRuleItemBasename("Fwk.framework.dSYM")) { task in
-                task.checkCommandLine([ "dsymutil", "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk",
-                                        "-o", "/TEST/build/Debug/Fwk.framework.dSYM"])
+                task.checkCommandLine([
+                    "dsymutil", "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk",
+                    "-o", "/TEST/build/Debug/Fwk.framework.dSYM",
+                ])
             }
             results.checkTask(.matchRuleType("GenerateTAPI")) { task in
                 // check TAPI options.
@@ -2488,18 +2877,19 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
 
                     // Check IO options.
                     "/tmp/aProject.dst/Library/Frameworks/Fwk.framework",
-                    "-filelist" ,"/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
+                    "-filelist", "/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
                     "-o",
                     "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd", .anySequence,
 
                     // Check dSYM Path.
-                    "--dsym=/TEST/build/Debug/Fwk.framework.dSYM"
+                    "--dsym=/TEST/build/Debug/Fwk.framework.dSYM",
                 ])
             }
             results.checkTask(.matchRuleType("CodeSign"), .matchRuleItemBasename("Fwk.tbd")) { task in
                 task.checkCommandLineMatches([
                     .suffix("codesign"), .anySequence,
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd",
+                ])
             }
         }
     }
@@ -2509,7 +2899,8 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
         let tapiToolPath = try await self.tapiToolPath
         let tapiVersion = try await discoveredTAPIToolInfo(at: tapiToolPath).toolVersion
         guard let version = tapiVersion,
-              version >= TAPIToolSpec.dSYMSupportRequiredVersion else {
+            version >= TAPIToolSpec.dSYMSupportRequiredVersion
+        else {
             return
         }
 
@@ -2517,25 +2908,33 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Fwk.h"),
-                    TestFile("Fwk.c")]),
+                    TestFile("Fwk.c"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "-",
-                    "INFOPLIST_FILE": "Info.plist",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                    "GCC_GENERATE_DEBUGGING_SYMBOLS" : "YES",
-                    "TAPI_READ_DSYM" : "NO",
-                    "DEBUG_INFORMATION_FORMAT" : "dwarf-with-dsym",
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "TAPI_VERIFY_MODE": "ErrorsOnly",
-                    "TAPI_USE_SRCROOT": "NO",
-                    "TAPI_LANGUAGE": "objective-c++",
-                    "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks",
-                    "SKIP_INSTALL": "NO"])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "-",
+                        "INFOPLIST_FILE": "Info.plist",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                        "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES",
+                        "TAPI_READ_DSYM": "NO",
+                        "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "TAPI_VERIFY_MODE": "ErrorsOnly",
+                        "TAPI_USE_SRCROOT": "NO",
+                        "TAPI_LANGUAGE": "objective-c++",
+                        "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks",
+                        "SKIP_INSTALL": "NO",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
@@ -2543,7 +2942,12 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.c"]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("Fwk.h", headerVisibility: .public)])])])
+                            TestBuildFile("Fwk.h", headerVisibility: .public)
+                        ]),
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         let fs = PseudoFS()
@@ -2560,7 +2964,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
 
                     "-target", StringPattern.prefix("\(results.runDestinationTargetArchitecture)-apple"),
 
-                        .anySequence,
+                    .anySequence,
                     "-rpath", "@executable_path/../Frameworks", .anySequence,
                     "-rpath", "@loader_path/../Frameworks", .anySequence,
 
@@ -2568,7 +2972,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
 
                     // Check IO options.
                     "/tmp/aProject.dst/Library/Frameworks/Fwk.framework",
-                    "-filelist" ,"/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
+                    "-filelist", "/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
                     "-o",
                     "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd",
                 ])
@@ -2586,13 +2990,15 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             results.checkTask(.matchRuleType("CpHeader")) { task in
                 task.checkCommandLineMatches([
                     "builtin-copy", .anySequence, "/TEST/Sources/Fwk.h",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Headers",
+                ])
             }
             results.checkTask(.matchRuleType("SymLink"), .matchRuleItemBasename("Fwk.tbd")) { task in
                 task.checkCommandLine([
                     "/bin/ln", "-sfh",
                     "Versions/Current/Fwk.tbd",
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Fwk.tbd",
+                ])
             }
             results.checkTask(.matchRuleType("GenerateTAPI")) { task in
                 // check TAPI options.
@@ -2611,7 +3017,7 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
 
                     // Check IO options.
                     "/tmp/aProject.dst/Library/Frameworks/Fwk.framework",
-                    "-filelist" ,"/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
+                    "-filelist", "/TEST/build/aProject.build/Debug/Fwk.build/Fwk.json",
                     "-o",
                     "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd", .anySequence,
                 ])
@@ -2620,7 +3026,8 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             results.checkTask(.matchRuleType("CodeSign"), .matchRuleItemBasename("Fwk.tbd")) { task in
                 task.checkCommandLineMatches([
                     .suffix("codesign"), .anySequence,
-                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd"])
+                    "/tmp/aProject.dst/Library/Frameworks/Fwk.framework/Versions/A/Fwk.tbd",
+                ])
             }
         }
     }
@@ -2631,48 +3038,62 @@ fileprivate struct InstallAPITaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("App.swift"),
                     TestFile("Fwk.swift"),
                     TestFile("StaticLib.swift"),
                     TestFile("StaticLib2.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "SKIP_INSTALL": "NO"
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "SKIP_INSTALL": "NO",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildPhases: [
                         TestSourcesBuildPhase(["App.swift"])
-                    ], dependencies: ["Fwk"]),
+                    ],
+                    dependencies: ["Fwk"]
+                ),
                 TestStandardTarget(
                     "Fwk",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.swift"])
-                    ], dependencies: ["StaticLib"]),
+                    ],
+                    dependencies: ["StaticLib"]
+                ),
                 TestStandardTarget(
                     "StaticLib",
                     type: .staticLibrary,
                     buildPhases: [
                         TestSourcesBuildPhase(["StaticLib.swift"])
-                    ], dependencies: ["StaticLib2"]),
+                    ],
+                    dependencies: ["StaticLib2"]
+                ),
                 TestStandardTarget(
                     "StaticLib2",
                     type: .staticLibrary,
                     buildPhases: [
                         TestSourcesBuildPhase(["StaticLib2.swift"])
-                    ])
-            ])
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         // Even though SUPPORTS_TEXT_BASED_API=YES is global for the project, don't emit a swiftmodule for the app target because it doesn't emit a TBD, and isn't a dependency of any target which emits a TBD.
         await tester.checkBuild(BuildParameters(action: .installAPI, configuration: "Debug"), runDestination: .macOS) { results in
diff --git a/Tests/SWBTaskConstructionTests/InstallLocTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/InstallLocTaskConstructionTests.swift
index 83432e46..bd678671 100644
--- a/Tests/SWBTaskConstructionTests/InstallLocTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/InstallLocTaskConstructionTests.swift
@@ -26,37 +26,52 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestVariantGroup("foo.xib", children: [
-                        TestFile("Base.lproj/foo.xib", regionVariantName: "Base"),
-                        TestFile("en.lproj/foo.strings", regionVariantName: "en"),
-                        TestFile("de.lproj/foo.strings", regionVariantName: "de"),
-                    ]),
-                    TestVariantGroup("Localizable.strings", children: [
-                        TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
-                        TestFile("de.lproj/Localizable.strings", regionVariantName: "de"),
-                        TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja"),
-                    ]),
-                    TestVariantGroup("Main.storyboard", children: [
-                        TestFile("Base.lproj/Main.storyboard", regionVariantName: "Base"),
-                        TestFile("en.lproj/Main.strings", regionVariantName: "en"),
-                        TestFile("de.lproj/Main.strings", regionVariantName: "de"),
-                        TestFile("ja.lproj/Main.strings", regionVariantName: "ja"),
-                    ]),
-                    TestVariantGroup("Intents.intentdefinition", children: [
-                        TestFile("Base.lproj/Intents.intentdefinition", regionVariantName: "Base"),
-                        TestFile("de.lproj/Intents.strings", regionVariantName: "de"),
-                        TestFile("ja.lproj/Intents.strings", regionVariantName: "ja"),
-                    ])
-                ]),
+                    TestVariantGroup(
+                        "foo.xib",
+                        children: [
+                            TestFile("Base.lproj/foo.xib", regionVariantName: "Base"),
+                            TestFile("en.lproj/foo.strings", regionVariantName: "en"),
+                            TestFile("de.lproj/foo.strings", regionVariantName: "de"),
+                        ]
+                    ),
+                    TestVariantGroup(
+                        "Localizable.strings",
+                        children: [
+                            TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
+                            TestFile("de.lproj/Localizable.strings", regionVariantName: "de"),
+                            TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja"),
+                        ]
+                    ),
+                    TestVariantGroup(
+                        "Main.storyboard",
+                        children: [
+                            TestFile("Base.lproj/Main.storyboard", regionVariantName: "Base"),
+                            TestFile("en.lproj/Main.strings", regionVariantName: "en"),
+                            TestFile("de.lproj/Main.strings", regionVariantName: "de"),
+                            TestFile("ja.lproj/Main.strings", regionVariantName: "ja"),
+                        ]
+                    ),
+                    TestVariantGroup(
+                        "Intents.intentdefinition",
+                        children: [
+                            TestFile("Base.lproj/Intents.intentdefinition", regionVariantName: "Base"),
+                            TestFile("de.lproj/Intents.strings", regionVariantName: "de"),
+                            TestFile("ja.lproj/Intents.strings", regionVariantName: "ja"),
+                        ]
+                    ),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "IBC_EXEC": ibtoolPath.str,
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -66,14 +81,16 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                         TestResourcesBuildPhase([
                             "foo.xib",
                             "Localizable.strings",
-                            "Main.storyboard"
+                            "Main.storyboard",
                         ]),
                         TestSourcesBuildPhase([
                             // Intent definition files appear in the "Compile Sources" phase
                             "Intents.intentdefinition"
                         ]),
-                    ])
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(BuildParameters(action: .installLoc, configuration: "Debug"), runDestination: .macOS) { results in
@@ -156,19 +173,22 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Foo.png"),
                     TestFile("com.apple.Foo.plist"),
-                    TestFile("AFolderIncorrectlyNamed.lproj/Path/To/Something/NotLocalizable.plist")
-                ]),
+                    TestFile("AFolderIncorrectlyNamed.lproj/Path/To/Something/NotLocalizable.plist"),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "DONT_GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -176,18 +196,26 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                     type: .application,
                     buildPhases: [
                         TestResourcesBuildPhase([
-                            "Foo.png",
+                            "Foo.png"
                         ]),
-                        TestCopyFilesBuildPhase([
-                            "com.apple.Foo.plist",
-                        ], destinationSubfolder: .resources, onlyForDeployment: false
-                                               ),
-                        TestCopyFilesBuildPhase([
-                            "AFolderIncorrectlyNamed.lproj/Path/To/Something/NotLocalizable.plist",
-                        ], destinationSubfolder: .resources, onlyForDeployment: false
-                                               ),
-                    ])
-            ])
+                        TestCopyFilesBuildPhase(
+                            [
+                                "com.apple.Foo.plist"
+                            ],
+                            destinationSubfolder: .resources,
+                            onlyForDeployment: false
+                        ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "AFolderIncorrectlyNamed.lproj/Path/To/Something/NotLocalizable.plist"
+                            ],
+                            destinationSubfolder: .resources,
+                            onlyForDeployment: false
+                        ),
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(BuildParameters(action: .installLoc, configuration: "Debug"), runDestination: .macOS) { results in
@@ -214,7 +242,8 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "Sources", path: "Sources",
+                "Sources",
+                path: "Sources",
                 children: [
                     // iOS app files
                     TestFile("iosApp/main.m"),
@@ -229,43 +258,54 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                     // watchOS extension files
                     TestFile("watchosExtension/Controller.m"),
                     TestFile("watchosExtension/Info.plist"),
-                    TestVariantGroup("Localizable.strings", children: [
-                        TestFile("watchOSExtension/en.lproj/Localizable.strings", regionVariantName: "en"),
-                        TestFile("watchOSExtension/zh_TW.lproj/Localizable.strings", regionVariantName: "zh_TW"),
-                        TestFile("watchOSExtension/fr.lproj/Localizable.strings", regionVariantName: "fr"),
-                    ]),
-                ]),
+                    TestVariantGroup(
+                        "Localizable.strings",
+                        children: [
+                            TestFile("watchOSExtension/en.lproj/Localizable.strings", regionVariantName: "en"),
+                            TestFile("watchOSExtension/zh_TW.lproj/Localizable.strings", regionVariantName: "zh_TW"),
+                            TestFile("watchOSExtension/fr.lproj/Localizable.strings", regionVariantName: "fr"),
+                        ]
+                    ),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Release",
                     buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Watchable",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release",
-                                               buildSettings: [
-                                                "INFOPLIST_FILE": "Sources/iosApp/Info.plist",
-                                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks",
-                                                "SDKROOT": "iphoneos"
-                                               ]),
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "Sources/iosApp/Info.plist",
+                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks",
+                                "SDKROOT": "iphoneos",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.m",
+                            "main.m"
                         ]),
                         TestResourcesBuildPhase([
                             "Main.storyboard",
                             "iosApp/Assets.xcassets",
                         ]),
-                        TestCopyFilesBuildPhase([
-                            "Watchable WatchKit App.app",
-                        ], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch", onlyForDeployment: false
-                                               ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Watchable WatchKit App.app"
+                            ],
+                            destinationSubfolder: .builtProductsDir,
+                            destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch",
+                            onlyForDeployment: false
+                        ),
                     ],
                     dependencies: ["Watchable WatchKit App"]
                 ),
@@ -273,21 +313,26 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                     "Watchable WatchKit App",
                     type: .watchKitApp,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release",
-                                               buildSettings: [
-                                                "INFOPLIST_FILE": "Sources/watchosApp/Info.plist",
-                                                "SDKROOT": "watchos",
-                                                "SKIP_INSTALL": "YES",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "Sources/watchosApp/Info.plist",
+                                "SDKROOT": "watchos",
+                                "SKIP_INSTALL": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
-                            "Interface.storyboard",
+                            "Interface.storyboard"
                         ]),
-                        TestCopyFilesBuildPhase([
-                            "Watchable WatchKit Extension.appex",
-                        ], destinationSubfolder: .plugins, onlyForDeployment: false
-                                               ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Watchable WatchKit Extension.appex"
+                            ],
+                            destinationSubfolder: .plugins,
+                            onlyForDeployment: false
+                        ),
                     ],
                     dependencies: ["Watchable WatchKit Extension"]
                 ),
@@ -295,18 +340,20 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                     "Watchable WatchKit Extension",
                     type: .watchKitExtension,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
-                                                "INFOPLIST_FILE": "Sources/watchosExtension/Info.plist",
-                                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
-                                                "SDKROOT": "watchos",
-                                                "SKIP_INSTALL": "YES",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
+                                "INFOPLIST_FILE": "Sources/watchosExtension/Info.plist",
+                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
+                                "SDKROOT": "watchos",
+                                "SKIP_INSTALL": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Controller.m",
+                            "Controller.m"
                         ]),
                         TestResourcesBuildPhase([
                             "Interface.storyboard",
@@ -314,7 +361,8 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                         ]),
                     ]
                 ),
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(BuildParameters(action: .installLoc, configuration: "Release", overrides: ["DSTROOT": "/tmp/Root"]), runDestination: .macOS) { results in
@@ -403,7 +451,8 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "Sources", path: "Sources",
+                "Sources",
+                path: "Sources",
                 children: [
                     // iOS app files
                     TestFile("iosApp/main.m"),
@@ -414,39 +463,46 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                     // bundle files
                     TestFile("myBundle/Controller.m"),
                     TestFile("myBundle/Info.plist"),
-                    TestVariantGroup("Localizable.strings", children: [
-                        TestFile("myBundle/en.lproj/Localizable.strings", regionVariantName: "en"),
-                        TestFile("myBundle/zh_TW.lproj/Localizable.strings", regionVariantName: "zh_TW"),
-                        TestFile("myBundle/fr.lproj/Localizable.strings", regionVariantName: "fr"),
-                    ]),
-                ]),
+                    TestVariantGroup(
+                        "Localizable.strings",
+                        children: [
+                            TestFile("myBundle/en.lproj/Localizable.strings", regionVariantName: "en"),
+                            TestFile("myBundle/zh_TW.lproj/Localizable.strings", regionVariantName: "zh_TW"),
+                            TestFile("myBundle/fr.lproj/Localizable.strings", regionVariantName: "fr"),
+                        ]
+                    ),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Release",
                     buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Bundlable",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release",
-                                               buildSettings: [
-                                                "INFOPLIST_FILE": "Sources/iosApp/Info.plist",
-                                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks",
-                                                "SDKROOT": "iphoneos"
-                                               ]),
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "Sources/iosApp/Info.plist",
+                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks",
+                                "SDKROOT": "iphoneos",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.m",
+                            "main.m"
                         ]),
                         TestResourcesBuildPhase([
                             "Main.storyboard",
                             "iosApp/Assets.xcassets",
-                            "MyBundle.bundle"
+                            "MyBundle.bundle",
                         ]),
                     ],
                     dependencies: ["MyBundle"]
@@ -455,24 +511,27 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                     "MyBundle",
                     type: .bundle,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "INFOPLIST_FILE": "Sources/myBundle/Info.plist",
-                                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
-                                                "SDKROOT": "iphoneos",
-                                                "SKIP_INSTALL": "YES",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "Sources/myBundle/Info.plist",
+                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
+                                "SDKROOT": "iphoneos",
+                                "SKIP_INSTALL": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Controller.m",
+                            "Controller.m"
                         ]),
                         TestResourcesBuildPhase([
-                            "Localizable.strings",
+                            "Localizable.strings"
                         ]),
                     ]
                 ),
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(BuildParameters(action: .installLoc, configuration: "Release", overrides: ["DSTROOT": "/tmp/Root"]), runDestination: .iOS) { results in
@@ -553,35 +612,45 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("CoreFoo.framework"),
-                        TestVariantGroup("Localizable.strings", children: [
-                            TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
-                            TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja"),
-                            TestFile("zh_TW.lproj/Localizable.strings", regionVariantName: "zh_TW"),
-                        ]),
-                    ]),
+                        TestVariantGroup(
+                            "Localizable.strings",
+                            children: [
+                                TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
+                                TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja"),
+                                TestFile("zh_TW.lproj/Localizable.strings", regionVariantName: "zh_TW"),
+                            ]
+                        ),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
                             "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "SDKROOT" : "iphoneos",
-                        ]),
+                            "SDKROOT": "iphoneos",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "App",
                         type: .application,
                         buildPhases: [
-                            TestCopyFilesBuildPhase([
-                                "CoreFoo.framework",
-                            ], destinationSubfolder: .frameworks, onlyForDeployment: false
-                                                   ),
+                            TestCopyFilesBuildPhase(
+                                [
+                                    "CoreFoo.framework"
+                                ],
+                                destinationSubfolder: .frameworks,
+                                onlyForDeployment: false
+                            )
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let fs = PseudoFS()
             var languageLprojPathPairs: [(String, Path)] = []
@@ -663,31 +732,38 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("MyFolder"),
                         TestFile("MyPackage.myPackage"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
                             "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "INSTALLLOC_DIRECTORY_CONTENTS": "YES"
-                        ]),
+                            "INSTALLLOC_DIRECTORY_CONTENTS": "YES",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "App",
                         type: .application,
                         buildPhases: [
-                            TestResourcesBuildPhase([
-                                "MyFolder",
-                                "MyPackage.myPackage"
-                            ], onlyForDeployment: false)
+                            TestResourcesBuildPhase(
+                                [
+                                    "MyFolder",
+                                    "MyPackage.myPackage",
+                                ],
+                                onlyForDeployment: false
+                            )
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let fs = PseudoFS()
             var languageComponentPathGroupings: [(lang: String, component: String, path: Path)] = []
@@ -775,31 +851,40 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("MyFolder"),
                         TestFile("MyPackage.myPackage"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
                             "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "INSTALLLOC_DIRECTORY_CONTENTS": "YES"
-                        ]),
+                            "INSTALLLOC_DIRECTORY_CONTENTS": "YES",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "App",
                         type: .application,
                         buildPhases: [
-                            TestCopyFilesBuildPhase([
-                                "MyFolder",
-                                "MyPackage.myPackage"
-                            ], destinationSubfolder: .absolute, destinationSubpath: "/tmp/CustomPath", onlyForDeployment: false)
+                            TestCopyFilesBuildPhase(
+                                [
+                                    "MyFolder",
+                                    "MyPackage.myPackage",
+                                ],
+                                destinationSubfolder: .absolute,
+                                destinationSubpath: "/tmp/CustomPath",
+                                onlyForDeployment: false
+                            )
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let fs = PseudoFS()
             var languageComponentPathGroupings: [(lang: String, component: String, path: Path)] = []
@@ -883,34 +968,44 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("CoreFoo.framework"),
-                    TestVariantGroup("Localizable.strings", children: [
-                        TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
-                        TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja"),
-                    ]),
-                ]),
+                    TestVariantGroup(
+                        "Localizable.strings",
+                        children: [
+                            TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
+                            TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja"),
+                        ]
+                    ),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT" : "iphoneos",
-                    ]),
+                        "SDKROOT": "iphoneos",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildPhases: [
-                        TestCopyFilesBuildPhase([
-                            "CoreFoo.framework",
-                        ], destinationSubfolder: .frameworks, onlyForDeployment: false
-                                               ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "CoreFoo.framework"
+                            ],
+                            destinationSubfolder: .frameworks,
+                            onlyForDeployment: false
+                        )
                     ]
                 )
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(BuildParameters(action: .installLoc, configuration: "Debug"), runDestination: .iOS) { results in
@@ -932,32 +1027,44 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestVariantGroup("Localizable.strings", children: [
-                        TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
-                        TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja"),
-                        TestFile("zh_TW.lproj/Localizable.strings", regionVariantName: "zh_TW"),
-                    ]),
-                ]),
+                    TestVariantGroup(
+                        "Localizable.strings",
+                        children: [
+                            TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
+                            TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja"),
+                            TestFile("zh_TW.lproj/Localizable.strings", regionVariantName: "zh_TW"),
+                        ]
+                    )
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT" : "iphoneos",
-                    ]),
+                        "SDKROOT": "iphoneos",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [
-                        TestCopyFilesBuildPhase([
-                            "Localizable.strings",
-                        ], destinationSubfolder: .resources, onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Localizable.strings"
+                            ],
+                            destinationSubfolder: .resources,
+                            onlyForDeployment: false
+                        )
                     ]
                 )
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // When installing Japanese, we should only get Japanese content.
@@ -1019,48 +1126,62 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestVariantGroup("Localizable.strings", children: [
-                        TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
-                        TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja"),
-                        TestFile("zh_TW.lproj/Localizable.strings", regionVariantName: "zh_TW"),
-                    ]),
-                ]),
+                    TestVariantGroup(
+                        "Localizable.strings",
+                        children: [
+                            TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
+                            TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja"),
+                            TestFile("zh_TW.lproj/Localizable.strings", regionVariantName: "zh_TW"),
+                        ]
+                    )
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT" : "iphoneos",
-                    ]),
+                        "SDKROOT": "iphoneos",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildPhases: [
-                        TestCopyFilesBuildPhase([
-                            "CoreFoo.framework",
-                        ], destinationSubfolder: .frameworks, onlyForDeployment: false
-                                               ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "CoreFoo.framework"
+                            ],
+                            destinationSubfolder: .frameworks,
+                            onlyForDeployment: false
+                        )
                     ],
                     dependencies: ["CoreFoo"]
                 ),
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
                             "Localizable.strings"
-                        ]),
+                        ])
                     ]
-                )
-            ])
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(BuildParameters(action: .installLoc, configuration: "Debug"), runDestination: .iOS) { results in
@@ -1130,70 +1251,89 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
 
     @Test(.requireSDKs(.iOS))
     func installLocForAppAndEmbeddedProductsInWorkspace() async throws {
-        let testWorkspace = TestWorkspace("aWorkspace", projects: [
-            TestProject(
-                "aProject",
-                groupTree: TestGroup(
-                    "Frameworks",
-                    children: [
-                        TestFile("CoreFoo.framework", sourceTree: .buildSetting("BUILT_PRODUCTS_DIR")),
-                    ]),
-                buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "SDKROOT" : "iphoneos",
-                        ]),
-                ],
-                targets: [
-                    TestStandardTarget(
-                        "App",
-                        type: .application,
-                        buildPhases: [
-                            TestCopyFilesBuildPhase([
-                                "CoreFoo.framework",
-                            ], destinationSubfolder: .frameworks, onlyForDeployment: false
-                                                   ),
+        let testWorkspace = TestWorkspace(
+            "aWorkspace",
+            projects: [
+                TestProject(
+                    "aProject",
+                    groupTree: TestGroup(
+                        "Frameworks",
+                        children: [
+                            TestFile("CoreFoo.framework", sourceTree: .buildSetting("BUILT_PRODUCTS_DIR"))
                         ]
-                    )
-                ]),
-            TestProject(
-                "bProject",
-                groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
-                    children: [
-                        TestVariantGroup("Localizable.strings", children: [
-                            TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
-                            TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja"),
-                            TestFile("zh_TW.lproj/Localizable.strings", regionVariantName: "zh_TW"),
-                        ]),
-                    ]),
-                buildConfigurations: [
-                    TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "SDKROOT" : "iphoneos",
-                        ]),
-                ],
-                targets: [
-                    TestStandardTarget(
-                        "CoreFoo", type: .framework,
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "SKIP_INSTALL": "YES",
-                            ]),
-                        ],
-                        buildPhases: [
-                            TestResourcesBuildPhase([
-                                "Localizable.strings"
-                            ]),
+                    ),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SDKROOT": "iphoneos",
+                            ]
+                        )
+                    ],
+                    targets: [
+                        TestStandardTarget(
+                            "App",
+                            type: .application,
+                            buildPhases: [
+                                TestCopyFilesBuildPhase(
+                                    [
+                                        "CoreFoo.framework"
+                                    ],
+                                    destinationSubfolder: .frameworks,
+                                    onlyForDeployment: false
+                                )
+                            ]
+                        )
+                    ]
+                ),
+                TestProject(
+                    "bProject",
+                    groupTree: TestGroup(
+                        "SomeFiles",
+                        path: "Sources",
+                        children: [
+                            TestVariantGroup(
+                                "Localizable.strings",
+                                children: [
+                                    TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
+                                    TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja"),
+                                    TestFile("zh_TW.lproj/Localizable.strings", regionVariantName: "zh_TW"),
+                                ]
+                            )
                         ]
-                    )
-                ]
-            )
-        ])
+                    ),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SDKROOT": "iphoneos",
+                            ]
+                        )
+                    ],
+                    targets: [
+                        TestStandardTarget(
+                            "CoreFoo",
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "SKIP_INSTALL": "YES"
+                                    ]
+                                )
+                            ],
+                            buildPhases: [
+                                TestResourcesBuildPhase([
+                                    "Localizable.strings"
+                                ])
+                            ]
+                        )
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
         let buildParameters = BuildParameters(action: .installLoc, configuration: "Debug")
@@ -1283,16 +1423,19 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("Settings.bundle")
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
+                            "PRODUCT_NAME": "$(TARGET_NAME)"
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -1301,9 +1444,11 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                         buildPhases: [
                             TestResourcesBuildPhase([
                                 "Settings.bundle"
-                            ]),
-                        ])
-                ])
+                            ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let fs = PseudoFS()
             var languageLprojPathPairs: [(String, Path)] = []
@@ -1385,25 +1530,30 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("Settings.bundle")
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
+                            "PRODUCT_NAME": "$(TARGET_NAME)"
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "App",
                         type: .application,
                         buildPhases: [
-                            TestCopyFilesBuildPhase(["Settings.bundle"], destinationSubfolder: .resources, onlyForDeployment: false),
-                        ])
-                ])
+                            TestCopyFilesBuildPhase(["Settings.bundle"], destinationSubfolder: .resources, onlyForDeployment: false)
+                        ]
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let fs = PseudoFS()
             var languageLprojPathPairs: [(String, Path)] = []
@@ -1485,16 +1635,19 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("ReleaseSettings.bundle")
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
+                            "PRODUCT_NAME": "$(TARGET_NAME)"
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -1503,9 +1656,11 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                         buildPhases: [
                             TestResourcesBuildPhase([
                                 "ReleaseSettings.bundle"
-                            ]),
-                        ])
-                ])
+                            ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let fs = PseudoFS()
             let path = srcRoot.join("Sources/ReleaseSettings.bundle/en.lproj", preserveRoot: true, normalize: true)
@@ -1582,7 +1737,8 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                         TestShellScriptBuildPhase(name: "", shellPath: "/bin/bash", originalObjectID: "abc", contents: "env | sort", onlyForDeployment: false, emitEnvironment: true, alwaysOutOfDate: true)
                     ]
                 )
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(BuildParameters(action: .installLoc, configuration: "Debug"), runDestination: .macOS) { results in
@@ -1620,32 +1776,40 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
             groupTree: TestGroup(
                 "SomeFiles",
                 children: [
-                    TestVariantGroup("Localizable.strings", children: [
-                        TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
-                        TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja"),
-                        TestFile("it.lproj/Localizable.strings", regionVariantName: "it"),
-                    ]),
-                ]),
+                    TestVariantGroup(
+                        "Localizable.strings",
+                        children: [
+                            TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
+                            TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja"),
+                            TestFile("it.lproj/Localizable.strings", regionVariantName: "it"),
+                        ]
+                    )
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)"
-                ]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "FrameworkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release"),
+                        TestBuildConfiguration("Release")
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
                             "Localizable.strings"
-                        ]),
+                        ])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // For localization builds, we expect all the necessary directories and localizable files to be created.
@@ -1710,46 +1874,59 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("MyFramework.h"),
                     TestFile("PublicHeader.h"),
                     TestFile("PrivateHeader.h"),
                     TestFile("SourceFile.m"),
-                    TestVariantGroup("Localizable.strings", children: [
-                        TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
-                        TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja"),
-                        TestFile("zh_TW.lproj/Localizable.strings", regionVariantName: "zh_TW"),
-                    ]),
-                ]),
+                    TestVariantGroup(
+                        "Localizable.strings",
+                        children: [
+                            TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
+                            TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja"),
+                            TestFile("zh_TW.lproj/Localizable.strings", regionVariantName: "zh_TW"),
+                        ]
+                    ),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT" : "iphoneos",
-                    ]),
+                        "SDKROOT": "iphoneos",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildPhases: [
-                        TestCopyFilesBuildPhase([
-                            "CoreFoo.framework",
-                        ], destinationSubfolder: .frameworks, onlyForDeployment: false
-                                               ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "CoreFoo.framework"
+                            ],
+                            destinationSubfolder: .frameworks,
+                            onlyForDeployment: false
+                        )
                     ],
                     dependencies: ["CoreFoo"]
                 ),
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "ENABLE_MODULE_VERIFIER": "YES",
-                            "DEFINES_MODULE": "YES"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "ENABLE_MODULE_VERIFIER": "YES",
+                                "DEFINES_MODULE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
@@ -1761,8 +1938,9 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                             "Localizable.strings"
                         ]),
                     ]
-                )
-            ])
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(BuildParameters(action: .installLoc, configuration: "Debug"), runDestination: .iOS) { results in
@@ -1847,7 +2025,8 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                     // Test target sources
                     TestFile("TestOne.swift"),
                     TestFile("TestTwo.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -1856,16 +2035,20 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                         "SDKROOT": "macosx",
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": "5.0",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "UnitTestTarget",
                     type: .unitTest,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "INFOPLIST_FILE": "UnitTestTarget-Info.plist"]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "UnitTestTarget-Info.plist"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -1873,8 +2056,8 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                             "TestTwo.swift",
                         ]),
                         TestFrameworksBuildPhase([
-                            "FrameworkTarget.framework",
-                        ])
+                            "FrameworkTarget.framework"
+                        ]),
                     ],
                     dependencies: ["FrameworkTarget"]
                 ),
@@ -1882,18 +2065,18 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                     "FrameworkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "FrameworkTarget-Info.plist"]),
+                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "FrameworkTarget-Info.plist"])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "ClassOne.swift",
                             "ClassTwo.swift",
                         ]),
-                        TestFrameworksBuildPhase([
-                        ])
+                        TestFrameworksBuildPhase([]),
                     ]
                 ),
-            ])
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -1940,25 +2123,30 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                     TestFile("SwiftyJSON.swift"),
                     TestFile("app.swift"),
                     TestFile("appex.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "",
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "4.2",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "USE_HEADERMAP": "NO",
-                    "SKIP_INSTALL": "YES",
-                    "MACOSX_DEPLOYMENT_TARGET": "10.15",
-                    "IPHONEOS_DEPLOYMENT_TARGET": "13.0",
-                    "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                    "SUPPORTS_MACCATALYST": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "",
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": "4.2",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "USE_HEADERMAP": "NO",
+                        "SKIP_INSTALL": "YES",
+                        "MACOSX_DEPLOYMENT_TARGET": "10.15",
+                        "IPHONEOS_DEPLOYMENT_TARGET": "13.0",
+                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                        "SUPPORTS_MACCATALYST": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "app", type: .application,
+                    "app",
+                    type: .application,
                     buildPhases: [
                         TestSourcesBuildPhase(["app.swift"]),
                         TestFrameworksBuildPhase([
@@ -1968,10 +2156,12 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                     dependencies: [
                         "appex",
                         "SwiftyJSON",
-                    ]),
+                    ]
+                ),
 
                 TestStandardTarget(
-                    "appex", type: .applicationExtension,
+                    "appex",
+                    type: .applicationExtension,
                     buildPhases: [
                         TestSourcesBuildPhase(["appex.swift"]),
                         TestFrameworksBuildPhase([
@@ -1979,27 +2169,35 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                         ]),
                     ],
                     dependencies: [
-                        "SwiftyJSON",
-                    ]),
+                        "SwiftyJSON"
+                    ]
+                ),
 
                 TestStandardTarget(
-                    "SwiftyJSON", type: .objectFile,
+                    "SwiftyJSON",
+                    type: .objectFile,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", impartedBuildProperties: TestImpartedBuildProperties(buildSettings: [
-                            "EMBED_PACKAGE_RESOURCE_BUNDLE_NAMES": "FOO",
-                        ]))
+                        TestBuildConfiguration(
+                            "Debug",
+                            impartedBuildProperties: TestImpartedBuildProperties(buildSettings: [
+                                "EMBED_PACKAGE_RESOURCE_BUNDLE_NAMES": "FOO"
+                            ])
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SwiftyJSON.swift"]),
+                        TestSourcesBuildPhase(["SwiftyJSON.swift"])
                     ],
                     dependencies: [
-                        "FOO",
-                    ]),
+                        "FOO"
+                    ]
+                ),
 
                 TestStandardTarget(
-                    "FOO", type: .bundle
+                    "FOO",
+                    type: .bundle
                 ),
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(BuildParameters(action: .installLoc, configuration: "Debug", overrides: ["INSTALLLOC_LANGUAGE": "ja"]), runDestination: .macOS) { results in
@@ -2022,24 +2220,35 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestVariantGroup("AppShortcuts.strings", children: [
-                        TestFile("en.lproj/AppShortcuts.strings", regionVariantName: "en"),
-                        TestFile("de.lproj/AppShortcuts.strings", regionVariantName: "de"),
-                        TestFile("ja.lproj/AppShortcuts.strings", regionVariantName: "ja"),
-                    ]),
-                    TestVariantGroup("Localizable.strings", children: [
-                        TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
-                        TestFile("de.lproj/Localizable.strings", regionVariantName: "de"),
-                        TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja"),
-                    ]),
-                    TestVariantGroup("InfoPlist.strings", children: [
-                        TestFile("en.lproj/InfoPlist.strings", regionVariantName: "en"),
-                        TestFile("de.lproj/InfoPlist.strings", regionVariantName: "de"),
-                        TestFile("ja.lproj/InfoPlist.strings", regionVariantName: "ja"),
-                    ])
-                ]),
+                    TestVariantGroup(
+                        "AppShortcuts.strings",
+                        children: [
+                            TestFile("en.lproj/AppShortcuts.strings", regionVariantName: "en"),
+                            TestFile("de.lproj/AppShortcuts.strings", regionVariantName: "de"),
+                            TestFile("ja.lproj/AppShortcuts.strings", regionVariantName: "ja"),
+                        ]
+                    ),
+                    TestVariantGroup(
+                        "Localizable.strings",
+                        children: [
+                            TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
+                            TestFile("de.lproj/Localizable.strings", regionVariantName: "de"),
+                            TestFile("ja.lproj/Localizable.strings", regionVariantName: "ja"),
+                        ]
+                    ),
+                    TestVariantGroup(
+                        "InfoPlist.strings",
+                        children: [
+                            TestFile("en.lproj/InfoPlist.strings", regionVariantName: "en"),
+                            TestFile("de.lproj/InfoPlist.strings", regionVariantName: "de"),
+                            TestFile("ja.lproj/InfoPlist.strings", regionVariantName: "ja"),
+                        ]
+                    ),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -2049,7 +2258,8 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                         "PRODUCT_BUNDLE_IDENTIFIER": "com.foo.bar",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "SDKROOT": "iphoneos",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -2059,10 +2269,12 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                         TestResourcesBuildPhase([
                             "AppShortcuts.strings",
                             "Localizable.strings",
-                            "InfoPlist.strings"
-                        ]),
-                    ])
-            ])
+                            "InfoPlist.strings",
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(BuildParameters(action: .installLoc, configuration: "Debug"), runDestination: nil) { results in
             // Ignore all Gate tasks.
@@ -2085,32 +2297,36 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchTarget(target), .matchRule(["CopyStringsFile", "/tmp/aProject.dst/Applications/App.app/ja.lproj/InfoPlist.strings", "/tmp/Test/aProject/Sources/ja.lproj/InfoPlist.strings"])) { _ in }
                 results.checkTask(.matchTarget(target), .matchRule(["CopyStringsFile", "/tmp/aProject.dst/Applications/App.app/de.lproj/InfoPlist.strings", "/tmp/Test/aProject/Sources/de.lproj/InfoPlist.strings"])) { _ in }
                 results.checkTask(.matchTarget(target), .matchRuleType("ValidateAppShortcutStringsMetadata")) { task in
-                    task.checkCommandLineContains(["appshortcutstringsprocessor",
-                                                   "--source-file",
-                                                   "/tmp/Test/aProject/Sources/en.lproj/AppShortcuts.strings",
-                                                   "--input-data-path",
-                                                   "path_to_metadata_appintents"])
+                    task.checkCommandLineContains([
+                        "appshortcutstringsprocessor",
+                        "--source-file",
+                        "/tmp/Test/aProject/Sources/en.lproj/AppShortcuts.strings",
+                        "--input-data-path",
+                        "path_to_metadata_appintents",
+                    ])
                 }
                 results.checkTask(.matchRuleType("AppIntentsSSUTraining")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
-                       executableName == "appintentsnltrainingprocessor" {
-                        task.checkCommandLine([executableName.asString,
-                                               "--infoplist-path",
-                                               "/tmp/Test/aProject/Sources/en.lproj/InfoPlist.strings",
-                                               "--temp-dir-path",
-                                               "/tmp/Test/aProject/build/aProject.build/Debug-iphoneos/App.build/ssu",
-                                               "--bundle-id",
-                                               "com.foo.bar",
-                                               "--product-path",
-                                               "/tmp/aProject.dst/Applications/App.app",
-                                               "--extracted-metadata-path",
-                                               "path_to_metadata_appintents",
-                                               "--deployment-postprocessing",
-                                               "--metadata-file-list",
-                                               "/tmp/Test/aProject/build/aProject.build/Debug-iphoneos/App.build/App.DependencyMetadataFileList",
-                                               "--archive-ssu-assets"
-                                              ])
+                        executableName == "appintentsnltrainingprocessor"
+                    {
+                        task.checkCommandLine([
+                            executableName.asString,
+                            "--infoplist-path",
+                            "/tmp/Test/aProject/Sources/en.lproj/InfoPlist.strings",
+                            "--temp-dir-path",
+                            "/tmp/Test/aProject/build/aProject.build/Debug-iphoneos/App.build/ssu",
+                            "--bundle-id",
+                            "com.foo.bar",
+                            "--product-path",
+                            "/tmp/aProject.dst/Applications/App.app",
+                            "--extracted-metadata-path",
+                            "path_to_metadata_appintents",
+                            "--deployment-postprocessing",
+                            "--metadata-file-list",
+                            "/tmp/Test/aProject/build/aProject.build/Debug-iphoneos/App.build/App.DependencyMetadataFileList",
+                            "--archive-ssu-assets",
+                        ])
                     }
 
                     task.checkInputs([
@@ -2120,11 +2336,11 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                         .namePattern(.suffix("App.DependencyMetadataFileList")),
                         .namePattern(.and(.prefix("target-"), .suffix("-ModuleVerifierTaskProducer"))),
                         .namePattern(.and(.prefix("target-"), .suffix("-fused-phase0-copy-bundle-resources"))),
-                        .namePattern(.and(.prefix("target-"), .suffix("-entry")))
+                        .namePattern(.and(.prefix("target-"), .suffix("-entry"))),
                     ])
 
                     task.checkOutputs([
-                        .path("/tmp/Test/aProject/build/aProject.build/Debug-iphoneos/App.build/ssu/root.ssu.yaml"),
+                        .path("/tmp/Test/aProject/build/aProject.build/Debug-iphoneos/App.build/ssu/root.ssu.yaml")
                     ])
 
                     results.checkNoDiagnostics()
@@ -2152,21 +2368,25 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchTarget(target), .matchRule(["CopyStringsFile", "/tmp/aProject.dst/Applications/App.app/de.lproj/AppShortcuts.strings", "/tmp/Test/aProject/Sources/de.lproj/AppShortcuts.strings"])) { _ in }
                 results.checkTask(.matchTarget(target), .matchRule(["CopyStringsFile", "/tmp/aProject.dst/Applications/App.app/de.lproj/InfoPlist.strings", "/tmp/Test/aProject/Sources/de.lproj/InfoPlist.strings"])) { _ in }
                 results.checkTask(.matchTarget(target), .matchRuleType("ValidateAppShortcutStringsMetadata")) { task in
-                    task.checkCommandLineContains(["appshortcutstringsprocessor",
-                                                   "--source-file",
-                                                   "/tmp/Test/aProject/Sources/en.lproj/AppShortcuts.strings",
-                                                   "--input-data-path",
-                                                   "path_to_metadata_appintents"])
+                    task.checkCommandLineContains([
+                        "appshortcutstringsprocessor",
+                        "--source-file",
+                        "/tmp/Test/aProject/Sources/en.lproj/AppShortcuts.strings",
+                        "--input-data-path",
+                        "path_to_metadata_appintents",
+                    ])
                 }
                 results.checkTask(.matchTarget(target), .matchRuleType("AppIntentsSSUTraining")) { task in
-                    task.checkCommandLineContains(["appintentsnltrainingprocessor",
-                                                   "--infoplist-path",
-                                                   "/tmp/Test/aProject/Sources/en.lproj/InfoPlist.strings",
-                                                   "--temp-dir-path",
-                                                   "/tmp/Test/aProject/build/aProject.build/Debug-iphoneos/App.build/ssu",
-                                                   "--extracted-metadata-path",
-                                                   "path_to_metadata_appintents",
-                                                   "--archive-ssu-assets"])
+                    task.checkCommandLineContains([
+                        "appintentsnltrainingprocessor",
+                        "--infoplist-path",
+                        "/tmp/Test/aProject/Sources/en.lproj/InfoPlist.strings",
+                        "--temp-dir-path",
+                        "/tmp/Test/aProject/build/aProject.build/Debug-iphoneos/App.build/ssu",
+                        "--extracted-metadata-path",
+                        "path_to_metadata_appintents",
+                        "--archive-ssu-assets",
+                    ])
                 }
             }
             results.checkNoTask()
@@ -2190,21 +2410,25 @@ fileprivate struct InstallLocTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", "/tmp/Test/aProject/build/aProject.build/Debug-iphoneos/App.build/App.DependencyMetadataFileList"])) { _ in }
                 results.checkTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", "/tmp/Test/aProject/build/aProject.build/Debug-iphoneos/App.build/App.DependencyStaticMetadataFileList"])) { _ in }
                 results.checkTask(.matchTarget(target), .matchRuleType("ValidateAppShortcutStringsMetadata")) { task in
-                    task.checkCommandLineContains(["appshortcutstringsprocessor",
-                                                   "--source-file",
-                                                   "/tmp/Test/aProject/Sources/en.lproj/AppShortcuts.strings",
-                                                   "--input-data-path",
-                                                   "path_to_metadata_appintents"])
+                    task.checkCommandLineContains([
+                        "appshortcutstringsprocessor",
+                        "--source-file",
+                        "/tmp/Test/aProject/Sources/en.lproj/AppShortcuts.strings",
+                        "--input-data-path",
+                        "path_to_metadata_appintents",
+                    ])
                 }
                 results.checkTask(.matchTarget(target), .matchRuleType("AppIntentsSSUTraining")) { task in
-                    task.checkCommandLineContains(["appintentsnltrainingprocessor",
-                                                   "--infoplist-path",
-                                                   "/tmp/Test/aProject/Sources/en.lproj/InfoPlist.strings",
-                                                   "--temp-dir-path",
-                                                   "/tmp/Test/aProject/build/aProject.build/Debug-iphoneos/App.build/ssu",
-                                                   "--extracted-metadata-path",
-                                                   "path_to_metadata_appintents",
-                                                   "--archive-ssu-assets"])
+                    task.checkCommandLineContains([
+                        "appintentsnltrainingprocessor",
+                        "--infoplist-path",
+                        "/tmp/Test/aProject/Sources/en.lproj/InfoPlist.strings",
+                        "--temp-dir-path",
+                        "/tmp/Test/aProject/build/aProject.build/Debug-iphoneos/App.build/ssu",
+                        "--extracted-metadata-path",
+                        "path_to_metadata_appintents",
+                        "--archive-ssu-assets",
+                    ])
                 }
             }
             results.checkNoTask()
diff --git a/Tests/SWBTaskConstructionTests/InstallTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/InstallTaskConstructionTests.swift
index c0a1113f..8717b50b 100644
--- a/Tests/SWBTaskConstructionTests/InstallTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/InstallTaskConstructionTests.swift
@@ -34,7 +34,8 @@ fileprivate struct InstallTaskConstructionTests: CoreBasedTests {
                     TestFile("LibraryOne.m"),
                     TestFile("LibraryTwo.m"),
                     TestFile("LibraryThree.m"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Release",
@@ -42,7 +43,8 @@ fileprivate struct InstallTaskConstructionTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "SDKROOT": "macosx",
                         "BUILD_VARIANTS": "normal profile",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestAggregateTarget(
@@ -64,12 +66,13 @@ fileprivate struct InstallTaskConstructionTests: CoreBasedTests {
                             buildSettings: [
                                 "PRODUCT_NAME": "MyLibrary",
                                 "INSTALL_PATH": "/usr/lib",
-                            ]),
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "LibraryOne.m",
-                        ]),
+                            "LibraryOne.m"
+                        ])
                     ]
                 ),
                 TestStandardTarget(
@@ -82,12 +85,13 @@ fileprivate struct InstallTaskConstructionTests: CoreBasedTests {
                                 "PRODUCT_NAME": "MyLibrary",
                                 "INSTALL_PATH": "/usr/local/lib",
                                 "DONT_CREATE_BUILT_PRODUCTS_DIR_SYMLINKS": "YES",
-                            ]),
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "LibraryTwo.m",
-                        ]),
+                            "LibraryTwo.m"
+                        ])
                     ]
                 ),
                 TestStandardTarget(
@@ -98,14 +102,15 @@ fileprivate struct InstallTaskConstructionTests: CoreBasedTests {
                             "Release",
                             buildSettings: [
                                 "PRODUCT_NAME": "MyLibrary",
-                                "INSTALL_PATH": "",                 // Will cause SKIP_INSTALL to be enabled.
+                                "INSTALL_PATH": "",  // Will cause SKIP_INSTALL to be enabled.
                                 "DONT_CREATE_BUILT_PRODUCTS_DIR_SYMLINKS": "YES",
-                            ]),
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "LibraryThree.m",
-                        ]),
+                            "LibraryThree.m"
+                        ])
                     ]
                 ),
                 // An uninstalled tool which does not have a name collision with the libraries, to further test uninstalled behaviors.
@@ -117,16 +122,18 @@ fileprivate struct InstallTaskConstructionTests: CoreBasedTests {
                             "Release",
                             buildSettings: [
                                 "PRODUCT_NAME": "tool",
-                                "INSTALL_PATH": "",                 // Will cause SKIP_INSTALL to be enabled.
-                            ]),
+                                "INSTALL_PATH": "",  // Will cause SKIP_INSTALL to be enabled.
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "LibraryThree.m",
-                        ]),
+                            "LibraryThree.m"
+                        ])
                     ]
                 ),
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Check the debug build.
@@ -201,7 +208,8 @@ fileprivate struct InstallTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("ClassOne.swift"),
                     TestFile("InstallerSections.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Release",
@@ -210,7 +218,8 @@ fileprivate struct InstallTaskConstructionTests: CoreBasedTests {
                         "SDKROOT": "macosx",
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -220,25 +229,31 @@ fileprivate struct InstallTaskConstructionTests: CoreBasedTests {
                         TestBuildConfiguration(
                             "Release",
                             buildSettings: [
-                                "INSTALL_PATH": "/",
-                            ]),
+                                "INSTALL_PATH": "/"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassOne.swift",
+                            "ClassOne.swift"
                         ]),
-                        TestCopyFilesBuildPhase([
-                            "InstallerSections.plist",
-                        ], destinationSubfolder: .absolute, onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "InstallerSections.plist"
+                            ],
+                            destinationSubfolder: .absolute,
+                            onlyForDeployment: false
+                        ),
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
         // Check a build where the DSTROOT is a string-prefix of the SRCROOT.
         var DSTROOT = tester.workspace.projects[0].sourceRoot.dirname.join(projectNameRoot).str
-        await tester.checkBuild(BuildParameters(action: .install, configuration: "Release", overrides: ["DSTROOT": DSTROOT,]), runDestination: .macOS) { results in
+        await tester.checkBuild(BuildParameters(action: .install, configuration: "Release", overrides: ["DSTROOT": DSTROOT]), runDestination: .macOS) { results in
             results.checkNoDiagnostics()
 
             results.consumeTasksMatchingRuleTypes(["Gate", "WriteAuxiliaryFile", "CreateBuildDirectory", "MkDir", "Strip", "SetOwnerAndGroup", "SetMode", "Touch", "RegisterWithLaunchServices"])
@@ -251,7 +266,7 @@ fileprivate struct InstallTaskConstructionTests: CoreBasedTests {
 
         // Check a build where the DSTROOT is *not* a string-prefix of the SRCROOT.
         DSTROOT = tester.workspace.projects[0].sourceRoot.dirname.join("\(projectNameRoot).dst").str
-        await tester.checkBuild(BuildParameters(action: .install, configuration: "Release", overrides: ["DSTROOT": DSTROOT,]), runDestination: .macOS) { results in
+        await tester.checkBuild(BuildParameters(action: .install, configuration: "Release", overrides: ["DSTROOT": DSTROOT]), runDestination: .macOS) { results in
             results.checkNoDiagnostics()
 
             results.consumeTasksMatchingRuleTypes(["Gate", "WriteAuxiliaryFile", "CreateBuildDirectory", "MkDir", "Strip", "SetOwnerAndGroup", "SetMode", "Touch", "RegisterWithLaunchServices"])
diff --git a/Tests/SWBTaskConstructionTests/IntermediateStubTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/IntermediateStubTaskConstructionTests.swift
index 5cea5930..c2ecfff6 100644
--- a/Tests/SWBTaskConstructionTests/IntermediateStubTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/IntermediateStubTaskConstructionTests.swift
@@ -26,36 +26,48 @@ fileprivate struct IntermediateStubTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Fwk.swift"),
-                ]),
+                    TestFile("Fwk.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SDKROOT": "macosx",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "TAPI_EXEC": tapiToolPath.str,
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SDKROOT": "macosx",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "TAPI_EXEC": tapiToolPath.str,
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.swift"])
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         await tester.checkBuild(BuildParameters(action: .build, configuration: "Debug"), runDestination: .macOS) { results in
             results.checkTask(.matchRuleType("GenerateTAPI")) { task in
-                task.checkInputs([.path("/tmp/Test/aProject/build/Debug/Fwk.framework/Versions/A/Fwk"),
-                                  .namePattern(.suffix("-ProductPostprocessingTaskProducer")),
-                                  .namePattern(.suffix("-entry"))])
-                task.checkOutputs([.path("/tmp/Test/aProject/build/EagerLinkingTBDs/Debug/Fwk.framework/Versions/A/Fwk.tbd"),
-                                   .name("Eager Linking TBD Production /tmp/Test/aProject/build/EagerLinkingTBDs/Debug/Fwk.framework/Versions/A/Fwk.tbd")])
+                task.checkInputs([
+                    .path("/tmp/Test/aProject/build/Debug/Fwk.framework/Versions/A/Fwk"),
+                    .namePattern(.suffix("-ProductPostprocessingTaskProducer")),
+                    .namePattern(.suffix("-entry")),
+                ])
+                task.checkOutputs([
+                    .path("/tmp/Test/aProject/build/EagerLinkingTBDs/Debug/Fwk.framework/Versions/A/Fwk.tbd"),
+                    .name("Eager Linking TBD Production /tmp/Test/aProject/build/EagerLinkingTBDs/Debug/Fwk.framework/Versions/A/Fwk.tbd"),
+                ])
                 task.checkCommandLine([tapiToolPath.str, "stubify", "-isysroot", core.loadSDK(.macOS).path.str, "-F/tmp/Test/aProject/build/Debug", "-L/tmp/Test/aProject/build/Debug", "/tmp/Test/aProject/build/Debug/Fwk.framework/Versions/A/Fwk", "-o", "/tmp/Test/aProject/build/EagerLinkingTBDs/Debug/Fwk.framework/Versions/A/Fwk.tbd"])
             }
         }
@@ -66,28 +78,36 @@ fileprivate struct IntermediateStubTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Fwk.swift"),
-                ]),
+                    TestFile("Fwk.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SDKROOT": "macosx",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SDKROOT": "macosx",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.swift"])
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(BuildParameters(action: .build, configuration: "Debug"), runDestination: .macOS) { results in
             results.checkTask(.matchRule(["GenerateTAPI", "/tmp/Test/aProject/build/Debug/Fwk.framework/Versions/A/Fwk.tbd", "normal", results.runDestinationTargetArchitecture])) { _ in }
@@ -100,28 +120,36 @@ fileprivate struct IntermediateStubTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Fwk.swift"),
-                ]),
+                    TestFile("Fwk.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SDKROOT": "macosx",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "LIBTOOL": libtoolPath.str,
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SDKROOT": "macosx",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "LIBTOOL": libtoolPath.str,
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
                     type: .staticLibrary,
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.swift"])
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(BuildParameters(action: .build, configuration: "Debug"), runDestination: .macOS) { results in
             results.checkNoTask(.matchRuleType("GenerateTAPI"))
@@ -133,28 +161,36 @@ fileprivate struct IntermediateStubTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Fwk.swift"),
-                ]),
+                    TestFile("Fwk.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SDKROOT": "macosx",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "GENERATE_TEXT_BASED_STUBS": "YES",
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SDKROOT": "macosx",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "GENERATE_TEXT_BASED_STUBS": "YES",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.swift"])
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(BuildParameters(action: .build, configuration: "Debug"), runDestination: .macOS) { results in
             results.checkTask(.matchRule(["GenerateTAPI", "/tmp/Test/aProject/build/Debug/Fwk.framework/Versions/A/Fwk.tbd"])) { _ in }
@@ -167,27 +203,35 @@ fileprivate struct IntermediateStubTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Fwk.swift"),
-                ]),
+                    TestFile("Fwk.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SDKROOT": "macosx",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "TAPI_EXEC": tapiToolPath.str,
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SDKROOT": "macosx",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "TAPI_EXEC": tapiToolPath.str,
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.swift"])
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(BuildParameters(action: .build, configuration: "Debug", overrides: ["REEXPORTED_FRAMEWORK_NAMES": "Foundation"]), runDestination: .macOS) { results in
             results.checkNoTask(.matchRuleType("GenerateTAPI"))
diff --git a/Tests/SWBTaskConstructionTests/KernelExtensionTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/KernelExtensionTaskConstructionTests.swift
index 806c0084..85a825e4 100644
--- a/Tests/SWBTaskConstructionTests/KernelExtensionTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/KernelExtensionTaskConstructionTests.swift
@@ -25,32 +25,39 @@ fileprivate struct KernelExtensionTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("File.c"),
-                ]),
+                    TestFile("File.c")
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "aTarget",
                     type: .kernelExtension,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "GENERATE_KERNEL_MODULE_INFO_FILE": "NO",
-                            "PRODUCT_NAME": "KextTest",
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "GENERATE_KERNEL_MODULE_INFO_FILE": "NO",
+                                "PRODUCT_NAME": "KextTest",
 
-                            "MODULE_NAME": "com.apple.dt.KextTest",
-                            "MODULE_START": "KextTest_start",
-                            "MODULE_STOP": "KextTest_stop",
-                            "MODULE_VERSION": "1.0.0d1",
-                        ]),
+                                "MODULE_NAME": "com.apple.dt.KextTest",
+                                "MODULE_START": "KextTest_start",
+                                "MODULE_STOP": "KextTest_stop",
+                                "MODULE_VERSION": "1.0.0d1",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("File.c"),
-                        ]),
-                    ])
-            ])
+                            TestBuildFile("File.c")
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         for macro in ["$(ARCHS_STANDARD)", "$(ARCHS_STANDARD_64_BIT)", "$(ARCHS_STANDARD_INCLUDING_64_BIT)"] {
@@ -68,33 +75,40 @@ fileprivate struct KernelExtensionTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("File.c"),
-                ]),
+                    TestFile("File.c")
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "aTarget",
                     type: .kernelExtension,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "KextTest",
-                            "ARCHS": "x86_64 x86_64h",
-                            "VALID_ARCHS": "$(inherited) x86_64h",
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "KextTest",
+                                "ARCHS": "x86_64 x86_64h",
+                                "VALID_ARCHS": "$(inherited) x86_64h",
 
-                            "MODULE_NAME": "com.apple.dt.KextTest",
-                            "MODULE_START": "KextTest_start",
-                            "MODULE_STOP": "KextTest_stop",
-                            "MODULE_VERSION": "1.0.0d1",
-                        ]),
+                                "MODULE_NAME": "com.apple.dt.KextTest",
+                                "MODULE_START": "KextTest_start",
+                                "MODULE_STOP": "KextTest_stop",
+                                "MODULE_VERSION": "1.0.0d1",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("File.c"),
-                        ]),
-                    ])
-            ])
+                            TestBuildFile("File.c")
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         try await tester.checkBuild(runDestination: .anyMac) { results in
@@ -116,7 +130,8 @@ fileprivate struct KernelExtensionTaskConstructionTests: CoreBasedTests {
                 task.checkCommandLineContains(["-nostdlib"])
                 task.checkCommandLineContains([
                     "-Xlinker", "-kext",
-                    "-lkmodc++", "-lkmod", "-lcc_kext"])
+                    "-lkmodc++", "-lkmod", "-lcc_kext",
+                ])
             }
         }
     }
@@ -127,31 +142,37 @@ fileprivate struct KernelExtensionTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("File.c"),
-                ]),
+                    TestFile("File.c")
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "aTarget",
                     type: .kernelExtension,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "KextTest",
-                            "ARCHS": "x86_64 x86_64h",
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "KextTest",
+                                "ARCHS": "x86_64 x86_64h",
 
-                            "MODULE_NAME": "com.apple.dt.KextTest",
-                            "MODULE_START": "KextTest_start",
-                            "MODULE_STOP": "KextTest_stop",
-                            "MODULE_VERSION": "1.0.0d1",
-                        ]),
+                                "MODULE_NAME": "com.apple.dt.KextTest",
+                                "MODULE_START": "KextTest_start",
+                                "MODULE_STOP": "KextTest_stop",
+                                "MODULE_VERSION": "1.0.0d1",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([
-                        ]),
-                    ])
-            ])
+                        TestSourcesBuildPhase([])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
 
@@ -177,36 +198,39 @@ fileprivate struct KernelExtensionTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
-                children: [
-                ]),
+                "SomeFiles",
+                path: "Sources",
+                children: []
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug",
-                                       buildSettings: [
-                                        "CODE_SIGNING_ALLOWED": "NO",
-                                        "BUILD_VARIANTS": "normal debug profile",
-                                        "EXCLUDED_SOURCE_FILE_NAMES": "*",
-                                        "GENERATE_INFOPLIST_FILE": "YES",
-                                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                                        "SKIP_INSTALL": "YES",
-                                        "MODULE_NAME": "foo",
-                                        "MODULE_START": "foo_start",
-                                        "MODULE_STOP": "foo_stop",
-                                       ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "BUILD_VARIANTS": "normal debug profile",
+                        "EXCLUDED_SOURCE_FILE_NAMES": "*",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SKIP_INSTALL": "YES",
+                        "MODULE_NAME": "foo",
+                        "MODULE_START": "foo_start",
+                        "MODULE_STOP": "foo_stop",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "SomeKext",
                     type: .kernelExtension,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([
-                        ]),
+                        TestSourcesBuildPhase([])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
 
@@ -226,40 +250,50 @@ fileprivate struct KernelExtensionTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("file.fake-x"),
-                ]),
+                    TestFile("file.fake-x")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug",
-                                       buildSettings: [
-                                        "BUILD_VARIANTS": "normal debug profile",
-                                        "GENERATE_INFOPLIST_FILE": "YES",
-                                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                                        "MODULE_NAME": "foo",
-                                        "MODULE_START": "foo_start",
-                                        "MODULE_STOP": "foo_stop",
-                                       ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "BUILD_VARIANTS": "normal debug profile",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "MODULE_NAME": "foo",
+                        "MODULE_START": "foo_start",
+                        "MODULE_STOP": "foo_stop",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "SomeKext",
                     type: .kernelExtension,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "file.fake-x",
-                        ]),
+                            "file.fake-x"
+                        ])
                     ],
                     buildRules: [
-                        TestBuildRule(filePattern: "$(DERIVED_FILE_DIR)/$(PRODUCT_NAME)_info.c", script: "touch \"$SCRIPT_OUTPUT_FILE_0\"", outputs: [
-                            "$(DERIVED_FILE_DIR)/$(FULL_PRODUCT_NAME)_info1.c"
-                        ], runOncePerArchitecture: false)
+                        TestBuildRule(
+                            filePattern: "$(DERIVED_FILE_DIR)/$(PRODUCT_NAME)_info.c",
+                            script: "touch \"$SCRIPT_OUTPUT_FILE_0\"",
+                            outputs: [
+                                "$(DERIVED_FILE_DIR)/$(FULL_PRODUCT_NAME)_info1.c"
+                            ],
+                            runOncePerArchitecture: false
+                        )
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
diff --git a/Tests/SWBTaskConstructionTests/LibtoolTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/LibtoolTaskConstructionTests.swift
index b6242179..0273ef5b 100644
--- a/Tests/SWBTaskConstructionTests/LibtoolTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/LibtoolTaskConstructionTests.swift
@@ -27,23 +27,27 @@ fileprivate struct LibtoolTaskConstructionTests: CoreBasedTests {
             groupTree: TestGroup(
                 "SomeFiles",
                 children: [
-                    TestFile("SourceFile.m"),
-                ]),
+                    TestFile("SourceFile.m")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "LIBTOOL": libtoolPath.str,
-                    "PRODUCT_NAME": "$(TARGET_NAME)"
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "LIBTOOL": libtoolPath.str,
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Deterministic",
                     type: .staticLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: ["LIBTOOL_DETERMINISTIC_MODE": "YES"]),
+                        TestBuildConfiguration("Debug", buildSettings: ["LIBTOOL_DETERMINISTIC_MODE": "YES"])
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SourceFile.m"]),
+                        TestSourcesBuildPhase(["SourceFile.m"])
                     ],
                     dependencies: ["Nondeterministic"]
                 ),
@@ -51,13 +55,14 @@ fileprivate struct LibtoolTaskConstructionTests: CoreBasedTests {
                     "Nondeterministic",
                     type: .staticLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: ["LIBTOOL_DETERMINISTIC_MODE": "NO"]),
+                        TestBuildConfiguration("Debug", buildSettings: ["LIBTOOL_DETERMINISTIC_MODE": "NO"])
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SourceFile.m"]),
+                        TestSourcesBuildPhase(["SourceFile.m"])
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
diff --git a/Tests/SWBTaskConstructionTests/LinkerTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/LinkerTaskConstructionTests.swift
index f19e8e39..46fb4e65 100644
--- a/Tests/SWBTaskConstructionTests/LinkerTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/LinkerTaskConstructionTests.swift
@@ -29,26 +29,31 @@ fileprivate struct LinkerTaskConstructionTests: CoreBasedTests {
                     TestFile("c.c"),
                     TestFile("cxx.cpp"),
                     TestFile("s.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SWIFT_EXEC": try await swiftCompilerPath.str,
-                    "SWIFT_VERSION": try await swiftVersion
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SWIFT_EXEC": try await swiftCompilerPath.str,
+                        "SWIFT_VERSION": try await swiftVersion,
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Library",
                     type: .dynamicLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["c.c", "cxx.cpp", "s.swift"]),
+                        TestSourcesBuildPhase(["c.c", "cxx.cpp", "s.swift"])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
 
@@ -102,28 +107,33 @@ fileprivate struct LinkerTaskConstructionTests: CoreBasedTests {
             groupTree: TestGroup(
                 "SomeFiles",
                 children: [
-                    TestFile("s.swift"),
-                ]),
+                    TestFile("s.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SWIFT_EXEC": try await swiftCompilerPath.str,
-                    "SWIFT_VERSION": try await swiftVersion,
-                    "MACOSX_DEPLOYMENT_TARGET": "10.13"
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SWIFT_EXEC": try await swiftCompilerPath.str,
+                        "SWIFT_VERSION": try await swiftVersion,
+                        "MACOSX_DEPLOYMENT_TARGET": "10.13",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Library",
                     type: .dynamicLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["s.swift"]),
+                        TestSourcesBuildPhase(["s.swift"])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
 
diff --git a/Tests/SWBTaskConstructionTests/MergeableLibraryTests.swift b/Tests/SWBTaskConstructionTests/MergeableLibraryTests.swift
index 4584f5d4..b707bb2c 100644
--- a/Tests/SWBTaskConstructionTests/MergeableLibraryTests.swift
+++ b/Tests/SWBTaskConstructionTests/MergeableLibraryTests.swift
@@ -53,7 +53,8 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
 
                     // Other files
                     TestFile("External.framework"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Config",
@@ -67,7 +68,8 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
                         "TAPI_EXEC": tapiToolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 // App target
@@ -75,22 +77,26 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config"),
+                        TestBuildConfiguration("Config")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Application.swift",
+                            "Application.swift"
                         ]),
                         TestFrameworksBuildPhase([
-                            "MergedFwkTarget.framework",
+                            "MergedFwkTarget.framework"
                         ]),
                         // Embed
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile("MergedFwkTarget.framework", codeSignOnCopy: true),
-                            TestBuildFile("FwkTarget1.framework", codeSignOnCopy: true),
-                            TestBuildFile("FwkTarget2.framework", codeSignOnCopy: true),
-                            TestBuildFile("libDylibTarget1.dylib", codeSignOnCopy: true),
-                        ], destinationSubfolder: .frameworks, onlyForDeployment: false)
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("MergedFwkTarget.framework", codeSignOnCopy: true),
+                                TestBuildFile("FwkTarget1.framework", codeSignOnCopy: true),
+                                TestBuildFile("FwkTarget2.framework", codeSignOnCopy: true),
+                                TestBuildFile("libDylibTarget1.dylib", codeSignOnCopy: true),
+                            ],
+                            destinationSubfolder: .frameworks,
+                            onlyForDeployment: false
+                        ),
                     ],
                     dependencies: ["MergedFwkTarget"]
                 ),
@@ -99,10 +105,12 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "MergedFwkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
-                                               buildSettings: [
-                                                "MERGED_BINARY_TYPE": "automatic",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Config",
+                            buildSettings: [
+                                "MERGED_BINARY_TYPE": "automatic"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -124,45 +132,43 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "FwkTarget1",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config"),
+                        TestBuildConfiguration("Config")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassOne.swift",
-                        ]),
-                        TestFrameworksBuildPhase([
+                            "ClassOne.swift"
                         ]),
+                        TestFrameworksBuildPhase([]),
                     ]
                 ),
                 TestStandardTarget(
                     "FwkTarget2",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config"),
+                        TestBuildConfiguration("Config")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassTwo.swift",
-                        ]),
-                        TestFrameworksBuildPhase([
+                            "ClassTwo.swift"
                         ]),
+                        TestFrameworksBuildPhase([]),
                     ]
                 ),
                 TestStandardTarget(
                     "DylibTarget1",
                     type: .dynamicLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config"),
+                        TestBuildConfiguration("Config")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassThree.swift",
-                        ]),
-                        TestFrameworksBuildPhase([
+                            "ClassThree.swift"
                         ]),
+                        TestFrameworksBuildPhase([]),
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let runDestination = RunDestinationInfo.iOS
@@ -178,21 +184,24 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
             "MkDir",
             "CreateBuildDirectory",
             "ClangStatCache",
-            "LinkAssetCatalogSignature"
+            "LinkAssetCatalogSignature",
         ]
 
         // Test a debug build.  This will just build the merged framework to reexport the frameworks it links against.
         do {
             let buildType = "Debug"
             let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
-            let parameters = BuildParameters(configuration: CONFIGURATION, overrides: [
-                "SYMROOT": SYMROOT,
-                "OBJROOT": OBJROOT,
-                "DSTROOT": DSTROOT,
-                "DEBUG_INFORMATION_FORMAT": "dwarf",        // No dSYM for debug builds
-                "GCC_OPTIMIZATION_LEVEL": "0",
-                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-            ])
+            let parameters = BuildParameters(
+                configuration: CONFIGURATION,
+                overrides: [
+                    "SYMROOT": SYMROOT,
+                    "OBJROOT": OBJROOT,
+                    "DSTROOT": DSTROOT,
+                    "DEBUG_INFORMATION_FORMAT": "dwarf",  // No dSYM for debug builds
+                    "GCC_OPTIMIZATION_LEVEL": "0",
+                    "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                ]
+            )
             let BUILT_PRODUCTS_DIR = "\(SYMROOT)/\(CONFIGURATION)" + (runDestination != .macOS ? "-\(runDestination.platform)" : "")
             // Add all the targets as top-level targets as this can shake out certain kinds of target dependency resolution bugs.
             let targets = tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
@@ -205,12 +214,14 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let FULL_PRODUCT_NAME = "\(targetName).framework"
                     results.checkTarget(targetName) { target in
                         results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                            task.checkCommandLineContains([
-                                ["clang"],
-                                supportsMergeableDebugHook ? ["-add_mergeable_debug_hook"] : [],      // Only passed in debug builds
-                                ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
-                            ].reduce([], +))
-                            task.checkCommandLineDoesNotContain("-make_mergeable")      // Not passed in debug builds
+                            task.checkCommandLineContains(
+                                [
+                                    ["clang"],
+                                    supportsMergeableDebugHook ? ["-add_mergeable_debug_hook"] : [],  // Only passed in debug builds
+                                    ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
+                                ].reduce([], +)
+                            )
+                            task.checkCommandLineDoesNotContain("-make_mergeable")  // Not passed in debug builds
                         }
                         results.checkTask(.matchTarget(target), .matchRuleType("GenerateTAPI")) { _ in }
 
@@ -229,12 +240,14 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let targetName = target.target.name
                     let FULL_PRODUCT_NAME = "\(targetName).dylib"
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            supportsMergeableDebugHook ? ["-add_mergeable_debug_hook"] : [],      // Only passed in debug builds
-                            ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)"],
-                        ].reduce([], +))
-                        task.checkCommandLineDoesNotContain("-make_mergeable")      // Not passed in debug builds
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                supportsMergeableDebugHook ? ["-add_mergeable_debug_hook"] : [],  // Only passed in debug builds
+                                ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)"],
+                            ].reduce([], +)
+                        )
+                        task.checkCommandLineDoesNotContain("-make_mergeable")  // Not passed in debug builds
                     }
 
                     // Even though we aren't building to be mergeable, the re-exporting dance still means we need our custom bundle lookup class.
@@ -253,16 +266,19 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let targetName = target.target.name
                     let FULL_PRODUCT_NAME = "\(targetName).framework"
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-Xlinker", "-rpath", "-Xlinker", "@loader_path/\(reexportedBinariesDirectoryName)"],
-                            ["-Xlinker", "-no_merge_framework", "-Xlinker", "FwkTarget1",
-                             "-Xlinker", "-no_merge_framework", "-Xlinker", "FwkTarget2",
-                             "-Xlinker", "-no_merge-lDylibTarget1",
-                             "-framework", "External",
-                            ],
-                            ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-Xlinker", "-rpath", "-Xlinker", "@loader_path/\(reexportedBinariesDirectoryName)"],
+                                [
+                                    "-Xlinker", "-no_merge_framework", "-Xlinker", "FwkTarget1",
+                                    "-Xlinker", "-no_merge_framework", "-Xlinker", "FwkTarget2",
+                                    "-Xlinker", "-no_merge-lDylibTarget1",
+                                    "-framework", "External",
+                                ],
+                                ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
+                            ].reduce([], +)
+                        )
                         task.checkCommandLineDoesNotContain("-merge_framework")
                         task.checkCommandLineDoesNotContain("-merge-lDylibTarget1")
                         results.checkTaskFollows(task, [.matchTargetName("FwkTarget1"), .matchRuleType("Ld")])
@@ -274,19 +290,22 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         let FWK_FULL_PRODUCT_NAME = "\(fwkTargetName).framework"
                         results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(FWK_FULL_PRODUCT_NAME)) { task in
                             task.checkRuleInfo(["Copy", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(reexportedBinariesDirectoryName)/\(FWK_FULL_PRODUCT_NAME)", "\(BUILT_PRODUCTS_DIR)/\(FWK_FULL_PRODUCT_NAME)"])
-                            task.checkCommandLineContains([
-                                ["builtin-copy"],
-                                ["-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkTargetName)",
-                                 "-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)_CodeSignature",
-                                 "-include_only_subpath", "Info.plist",
-                                ],
-                                ["\(BUILT_PRODUCTS_DIR)/\(FWK_FULL_PRODUCT_NAME)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(reexportedBinariesDirectoryName)"],
-                            ].reduce([], +))
-                            let numberOfIncludeOnlySubpath = task.commandLineAsStrings.filter({ $0 == "-include_only_subpath" } ).count
+                            task.checkCommandLineContains(
+                                [
+                                    ["builtin-copy"],
+                                    [
+                                        "-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkTargetName)",
+                                        "-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)_CodeSignature",
+                                        "-include_only_subpath", "Info.plist",
+                                    ],
+                                    ["\(BUILT_PRODUCTS_DIR)/\(FWK_FULL_PRODUCT_NAME)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(reexportedBinariesDirectoryName)"],
+                                ].reduce([], +)
+                            )
+                            let numberOfIncludeOnlySubpath = task.commandLineAsStrings.filter({ $0 == "-include_only_subpath" }).count
                             #expect(numberOfIncludeOnlySubpath == 3, "Expected 3 -include_only_subpath, found \(numberOfIncludeOnlySubpath): \(Array(task.commandLineAsStrings))")
                             results.checkTaskFollows(task, [.matchTargetName(fwkTargetName), .matchRuleType("Touch")])
                         }
-                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())       // Chop off the trailing '/'
+                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())  // Chop off the trailing '/'
                         results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemPattern(.suffix(signedDir))) { task in
                             task.checkRuleInfo(["CodeSign", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(reexportedBinariesDirectoryName)/\(signedDir)"])
                             task.checkCommandLineContains(["/usr/bin/codesign", "--preserve-metadata=identifier,entitlements,flags", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(reexportedBinariesDirectoryName)/\(signedDir)"])
@@ -320,11 +339,13 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let targetName = target.target.name
                     let FULL_PRODUCT_NAME = "\(targetName).app"
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-framework", "MergedFwkTarget"],
-                            ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-framework", "MergedFwkTarget"],
+                                ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
+                            ].reduce([], +)
+                        )
                         results.checkTaskFollows(task, [.matchTargetName("MergedFwkTarget"), .matchRuleType("Ld")])
                     }
 
@@ -332,14 +353,16 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     for fwkTargetName in ["FwkTarget1", "FwkTarget2"] {
                         let FWK_FULL_PRODUCT_NAME = "\(fwkTargetName).framework"
                         results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(FWK_FULL_PRODUCT_NAME)) { task in
-                            task.checkCommandLineContains([
-                                ["builtin-copy"],
-                                ["-exclude_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkTargetName)"],
-                                ["\(BUILT_PRODUCTS_DIR)/\(FWK_FULL_PRODUCT_NAME)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"]
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["builtin-copy"],
+                                    ["-exclude_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkTargetName)"],
+                                    ["\(BUILT_PRODUCTS_DIR)/\(FWK_FULL_PRODUCT_NAME)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"],
+                                ].reduce([], +)
+                            )
                             results.checkTaskFollows(task, [.matchTargetName(fwkTargetName), .matchRuleType("Touch")])
                         }
-                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())       // Chop off the trailing '/'
+                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())  // Chop off the trailing '/'
                         results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemPattern(.suffix(signedDir))) { task in
                             // --generate-pre-encrypt-hashes is added dynamically in CodeSignTaskAction and is checked in MergeableLibrariesBuildOperationTests.testAutomaticMergedFrameworkCreation()
                             results.checkTaskFollows(task, [.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(FWK_FULL_PRODUCT_NAME)])
@@ -353,7 +376,7 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                             task.checkCommandLineDoesNotContain("-exclude_subpath")
                             results.checkTaskFollows(task, [.matchTargetName(mergedTargetName), .matchRuleType("Touch"), .matchRuleItemBasename("MergedFwkTarget.framework")])
                         }
-                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())       // Chop off the trailing '/'
+                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())  // Chop off the trailing '/'
                         results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemPattern(.suffix(signedDir))) { task in
                             results.checkTaskFollows(task, [.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(FWK_FULL_PRODUCT_NAME)])
                         }
@@ -381,15 +404,18 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
         do {
             let buildType = "Release"
             let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
-            let parameters = BuildParameters(configuration: CONFIGURATION, overrides: [
-                "SYMROOT": SYMROOT,
-                "OBJROOT": OBJROOT,
-                "DSTROOT": DSTROOT,
-                "DEPLOYMENT_POSTPROCESSING": "YES",
-                "DEPLOYMENT_LOCATION": "YES",
-                "GCC_OPTIMIZATION_LEVEL": "s",
-                "SWIFT_OPTIMIZATION_LEVEL": "-O",
-            ])
+            let parameters = BuildParameters(
+                configuration: CONFIGURATION,
+                overrides: [
+                    "SYMROOT": SYMROOT,
+                    "OBJROOT": OBJROOT,
+                    "DSTROOT": DSTROOT,
+                    "DEPLOYMENT_POSTPROCESSING": "YES",
+                    "DEPLOYMENT_LOCATION": "YES",
+                    "GCC_OPTIMIZATION_LEVEL": "s",
+                    "SWIFT_OPTIMIZATION_LEVEL": "-O",
+                ]
+            )
             let BUILT_PRODUCTS_DIR = "\(SYMROOT)/\(CONFIGURATION)" + (runDestination != .macOS ? "-\(runDestination.platform)" : "")
             // Add all the targets as top-level targets as this can shake out certain kinds of target dependency resolution bugs.
             let targets = tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
@@ -403,12 +429,14 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let INSTALL_PATH = "/Library/Frameworks"
                     results.checkTarget(targetName) { target in
                         results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                            task.checkCommandLineContains([
-                                ["clang"],
-                                ["-Xlinker", "-make_mergeable"],
-                                ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
-                            ].reduce([], +))
-                            task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")    // Only passed in debug builds
+                            task.checkCommandLineContains(
+                                [
+                                    ["clang"],
+                                    ["-Xlinker", "-make_mergeable"],
+                                    ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
+                                ].reduce([], +)
+                            )
+                            task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")  // Only passed in debug builds
                         }
                         // Don't generate an intermediate .tbd file for eager linking when we're making the binary mergeable.
                         results.checkNoTask(.matchTarget(target), .matchRuleType("GenerateTAPI"))
@@ -431,12 +459,14 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let FULL_PRODUCT_NAME = "\(targetName).dylib"
                     let INSTALL_PATH = "/usr/local/lib"
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-Xlinker", "-make_mergeable"],
-                            ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)"],
-                        ].reduce([], +))
-                        task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")    // Only passed in debug builds
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-Xlinker", "-make_mergeable"],
+                                ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)"],
+                            ].reduce([], +)
+                        )
+                        task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")  // Only passed in debug builds
                         task.checkCommandLineDoesNotContain(reexportedBinariesDirectoryName)
                     }
                     // Mergeable products should not be stripped.
@@ -459,15 +489,18 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let FULL_PRODUCT_NAME = "\(targetName).framework"
                     let INSTALL_PATH = "/Library/Frameworks"
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-Xlinker", "-merge_framework", "-Xlinker", "FwkTarget1",
-                             "-Xlinker", "-merge_framework", "-Xlinker", "FwkTarget2",
-                             "-Xlinker", "-merge-lDylibTarget1",
-                             "-framework", "External",
-                            ],
-                            ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                [
+                                    "-Xlinker", "-merge_framework", "-Xlinker", "FwkTarget1",
+                                    "-Xlinker", "-merge_framework", "-Xlinker", "FwkTarget2",
+                                    "-Xlinker", "-merge-lDylibTarget1",
+                                    "-framework", "External",
+                                ],
+                                ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
+                            ].reduce([], +)
+                        )
                         task.checkCommandLineDoesNotContain("-no_merge_framework")
                         task.checkCommandLineDoesNotContain("-no_merge-lDylibTarget1")
                         results.checkTaskFollows(task, [.matchTargetName("FwkTarget1"), .matchRuleType("Ld")])
@@ -494,11 +527,13 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let FULL_PRODUCT_NAME = "\(targetName).app"
                     let INSTALL_PATH = "/Applications"
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-framework", "MergedFwkTarget"],
-                            ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-framework", "MergedFwkTarget"],
+                                ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
+                            ].reduce([], +)
+                        )
                         results.checkTaskFollows(task, [.matchTargetName("MergedFwkTarget"), .matchRuleType("Ld")])
                     }
 
@@ -506,14 +541,16 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     for fwkTargetName in ["FwkTarget1", "FwkTarget2"] {
                         let FWK_FULL_PRODUCT_NAME = "\(fwkTargetName).framework"
                         results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(FWK_FULL_PRODUCT_NAME)) { task in
-                            task.checkCommandLineContains([
-                                ["builtin-copy"],
-                                ["-exclude_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkTargetName)"],
-                                ["\(BUILT_PRODUCTS_DIR)/\(FWK_FULL_PRODUCT_NAME)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"]
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["builtin-copy"],
+                                    ["-exclude_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkTargetName)"],
+                                    ["\(BUILT_PRODUCTS_DIR)/\(FWK_FULL_PRODUCT_NAME)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"],
+                                ].reduce([], +)
+                            )
                             results.checkTaskFollows(task, [.matchTargetName(fwkTargetName), .matchRuleType("Touch")])
                         }
-                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())       // Chop off the trailing '/'
+                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())  // Chop off the trailing '/'
                         results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemPattern(.suffix(signedDir))) { task in
                             // --generate-pre-encrypt-hashes is added dynamically in CodeSignTaskAction and is checked in MergeableLibrariesBuildOperationTests.testAutomaticMergedFrameworkCreation()
                             results.checkTaskFollows(task, [.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(FWK_FULL_PRODUCT_NAME)])
@@ -525,14 +562,16 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         let fwkTargetName = "MergedFwkTarget"
                         let FWK_FULL_PRODUCT_NAME = "\(fwkTargetName).framework"
                         results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(FWK_FULL_PRODUCT_NAME)) { task in
-                            task.checkCommandLineContains([
-                                ["builtin-copy"],
-                                ["\(BUILT_PRODUCTS_DIR)/\(FWK_FULL_PRODUCT_NAME)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"]
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["builtin-copy"],
+                                    ["\(BUILT_PRODUCTS_DIR)/\(FWK_FULL_PRODUCT_NAME)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"],
+                                ].reduce([], +)
+                            )
                             task.checkCommandLineDoesNotContain("-exclude_subpath")
                             results.checkTaskFollows(task, [.matchTargetName(fwkTargetName), .matchRuleType("Touch")])
                         }
-                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())       // Chop off the trailing '/'
+                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())  // Chop off the trailing '/'
                         results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemPattern(.suffix(signedDir))) { task in
                             results.checkTaskFollows(task, [.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(FWK_FULL_PRODUCT_NAME)])
                         }
@@ -571,7 +610,8 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
 
                     // Mergeable framework and library sources
                     TestFile("ClassOne.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Config",
@@ -585,7 +625,8 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
                         "TAPI_EXEC": tapiToolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 // App target
@@ -593,20 +634,24 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config"),
+                        TestBuildConfiguration("Config")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Application.swift",
+                            "Application.swift"
                         ]),
                         TestFrameworksBuildPhase([
-                            "MergedFwkTarget.framework",
+                            "MergedFwkTarget.framework"
                         ]),
                         // Embed
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile("MergedFwkTarget.framework", codeSignOnCopy: true),
-                            TestBuildFile("FwkTarget1.framework", codeSignOnCopy: true),
-                        ], destinationSubfolder: .frameworks, onlyForDeployment: false)
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("MergedFwkTarget.framework", codeSignOnCopy: true),
+                                TestBuildFile("FwkTarget1.framework", codeSignOnCopy: true),
+                            ],
+                            destinationSubfolder: .frameworks,
+                            onlyForDeployment: false
+                        ),
                     ],
                     dependencies: ["MergedFwkTarget"]
                 ),
@@ -615,17 +660,19 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "MergedFwkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
-                                               buildSettings: [
-                                                "MERGED_BINARY_TYPE": "automatic",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Config",
+                            buildSettings: [
+                                "MERGED_BINARY_TYPE": "automatic"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             // There are intentionally no sources for this target, since a common mode is to have a merged framework which does nothing but merge several other frameworks together.
                         ]),
                         TestFrameworksBuildPhase([
-                            "FwkTarget1.framework",
+                            "FwkTarget1.framework"
                         ]),
                     ],
                     // We want to test both explicit and implicit dependencies so not all targets are listed here.
@@ -636,17 +683,17 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "FwkTarget1",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config"),
+                        TestBuildConfiguration("Config")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassOne.swift",
-                        ]),
-                        TestFrameworksBuildPhase([
+                            "ClassOne.swift"
                         ]),
+                        TestFrameworksBuildPhase([]),
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let runDestination = RunDestinationInfo.macOS
@@ -660,14 +707,17 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
         do {
             let buildType = "Debug"
             let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
-            let parameters = BuildParameters(configuration: CONFIGURATION, overrides: [
-                "SYMROOT": SYMROOT,
-                "OBJROOT": OBJROOT,
-                "DSTROOT": DSTROOT,
-                "DEBUG_INFORMATION_FORMAT": "dwarf",        // No dSYM for debug builds
-                "GCC_OPTIMIZATION_LEVEL": "0",
-                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-            ])
+            let parameters = BuildParameters(
+                configuration: CONFIGURATION,
+                overrides: [
+                    "SYMROOT": SYMROOT,
+                    "OBJROOT": OBJROOT,
+                    "DSTROOT": DSTROOT,
+                    "DEBUG_INFORMATION_FORMAT": "dwarf",  // No dSYM for debug builds
+                    "GCC_OPTIMIZATION_LEVEL": "0",
+                    "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                ]
+            )
             let BUILT_PRODUCTS_DIR = "\(SYMROOT)/\(CONFIGURATION)" + (runDestination != .macOS ? "-\(runDestination.platform)" : "")
             // Add all the targets as top-level targets as this can shake out certain kinds of target dependency resolution bugs.
             let targets = tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
@@ -681,12 +731,14 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let FULL_PRODUCT_NAME = "\(targetName).framework"
                     results.checkTarget(targetName) { target in
                         results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                            task.checkCommandLineContains([
-                                ["clang"],
-                                supportsMergeableDebugHook ? ["-add_mergeable_debug_hook"] : [],      // Only passed in debug builds
-                                ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
-                            ].reduce([], +))
-                            task.checkCommandLineDoesNotContain("-make_mergeable")      // Not passed in debug builds
+                            task.checkCommandLineContains(
+                                [
+                                    ["clang"],
+                                    supportsMergeableDebugHook ? ["-add_mergeable_debug_hook"] : [],  // Only passed in debug builds
+                                    ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
+                                ].reduce([], +)
+                            )
+                            task.checkCommandLineDoesNotContain("-make_mergeable")  // Not passed in debug builds
                         }
                         results.checkTask(.matchTarget(target), .matchRuleType("GenerateTAPI")) { _ in }
 
@@ -699,12 +751,14 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let targetName = target.target.name
                     let FULL_PRODUCT_NAME = "\(targetName).framework"
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-Xlinker", "-rpath", "-Xlinker", "@loader_path/\(reexportedBinariesDirectoryName)"],
-                            ["-Xlinker", "-no_merge_framework", "-Xlinker", "FwkTarget1"],
-                            ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-Xlinker", "-rpath", "-Xlinker", "@loader_path/\(reexportedBinariesDirectoryName)"],
+                                ["-Xlinker", "-no_merge_framework", "-Xlinker", "FwkTarget1"],
+                                ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
+                            ].reduce([], +)
+                        )
                         task.checkCommandLineDoesNotContain("-merge_framework")
                         results.checkTaskFollows(task, [.matchTargetName("FwkTarget1"), .matchRuleType("Ld")])
                     }
@@ -715,21 +769,24 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         let FWK_FULL_PRODUCT_NAME = "\(fwkTargetName).framework"
                         results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(FWK_FULL_PRODUCT_NAME)) { task in
                             task.checkRuleInfo(["Copy", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(reexportedBinariesDirectoryName)/\(FWK_FULL_PRODUCT_NAME)", "\(BUILT_PRODUCTS_DIR)/\(FWK_FULL_PRODUCT_NAME)"])
-                            task.checkCommandLineContains([
-                                ["builtin-copy"],
-                                ["-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkTargetName)",
-                                 "-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)_CodeSignature",
-                                 "-include_only_subpath", "Versions/A/Resources/Info.plist",
-                                 "-include_only_subpath", fwkTargetName,
-                                 "-include_only_subpath", "Versions/Current",
-                                ],
-                                ["\(BUILT_PRODUCTS_DIR)/\(FWK_FULL_PRODUCT_NAME)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(reexportedBinariesDirectoryName)"],
-                            ].reduce([], +))
-                            let numberOfIncludeOnlySubpath = task.commandLineAsStrings.filter({ $0 == "-include_only_subpath" } ).count
+                            task.checkCommandLineContains(
+                                [
+                                    ["builtin-copy"],
+                                    [
+                                        "-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkTargetName)",
+                                        "-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)_CodeSignature",
+                                        "-include_only_subpath", "Versions/A/Resources/Info.plist",
+                                        "-include_only_subpath", fwkTargetName,
+                                        "-include_only_subpath", "Versions/Current",
+                                    ],
+                                    ["\(BUILT_PRODUCTS_DIR)/\(FWK_FULL_PRODUCT_NAME)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(reexportedBinariesDirectoryName)"],
+                                ].reduce([], +)
+                            )
+                            let numberOfIncludeOnlySubpath = task.commandLineAsStrings.filter({ $0 == "-include_only_subpath" }).count
                             #expect(numberOfIncludeOnlySubpath == 5, "Expected 5 -include_only_subpath, found \(numberOfIncludeOnlySubpath): \(Array(task.commandLineAsStrings))")
                             results.checkTaskFollows(task, [.matchTargetName(fwkTargetName), .matchRuleType("Touch")])
                         }
-                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())       // Chop off the trailing '/'
+                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())  // Chop off the trailing '/'
                         results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemPattern(.suffix(signedDir))) { task in
                             task.checkRuleInfo(["CodeSign", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(reexportedBinariesDirectoryName)/\(signedDir)"])
                             task.checkCommandLineContains(["/usr/bin/codesign", "--preserve-metadata=identifier,entitlements,flags", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(reexportedBinariesDirectoryName)/\(signedDir)"])
@@ -745,11 +802,13 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let targetName = target.target.name
                     let FULL_PRODUCT_NAME = "\(targetName).app"
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-framework", "MergedFwkTarget"],
-                            ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-framework", "MergedFwkTarget"],
+                                ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
+                            ].reduce([], +)
+                        )
                         results.checkTaskFollows(task, [.matchTargetName("MergedFwkTarget"), .matchRuleType("Ld")])
                     }
 
@@ -758,14 +817,16 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         let fwkTargetName = "FwkTarget1"
                         let FWK_FULL_PRODUCT_NAME = "\(fwkTargetName).framework"
                         results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(FWK_FULL_PRODUCT_NAME)) { task in
-                            task.checkCommandLineContains([
-                                ["builtin-copy"],
-                                ["-exclude_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkTargetName)"],
-                                ["\(BUILT_PRODUCTS_DIR)/\(FWK_FULL_PRODUCT_NAME)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"]
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["builtin-copy"],
+                                    ["-exclude_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkTargetName)"],
+                                    ["\(BUILT_PRODUCTS_DIR)/\(FWK_FULL_PRODUCT_NAME)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"],
+                                ].reduce([], +)
+                            )
                             results.checkTaskFollows(task, [.matchTargetName(fwkTargetName), .matchRuleType("Touch")])
                         }
-                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())       // Chop off the trailing '/'
+                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())  // Chop off the trailing '/'
                         results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemPattern(.suffix(signedDir))) { task in
                             // --generate-pre-encrypt-hashes is added dynamically in CodeSignTaskAction and is checked in MergeableLibrariesBuildOperationTests.testAutomaticMergedFrameworkCreation()
                             results.checkTaskFollows(task, [.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(FWK_FULL_PRODUCT_NAME)])
@@ -778,7 +839,7 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                             task.checkCommandLineDoesNotContain("-exclude_subpath")
                             results.checkTaskFollows(task, [.matchTargetName(mergedTargetName), .matchRuleType("Touch"), .matchRuleItemBasename("MergedFwkTarget.framework")])
                         }
-                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())       // Chop off the trailing '/'
+                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())  // Chop off the trailing '/'
                         results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemPattern(.suffix(signedDir))) { task in
                             results.checkTaskFollows(task, [.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(FWK_FULL_PRODUCT_NAME)])
                         }
@@ -799,15 +860,18 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
         do {
             let buildType = "Release"
             let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
-            let parameters = BuildParameters(configuration: CONFIGURATION, overrides: [
-                "SYMROOT": SYMROOT,
-                "OBJROOT": OBJROOT,
-                "DSTROOT": DSTROOT,
-                "DEPLOYMENT_POSTPROCESSING": "YES",
-                "DEPLOYMENT_LOCATION": "YES",
-                "GCC_OPTIMIZATION_LEVEL": "s",
-                "SWIFT_OPTIMIZATION_LEVEL": "-O",
-            ])
+            let parameters = BuildParameters(
+                configuration: CONFIGURATION,
+                overrides: [
+                    "SYMROOT": SYMROOT,
+                    "OBJROOT": OBJROOT,
+                    "DSTROOT": DSTROOT,
+                    "DEPLOYMENT_POSTPROCESSING": "YES",
+                    "DEPLOYMENT_LOCATION": "YES",
+                    "GCC_OPTIMIZATION_LEVEL": "s",
+                    "SWIFT_OPTIMIZATION_LEVEL": "-O",
+                ]
+            )
             let BUILT_PRODUCTS_DIR = "\(SYMROOT)/\(CONFIGURATION)" + (runDestination != .macOS ? "-\(runDestination.platform)" : "")
             // Add all the targets as top-level targets as this can shake out certain kinds of target dependency resolution bugs.
             let targets = tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
@@ -822,12 +886,14 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let INSTALL_PATH = "/Library/Frameworks"
                     results.checkTarget(targetName) { target in
                         results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                            task.checkCommandLineContains([
-                                ["clang"],
-                                ["-Xlinker", "-make_mergeable"],
-                                ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
-                            ].reduce([], +))
-                            task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")    // Only passed in debug builds
+                            task.checkCommandLineContains(
+                                [
+                                    ["clang"],
+                                    ["-Xlinker", "-make_mergeable"],
+                                    ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
+                                ].reduce([], +)
+                            )
+                            task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")  // Only passed in debug builds
                         }
                         // Don't generate an intermediate .tbd file for eager linking when we're making the binary mergeable.
                         results.checkNoTask(.matchTarget(target), .matchRuleType("GenerateTAPI"))
@@ -844,11 +910,13 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let FULL_PRODUCT_NAME = "\(targetName).framework"
                     let INSTALL_PATH = "/Library/Frameworks"
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-Xlinker", "-merge_framework", "-Xlinker", "FwkTarget1"],
-                            ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-Xlinker", "-merge_framework", "-Xlinker", "FwkTarget1"],
+                                ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
+                            ].reduce([], +)
+                        )
                         task.checkCommandLineDoesNotContain("-no_merge_framework")
                         results.checkTaskFollows(task, [.matchTargetName("FwkTarget1"), .matchRuleType("Ld")])
                     }
@@ -868,11 +936,13 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let FULL_PRODUCT_NAME = "\(targetName).app"
                     let INSTALL_PATH = "/Applications"
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-framework", "MergedFwkTarget"],
-                            ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-framework", "MergedFwkTarget"],
+                                ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
+                            ].reduce([], +)
+                        )
                         results.checkTaskFollows(task, [.matchTargetName("MergedFwkTarget"), .matchRuleType("Ld")])
                     }
 
@@ -881,14 +951,16 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         let fwkTargetName = "FwkTarget1"
                         let FWK_FULL_PRODUCT_NAME = "\(fwkTargetName).framework"
                         results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(FWK_FULL_PRODUCT_NAME)) { task in
-                            task.checkCommandLineContains([
-                                ["builtin-copy"],
-                                ["-exclude_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkTargetName)"],
-                                ["\(BUILT_PRODUCTS_DIR)/\(FWK_FULL_PRODUCT_NAME)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"]
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["builtin-copy"],
+                                    ["-exclude_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkTargetName)"],
+                                    ["\(BUILT_PRODUCTS_DIR)/\(FWK_FULL_PRODUCT_NAME)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"],
+                                ].reduce([], +)
+                            )
                             results.checkTaskFollows(task, [.matchTargetName(fwkTargetName), .matchRuleType("Touch")])
                         }
-                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())       // Chop off the trailing '/'
+                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())  // Chop off the trailing '/'
                         results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemPattern(.suffix(signedDir))) { task in
                             // --generate-pre-encrypt-hashes is added dynamically in CodeSignTaskAction and is checked in MergeableLibrariesBuildOperationTests.testAutomaticMergedFrameworkCreation()
                             results.checkTaskFollows(task, [.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(FWK_FULL_PRODUCT_NAME)])
@@ -898,14 +970,16 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         let fwkTargetName = "MergedFwkTarget"
                         let FWK_FULL_PRODUCT_NAME = "\(fwkTargetName).framework"
                         results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(FWK_FULL_PRODUCT_NAME)) { task in
-                            task.checkCommandLineContains([
-                                ["builtin-copy"],
-                                ["\(BUILT_PRODUCTS_DIR)/\(FWK_FULL_PRODUCT_NAME)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"]
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["builtin-copy"],
+                                    ["\(BUILT_PRODUCTS_DIR)/\(FWK_FULL_PRODUCT_NAME)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"],
+                                ].reduce([], +)
+                            )
                             task.checkCommandLineDoesNotContain("-exclude_subpath")
                             results.checkTaskFollows(task, [.matchTargetName(fwkTargetName), .matchRuleType("Touch")])
                         }
-                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())       // Chop off the trailing '/'
+                        let signedDir = String("\(FWK_FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)".dropLast())  // Chop off the trailing '/'
                         results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemPattern(.suffix(signedDir))) { task in
                             results.checkTaskFollows(task, [.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(FWK_FULL_PRODUCT_NAME)])
                         }
@@ -941,7 +1015,8 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
 
                             // Merged framework sources
                             TestFile("FwkTarget.framework", sourceTree: .buildSetting("BUILT_PRODUCTS_DIR")),
-                        ]),
+                        ]
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Config",
@@ -956,7 +1031,8 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                                 "SWIFT_EXEC": swiftCompilerPath.str,
                                 "SWIFT_VERSION": swiftVersion,
                                 "TAPI_EXEC": tapiToolPath.str,
-                            ]),
+                            ]
+                        )
                     ],
                     targets: [
                         // App target
@@ -964,23 +1040,29 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                             "AppTarget",
                             type: .application,
                             buildConfigurations: [
-                                TestBuildConfiguration("Config",
-                                                       buildSettings: [
-                                                        "SKIP_INSTALL": "NO",
-                                                       ]),
+                                TestBuildConfiguration(
+                                    "Config",
+                                    buildSettings: [
+                                        "SKIP_INSTALL": "NO"
+                                    ]
+                                )
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase([
-                                    "Application.swift",
+                                    "Application.swift"
                                 ]),
                                 TestFrameworksBuildPhase([
-                                    "MergedFwkTarget.framework",
+                                    "MergedFwkTarget.framework"
                                 ]),
                                 // Embed
-                                TestCopyFilesBuildPhase([
-                                    TestBuildFile("MergedFwkTarget.framework", codeSignOnCopy: true),
-                                    TestBuildFile(.file("FwkTarget.framework"), codeSignOnCopy: true),
-                                ], destinationSubfolder: .frameworks, onlyForDeployment: false)
+                                TestCopyFilesBuildPhase(
+                                    [
+                                        TestBuildFile("MergedFwkTarget.framework", codeSignOnCopy: true),
+                                        TestBuildFile(.file("FwkTarget.framework"), codeSignOnCopy: true),
+                                    ],
+                                    destinationSubfolder: .frameworks,
+                                    onlyForDeployment: false
+                                ),
                             ],
                             dependencies: ["MergedFwkTarget"]
                         ),
@@ -989,29 +1071,33 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                             "MergedFwkTarget",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Config",
-                                                       buildSettings: [
-                                                        "MERGED_BINARY_TYPE": "automatic",
-                                                       ]),
+                                TestBuildConfiguration(
+                                    "Config",
+                                    buildSettings: [
+                                        "MERGED_BINARY_TYPE": "automatic"
+                                    ]
+                                )
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase([
                                     // There are intentionally no sources for this target, since a common mode is to have a merged framework which does nothing but merge several other frameworks together.
                                 ]),
                                 TestFrameworksBuildPhase([
-                                    TestBuildFile(.file("FwkTarget.framework")),
+                                    TestBuildFile(.file("FwkTarget.framework"))
                                 ]),
                             ]
                         ),
-                    ]),
+                    ]
+                ),
                 TestProject(
                     "FwkProject",
                     groupTree: TestGroup(
                         "SomeFiles",
                         children: [
                             // Mergeable framework sources
-                            TestFile("ClassOne.swift"),
-                        ]),
+                            TestFile("ClassOne.swift")
+                        ]
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Config",
@@ -1026,7 +1112,8 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                                 "SWIFT_EXEC": swiftCompilerPath.str,
                                 "SWIFT_VERSION": swiftVersion,
                                 "TAPI_EXEC": tapiToolPath.str,
-                            ]),
+                            ]
+                        )
                     ],
                     targets: [
                         // Mergeable framework and library targets
@@ -1034,18 +1121,19 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                             "FwkTarget",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Config"),
+                                TestBuildConfiguration("Config")
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase([
-                                    "ClassOne.swift",
-                                ]),
-                                TestFrameworksBuildPhase([
+                                    "ClassOne.swift"
                                 ]),
+                                TestFrameworksBuildPhase([]),
                             ]
-                        ),
-                    ]),
-            ])
+                        )
+                    ]
+                ),
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testWorkspace)
         let supportsMergeableDebugHook = try await linkerSupportsMergeableDebugHook()
@@ -1054,14 +1142,17 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
         do {
             let buildType = "Debug"
             let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
-            let parameters = BuildParameters(configuration: "Config", overrides: [
-                "SYMROOT": SYMROOT,
-                "OBJROOT": OBJROOT,
-                "DSTROOT": DSTROOT,
-                "DEBUG_INFORMATION_FORMAT": "dwarf",        // No dSYM for debug builds
-                "GCC_OPTIMIZATION_LEVEL": "0",
-                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-            ])
+            let parameters = BuildParameters(
+                configuration: "Config",
+                overrides: [
+                    "SYMROOT": SYMROOT,
+                    "OBJROOT": OBJROOT,
+                    "DSTROOT": DSTROOT,
+                    "DEBUG_INFORMATION_FORMAT": "dwarf",  // No dSYM for debug builds
+                    "GCC_OPTIMIZATION_LEVEL": "0",
+                    "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                ]
+            )
             // Add all the targets as top-level targets as this can shake out certain kinds of target dependency resolution bugs.
             let targets = tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
             let request = BuildRequest(parameters: parameters, buildTargets: targets, continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
@@ -1073,12 +1164,14 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let targetName = target.target.name
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
                         task.checkRuleInfo(["Ld", "\(SYMROOT)/Config-iphoneos/\(targetName).framework/\(targetName)", "normal"])
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            supportsMergeableDebugHook ? ["-add_mergeable_debug_hook"] : [],      // Only passed in debug builds
-                            ["-o", "\(SYMROOT)/Config-iphoneos/\(targetName).framework/\(targetName)"],
-                        ].reduce([], +))
-                        task.checkCommandLineDoesNotContain("-make_mergeable")      // Not passed in debug builds
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                supportsMergeableDebugHook ? ["-add_mergeable_debug_hook"] : [],  // Only passed in debug builds
+                                ["-o", "\(SYMROOT)/Config-iphoneos/\(targetName).framework/\(targetName)"],
+                            ].reduce([], +)
+                        )
+                        task.checkCommandLineDoesNotContain("-make_mergeable")  // Not passed in debug builds
                     }
 
                     results.checkTasks(.matchTarget(target), body: { (tasks) -> Void in #expect(tasks.count > 0) })
@@ -1089,12 +1182,14 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let targetName = target.target.name
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
                         task.checkRuleInfo(["Ld", "\(SYMROOT)/Config-iphoneos/\(targetName).framework/\(targetName)", "normal"])
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-Xlinker", "-rpath", "-Xlinker", "@loader_path/\(reexportedBinariesDirectoryName)"],
-                            ["-Xlinker", "-no_merge_framework", "-Xlinker", "FwkTarget"],
-                            ["-o", "\(SYMROOT)/Config-iphoneos/\(targetName).framework/\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-Xlinker", "-rpath", "-Xlinker", "@loader_path/\(reexportedBinariesDirectoryName)"],
+                                ["-Xlinker", "-no_merge_framework", "-Xlinker", "FwkTarget"],
+                                ["-o", "\(SYMROOT)/Config-iphoneos/\(targetName).framework/\(targetName)"],
+                            ].reduce([], +)
+                        )
                         task.checkCommandLineDoesNotContain("-merge_framework")
                         results.checkTaskFollows(task, [.matchTargetName("FwkTarget"), .matchRuleType("Ld")])
                     }
@@ -1102,13 +1197,16 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     // Check that we're copy-and-resigning the mergeable framework.
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("FwkTarget.framework")) { task in
                         task.checkRuleInfo(["Copy", "\(SYMROOT)/Config-iphoneos/\(targetName).framework/\(reexportedBinariesDirectoryName)/FwkTarget.framework", "\(SYMROOT)/Config-iphoneos/FwkTarget.framework"])
-                        task.checkCommandLineContains([
-                            ["builtin-copy"],
-                            ["-include_only_subpath", "FwkTarget",
-                             "-include_only_subpath", "_CodeSignature",
-                            ],
-                            ["\(SYMROOT)/Config-iphoneos/FwkTarget.framework", "\(SYMROOT)/Config-iphoneos/\(targetName).framework/\(reexportedBinariesDirectoryName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["builtin-copy"],
+                                [
+                                    "-include_only_subpath", "FwkTarget",
+                                    "-include_only_subpath", "_CodeSignature",
+                                ],
+                                ["\(SYMROOT)/Config-iphoneos/FwkTarget.framework", "\(SYMROOT)/Config-iphoneos/\(targetName).framework/\(reexportedBinariesDirectoryName)"],
+                            ].reduce([], +)
+                        )
                         results.checkTaskFollows(task, [.matchTargetName("FwkTarget"), .matchRuleType("Touch")])
                     }
                     results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemBasename("FwkTarget.framework")) { task in
@@ -1125,21 +1223,25 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let targetName = target.target.name
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
                         task.checkRuleInfo(["Ld", "\(SYMROOT)/Config-iphoneos/\(targetName).app/\(targetName)", "normal"])
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-framework", "MergedFwkTarget"],
-                            ["-o", "\(SYMROOT)/Config-iphoneos/\(targetName).app/\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-framework", "MergedFwkTarget"],
+                                ["-o", "\(SYMROOT)/Config-iphoneos/\(targetName).app/\(targetName)"],
+                            ].reduce([], +)
+                        )
                         results.checkTaskFollows(task, [.matchTargetName("MergedFwkTarget"), .matchRuleType("Ld")])
                     }
 
                     // Check that we are removing the binary from the mergeable framework (because it got merged into the merged framework), and that we're not doing anything special to the merged framework.
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("FwkTarget.framework")) { task in
-                        task.checkCommandLineContains([
-                            ["builtin-copy"],
-                            ["-exclude_subpath", "FwkTarget"],
-                            ["\(SYMROOT)/Config-iphoneos/FwkTarget.framework", "\(SYMROOT)/Config-iphoneos/\(targetName).app/Frameworks"]
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["builtin-copy"],
+                                ["-exclude_subpath", "FwkTarget"],
+                                ["\(SYMROOT)/Config-iphoneos/FwkTarget.framework", "\(SYMROOT)/Config-iphoneos/\(targetName).app/Frameworks"],
+                            ].reduce([], +)
+                        )
                         results.checkTaskFollows(task, [.matchTargetName("FwkTarget"), .matchRuleType("Touch")])
                     }
                     results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemBasename("FwkTarget.framework")) { task in
@@ -1147,10 +1249,12 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         results.checkTaskFollows(task, [.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("FwkTarget.framework")])
                     }
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("MergedFwkTarget.framework")) { task in
-                        task.checkCommandLineContains([
-                            ["builtin-copy"],
-                            ["\(SYMROOT)/Config-iphoneos/MergedFwkTarget.framework", "\(SYMROOT)/Config-iphoneos/\(targetName).app/Frameworks"]
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["builtin-copy"],
+                                ["\(SYMROOT)/Config-iphoneos/MergedFwkTarget.framework", "\(SYMROOT)/Config-iphoneos/\(targetName).app/Frameworks"],
+                            ].reduce([], +)
+                        )
                         task.checkCommandLineDoesNotContain("-exclude_subpath")
                         results.checkTaskFollows(task, [.matchTargetName("MergedFwkTarget"), .matchRuleType("Touch")])
                     }
@@ -1173,15 +1277,18 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
         do {
             let buildType = "Release"
             let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
-            let parameters = BuildParameters(configuration: "Config", overrides: [
-                "SYMROOT": SYMROOT,
-                "OBJROOT": OBJROOT,
-                "DSTROOT": DSTROOT,
-                "DEPLOYMENT_POSTPROCESSING": "YES",
-                "DEPLOYMENT_LOCATION": "YES",
-                "GCC_OPTIMIZATION_LEVEL": "s",
-                "SWIFT_OPTIMIZATION_LEVEL": "-O",
-            ])
+            let parameters = BuildParameters(
+                configuration: "Config",
+                overrides: [
+                    "SYMROOT": SYMROOT,
+                    "OBJROOT": OBJROOT,
+                    "DSTROOT": DSTROOT,
+                    "DEPLOYMENT_POSTPROCESSING": "YES",
+                    "DEPLOYMENT_LOCATION": "YES",
+                    "GCC_OPTIMIZATION_LEVEL": "s",
+                    "SWIFT_OPTIMIZATION_LEVEL": "-O",
+                ]
+            )
             // Add all the targets as top-level targets as this can shake out certain kinds of target dependency resolution bugs.
             let targets = tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
             let request = BuildRequest(parameters: parameters, buildTargets: targets, continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
@@ -1193,12 +1300,14 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let targetName = target.target.name
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
                         task.checkRuleInfo(["Ld", "\(OBJROOT)/UninstalledProducts/iphoneos/\(targetName).framework/\(targetName)", "normal"])
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-Xlinker", "-make_mergeable"],
-                            ["-o", "\(OBJROOT)/UninstalledProducts/iphoneos/\(targetName).framework/\(targetName)"],
-                        ].reduce([], +))
-                        task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")    // Only passed in debug builds
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-Xlinker", "-make_mergeable"],
+                                ["-o", "\(OBJROOT)/UninstalledProducts/iphoneos/\(targetName).framework/\(targetName)"],
+                            ].reduce([], +)
+                        )
+                        task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")  // Only passed in debug builds
                     }
                     // Don't generate an intermediate .tbd file for eager linking when we're making the binary mergeable.
                     results.checkNoTask(.matchTarget(target), .matchRuleType("GenerateTAPI"))
@@ -1213,11 +1322,13 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let targetName = target.target.name
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
                         task.checkRuleInfo(["Ld", "\(OBJROOT)/UninstalledProducts/iphoneos/\(targetName).framework/\(targetName)", "normal"])
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-Xlinker", "-merge_framework", "-Xlinker", "FwkTarget"],
-                            ["-o", "\(OBJROOT)/UninstalledProducts/iphoneos/\(targetName).framework/\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-Xlinker", "-merge_framework", "-Xlinker", "FwkTarget"],
+                                ["-o", "\(OBJROOT)/UninstalledProducts/iphoneos/\(targetName).framework/\(targetName)"],
+                            ].reduce([], +)
+                        )
                         task.checkCommandLineDoesNotContain("-no_merge_framework")
                         task.checkCommandLineDoesNotContain(reexportedBinariesDirectoryName)
                         results.checkTaskFollows(task, [.matchTargetName("FwkTarget"), .matchRuleType("Ld")])
@@ -1236,21 +1347,25 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let targetName = target.target.name
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
                         task.checkRuleInfo(["Ld", "\(DSTROOT)/Applications/\(targetName).app/\(targetName)", "normal"])
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-framework", "MergedFwkTarget"],
-                            ["-o", "\(DSTROOT)/Applications/\(targetName).app/\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-framework", "MergedFwkTarget"],
+                                ["-o", "\(DSTROOT)/Applications/\(targetName).app/\(targetName)"],
+                            ].reduce([], +)
+                        )
                         results.checkTaskFollows(task, [.matchTargetName("MergedFwkTarget"), .matchRuleType("Ld")])
                     }
 
                     // Check that we are removing the binary from the mergeable framework (because it got merged into the merged framework), and that we're not doing anything special to the merged framework.
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("FwkTarget.framework")) { task in
-                        task.checkCommandLineContains([
-                            ["builtin-copy"],
-                            ["-exclude_subpath", "FwkTarget"],
-                            ["\(SYMROOT)/Config-iphoneos/FwkTarget.framework", "\(DSTROOT)/Applications/\(targetName).app/Frameworks"]
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["builtin-copy"],
+                                ["-exclude_subpath", "FwkTarget"],
+                                ["\(SYMROOT)/Config-iphoneos/FwkTarget.framework", "\(DSTROOT)/Applications/\(targetName).app/Frameworks"],
+                            ].reduce([], +)
+                        )
                         results.checkTaskFollows(task, [.matchTargetName("FwkTarget"), .matchRuleType("Touch")])
                     }
                     results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemBasename("FwkTarget.framework")) { task in
@@ -1258,10 +1373,12 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         results.checkTaskFollows(task, [.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("FwkTarget.framework")])
                     }
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("MergedFwkTarget.framework")) { task in
-                        task.checkCommandLineContains([
-                            ["builtin-copy"],
-                            ["\(SYMROOT)/Config-iphoneos/MergedFwkTarget.framework", "\(DSTROOT)/Applications/\(targetName).app/Frameworks"]
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["builtin-copy"],
+                                ["\(SYMROOT)/Config-iphoneos/MergedFwkTarget.framework", "\(DSTROOT)/Applications/\(targetName).app/Frameworks"],
+                            ].reduce([], +)
+                        )
                         task.checkCommandLineDoesNotContain("-exclude_subpath")
                         results.checkTaskFollows(task, [.matchTargetName("MergedFwkTarget"), .matchRuleType("Touch")])
                     }
@@ -1296,19 +1413,23 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     TestFile("file.c"),
                     TestFile("Framework.xcframework"),
                     TestFile("Dylib.xcframework"),
-                    TestFile("Info.plist")
-                ]),
+                    TestFile("Info.plist"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration(CONFIGURATION, buildSettings: [
-                    "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "COPY_PHASE_STRIP": "NO",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "MERGE_LINKED_LIBRARIES": "$(APP_MERGE_LINKED_LIBRARIES)",      // Builds below can override APP_MERGE_LINKED_LIBRARIES to NO to disable merging.
-                    "APP_MERGE_LINKED_LIBRARIES": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SDKROOT": "auto",
-                ]),
+                TestBuildConfiguration(
+                    CONFIGURATION,
+                    buildSettings: [
+                        "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "COPY_PHASE_STRIP": "NO",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "MERGE_LINKED_LIBRARIES": "$(APP_MERGE_LINKED_LIBRARIES)",  // Builds below can override APP_MERGE_LINKED_LIBRARIES to NO to disable merging.
+                        "APP_MERGE_LINKED_LIBRARIES": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SDKROOT": "auto",
+                    ]
+                )
             ],
             targets: [
                 // Test building an app which links and embeds an xcframework.
@@ -1316,7 +1437,7 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration(CONFIGURATION),
+                        TestBuildConfiguration(CONFIGURATION)
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["file.c"]),
@@ -1324,14 +1445,19 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                             "Framework.xcframework",
                             "Dylib.xcframework",
                         ]),
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile("Framework.xcframework", codeSignOnCopy: true),
-                            TestBuildFile("Dylib.xcframework", codeSignOnCopy: true),
-                        ], destinationSubfolder: .frameworks, onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("Framework.xcframework", codeSignOnCopy: true),
+                                TestBuildFile("Dylib.xcframework", codeSignOnCopy: true),
+                            ],
+                            destinationSubfolder: .frameworks,
+                            onlyForDeployment: false
+                        ),
                     ],
                     dependencies: []
-                ),
-            ])
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1347,20 +1473,26 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
 
         let fwkBaseName = "Framework"
         let fwkFullProductName = "\(fwkBaseName).framework"
-        let fwkXCFramework = try XCFramework(version: XCFramework.mergeableMetadataVersion, libraries: [
-            XCFramework.Library(libraryIdentifier: iosLibraryIdentifier, supportedPlatform: "ios", supportedArchitectures: ["arm64"], platformVariant: nil, libraryPath: Path(fwkFullProductName), binaryPath: Path("\(fwkFullProductName)/\(fwkBaseName)"), headersPath: nil, mergeableMetadata: true),
-            XCFramework.Library(libraryIdentifier: iossimLibraryIdentifier, supportedPlatform: "ios", supportedArchitectures: ["arm64"], platformVariant: "simulator", libraryPath: Path(fwkFullProductName), binaryPath: Path("\(fwkFullProductName)/\(fwkBaseName)"), headersPath: nil),
-        ])
+        let fwkXCFramework = try XCFramework(
+            version: XCFramework.mergeableMetadataVersion,
+            libraries: [
+                XCFramework.Library(libraryIdentifier: iosLibraryIdentifier, supportedPlatform: "ios", supportedArchitectures: ["arm64"], platformVariant: nil, libraryPath: Path(fwkFullProductName), binaryPath: Path("\(fwkFullProductName)/\(fwkBaseName)"), headersPath: nil, mergeableMetadata: true),
+                XCFramework.Library(libraryIdentifier: iossimLibraryIdentifier, supportedPlatform: "ios", supportedArchitectures: ["arm64"], platformVariant: "simulator", libraryPath: Path(fwkFullProductName), binaryPath: Path("\(fwkFullProductName)/\(fwkBaseName)"), headersPath: nil),
+            ]
+        )
         let fwkXCFrameworkPath = Path(SRCROOT).join("\(fwkBaseName).xcframework")
         try fs.createDirectory(fwkXCFrameworkPath, recursive: true)
         try await XCFrameworkTestSupport.writeXCFramework(fwkXCFramework, fs: fs, path: fwkXCFrameworkPath, infoLookup: infoLookup)
 
         let libBaseName = "Dylib"
         let libFullProductName = "lib\(libBaseName).dylib"
-        let libXCFramework = try XCFramework(version: XCFramework.mergeableMetadataVersion, libraries: [
-            XCFramework.Library(libraryIdentifier: iosLibraryIdentifier, supportedPlatform: "ios", supportedArchitectures: ["arm64"], platformVariant: nil, libraryPath: Path(libFullProductName), binaryPath: Path("\(libFullProductName)"), headersPath: nil, mergeableMetadata: true),
-            XCFramework.Library(libraryIdentifier: iossimLibraryIdentifier, supportedPlatform: "ios", supportedArchitectures: ["arm64"], platformVariant: "simulator", libraryPath: Path(libFullProductName), binaryPath: Path("\(libFullProductName)"), headersPath: nil),
-        ])
+        let libXCFramework = try XCFramework(
+            version: XCFramework.mergeableMetadataVersion,
+            libraries: [
+                XCFramework.Library(libraryIdentifier: iosLibraryIdentifier, supportedPlatform: "ios", supportedArchitectures: ["arm64"], platformVariant: nil, libraryPath: Path(libFullProductName), binaryPath: Path("\(libFullProductName)"), headersPath: nil, mergeableMetadata: true),
+                XCFramework.Library(libraryIdentifier: iossimLibraryIdentifier, supportedPlatform: "ios", supportedArchitectures: ["arm64"], platformVariant: "simulator", libraryPath: Path(libFullProductName), binaryPath: Path("\(libFullProductName)"), headersPath: nil),
+            ]
+        )
         let libXCFrameworkPath = Path(SRCROOT).join("\(libBaseName).xcframework")
         try fs.createDirectory(libXCFrameworkPath, recursive: true)
         try await XCFrameworkTestSupport.writeXCFramework(libXCFramework, fs: fs, path: libXCFrameworkPath, infoLookup: infoLookup)
@@ -1370,7 +1502,7 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
             "MkDir",
             "CreateBuildDirectory",
             "ClangStatCache",
-            "LinkAssetCatalogSignature"
+            "LinkAssetCatalogSignature",
         ]
 
         // Check a debug build for iOS device, where we reexport the XCFrameworks.
@@ -1378,15 +1510,18 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
             let runDestination = RunDestinationInfo.iOS
             let buildType = "Debug"
             let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
-            let parameters = BuildParameters(configuration: CONFIGURATION, overrides: [
-                "SYMROOT": SYMROOT,
-                "OBJROOT": OBJROOT,
-                "DSTROOT": DSTROOT,
-                "ARCHS": "arm64",
-                "DEBUG_INFORMATION_FORMAT": "dwarf",        // No dSYM for debug builds
-                "GCC_OPTIMIZATION_LEVEL": "0",
-                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-            ])
+            let parameters = BuildParameters(
+                configuration: CONFIGURATION,
+                overrides: [
+                    "SYMROOT": SYMROOT,
+                    "OBJROOT": OBJROOT,
+                    "DSTROOT": DSTROOT,
+                    "ARCHS": "arm64",
+                    "DEBUG_INFORMATION_FORMAT": "dwarf",  // No dSYM for debug builds
+                    "GCC_OPTIMIZATION_LEVEL": "0",
+                    "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                ]
+            )
             let FWK_CONTENTS_DIR_SUBPATH = runDestination == .macOS ? "Versions/A/" : ""
             let APP_CONTENTS_DIR_SUBPATH = runDestination == .macOS ? "Contents/" : ""
             let APP_EXEC_DIR_SUBPATH = runDestination == .macOS ? "\(APP_CONTENTS_DIR_SUBPATH)MacOS/" : ""
@@ -1410,20 +1545,24 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(fwkBaseName).xcframework")])
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(libBaseName).xcframework")])
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-Xlinker", "-no_merge_framework", "-Xlinker", "\(fwkBaseName)"],
-                            ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-Xlinker", "-no_merge_framework", "-Xlinker", "\(fwkBaseName)"],
+                                ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
+                            ].reduce([], +)
+                        )
                     }
 
                     // Check that we're copying the framework twice, once with its binary and once without.
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItem("\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks/\(fwkFullProductName)")) { task in
-                        task.checkCommandLineContains([
-                            ["builtin-copy"],
-                            ["-exclude_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkBaseName)"],
-                            ["\(fwkXCFrameworkPath.str)/\(iosLibraryIdentifier)/\(fwkFullProductName)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"]
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["builtin-copy"],
+                                ["-exclude_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkBaseName)"],
+                                ["\(fwkXCFrameworkPath.str)/\(iosLibraryIdentifier)/\(fwkFullProductName)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"],
+                            ].reduce([], +)
+                        )
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(fwkBaseName).xcframework")])
                     }
                     results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItem("\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks/\(fwkFullProductName)")) { task in
@@ -1431,15 +1570,18 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     }
 
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItem("\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)ReexportedBinaries/\(fwkFullProductName)")) { task in
-                        task.checkCommandLineContains([
-                            ["builtin-copy"],
-                            ["-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkBaseName)",
-                             "-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)_CodeSignature",
-                             "-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)Info.plist",
-                            ],
-                            ["-strip_subpath", "\(fwkFullProductName)/\(FWK_CONTENTS_DIR_SUBPATH)\(fwkBaseName)"],
-                            ["\(BUILT_PRODUCTS_DIR)/\(fwkFullProductName)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)ReexportedBinaries"]
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["builtin-copy"],
+                                [
+                                    "-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkBaseName)",
+                                    "-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)_CodeSignature",
+                                    "-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)Info.plist",
+                                ],
+                                ["-strip_subpath", "\(fwkFullProductName)/\(FWK_CONTENTS_DIR_SUBPATH)\(fwkBaseName)"],
+                                ["\(BUILT_PRODUCTS_DIR)/\(fwkFullProductName)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)ReexportedBinaries"],
+                            ].reduce([], +)
+                        )
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(fwkBaseName).xcframework")])
                     }
                     results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItem("\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)ReexportedBinaries/\(fwkFullProductName)")) { task in
@@ -1451,11 +1593,13 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
 
                     // Check that we're copying the library only once.
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(libFullProductName)) { task in
-                        task.checkCommandLineContains([
-                            ["builtin-copy"],
-                            ["-strip_subpath", "\(libFullProductName)"],
-                            ["\(BUILT_PRODUCTS_DIR)/\(libFullProductName)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)ReexportedBinaries"]
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["builtin-copy"],
+                                ["-strip_subpath", "\(libFullProductName)"],
+                                ["\(BUILT_PRODUCTS_DIR)/\(libFullProductName)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)ReexportedBinaries"],
+                            ].reduce([], +)
+                        )
                         task.checkCommandLineDoesNotContain("-exclude_subpath")
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(libBaseName).xcframework")])
                     }
@@ -1476,15 +1620,18 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
             let runDestination = RunDestinationInfo.iOSSimulator
             let buildType = "Debug"
             let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
-            let parameters = BuildParameters(configuration: CONFIGURATION, overrides: [
-                "SYMROOT": SYMROOT,
-                "OBJROOT": OBJROOT,
-                "DSTROOT": DSTROOT,
-                "ARCHS": "arm64",
-                "DEBUG_INFORMATION_FORMAT": "dwarf",        // No dSYM for debug builds
-                "GCC_OPTIMIZATION_LEVEL": "0",
-                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-            ])
+            let parameters = BuildParameters(
+                configuration: CONFIGURATION,
+                overrides: [
+                    "SYMROOT": SYMROOT,
+                    "OBJROOT": OBJROOT,
+                    "DSTROOT": DSTROOT,
+                    "ARCHS": "arm64",
+                    "DEBUG_INFORMATION_FORMAT": "dwarf",  // No dSYM for debug builds
+                    "GCC_OPTIMIZATION_LEVEL": "0",
+                    "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                ]
+            )
             //let FWK_CONTENTS_DIR_SUBPATH = runDestination == .macOS ? "Versions/A/" : ""
             let APP_CONTENTS_DIR_SUBPATH = runDestination == .macOS ? "Contents/" : ""
             let APP_EXEC_DIR_SUBPATH = runDestination == .macOS ? "\(APP_CONTENTS_DIR_SUBPATH)MacOS/" : ""
@@ -1508,19 +1655,23 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(fwkBaseName).xcframework")])
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(libBaseName).xcframework")])
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
+                            ].reduce([], +)
+                        )
                         task.checkCommandLineDoesNotContain("-no_merge_framework")
                     }
 
                     // Check that we're copying the framework and library once each.
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(fwkFullProductName)) { task in
-                        task.checkCommandLineContains([
-                            ["builtin-copy"],
-                            ["\(fwkXCFrameworkPath.str)/\(iossimLibraryIdentifier)/\(fwkFullProductName)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"]
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["builtin-copy"],
+                                ["\(fwkXCFrameworkPath.str)/\(iossimLibraryIdentifier)/\(fwkFullProductName)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"],
+                            ].reduce([], +)
+                        )
                         task.checkCommandLineDoesNotContain("-exclude_subpath")
                         task.checkCommandLineDoesNotContain("-include_only_subpath")
                         task.checkCommandLineDoesNotContain("-strip_subpath")
@@ -1531,10 +1682,12 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     }
 
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(libFullProductName)) { task in
-                        task.checkCommandLineContains([
-                            ["builtin-copy"],
-                            ["\(libXCFrameworkPath.str)/\(iossimLibraryIdentifier)/\(libFullProductName)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"]
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["builtin-copy"],
+                                ["\(libXCFrameworkPath.str)/\(iossimLibraryIdentifier)/\(libFullProductName)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"],
+                            ].reduce([], +)
+                        )
                         task.checkCommandLineDoesNotContain("-exclude_subpath")
                         task.checkCommandLineDoesNotContain("-include_only_subpath")
                         task.checkCommandLineDoesNotContain("-strip_subpath")
@@ -1556,16 +1709,19 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
             let runDestination = RunDestinationInfo.iOS
             let buildType = "Release"
             let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
-            let parameters = BuildParameters(configuration: CONFIGURATION, overrides: [
-                "SYMROOT": SYMROOT,
-                "OBJROOT": OBJROOT,
-                "DSTROOT": DSTROOT,
-                "ARCHS": "arm64",
-                "DEPLOYMENT_POSTPROCESSING": "YES",
-                "DEPLOYMENT_LOCATION": "YES",
-                "GCC_OPTIMIZATION_LEVEL": "s",
-                "SWIFT_OPTIMIZATION_LEVEL": "-O",
-            ])
+            let parameters = BuildParameters(
+                configuration: CONFIGURATION,
+                overrides: [
+                    "SYMROOT": SYMROOT,
+                    "OBJROOT": OBJROOT,
+                    "DSTROOT": DSTROOT,
+                    "ARCHS": "arm64",
+                    "DEPLOYMENT_POSTPROCESSING": "YES",
+                    "DEPLOYMENT_LOCATION": "YES",
+                    "GCC_OPTIMIZATION_LEVEL": "s",
+                    "SWIFT_OPTIMIZATION_LEVEL": "-O",
+                ]
+            )
             let FWK_CONTENTS_DIR_SUBPATH = runDestination == .macOS ? "Versions/A/" : ""
             let APP_CONTENTS_DIR_SUBPATH = runDestination == .macOS ? "Contents/" : ""
             let APP_EXEC_DIR_SUBPATH = runDestination == .macOS ? "\(APP_CONTENTS_DIR_SUBPATH)MacOS/" : ""
@@ -1590,20 +1746,24 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         let INSTALL_PATH = "/Applications"
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(fwkBaseName).xcframework")])
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(libBaseName).xcframework")])
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-Xlinker", "-merge_framework", "-Xlinker", "\(fwkBaseName)"],
-                            ["-Xlinker", "-merge-l\(libBaseName)"],
-                            ["-o", "\(DSTROOT)/Applications/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-Xlinker", "-merge_framework", "-Xlinker", "\(fwkBaseName)"],
+                                ["-Xlinker", "-merge-l\(libBaseName)"],
+                                ["-o", "\(DSTROOT)/Applications/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
+                            ].reduce([], +)
+                        )
 
                         // Check that we're copying the framework appropriately.
                         results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(fwkFullProductName)) { task in
-                            task.checkCommandLineContains([
-                                ["builtin-copy"],
-                                ["-exclude_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkBaseName)"],
-                                ["\(fwkXCFrameworkPath.str)/\(iosLibraryIdentifier)/\(fwkFullProductName)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"]
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["builtin-copy"],
+                                    ["-exclude_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkBaseName)"],
+                                    ["\(fwkXCFrameworkPath.str)/\(iosLibraryIdentifier)/\(fwkFullProductName)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"],
+                                ].reduce([], +)
+                            )
                             task.checkCommandLineDoesNotContain("-strip_subpath")
                             results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(fwkBaseName).xcframework")])
                         }
@@ -1628,17 +1788,20 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
             let runDestination = RunDestinationInfo.iOS
             let buildType = "Release"
             let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
-            let parameters = BuildParameters(configuration: CONFIGURATION, overrides: [
-                "SYMROOT": SYMROOT,
-                "OBJROOT": OBJROOT,
-                "DSTROOT": DSTROOT,
-                "ARCHS": "arm64",
-                "DEPLOYMENT_POSTPROCESSING": "YES",
-                "DEPLOYMENT_LOCATION": "YES",
-                "GCC_OPTIMIZATION_LEVEL": "s",
-                "SWIFT_OPTIMIZATION_LEVEL": "-O",
-                "APP_MERGE_LINKED_LIBRARIES": "NO",
-            ])
+            let parameters = BuildParameters(
+                configuration: CONFIGURATION,
+                overrides: [
+                    "SYMROOT": SYMROOT,
+                    "OBJROOT": OBJROOT,
+                    "DSTROOT": DSTROOT,
+                    "ARCHS": "arm64",
+                    "DEPLOYMENT_POSTPROCESSING": "YES",
+                    "DEPLOYMENT_LOCATION": "YES",
+                    "GCC_OPTIMIZATION_LEVEL": "s",
+                    "SWIFT_OPTIMIZATION_LEVEL": "-O",
+                    "APP_MERGE_LINKED_LIBRARIES": "NO",
+                ]
+            )
             let FWK_CONTENTS_DIR_SUBPATH = runDestination == .macOS ? "Versions/A/" : ""
             let APP_CONTENTS_DIR_SUBPATH = runDestination == .macOS ? "Contents/" : ""
             let APP_EXEC_DIR_SUBPATH = runDestination == .macOS ? "\(APP_CONTENTS_DIR_SUBPATH)MacOS/" : ""
@@ -1663,20 +1826,24 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         let INSTALL_PATH = "/Applications"
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(fwkBaseName).xcframework")])
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(libBaseName).xcframework")])
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-framework", "\(fwkBaseName)"],
-                            ["-l\(libBaseName)"],
-                            ["-o", "\(DSTROOT)/Applications/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-framework", "\(fwkBaseName)"],
+                                ["-l\(libBaseName)"],
+                                ["-o", "\(DSTROOT)/Applications/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
+                            ].reduce([], +)
+                        )
 
                         // Check that we're copying both the framework and the library appropriately.
                         results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(fwkFullProductName)) { task in
-                            task.checkCommandLineContains([
-                                ["builtin-copy"],
-                                ["-strip_subpath", "\(fwkFullProductName)/\(FWK_CONTENTS_DIR_SUBPATH)\(fwkBaseName)"],
-                                ["\(fwkXCFrameworkPath.str)/\(iosLibraryIdentifier)/\(fwkFullProductName)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"]
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["builtin-copy"],
+                                    ["-strip_subpath", "\(fwkFullProductName)/\(FWK_CONTENTS_DIR_SUBPATH)\(fwkBaseName)"],
+                                    ["\(fwkXCFrameworkPath.str)/\(iosLibraryIdentifier)/\(fwkFullProductName)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"],
+                                ].reduce([], +)
+                            )
                             task.checkCommandLineDoesNotContain("-exclude_subpath")
                             results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(fwkBaseName).xcframework")])
                         }
@@ -1685,11 +1852,13 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         }
 
                         results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(libFullProductName)) { task in
-                            task.checkCommandLineContains([
-                                ["builtin-copy"],
-                                ["-strip_subpath", "\(libFullProductName)"],
-                                ["\(libXCFrameworkPath.str)/\(iosLibraryIdentifier)/\(libFullProductName)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"]
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["builtin-copy"],
+                                    ["-strip_subpath", "\(libFullProductName)"],
+                                    ["\(libXCFrameworkPath.str)/\(iosLibraryIdentifier)/\(libFullProductName)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"],
+                                ].reduce([], +)
+                            )
                             results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(libBaseName).xcframework")])
                         }
                         results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemPattern(.suffix(libFullProductName))) { task in
@@ -1709,16 +1878,19 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
             let runDestination = RunDestinationInfo.iOSSimulator
             let buildType = "Release"
             let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
-            let parameters = BuildParameters(configuration: CONFIGURATION, overrides: [
-                "SYMROOT": SYMROOT,
-                "OBJROOT": OBJROOT,
-                "DSTROOT": DSTROOT,
-                "ARCHS": "arm64",
-                "DEPLOYMENT_POSTPROCESSING": "YES",
-                "DEPLOYMENT_LOCATION": "YES",
-                "GCC_OPTIMIZATION_LEVEL": "s",
-                "SWIFT_OPTIMIZATION_LEVEL": "-O",
-            ])
+            let parameters = BuildParameters(
+                configuration: CONFIGURATION,
+                overrides: [
+                    "SYMROOT": SYMROOT,
+                    "OBJROOT": OBJROOT,
+                    "DSTROOT": DSTROOT,
+                    "ARCHS": "arm64",
+                    "DEPLOYMENT_POSTPROCESSING": "YES",
+                    "DEPLOYMENT_LOCATION": "YES",
+                    "GCC_OPTIMIZATION_LEVEL": "s",
+                    "SWIFT_OPTIMIZATION_LEVEL": "-O",
+                ]
+            )
             //let FWK_CONTENTS_DIR_SUBPATH = runDestination == .macOS ? "Versions/A/" : ""
             let APP_CONTENTS_DIR_SUBPATH = runDestination == .macOS ? "Contents/" : ""
             let APP_EXEC_DIR_SUBPATH = runDestination == .macOS ? "\(APP_CONTENTS_DIR_SUBPATH)MacOS/" : ""
@@ -1744,20 +1916,24 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(fwkBaseName).xcframework")])
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(libBaseName).xcframework")])
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-framework", "\(fwkBaseName)"],
-                            ["-l\(libBaseName)"],
-                            ["-o", "\(DSTROOT)/Applications/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-framework", "\(fwkBaseName)"],
+                                ["-l\(libBaseName)"],
+                                ["-o", "\(DSTROOT)/Applications/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
+                            ].reduce([], +)
+                        )
                     }
 
                     // Check that we're copying both the framework and the library appropriately.
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(fwkFullProductName)) { task in
-                        task.checkCommandLineContains([
-                            ["builtin-copy"],
-                            ["\(fwkXCFrameworkPath.str)/\(iossimLibraryIdentifier)/\(fwkFullProductName)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"]
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["builtin-copy"],
+                                ["\(fwkXCFrameworkPath.str)/\(iossimLibraryIdentifier)/\(fwkFullProductName)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"],
+                            ].reduce([], +)
+                        )
                         task.checkCommandLineDoesNotContain("-exclude_subpath")
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(fwkBaseName).xcframework")])
                     }
@@ -1766,10 +1942,12 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     }
 
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(libFullProductName)) { task in
-                        task.checkCommandLineContains([
-                            ["builtin-copy"],
-                            ["\(libXCFrameworkPath.str)/\(iossimLibraryIdentifier)/\(libFullProductName)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"]
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["builtin-copy"],
+                                ["\(libXCFrameworkPath.str)/\(iossimLibraryIdentifier)/\(libFullProductName)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"],
+                            ].reduce([], +)
+                        )
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(libBaseName).xcframework")])
                     }
                     results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemPattern(.suffix(libFullProductName))) { task in
@@ -1797,17 +1975,21 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     TestFile("file.c"),
                     TestFile("Framework.xcframework"),
                     TestFile("Dylib.xcframework"),
-                    TestFile("Info.plist")
-                ]),
+                    TestFile("Info.plist"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration(CONFIGURATION, buildSettings: [
-                    "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "MERGE_LINKED_LIBRARIES": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SDKROOT": "auto",
-                ]),
+                TestBuildConfiguration(
+                    CONFIGURATION,
+                    buildSettings: [
+                        "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "MERGE_LINKED_LIBRARIES": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SDKROOT": "auto",
+                    ]
+                )
             ],
             targets: [
                 // Test building an app which links and embeds an xcframework.
@@ -1815,7 +1997,7 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration(CONFIGURATION),
+                        TestBuildConfiguration(CONFIGURATION)
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["file.c"]),
@@ -1823,14 +2005,19 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                             "Framework.xcframework",
                             "Dylib.xcframework",
                         ]),
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile("Framework.xcframework", codeSignOnCopy: true),
-                            TestBuildFile("Dylib.xcframework", codeSignOnCopy: true),
-                        ], destinationSubfolder: .frameworks, onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("Framework.xcframework", codeSignOnCopy: true),
+                                TestBuildFile("Dylib.xcframework", codeSignOnCopy: true),
+                            ],
+                            destinationSubfolder: .frameworks,
+                            onlyForDeployment: false
+                        ),
                     ],
                     dependencies: []
-                ),
-            ])
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1845,18 +2032,24 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
 
         let fwkBaseName = "Framework"
         let fwkFullProductName = "\(fwkBaseName).framework"
-        let fwkXCFramework = try XCFramework(version: XCFramework.mergeableMetadataVersion, libraries: [
-            XCFramework.Library(libraryIdentifier: macosLibraryIdentifier, supportedPlatform: "macos", supportedArchitectures: ["arm64"], platformVariant: nil, libraryPath: Path(fwkFullProductName), binaryPath: Path("\(fwkFullProductName)/Versions/A/\(fwkBaseName)"), headersPath: nil, mergeableMetadata: true),
-        ])
+        let fwkXCFramework = try XCFramework(
+            version: XCFramework.mergeableMetadataVersion,
+            libraries: [
+                XCFramework.Library(libraryIdentifier: macosLibraryIdentifier, supportedPlatform: "macos", supportedArchitectures: ["arm64"], platformVariant: nil, libraryPath: Path(fwkFullProductName), binaryPath: Path("\(fwkFullProductName)/Versions/A/\(fwkBaseName)"), headersPath: nil, mergeableMetadata: true)
+            ]
+        )
         let fwkXCFrameworkPath = Path(SRCROOT).join("\(fwkBaseName).xcframework")
         try fs.createDirectory(fwkXCFrameworkPath, recursive: true)
         try await XCFrameworkTestSupport.writeXCFramework(fwkXCFramework, fs: fs, path: fwkXCFrameworkPath, infoLookup: infoLookup)
 
         let libBaseName = "Dylib"
         let libFullProductName = "lib\(libBaseName).dylib"
-        let libXCFramework = try XCFramework(version: XCFramework.mergeableMetadataVersion, libraries: [
-            XCFramework.Library(libraryIdentifier: macosLibraryIdentifier, supportedPlatform: "macos", supportedArchitectures: ["arm64"], platformVariant: nil, libraryPath: Path(libFullProductName), binaryPath: Path("\(libFullProductName)"), headersPath: nil, mergeableMetadata: true),
-        ])
+        let libXCFramework = try XCFramework(
+            version: XCFramework.mergeableMetadataVersion,
+            libraries: [
+                XCFramework.Library(libraryIdentifier: macosLibraryIdentifier, supportedPlatform: "macos", supportedArchitectures: ["arm64"], platformVariant: nil, libraryPath: Path(libFullProductName), binaryPath: Path("\(libFullProductName)"), headersPath: nil, mergeableMetadata: true)
+            ]
+        )
         let libXCFrameworkPath = Path(SRCROOT).join("\(libBaseName).xcframework")
         try fs.createDirectory(libXCFrameworkPath, recursive: true)
         try await XCFrameworkTestSupport.writeXCFramework(libXCFramework, fs: fs, path: libXCFrameworkPath, infoLookup: infoLookup)
@@ -1866,15 +2059,18 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
             let runDestination = RunDestinationInfo.macOS
             let buildType = "Debug"
             let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
-            let parameters = BuildParameters(configuration: CONFIGURATION, overrides: [
-                "SYMROOT": SYMROOT,
-                "OBJROOT": OBJROOT,
-                "DSTROOT": DSTROOT,
-                "ARCHS": "arm64",
-                "DEBUG_INFORMATION_FORMAT": "dwarf",        // No dSYM for debug builds
-                "GCC_OPTIMIZATION_LEVEL": "0",
-                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-            ])
+            let parameters = BuildParameters(
+                configuration: CONFIGURATION,
+                overrides: [
+                    "SYMROOT": SYMROOT,
+                    "OBJROOT": OBJROOT,
+                    "DSTROOT": DSTROOT,
+                    "ARCHS": "arm64",
+                    "DEBUG_INFORMATION_FORMAT": "dwarf",  // No dSYM for debug builds
+                    "GCC_OPTIMIZATION_LEVEL": "0",
+                    "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                ]
+            )
             let FWK_CONTENTS_DIR_SUBPATH = runDestination == .macOS ? "Versions/A/" : ""
             let APP_CONTENTS_DIR_SUBPATH = runDestination == .macOS ? "Contents/" : ""
             let APP_EXEC_DIR_SUBPATH = runDestination == .macOS ? "\(APP_CONTENTS_DIR_SUBPATH)MacOS/" : ""
@@ -1898,20 +2094,24 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(fwkBaseName).xcframework")])
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(libBaseName).xcframework")])
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-Xlinker", "-no_merge_framework", "-Xlinker", "\(fwkBaseName)"],
-                            ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-Xlinker", "-no_merge_framework", "-Xlinker", "\(fwkBaseName)"],
+                                ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
+                            ].reduce([], +)
+                        )
                     }
 
                     // Check that we're copying the framework twice, once with its binary and once without.
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItem("\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks/\(fwkFullProductName)")) { task in
-                        task.checkCommandLineContains([
-                            ["builtin-copy"],
-                            ["-exclude_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkBaseName)"],
-                            ["\(fwkXCFrameworkPath.str)/\(macosLibraryIdentifier)/\(fwkFullProductName)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"]
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["builtin-copy"],
+                                ["-exclude_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkBaseName)"],
+                                ["\(fwkXCFrameworkPath.str)/\(macosLibraryIdentifier)/\(fwkFullProductName)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"],
+                            ].reduce([], +)
+                        )
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(fwkBaseName).xcframework")])
                     }
                     results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItem("\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks/\(fwkFullProductName)")) { task in
@@ -1919,17 +2119,20 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     }
 
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItem("\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)ReexportedBinaries/\(fwkFullProductName)")) { task in
-                        task.checkCommandLineContains([
-                            ["builtin-copy"],
-                            ["-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkBaseName)",
-                             "-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)_CodeSignature",
-                             "-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)Info.plist",
-                             "-include_only_subpath", "\(fwkBaseName)",
-                             "-include_only_subpath", "Versions/Current",
-                            ],
-                            ["-strip_subpath", "\(fwkFullProductName)/\(FWK_CONTENTS_DIR_SUBPATH)\(fwkBaseName)"],
-                            ["\(BUILT_PRODUCTS_DIR)/\(fwkFullProductName)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)ReexportedBinaries"]
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["builtin-copy"],
+                                [
+                                    "-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkBaseName)",
+                                    "-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)_CodeSignature",
+                                    "-include_only_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)Info.plist",
+                                    "-include_only_subpath", "\(fwkBaseName)",
+                                    "-include_only_subpath", "Versions/Current",
+                                ],
+                                ["-strip_subpath", "\(fwkFullProductName)/\(FWK_CONTENTS_DIR_SUBPATH)\(fwkBaseName)"],
+                                ["\(BUILT_PRODUCTS_DIR)/\(fwkFullProductName)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)ReexportedBinaries"],
+                            ].reduce([], +)
+                        )
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(fwkBaseName).xcframework")])
                     }
                     results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItem("\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)ReexportedBinaries/\(fwkFullProductName)")) { task in
@@ -1941,11 +2144,13 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
 
                     // Check that we're copying the library only once.
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(libFullProductName)) { task in
-                        task.checkCommandLineContains([
-                            ["builtin-copy"],
-                            ["-strip_subpath", "\(libFullProductName)"],
-                            ["\(BUILT_PRODUCTS_DIR)/\(libFullProductName)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)ReexportedBinaries"]
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["builtin-copy"],
+                                ["-strip_subpath", "\(libFullProductName)"],
+                                ["\(BUILT_PRODUCTS_DIR)/\(libFullProductName)", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)ReexportedBinaries"],
+                            ].reduce([], +)
+                        )
                         task.checkCommandLineDoesNotContain("-exclude_subpath")
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(libBaseName).xcframework")])
                     }
@@ -1963,16 +2168,19 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
             let runDestination = RunDestinationInfo.macOS
             let buildType = "Release"
             let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
-            let parameters = BuildParameters(configuration: CONFIGURATION, overrides: [
-                "SYMROOT": SYMROOT,
-                "OBJROOT": OBJROOT,
-                "DSTROOT": DSTROOT,
-                "ARCHS": "arm64",
-                "DEPLOYMENT_POSTPROCESSING": "YES",
-                "DEPLOYMENT_LOCATION": "YES",
-                "GCC_OPTIMIZATION_LEVEL": "s",
-                "SWIFT_OPTIMIZATION_LEVEL": "-O",
-            ])
+            let parameters = BuildParameters(
+                configuration: CONFIGURATION,
+                overrides: [
+                    "SYMROOT": SYMROOT,
+                    "OBJROOT": OBJROOT,
+                    "DSTROOT": DSTROOT,
+                    "ARCHS": "arm64",
+                    "DEPLOYMENT_POSTPROCESSING": "YES",
+                    "DEPLOYMENT_LOCATION": "YES",
+                    "GCC_OPTIMIZATION_LEVEL": "s",
+                    "SWIFT_OPTIMIZATION_LEVEL": "-O",
+                ]
+            )
             let FWK_CONTENTS_DIR_SUBPATH = runDestination == .macOS ? "Versions/A/" : ""
             let APP_CONTENTS_DIR_SUBPATH = runDestination == .macOS ? "Contents/" : ""
             let APP_EXEC_DIR_SUBPATH = runDestination == .macOS ? "\(APP_CONTENTS_DIR_SUBPATH)MacOS/" : ""
@@ -1997,20 +2205,24 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         let INSTALL_PATH = "/Applications"
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(fwkBaseName).xcframework")])
                         results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(libBaseName).xcframework")])
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-Xlinker", "-merge_framework", "-Xlinker", "\(fwkBaseName)"],
-                            ["-Xlinker", "-merge-l\(libBaseName)"],
-                            ["-o", "\(DSTROOT)/Applications/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-Xlinker", "-merge_framework", "-Xlinker", "\(fwkBaseName)"],
+                                ["-Xlinker", "-merge-l\(libBaseName)"],
+                                ["-o", "\(DSTROOT)/Applications/\(FULL_PRODUCT_NAME)/\(APP_EXEC_DIR_SUBPATH)\(targetName)"],
+                            ].reduce([], +)
+                        )
 
                         // Check that we're copying the framework appropriately.
                         results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename(fwkFullProductName)) { task in
-                            task.checkCommandLineContains([
-                                ["builtin-copy"],
-                                ["-exclude_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkBaseName)"],
-                                ["\(fwkXCFrameworkPath.str)/\(macosLibraryIdentifier)/\(fwkFullProductName)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"]
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["builtin-copy"],
+                                    ["-exclude_subpath", "\(FWK_CONTENTS_DIR_SUBPATH)\(fwkBaseName)"],
+                                    ["\(fwkXCFrameworkPath.str)/\(macosLibraryIdentifier)/\(fwkFullProductName)", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(APP_CONTENTS_DIR_SUBPATH)Frameworks"],
+                                ].reduce([], +)
+                            )
                             task.checkCommandLineDoesNotContain("-strip_subpath")
                             results.checkTaskFollows(task, [.matchRuleType("ProcessXCFramework"), .matchRuleItemBasename("\(fwkBaseName).xcframework")])
                         }
@@ -2044,7 +2256,8 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     // Mergeable framework and library sources
                     TestFile("ClassOne.swift"),
                     TestFile("ClassTwo.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Config",
@@ -2058,7 +2271,8 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
                         "TAPI_EXEC": tapiToolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 // App target
@@ -2066,24 +2280,30 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
-                                               buildSettings: [
-                                                "MERGED_BINARY_TYPE": "manual",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Config",
+                            buildSettings: [
+                                "MERGED_BINARY_TYPE": "manual"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Application.swift",
+                            "Application.swift"
                         ]),
                         TestFrameworksBuildPhase([
                             "MergeableFwkTarget.framework",
                             "NormalFwkTarget.framework",
                         ]),
                         // Embed
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile("MergeableFwkTarget.framework", codeSignOnCopy: true),
-                            TestBuildFile("NormalFwkTarget.framework", codeSignOnCopy: true),
-                        ], destinationSubfolder: .frameworks, onlyForDeployment: false)
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("MergeableFwkTarget.framework", codeSignOnCopy: true),
+                                TestBuildFile("NormalFwkTarget.framework", codeSignOnCopy: true),
+                            ],
+                            destinationSubfolder: .frameworks,
+                            onlyForDeployment: false
+                        ),
                     ]
                 ),
                 // Mergeable framework target
@@ -2091,17 +2311,18 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "MergeableFwkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
-                                               buildSettings: [
-                                                "MERGEABLE_LIBRARY": "YES",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Config",
+                            buildSettings: [
+                                "MERGEABLE_LIBRARY": "YES"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassOne.swift",
-                        ]),
-                        TestFrameworksBuildPhase([
+                            "ClassOne.swift"
                         ]),
+                        TestFrameworksBuildPhase([]),
                     ]
                 ),
                 // Not-mergeable framework target
@@ -2109,17 +2330,17 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "NormalFwkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config"),
+                        TestBuildConfiguration("Config")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassTwo.swift",
-                        ]),
-                        TestFrameworksBuildPhase([
+                            "ClassTwo.swift"
                         ]),
+                        TestFrameworksBuildPhase([]),
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let supportsMergeableDebugHook = try await linkerSupportsMergeableDebugHook()
@@ -2129,21 +2350,24 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
             "MkDir",
             "CreateBuildDirectory",
             "ClangStatCache",
-            "LinkAssetCatalogSignature"
+            "LinkAssetCatalogSignature",
         ]
 
         // Test a debug build.  This will reexport the mergeable framework and not the normal framework.
         do {
             let buildType = "Debug"
             let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
-            let parameters = BuildParameters(configuration: "Config", overrides: [
-                "SYMROOT": SYMROOT,
-                "OBJROOT": OBJROOT,
-                "DSTROOT": DSTROOT,
-                "DEBUG_INFORMATION_FORMAT": "dwarf",        // No dSYM for debug builds
-                "GCC_OPTIMIZATION_LEVEL": "0",
-                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-            ])
+            let parameters = BuildParameters(
+                configuration: "Config",
+                overrides: [
+                    "SYMROOT": SYMROOT,
+                    "OBJROOT": OBJROOT,
+                    "DSTROOT": DSTROOT,
+                    "DEBUG_INFORMATION_FORMAT": "dwarf",  // No dSYM for debug builds
+                    "GCC_OPTIMIZATION_LEVEL": "0",
+                    "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                ]
+            )
             // Add all the targets as top-level targets as this can shake out certain kinds of target dependency resolution bugs.
             let targets = tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
             let request = BuildRequest(parameters: parameters, buildTargets: targets, continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
@@ -2155,12 +2379,14 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let targetName = target.target.name
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
                         task.checkRuleInfo(["Ld", "\(SYMROOT)/Config-iphoneos/\(targetName).framework/\(targetName)", "normal"])
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            supportsMergeableDebugHook ? ["-add_mergeable_debug_hook"] : [],      // Only passed in debug builds
-                            ["-o", "\(SYMROOT)/Config-iphoneos/\(targetName).framework/\(targetName)"],
-                        ].reduce([], +))
-                        task.checkCommandLineDoesNotContain("-make_mergeable")      // Not passed in debug builds
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                supportsMergeableDebugHook ? ["-add_mergeable_debug_hook"] : [],  // Only passed in debug builds
+                                ["-o", "\(SYMROOT)/Config-iphoneos/\(targetName).framework/\(targetName)"],
+                            ].reduce([], +)
+                        )
+                        task.checkCommandLineDoesNotContain("-make_mergeable")  // Not passed in debug builds
 
                         results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRuleType("WriteAuxiliaryFile"), .matchRuleItemBasename("bundle_lookup_helper.swift")) { task, contents in
                             XCTAssertMatch(contents.unsafeStringValue, .contains("internal class __BundleLookupHelper {}"))
@@ -2177,12 +2403,14 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let targetName = target.target.name
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
                         task.checkRuleInfo(["Ld", "\(SYMROOT)/Config-iphoneos/\(targetName).framework/\(targetName)", "normal"])
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-o", "\(SYMROOT)/Config-iphoneos/\(targetName).framework/\(targetName)"],
-                        ].reduce([], +))
-                        task.checkCommandLineDoesNotContain("-make_mergeable")              // Not passed to this target
-                        task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")    // Not passed to this target
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-o", "\(SYMROOT)/Config-iphoneos/\(targetName).framework/\(targetName)"],
+                            ].reduce([], +)
+                        )
+                        task.checkCommandLineDoesNotContain("-make_mergeable")  // Not passed to this target
+                        task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")  // Not passed to this target
                     }
                     results.checkTask(.matchTarget(target), .matchRuleType("GenerateTAPI")) { _ in }
 
@@ -2199,13 +2427,16 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let targetName = target.target.name
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
                         task.checkRuleInfo(["Ld", "\(SYMROOT)/Config-iphoneos/\(targetName).app/\(targetName)", "normal"])
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-Xlinker", "-no_merge_framework", "-Xlinker", "MergeableFwkTarget",
-                             "-framework", "NormalFwkTarget",
-                            ],
-                            ["-o", "\(SYMROOT)/Config-iphoneos/\(targetName).app/\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                [
+                                    "-Xlinker", "-no_merge_framework", "-Xlinker", "MergeableFwkTarget",
+                                    "-framework", "NormalFwkTarget",
+                                ],
+                                ["-o", "\(SYMROOT)/Config-iphoneos/\(targetName).app/\(targetName)"],
+                            ].reduce([], +)
+                        )
                         task.checkCommandLineDoesNotContain("-merge_framework")
                         results.checkTaskFollows(task, [.matchTargetName("MergeableFwkTarget"), .matchRuleType("Ld")])
                         results.checkTaskFollows(task, [.matchTargetName("NormalFwkTarget"), .matchRuleType("Ld")])
@@ -2218,10 +2449,12 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
 
                         // Check embedding the binary-less framework.
                         results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemPattern(.suffix("Frameworks/\(fwkTargetName).framework"))) { task in
-                            task.checkCommandLineContains([
-                                ["builtin-copy"],
-                                ["\(SYMROOT)/Config-iphoneos/\(fwkTargetName).framework", "\(SYMROOT)/Config-iphoneos/\(targetName).app/Frameworks"]
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["builtin-copy"],
+                                    ["\(SYMROOT)/Config-iphoneos/\(fwkTargetName).framework", "\(SYMROOT)/Config-iphoneos/\(targetName).app/Frameworks"],
+                                ].reduce([], +)
+                            )
                             results.checkTaskFollows(task, [.matchTargetName(fwkTargetName), .matchRuleType("Touch")])
                         }
                         results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemPattern(.suffix("Frameworks/\(fwkTargetName).framework"))) { task in
@@ -2231,13 +2464,16 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         // Check embedding the binary-only framework.
                         results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemPattern(.suffix("\(reexportedBinariesDirectoryName)/\(fwkTargetName).framework"))) { task in
                             task.checkRuleInfo(["Copy", "\(SYMROOT)/Config-iphoneos/\(targetName).app/\(reexportedBinariesDirectoryName)/\(fwkTargetName).framework", "\(SYMROOT)/Config-iphoneos/\(fwkTargetName).framework"])
-                            task.checkCommandLineContains([
-                                ["builtin-copy"],
-                                ["-include_only_subpath", fwkTargetName,
-                                 "-include_only_subpath", "_CodeSignature",
-                                ],
-                                ["\(SYMROOT)/Config-iphoneos/\(fwkTargetName).framework", "\(SYMROOT)/Config-iphoneos/\(targetName).app/\(reexportedBinariesDirectoryName)"],
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["builtin-copy"],
+                                    [
+                                        "-include_only_subpath", fwkTargetName,
+                                        "-include_only_subpath", "_CodeSignature",
+                                    ],
+                                    ["\(SYMROOT)/Config-iphoneos/\(fwkTargetName).framework", "\(SYMROOT)/Config-iphoneos/\(targetName).app/\(reexportedBinariesDirectoryName)"],
+                                ].reduce([], +)
+                            )
                             results.checkTaskFollows(task, [.matchTargetName(fwkTargetName), .matchRuleType("Touch")])
                         }
                         results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemPattern(.suffix("\(reexportedBinariesDirectoryName)/\(fwkTargetName).framework"))) { task in
@@ -2249,10 +2485,12 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     do {
                         let fwkTargetName = "NormalFwkTarget"
                         results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("\(fwkTargetName).framework")) { task in
-                            task.checkCommandLineContains([
-                                ["builtin-copy"],
-                                ["\(SYMROOT)/Config-iphoneos/\(fwkTargetName).framework", "\(SYMROOT)/Config-iphoneos/\(targetName).app/Frameworks"]
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["builtin-copy"],
+                                    ["\(SYMROOT)/Config-iphoneos/\(fwkTargetName).framework", "\(SYMROOT)/Config-iphoneos/\(targetName).app/Frameworks"],
+                                ].reduce([], +)
+                            )
                             results.checkTaskFollows(task, [.matchTargetName(fwkTargetName), .matchRuleType("Touch")])
                         }
                         results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemBasename("\(fwkTargetName).framework")) { task in
@@ -2280,15 +2518,18 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
         do {
             let buildType = "Release"
             let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
-            let parameters = BuildParameters(configuration: "Config", overrides: [
-                "SYMROOT": SYMROOT,
-                "OBJROOT": OBJROOT,
-                "DSTROOT": DSTROOT,
-                "DEPLOYMENT_POSTPROCESSING": "YES",
-                "DEPLOYMENT_LOCATION": "YES",
-                "GCC_OPTIMIZATION_LEVEL": "s",
-                "SWIFT_OPTIMIZATION_LEVEL": "-O",
-            ])
+            let parameters = BuildParameters(
+                configuration: "Config",
+                overrides: [
+                    "SYMROOT": SYMROOT,
+                    "OBJROOT": OBJROOT,
+                    "DSTROOT": DSTROOT,
+                    "DEPLOYMENT_POSTPROCESSING": "YES",
+                    "DEPLOYMENT_LOCATION": "YES",
+                    "GCC_OPTIMIZATION_LEVEL": "s",
+                    "SWIFT_OPTIMIZATION_LEVEL": "-O",
+                ]
+            )
             // Add all the targets as top-level targets as this can shake out certain kinds of target dependency resolution bugs.
             let targets = tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
             let request = BuildRequest(parameters: parameters, buildTargets: targets, continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
@@ -2300,12 +2541,14 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let targetName = target.target.name
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
                         task.checkRuleInfo(["Ld", "\(DSTROOT)/Library/Frameworks/\(targetName).framework/\(targetName)", "normal"])
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-Xlinker", "-make_mergeable"],
-                            ["-o", "\(DSTROOT)/Library/Frameworks/\(targetName).framework/\(targetName)"],
-                        ].reduce([], +))
-                        task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")    // Only passed in debug builds
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-Xlinker", "-make_mergeable"],
+                                ["-o", "\(DSTROOT)/Library/Frameworks/\(targetName).framework/\(targetName)"],
+                            ].reduce([], +)
+                        )
+                        task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")  // Only passed in debug builds
                     }
                     // Don't generate an intermediate .tbd file for eager linking when we're making the binary mergeable.
                     results.checkNoTask(.matchTarget(target), .matchRuleType("GenerateTAPI"))
@@ -2325,10 +2568,12 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let targetName = target.target.name
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
                         task.checkRuleInfo(["Ld", "\(DSTROOT)/Library/Frameworks/\(targetName).framework/\(targetName)", "normal"])
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-o", "\(DSTROOT)/Library/Frameworks/\(targetName).framework/\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-o", "\(DSTROOT)/Library/Frameworks/\(targetName).framework/\(targetName)"],
+                            ].reduce([], +)
+                        )
                         task.checkCommandLineDoesNotContain("-make_mergeable")
                         task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")
                     }
@@ -2349,13 +2594,16 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let targetName = target.target.name
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
                         task.checkRuleInfo(["Ld", "\(DSTROOT)/Applications/\(targetName).app/\(targetName)", "normal"])
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-Xlinker", "-merge_framework", "-Xlinker", "MergeableFwkTarget",
-                             "-framework", "NormalFwkTarget",
-                            ],
-                            ["-o", "\(DSTROOT)/Applications/\(targetName).app/\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                [
+                                    "-Xlinker", "-merge_framework", "-Xlinker", "MergeableFwkTarget",
+                                    "-framework", "NormalFwkTarget",
+                                ],
+                                ["-o", "\(DSTROOT)/Applications/\(targetName).app/\(targetName)"],
+                            ].reduce([], +)
+                        )
                         task.checkCommandLineDoesNotContain("-no_merge_framework")
                         results.checkTaskFollows(task, [.matchTargetName("MergeableFwkTarget"), .matchRuleType("Ld")])
                         results.checkTaskFollows(task, [.matchTargetName("NormalFwkTarget"), .matchRuleType("Ld")])
@@ -2365,11 +2613,13 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     do {
                         let fwkTargetName = "MergeableFwkTarget"
                         results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("\(fwkTargetName).framework")) { task in
-                            task.checkCommandLineContains([
-                                ["builtin-copy"],
-                                ["-exclude_subpath", fwkTargetName],
-                                ["\(SYMROOT)/Config-iphoneos/\(fwkTargetName).framework", "\(DSTROOT)/Applications/\(targetName).app/Frameworks"]
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["builtin-copy"],
+                                    ["-exclude_subpath", fwkTargetName],
+                                    ["\(SYMROOT)/Config-iphoneos/\(fwkTargetName).framework", "\(DSTROOT)/Applications/\(targetName).app/Frameworks"],
+                                ].reduce([], +)
+                            )
                             results.checkTaskFollows(task, [.matchTargetName(fwkTargetName), .matchRuleType("Touch")])
                         }
                         results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemBasename("\(fwkTargetName).framework")) { task in
@@ -2380,10 +2630,12 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     do {
                         let fwkTargetName = "NormalFwkTarget"
                         results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("\(fwkTargetName).framework")) { task in
-                            task.checkCommandLineContains([
-                                ["builtin-copy"],
-                                ["\(SYMROOT)/Config-iphoneos/\(fwkTargetName).framework", "\(DSTROOT)/Applications/\(targetName).app/Frameworks"]
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["builtin-copy"],
+                                    ["\(SYMROOT)/Config-iphoneos/\(fwkTargetName).framework", "\(DSTROOT)/Applications/\(targetName).app/Frameworks"],
+                                ].reduce([], +)
+                            )
                             results.checkTaskFollows(task, [.matchTargetName(fwkTargetName), .matchRuleType("Touch")])
                             task.checkCommandLineDoesNotContain("-exclude_subpath")
                         }
@@ -2425,7 +2677,8 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
 
                     // Mergeable framework sources
                     TestFile("ClassOne.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Config",
@@ -2439,7 +2692,8 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
                         "TAPI_EXEC": tapiToolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 // App target
@@ -2447,22 +2701,28 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
-                                               buildSettings: [
-                                                "MERGED_BINARY_TYPE": "automatic",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Config",
+                            buildSettings: [
+                                "MERGED_BINARY_TYPE": "automatic"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Application.swift",
+                            "Application.swift"
                         ]),
                         TestFrameworksBuildPhase([
-                            "MergeableFwkTarget.framework",
+                            "MergeableFwkTarget.framework"
                         ]),
                         // Embed
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile("MergeableFwkTarget.framework", codeSignOnCopy: true),
-                        ], destinationSubfolder: .frameworks, onlyForDeployment: false)
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("MergeableFwkTarget.framework", codeSignOnCopy: true)
+                            ],
+                            destinationSubfolder: .frameworks,
+                            onlyForDeployment: false
+                        ),
                     ]
                 ),
                 // Mergeable framework target
@@ -2470,17 +2730,17 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "MergeableFwkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config"),
+                        TestBuildConfiguration("Config")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassOne.swift",
-                        ]),
-                        TestFrameworksBuildPhase([
+                            "ClassOne.swift"
                         ]),
+                        TestFrameworksBuildPhase([]),
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
 
@@ -2491,17 +2751,20 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
             let CONFIGURATION = "Config"
             let buildVariants = ["normal", "profile"]
             let runDestination = RunDestinationInfo.iOS
-            let parameters = BuildParameters(configuration: CONFIGURATION, overrides: [
-                "SYMROOT": SYMROOT,
-                "OBJROOT": OBJROOT,
-                "DSTROOT": DSTROOT,
-                "DEPLOYMENT_POSTPROCESSING": "YES",
-                "DEPLOYMENT_LOCATION": "YES",
-                "GCC_OPTIMIZATION_LEVEL": "s",
-                "SWIFT_OPTIMIZATION_LEVEL": "-O",
-                "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
-                "BUILD_VARIANTS": buildVariants.joined(separator: " "),
-            ])
+            let parameters = BuildParameters(
+                configuration: CONFIGURATION,
+                overrides: [
+                    "SYMROOT": SYMROOT,
+                    "OBJROOT": OBJROOT,
+                    "DSTROOT": DSTROOT,
+                    "DEPLOYMENT_POSTPROCESSING": "YES",
+                    "DEPLOYMENT_LOCATION": "YES",
+                    "GCC_OPTIMIZATION_LEVEL": "s",
+                    "SWIFT_OPTIMIZATION_LEVEL": "-O",
+                    "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
+                    "BUILD_VARIANTS": buildVariants.joined(separator: " "),
+                ]
+            )
             let BUILT_PRODUCTS_DIR = "\(SYMROOT)/\(CONFIGURATION)" + (runDestination != .macOS ? "-\(runDestination.platform)" : "")
             // Add all the targets as top-level targets as this can shake out certain kinds of target dependency resolution bugs.
             let targets = tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
@@ -2517,20 +2780,24 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     for variant in buildVariants {
                         let variantSuffix = (variant == "normal" ? "" : "_\(variant)")
                         results.checkTask(.matchTarget(target), .matchRuleType("Ld"), .matchRuleItem(variant)) { task in
-                            task.checkCommandLineContains([
-                                ["clang"],
-                                ["-Xlinker", "-make_mergeable"],
-                                ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(targetName)\(variantSuffix)"],
-                            ].reduce([], +))
-                            task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")    // Only passed in debug builds
+                            task.checkCommandLineContains(
+                                [
+                                    ["clang"],
+                                    ["-Xlinker", "-make_mergeable"],
+                                    ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(targetName)\(variantSuffix)"],
+                                ].reduce([], +)
+                            )
+                            task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")  // Only passed in debug builds
                         }
 
                         results.checkTask(.matchTarget(target), .matchRuleType("GenerateDSYMFile"), .matchRuleItemBasename("\(targetName)\(variantSuffix)")) { task in
-                            task.checkCommandLineContains([
-                                ["dsymutil"],
-                                ["\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(targetName)\(variantSuffix)"],
-                                ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME).dSYM"],
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["dsymutil"],
+                                    ["\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(targetName)\(variantSuffix)"],
+                                    ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME).dSYM"],
+                                ].reduce([], +)
+                            )
                             task.checkCommandLineDoesNotContain("-D")
                         }
                     }
@@ -2546,24 +2813,28 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     for variant in buildVariants {
                         let variantSuffix = (variant == "normal" ? "" : "_\(variant)")
                         results.checkTask(.matchTarget(target), .matchRuleType("Ld"), .matchRuleItem(variant)) { task in
-                            task.checkCommandLineContains([
-                                ["clang"],
-                                ["-Xlinker", "-merge_framework", "-Xlinker", "MergeableFwkTarget"],
-                                ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(targetName)\(variantSuffix)"],
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["clang"],
+                                    ["-Xlinker", "-merge_framework", "-Xlinker", "MergeableFwkTarget"],
+                                    ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(targetName)\(variantSuffix)"],
+                                ].reduce([], +)
+                            )
                             task.checkCommandLineDoesNotContain("-no_merge_framework")
                             results.checkTaskFollows(task, [.matchTargetName("MergeableFwkTarget"), .matchRuleType("Ld"), .matchRuleItem(variant)])
                         }
 
                         results.checkTask(.matchTarget(target), .matchRuleType("GenerateDSYMFile"), .matchRuleItemBasename("\(targetName)\(variantSuffix)")) { task in
-                            task.checkCommandLineContains([
-                                ["dsymutil"],
-                                // This test basically exists to check that the next two options being passed as appropriate.
-                                (variant == "normal" ? [] : ["-build-variant-suffix=\(variantSuffix)"]),
-                                ["-D", "\(BUILT_PRODUCTS_DIR)"],
-                                ["\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(targetName)\(variantSuffix)"],
-                                ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME).dSYM"],
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["dsymutil"],
+                                    // This test basically exists to check that the next two options being passed as appropriate.
+                                    (variant == "normal" ? [] : ["-build-variant-suffix=\(variantSuffix)"]),
+                                    ["-D", "\(BUILT_PRODUCTS_DIR)"],
+                                    ["\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(targetName)\(variantSuffix)"],
+                                    ["-o", "\(BUILT_PRODUCTS_DIR)/\(FULL_PRODUCT_NAME).dSYM"],
+                                ].reduce([], +)
+                            )
                         }
                     }
 
@@ -2594,7 +2865,8 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     // Framework sources
                     TestFile("ClassOne.swift"),
                     TestFile("ClassTwo.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Config",
@@ -2608,7 +2880,8 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
                         "TAPI_EXEC": tapiToolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 // App target, which automatically builds its dependencies as mergeable and then merges them.
@@ -2616,23 +2889,29 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
-                                               buildSettings: [
-                                                "MERGED_BINARY_TYPE": "automatic",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Config",
+                            buildSettings: [
+                                "MERGED_BINARY_TYPE": "automatic"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Application.swift",
+                            "Application.swift"
                         ]),
                         TestFrameworksBuildPhase([
-                            "MergeableFwkTarget.framework",
+                            "MergeableFwkTarget.framework"
                         ]),
                         // Embed
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile("MergeableFwkTarget.framework", codeSignOnCopy: true),
-                            TestBuildFile("NormalFwkTarget.framework", codeSignOnCopy: true),
-                        ], destinationSubfolder: .frameworks, onlyForDeployment: false)
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("MergeableFwkTarget.framework", codeSignOnCopy: true),
+                                TestBuildFile("NormalFwkTarget.framework", codeSignOnCopy: true),
+                            ],
+                            destinationSubfolder: .frameworks,
+                            onlyForDeployment: false
+                        ),
                     ]
                 ),
                 // Mergeable framework target which is merged into the app target.
@@ -2640,14 +2919,14 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "MergeableFwkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config"),
+                        TestBuildConfiguration("Config")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassOne.swift",
+                            "ClassOne.swift"
                         ]),
                         TestFrameworksBuildPhase([
-                            "NormalFwkTarget.framework",
+                            "NormalFwkTarget.framework"
                         ]),
                     ]
                 ),
@@ -2656,17 +2935,17 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "NormalFwkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config"),
+                        TestBuildConfiguration("Config")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassTwo.swift",
-                        ]),
-                        TestFrameworksBuildPhase([
+                            "ClassTwo.swift"
                         ]),
+                        TestFrameworksBuildPhase([]),
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
 
@@ -2675,7 +2954,7 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
             "MkDir",
             "CreateBuildDirectory",
             "ClangStatCache",
-            "LinkAssetCatalogSignature"
+            "LinkAssetCatalogSignature",
         ]
 
         // Test a release build.
@@ -2684,15 +2963,18 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
             let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
             let CONFIGURATION = "Config"
             let runDestination = RunDestinationInfo.iOS
-            let parameters = BuildParameters(configuration: CONFIGURATION, overrides: [
-                "SYMROOT": SYMROOT,
-                "OBJROOT": OBJROOT,
-                "DSTROOT": DSTROOT,
-                "DEPLOYMENT_POSTPROCESSING": "YES",
-                "DEPLOYMENT_LOCATION": "YES",
-                "GCC_OPTIMIZATION_LEVEL": "s",
-                "SWIFT_OPTIMIZATION_LEVEL": "-O",
-            ])
+            let parameters = BuildParameters(
+                configuration: CONFIGURATION,
+                overrides: [
+                    "SYMROOT": SYMROOT,
+                    "OBJROOT": OBJROOT,
+                    "DSTROOT": DSTROOT,
+                    "DEPLOYMENT_POSTPROCESSING": "YES",
+                    "DEPLOYMENT_LOCATION": "YES",
+                    "GCC_OPTIMIZATION_LEVEL": "s",
+                    "SWIFT_OPTIMIZATION_LEVEL": "-O",
+                ]
+            )
             let BUILT_PRODUCTS_DIR = "\(SYMROOT)/\(CONFIGURATION)" + (runDestination != .macOS ? "-\(runDestination.platform)" : "")
             let targets = [BuildRequest.BuildTargetInfo(parameters: parameters, target: tester.workspace.projects[0].targets[0])]
             let request = BuildRequest(parameters: parameters, buildTargets: targets, continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
@@ -2705,10 +2987,12 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let INSTALL_PATH = "/Library/Frameworks"
                     let FULL_PRODUCT_NAME = "\(targetName).framework"
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(targetName)"],
+                            ].reduce([], +)
+                        )
                         task.checkCommandLineDoesNotContain("-make_mergeable")
                         task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")
                     }
@@ -2727,13 +3011,15 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let INSTALL_PATH = "/Library/Frameworks"
                     let FULL_PRODUCT_NAME = "\(targetName).framework"
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-Xlinker", "-make_mergeable"],
-                            ["-framework", "NormalFwkTarget"],
-                            ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(targetName)"],
-                        ].reduce([], +))
-                        task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")    // Only passed in debug builds
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-Xlinker", "-make_mergeable"],
+                                ["-framework", "NormalFwkTarget"],
+                                ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(targetName)"],
+                            ].reduce([], +)
+                        )
+                        task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")  // Only passed in debug builds
                     }
 
                     results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRuleType("WriteAuxiliaryFile"), .matchRuleItemBasename("bundle_lookup_helper.swift")) { task, contents in
@@ -2752,11 +3038,13 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     let INSTALL_PATH = "/Applications"
                     let FULL_PRODUCT_NAME = "\(targetName).app"
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                        task.checkCommandLineContains([
-                            ["clang"],
-                            ["-Xlinker", "-merge_framework", "-Xlinker", "MergeableFwkTarget"],
-                            ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(targetName)"],
-                        ].reduce([], +))
+                        task.checkCommandLineContains(
+                            [
+                                ["clang"],
+                                ["-Xlinker", "-merge_framework", "-Xlinker", "MergeableFwkTarget"],
+                                ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(targetName)"],
+                            ].reduce([], +)
+                        )
                         results.checkTaskFollows(task, [.matchTargetName("MergeableFwkTarget"), .matchRuleType("Ld")])
                     }
 
@@ -2764,11 +3052,13 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     do {
                         let fwkTargetName = "MergeableFwkTarget"
                         results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("\(fwkTargetName).framework")) { task in
-                            task.checkCommandLineContains([
-                                ["builtin-copy"],
-                                ["-exclude_subpath", fwkTargetName],
-                                ["\(BUILT_PRODUCTS_DIR)/\(fwkTargetName).framework", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/Frameworks"]
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["builtin-copy"],
+                                    ["-exclude_subpath", fwkTargetName],
+                                    ["\(BUILT_PRODUCTS_DIR)/\(fwkTargetName).framework", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/Frameworks"],
+                                ].reduce([], +)
+                            )
                             results.checkTaskFollows(task, [.matchTargetName(fwkTargetName), .matchRuleType("Touch")])
                         }
                         results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemBasename("\(fwkTargetName).framework")) { task in
@@ -2781,10 +3071,12 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     do {
                         let fwkTargetName = "NormalFwkTarget"
                         results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("\(fwkTargetName).framework")) { task in
-                            task.checkCommandLineContains([
-                                ["builtin-copy"],
-                                ["\(BUILT_PRODUCTS_DIR)/\(fwkTargetName).framework", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/Frameworks"]
-                            ].reduce([], +))
+                            task.checkCommandLineContains(
+                                [
+                                    ["builtin-copy"],
+                                    ["\(BUILT_PRODUCTS_DIR)/\(fwkTargetName).framework", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/Frameworks"],
+                                ].reduce([], +)
+                            )
                             results.checkTaskFollows(task, [.matchTargetName(fwkTargetName), .matchRuleType("Touch")])
                             task.checkCommandLineDoesNotContain("-exclude_subpath")
                         }
@@ -2821,8 +3113,9 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                 "SomeFiles",
                 children: [
                     // Mergeable framework sources
-                    TestFile("ClassOne.swift"),
-                ]),
+                    TestFile("ClassOne.swift")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Config",
@@ -2837,7 +3130,8 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
                         "TAPI_EXEC": tapiToolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 // Merged framework target
@@ -2845,17 +3139,19 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "MergedFwkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
-                                               buildSettings: [
-                                                "MERGED_BINARY_TYPE": "automatic",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Config",
+                            buildSettings: [
+                                "MERGED_BINARY_TYPE": "automatic"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             // Intentionally empty
                         ]),
                         TestFrameworksBuildPhase([
-                            "FwkTarget1.framework",
+                            "FwkTarget1.framework"
                         ]),
                     ],
                     // We want to test both explicit and implicit dependencies so not all targets are listed here.
@@ -2866,17 +3162,17 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "FwkTarget1",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config"),
+                        TestBuildConfiguration("Config")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassOne.swift",
-                        ]),
-                        TestFrameworksBuildPhase([
+                            "ClassOne.swift"
                         ]),
+                        TestFrameworksBuildPhase([]),
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let runDestination = RunDestinationInfo.iOS
@@ -2888,15 +3184,19 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
             for action: BuildAction in [.install, .installHeaders, .installAPI] {
                 let buildType = "Release"
                 let (SYMROOT, OBJROOT, DSTROOT) = buildDirs(in: Path("/tmp/buildDir"), for: buildType)
-                let parameters = BuildParameters(action: action, configuration: CONFIGURATION, overrides: [
-                    "SYMROOT": SYMROOT,
-                    "OBJROOT": OBJROOT,
-                    "DSTROOT": DSTROOT,
-                    "DEPLOYMENT_POSTPROCESSING": "YES",
-                    "DEPLOYMENT_LOCATION": "YES",
-                    "GCC_OPTIMIZATION_LEVEL": "s",
-                    "SWIFT_OPTIMIZATION_LEVEL": "-O",
-                ])
+                let parameters = BuildParameters(
+                    action: action,
+                    configuration: CONFIGURATION,
+                    overrides: [
+                        "SYMROOT": SYMROOT,
+                        "OBJROOT": OBJROOT,
+                        "DSTROOT": DSTROOT,
+                        "DEPLOYMENT_POSTPROCESSING": "YES",
+                        "DEPLOYMENT_LOCATION": "YES",
+                        "GCC_OPTIMIZATION_LEVEL": "s",
+                        "SWIFT_OPTIMIZATION_LEVEL": "-O",
+                    ]
+                )
                 // Add all the targets as top-level targets as this can shake out certain kinds of target dependency resolution bugs.
                 let targets = tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
                 let request = BuildRequest(parameters: parameters, buildTargets: targets, continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
@@ -2911,12 +3211,14 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                             let INSTALL_PATH = "/Library/Frameworks"
                             results.checkTarget(targetName) { target in
                                 results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                                    task.checkCommandLineContains([
-                                        ["clang"],
-                                        ["-Xlinker", "-make_mergeable"],
-                                        ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
-                                    ].reduce([], +))
-                                    task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")    // Only passed in debug builds
+                                    task.checkCommandLineContains(
+                                        [
+                                            ["clang"],
+                                            ["-Xlinker", "-make_mergeable"],
+                                            ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
+                                        ].reduce([], +)
+                                    )
+                                    task.checkCommandLineDoesNotContain("-add_mergeable_debug_hook")  // Only passed in debug builds
                                 }
 
                                 results.checkTasks(.matchTarget(target), body: { (tasks) -> Void in #expect(tasks.count > 0) })
@@ -2929,12 +3231,15 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                             let FULL_PRODUCT_NAME = "\(targetName).framework"
                             let INSTALL_PATH = "/Library/Frameworks"
                             results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                                task.checkCommandLineContains([
-                                    ["clang"],
-                                    ["-Xlinker", "-merge_framework", "-Xlinker", "FwkTarget1",
-                                    ],
-                                    ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
-                                ].reduce([], +))
+                                task.checkCommandLineContains(
+                                    [
+                                        ["clang"],
+                                        [
+                                            "-Xlinker", "-merge_framework", "-Xlinker", "FwkTarget1",
+                                        ],
+                                        ["-o", "\(DSTROOT)\(INSTALL_PATH)/\(FULL_PRODUCT_NAME)/\(FWK_CONTENTS_DIR_SUBPATH)\(targetName)"],
+                                    ].reduce([], +)
+                                )
                                 task.checkCommandLineDoesNotContain("-no_merge_framework")
                                 results.checkTaskFollows(task, [.matchTargetName("FwkTarget1"), .matchRuleType("Ld")])
                             }
@@ -3002,7 +3307,8 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     TestFile("ManualApp.swift"),
                     TestFile("ClassOne.swift"),
                     TestFile("ClassTwo.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Config",
@@ -3019,7 +3325,8 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
                         "TAPI_EXEC": tapiToolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 // Automatic merged framework target
@@ -3027,22 +3334,28 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "AutomaticApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
-                                               buildSettings: [
-                                                "AUTOMATICALLY_MERGE_DEPENDENCIES": "YES",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Config",
+                            buildSettings: [
+                                "AUTOMATICALLY_MERGE_DEPENDENCIES": "YES"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "AutomaticApp.swift",
+                            "AutomaticApp.swift"
                         ]),
                         TestFrameworksBuildPhase([
-                            "AutomaticMergeableFwk.framework",
+                            "AutomaticMergeableFwk.framework"
                         ]),
                         // Embed
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile("AutomaticMergeableFwk.framework", codeSignOnCopy: true),
-                        ], destinationSubfolder: .frameworks, onlyForDeployment: false)
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("AutomaticMergeableFwk.framework", codeSignOnCopy: true)
+                            ],
+                            destinationSubfolder: .frameworks,
+                            onlyForDeployment: false
+                        ),
                     ],
                     // We want to test both explicit and implicit dependencies so not all targets are listed here.
                     dependencies: ["AutomaticMergeableFwk"]
@@ -3052,18 +3365,18 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "AutomaticMergeableFwk",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
-                                               buildSettings: [
-                                                "SKIP_INSTALL": "YES",
-                                               ]
-                                              ),
+                        TestBuildConfiguration(
+                            "Config",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassOne.swift",
-                        ]),
-                        TestFrameworksBuildPhase([
+                            "ClassOne.swift"
                         ]),
+                        TestFrameworksBuildPhase([]),
                     ]
                 ),
                 // Manual merged framework target
@@ -3071,22 +3384,28 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "ManualApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
-                                               buildSettings: [
-                                                "MERGE_LINKED_LIBRARIES": "YES",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Config",
+                            buildSettings: [
+                                "MERGE_LINKED_LIBRARIES": "YES"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ManualApp.swift",
+                            "ManualApp.swift"
                         ]),
                         TestFrameworksBuildPhase([
-                            "ManualMergeableFwk.framework",
+                            "ManualMergeableFwk.framework"
                         ]),
                         // Embed
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile("ManualMergeableFwk.framework", codeSignOnCopy: true),
-                        ], destinationSubfolder: .frameworks, onlyForDeployment: false)
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("ManualMergeableFwk.framework", codeSignOnCopy: true)
+                            ],
+                            destinationSubfolder: .frameworks,
+                            onlyForDeployment: false
+                        ),
                     ],
                     // We want to test both explicit and implicit dependencies so not all targets are listed here.
                     dependencies: ["ManualMergeableFwk"]
@@ -3096,22 +3415,23 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
                     "ManualMergeableFwk",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Config",
-                                               buildSettings: [
-                                                "MERGEABLE_LIBRARY": "YES",
-                                                "SKIP_INSTALL": "YES",
-                                               ]
-                                              ),
+                        TestBuildConfiguration(
+                            "Config",
+                            buildSettings: [
+                                "MERGEABLE_LIBRARY": "YES",
+                                "SKIP_INSTALL": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassTwo.swift",
-                        ]),
-                        TestFrameworksBuildPhase([
+                            "ClassTwo.swift"
                         ]),
+                        TestFrameworksBuildPhase([]),
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let project = tester.workspace.projects[0]
@@ -3123,14 +3443,17 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
             // Test a debug build
             do {
                 let (SYMROOT, OBJROOT, DSTROOT) = ("/tmp/buildDir/\(runDestination.platform)/sym", "/tmp/buildDir/\(runDestination.platform)/obj", "/tmp/buildDir/\(runDestination.platform)/dst")
-                let parameters = BuildParameters(configuration: "Config", overrides: [
-                    "SYMROOT": SYMROOT,
-                    "OBJROOT": OBJROOT,
-                    "DSTROOT": DSTROOT,
-                    "DEBUG_INFORMATION_FORMAT": "dwarf",        // No dSYM for debug builds
-                    "GCC_OPTIMIZATION_LEVEL": "0",
-                    "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                ])
+                let parameters = BuildParameters(
+                    configuration: "Config",
+                    overrides: [
+                        "SYMROOT": SYMROOT,
+                        "OBJROOT": OBJROOT,
+                        "DSTROOT": DSTROOT,
+                        "DEBUG_INFORMATION_FORMAT": "dwarf",  // No dSYM for debug builds
+                        "GCC_OPTIMIZATION_LEVEL": "0",
+                        "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                    ]
+                )
                 // Add all the targets as top-level targets as this can shake out certain kinds of target dependency resolution bugs.
                 let targets = tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
                 let request = BuildRequest(parameters: parameters, buildTargets: targets, continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
@@ -3151,15 +3474,18 @@ fileprivate struct MergeableLibraryTests: CoreBasedTests {
             // Test a release build
             do {
                 let (SYMROOT, OBJROOT, DSTROOT) = ("/tmp/buildDir/\(runDestination.platform)/sym", "/tmp/buildDir/\(runDestination.platform)/obj", "/tmp/buildDir/\(runDestination.platform)/dst")
-                let parameters = BuildParameters(configuration: "Config", overrides: [
-                    "SYMROOT": SYMROOT,
-                    "OBJROOT": OBJROOT,
-                    "DSTROOT": DSTROOT,
-                    "DEPLOYMENT_POSTPROCESSING": "YES",
-                    "DEPLOYMENT_LOCATION": "YES",
-                    "GCC_OPTIMIZATION_LEVEL": "s",
-                    "SWIFT_OPTIMIZATION_LEVEL": "-O",
-                ])
+                let parameters = BuildParameters(
+                    configuration: "Config",
+                    overrides: [
+                        "SYMROOT": SYMROOT,
+                        "OBJROOT": OBJROOT,
+                        "DSTROOT": DSTROOT,
+                        "DEPLOYMENT_POSTPROCESSING": "YES",
+                        "DEPLOYMENT_LOCATION": "YES",
+                        "GCC_OPTIMIZATION_LEVEL": "s",
+                        "SWIFT_OPTIMIZATION_LEVEL": "-O",
+                    ]
+                )
                 // Add all the targets as top-level targets as this can shake out certain kinds of target dependency resolution bugs.
                 let targets = tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) })
                 let request = BuildRequest(parameters: parameters, buildTargets: targets, continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
diff --git a/Tests/SWBTaskConstructionTests/MetalTests.swift b/Tests/SWBTaskConstructionTests/MetalTests.swift
index 7e502a5e..2c0a8e77 100644
--- a/Tests/SWBTaskConstructionTests/MetalTests.swift
+++ b/Tests/SWBTaskConstructionTests/MetalTests.swift
@@ -27,7 +27,8 @@ fileprivate struct MetalTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("File1.metal")
-                    ]),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "Test",
@@ -42,13 +43,14 @@ fileprivate struct MetalTests: CoreBasedTests {
                                     "INDEX_STORE_ONLY_PROJECT_FILES": "YES",
                                     "CLANG_INDEX_STORE_IGNORE_MACROS": "YES",
                                 ]
-                            ),
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["File1.metal"]),
+                            TestSourcesBuildPhase(["File1.metal"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -74,7 +76,7 @@ fileprivate struct MetalTests: CoreBasedTests {
     }
 
     @Test(.requireSDKs(.macOS), .skipInGitHubActions("Metal toolchain is not installed on GitHub runners"))
-    func  indexOptionsNotAddedIfIndexingIsDisabled() async throws {
+    func indexOptionsNotAddedIfIndexingIsDisabled() async throws {
         try await withTemporaryDirectory { tmpDir in
             let testProject = TestProject(
                 "ProjectName",
@@ -83,7 +85,8 @@ fileprivate struct MetalTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("File1.metal")
-                    ]),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "Test",
@@ -98,13 +101,14 @@ fileprivate struct MetalTests: CoreBasedTests {
                                     "INDEX_STORE_ONLY_PROJECT_FILES": "YES",
                                     "CLANG_INDEX_STORE_IGNORE_MACROS": "YES",
                                 ]
-                            ),
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["File1.metal"]),
+                            TestSourcesBuildPhase(["File1.metal"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
diff --git a/Tests/SWBTaskConstructionTests/ModuleMapTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/ModuleMapTaskConstructionTests.swift
index 0c67d4ab..2084f2c1 100644
--- a/Tests/SWBTaskConstructionTests/ModuleMapTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/ModuleMapTaskConstructionTests.swift
@@ -33,7 +33,8 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     TestFile("ObjCAndSwift.private.modulemap"),
                     TestFile("SwiftSource.swift"),
                     TestFile("Info.plist"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "ObjCOnly",
@@ -50,8 +51,8 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("ObjCOnly.h", headerVisibility: .public),
-                        ]),
+                            TestBuildFile("ObjCOnly.h", headerVisibility: .public)
+                        ])
                     ]
                 ),
                 TestStandardTarget(
@@ -67,8 +68,8 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "SwiftSource.swift",
-                        ]),
+                            "SwiftSource.swift"
+                        ])
                     ]
                 ),
                 TestStandardTarget(
@@ -78,23 +79,27 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                         // If DEFINES_MODULE is off, don't generate a module map file, even when the Objective-C compatibility header is present.
                         try buildConfiguration(withName: "Default", extraSettings: [:]),
                         // Don't copy a module map file.
-                        try buildConfiguration(withName: "ModuleFile", extraSettings: [
-                            "MODULEMAP_FILE": "ObjCAndSwift.modulemap",
-                            "MODULEMAP_PRIVATE_FILE": "ObjCAndSwift.private.modulemap",
-                        ]),
+                        try buildConfiguration(
+                            withName: "ModuleFile",
+                            extraSettings: [
+                                "MODULEMAP_FILE": "ObjCAndSwift.modulemap",
+                                "MODULEMAP_PRIVATE_FILE": "ObjCAndSwift.private.modulemap",
+                            ]
+                        ),
                         // Don't write module map contents.
                         try buildConfiguration(withName: "ModuleContents", extraSettings: ["MODULEMAP_FILE_CONTENTS": "framework module ObjCAndSwift {}"]),
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("ObjCAndSwift.h", headerVisibility: .public),
+                            TestBuildFile("ObjCAndSwift.h", headerVisibility: .public)
                         ]),
                         TestSourcesBuildPhase([
-                            "SwiftSource.swift",
+                            "SwiftSource.swift"
                         ]),
                     ]
                 ),
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -102,16 +107,17 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
         let didNotCopyPrivateModuleMapFile = "[targetIntegrity] MODULEMAP_PRIVATE_FILE has no effect if DEFINES_MODULE is not set"
         let didNotWriteModuleMapContents = "[targetIntegrity] MODULEMAP_FILE_CONTENTS has no effect if DEFINES_MODULE is not set"
 
-        let builds = [("ObjCOnly", "Default", []),
-                      ("ObjCOnly", "DefinesModuleNo", []),
-                      ("ObjCOnly", "ModuleFile", [didNotCopyModuleMapFile]),
-                      ("ObjCOnly", "ModuleContents", [didNotWriteModuleMapContents]),
-                      ("SwiftOnly", "Default", []),
-                      ("SwiftOnly", "ModuleFile", [didNotCopyModuleMapFile]),
-                      ("SwiftOnly", "ModuleContents", [didNotWriteModuleMapContents]),
-                      ("ObjCAndSwift", "Default", []),
-                      ("ObjCAndSwift", "ModuleFile", [didNotCopyModuleMapFile, didNotCopyPrivateModuleMapFile]),
-                      ("ObjCAndSwift", "ModuleContents", [didNotWriteModuleMapContents]),
+        let builds = [
+            ("ObjCOnly", "Default", []),
+            ("ObjCOnly", "DefinesModuleNo", []),
+            ("ObjCOnly", "ModuleFile", [didNotCopyModuleMapFile]),
+            ("ObjCOnly", "ModuleContents", [didNotWriteModuleMapContents]),
+            ("SwiftOnly", "Default", []),
+            ("SwiftOnly", "ModuleFile", [didNotCopyModuleMapFile]),
+            ("SwiftOnly", "ModuleContents", [didNotWriteModuleMapContents]),
+            ("ObjCAndSwift", "Default", []),
+            ("ObjCAndSwift", "ModuleFile", [didNotCopyModuleMapFile, didNotCopyPrivateModuleMapFile]),
+            ("ObjCAndSwift", "ModuleContents", [didNotWriteModuleMapContents]),
         ]
         for (targetName, configurationName, warnings) in builds {
             await tester.checkBuild(BuildParameters(configuration: configurationName), runDestination: .macOS, targetName: targetName) { results in
@@ -154,16 +160,20 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     TestFile("SwiftSource.swift"),
                     TestFile("PrivateModuleOnly.private.modulemap"),
                     TestFile("Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "",
-                    "DEFINES_MODULE": "YES",
-                    "INFOPLIST_FILE": "Info.plist",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "5.0",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "",
+                        "DEFINES_MODULE": "YES",
+                        "INFOPLIST_FILE": "Info.plist",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": "5.0",
+                    ]
+                )
             ],
             targets: [
                 // Don't generate a module if there's no umbrella header.
@@ -172,8 +182,8 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     type: .framework,
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("SomeHeader.h", headerVisibility: .public),
-                        ]),
+                            TestBuildFile("SomeHeader.h", headerVisibility: .public)
+                        ])
                     ]
                 ),
                 // Don't generate a module if the thing that looks like an umbrella header is project internal.
@@ -182,8 +192,8 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     type: .framework,
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            "ProjectInternalUmbrellaHeader.h",
-                        ]),
+                            "ProjectInternalUmbrellaHeader.h"
+                        ])
                     ]
                 ),
                 // Don't generate a module if the Objective-C compatibility header isn't generated.
@@ -191,14 +201,17 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     "NoObjCCompatibilityHeader",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SWIFT_OBJC_INTERFACE_HEADER_NAME": "",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SWIFT_OBJC_INTERFACE_HEADER_NAME": ""
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "SwiftSource.swift",
-                        ]),
+                            "SwiftSource.swift"
+                        ])
                     ]
                 ),
                 // Don't generate a module if the Objective-C compatibility header isn't installed.
@@ -206,14 +219,17 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     "ObjCCompatibilityHeaderNotInstalled",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SWIFT_INSTALL_OBJC_HEADER": "NO",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SWIFT_INSTALL_OBJC_HEADER": "NO"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "SwiftSource.swift",
-                        ]),
+                            "SwiftSource.swift"
+                        ])
                     ]
                 ),
                 // Don't install the private module if there's no public module.
@@ -221,14 +237,17 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     "PrivateModuleOnly",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "MODULEMAP_PRIVATE_FILE": "PrivateModuleOnly.private.modulemap",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "MODULEMAP_PRIVATE_FILE": "PrivateModuleOnly.private.modulemap"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("SomeHeader.h", headerVisibility: .private),
-                        ]),
+                            TestBuildFile("SomeHeader.h", headerVisibility: .private)
+                        ])
                     ]
                 ),
                 // Don't install the private module if there's no public module and the
@@ -237,30 +256,35 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     "PrivateModuleInternalSwift",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "MODULEMAP_PRIVATE_FILE": "PrivateModuleOnly.private.modulemap",
-                            "SWIFT_INSTALL_OBJC_HEADER": "NO",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "MODULEMAP_PRIVATE_FILE": "PrivateModuleOnly.private.modulemap",
+                                "SWIFT_INSTALL_OBJC_HEADER": "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("SomeHeader.h", headerVisibility: .private),
+                            TestBuildFile("SomeHeader.h", headerVisibility: .private)
                         ]),
                         TestSourcesBuildPhase([
-                            "SwiftSource.swift",
+                            "SwiftSource.swift"
                         ]),
                     ]
                 ),
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
-        let builds = [("NoUmbrellaHeader", false),
-                      ("ProjectInternalUmbrellaHeader", false),
-                      ("NoObjCCompatibilityHeader", false),
-                      ("ObjCCompatibilityHeaderNotInstalled", false),
-                      ("PrivateModuleOnly", true),
-                      ("PrivateModuleInternalSwift", true),
+        let builds = [
+            ("NoUmbrellaHeader", false),
+            ("ProjectInternalUmbrellaHeader", false),
+            ("NoObjCCompatibilityHeader", false),
+            ("ObjCCompatibilityHeaderNotInstalled", false),
+            ("PrivateModuleOnly", true),
+            ("PrivateModuleInternalSwift", true),
         ]
         for (targetName, hasPrivateModuleMap) in builds {
             await tester.checkBuild(runDestination: .macOS, targetName: targetName) { results in
@@ -315,16 +339,20 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     TestFile("CSource.c"),
                     TestFile("SwiftSource.swift"),
                     TestFile("Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "",
-                    "DEFINES_MODULE": "YES",
-                    "INFOPLIST_FILE": "Info.plist",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "5.0",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "",
+                        "DEFINES_MODULE": "YES",
+                        "INFOPLIST_FILE": "Info.plist",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": "5.0",
+                    ]
+                )
             ],
             targets: [
                 // Typical cookie cutter framework - matching umbrella header.
@@ -333,10 +361,10 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     type: .framework,
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("CookieCutter.h", headerVisibility: .public),
+                            TestBuildFile("CookieCutter.h", headerVisibility: .public)
                         ]),
                         TestSourcesBuildPhase([
-                            "CSource.c",
+                            "CSource.c"
                         ]),
                     ]
                 ),
@@ -346,10 +374,10 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     type: .framework,
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("CPlusPlus.hpp", headerVisibility: .public),
+                            TestBuildFile("CPlusPlus.hpp", headerVisibility: .public)
                         ]),
                         TestSourcesBuildPhase([
-                            "CSource.c",
+                            "CSource.c"
                         ]),
                     ]
                 ),
@@ -359,10 +387,10 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     type: .framework,
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("PrivateHeadersOnly.H", headerVisibility: .private),
+                            TestBuildFile("PrivateHeadersOnly.H", headerVisibility: .private)
                         ]),
                         TestSourcesBuildPhase([
-                            "CSource.c",
+                            "CSource.c"
                         ]),
                     ]
                 ),
@@ -372,10 +400,10 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     type: .framework,
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("mismatchedcase.hxx", headerVisibility: .public),
+                            TestBuildFile("mismatchedcase.hxx", headerVisibility: .public)
                         ]),
                         TestSourcesBuildPhase([
-                            "CSource.c",
+                            "CSource.c"
                         ]),
                     ]
                 ),
@@ -389,7 +417,7 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                             TestBuildFile("PublicHeaderPreferred.h", headerVisibility: .private),
                         ]),
                         TestSourcesBuildPhase([
-                            "CSource.c",
+                            "CSource.c"
                         ]),
                     ]
                 ),
@@ -404,7 +432,7 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                             TestBuildFile("ExactMatchPreferred.h", headerVisibility: .private),
                         ]),
                         TestSourcesBuildPhase([
-                            "CSource.c",
+                            "CSource.c"
                         ]),
                     ]
                 ),
@@ -419,7 +447,7 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                             TestBuildFile("NonCPlusPlusPreferred.h", headerVisibility: .private),
                         ]),
                         TestSourcesBuildPhase([
-                            "CSource.c",
+                            "CSource.c"
                         ]),
                     ]
                 ),
@@ -433,13 +461,16 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     "NoObjCCompatibilityHeader",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SWIFT_OBJC_INTERFACE_HEADER_NAME": "",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SWIFT_OBJC_INTERFACE_HEADER_NAME": ""
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("NoObjCCompatibilityHeader.h", headerVisibility: .public),
+                            TestBuildFile("NoObjCCompatibilityHeader.h", headerVisibility: .public)
                         ]),
                         TestSourcesBuildPhase([
                             "CSource.c",
@@ -452,13 +483,16 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     "ObjCCompatibilityHeaderNotInstalled",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SWIFT_INSTALL_OBJC_HEADER": "NO",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SWIFT_INSTALL_OBJC_HEADER": "NO"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("ObjCCompatibilityHeaderNotInstalled.h", headerVisibility: .public),
+                            TestBuildFile("ObjCCompatibilityHeaderNotInstalled.h", headerVisibility: .public)
                         ]),
                         TestSourcesBuildPhase([
                             "CSource.c",
@@ -472,8 +506,8 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "SwiftSource.swift",
-                        ]),
+                            "SwiftSource.swift"
+                        ])
                     ]
                 ),
                 // A mixed Objective-C and Swift framework has the Objective-C compatibility header in a submodule.
@@ -482,7 +516,7 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     type: .framework,
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("ObjCCompatibilityHeader.h", headerVisibility: .public),
+                            TestBuildFile("ObjCCompatibilityHeader.h", headerVisibility: .public)
                         ]),
                         TestSourcesBuildPhase([
                             "CSource.c",
@@ -495,34 +529,39 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     "Unifdef",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "COPY_HEADERS_RUN_UNIFDEF": "YES",
-                            "COPY_HEADERS_UNIFDEF_FLAGS": "-DENABLE_FEATURE",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "COPY_HEADERS_RUN_UNIFDEF": "YES",
+                                "COPY_HEADERS_UNIFDEF_FLAGS": "-DENABLE_FEATURE",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("Unifdef.h", headerVisibility: .public),
+                            TestBuildFile("Unifdef.h", headerVisibility: .public)
                         ]),
                         TestSourcesBuildPhase([
-                            "CSource.c",
+                            "CSource.c"
                         ]),
                     ]
                 ),
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
-        let targetParameters = [("CookieCutter", "CookieCutter.h", false),
-                                ("CPlusPlus", "CPlusPlus.hpp", false),
-                                ("PrivateHeadersOnly", "PrivateHeadersOnly.H", false),
-                                ("MismatchedCase", "mismatchedcase.hxx", false),
-                                ("PublicHeaderPreferred", "publicheaderpreferred.hh", false),
-                                ("ExactMatchPreferred", "ExactMatchPreferred.hp", false),
-                                ("NonCPlusPlusPreferred", "noncpluspluspreferred.H", false),
-                                ("NoObjCCompatibilityHeader", "NoObjCCompatibilityHeader.h", true),
-                                ("ObjCCompatibilityHeaderNotInstalled", "ObjCCompatibilityHeaderNotInstalled.h", true),
-                                ("Unifdef", "Unifdef.h", false),
+        let targetParameters = [
+            ("CookieCutter", "CookieCutter.h", false),
+            ("CPlusPlus", "CPlusPlus.hpp", false),
+            ("PrivateHeadersOnly", "PrivateHeadersOnly.H", false),
+            ("MismatchedCase", "mismatchedcase.hxx", false),
+            ("PublicHeaderPreferred", "publicheaderpreferred.hh", false),
+            ("ExactMatchPreferred", "ExactMatchPreferred.hp", false),
+            ("NonCPlusPlusPreferred", "noncpluspluspreferred.H", false),
+            ("NoObjCCompatibilityHeader", "NoObjCCompatibilityHeader.h", true),
+            ("ObjCCompatibilityHeaderNotInstalled", "ObjCCompatibilityHeaderNotInstalled.h", true),
+            ("Unifdef", "Unifdef.h", false),
         ]
         for (targetName, umbrellaHeader, hasSwiftSource) in targetParameters {
             await tester.checkBuild(runDestination: .macOS, targetName: targetName) { results in
@@ -535,13 +574,16 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     let copyModuleMap = TaskCondition.matchRule(["Copy", installedModuleMap, generatedModuleMap])
 
                     results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", generatedModuleMap])) { task, contents in
-                        #expect(contents == (OutputByteStream()
-                                             <<< "framework module \(targetName) {\n"
-                                             <<< "  umbrella header \"\(umbrellaHeader)\"\n"
-                                             <<< "  export *\n"
-                                             <<< "\n"
-                                             <<< "  module * { export * }\n"
-                                             <<< "}\n").bytes)
+                        #expect(
+                            contents
+                                == (OutputByteStream()
+                                <<< "framework module \(targetName) {\n"
+                                <<< "  umbrella header \"\(umbrellaHeader)\"\n"
+                                <<< "  export *\n"
+                                <<< "\n"
+                                <<< "  module * { export * }\n"
+                                <<< "}\n").bytes
+                        )
                     }
 
                     results.checkNoTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", unextendedModuleMap]))
@@ -549,7 +591,7 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
 
                     results.checkTask(.matchTarget(target), copyModuleMap) { _ in }
 
-                    results.checkTasks(.matchTarget(target), .matchRuleType("CompileC")) {tasks in
+                    results.checkTasks(.matchTarget(target), .matchRuleType("CompileC")) { tasks in
                         for task in tasks {
                             results.checkTaskFollows(task, copyModuleMap)
                         }
@@ -581,10 +623,13 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                 let copyModuleMap = TaskCondition.matchRule(["Copy", installedModuleMap, generatedModuleMap])
 
                 results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", generatedModuleMap])) { task, contents in
-                    #expect(contents == (OutputByteStream()
-                                         <<< "framework module SwiftOnly {\n"
-                                         <<< "  header \"SwiftOnly-Swift.h\"\n"
-                                         <<< "}\n").bytes)
+                    #expect(
+                        contents
+                            == (OutputByteStream()
+                            <<< "framework module SwiftOnly {\n"
+                            <<< "  header \"SwiftOnly-Swift.h\"\n"
+                            <<< "}\n").bytes
+                    )
                 }
 
                 // Swift-only frameworks don't use -import-underlying-module, and so don't use their own clang module
@@ -618,63 +663,72 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                 let copyModuleMap = TaskCondition.matchRule(["Copy", installedModuleMap, generatedModuleMap])
 
                 results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", generatedModuleMap])) { task, contents in
-                    #expect(contents == (OutputByteStream()
-                                         <<< "framework module ObjCCompatibilityHeader {\n"
-                                         <<< "  umbrella header \"ObjCCompatibilityHeader.h\"\n"
-                                         <<< "  export *\n"
-                                         <<< "\n"
-                                         <<< "  module * { export * }\n"
-                                         <<< "}\n"
-                                         <<< "\n"
-                                         <<< "module ObjCCompatibilityHeader.Swift {\n"
-                                         <<< "  header \"ObjCCompatibilityHeader-Swift.h\"\n"
-                                         <<< "}\n").bytes)
+                    #expect(
+                        contents
+                            == (OutputByteStream()
+                            <<< "framework module ObjCCompatibilityHeader {\n"
+                            <<< "  umbrella header \"ObjCCompatibilityHeader.h\"\n"
+                            <<< "  export *\n"
+                            <<< "\n"
+                            <<< "  module * { export * }\n"
+                            <<< "}\n"
+                            <<< "\n"
+                            <<< "module ObjCCompatibilityHeader.Swift {\n"
+                            <<< "  header \"ObjCCompatibilityHeader-Swift.h\"\n"
+                            <<< "}\n").bytes
+                    )
                 }
 
                 results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", unextendedModuleMap])) { task, contents in
-                    #expect(contents == (OutputByteStream()
-                                         <<< "framework module ObjCCompatibilityHeader {\n"
-                                         <<< "  umbrella header \"ObjCCompatibilityHeader.h\"\n"
-                                         <<< "  export *\n"
-                                         <<< "\n"
-                                         <<< "  module * { export * }\n"
-                                         <<< "}\n"
-                                         <<< "\n"
-                                         <<< "module ObjCCompatibilityHeader.__Swift {\n"
-                                         <<< "  exclude header \"ObjCCompatibilityHeader-Swift.h\"\n"
-                                         <<< "}\n").bytes)
+                    #expect(
+                        contents
+                            == (OutputByteStream()
+                            <<< "framework module ObjCCompatibilityHeader {\n"
+                            <<< "  umbrella header \"ObjCCompatibilityHeader.h\"\n"
+                            <<< "  export *\n"
+                            <<< "\n"
+                            <<< "  module * { export * }\n"
+                            <<< "}\n"
+                            <<< "\n"
+                            <<< "module ObjCCompatibilityHeader.__Swift {\n"
+                            <<< "  exclude header \"ObjCCompatibilityHeader-Swift.h\"\n"
+                            <<< "}\n").bytes
+                    )
                 }
                 results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", swiftVFS])) { task, contents in
-                    #expect(contents == (OutputByteStream()
-                                         <<< "{\n"
-                                         <<< "  \"version\": 0,\n"
-                                         <<< "  \"use-external-names\": false,\n"
-                                         <<< "  \"case-sensitive\": false,\n"
-                                         <<< "  \"roots\": [{\n"
-                                         <<< "    \"type\": \"directory\",\n"
-                                         <<< "    \"name\": \"\(SRCROOT)/build/Debug/ObjCCompatibilityHeader.framework/Modules\",\n"
-                                         <<< "    \"contents\": [{\n"
-                                         <<< "      \"type\": \"file\",\n"
-                                         <<< "      \"name\": \"module.modulemap\",\n"
-                                         <<< "      \"external-contents\": \"\(unextendedModuleMap)\",\n"
-                                         <<< "    }]\n"
-                                         <<< "    },\n"
-                                         <<< "    {\n"
-                                         <<< "    \"type\": \"directory\",\n"
-                                         <<< "    \"name\": \"\(SRCROOT)/build/Debug/ObjCCompatibilityHeader.framework/Headers\",\n"
-                                         <<< "    \"contents\": [{\n"
-                                         <<< "      \"type\": \"file\",\n"
-                                         <<< "      \"name\": \"ObjCCompatibilityHeader-Swift.h\",\n"
-                                         <<< "      \"external-contents\": \"\(SRCROOT)/build/Project.build/Debug/ObjCCompatibilityHeader.build/unextended-interface-header.h\",\n"
-                                         <<< "    }]\n"
-                                         <<< "  }]\n"
-                                         <<< "}\n").bytes)
+                    #expect(
+                        contents
+                            == (OutputByteStream()
+                            <<< "{\n"
+                            <<< "  \"version\": 0,\n"
+                            <<< "  \"use-external-names\": false,\n"
+                            <<< "  \"case-sensitive\": false,\n"
+                            <<< "  \"roots\": [{\n"
+                            <<< "    \"type\": \"directory\",\n"
+                            <<< "    \"name\": \"\(SRCROOT)/build/Debug/ObjCCompatibilityHeader.framework/Modules\",\n"
+                            <<< "    \"contents\": [{\n"
+                            <<< "      \"type\": \"file\",\n"
+                            <<< "      \"name\": \"module.modulemap\",\n"
+                            <<< "      \"external-contents\": \"\(unextendedModuleMap)\",\n"
+                            <<< "    }]\n"
+                            <<< "    },\n"
+                            <<< "    {\n"
+                            <<< "    \"type\": \"directory\",\n"
+                            <<< "    \"name\": \"\(SRCROOT)/build/Debug/ObjCCompatibilityHeader.framework/Headers\",\n"
+                            <<< "    \"contents\": [{\n"
+                            <<< "      \"type\": \"file\",\n"
+                            <<< "      \"name\": \"ObjCCompatibilityHeader-Swift.h\",\n"
+                            <<< "      \"external-contents\": \"\(SRCROOT)/build/Project.build/Debug/ObjCCompatibilityHeader.build/unextended-interface-header.h\",\n"
+                            <<< "    }]\n"
+                            <<< "  }]\n"
+                            <<< "}\n").bytes
+                    )
                 }
                 // unextended-interface-header.h doesn't get written and doesn't exist.
 
                 results.checkTask(.matchTarget(target), copyModuleMap) { _ in }
 
-                results.checkTasks(.matchTarget(target), .matchRuleType("CompileC")) {tasks in
+                results.checkTasks(.matchTarget(target), .matchRuleType("CompileC")) { tasks in
                     for task in tasks {
                         results.checkTaskFollows(task, copyModuleMap)
                     }
@@ -706,17 +760,21 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     TestFile("ObjCCompatibilityHeader.swift"),
                     TestFile("ObjCSource.m"),
                     TestFile("Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "",
-                    "DEFINES_MODULE": "YES",
-                    "INFOPLIST_FILE": "Info.plist",
-                    "MODULEMAP_FILE_CONTENTS": "framework module Framework {}",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "5.0",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "",
+                        "DEFINES_MODULE": "YES",
+                        "INFOPLIST_FILE": "Info.plist",
+                        "MODULEMAP_FILE_CONTENTS": "framework module Framework {}",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": "5.0",
+                    ]
+                )
             ],
             targets: [
                 // Don't generate a module map for the umbrella header, use the provided contents.
@@ -725,10 +783,10 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     type: .framework,
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("ObjCOnly.h", headerVisibility: .public),
+                            TestBuildFile("ObjCOnly.h", headerVisibility: .public)
                         ]),
                         TestSourcesBuildPhase([
-                            "ObjCSource.m",
+                            "ObjCSource.m"
                         ]),
                     ]
                 ),
@@ -738,14 +796,17 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     "ObjCCompatibilityHeader",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "COPY_HEADERS_RUN_UNIFDEF": "YES",
-                            "COPY_HEADERS_UNIFDEF_FLAGS": "-DENABLE_FEATURE",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "COPY_HEADERS_RUN_UNIFDEF": "YES",
+                                "COPY_HEADERS_UNIFDEF_FLAGS": "-DENABLE_FEATURE",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("ObjCCompatibilityHeader.h", headerVisibility: .public),
+                            TestBuildFile("ObjCCompatibilityHeader.h", headerVisibility: .public)
                         ]),
                         TestSourcesBuildPhase([
                             "ObjCSource.m",
@@ -753,12 +814,14 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                         ]),
                     ]
                 ),
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
-        let targetParameters = [("ObjCOnly", false),
-                                ("ObjCCompatibilityHeader", true),
+        let targetParameters = [
+            ("ObjCOnly", false),
+            ("ObjCCompatibilityHeader", true),
         ]
         for (targetName, hasSwiftSource) in targetParameters {
             await tester.checkBuild(runDestination: .macOS, targetName: targetName) { results in
@@ -771,8 +834,11 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     let copyModuleMap = TaskCondition.matchRule(["Copy", installedModuleMap, generatedModuleMap])
 
                     results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", generatedModuleMap])) { task, contents in
-                        #expect(contents == (OutputByteStream()
-                                             <<< "framework module Framework {}").bytes)
+                        #expect(
+                            contents
+                                == (OutputByteStream()
+                                <<< "framework module Framework {}").bytes
+                        )
                     }
 
                     results.checkNoTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", unextendedModuleMap]))
@@ -780,7 +846,7 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
 
                     results.checkTask(.matchTarget(target), copyModuleMap) { _ in }
 
-                    results.checkTasks(.matchTarget(target), .matchRuleType("CompileC")) {tasks in
+                    results.checkTasks(.matchTarget(target), .matchRuleType("CompileC")) { tasks in
                         for task in tasks {
                             results.checkTaskFollows(task, copyModuleMap)
                         }
@@ -821,36 +887,49 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     TestFile("ObjCSource.m"),
                     TestFile("SwiftSource.swift"),
                     TestFile("Info.plist"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "ObjCOnly",
                     type: .framework,
                     buildConfigurations: [
                         // MODULEMAP_FILE supersedes MODULEMAP_FILE_CONTENTS, and doesn't require MODULEMAP_PRIVATE_FILE.
-                        try buildConfiguration(withName: "PublicModuleOnly", extraSettings: [
-                            "DEFINES_MODULE": "YES",
-                            "MODULEMAP_FILE": "ObjCOnly.modulemap",
-                            "MODULEMAP_FILE_CONTENTS": "ERROR",
-                        ]),
+                        try buildConfiguration(
+                            withName: "PublicModuleOnly",
+                            extraSettings: [
+                                "DEFINES_MODULE": "YES",
+                                "MODULEMAP_FILE": "ObjCOnly.modulemap",
+                                "MODULEMAP_FILE_CONTENTS": "ERROR",
+                            ]
+                        ),
                         // MODULEMAP_PRIVATE_FILE requires a public module map to be installed in some way.
-                        try buildConfiguration(withName: "GeneratedPublicWithPrivate", extraSettings: [
-                            "DEFINES_MODULE": "YES",
-                            "MODULEMAP_PRIVATE_FILE": "ObjCOnly.private.modulemap",
-                        ]),
-                        try buildConfiguration(withName: "ContentsPublicWithPrivate", extraSettings: [
-                            "DEFINES_MODULE": "YES",
-                            "MODULEMAP_FILE_CONTENTS": "framework module ObjCOnly {}\n",
-                            "MODULEMAP_PRIVATE_FILE": "ObjCOnly.private.modulemap",
-                        ]),
+                        try buildConfiguration(
+                            withName: "GeneratedPublicWithPrivate",
+                            extraSettings: [
+                                "DEFINES_MODULE": "YES",
+                                "MODULEMAP_PRIVATE_FILE": "ObjCOnly.private.modulemap",
+                            ]
+                        ),
+                        try buildConfiguration(
+                            withName: "ContentsPublicWithPrivate",
+                            extraSettings: [
+                                "DEFINES_MODULE": "YES",
+                                "MODULEMAP_FILE_CONTENTS": "framework module ObjCOnly {}\n",
+                                "MODULEMAP_PRIVATE_FILE": "ObjCOnly.private.modulemap",
+                            ]
+                        ),
                         // MODULEMAP_FILE and MODULEMAP_PRIVATE_FILE get unifdef'ed.
-                        try buildConfiguration(withName: "FilePublicWithPrivate", extraSettings: [
-                            "COPY_HEADERS_RUN_UNIFDEF": "YES",
-                            "COPY_HEADERS_UNIFDEF_FLAGS": "-DENABLE_FEATURE",
-                            "DEFINES_MODULE": "YES",
-                            "MODULEMAP_FILE": "ObjCOnly.modulemap",
-                            "MODULEMAP_PRIVATE_FILE": "ObjCOnly.private.modulemap",
-                        ]),
+                        try buildConfiguration(
+                            withName: "FilePublicWithPrivate",
+                            extraSettings: [
+                                "COPY_HEADERS_RUN_UNIFDEF": "YES",
+                                "COPY_HEADERS_UNIFDEF_FLAGS": "-DENABLE_FEATURE",
+                                "DEFINES_MODULE": "YES",
+                                "MODULEMAP_FILE": "ObjCOnly.modulemap",
+                                "MODULEMAP_PRIVATE_FILE": "ObjCOnly.private.modulemap",
+                            ]
+                        ),
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
@@ -858,7 +937,7 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                             TestBuildFile("ObjCOnly_Private.h", headerVisibility: .private),
                         ]),
                         TestSourcesBuildPhase([
-                            "ObjCSource.m",
+                            "ObjCSource.m"
                         ]),
                     ]
                 ),
@@ -867,19 +946,22 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     type: .framework,
                     buildConfigurations: [
                         // MODULEMAP_PRIVATE_FILE works when the public module is only Swift.
-                        try buildConfiguration(withName: "GeneratedPublicWithPrivate", extraSettings: [
-                            "DEFINES_MODULE": "YES",
-                            "MODULEMAP_PRIVATE_FILE": "PublicSwiftPrivateObjC.private.modulemap",
-                        ]),
+                        try buildConfiguration(
+                            withName: "GeneratedPublicWithPrivate",
+                            extraSettings: [
+                                "DEFINES_MODULE": "YES",
+                                "MODULEMAP_PRIVATE_FILE": "PublicSwiftPrivateObjC.private.modulemap",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("PublicSwiftPrivateObjC_Private.h", headerVisibility: .private),
+                            TestBuildFile("PublicSwiftPrivateObjC_Private.h", headerVisibility: .private)
                         ]),
                         TestSourcesBuildPhase([
                             "ObjCSource.m",
                             "SwiftSource.swift",
-                        ])
+                        ]),
                     ]
                 ),
                 TestStandardTarget(
@@ -887,18 +969,24 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     type: .framework,
                     buildConfigurations: [
                         // Swift contents are appended to the end of the public module map.
-                        buildConfiguration(withName: "PublicModuleOnly", extraSettings: [
-                            "DEFINES_MODULE": "YES",
-                            "MODULEMAP_FILE": "$(DERIVED_FILE_DIR)/ObjCAndSwift.modulemap",
-                        ]),
+                        buildConfiguration(
+                            withName: "PublicModuleOnly",
+                            extraSettings: [
+                                "DEFINES_MODULE": "YES",
+                                "MODULEMAP_FILE": "$(DERIVED_FILE_DIR)/ObjCAndSwift.modulemap",
+                            ]
+                        ),
                         // The private module doesn't get Swift contents.
-                        buildConfiguration(withName: "FilePublicWithPrivate", extraSettings: [
-                            "COPY_HEADERS_RUN_UNIFDEF": "YES",
-                            "COPY_HEADERS_UNIFDEF_FLAGS": "-DENABLE_FEATURE",
-                            "DEFINES_MODULE": "YES",
-                            "MODULEMAP_FILE": "$(DERIVED_FILE_DIR)/ObjCAndSwift.modulemap",
-                            "MODULEMAP_PRIVATE_FILE": "$(DERIVED_FILE_DIR)/ObjCAndSwift.private.modulemap",
-                        ]),
+                        buildConfiguration(
+                            withName: "FilePublicWithPrivate",
+                            extraSettings: [
+                                "COPY_HEADERS_RUN_UNIFDEF": "YES",
+                                "COPY_HEADERS_UNIFDEF_FLAGS": "-DENABLE_FEATURE",
+                                "DEFINES_MODULE": "YES",
+                                "MODULEMAP_FILE": "$(DERIVED_FILE_DIR)/ObjCAndSwift.modulemap",
+                                "MODULEMAP_PRIVATE_FILE": "$(DERIVED_FILE_DIR)/ObjCAndSwift.private.modulemap",
+                            ]
+                        ),
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
@@ -911,14 +999,16 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                             outputs: [
                                 "$(DERIVED_FILE_DIR)/ObjCAndSwift.modulemap",
                                 "$(DERIVED_FILE_DIR)/ObjCAndSwift.private.modulemap",
-                            ]),
+                            ]
+                        ),
                         TestSourcesBuildPhase([
                             "ObjCSource.m",
                             "SwiftSource.swift",
                         ]),
                     ]
                 ),
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let sourceRoot = tester.workspace.projects[0].sourceRoot
 
@@ -937,21 +1027,23 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
         }
 
         let SRCROOT = sourceRoot.str
-        let builds = [("ObjCOnly", "PublicModuleOnly", true, false, false, false, false),
-                      ("ObjCOnly", "GeneratedPublicWithPrivate", false, false, true, false, false),
-                      ("ObjCOnly", "ContentsPublicWithPrivate", false, false, true, false, false),
-                      ("ObjCOnly", "FilePublicWithPrivate", true, false, true, false, true),
-                      ("PublicSwiftPrivateObjC", "GeneratedPublicWithPrivate", false, true, true, false, false),
-                      ("ObjCAndSwift", "PublicModuleOnly", true, true, false, true, false),
-                      ("ObjCAndSwift", "FilePublicWithPrivate", true, true, true, true, true),
+        let builds = [
+            ("ObjCOnly", "PublicModuleOnly", true, false, false, false, false),
+            ("ObjCOnly", "GeneratedPublicWithPrivate", false, false, true, false, false),
+            ("ObjCOnly", "ContentsPublicWithPrivate", false, false, true, false, false),
+            ("ObjCOnly", "FilePublicWithPrivate", true, false, true, false, true),
+            ("PublicSwiftPrivateObjC", "GeneratedPublicWithPrivate", false, true, true, false, false),
+            ("ObjCAndSwift", "PublicModuleOnly", true, true, false, true, false),
+            ("ObjCAndSwift", "FilePublicWithPrivate", true, true, true, true, true),
         ]
         for (targetName, configurationName, copiesPublicModuleMap, hasSwiftExtension, copiesPrivateModuleMap, generatesSourceModuleMaps, copiesUseUnifdef) in builds {
             await tester.checkBuild(BuildParameters(configuration: configurationName), runDestination: .macOS, targetName: targetName, fs: fs) { results in
                 results.checkTarget(targetName) { target in
                     // The build directories are hard coded to "Debug" and don't use the configuration name being built.
-                    let sourceModuleMap = generatesSourceModuleMaps
-                    ? "\(SRCROOT)/build/Project.build/Debug/\(targetName).build/DerivedSources/\(targetName).modulemap"
-                    : "\(SRCROOT)/\(targetName).modulemap"
+                    let sourceModuleMap =
+                        generatesSourceModuleMaps
+                        ? "\(SRCROOT)/build/Project.build/Debug/\(targetName).build/DerivedSources/\(targetName).modulemap"
+                        : "\(SRCROOT)/\(targetName).modulemap"
                     let originalGeneratedModuleMap = "\(SRCROOT)/build/Project.build/Debug/\(targetName).build/module-original.modulemap"
                     let moduleMapExtension = "\(SRCROOT)/build/Project.build/Debug/\(targetName).build/module-swiftextension.modulemap"
                     let generatedModuleMap = "\(SRCROOT)/build/Project.build/Debug/\(targetName).build/module.modulemap"
@@ -959,9 +1051,10 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     let unextendedModuleMap = "\(SRCROOT)/build/Project.build/Debug/\(targetName).build/unextended-module.modulemap"
                     let swiftVFS = "\(SRCROOT)/build/Project.build/Debug/\(targetName).build/unextended-module-overlay.yaml"
                     let installedModuleMap = "\(SRCROOT)/build/Debug/\(targetName).framework/Versions/A/Modules/module.modulemap"
-                    let sourcePrivateModuleMap = generatesSourceModuleMaps
-                    ? "\(SRCROOT)/build/Project.build/Debug/\(targetName).build/DerivedSources/\(targetName).private.modulemap"
-                    : "\(SRCROOT)/\(targetName).private.modulemap"
+                    let sourcePrivateModuleMap =
+                        generatesSourceModuleMaps
+                        ? "\(SRCROOT)/build/Project.build/Debug/\(targetName).build/DerivedSources/\(targetName).private.modulemap"
+                        : "\(SRCROOT)/\(targetName).private.modulemap"
                     let generatedPrivateModuleMap = "\(SRCROOT)/build/Project.build/Debug/\(targetName).build/module.private.modulemap"
                     let installedPrivateModuleMap = "\(SRCROOT)/build/Debug/\(targetName).framework/Versions/A/Modules/module.private.modulemap"
 
@@ -972,11 +1065,14 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                     if copiesPublicModuleMap {
                         if hasSwiftExtension {
                             results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", moduleMapExtension])) { task, contents in
-                                #expect(contents == (OutputByteStream()
-                                                     <<< "\n"
-                                                     <<< "module \(targetName).Swift {\n"
-                                                     <<< "  header \"\(targetName)-Swift.h\"\n"
-                                                     <<< "}\n").bytes)
+                                #expect(
+                                    contents
+                                        == (OutputByteStream()
+                                        <<< "\n"
+                                        <<< "module \(targetName).Swift {\n"
+                                        <<< "  header \"\(targetName)-Swift.h\"\n"
+                                        <<< "}\n").bytes
+                                )
                             }
 
                             let concatenateSourceModuleMap: String
@@ -998,38 +1094,44 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                             }
 
                             results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", moduleMapUnextension])) { task, contents in
-                                #expect(contents == (OutputByteStream()
-                                                     <<< "\n"
-                                                     <<< "module \(targetName).__Swift {\n"
-                                                     <<< "  exclude header \"\(targetName)-Swift.h\"\n"
-                                                     <<< "}\n").bytes)
+                                #expect(
+                                    contents
+                                        == (OutputByteStream()
+                                        <<< "\n"
+                                        <<< "module \(targetName).__Swift {\n"
+                                        <<< "  exclude header \"\(targetName)-Swift.h\"\n"
+                                        <<< "}\n").bytes
+                                )
                             }
                             results.checkTask(.matchTarget(target), .matchRule(["Concatenate", unextendedModuleMap, concatenateSourceModuleMap, moduleMapUnextension])) { _ in }
                             results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", swiftVFS])) { task, contents in
-                                #expect(contents == (OutputByteStream()
-                                                     <<< "{\n"
-                                                     <<< "  \"version\": 0,\n"
-                                                     <<< "  \"use-external-names\": false,\n"
-                                                     <<< "  \"case-sensitive\": false,\n"
-                                                     <<< "  \"roots\": [{\n"
-                                                     <<< "    \"type\": \"directory\",\n"
-                                                     <<< "    \"name\": \"\(SRCROOT)/build/Debug/\(targetName).framework/Modules\",\n"
-                                                     <<< "    \"contents\": [{\n"
-                                                     <<< "      \"type\": \"file\",\n"
-                                                     <<< "      \"name\": \"module.modulemap\",\n"
-                                                     <<< "      \"external-contents\": \"\(unextendedModuleMap)\",\n"
-                                                     <<< "    }]\n"
-                                                     <<< "    },\n"
-                                                     <<< "    {\n"
-                                                     <<< "    \"type\": \"directory\",\n"
-                                                     <<< "    \"name\": \"\(SRCROOT)/build/Debug/\(targetName).framework/Headers\",\n"
-                                                     <<< "    \"contents\": [{\n"
-                                                     <<< "      \"type\": \"file\",\n"
-                                                     <<< "      \"name\": \"\(targetName)-Swift.h\",\n"
-                                                     <<< "      \"external-contents\": \"\(SRCROOT)/build/Project.build/Debug/\(targetName).build/unextended-interface-header.h\",\n"
-                                                     <<< "    }]\n"
-                                                     <<< "  }]\n"
-                                                     <<< "}\n").bytes)
+                                #expect(
+                                    contents
+                                        == (OutputByteStream()
+                                        <<< "{\n"
+                                        <<< "  \"version\": 0,\n"
+                                        <<< "  \"use-external-names\": false,\n"
+                                        <<< "  \"case-sensitive\": false,\n"
+                                        <<< "  \"roots\": [{\n"
+                                        <<< "    \"type\": \"directory\",\n"
+                                        <<< "    \"name\": \"\(SRCROOT)/build/Debug/\(targetName).framework/Modules\",\n"
+                                        <<< "    \"contents\": [{\n"
+                                        <<< "      \"type\": \"file\",\n"
+                                        <<< "      \"name\": \"module.modulemap\",\n"
+                                        <<< "      \"external-contents\": \"\(unextendedModuleMap)\",\n"
+                                        <<< "    }]\n"
+                                        <<< "    },\n"
+                                        <<< "    {\n"
+                                        <<< "    \"type\": \"directory\",\n"
+                                        <<< "    \"name\": \"\(SRCROOT)/build/Debug/\(targetName).framework/Headers\",\n"
+                                        <<< "    \"contents\": [{\n"
+                                        <<< "      \"type\": \"file\",\n"
+                                        <<< "      \"name\": \"\(targetName)-Swift.h\",\n"
+                                        <<< "      \"external-contents\": \"\(SRCROOT)/build/Project.build/Debug/\(targetName).build/unextended-interface-header.h\",\n"
+                                        <<< "    }]\n"
+                                        <<< "  }]\n"
+                                        <<< "}\n").bytes
+                                )
                             }
                         } else if copiesUseUnifdef {
                             results.checkTask(.matchTarget(target), .matchRule(["Unifdef", generatedModuleMap, sourceModuleMap])) { task in
@@ -1072,7 +1174,7 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
                         results.checkNoTask(.matchTarget(target), .matchRule(["Copy", installedPrivateModuleMap, generatedPrivateModuleMap]))
                     }
 
-                    results.checkTasks(.matchTarget(target), .matchRuleType("CompileC")) {tasks in
+                    results.checkTasks(.matchTarget(target), .matchRuleType("CompileC")) { tasks in
                         for task in tasks {
                             results.checkTaskFollows(task, copyModuleMap)
                             if hasSwiftExtension && copiesPublicModuleMap {
@@ -1107,13 +1209,16 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
     }
 
     private func buildConfiguration(withName name: String, extraSettings: [String: String]) async throws -> TestBuildConfiguration {
-        return try await TestBuildConfiguration(name, buildSettings: [
-            "CODE_SIGN_IDENTITY": "",
-            "INFOPLIST_FILE": "Info.plist",
-            "PRODUCT_NAME": "$(TARGET_NAME)",
-            "SWIFT_EXEC": swiftCompilerPath.str,
-            "SWIFT_VERSION": swiftVersion,
-        ].merging(extraSettings, uniquingKeysWith: { a, b in a }))
+        return try await TestBuildConfiguration(
+            name,
+            buildSettings: [
+                "CODE_SIGN_IDENTITY": "",
+                "INFOPLIST_FILE": "Info.plist",
+                "PRODUCT_NAME": "$(TARGET_NAME)",
+                "SWIFT_EXEC": swiftCompilerPath.str,
+                "SWIFT_VERSION": swiftVersion,
+            ].merging(extraSettings, uniquingKeysWith: { a, b in a })
+        )
     }
 
     private func checkExpectedTasks(in planningResults: TaskConstructionTester.PlanningResults, for target: ConfiguredTarget) {
diff --git a/Tests/SWBTaskConstructionTests/ModuleVerifierTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/ModuleVerifierTaskConstructionTests.swift
index 528c1ec0..9b923341 100644
--- a/Tests/SWBTaskConstructionTests/ModuleVerifierTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/ModuleVerifierTaskConstructionTests.swift
@@ -36,29 +36,33 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                     TestFile("Orange.h"),
                     TestFile("Orange.defs"),
                     TestFile("main.m"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ARCHS": archs.joined(separator: " "),
-                            "DEFINES_MODULE": "YES",
-                            "ENABLE_MODULE_VERIFIER": "YES",
-                            "MODULE_VERIFIER_KIND": "builtin",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "MODULE_VERIFIER_TARGET_TRIPLE_VARIANTS": "x86_64-apple-macos14.0-macabi x86_64-apple-macos14.0-macabi arm64e-apple-macos14.0-macabi",
-                            "MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS": "gnu11 rust-1.71",
-                            "MODULE_VERIFIER_SUPPORTED_LANGUAGES": "objective-c objective-c++ rust",
-                            "MODULE_VERIFIER_VERBOSE": "YES",
-                            "MODULE_VERIFIER_LSV": "YES",
-                            "MODULES_VERIFIER_EXEC": "/alternate/modules-verifier",
-                            "OTHER_MODULE_VERIFIER_FLAGS": "-- -I$(BUILT_PRODUCTS_DIR)/usr/include",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "CC": clangCompilerPath.str,
-                            "CLANG_USE_RESPONSE_FILE": "NO",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ARCHS": archs.joined(separator: " "),
+                                "DEFINES_MODULE": "YES",
+                                "ENABLE_MODULE_VERIFIER": "YES",
+                                "MODULE_VERIFIER_KIND": "builtin",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "MODULE_VERIFIER_TARGET_TRIPLE_VARIANTS": "x86_64-apple-macos14.0-macabi x86_64-apple-macos14.0-macabi arm64e-apple-macos14.0-macabi",
+                                "MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS": "gnu11 rust-1.71",
+                                "MODULE_VERIFIER_SUPPORTED_LANGUAGES": "objective-c objective-c++ rust",
+                                "MODULE_VERIFIER_VERBOSE": "YES",
+                                "MODULE_VERIFIER_LSV": "YES",
+                                "MODULES_VERIFIER_EXEC": "/alternate/modules-verifier",
+                                "OTHER_MODULE_VERIFIER_FLAGS": "-- -I$(BUILT_PRODUCTS_DIR)/usr/include",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "CC": clangCompilerPath.str,
+                                "CLANG_USE_RESPONSE_FILE": "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
@@ -66,10 +70,12 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                             TestBuildFile("Orange.defs", headerVisibility: .public),
                         ]),
                         TestSourcesBuildPhase([
-                            "main.m",
+                            "main.m"
                         ]),
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(BuildParameters(action: .install, configuration: "Debug"), runDestination: .anyMac) { results in
             results.checkError("No standard in \"gnu11\" is valid for language objective-c++")
@@ -95,30 +101,34 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                     TestFile("Orange.h"),
                     TestFile("Orange.defs"),
                     TestFile("main.m"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ARCHS": archs.joined(separator: " "),
-                            "DEFINES_MODULE": "YES",
-                            "ENABLE_MODULE_VERIFIER": "YES",
-                            "MODULE_VERIFIER_KIND": "builtin",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS": "gnu11 gnu17 gnu++20",
-                            "MODULE_VERIFIER_SUPPORTED_LANGUAGES": "objective-c objective-c++",
-                            "MODULE_VERIFIER_VERBOSE": "YES",
-                            "MODULE_VERIFIER_LSV": "YES",
-                            "MODULES_VERIFIER_EXEC": "/alternate/modules-verifier",
-                            "OTHER_MODULE_VERIFIER_FLAGS": "-- -I$(BUILT_PRODUCTS_DIR)/usr/include",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "CC": clangCompilerPath.str,
-                            "OTHER_CFLAGS": "-DTARGET_FLAG",
-                            "FRAMEWORK_SEARCH_PATHS": "/TARGET_PATH",
-                            "CLANG_USE_RESPONSE_FILE": "NO",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ARCHS": archs.joined(separator: " "),
+                                "DEFINES_MODULE": "YES",
+                                "ENABLE_MODULE_VERIFIER": "YES",
+                                "MODULE_VERIFIER_KIND": "builtin",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS": "gnu11 gnu17 gnu++20",
+                                "MODULE_VERIFIER_SUPPORTED_LANGUAGES": "objective-c objective-c++",
+                                "MODULE_VERIFIER_VERBOSE": "YES",
+                                "MODULE_VERIFIER_LSV": "YES",
+                                "MODULES_VERIFIER_EXEC": "/alternate/modules-verifier",
+                                "OTHER_MODULE_VERIFIER_FLAGS": "-- -I$(BUILT_PRODUCTS_DIR)/usr/include",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "CC": clangCompilerPath.str,
+                                "OTHER_CFLAGS": "-DTARGET_FLAG",
+                                "FRAMEWORK_SEARCH_PATHS": "/TARGET_PATH",
+                                "CLANG_USE_RESPONSE_FILE": "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
@@ -126,10 +136,12 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                             TestBuildFile("Orange.defs", headerVisibility: .public),
                         ]),
                         TestSourcesBuildPhase([
-                            "main.m",
+                            "main.m"
                         ]),
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -137,9 +149,12 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
 
         let fs = PseudoFS()
         try fs.createDirectory(xcconfig.dirname, recursive: true)
-        try fs.write(xcconfig, contents: """
-            FRAMEWORK_SEARCH_PATHS = /XCCONFIG_PATH
-            """)
+        try fs.write(
+            xcconfig,
+            contents: """
+                FRAMEWORK_SEARCH_PATHS = /XCCONFIG_PATH
+                """
+        )
 
         // A regular build will just build the correct architecture.
         await tester.checkBuild(BuildParameters(configuration: "Debug", commandLineOverrides: ["OTHER_CFLAGS": "-DCLI_FLAG"], environmentConfigOverridesPath: xcconfig), runDestination: .macOS, fs: fs) { results in
@@ -147,7 +162,7 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
             results.checkNoDiagnostics()
 
             results.checkTarget(targetName) { target in
-                results.checkTasks(.matchRuleType("VerifyModuleC")) {tasks in
+                results.checkTasks(.matchRuleType("VerifyModuleC")) { tasks in
                     #expect(tasks.count == 6)
                     var ruleInfos: Set<[String]> = []
                     for task in tasks {
@@ -187,7 +202,7 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                             ])
                         } else {
                             task.checkCommandLineMatches([
-                                .or("-std=gnu11", "-std=gnu17"),
+                                .or("-std=gnu11", "-std=gnu17")
                             ])
                         }
                         guard task.ruleInfo.count > 7 else { continue }
@@ -200,14 +215,16 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
 
                     }
 
-                    #expect(ruleInfos == [
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", arch, "objective-c", "gnu11", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", arch, "objective-c", "gnu17", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", arch, "objective-c++", "gnu++20", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", arch, "objective-c", "gnu11", "lsv", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", arch, "objective-c", "gnu17", "lsv", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", arch, "objective-c++", "gnu++20", "lsv", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                    ])
+                    #expect(
+                        ruleInfos == [
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", arch, "objective-c", "gnu11", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", arch, "objective-c", "gnu17", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", arch, "objective-c++", "gnu++20", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", arch, "objective-c", "gnu11", "lsv", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", arch, "objective-c", "gnu17", "lsv", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", arch, "objective-c++", "gnu++20", "lsv", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                        ]
+                    )
                 }
                 // Check that we have a modules verifier task.
                 results.checkTasks(.matchTarget(target), .matchRuleType("GenerateVerifyModuleInput")) { tasks in
@@ -247,7 +264,7 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                         #expect(!task.alwaysExecuteTask)
                         task.checkInputs(contain: [
                             .name("module.modulemap"),
-                            .name("Orange.h")
+                            .name("Orange.h"),
                         ])
                         task.checkNoInputs(contain: [
                             .name("Orange.defs")
@@ -263,27 +280,29 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
             results.checkNoDiagnostics()
 
             results.checkTarget(targetName) { target in
-                results.checkTasks(.matchRuleType("VerifyModuleC")) {tasks in
+                results.checkTasks(.matchRuleType("VerifyModuleC")) { tasks in
                     #expect(tasks.count == 12)
                     var ruleInfos: Set<[String]> = []
                     for task in tasks {
                         ruleInfos.insert(task.ruleInfo)
                     }
 
-                    #expect(ruleInfos == [
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "arm64", "objective-c", "gnu11", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "arm64", "objective-c", "gnu17", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "arm64", "objective-c++", "gnu++20", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "x86_64", "objective-c", "gnu11", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "x86_64", "objective-c", "gnu17", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "x86_64", "objective-c++", "gnu++20", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "arm64", "objective-c", "gnu11",  "lsv", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "arm64", "objective-c", "gnu17",  "lsv", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "arm64", "objective-c++", "gnu++20",  "lsv", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "x86_64", "objective-c", "gnu11",  "lsv", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "x86_64", "objective-c", "gnu17",  "lsv", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "x86_64", "objective-c++", "gnu++20",  "lsv", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                    ])
+                    #expect(
+                        ruleInfos == [
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "arm64", "objective-c", "gnu11", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "arm64", "objective-c", "gnu17", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "arm64", "objective-c++", "gnu++20", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "x86_64", "objective-c", "gnu11", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "x86_64", "objective-c", "gnu17", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "x86_64", "objective-c++", "gnu++20", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "arm64", "objective-c", "gnu11", "lsv", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "arm64", "objective-c", "gnu17", "lsv", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "arm64", "objective-c++", "gnu++20", "lsv", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "x86_64", "objective-c", "gnu11", "lsv", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "x86_64", "objective-c", "gnu17", "lsv", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", "x86_64", "objective-c++", "gnu++20", "lsv", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                        ]
+                    )
                 }
                 results.checkTasks(.matchTarget(target), .matchRuleType("GenerateVerifyModuleInput")) { tasks in
                     var languages: Set<String> = []
@@ -303,21 +322,25 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
         let clangCompilerPath = try await self.clangCompilerPath
         try await withTemporaryDirectory { tmpDir in
             let sdkPath = tmpDir.join("MySDK.sdk")
-            try await writeSDK(name: sdkPath.basename, parentDir: sdkPath.dirname, settings: [
-                "CanonicalName": "com.apple.my_sdk.1.0",
-                "IsBaseSDK": true,
-                "DefaultProperties": [
-                    "PLATFORM_NAME": "macosx",
-                ],
-                "CustomProperties": [
-                    "SYSTEM_FRAMEWORK_SEARCH_PATHS": "$(inherited) $(SDKROOT)$(SYSTEM_PREFIX)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks"
-                ],
-                "SupportedTargets": [
-                    "default": [
-                        "LLVMTargetTripleVendor": "apple",
-                    ]
+            try await writeSDK(
+                name: sdkPath.basename,
+                parentDir: sdkPath.dirname,
+                settings: [
+                    "CanonicalName": "com.apple.my_sdk.1.0",
+                    "IsBaseSDK": true,
+                    "DefaultProperties": [
+                        "PLATFORM_NAME": "macosx"
+                    ],
+                    "CustomProperties": [
+                        "SYSTEM_FRAMEWORK_SEARCH_PATHS": "$(inherited) $(SDKROOT)$(SYSTEM_PREFIX)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks"
+                    ],
+                    "SupportedTargets": [
+                        "default": [
+                            "LLVMTargetTripleVendor": "apple"
+                        ]
+                    ],
                 ]
-            ])
+            )
 
             let targetName = "Orange"
             let testProject = TestProject(
@@ -329,23 +352,27 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                         TestFile("Orange.h"),
                         TestFile("Orange.defs"),
                         TestFile("main.m"),
-                    ]),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         targetName,
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "ARCHS": "x86_64",
-                                "DEFINES_MODULE": "YES",
-                                "ENABLE_MODULE_VERIFIER": "YES",
-                                "MODULE_VERIFIER_KIND": "builtin",
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SDKROOT": sdkPath.str,
-                                "CC": clangCompilerPath.str,
-                                "CLANG_USE_RESPONSE_FILE": "NO",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "ARCHS": "x86_64",
+                                    "DEFINES_MODULE": "YES",
+                                    "ENABLE_MODULE_VERIFIER": "YES",
+                                    "MODULE_VERIFIER_KIND": "builtin",
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SDKROOT": sdkPath.str,
+                                    "CC": clangCompilerPath.str,
+                                    "CLANG_USE_RESPONSE_FILE": "NO",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([
@@ -353,10 +380,12 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                                 TestBuildFile("Orange.defs", headerVisibility: .public),
                             ]),
                             TestSourcesBuildPhase([
-                                "main.m",
+                                "main.m"
                             ]),
-                        ]),
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             // A regular build will just build the correct architecture.
@@ -388,28 +417,28 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
             ],
             "SupportedTargets": [
                 "macos": [
-                    "LLVMTargetTripleVendor": "apple",
+                    "LLVMTargetTripleVendor": "apple"
                 ],
                 "iosmac": [
-                    "LLVMTargetTripleVendor": "apple",
-                ]
+                    "LLVMTargetTripleVendor": "apple"
+                ],
             ],
             "Variants": .plArray([
                 .plDict([
                     "Name": "iosmac",
                     "BuildSettings": [
                         "LLVM_TARGET_TRIPLE_OS_VERSION": "ios17.0",
-                        "SYSTEM_FRAMEWORK_SEARCH_PATHS": "$(inherited) $(SDKROOT)$(IOS_UNZIPPERED_TWIN_PREFIX_PATH)/System/Library/PrivateFrameworks"
-                    ]
+                        "SYSTEM_FRAMEWORK_SEARCH_PATHS": "$(inherited) $(SDKROOT)$(IOS_UNZIPPERED_TWIN_PREFIX_PATH)/System/Library/PrivateFrameworks",
+                    ],
                 ]),
                 .plDict([
                     "Name": "macos",
                     "BuildSettings": [
                         "LLVM_TARGET_TRIPLE_OS_VERSION": "macos14.0",
                         "SYSTEM_FRAMEWORK_SEARCH_PATHS": "$(inherited) $(SDKROOT)/System/Library/PrivateFrameworks",
-                    ]
-                ])
-            ])
+                    ],
+                ]),
+            ]),
         ]
         try await withTemporaryDirectory { tmpDir in
             let sdkPath = tmpDir.join("MySDK.sdk")
@@ -426,24 +455,28 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                         TestFile("Orange.h"),
                         TestFile("Orange.defs"),
                         TestFile("main.m"),
-                    ]),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         targetName,
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "ARCHS": "x86_64",
-                                "DEFINES_MODULE": "YES",
-                                "ENABLE_MODULE_VERIFIER": "YES",
-                                "MODULE_VERIFIER_KIND": "builtin",
-                                "MODULE_VERIFIER_TARGET_TRIPLE_VARIANTS": "x86_64-apple-ios17.0-macabi",
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SDKROOT": sdkPath.str,
-                                "CC": clangCompilerPath.str,
-                                "CLANG_USE_RESPONSE_FILE": "NO",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "ARCHS": "x86_64",
+                                    "DEFINES_MODULE": "YES",
+                                    "ENABLE_MODULE_VERIFIER": "YES",
+                                    "MODULE_VERIFIER_KIND": "builtin",
+                                    "MODULE_VERIFIER_TARGET_TRIPLE_VARIANTS": "x86_64-apple-ios17.0-macabi",
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SDKROOT": sdkPath.str,
+                                    "CC": clangCompilerPath.str,
+                                    "CLANG_USE_RESPONSE_FILE": "NO",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([
@@ -451,10 +484,12 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                                 TestBuildFile("Orange.defs", headerVisibility: .public),
                             ]),
                             TestSourcesBuildPhase([
-                                "main.m",
+                                "main.m"
                             ]),
-                        ]),
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             // A regular build will just build the correct architecture.
@@ -503,11 +538,11 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
             ],
             "SupportedTargets": [
                 "macos": [
-                    "LLVMTargetTripleVendor": "apple",
+                    "LLVMTargetTripleVendor": "apple"
                 ],
                 "iosmac": [
-                    "LLVMTargetTripleVendor": "apple",
-                ]
+                    "LLVMTargetTripleVendor": "apple"
+                ],
             ],
             "Variants": .plArray([
                 .plDict([
@@ -515,17 +550,17 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                     "BuildSettings": [
                         "LLVM_TARGET_TRIPLE_OS_VERSION": "ios17.0",
                         "LLVM_TARGET_TRIPLE_SUFFIX": "-macabi",
-                        "SYSTEM_FRAMEWORK_SEARCH_PATHS": "$(inherited) $(SDKROOT)$(IOS_UNZIPPERED_TWIN_PREFIX_PATH)/System/Library/PrivateFrameworks"
-                    ]
+                        "SYSTEM_FRAMEWORK_SEARCH_PATHS": "$(inherited) $(SDKROOT)$(IOS_UNZIPPERED_TWIN_PREFIX_PATH)/System/Library/PrivateFrameworks",
+                    ],
                 ]),
                 .plDict([
                     "Name": "macos",
                     "BuildSettings": [
                         "LLVM_TARGET_TRIPLE_OS_VERSION": "macos14.0",
                         "SYSTEM_FRAMEWORK_SEARCH_PATHS": "$(inherited) $(SDKROOT)/System/Library/PrivateFrameworks",
-                    ]
-                ])
-            ])
+                    ],
+                ]),
+            ]),
         ]
         try await withTemporaryDirectory { tmpDir in
             let sdkPath = tmpDir.join("MySDK.sdk")
@@ -542,25 +577,29 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                         TestFile("Orange.h"),
                         TestFile("Orange.defs"),
                         TestFile("main.m"),
-                    ]),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         targetName,
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "ARCHS": "x86_64",
-                                "DEFINES_MODULE": "YES",
-                                "ENABLE_MODULE_VERIFIER": "YES",
-                                "MODULE_VERIFIER_KIND": "builtin",
-                                "MODULE_VERIFIER_TARGET_TRIPLE_VARIANTS": "",
-                                "SDK_VARIANT": "iosmac",
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SDKROOT": sdkPath.str,
-                                "CC": clangCompilerPath.str,
-                                "CLANG_USE_RESPONSE_FILE": "NO",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "ARCHS": "x86_64",
+                                    "DEFINES_MODULE": "YES",
+                                    "ENABLE_MODULE_VERIFIER": "YES",
+                                    "MODULE_VERIFIER_KIND": "builtin",
+                                    "MODULE_VERIFIER_TARGET_TRIPLE_VARIANTS": "",
+                                    "SDK_VARIANT": "iosmac",
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SDKROOT": sdkPath.str,
+                                    "CC": clangCompilerPath.str,
+                                    "CLANG_USE_RESPONSE_FILE": "NO",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([
@@ -568,10 +607,12 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                                 TestBuildFile("Orange.defs", headerVisibility: .public),
                             ]),
                             TestSourcesBuildPhase([
-                                "main.m",
+                                "main.m"
                             ]),
-                        ]),
-                ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             // A regular build will just build the correct architecture.
@@ -607,23 +648,27 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                     TestFile("Orange.h"),
                     TestFile("Orange.defs"),
                     TestFile("main.m"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ARCHS": archs.joined(separator: " "),
-                            "DEFINES_MODULE": "YES",
-                            "ENABLE_MODULE_VERIFIER": "YES",
-                            "MODULE_VERIFIER_KIND": "builtin",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS": "",
-                            "MODULE_VERIFIER_SUPPORTED_LANGUAGES": "objective-c objective-c++",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "CC": clangCompilerPath.str,
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ARCHS": archs.joined(separator: " "),
+                                "DEFINES_MODULE": "YES",
+                                "ENABLE_MODULE_VERIFIER": "YES",
+                                "MODULE_VERIFIER_KIND": "builtin",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS": "",
+                                "MODULE_VERIFIER_SUPPORTED_LANGUAGES": "objective-c objective-c++",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "CC": clangCompilerPath.str,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
@@ -631,10 +676,12 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                             TestBuildFile("Orange.defs", headerVisibility: .public),
                         ]),
                         TestSourcesBuildPhase([
-                            "main.m",
+                            "main.m"
                         ]),
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -644,16 +691,18 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
             results.checkNoDiagnostics()
 
             results.checkTarget(targetName) { target in
-                results.checkTasks(.matchRuleType("VerifyModuleC")) {tasks in
+                results.checkTasks(.matchRuleType("VerifyModuleC")) { tasks in
                     var ruleInfos: Set<[String]> = []
                     for task in tasks {
                         ruleInfos.insert(task.ruleInfo)
                     }
 
-                    #expect(ruleInfos == [
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", arch, "objective-c", "gnu17", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                        ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", arch, "objective-c++", "gnu++20", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
-                    ])
+                    #expect(
+                        ruleInfos == [
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", arch, "objective-c", "gnu17", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                            ["VerifyModuleC", "\(SRCROOT)/build/Debug/Orange.framework", "", "", arch, "objective-c++", "gnu++20", "", "com.apple.compilers.llvm.clang.1_0.verify_module"],
+                        ]
+                    )
                 }
             }
         }
@@ -665,65 +714,70 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
             let blockListFilePath = tmpDirPath.join("clang-builtin-module-verify.json")
             let targetName = "Orange"
             let testProject =
-            TestProject(
-                "aProject",
-                sourceRoot: tmpDirPath.join("Test"),
-                groupTree: TestGroup(
-                    "Group",
-                    path: "Sources",
-                    children: [
-                        TestFile("Orange.h"),
-                        TestFile("Orange.defs"),
-                        TestFile("main.m"),
-                    ]),
-                targets: [
-                    TestStandardTarget(
-                        targetName,
-                        type: .framework,
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "ARCHS": "arm64",
-                                "DEFINES_MODULE": "YES",
-                                "ENABLE_MODULE_VERIFIER": "YES",
-                                "MODULE_VERIFIER_KIND": "builtin",
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS": "gnu11",
-                                "MODULE_VERIFIER_SUPPORTED_LANGUAGES": "objective-c",
-                                "MODULE_VERIFIER_VERBOSE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "BLOCKLISTS_PATH": tmpDirPath.str,
-                            ]),
-                        ],
-                        buildPhases: [
-                            TestHeadersBuildPhase([
-                                TestBuildFile("Orange.h", headerVisibility: .public)
-                            ]),
-                            TestSourcesBuildPhase([
-                                "main.m",
-                            ]),
-                    ]),
-                ])
-
-                let core = try await getCore()
-                let tester = try await BuildOperationTester(core, testProject, simulated: false)
-                let SRCROOT = tester.workspace.projects[0].sourceRoot
-                for inputFile in ["Sources/Orange.h", "Sources/Orange.defs", "Sources/main.m"] {
-                    try await tester.fs.writeFileContents(SRCROOT.join(inputFile)) { stream in
-                        stream <<< ""
-                    }
-                }
-                try await tester.fs.writeFileContents(blockListFilePath) { file in
-                    file <<<
-                        """
-                        { "KnownFailures": ["aProject"]}
-                        """
+                TestProject(
+                    "aProject",
+                    sourceRoot: tmpDirPath.join("Test"),
+                    groupTree: TestGroup(
+                        "Group",
+                        path: "Sources",
+                        children: [
+                            TestFile("Orange.h"),
+                            TestFile("Orange.defs"),
+                            TestFile("main.m"),
+                        ]
+                    ),
+                    targets: [
+                        TestStandardTarget(
+                            targetName,
+                            type: .framework,
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "ARCHS": "arm64",
+                                        "DEFINES_MODULE": "YES",
+                                        "ENABLE_MODULE_VERIFIER": "YES",
+                                        "MODULE_VERIFIER_KIND": "builtin",
+                                        "GENERATE_INFOPLIST_FILE": "YES",
+                                        "MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS": "gnu11",
+                                        "MODULE_VERIFIER_SUPPORTED_LANGUAGES": "objective-c",
+                                        "MODULE_VERIFIER_VERBOSE": "YES",
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "BLOCKLISTS_PATH": tmpDirPath.str,
+                                    ]
+                                )
+                            ],
+                            buildPhases: [
+                                TestHeadersBuildPhase([
+                                    TestBuildFile("Orange.h", headerVisibility: .public)
+                                ]),
+                                TestSourcesBuildPhase([
+                                    "main.m"
+                                ]),
+                            ]
+                        )
+                    ]
+                )
+
+            let core = try await getCore()
+            let tester = try await BuildOperationTester(core, testProject, simulated: false)
+            let SRCROOT = tester.workspace.projects[0].sourceRoot
+            for inputFile in ["Sources/Orange.h", "Sources/Orange.defs", "Sources/main.m"] {
+                try await tester.fs.writeFileContents(SRCROOT.join(inputFile)) { stream in
+                    stream <<< ""
                 }
-                /// Verify that while the project has enabled `MODULE_VERIFIER_KIND=builtin` the external module verifier is invoked because the project is on the blocklist.
-                try await tester.checkBuild(runDestination: .macOS) { results in
+            }
+            try await tester.fs.writeFileContents(blockListFilePath) { file in
+                file <<< """
+                    { "KnownFailures": ["aProject"]}
+                    """
+            }
+            /// Verify that while the project has enabled `MODULE_VERIFIER_KIND=builtin` the external module verifier is invoked because the project is on the blocklist.
+            try await tester.checkBuild(runDestination: .macOS) { results in
                 results.checkNoDiagnostics()
                 results.checkTask(.matchRuleType("VerifyModule")) { task in
-                        task.checkRuleInfo(["VerifyModule", "\(SRCROOT.str)/build/Debug/Orange.framework"])
-                        task.checkCommandLineMatches([.suffix("modules-verifier"), "\(SRCROOT.str)/build/Debug/Orange.framework", .anySequence, "--clang", .suffix("clang"), .anySequence])
+                    task.checkRuleInfo(["VerifyModule", "\(SRCROOT.str)/build/Debug/Orange.framework"])
+                    task.checkCommandLineMatches([.suffix("modules-verifier"), "\(SRCROOT.str)/build/Debug/Orange.framework", .anySequence, "--clang", .suffix("clang"), .anySequence])
                 }
                 results.checkNoErrors()
             }
@@ -743,26 +797,30 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                     TestFile("Orange.h"),
                     TestFile("Orange.defs"),
                     TestFile("main.m"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ARCHS": archs.joined(separator: " "),
-                            "DEFINES_MODULE": "YES",
-                            "ENABLE_MODULE_VERIFIER": "YES",
-                            "MODULE_VERIFIER_KIND": "external",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS": "gnu11 gnu17 gnu++20",
-                            "MODULE_VERIFIER_SUPPORTED_LANGUAGES": "objective-c objective-c++",
-                            "MODULE_VERIFIER_VERBOSE": "YES",
-                            "MODULE_VERIFIER_LSV": "YES",
-                            "MODULES_VERIFIER_EXEC": "/alternate/modules-verifier",
-                            "OTHER_MODULE_VERIFIER_FLAGS": "-- -I$(BUILT_PRODUCTS_DIR)/usr/include",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ARCHS": archs.joined(separator: " "),
+                                "DEFINES_MODULE": "YES",
+                                "ENABLE_MODULE_VERIFIER": "YES",
+                                "MODULE_VERIFIER_KIND": "external",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS": "gnu11 gnu17 gnu++20",
+                                "MODULE_VERIFIER_SUPPORTED_LANGUAGES": "objective-c objective-c++",
+                                "MODULE_VERIFIER_VERBOSE": "YES",
+                                "MODULE_VERIFIER_LSV": "YES",
+                                "MODULES_VERIFIER_EXEC": "/alternate/modules-verifier",
+                                "OTHER_MODULE_VERIFIER_FLAGS": "-- -I$(BUILT_PRODUCTS_DIR)/usr/include",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
@@ -770,10 +828,12 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                             TestBuildFile("Orange.defs", headerVisibility: .public),
                         ]),
                         TestSourcesBuildPhase([
-                            "main.m",
+                            "main.m"
                         ]),
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -821,7 +881,7 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                     #expect(!task.alwaysExecuteTask)
                     task.checkInputs(contain: [
                         .name("module.modulemap"),
-                        .name("Orange.h")
+                        .name("Orange.h"),
                     ])
                     task.checkNoInputs(contain: [
                         .name("Orange.defs")
@@ -838,21 +898,22 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchTarget(target), .matchRuleType("VerifyModule")) { task in
                     task.checkRuleInfo(["VerifyModule", "\(SRCROOT)/build/Debug/Orange.framework"])
 
-                    let expectedCommandLine = [
-                        "/alternate/modules-verifier",
-                        "\(SRCROOT)/build/Debug/Orange.framework",
-                        "--clang", "clang",
-                        "--diagnostic-filename-map", "\(SRCROOT)/build/aProject.build/Debug/Orange.build/Orange-diagnostic-filename-map.json",
-                        "--sdk", core.loadSDK(.macOS).path.str,
-                        "--intermediates-directory", "\(SRCROOT)/build/aProject.build/Debug/Orange.build/VerifyModule"
-                    ]
-                    + archs.flatMap { ["--target", "\($0)-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)"] } + [
-                        "--language", "objective-c", "--language", "objective-c++",
-                        "--standard", "gnu11", "--standard", "gnu17", "--standard", "gnu++20",
-                        "--verbose",
-                        "--enable-local-submodule-visibility",
-                        "--", "-I\(SRCROOT)/build/Debug/usr/include",
-                    ]
+                    let expectedCommandLine =
+                        [
+                            "/alternate/modules-verifier",
+                            "\(SRCROOT)/build/Debug/Orange.framework",
+                            "--clang", "clang",
+                            "--diagnostic-filename-map", "\(SRCROOT)/build/aProject.build/Debug/Orange.build/Orange-diagnostic-filename-map.json",
+                            "--sdk", core.loadSDK(.macOS).path.str,
+                            "--intermediates-directory", "\(SRCROOT)/build/aProject.build/Debug/Orange.build/VerifyModule",
+                        ]
+                        + archs.flatMap { ["--target", "\($0)-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)"] } + [
+                            "--language", "objective-c", "--language", "objective-c++",
+                            "--standard", "gnu11", "--standard", "gnu17", "--standard", "gnu++20",
+                            "--verbose",
+                            "--enable-local-submodule-visibility",
+                            "--", "-I\(SRCROOT)/build/Debug/usr/include",
+                        ]
                     task.checkCommandLine(expectedCommandLine)
                 }
             }
@@ -863,36 +924,45 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
     func excludedFilesBuiltin() async throws {
         let clangCompilerPath = try await self.clangCompilerPath
         let targetName = "Orange"
-        let testProject = TestProject("aProject",
-                                      groupTree: TestGroup(targetName, path: targetName,
-                                                           children: [
-                                                            TestFile("Orange.h"),
-                                                            TestFile("Excluded.h"),
-                                                            TestFile("iOS.h")
-                                                           ]),
-                                      targets: [
-                                        TestStandardTarget(targetName,
-                                                           type: .framework,
-                                                           buildConfigurations: [
-                                                            TestBuildConfiguration("Debug",
-                                                                                   buildSettings: [
-                                                                                    "DEFINES_MODULE": "YES",
-                                                                                    "ENABLE_MODULE_VERIFIER": "YES",
-                                                                                    "MODULE_VERIFIER_KIND": "builtin",
-                                                                                    "EXCLUDED_SOURCE_FILE_NAMES": "Excluded.h",
-                                                                                    "GENERATE_INFOPLIST_FILE": "YES",
-                                                                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                                                    "CC": clangCompilerPath.str,
-                                                                                   ]),
-                                                           ],
-                                                           buildPhases: [
-                                                            TestHeadersBuildPhase([
-                                                                TestBuildFile("Orange.h", headerVisibility: .public),
-                                                                TestBuildFile("Excluded.h", headerVisibility: .public),
-                                                                TestBuildFile("iOS.h", headerVisibility: .public, platformFilters: PlatformFilter.iOSFilters),
-                                                            ]),
-                                                           ]),
-                                      ])
+        let testProject = TestProject(
+            "aProject",
+            groupTree: TestGroup(
+                targetName,
+                path: targetName,
+                children: [
+                    TestFile("Orange.h"),
+                    TestFile("Excluded.h"),
+                    TestFile("iOS.h"),
+                ]
+            ),
+            targets: [
+                TestStandardTarget(
+                    targetName,
+                    type: .framework,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "DEFINES_MODULE": "YES",
+                                "ENABLE_MODULE_VERIFIER": "YES",
+                                "MODULE_VERIFIER_KIND": "builtin",
+                                "EXCLUDED_SOURCE_FILE_NAMES": "Excluded.h",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "CC": clangCompilerPath.str,
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestHeadersBuildPhase([
+                            TestBuildFile("Orange.h", headerVisibility: .public),
+                            TestBuildFile("Excluded.h", headerVisibility: .public),
+                            TestBuildFile("iOS.h", headerVisibility: .public, platformFilters: PlatformFilter.iOSFilters),
+                        ])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(runDestination: .macOS, targetName: targetName) { results in
@@ -901,7 +971,7 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                 results.checkNoDiagnostics()
                 results.checkTask(.matchTarget(target), .matchRuleType("GenerateVerifyModuleInput")) { task in
                     task.checkInputs(contain: [
-                        .name("Orange.h"),
+                        .name("Orange.h")
                     ])
                     task.checkNoInputs(contain: [
                         .name("Excluded.h"),
@@ -922,35 +992,44 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS))
     func excludedFilesExternal() async throws {
         let targetName = "Orange"
-        let testProject = TestProject("aProject",
-                                      groupTree: TestGroup(targetName, path: targetName,
-                                                           children: [
-                                                            TestFile("Orange.h"),
-                                                            TestFile("Excluded.h"),
-                                                            TestFile("iOS.h")
-                                                           ]),
-                                      targets: [
-                                        TestStandardTarget(targetName,
-                                                           type: .framework,
-                                                           buildConfigurations: [
-                                                            TestBuildConfiguration("Debug",
-                                                                                   buildSettings: [
-                                                                                    "DEFINES_MODULE": "YES",
-                                                                                    "ENABLE_MODULE_VERIFIER": "YES",
-                                                                                    "MODULE_VERIFIER_KIND": "external",
-                                                                                    "EXCLUDED_SOURCE_FILE_NAMES": "Excluded.h",
-                                                                                    "GENERATE_INFOPLIST_FILE": "YES",
-                                                                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                                                   ]),
-                                                           ],
-                                                           buildPhases: [
-                                                            TestHeadersBuildPhase([
-                                                                TestBuildFile("Orange.h", headerVisibility: .public),
-                                                                TestBuildFile("Excluded.h", headerVisibility: .public),
-                                                                TestBuildFile("iOS.h", headerVisibility: .public, platformFilters: PlatformFilter.iOSFilters),
-                                                            ]),
-                                                           ]),
-                                      ])
+        let testProject = TestProject(
+            "aProject",
+            groupTree: TestGroup(
+                targetName,
+                path: targetName,
+                children: [
+                    TestFile("Orange.h"),
+                    TestFile("Excluded.h"),
+                    TestFile("iOS.h"),
+                ]
+            ),
+            targets: [
+                TestStandardTarget(
+                    targetName,
+                    type: .framework,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "DEFINES_MODULE": "YES",
+                                "ENABLE_MODULE_VERIFIER": "YES",
+                                "MODULE_VERIFIER_KIND": "external",
+                                "EXCLUDED_SOURCE_FILE_NAMES": "Excluded.h",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestHeadersBuildPhase([
+                            TestBuildFile("Orange.h", headerVisibility: .public),
+                            TestBuildFile("Excluded.h", headerVisibility: .public),
+                            TestBuildFile("iOS.h", headerVisibility: .public, platformFilters: PlatformFilter.iOSFilters),
+                        ])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(runDestination: .macOS, targetName: targetName) { results in
@@ -959,7 +1038,7 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                 results.checkNoDiagnostics()
                 results.checkTask(.matchTarget(target), .matchRuleType("VerifyModule")) { task in
                     task.checkInputs(contain: [
-                        .name("Orange.h"),
+                        .name("Orange.h")
                     ])
                     task.checkNoInputs(contain: [
                         .name("Excluded.h"),
@@ -972,12 +1051,13 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
 }
 
 fileprivate final class TestIntentsCompilerTaskPlanningClientDelegate: MockTestTaskPlanningClientDelegate, @unchecked Sendable {
-    override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+    override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
         let commandName = commandLine.first.map(Path.init)?.basename
         switch commandName {
         case "intentbuilderc":
             if let input = commandLine.elementAfterElements(["-input"]).map(Path.init)?.basenameWithoutSuffix,
-               let outputDir = commandLine.elementAfterElements(["-output"]).map(Path.init) {
+                let outputDir = commandLine.elementAfterElements(["-output"]).map(Path.init)
+            {
                 let classPrefix = commandLine.elementAfterElements(["-classPrefix"]) ?? ""
                 let language = commandLine.elementAfterElements(["-language"]) ?? "Objective-C"
                 switch language {
@@ -1015,24 +1095,30 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
             groupTree: TestGroup(
                 targetName,
                 children: [
-                    TestFile("Orange.modulemap"),
-                ]),
+                    TestFile("Orange.modulemap")
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "DEFINES_MODULE": "YES",
-                            "ENABLE_MODULE_VERIFIER": "YES",
-                            "MODULE_VERIFIER_KIND": verifierKind,
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "MODULEMAP_FILE": "Orange.modulemap",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "CC": clangCompilerPath.str,
-                        ]),
-                    ]),
-            ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "DEFINES_MODULE": "YES",
+                                "ENABLE_MODULE_VERIFIER": "YES",
+                                "MODULE_VERIFIER_KIND": verifierKind,
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "MODULEMAP_FILE": "Orange.modulemap",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "CC": clangCompilerPath.str,
+                            ]
+                        )
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let sourceRoot = tester.workspace.projects[0].sourceRoot
 
@@ -1048,7 +1134,7 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
 
                 #expect((task?.alwaysExecuteTask ?? false) == false)
                 task?.checkInputs(contain: [
-                    .name("module.modulemap"),
+                    .name("module.modulemap")
                 ])
             }
         }
@@ -1065,17 +1151,21 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                     TestFile("A.m"),
                     TestFile("B.h"),
                     TestFile("B.m"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "DEFINES_MODULE": "YES",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "EAGER_COMPILATION_REQUIRE": "YES",
-                    "ENABLE_MODULE_VERIFIER": "YES",
-                    "MODULE_VERIFIER_KIND": verifierKind,
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CC": clangCompilerPath.str,
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "DEFINES_MODULE": "YES",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "EAGER_COMPILATION_REQUIRE": "YES",
+                        "ENABLE_MODULE_VERIFIER": "YES",
+                        "MODULE_VERIFIER_KIND": verifierKind,
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CC": clangCompilerPath.str,
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -1083,27 +1173,30 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                     type: .framework,
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("A.h", headerVisibility: .public),
+                            TestBuildFile("A.h", headerVisibility: .public)
                         ]),
                         TestSourcesBuildPhase([
-                            "A.m",
+                            "A.m"
                         ]),
-                    ]),
+                    ]
+                ),
                 TestStandardTarget(
                     "B",
                     type: .framework,
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("B.h", headerVisibility: .public),
+                            TestBuildFile("B.h", headerVisibility: .public)
                         ]),
                         TestSourcesBuildPhase([
-                            "B.m",
+                            "B.m"
                         ]),
                     ],
                     dependencies: [
-                        "A",
-                    ]),
-            ])
+                        "A"
+                    ]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -1118,18 +1211,26 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
             }
 
             // no dependency on own compile tasks
-            noDependency(from: [.matchTargetName("A"), .matchRuleType(verifierRuleName)],
-                         to: .compileC("A", fileName: "A.m"))
-            noDependency(from: [.matchTargetName("B"), .matchRuleType(verifierRuleName)],
-                         to: .compileC("B", fileName: "B.m"))
+            noDependency(
+                from: [.matchTargetName("A"), .matchRuleType(verifierRuleName)],
+                to: .compileC("A", fileName: "A.m")
+            )
+            noDependency(
+                from: [.matchTargetName("B"), .matchRuleType(verifierRuleName)],
+                to: .compileC("B", fileName: "B.m")
+            )
 
             // no dependency on compile tasks from downstream target
-            noDependency(from: [.matchTargetName("B"), .matchRuleType(verifierRuleName)],
-                         to: .compileC("A", fileName: "A.m"))
+            noDependency(
+                from: [.matchTargetName("B"), .matchRuleType(verifierRuleName)],
+                to: .compileC("A", fileName: "A.m")
+            )
 
             // no dependency of copying header to entry of target
-            noDependency(from: [.matchTargetName("A"), .matchRuleType("CpHeader")],
-                         to: [.matchTargetName("A"), .matchRuleItemPattern(.suffix("-entry"))])
+            noDependency(
+                from: [.matchTargetName("A"), .matchRuleType("CpHeader")],
+                to: [.matchTargetName("A"), .matchRuleItemPattern(.suffix("-entry"))]
+            )
         }
     }
 
@@ -1143,32 +1244,38 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                 children: [
                     TestFile("Orange.h"),
                     TestFile("main.m"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "DEFINES_MODULE": "YES",
-                            "ENABLE_MODULE_VERIFIER": "YES",
-                            "MODULE_VERIFIER_KIND": verifierKind,
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "SUPPORTS_TEXT_BASED_API": "YES",
-                            "TAPI_EXEC": tapiToolPath.str,
-                            "CC": clangCompilerPath.str,
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "DEFINES_MODULE": "YES",
+                                "ENABLE_MODULE_VERIFIER": "YES",
+                                "MODULE_VERIFIER_KIND": verifierKind,
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SUPPORTS_TEXT_BASED_API": "YES",
+                                "TAPI_EXEC": tapiToolPath.str,
+                                "CC": clangCompilerPath.str,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("Orange.h", headerVisibility: .public),
+                            TestBuildFile("Orange.h", headerVisibility: .public)
                         ]),
                         TestSourcesBuildPhase([
-                            "main.m",
+                            "main.m"
                         ]),
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         for action in BuildAction.allCases.filter({ !$0.buildComponents.contains("build") }) {
@@ -1195,18 +1302,21 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                     TestFile("AAA.m"),
                     TestFile("BBB.h"),
                     TestFile("BBB.m"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug",
-                                       buildSettings: [
-                                        "DEFINES_MODULE": "YES",
-                                        "EAGER_COMPILATION_REQUIRE": "YES",
-                                        "ENABLE_MODULE_VERIFIER": "YES",
-                                        "MODULE_VERIFIER_KIND": verifierKind,
-                                        "GENERATE_INFOPLIST_FILE": "YES",
-                                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                                        "CC": clangCompilerPath.str,
-                                       ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "DEFINES_MODULE": "YES",
+                        "EAGER_COMPILATION_REQUIRE": "YES",
+                        "ENABLE_MODULE_VERIFIER": "YES",
+                        "MODULE_VERIFIER_KIND": verifierKind,
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CC": clangCompilerPath.str,
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -1214,27 +1324,30 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                     type: .framework,
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("AAA.h", headerVisibility: .public),
+                            TestBuildFile("AAA.h", headerVisibility: .public)
                         ]),
                         TestSourcesBuildPhase([
-                            "AAA.m",
+                            "AAA.m"
                         ]),
-                    ]),
+                    ]
+                ),
                 TestStandardTarget(
                     "BBB",
                     type: .framework,
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("BBB.h", headerVisibility: .public),
+                            TestBuildFile("BBB.h", headerVisibility: .public)
                         ]),
                         TestSourcesBuildPhase([
-                            "BBB.m",
+                            "BBB.m"
                         ]),
                     ],
                     dependencies: [
-                        "AAA",
-                    ]),
-            ])
+                        "AAA"
+                    ]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1300,7 +1413,7 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
     }
 
     func _copyFiles() async throws {
-        let targetName  = "Framework"
+        let targetName = "Framework"
         let clangCompilerPath = try await self.clangCompilerPath
         let testProject = TestProject(
             "Project",
@@ -1318,20 +1431,24 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                     TestFile("BuiltProductsHeader.h"),
                     TestFile("module.private.modulemap"),
                     TestFile("ResourceFile.txt"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "DEFINES_MODULE": "YES",
-                            "ENABLE_MODULE_VERIFIER": "YES",
-                            "MODULE_VERIFIER_KIND": verifierKind,
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "CC": clangCompilerPath.str,
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "DEFINES_MODULE": "YES",
+                                "ENABLE_MODULE_VERIFIER": "YES",
+                                "MODULE_VERIFIER_KIND": verifierKind,
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "CC": clangCompilerPath.str,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
@@ -1340,49 +1457,89 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
 
                         // Copying to Headers should run the verifier, but only the header file
                         // should be an input file to the module verifier.
-                        TestCopyFilesBuildPhase([
-                            "Framework.defs",
-                            "PublicHeader.h",
-                        ], destinationSubfolder: .wrapper, destinationSubpath: "Versions/A/Headers", onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Framework.defs",
+                                "PublicHeader.h",
+                            ],
+                            destinationSubfolder: .wrapper,
+                            destinationSubpath: "Versions/A/Headers",
+                            onlyForDeployment: false
+                        ),
 
                         // Subfolders count too.
-                        TestCopyFilesBuildPhase([
-                            "PrivateSubHeaderOne.h",
-                        ], destinationSubfolder: .wrapper, destinationSubpath: "Versions/A/PrivateHeaders/SubFolder", onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "PrivateSubHeaderOne.h"
+                            ],
+                            destinationSubfolder: .wrapper,
+                            destinationSubpath: "Versions/A/PrivateHeaders/SubFolder",
+                            onlyForDeployment: false
+                        ),
 
                         // Using the symlinks should work too.
-                        TestCopyFilesBuildPhase([
-                            "PrivateSubHeaderTwo.h",
-                        ], destinationSubfolder: .wrapper, destinationSubpath: "Versions/Current/PrivateHeaders/SubFolder", onlyForDeployment: false),
-                        TestCopyFilesBuildPhase([
-                            "PrivateSubHeaderThree.h",
-                        ], destinationSubfolder: .wrapper, destinationSubpath: "PrivateHeaders/SubFolder", onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "PrivateSubHeaderTwo.h"
+                            ],
+                            destinationSubfolder: .wrapper,
+                            destinationSubpath: "Versions/Current/PrivateHeaders/SubFolder",
+                            onlyForDeployment: false
+                        ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "PrivateSubHeaderThree.h"
+                            ],
+                            destinationSubfolder: .wrapper,
+                            destinationSubpath: "PrivateHeaders/SubFolder",
+                            onlyForDeployment: false
+                        ),
 
                         // A deployment-only phase should only affect deployment builds.
-                        TestCopyFilesBuildPhase([
-                            "DeploymentOnlyHeader.h",
-                        ], destinationSubfolder: .wrapper, destinationSubpath: "Versions/A/Headers"),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "DeploymentOnlyHeader.h"
+                            ],
+                            destinationSubfolder: .wrapper,
+                            destinationSubpath: "Versions/A/Headers"
+                        ),
 
                         // Built products should work for both deployment and non-deployment builds.
-                        TestCopyFilesBuildPhase([
-                            "BuiltProductsHeader.h",
-                        ], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(PUBLIC_HEADERS_FOLDER_PATH)", onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "BuiltProductsHeader.h"
+                            ],
+                            destinationSubfolder: .builtProductsDir,
+                            destinationSubpath: "$(PUBLIC_HEADERS_FOLDER_PATH)",
+                            onlyForDeployment: false
+                        ),
 
                         // Module maps should run the verifier.
-                        TestCopyFilesBuildPhase([
-                            "module.private.modulemap",
-                        ], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(MODULES_FOLDER_PATH)", onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "module.private.modulemap"
+                            ],
+                            destinationSubfolder: .builtProductsDir,
+                            destinationSubpath: "$(MODULES_FOLDER_PATH)",
+                            onlyForDeployment: false
+                        ),
 
                         TestSourcesBuildPhase([
-                            "Framework.m",
+                            "Framework.m"
                         ]),
 
                         // Resources and other destinations shouldn't run the verifier.
-                        TestCopyFilesBuildPhase([
-                            "ResourceFile.txt",
-                        ], destinationSubfolder: .resources, onlyForDeployment: false),
-                    ]),
-            ])
+                        TestCopyFilesBuildPhase(
+                            [
+                                "ResourceFile.txt"
+                            ],
+                            destinationSubfolder: .resources,
+                            onlyForDeployment: false
+                        ),
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1437,7 +1594,7 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                         .name("DeploymentOnlyHeader.h"),
                         // The built products header should still show up, even though the built products
                         // directory is a different one from the target build directory in deployment mode.
-                            .name("BuiltProductsHeader.h"),
+                        .name("BuiltProductsHeader.h"),
                     ])
                 }
             }
@@ -1455,24 +1612,28 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                     TestFile("OutputFiles.m"),
                     TestFile("NoOutputFiles.h"),
                     TestFile("NoOutputFiles.m"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "DEFINES_MODULE": "YES",
-                    // The module verification tasks use TaskOrderingOptions.compilation, and
-                    // shell script tasks use .compilationRequirement by default. That means
-                    // that module verification waits for all shell scripts, regardless of
-                    // their output files. EAGER_COMPILATION_ALLOW_SCRIPTS changes shell scripts
-                    // to .compilation, allowing the module verification tasks to be ordered
-                    // independent of them. Make sure that module verification still waits for
-                    // the relevant shell scripts in that environment.
-                    "EAGER_COMPILATION_ALLOW_SCRIPTS": "YES",
-                    "ENABLE_MODULE_VERIFIER": "YES",
-                    "MODULE_VERIFIER_KIND": verifierKind,
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CC": clangCompilerPath.str,
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "DEFINES_MODULE": "YES",
+                        // The module verification tasks use TaskOrderingOptions.compilation, and
+                        // shell script tasks use .compilationRequirement by default. That means
+                        // that module verification waits for all shell scripts, regardless of
+                        // their output files. EAGER_COMPILATION_ALLOW_SCRIPTS changes shell scripts
+                        // to .compilation, allowing the module verification tasks to be ordered
+                        // independent of them. Make sure that module verification still waits for
+                        // the relevant shell scripts in that environment.
+                        "EAGER_COMPILATION_ALLOW_SCRIPTS": "YES",
+                        "ENABLE_MODULE_VERIFIER": "YES",
+                        "MODULE_VERIFIER_KIND": verifierKind,
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CC": clangCompilerPath.str,
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -1490,37 +1651,44 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                             outputs: [
                                 "$(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)/PublicHeader.h",
                                 "$(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)/PublicHeader.defs",
-                            ]),
+                            ]
+                        ),
                         // Subfolders count too. Even if the script always runs, the module
                         // verifier should still only run if the output file changes.
                         TestShellScriptBuildPhase(
                             name: "OutputToPrivateHeadersSubFolder",
                             originalObjectID: "OutputToPrivateHeadersSubFolder",
                             outputs: [
-                                "$(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/SubFolder/PrivateSubHeaderOne.h",
-                            ], alwaysOutOfDate: true),
+                                "$(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/SubFolder/PrivateSubHeaderOne.h"
+                            ],
+                            alwaysOutOfDate: true
+                        ),
 
                         // Using the symlinks and file lists should work too.
                         TestShellScriptBuildPhase(
                             name: "OutputToPrivateHeadersSymlink",
                             originalObjectID: "OutputToPrivateHeadersSymlink",
                             outputFileLists: [
-                                "$(PROJECT_DIR)/OutputToPrivateHeadersSymlink.xcfilelist",
-                            ]),
+                                "$(PROJECT_DIR)/OutputToPrivateHeadersSymlink.xcfilelist"
+                            ]
+                        ),
                         TestShellScriptBuildPhase(
                             name: "OutputToCurrentSymlink",
                             originalObjectID: "OutputToCurrentSymlink",
                             outputFileLists: [
-                                "$(SRCROOT)/OutputToCurrentSymlink.xcfilelist",
-                            ]),
+                                "$(SRCROOT)/OutputToCurrentSymlink.xcfilelist"
+                            ]
+                        ),
 
                         // A deployment-only phase should only affect deployment builds.
                         TestShellScriptBuildPhase(
                             name: "DeploymentOnly",
                             originalObjectID: "DeploymentOnly",
                             outputs: [
-                                "$(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)/DeploymentOnlyHeader.h",
-                            ], onlyForDeployment: true),
+                                "$(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)/DeploymentOnlyHeader.h"
+                            ],
+                            onlyForDeployment: true
+                        ),
 
                         // Built products should work for both deployment and non-deployment builds.
                         // As long as any output file affects the module, the phase should run the
@@ -1531,18 +1699,20 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                             outputs: [
                                 "$(BUILT_PRODUCTS_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)/BuiltProductsHeader.h",
                                 "$(BUILT_PRODUCTS_DIR)/SharedHeader.h",
-                            ]),
+                            ]
+                        ),
 
                         // Module maps should run the verifier.
                         TestShellScriptBuildPhase(
                             name: "ModuleMap",
                             originalObjectID: "ModuleMap",
                             outputs: [
-                                "$(TARGET_BUILD_DIR)/$(MODULES_FOLDER_PATH)/module.private.modulemap",
-                            ]),
+                                "$(TARGET_BUILD_DIR)/$(MODULES_FOLDER_PATH)/module.private.modulemap"
+                            ]
+                        ),
 
                         TestSourcesBuildPhase([
-                            "OutputFiles.m",
+                            "OutputFiles.m"
                         ]),
 
                         // Resources and other destinations shouldn't run the verifier.
@@ -1550,9 +1720,11 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                             name: "Resources",
                             originalObjectID: "Resources",
                             outputs: [
-                                "$(TARGET_BUILD_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/ResourceFile.txt",
-                            ]),
-                    ]),
+                                "$(TARGET_BUILD_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/ResourceFile.txt"
+                            ]
+                        ),
+                    ]
+                ),
                 TestStandardTarget(
                     "NoOutputFiles",
                     type: .framework,
@@ -1572,11 +1744,12 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                             name: "OutputToHeaders",
                             originalObjectID: "OutputToHeaders",
                             outputs: [
-                                "$(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)/PublicHeader.h",
-                            ]),
+                                "$(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)/PublicHeader.h"
+                            ]
+                        ),
 
                         TestSourcesBuildPhase([
-                            "NoOutputFiles.m",
+                            "NoOutputFiles.m"
                         ]),
 
                         // Resources and other destinations shouldn't block the verifier.
@@ -1584,10 +1757,13 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                             name: "Resources",
                             originalObjectID: "Resources",
                             outputs: [
-                                "$(TARGET_BUILD_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/ResourceFile.txt",
-                            ]),
-                    ]),
-            ])
+                                "$(TARGET_BUILD_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/ResourceFile.txt"
+                            ]
+                        ),
+                    ]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let sourceRoot = tester.workspace.projects[0].sourceRoot
@@ -1654,7 +1830,7 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                         .name("DeploymentOnlyHeader.h"),
                         // The built products header should still show up, even though the built products
                         // directory is a different one from the target build directory in deployment mode.
-                            .name("BuiltProductsHeader.h"),
+                        .name("BuiltProductsHeader.h"),
                     ])
                 }
             }
@@ -1678,7 +1854,7 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                         .name("PublicHeader.h"),
                     ])
                     task.checkNoInputs(contain: [
-                        .name("ResourceFile.txt"),
+                        .name("ResourceFile.txt")
                     ])
                 }
             }
@@ -1694,18 +1870,22 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                 children: [
                     TestFile("ObjCAndSwift.h"),
                     TestFile("SwiftSource.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "DEFINES_MODULE": "YES",
-                    "ENABLE_MODULE_VERIFIER": "YES",
-                    "MODULE_VERIFIER_KIND": verifierKind,
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "5.0",
-                    "CC": clangCompilerPath.str,
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "DEFINES_MODULE": "YES",
+                        "ENABLE_MODULE_VERIFIER": "YES",
+                        "MODULE_VERIFIER_KIND": verifierKind,
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": "5.0",
+                        "CC": clangCompilerPath.str,
+                    ]
+                )
             ],
             targets: [
                 // Don't run the module verifier if the Objective-C compatibility header isn't generated.
@@ -1713,57 +1893,71 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                     "NoObjCCompatibilityHeader",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SWIFT_OBJC_INTERFACE_HEADER_NAME": "",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SWIFT_OBJC_INTERFACE_HEADER_NAME": ""
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "SwiftSource.swift",
-                        ]),
-                    ]),
+                            "SwiftSource.swift"
+                        ])
+                    ]
+                ),
                 // Don't run the module verifier if the Objective-C compatibility header isn't installed.
                 TestStandardTarget(
                     "ObjCCompatibilityHeaderNotInstalled",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SWIFT_INSTALL_OBJC_HEADER": "NO",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SWIFT_INSTALL_OBJC_HEADER": "NO"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "SwiftSource.swift",
-                        ]),
-                    ]),
+                            "SwiftSource.swift"
+                        ])
+                    ]
+                ),
                 // Run the module verifier if the Objective-C compatibility header is the only header in the framework.
                 TestStandardTarget(
                     "SwiftOnly",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "SwiftSource.swift",
-                        ]),
-                    ]),
+                            "SwiftSource.swift"
+                        ])
+                    ]
+                ),
                 // Run the module verifier if there are normal headers installed, but the Objective-C
                 // compatibility header shouldn't block verification if it isn't installed.
                 TestStandardTarget(
                     "ObjCAndSwift",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SWIFT_INSTALL_OBJC_HEADER": "NO",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SWIFT_INSTALL_OBJC_HEADER": "NO"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("ObjCAndSwift.h", headerVisibility: .public),
+                            TestBuildFile("ObjCAndSwift.h", headerVisibility: .public)
                         ]),
                         TestSourcesBuildPhase([
-                            "SwiftSource.swift",
+                            "SwiftSource.swift"
                         ]),
-                    ]),
-            ])
+                    ]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1790,10 +1984,10 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                     // as inputs so that it will run again if any of them change.
                     #expect(!task.alwaysExecuteTask)
                     task.checkInputs(contain: [
-                        .name("SwiftOnly-Swift.h"),
+                        .name("SwiftOnly-Swift.h")
                     ])
                     task.checkNoInputs(contain: [
-                        .name("SwiftSource.swift"),
+                        .name("SwiftSource.swift")
                     ])
                 }
             }
@@ -1810,7 +2004,7 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
 
                     #expect(!task.alwaysExecuteTask)
                     task.checkInputs(contain: [
-                        .name("ObjCAndSwift.h"),
+                        .name("ObjCAndSwift.h")
                     ])
                     task.checkNoInputs(contain: [
                         .name("SwiftSource.swift"),
@@ -1832,30 +2026,46 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                     TestFile("PublicSource.iig"),
                     TestFile("PrivateSource.iig"),
                     TestFile("ProjectSource.iig"),
-                    TestVariantGroup("PublicIntents.intentdefinition", children: [
-                        TestFile("Base.lproj/PublicIntents.intentdefinition", regionVariantName: "Base"),
-                    ]),
-                    TestVariantGroup("PrivateIntents.intentdefinition", children: [
-                        TestFile("Base.lproj/PrivateIntents.intentdefinition", regionVariantName: "Base"),
-                    ]),
-                    TestVariantGroup("ProjectIntents.intentdefinition", children: [
-                        TestFile("Base.lproj/ProjectIntents.intentdefinition", regionVariantName: "Base"),
-                    ]),
-                    TestVariantGroup("NoCodegenIntents.intentdefinition", children: [
-                        TestFile("Base.lproj/NoCodegenIntents.intentdefinition", regionVariantName: "Base"),
-                    ]),
-                ]),
+                    TestVariantGroup(
+                        "PublicIntents.intentdefinition",
+                        children: [
+                            TestFile("Base.lproj/PublicIntents.intentdefinition", regionVariantName: "Base")
+                        ]
+                    ),
+                    TestVariantGroup(
+                        "PrivateIntents.intentdefinition",
+                        children: [
+                            TestFile("Base.lproj/PrivateIntents.intentdefinition", regionVariantName: "Base")
+                        ]
+                    ),
+                    TestVariantGroup(
+                        "ProjectIntents.intentdefinition",
+                        children: [
+                            TestFile("Base.lproj/ProjectIntents.intentdefinition", regionVariantName: "Base")
+                        ]
+                    ),
+                    TestVariantGroup(
+                        "NoCodegenIntents.intentdefinition",
+                        children: [
+                            TestFile("Base.lproj/NoCodegenIntents.intentdefinition", regionVariantName: "Base")
+                        ]
+                    ),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "DEFINES_MODULE": "YES",
-                    "ENABLE_MODULE_VERIFIER": "YES",
-                    "MODULE_VERIFIER_KIND": verifierKind,
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "INTENTS_CODEGEN_LANGUAGE": "Objective-C",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "IIG_EXEC": iigPath.str,
-                    "CC": clangCompilerPath.str,
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "DEFINES_MODULE": "YES",
+                        "ENABLE_MODULE_VERIFIER": "YES",
+                        "MODULE_VERIFIER_KIND": verifierKind,
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "INTENTS_CODEGEN_LANGUAGE": "Objective-C",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "IIG_EXEC": iigPath.str,
+                        "CC": clangCompilerPath.str,
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -1863,7 +2073,7 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                     type: .framework,
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("Framework.h", headerVisibility: .public),
+                            TestBuildFile("Framework.h", headerVisibility: .public)
                         ]),
                         TestSourcesBuildPhase([
                             TestBuildFile("PublicSource.iig", headerVisibility: .public),
@@ -1875,8 +2085,10 @@ extension ClangModuleVerifierTaskConstructionTestsProtocol {
                             TestBuildFile("NoCodegenIntents.intentdefinition", intentsCodegenVisibility: .noCodegen),
                             TestBuildFile("Framework.m"),
                         ]),
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
diff --git a/Tests/SWBTaskConstructionTests/MultiPlatformTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/MultiPlatformTaskConstructionTests.swift
index 2d59a358..bf2bb929 100644
--- a/Tests/SWBTaskConstructionTests/MultiPlatformTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/MultiPlatformTaskConstructionTests.swift
@@ -40,7 +40,6 @@ extension TestTargetDependency: DependencyFilter {
     var value: String { return self.name }
 }
 
-
 extension SWBCore.Workspace {
     /// Finds the target with the given name.
     /// - Precondition: There are no duplicate targets with the given name.
@@ -51,7 +50,6 @@ extension SWBCore.Workspace {
     }
 }
 
-
 @Suite
 fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
     /// A helper function to determine which dependencies to return.
@@ -61,13 +59,12 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
         return d
     }
 
-
     /**
      * Helper function to create the basic test project.
      * - Parameter overrides: set of build setting overrides for the specialized targets only.
      */
     /// @param overrides -
-    func createBasicTestWorkspace(fs: any FSProxy, overrides: [String:String] = [:], useImplicitDependencies: Bool = false, allowTargetSpecializationByDefault: Bool = false) async throws -> TestWorkspace {
+    func createBasicTestWorkspace(fs: any FSProxy, overrides: [String: String] = [:], useImplicitDependencies: Bool = false, allowTargetSpecializationByDefault: Bool = false) async throws -> TestWorkspace {
         let core = try await getCore()
         var buildSettings = try await [
             "ARCHS": "$(ARCHS_STANDARD)",
@@ -96,7 +93,8 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "Sources", path: "Sources",
+                "Sources",
+                path: "Sources",
                 children: [
                     // watchOS app files
                     TestFile("watchosApp/Base.lproj/Interface.storyboard"),
@@ -128,7 +126,8 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
                     // Shared framework files
                     TestFile("shared/Info.plist"),
                     TestFile("shared/lib.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 debugBuildConfiguration
             ],
@@ -137,16 +136,23 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
                     "Watchable",
                     type: .watchKitAppContainer,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "iphoneos"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "iphoneos"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
                             // The target must at least HAVE an empty phase for the automatic asset catalog and storyboard to work
                         ]),
-                        TestCopyFilesBuildPhase(["Watchable WatchKit App.app"], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch", onlyForDeployment: false
-                                               ),
+                        TestCopyFilesBuildPhase(
+                            ["Watchable WatchKit App.app"],
+                            destinationSubfolder: .builtProductsDir,
+                            destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch",
+                            onlyForDeployment: false
+                        ),
                     ],
                     dependencies: deps(["Watchable WatchKit App"], useImplicitDependencies: useImplicitDependencies)
                 ),
@@ -154,20 +160,26 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
                     "Watchable WatchKit App",
                     type: .watchKitApp,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
-                            "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
-                            "SDKROOT": "watchos",
-                            "TARGETED_DEVICE_FAMILY": "4",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
+                                "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
+                                "SDKROOT": "watchos",
+                                "TARGETED_DEVICE_FAMILY": "4",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
                             "Base.lproj/Interface.storyboard",
                             "watchosApp/Assets.xcassets",
                         ]),
-                        TestCopyFilesBuildPhase(["Watchable WatchKit Extension.appex"], destinationSubfolder: .plugins, onlyForDeployment: false
-                                               ),
+                        TestCopyFilesBuildPhase(
+                            ["Watchable WatchKit Extension.appex"],
+                            destinationSubfolder: .plugins,
+                            onlyForDeployment: false
+                        ),
                         TestFrameworksBuildPhase([
                             TestBuildFile(.target("Shared Framework")),
                             TestBuildFile(.target("SharedPkgTarget")),
@@ -179,12 +191,15 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
                     "Watchable WatchKit Extension",
                     type: .watchKitExtension,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
-                            "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
-                            "SDKROOT": "watchos",
-                            "TARGETED_DEVICE_FAMILY": "4",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
+                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
+                                "SDKROOT": "watchos",
+                                "TARGETED_DEVICE_FAMILY": "4",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -201,17 +216,20 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
                     "iOS App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
-                            "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
-                            "SDKROOT": "iphoneos",
-                            "TARGETED_DEVICE_FAMILY": "1",
-                            "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
+                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
+                                "SDKROOT": "iphoneos",
+                                "TARGETED_DEVICE_FAMILY": "1",
+                                "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "iphoneosApp/ios.swift",
+                            "iphoneosApp/ios.swift"
                         ]),
                         TestResourcesBuildPhase([
                             "Base.lproj/Interface.storyboard",
@@ -228,20 +246,23 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
                     "macCatalyst App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ALWAYS_SEARCH_USER_PATHS": "NO",
-                            "CODE_SIGNING_ALLOWED": "NO",
-                            "SDKROOT": "iphoneos",
-                            "SUPPORTS_MACCATALYST": "YES",
-                            "TARGETED_DEVICE_FAMILY": "2,6",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                "CODE_SIGNING_ALLOWED": "NO",
+                                "SDKROOT": "iphoneos",
+                                "SUPPORTS_MACCATALYST": "YES",
+                                "TARGETED_DEVICE_FAMILY": "2,6",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["maccatalystApp/cat.swift"]),
                         TestFrameworksBuildPhase([
                             TestBuildFile(.target("Shared Framework")),
                             TestBuildFile(.target("SharedPkgTarget")),
-                        ])
+                        ]),
                     ],
                     dependencies: deps([TestTargetDependency("Shared Framework")], useImplicitDependencies: useImplicitDependencies).appending(contentsOf: [TestTargetDependency("SharedPkgTarget")])
                 ),
@@ -249,15 +270,18 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
                     "macOS App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
-                            "SDKROOT": "macosx",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
+                                "SDKROOT": "macosx",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "macosApp/mac.swift",
+                            "macosApp/mac.swift"
                         ]),
                         TestResourcesBuildPhase([]),
                         TestFrameworksBuildPhase([
@@ -271,15 +295,18 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
                     "tvOS App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
-                            "SDKROOT": "appletvos",
-                            "SUPPORTED_PLATFORMS": "appletvos",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
+                                "SDKROOT": "appletvos",
+                                "SUPPORTED_PLATFORMS": "appletvos",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "tvosApp/tv.swift",
+                            "tvosApp/tv.swift"
                         ]),
                         TestResourcesBuildPhase([]),
                         TestFrameworksBuildPhase([
@@ -293,48 +320,60 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
                     "Shared Framework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "TARGETED_DEVICE_FAMILY": "1",
-                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                            "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
-                        ].addingContents(of: overrides)),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "TARGETED_DEVICE_FAMILY": "1",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
+                            ].addingContents(of: overrides)
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("shared/lib.swift")]),
+                        TestSourcesBuildPhase([TestBuildFile("shared/lib.swift")])
                     ]
                 ),
                 TestStandardTarget(
-                    "MacAppEmbeddingiOSApp", type: .application,
+                    "MacAppEmbeddingiOSApp",
+                    type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
-                            "SDKROOT": "macosx",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
+                                "SDKROOT": "macosx",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "macosApp/mac.swift",
+                            "macosApp/mac.swift"
                         ]),
                         TestResourcesBuildPhase([]),
                         TestFrameworksBuildPhase([
                             TestBuildFile(.target("Shared Framework")),
                             TestBuildFile(.target("SharedPkgTarget")),
                         ]),
-                        TestCopyFilesBuildPhase([TestBuildFile(.target("iOS App"))], destinationSubfolder: .builtProductsDir, destinationSubpath: "Samples")
+                        TestCopyFilesBuildPhase([TestBuildFile(.target("iOS App"))], destinationSubfolder: .builtProductsDir, destinationSubpath: "Samples"),
                     ],
                     dependencies: deps([TestTargetDependency("Shared Framework")], useImplicitDependencies: useImplicitDependencies).appending(contentsOf: [TestTargetDependency("SharedPkgTarget"), TestTargetDependency("iOS App")])
-                )
-            ])
+                ),
+            ]
+        )
 
         let packageProject = TestPackageProject(
             "Package",
-            groupTree: TestGroup("Sources", path: "Sources", children: [
-                // Shared package files
-                TestFile("SharedPackageProduct/Info.plist"),
-                TestFile("SharedPkgTarget/Info.plist"),
-                TestFile("SharedPkgSource.swift"),
-            ]),
+            groupTree: TestGroup(
+                "Sources",
+                path: "Sources",
+                children: [
+                    // Shared package files
+                    TestFile("SharedPackageProduct/Info.plist"),
+                    TestFile("SharedPkgTarget/Info.plist"),
+                    TestFile("SharedPkgSource.swift"),
+                ]
+            ),
             buildConfigurations: [
                 debugBuildConfiguration
             ],
@@ -345,22 +384,29 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
                         TestBuildFile(.target("SharedPkgTarget"))
                     ]),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
-                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                            "SUPPORTS_MACCATALYST": "YES",
-                        ].addingContents(of: overrides)),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                "SUPPORTS_MACCATALYST": "YES",
+                            ].addingContents(of: overrides)
+                        )
                     ],
                     dependencies: ["SharedPkgTarget"]
                 ),
                 TestStandardTarget(
-                    "SharedPkgTarget", type: .framework,
+                    "SharedPkgTarget",
+                    type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
-                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                            "SUPPORTS_MACCATALYST": "YES",
-                        ].addingContents(of: overrides)),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                                "SUPPORTS_MACCATALYST": "YES",
+                            ].addingContents(of: overrides)
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["SharedPkgSource.swift"])
@@ -482,8 +528,7 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
                             validateTargetCompiledForPlatform("-macabi", tasks: tasks)
                         }
                     }
-                }
-                else {
+                } else {
                     validated.append(.iOS)
 
                     results.checkTarget("macCatalyst App") { target in
@@ -514,13 +559,11 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
                     results.checkTarget("macOS App") { target in
                         results.checkTasks(.matchTarget(target), .matchRuleType("SwiftDriver Compilation")) { #expect($0.count > 0) }
                     }
-                }
-                else if targets.contains(macAppWithEmbeddedPhoneAppTarget) {
+                } else if targets.contains(macAppWithEmbeddedPhoneAppTarget) {
                     results.checkTarget("MacAppEmbeddingiOSApp") { target in
                         results.checkTasks(.matchTarget(target), .matchRuleType("SwiftDriver Compilation")) { #expect($0.count > 0) }
                     }
-                }
-                else {
+                } else {
                     Issue.record("Unexpectedly building for macos for targets: \(targets.map({ $0.name }))")
                 }
 
@@ -625,7 +668,7 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
         #expect(try await validateBuildFor([iphoneosTarget], destination: .iOS, tester: tester, useImplicitDependencies: useImplicitDependencies, fs: fs) == [.iOS])
         #expect(try await validateBuildFor([catalystTarget], destination: .macCatalyst, tester: tester, useImplicitDependencies: useImplicitDependencies, fs: fs) == [.macCatalyst])
         #expect(try await validateBuildFor([macosTarget], destination: .macOS, tester: tester, useImplicitDependencies: useImplicitDependencies, fs: fs) == [.macOS])
-        #expect(try await validateBuildFor([macAppWithEmbeddedPhoneAppTarget], destination: .macOS, tester: tester, useImplicitDependencies: useImplicitDependencies, fs: fs) == [ .iOS, .macOS])
+        #expect(try await validateBuildFor([macAppWithEmbeddedPhoneAppTarget], destination: .macOS, tester: tester, useImplicitDependencies: useImplicitDependencies, fs: fs) == [.iOS, .macOS])
     }
 
     @Test(.requireSDKs(.macOS, .iOS, .watchOS))
@@ -633,7 +676,6 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
         try await _testSingleTopLevelTargetSpecialization(useImplicitDependencies: false)
     }
 
-
     @Test(.requireSDKs(.macOS, .iOS, .watchOS))
     func singleTopLevelTargetSpecializedDeps_PublicSDK_ImplicitDependencies() async throws {
         try await _testSingleTopLevelTargetSpecialization(useImplicitDependencies: true)
@@ -684,7 +726,6 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
         #expect(try await _testBasicMultiPlatformScenario(targets: ["macOS App", "iOS App"], destination: .iOS, useImplicitDependencies: false) == [.iOS, .macOS])
         #expect(try await _testBasicMultiPlatformScenario(targets: ["macOS App", "macCatalyst App"], destination: .iOS, useImplicitDependencies: false) == [.iOS, .macOS])
 
-
         #expect(try await _testBasicMultiPlatformScenario(targets: ["iOS App", "macCatalyst App"], destination: .iOS, useImplicitDependencies: false) == [.iOS])
         #expect(try await _testBasicMultiPlatformScenario(targets: ["iOS App", "macCatalyst App"], destination: .macCatalyst, useImplicitDependencies: false) == [.iOS, .macCatalyst])
         #expect(try await _testBasicMultiPlatformScenario(targets: ["iOS App", "macCatalyst App"], destination: .macOS, useImplicitDependencies: false) == [.iOS])
@@ -713,7 +754,8 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "Sources", path: "Sources",
+                "Sources",
+                path: "Sources",
                 children: [
                     // macCatalyst app files
                     TestFile("maccatalystApp/cat.swift"),
@@ -723,39 +765,46 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
 
                     // Shared framework files
                     TestFile("shared_maccat/lib.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ARCHS": "$(ARCHS_STANDARD)",
-                    "ENABLE_ON_DEMAND_RESOURCES": "NO",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "CODE_SIGN_IDENTITY": "",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "SWIFT_INSTALL_OBJC_HEADER": "NO",
-                    "SKIP_INSTALL": "YES",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "IPHONEOS_DEPLOYMENT_TARGET": core.loadSDK(.iOS).defaultDeploymentTarget,
-                    "MACOSX_DEPLOYMENT_TARGET": core.loadSDK(.macOS).defaultDeploymentTarget,
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS": "$(ARCHS_STANDARD)",
+                        "ENABLE_ON_DEMAND_RESOURCES": "NO",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "CODE_SIGN_IDENTITY": "",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "SWIFT_INSTALL_OBJC_HEADER": "NO",
+                        "SKIP_INSTALL": "YES",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "IPHONEOS_DEPLOYMENT_TARGET": core.loadSDK(.iOS).defaultDeploymentTarget,
+                        "MACOSX_DEPLOYMENT_TARGET": core.loadSDK(.macOS).defaultDeploymentTarget,
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "macCatalyst App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "iphoneos",
-                            "SUPPORTS_MACCATALYST": "YES",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "iphoneos",
+                                "SUPPORTS_MACCATALYST": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["maccatalystApp/cat.swift"]),
                         TestFrameworksBuildPhase([
-                            TestBuildFile("Shared Framework.framework"),
-                        ])
+                            TestBuildFile("Shared Framework.framework")
+                        ]),
                     ],
                     dependencies: []
                 ),
@@ -763,34 +812,41 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
                     "Shared Framework 1",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "macosx",
-                            "SUPPORTED_PLATFORMS": "macosx watchos watchsimulator",
-                            "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
-                            "PRODUCT_NAME": "Shared Framework",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "SUPPORTED_PLATFORMS": "macosx watchos watchsimulator",
+                                "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
+                                "PRODUCT_NAME": "Shared Framework",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("shared_mac/lib.swift")]),
+                        TestSourcesBuildPhase([TestBuildFile("shared_mac/lib.swift")])
                     ]
                 ),
                 TestStandardTarget(
                     "Shared Framework 2",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "iphoneos",
-                            "SUPPORTS_MACCATALYST": "YES",
-                            "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator macosx",
-                            "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
-                            "PRODUCT_NAME": "Shared Framework",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "iphoneos",
+                                "SUPPORTS_MACCATALYST": "YES",
+                                "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator macosx",
+                                "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
+                                "PRODUCT_NAME": "Shared Framework",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("shared_maccat/lib.swift")]),
+                        TestSourcesBuildPhase([TestBuildFile("shared_maccat/lib.swift")])
                     ]
-                )
-            ])
+                ),
+            ]
+        )
 
         let tester = try TaskConstructionTester(core, testProject)
 
@@ -842,38 +898,47 @@ fileprivate struct MultiPlatformTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "Sources", path: "Sources",
+                "Sources",
+                path: "Sources",
                 children: [
                     TestFile("test.c")
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "MACOSX_DEPLOYMENT_TARGET": core.loadSDK(.macOS).defaultDeploymentTarget,
-                    "SDKROOT": sdkroot,
-                    "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
-                    "SUPPORTS_MACCATALYST": "YES",
-                    "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
-                    "CLANG_USE_RESPONSE_FILE": "NO",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "MACOSX_DEPLOYMENT_TARGET": core.loadSDK(.macOS).defaultDeploymentTarget,
+                        "SDKROOT": sdkroot,
+                        "ALLOW_TARGET_PLATFORM_SPECIALIZATION": "YES",
+                        "SUPPORTS_MACCATALYST": "YES",
+                        "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                        "CLANG_USE_RESPONSE_FILE": "NO",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "NativeTool",
                     type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SUPPORTS_MACCATALYST": "NO",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SUPPORTS_MACCATALYST": "NO",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["test.c"]),
+                        TestSourcesBuildPhase(["test.c"])
                     ],
                     dependencies: []
-                ),
-            ])
+                )
+            ]
+        )
 
         let tester = try TaskConstructionTester(core, testProject)
 
diff --git a/Tests/SWBTaskConstructionTests/ObjectLibraryTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/ObjectLibraryTaskConstructionTests.swift
index 4eff840a..66677fa1 100644
--- a/Tests/SWBTaskConstructionTests/ObjectLibraryTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/ObjectLibraryTaskConstructionTests.swift
@@ -28,26 +28,31 @@ fileprivate struct ObjectLibraryTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("a.c"),
                     TestFile("b.c"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SWIFT_EXEC": try await swiftCompilerPath.str,
-                    "SWIFT_VERSION": try await swiftVersion
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SWIFT_EXEC": try await swiftCompilerPath.str,
+                        "SWIFT_VERSION": try await swiftVersion,
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Library",
                     type: .objectLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["a.c", "b.c"]),
+                        TestSourcesBuildPhase(["a.c", "b.c"])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
 
@@ -61,7 +66,7 @@ fileprivate struct ObjectLibraryTaskConstructionTests: CoreBasedTests {
                     .suffix("a.o"),
                     .suffix("b.o"),
                     "--output",
-                    .suffix("Library.objlib")
+                    .suffix("Library.objlib"),
                 ])
                 task.checkInputs([
                     .pathPattern(.suffix("a.o")),
@@ -88,7 +93,8 @@ fileprivate struct ObjectLibraryTaskConstructionTests: CoreBasedTests {
                         children: [
                             TestFile("a.swift"),
                             TestFile("b.swift"),
-                        ]),
+                        ]
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -96,8 +102,9 @@ fileprivate struct ObjectLibraryTaskConstructionTests: CoreBasedTests {
                                 "CODE_SIGNING_ALLOWED": "NO",
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "SWIFT_VERSION": try await swiftVersion,
-                                "SWIFT_EXEC": try await swiftCompilerPath.str
-                            ]),
+                                "SWIFT_EXEC": try await swiftCompilerPath.str,
+                            ]
+                        )
                     ],
                     targets: [
                         TestStandardTarget(
@@ -105,14 +112,14 @@ fileprivate struct ObjectLibraryTaskConstructionTests: CoreBasedTests {
                             type: .commandLineTool,
                             buildPhases: [
                                 TestSourcesBuildPhase([
-                                    "b.swift",
+                                    "b.swift"
                                 ]),
                                 TestFrameworksBuildPhase([
                                     "Library.objlib"
-                                ])
+                                ]),
                             ],
                             dependencies: [
-                                "Library",
+                                "Library"
                             ]
                         ),
                         TestStandardTarget(
@@ -120,12 +127,14 @@ fileprivate struct ObjectLibraryTaskConstructionTests: CoreBasedTests {
                             type: .objectLibrary,
                             buildPhases: [
                                 TestSourcesBuildPhase([
-                                    "a.swift",
-                                ]),
+                                    "a.swift"
+                                ])
                             ]
                         ),
-                    ])
-            ])
+                    ]
+                )
+            ]
+        )
 
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testWorkspace)
diff --git a/Tests/SWBTaskConstructionTests/ObjectiveCSymbolExtractorTests.swift b/Tests/SWBTaskConstructionTests/ObjectiveCSymbolExtractorTests.swift
index 0222dd1a..faeab2c0 100644
--- a/Tests/SWBTaskConstructionTests/ObjectiveCSymbolExtractorTests.swift
+++ b/Tests/SWBTaskConstructionTests/ObjectiveCSymbolExtractorTests.swift
@@ -24,12 +24,12 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS))
     func skipsDocumentationWhenTargetHasPlusPlusHeader() async throws {
         try await ObjectiveCSymbolExtractorImplementationSelector.runWithAllImplementations {
-            try await checkBuildWithPlusPlusHeader(targetType: .framework, withHeaderBuildPhase: true, plusPlusHeaderVisibility: .public, shouldSkip: true) // Public headers are processed for all target types
+            try await checkBuildWithPlusPlusHeader(targetType: .framework, withHeaderBuildPhase: true, plusPlusHeaderVisibility: .public, shouldSkip: true)  // Public headers are processed for all target types
             try await checkBuildWithPlusPlusHeader(targetType: .application, withHeaderBuildPhase: true, plusPlusHeaderVisibility: .public, shouldSkip: true)
-            try await checkBuildWithPlusPlusHeader(targetType: .framework, withHeaderBuildPhase: true, plusPlusHeaderVisibility: .private, shouldSkip: false) // Private headers aren't processed for frameworks
-            try await checkBuildWithPlusPlusHeader(targetType: .application, withHeaderBuildPhase: true, plusPlusHeaderVisibility: .private, shouldSkip: true) // Private headers are processed for applications
-            try await checkBuildWithPlusPlusHeader(targetType: .framework, withHeaderBuildPhase: true, plusPlusHeaderVisibility: .private, extraBuildSettings: ["DOCC_EXTRACT_SPI_DOCUMENTATION": "YES"], shouldSkip: true) // The private plus plus header is now configured to be processed.
-            try await checkBuildWithPlusPlusHeader(targetType: .application, withHeaderBuildPhase: false, plusPlusHeaderVisibility: .private, shouldSkip: true) // Private headers are processed for applications
+            try await checkBuildWithPlusPlusHeader(targetType: .framework, withHeaderBuildPhase: true, plusPlusHeaderVisibility: .private, shouldSkip: false)  // Private headers aren't processed for frameworks
+            try await checkBuildWithPlusPlusHeader(targetType: .application, withHeaderBuildPhase: true, plusPlusHeaderVisibility: .private, shouldSkip: true)  // Private headers are processed for applications
+            try await checkBuildWithPlusPlusHeader(targetType: .framework, withHeaderBuildPhase: true, plusPlusHeaderVisibility: .private, extraBuildSettings: ["DOCC_EXTRACT_SPI_DOCUMENTATION": "YES"], shouldSkip: true)  // The private plus plus header is now configured to be processed.
+            try await checkBuildWithPlusPlusHeader(targetType: .application, withHeaderBuildPhase: false, plusPlusHeaderVisibility: .private, shouldSkip: true)  // Private headers are processed for applications
         }
     }
 
@@ -45,7 +45,7 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
 
         for withPlusPlusFile in [false, true] {
             var headerBuildPhaseFiles = [
-                TestBuildFile("ObjCHeaderFilePublic.h", headerVisibility: .public),
+                TestBuildFile("ObjCHeaderFilePublic.h", headerVisibility: .public)
             ]
             if withPlusPlusFile {
                 headerBuildPhaseFiles.append(
@@ -90,7 +90,7 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                                     // Set the real TAPI tool path so that we can check its version to determine what version of the "headers info" JSON file to pass to `tapi extractapi`.
                                     "TAPI_EXEC": tapiToolPath.str,
                                     "DOCC_EXEC": doccToolPath.str,
-                                    "INFOPLIST_FILE":"SomeFiles/Info.plist",
+                                    "INFOPLIST_FILE": "SomeFiles/Info.plist",
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "PRODUCT_BUNDLE_IDENTIFIER": "test.bundle.identifier",
                                     "CURRENT_PROJECT_VERSION": "0.0.1",
@@ -158,7 +158,7 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
 
                             results.checkTask(
                                 .matchTarget(target),
-                                .matchRule([ "ExtractAPI", SWBFeatureFlag.enableClangExtractAPI.value ? symbolGraphFile : sdkdbFile ])
+                                .matchRule(["ExtractAPI", SWBFeatureFlag.enableClangExtractAPI.value ? symbolGraphFile : sdkdbFile])
                             ) { task in
                                 // For testing clang extract-api, also check the proper
                                 // -x command line option is passed to clang
@@ -238,7 +238,7 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                                 "TAPI_EXEC": tapiToolPath.str,
                                 "DOCC_EXEC": doccToolPath.str,
                                 "LIBTOOL": libtoolPath.str,
-                                "INFOPLIST_FILE":"SomeFiles/Info.plist",
+                                "INFOPLIST_FILE": "SomeFiles/Info.plist",
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "PRODUCT_BUNDLE_IDENTIFIER": "test.bundle.identifier",
                                 "CURRENT_PROJECT_VERSION": "0.0.1",
@@ -286,7 +286,7 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                             .matchTarget(target),
                             .matchRule([
                                 "ExtractAPI",
-                                SWBFeatureFlag.enableClangExtractAPI.value ? symbolGraphFile : sdkdbFile
+                                SWBFeatureFlag.enableClangExtractAPI.value ? symbolGraphFile : sdkdbFile,
                             ])
                         )
 
@@ -310,52 +310,85 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                 "aProject",
                 // This is meant to represent a small but well organized cross platform app target
                 groupTree:
-                    TestGroup("Project", children: [
-                        TestGroup("iOS", children: [
-                            TestGroup("Feature 1", children: [
-                                TestFile("FeatureOneExtraInterfaceFile.h", guid: "FR_iOS_FeatureOneExtraInterfaceFile.h"),
-                                TestFile("FeatureOneSomething.h", guid: "FR_iOS_FeatureOneSomething.h"),
-                                TestFile("FeatureOneSomething.m", guid: "FR_iOS_FeatureOneSomething.m"),
-                            ]),
-                            TestGroup("Feature 2", children: [
-                                TestFile("FeatureTwoViewController.h", guid: "FR_iOS_FeatureTwoViewController.h"),
-                                TestFile("FeatureTwoViewController_Private.h", guid: "FR_iOS_FeatureTwoViewController_Private.h"),
-                                TestFile("FeatureTwoViewController.m", guid: "FR_iOS_FeatureTwoViewController.m"),
-                            ]),
-                            TestGroup("Feature 3", children: [
-                                TestFile("FeatureThreeSomething.h", guid: "FR_iOS_FeatureThreeSomething.h"),
-                                TestFile("FeatureThreeSomething.m", guid: "FR_iOS_FeatureThreeSomething.m"),
-                                TestFile("FeatureThreeSomething+Other.h", guid: "FR_iOS_FeatureThreeSomething+Other.h"),
-                                TestFile("FeatureThreeSomething+Other.m", guid: "FR_iOS_FeatureThreeSomething+Other.m"),
-                            ]),
-                            TestFile("Info.plist", guid: "FR_iOS_Info.plist"),
-                        ]),
-                        TestGroup("macOS", children: [
-                            TestGroup("Feature 1", children: [
-                                TestFile("FeatureOneExtraInterfaceFile.h", guid: "FR_macOS_FeatureOneExtraInterfaceFile.h"),
-                                TestFile("FeatureOneSomething.h", guid: "FR_macOS_FeatureOneSomething.h"),
-                                TestFile("FeatureOneSomething.m", guid: "FR_macOS_FeatureOneSomething.m"),
-                            ]),
-                            TestGroup("Feature 2", children: [
-                                TestFile("FeatureTwoViewController.h", guid: "FR_macOS_FeatureTwoViewController.h"),
-                                TestFile("FeatureTwoViewController_Private.h", guid: "FR_macOS_FeatureTwoViewController_Private.h"),
-                                TestFile("FeatureTwoViewController.m", guid: "FR_macOS_FeatureTwoViewController.m"),
-                            ]),
-                            TestGroup("Feature 3", children: [
-                                TestFile("FeatureThreeSomething.h", guid: "FR_macOS_FeatureThreeSomething.h"),
-                                TestFile("FeatureThreeSomething.m", guid: "FR_macOS_FeatureThreeSomething.m"),
-                                TestFile("FeatureThreeSomething+Other.h", guid: "FR_macOS_FeatureThreeSomething+Other.h"),
-                                TestFile("FeatureThreeSomething+Other.m", guid: "FR_macOS_FeatureThreeSomething+Other.m"),
-                            ]),
-                            TestFile("Info.plist", guid: "FR_macOS_Info.plist"),
-                        ]),
-                        TestGroup("Common", children: [
-                            TestGroup("Feature 1", children: [
-                                TestFile("FeatureOneSomethingCommon.h", guid: "FR_Common_FeatureOneSomethingCommon.h"),
-                                TestFile("FeatureOneSomethingCommon.m", guid: "FR_Common_FeatureOneSomethingCommon.m"),
-                            ]),
-                        ]),
-                    ]),
+                    TestGroup(
+                        "Project",
+                        children: [
+                            TestGroup(
+                                "iOS",
+                                children: [
+                                    TestGroup(
+                                        "Feature 1",
+                                        children: [
+                                            TestFile("FeatureOneExtraInterfaceFile.h", guid: "FR_iOS_FeatureOneExtraInterfaceFile.h"),
+                                            TestFile("FeatureOneSomething.h", guid: "FR_iOS_FeatureOneSomething.h"),
+                                            TestFile("FeatureOneSomething.m", guid: "FR_iOS_FeatureOneSomething.m"),
+                                        ]
+                                    ),
+                                    TestGroup(
+                                        "Feature 2",
+                                        children: [
+                                            TestFile("FeatureTwoViewController.h", guid: "FR_iOS_FeatureTwoViewController.h"),
+                                            TestFile("FeatureTwoViewController_Private.h", guid: "FR_iOS_FeatureTwoViewController_Private.h"),
+                                            TestFile("FeatureTwoViewController.m", guid: "FR_iOS_FeatureTwoViewController.m"),
+                                        ]
+                                    ),
+                                    TestGroup(
+                                        "Feature 3",
+                                        children: [
+                                            TestFile("FeatureThreeSomething.h", guid: "FR_iOS_FeatureThreeSomething.h"),
+                                            TestFile("FeatureThreeSomething.m", guid: "FR_iOS_FeatureThreeSomething.m"),
+                                            TestFile("FeatureThreeSomething+Other.h", guid: "FR_iOS_FeatureThreeSomething+Other.h"),
+                                            TestFile("FeatureThreeSomething+Other.m", guid: "FR_iOS_FeatureThreeSomething+Other.m"),
+                                        ]
+                                    ),
+                                    TestFile("Info.plist", guid: "FR_iOS_Info.plist"),
+                                ]
+                            ),
+                            TestGroup(
+                                "macOS",
+                                children: [
+                                    TestGroup(
+                                        "Feature 1",
+                                        children: [
+                                            TestFile("FeatureOneExtraInterfaceFile.h", guid: "FR_macOS_FeatureOneExtraInterfaceFile.h"),
+                                            TestFile("FeatureOneSomething.h", guid: "FR_macOS_FeatureOneSomething.h"),
+                                            TestFile("FeatureOneSomething.m", guid: "FR_macOS_FeatureOneSomething.m"),
+                                        ]
+                                    ),
+                                    TestGroup(
+                                        "Feature 2",
+                                        children: [
+                                            TestFile("FeatureTwoViewController.h", guid: "FR_macOS_FeatureTwoViewController.h"),
+                                            TestFile("FeatureTwoViewController_Private.h", guid: "FR_macOS_FeatureTwoViewController_Private.h"),
+                                            TestFile("FeatureTwoViewController.m", guid: "FR_macOS_FeatureTwoViewController.m"),
+                                        ]
+                                    ),
+                                    TestGroup(
+                                        "Feature 3",
+                                        children: [
+                                            TestFile("FeatureThreeSomething.h", guid: "FR_macOS_FeatureThreeSomething.h"),
+                                            TestFile("FeatureThreeSomething.m", guid: "FR_macOS_FeatureThreeSomething.m"),
+                                            TestFile("FeatureThreeSomething+Other.h", guid: "FR_macOS_FeatureThreeSomething+Other.h"),
+                                            TestFile("FeatureThreeSomething+Other.m", guid: "FR_macOS_FeatureThreeSomething+Other.m"),
+                                        ]
+                                    ),
+                                    TestFile("Info.plist", guid: "FR_macOS_Info.plist"),
+                                ]
+                            ),
+                            TestGroup(
+                                "Common",
+                                children: [
+                                    TestGroup(
+                                        "Feature 1",
+                                        children: [
+                                            TestFile("FeatureOneSomethingCommon.h", guid: "FR_Common_FeatureOneSomethingCommon.h"),
+                                            TestFile("FeatureOneSomethingCommon.m", guid: "FR_Common_FeatureOneSomethingCommon.m"),
+                                        ]
+                                    )
+                                ]
+                            ),
+                        ]
+                    ),
                 targets: [
                     TestStandardTarget(
                         "iOS App",
@@ -371,7 +404,7 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                                     // Set the real TAPI tool path so that we can check its version to determine what version of the "headers info" JSON file to pass to `tapi extractapi`.
                                     "TAPI_EXEC": tapiToolPath.str,
                                     "DOCC_EXEC": doccToolPath.str,
-                                    "INFOPLIST_FILE":"iOS/Info.plist",
+                                    "INFOPLIST_FILE": "iOS/Info.plist",
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "PRODUCT_BUNDLE_IDENTIFIER": "test.bundle.identifier",
                                     "CURRENT_PROJECT_VERSION": "0.0.1",
@@ -403,7 +436,7 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                                     // Set the real TAPI tool path so that we can check its version to determine what version of the "headers info" JSON file to pass to `tapi extractapi`.
                                     "TAPI_EXEC": tapiToolPath.str,
                                     "DOCC_EXEC": doccToolPath.str,
-                                    "INFOPLIST_FILE":"macOS/Info.plist",
+                                    "INFOPLIST_FILE": "macOS/Info.plist",
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "PRODUCT_BUNDLE_IDENTIFIER": "test.bundle.identifier",
                                     "CURRENT_PROJECT_VERSION": "0.0.1",
@@ -420,7 +453,7 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                                 TestBuildFile(TestFile("FeatureOneSomethingCommon.m", guid: "FR_Common_FeatureOneSomethingCommon.m")),
                             ])
                         ]
-                    )
+                    ),
                 ]
             )
 
@@ -516,22 +549,24 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                             .matchTarget(target),
                             .matchRule([
                                 "ExtractAPI",
-                                SWBFeatureFlag.enableClangExtractAPI.value ? symbolGraphFile : sdkdbFile
+                                SWBFeatureFlag.enableClangExtractAPI.value ? symbolGraphFile : sdkdbFile,
                             ])
                         ) { task in
                             let headerTaskOrderingInputPaths = task.inputs
                                 .filter { $0.path.fileExtension == "h" }
                                 .map { $0.path.str }
 
-                            #expect(headerTaskOrderingInputPaths == [
-                                "/tmp/Test/aProject/macOS/Feature 1/FeatureOneExtraInterfaceFile.h",
-                                "/tmp/Test/aProject/macOS/Feature 1/FeatureOneSomething.h",
-                                "/tmp/Test/aProject/macOS/Feature 2/FeatureTwoViewController.h",
-                                "/tmp/Test/aProject/macOS/Feature 2/FeatureTwoViewController_Private.h",
-                                "/tmp/Test/aProject/macOS/Feature 3/FeatureThreeSomething.h",
-                                "/tmp/Test/aProject/macOS/Feature 3/FeatureThreeSomething+Other.h",
-                                "/tmp/Test/aProject/Common/Feature 1/FeatureOneSomethingCommon.h",
-                            ])
+                            #expect(
+                                headerTaskOrderingInputPaths == [
+                                    "/tmp/Test/aProject/macOS/Feature 1/FeatureOneExtraInterfaceFile.h",
+                                    "/tmp/Test/aProject/macOS/Feature 1/FeatureOneSomething.h",
+                                    "/tmp/Test/aProject/macOS/Feature 2/FeatureTwoViewController.h",
+                                    "/tmp/Test/aProject/macOS/Feature 2/FeatureTwoViewController_Private.h",
+                                    "/tmp/Test/aProject/macOS/Feature 3/FeatureThreeSomething.h",
+                                    "/tmp/Test/aProject/macOS/Feature 3/FeatureThreeSomething+Other.h",
+                                    "/tmp/Test/aProject/Common/Feature 1/FeatureOneSomethingCommon.h",
+                                ]
+                            )
                         }
                     }
                     // Since symbol information is extracted, there should also be a documentation built task.
@@ -551,22 +586,24 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                             .matchTarget(target),
                             .matchRule([
                                 "ExtractAPI",
-                                SWBFeatureFlag.enableClangExtractAPI.value ? symbolGraphFile : sdkdbFile
+                                SWBFeatureFlag.enableClangExtractAPI.value ? symbolGraphFile : sdkdbFile,
                             ])
                         ) { task in
                             let headerTaskOrderingInputPaths = task.inputs
                                 .filter { $0.path.fileExtension == "h" }
                                 .map { $0.path.str }
 
-                            #expect(headerTaskOrderingInputPaths == [
-                                "/tmp/Test/aProject/iOS/Feature 1/FeatureOneExtraInterfaceFile.h",
-                                "/tmp/Test/aProject/iOS/Feature 1/FeatureOneSomething.h",
-                                "/tmp/Test/aProject/iOS/Feature 2/FeatureTwoViewController.h",
-                                "/tmp/Test/aProject/iOS/Feature 2/FeatureTwoViewController_Private.h",
-                                "/tmp/Test/aProject/iOS/Feature 3/FeatureThreeSomething.h",
-                                "/tmp/Test/aProject/iOS/Feature 3/FeatureThreeSomething+Other.h",
-                                "/tmp/Test/aProject/Common/Feature 1/FeatureOneSomethingCommon.h",
-                            ])
+                            #expect(
+                                headerTaskOrderingInputPaths == [
+                                    "/tmp/Test/aProject/iOS/Feature 1/FeatureOneExtraInterfaceFile.h",
+                                    "/tmp/Test/aProject/iOS/Feature 1/FeatureOneSomething.h",
+                                    "/tmp/Test/aProject/iOS/Feature 2/FeatureTwoViewController.h",
+                                    "/tmp/Test/aProject/iOS/Feature 2/FeatureTwoViewController_Private.h",
+                                    "/tmp/Test/aProject/iOS/Feature 3/FeatureThreeSomething.h",
+                                    "/tmp/Test/aProject/iOS/Feature 3/FeatureThreeSomething+Other.h",
+                                    "/tmp/Test/aProject/Common/Feature 1/FeatureOneSomethingCommon.h",
+                                ]
+                            )
                         }
 
                         if !SWBFeatureFlag.enableClangExtractAPI.value {
@@ -589,19 +626,31 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                 "aProject",
                 // This is meant to represent a small but well organized cross platform app target
                 groupTree:
-                    TestGroup("Project", children: [
-                        TestGroup("Objective-C App", children: [
-                            TestFile("Something.h"),
-                            TestFile("Something.m"),
-                            TestFile("Info.plist"),
-                        ]),
-                        TestGroup("Swift Dependency", children: [
-                            TestFile("Dependency.swift"),
-                        ]),
-                        TestGroup("Swift Sub-Dependency", children: [
-                            TestFile("Sub-Dependency.swift"),
-                        ]),
-                    ]),
+                    TestGroup(
+                        "Project",
+                        children: [
+                            TestGroup(
+                                "Objective-C App",
+                                children: [
+                                    TestFile("Something.h"),
+                                    TestFile("Something.m"),
+                                    TestFile("Info.plist"),
+                                ]
+                            ),
+                            TestGroup(
+                                "Swift Dependency",
+                                children: [
+                                    TestFile("Dependency.swift")
+                                ]
+                            ),
+                            TestGroup(
+                                "Swift Sub-Dependency",
+                                children: [
+                                    TestFile("Sub-Dependency.swift")
+                                ]
+                            ),
+                        ]
+                    ),
                 targets: [
                     TestStandardTarget(
                         "SwiftSubDependency",
@@ -617,7 +666,7 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                                     // Set the real TAPI tool path so that we can check its version to determine what version of the "headers info" JSON file to pass to `tapi extractapi`.
                                     "TAPI_EXEC": tapiToolPath.str,
                                     "DOCC_EXEC": doccToolPath.str,
-                                    "INFOPLIST_FILE":"Swift Sub-Dependency/Info.plist",
+                                    "INFOPLIST_FILE": "Swift Sub-Dependency/Info.plist",
                                     "DEFINES_MODULE": "YES",
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "PRODUCT_BUNDLE_IDENTIFIER": "test.bundle.sub-dependency",
@@ -628,7 +677,7 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile(TestFile("Dependency.swift")),
+                                TestBuildFile(TestFile("Dependency.swift"))
                             ])
                         ]
                     ),
@@ -646,7 +695,7 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                                     // Set the real TAPI tool path so that we can check its version to determine what version of the "headers info" JSON file to pass to `tapi extractapi`.
                                     "TAPI_EXEC": tapiToolPath.str,
                                     "DOCC_EXEC": doccToolPath.str,
-                                    "INFOPLIST_FILE":"Swift Dependency/Info.plist",
+                                    "INFOPLIST_FILE": "Swift Dependency/Info.plist",
                                     "DEFINES_MODULE": "YES",
                                     "MODULEMAP_PATH": "dependency_custom_module_map_file_path",
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
@@ -658,7 +707,7 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile(TestFile("Dependency.swift")),
+                                TestBuildFile(TestFile("Dependency.swift"))
                             ])
                         ],
                         dependencies: [
@@ -677,7 +726,7 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                                     // Set the real TAPI tool path so that we can check its version to determine what version of the "headers info" JSON file to pass to `tapi extractapi`.
                                     "TAPI_EXEC": tapiToolPath.str,
                                     "DOCC_EXEC": doccToolPath.str,
-                                    "INFOPLIST_FILE":"Objective-C App/Info.plist",
+                                    "INFOPLIST_FILE": "Objective-C App/Info.plist",
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "PRODUCT_BUNDLE_IDENTIFIER": "test.bundle.app",
                                     "CURRENT_PROJECT_VERSION": "0.0.1",
@@ -691,13 +740,13 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile(TestFile("Something.m")),
+                                TestBuildFile(TestFile("Something.m"))
                             ])
                         ],
                         dependencies: [
                             TestTargetDependency("SwiftDependency")
                         ]
-                    )
+                    ),
                 ]
             )
 
@@ -745,19 +794,20 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                             .matchTarget(target),
                             .matchRule([
                                 "ExtractAPI",
-                                SWBFeatureFlag.enableClangExtractAPI.value ? symbolGraphFile : sdkdbFile
-                            ])) { task in
-                                task.checkCommandLineContains([
-                                    // Check custom MODULEMAP_PATH values. This would for example be the generated module map.
-                                    "-fmodule-map-file=/tmp/Test/aProject/dependency_custom_module_map_file_path",
-                                    // Check that module maps from dependencies' dependencies are also passed.
-                                    "-fmodule-map-file=/tmp/Test/aProject/build/Debug/SwiftSubDependency.framework/Versions/A/Modules/module.modulemap"
-                                ])
-
-                                if SWBFeatureFlag.enableClangExtractAPI.value && clangFeatures.has(.extractAPIIgnores) {
-                                    task.checkCommandLineContains(["--extract-api-ignores=\(compatibilitySymbolsFile.str)"])
-                                }
+                                SWBFeatureFlag.enableClangExtractAPI.value ? symbolGraphFile : sdkdbFile,
+                            ])
+                        ) { task in
+                            task.checkCommandLineContains([
+                                // Check custom MODULEMAP_PATH values. This would for example be the generated module map.
+                                "-fmodule-map-file=/tmp/Test/aProject/dependency_custom_module_map_file_path",
+                                // Check that module maps from dependencies' dependencies are also passed.
+                                "-fmodule-map-file=/tmp/Test/aProject/build/Debug/SwiftSubDependency.framework/Versions/A/Modules/module.modulemap",
+                            ])
+
+                            if SWBFeatureFlag.enableClangExtractAPI.value && clangFeatures.has(.extractAPIIgnores) {
+                                task.checkCommandLineContains(["--extract-api-ignores=\(compatibilitySymbolsFile.str)"])
                             }
+                        }
 
                         if !SWBFeatureFlag.enableClangExtractAPI.value {
                             results.checkTaskExists(.matchTarget(target), .matchRule(["ConvertSDKDBToSymbolGraph", sdkdbFile]))
@@ -804,24 +854,24 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                                     "CC": clangCompilerPath.str,
                                     "TAPI_EXEC": tapiToolPath.str,
                                     "DOCC_EXEC": doccToolPath.str,
-                                    "INFOPLIST_FILE":"Info.plist",
+                                    "INFOPLIST_FILE": "Info.plist",
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "PRODUCT_BUNDLE_IDENTIFIER": "test.bundle.identifier",
                                     "CURRENT_PROJECT_VERSION": "0.0.1",
                                     "CLANG_CXX_LANGUAGE_STANDARD": "c++23",
                                     "OTHER_CPLUSPLUSFLAGS": "-fchar8_t",
-                                    "DOCC_ENABLE_CXX_SUPPORT": "NO" // Disable C++ symbol graph generation
+                                    "DOCC_ENABLE_CXX_SUPPORT": "NO",  // Disable C++ symbol graph generation
                                 ]
                             )
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([
                                 TestBuildFile("ObjCHeaderFilePublic.h", headerVisibility: .public),
-                                TestBuildFile("ObjCXXHeaderFilePublic.hpp", headerVisibility: .public)
+                                TestBuildFile("ObjCXXHeaderFilePublic.hpp", headerVisibility: .public),
                             ]),
                             TestSourcesBuildPhase([
                                 TestBuildFile("ObjCXXSourceFile.cpp")
-                            ])
+                            ]),
                         ]
                     ),
                     TestStandardTarget(
@@ -838,13 +888,13 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                                     "CC": clangCompilerPath.str,
                                     "TAPI_EXEC": tapiToolPath.str,
                                     "DOCC_EXEC": doccToolPath.str,
-                                    "INFOPLIST_FILE":"Info.plist",
+                                    "INFOPLIST_FILE": "Info.plist",
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "PRODUCT_BUNDLE_IDENTIFIER": "test.bundle.identifier",
                                     "CURRENT_PROJECT_VERSION": "0.0.1",
                                     "CLANG_CXX_LANGUAGE_STANDARD": "c++23",
                                     "OTHER_CPLUSPLUSFLAGS": "-fchar8_t",
-                                    "DOCC_ENABLE_CXX_SUPPORT": "NO" // Disable C++ symbol graph generation
+                                    "DOCC_ENABLE_CXX_SUPPORT": "NO",  // Disable C++ symbol graph generation
                                 ]
                             )
                         ],
@@ -854,9 +904,9 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
                             ]),
                             TestSourcesBuildPhase([
                                 TestBuildFile("ObjCXXSourceFile.cpp")
-                            ])
+                            ]),
                         ]
-                    )
+                    ),
                 ]
             )
 
@@ -883,7 +933,7 @@ fileprivate struct ObjectiveCSymbolExtractorTests: CoreBasedTests {
 
                         results.checkTask(
                             .matchTarget(target),
-                            .matchRule([ "ExtractAPI", symbolGraphFile.str])
+                            .matchRule(["ExtractAPI", symbolGraphFile.str])
                         ) { task in
                             task.checkCommandLineContainsUninterrupted(["-x", "objective-c-header"])
                             task.checkCommandLineMatches([.contains("ObjCHeaderFilePublic.h")])
diff --git a/Tests/SWBTaskConstructionTests/OnDemandResourcesTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/OnDemandResourcesTaskConstructionTests.swift
index feda1daf..f36ff8cb 100644
--- a/Tests/SWBTaskConstructionTests/OnDemandResourcesTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/OnDemandResourcesTaskConstructionTests.swift
@@ -26,7 +26,8 @@ fileprivate struct OnDemandResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     // We have a mix of resources which just get copied, vs. get processed.
                     TestFile("A.dat"),
@@ -34,7 +35,8 @@ fileprivate struct OnDemandResourcesTaskConstructionTests: CoreBasedTests {
                     TestFile("de.lproj/C.png", regionVariantName: "de"),
                     TestFile("Assets.xcassets"),
                     TestFile("Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -48,7 +50,8 @@ fileprivate struct OnDemandResourcesTaskConstructionTests: CoreBasedTests {
                         "CODE_SIGN_IDENTITY": "-",
                         "ON_DEMAND_RESOURCES_INITIAL_INSTALL_TAGS": "foo",
                         "ON_DEMAND_RESOURCES_PREFETCH_ORDER": "baz",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -60,14 +63,16 @@ fileprivate struct OnDemandResourcesTaskConstructionTests: CoreBasedTests {
                             TestBuildFile("B.png", assetTags: Set(["foo"])),
                             TestBuildFile("de.lproj/C.png", assetTags: Set(["foo", "bar"])),
                             "Assets.xcassets",
-                        ]),
-                    ]),
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
         final class ClientDelegate: MockTestTaskPlanningClientDelegate, @unchecked Sendable {
-            override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+            override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
                 if commandLine.first.map(Path.init)?.basename == "actool", commandLine.dropFirst().first != "--version" {
                     return .result(status: .exit(0), stdout: Data("{}".utf8), stderr: Data())
                 }
diff --git a/Tests/SWBTaskConstructionTests/PackageProductConstructionTests.swift b/Tests/SWBTaskConstructionTests/PackageProductConstructionTests.swift
index 8675767d..5b2186dc 100644
--- a/Tests/SWBTaskConstructionTests/PackageProductConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/PackageProductConstructionTests.swift
@@ -32,17 +32,23 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("main.c"),
                     TestFile("d.c"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "LIBTOOL": libtoolPath.str,
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "USE_HEADERMAP": "NO"]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "LIBTOOL": libtoolPath.str,
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "USE_HEADERMAP": "NO",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "Tool", type: .commandLineTool,
+                    "Tool",
+                    type: .commandLineTool,
                     buildPhases: [
                         TestSourcesBuildPhase(["main.c"]),
                         TestFrameworksBuildPhase([
@@ -54,20 +60,25 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                             TestBuildFile(.target("OtherPackageProduct")),
                             // Add a package which has transitive references through a static library.
                             TestBuildFile(.target("PackageProductWithTransitiveRefs")),
-                            "libEND.a"]),
+                            "libEND.a",
+                        ]),
                     ],
                     dependencies: [
                         "SomePackageProduct",
                         "SwiftyJSON",
                         "PackageProductWithTransitiveRefs",
-                    ]),
+                    ]
+                ),
                 TestStandardTarget(
-                    "D", type: .staticLibrary,
+                    "D",
+                    type: .staticLibrary,
                     buildConfigurations: [],
                     buildPhases: [
                         TestSourcesBuildPhase(["d.c"])
-                    ]),
-            ])
+                    ]
+                ),
+            ]
+        )
         let testPackage = try await TestPackageProject(
             "Package",
             groupTree: TestGroup(
@@ -76,30 +87,41 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                     TestFile("foo.c"),
                     TestFile("libBEGIN.a"),
                     TestFile("libEND.a"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "LIBTOOL": libtoolPath.str,
-                    "CODE_SIGN_IDENTITY": "",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "USE_HEADERMAP": "NO"]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "LIBTOOL": libtoolPath.str,
+                        "CODE_SIGN_IDENTITY": "",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "USE_HEADERMAP": "NO",
+                    ]
+                )
             ],
             targets: [
                 TestPackageProductTarget(
                     "SomePackageProduct",
                     frameworksBuildPhase: TestFrameworksBuildPhase([
-                        TestBuildFile(.target("A"))]),
-                    dependencies: ["A"]),
+                        TestBuildFile(.target("A"))
+                    ]),
+                    dependencies: ["A"]
+                ),
                 TestPackageProductTarget(
                     "OtherPackageProduct",
                     frameworksBuildPhase: TestFrameworksBuildPhase([
-                        TestBuildFile(.target("A"))]),
-                    dependencies: ["A"]),
+                        TestBuildFile(.target("A"))
+                    ]),
+                    dependencies: ["A"]
+                ),
                 TestPackageProductTarget(
                     "NestedPackagedProduct",
                     frameworksBuildPhase: TestFrameworksBuildPhase([
-                        TestBuildFile(.target("B"))]),
-                    dependencies: ["B"]),
+                        TestBuildFile(.target("B"))
+                    ]),
+                    dependencies: ["B"]
+                ),
                 TestPackageProductTarget(
                     "PackageProductWithTransitiveRefs",
                     frameworksBuildPhase: TestFrameworksBuildPhase([
@@ -110,42 +132,62 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                         // This is a static library which should also add more transitive refs.
                         TestBuildFile(.target("C")),
                         // This is an object file which should also add more transitive refs.
-                        TestBuildFile(.target("E"))]),
-                    dependencies: ["SomePackageProduct", "NestedPackageProduct", "C", "E"]),
+                        TestBuildFile(.target("E")),
+                    ]),
+                    dependencies: ["SomePackageProduct", "NestedPackageProduct", "C", "E"]
+                ),
                 TestStandardTarget(
-                    "A", type: .staticLibrary,
-                    buildPhases: [TestSourcesBuildPhase(["foo.c"])]),
+                    "A",
+                    type: .staticLibrary,
+                    buildPhases: [TestSourcesBuildPhase(["foo.c"])]
+                ),
                 TestStandardTarget(
-                    "B", type: .staticLibrary,
-                    buildPhases: [TestSourcesBuildPhase(["foo.c"])]),
+                    "B",
+                    type: .staticLibrary,
+                    buildPhases: [TestSourcesBuildPhase(["foo.c"])]
+                ),
                 TestStandardTarget(
-                    "C", type: .staticLibrary,
+                    "C",
+                    type: .staticLibrary,
                     buildPhases: [
                         TestSourcesBuildPhase(["foo.c"]),
                         TestFrameworksBuildPhase([
-                            TestBuildFile(.target("C_Impl"))])],
-                    dependencies: ["C_Impl"]),
+                            TestBuildFile(.target("C_Impl"))
+                        ]),
+                    ],
+                    dependencies: ["C_Impl"]
+                ),
                 TestStandardTarget(
-                    "C_Impl", type: .staticLibrary,
-                    buildPhases: [TestSourcesBuildPhase(["foo.c"])]),
+                    "C_Impl",
+                    type: .staticLibrary,
+                    buildPhases: [TestSourcesBuildPhase(["foo.c"])]
+                ),
                 TestPackageProductTarget(
                     "SwiftyJSON",
                     frameworksBuildPhase: TestFrameworksBuildPhase([]),
                     buildConfigurations: [],
-                    dependencies: ["D"]),
+                    dependencies: ["D"]
+                ),
                 TestStandardTarget(
-                    "E", type: .objectFile,
+                    "E",
+                    type: .objectFile,
                     buildPhases: [
                         TestSourcesBuildPhase([]),
                         TestFrameworksBuildPhase([
-                            TestBuildFile(.target("F"))])
-                    ], dependencies: ["F"]),
+                            TestBuildFile(.target("F"))
+                        ]),
+                    ],
+                    dependencies: ["F"]
+                ),
                 TestStandardTarget(
-                    "F", type: .objectFile,
+                    "F",
+                    type: .objectFile,
                     buildPhases: [
                         TestSourcesBuildPhase(["foo.c"])
-                    ]),
-            ])
+                    ]
+                ),
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject, testPackage])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
@@ -171,80 +213,100 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
             groupTree: TestGroup(
                 "SomeFiles",
                 children: [
-                    TestFile("Utility.swift"),
-                ]),
+                    TestFile("Utility.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "4.2",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "USE_HEADERMAP": "NO",
-                    "SKIP_INSTALL": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": "4.2",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "USE_HEADERMAP": "NO",
+                        "SKIP_INSTALL": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestAggregateTarget(
                     "ALL",
-                    dependencies: ["DynamicUtility", "DynamicJSON"]),
+                    dependencies: ["DynamicUtility", "DynamicJSON"]
+                ),
 
                 TestStandardTarget(
-                    "DynamicUtility", type: .dynamicLibrary,
+                    "DynamicUtility",
+                    type: .dynamicLibrary,
                     buildPhases: [
                         TestSourcesBuildPhase([]),
                         TestFrameworksBuildPhase([
                             TestBuildFile(.target("Utility"))
                         ]),
                     ],
-                    dependencies: ["Utility"]),
+                    dependencies: ["Utility"]
+                ),
 
                 TestStandardTarget(
-                    "DynamicJSON", type: .dynamicLibrary,
+                    "DynamicJSON",
+                    type: .dynamicLibrary,
                     buildPhases: [
                         TestSourcesBuildPhase([]),
                         TestFrameworksBuildPhase([
-                            TestBuildFile(.target("PackageProduct::SwiftyJSON")),
+                            TestBuildFile(.target("PackageProduct::SwiftyJSON"))
                         ]),
                     ],
                     dependencies: [
-                        "PackageProduct::SwiftyJSON",
-                    ]),
+                        "PackageProduct::SwiftyJSON"
+                    ]
+                ),
 
                 TestStandardTarget(
-                    "Utility", type: .objectFile,
+                    "Utility",
+                    type: .objectFile,
                     buildPhases: [
                         TestSourcesBuildPhase(["Utility.swift"])
-                    ]),
-            ])
+                    ]
+                ),
+            ]
+        )
         let testPackage = try await TestPackageProject(
             "Package",
             groupTree: TestGroup(
                 "SomeFiles",
                 children: [
-                    TestFile("SwiftyJSON.swift"),
-                ]),
+                    TestFile("SwiftyJSON.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "4.2",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "USE_HEADERMAP": "NO",
-                    "SKIP_INSTALL": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": "4.2",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "USE_HEADERMAP": "NO",
+                        "SKIP_INSTALL": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestPackageProductTarget(
                     "PackageProduct::SwiftyJSON",
                     frameworksBuildPhase: TestFrameworksBuildPhase([
-                        TestBuildFile(.target("SwiftyJSON"))]),
-                    dependencies: ["SwiftyJSON"]),
+                        TestBuildFile(.target("SwiftyJSON"))
+                    ]),
+                    dependencies: ["SwiftyJSON"]
+                ),
 
                 TestStandardTarget(
-                    "SwiftyJSON", type: .objectFile,
+                    "SwiftyJSON",
+                    type: .objectFile,
                     buildPhases: [
                         TestSourcesBuildPhase(["SwiftyJSON.swift"])
-                    ]),
+                    ]
+                ),
             ]
         )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject, testPackage])
@@ -267,11 +329,14 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
 
         // Check deployment build.
         try await withTemporaryDirectory { tmpDir in
-            let parameters = BuildParameters(configuration: "Debug", overrides: [
-                "DSTROOT": tmpDir.join("dst").str,
-                "DEPLOYMENT_POSTPROCESSING": "YES",
-                "DEPLOYMENT_LOCATION": "YES",
-            ])
+            let parameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    "DSTROOT": tmpDir.join("dst").str,
+                    "DEPLOYMENT_POSTPROCESSING": "YES",
+                    "DEPLOYMENT_LOCATION": "YES",
+                ]
+            )
 
             await tester.checkBuild(parameters, runDestination: .macOS) { results in
                 results.checkNoDiagnostics()
@@ -317,44 +382,58 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                     TestGroup(
                         "clib",
                         children: [
-                            TestFile("clib.h"),
-                        ]),
-                ]),
+                            TestFile("clib.h")
+                        ]
+                    ),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "4.2",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "USE_HEADERMAP": "NO"]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": "4.2",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "USE_HEADERMAP": "NO",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "tool", type: .commandLineTool,
+                    "tool",
+                    type: .commandLineTool,
                     buildPhases: [
                         TestSourcesBuildPhase(["main.swift"]),
                         TestFrameworksBuildPhase([
-                            TestBuildFile(.target("clib")),
+                            TestBuildFile(.target("clib"))
                         ]),
                     ],
                     dependencies: [
-                        "clib",
-                    ]),
+                        "clib"
+                    ]
+                ),
 
                 TestStandardTarget(
-                    "clib", type: .objectFile,
+                    "clib",
+                    type: .objectFile,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "USE_HEADERMAP": "NO",
-                            "DEFINES_MODULE": "YES",
-                            "MODULEMAP_FILE_CONTENTS": "foo",
-                            "MODULEMAP_PATH": "$(BUILT_PRODUCTS_DIR)/somewhere/test.modulemap",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "USE_HEADERMAP": "NO",
+                                "DEFINES_MODULE": "YES",
+                                "MODULEMAP_FILE_CONTENTS": "foo",
+                                "MODULEMAP_PATH": "$(BUILT_PRODUCTS_DIR)/somewhere/test.modulemap",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["clib.c"])
-                    ]),
-            ])
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(runDestination: .macOS) { results in
@@ -364,7 +443,7 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                     #expect(contents == "foo")
                 }
                 results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("test.modulemap")) { task in
-                    #expect(task.outputs.map{$0.path.str} == ["/tmp/Test/aProject/build/Debug/somewhere/test.modulemap"])
+                    #expect(task.outputs.map { $0.path.str } == ["/tmp/Test/aProject/build/Debug/somewhere/test.modulemap"])
                 }
             }
         }
@@ -377,65 +456,83 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
             groupTree: TestGroup(
                 "SomeFiles",
                 children: [
-                    TestFile("main.swift"),
-                ]),
+                    TestFile("main.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "4.2",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "USE_HEADERMAP": "NO",
-                    "SKIP_INSTALL": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": "4.2",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "USE_HEADERMAP": "NO",
+                        "SKIP_INSTALL": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "tool", type: .commandLineTool,
+                    "tool",
+                    type: .commandLineTool,
                     buildPhases: [
                         TestSourcesBuildPhase(["main.swift"]),
                         TestFrameworksBuildPhase([
-                            TestBuildFile(.target("SwiftyJSON")),
+                            TestBuildFile(.target("SwiftyJSON"))
                         ]),
                     ],
                     dependencies: [
-                        "SwiftyJSON",
-                    ]),
-            ])
+                        "SwiftyJSON"
+                    ]
+                )
+            ]
+        )
         let testPackage = try await TestPackageProject(
             "Package",
             groupTree: TestGroup(
                 "SomeFiles",
                 children: [
-                    TestFile("SwiftyJSON.swift"),
-                ]),
+                    TestFile("SwiftyJSON.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "4.2",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "USE_HEADERMAP": "NO",
-                    "SKIP_INSTALL": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": "4.2",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "USE_HEADERMAP": "NO",
+                        "SKIP_INSTALL": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestPackageProductTarget(
                     "SwiftyJSON",
                     frameworksBuildPhase: TestFrameworksBuildPhase([
-                        TestBuildFile(.target("PACKAGE::SwiftyJSON"))]),
+                        TestBuildFile(.target("PACKAGE::SwiftyJSON"))
+                    ]),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "USES_SWIFTPM_UNSAFE_FLAGS": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "USES_SWIFTPM_UNSAFE_FLAGS": "YES"
+                            ]
+                        )
                     ],
-                    dependencies: ["PACKAGE::SwiftyJSON"]),
+                    dependencies: ["PACKAGE::SwiftyJSON"]
+                ),
 
                 TestStandardTarget(
-                    "PACKAGE::SwiftyJSON", type: .objectFile,
+                    "PACKAGE::SwiftyJSON",
+                    type: .objectFile,
                     buildPhases: [
                         TestSourcesBuildPhase(["SwiftyJSON.swift"])
-                    ]),
+                    ]
+                ),
             ]
         )
         let testWorkspace = TestWorkspace("Test", projects: [testProject, testPackage])
@@ -455,50 +552,65 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("SwiftyJSON.swift"),
                     TestFile("SwiftyJSONTests.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "CODE_SIGN_IDENTITY": "",
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "4.2",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "USE_HEADERMAP": "NO",
-                    "SKIP_INSTALL": "YES",
-                    "MACOSX_DEPLOYMENT_TARGET": "10.15",
-                    "IPHONEOS_DEPLOYMENT_TARGET": "13.0",
-                    "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                    "SUPPORTS_MACCATALYST": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "CODE_SIGN_IDENTITY": "",
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": "4.2",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "USE_HEADERMAP": "NO",
+                        "SKIP_INSTALL": "YES",
+                        "MACOSX_DEPLOYMENT_TARGET": "10.15",
+                        "IPHONEOS_DEPLOYMENT_TARGET": "13.0",
+                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                        "SUPPORTS_MACCATALYST": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "SwiftJSONTests", type: .unitTest,
+                    "SwiftJSONTests",
+                    type: .unitTest,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "BUNDLE_LOADER[sdk=macosx*]": "$(BUILT_PRODUCTS_DIR)/SwiftyJSON.app/Contents/MacOS/SwiftyJSON",
-                            "BUNDLE_LOADER": "$(BUILT_PRODUCTS_DIR)/SwiftyJSON.app/SwiftyJSON",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "BUNDLE_LOADER[sdk=macosx*]": "$(BUILT_PRODUCTS_DIR)/SwiftyJSON.app/Contents/MacOS/SwiftyJSON",
+                                "BUNDLE_LOADER": "$(BUILT_PRODUCTS_DIR)/SwiftyJSON.app/SwiftyJSON",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SwiftyJSONTests.swift"]),
+                        TestSourcesBuildPhase(["SwiftyJSONTests.swift"])
                     ],
                     dependencies: [
-                        "SwiftyJSON",
-                    ]),
+                        "SwiftyJSON"
+                    ]
+                ),
 
                 TestStandardTarget(
-                    "SwiftyJSON", type: .application,
+                    "SwiftyJSON",
+                    type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", impartedBuildProperties: TestImpartedBuildProperties(buildSettings: [
-                            "OTHER_SWIFT_FLAGS": "-Isome/path",
-                        ]))
+                        TestBuildConfiguration(
+                            "Debug",
+                            impartedBuildProperties: TestImpartedBuildProperties(buildSettings: [
+                                "OTHER_SWIFT_FLAGS": "-Isome/path"
+                            ])
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SwiftyJSON.swift"]),
-                    ]),
-            ])
+                        TestSourcesBuildPhase(["SwiftyJSON.swift"])
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         for destination in [RunDestinationInfo.iOS, .macOS, .macCatalyst] {
@@ -536,80 +648,104 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("SwiftyJSON.swift"),
                     TestFile("fmwk.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "",
-                    "ENTITLEMENTS_REQUIRED": "NO",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "4.2",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "USE_HEADERMAP": "NO",
-                    "SKIP_INSTALL": "YES",
-                    "SUPPORTS_MACCATALYST": "YES",
-                    "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator macosx",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "",
+                        "ENTITLEMENTS_REQUIRED": "NO",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": "4.2",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "USE_HEADERMAP": "NO",
+                        "SKIP_INSTALL": "YES",
+                        "SUPPORTS_MACCATALYST": "YES",
+                        "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator macosx",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "fmwk", type: .framework,
+                    "fmwk",
+                    type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "MACOSX_DEPLOYMENT_TARGET": "10.13",
-                            "IPHONEOS_DEPLOYMENT_TARGET": "13.0", // NOTE: *effective* deployment target is clamped to 13.1 for Mac Catalyst
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "MACOSX_DEPLOYMENT_TARGET": "10.13",
+                                "IPHONEOS_DEPLOYMENT_TARGET": "13.0",  // NOTE: *effective* deployment target is clamped to 13.1 for Mac Catalyst
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["fmwk.swift"]),
                         TestFrameworksBuildPhase([
-                            TestBuildFile(.target("SwiftyJSON")),
+                            TestBuildFile(.target("SwiftyJSON"))
                         ]),
                     ],
                     dependencies: [
                         "SwiftyJSON",
-                        "SwiftyJSONImpl"
-                    ]),
+                        "SwiftyJSONImpl",
+                    ]
+                ),
 
                 TestPackageProductTarget(
                     "SwiftyJSON",
                     frameworksBuildPhase: TestFrameworksBuildPhase([
-                        TestBuildFile(.target("PACKAGE::SwiftyJSON"))]),
+                        TestBuildFile(.target("PACKAGE::SwiftyJSON"))
+                    ]),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "MACOSX_DEPLOYMENT_TARGET": "10.14",
-                            "IPHONEOS_DEPLOYMENT_TARGET": "13.2",
-                            "SDKROOT": "auto",
-                            "SDK_VARIANT": "auto",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "MACOSX_DEPLOYMENT_TARGET": "10.14",
+                                "IPHONEOS_DEPLOYMENT_TARGET": "13.2",
+                                "SDKROOT": "auto",
+                                "SDK_VARIANT": "auto",
+                            ]
+                        )
                     ],
-                    dependencies: ["PACKAGE::SwiftyJSON"]),
+                    dependencies: ["PACKAGE::SwiftyJSON"]
+                ),
 
                 TestStandardTarget(
-                    "PACKAGE::SwiftyJSON", type: .objectFile,
+                    "PACKAGE::SwiftyJSON",
+                    type: .objectFile,
                     buildPhases: [
                         TestSourcesBuildPhase(["SwiftyJSON.swift"])
-                    ]),
+                    ]
+                ),
 
                 TestPackageProductTarget(
                     "SwiftyJSONImpl",
                     frameworksBuildPhase: TestFrameworksBuildPhase([
-                        TestBuildFile(.target("PACKAGE::SwiftyJSONImpl"))]),
+                        TestBuildFile(.target("PACKAGE::SwiftyJSONImpl"))
+                    ]),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "MACOSX_DEPLOYMENT_TARGET": "11.0",
-                            "IPHONEOS_DEPLOYMENT_TARGET": "13.2",
-                            "SDKROOT": "auto",
-                            "SDK_VARIANT": "auto",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "MACOSX_DEPLOYMENT_TARGET": "11.0",
+                                "IPHONEOS_DEPLOYMENT_TARGET": "13.2",
+                                "SDKROOT": "auto",
+                                "SDK_VARIANT": "auto",
+                            ]
+                        )
                     ],
-                    dependencies: ["PACKAGE::SwiftyJSONImpl"]),
+                    dependencies: ["PACKAGE::SwiftyJSONImpl"]
+                ),
 
                 TestStandardTarget(
-                    "PACKAGE::SwiftyJSONImpl", type: .objectFile,
+                    "PACKAGE::SwiftyJSONImpl",
+                    type: .objectFile,
                     buildPhases: [
                         TestSourcesBuildPhase(["SwiftyJSON.swift"])
-                    ]),
-            ])
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(runDestination: .macOS) { results in
@@ -637,21 +773,32 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
         }
     }
 
-    func commandLineDynamicLibraryTarget(name: String, buildSettings: [String:String]) -> TestStandardTarget {
+    func commandLineDynamicLibraryTarget(name: String, buildSettings: [String: String]) -> TestStandardTarget {
         TestStandardTarget(
             name,
-            type: .dynamicLibrary, // we need to choose a product type that is supported on all platforms; so tool, for example, doesn't work
-            buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": name,
-                                                                                   "ONLY_ACTIVE_ARCH": "YES",
-                                                                                   "USE_HEADERMAP": "NO",
-                                                                                   "CODE_SIGN_IDENTITY": "",
-                                                                                   "ENTITLEMENTS_REQUIRED": "NO",
-                                                                                  ].merging(buildSettings, uniquingKeysWith: { a, _ in
-                                                                                      Issue.record("should not be reached")
-                                                                                      return a
-                                                                                  })) ],
-            buildPhases: [ TestSourcesBuildPhase(["best.c"]),
-                           TestFrameworksBuildPhase([TestBuildFile("PackageLib.o")]) ],
+            type: .dynamicLibrary,  // we need to choose a product type that is supported on all platforms; so tool, for example, doesn't work
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": name,
+                        "ONLY_ACTIVE_ARCH": "YES",
+                        "USE_HEADERMAP": "NO",
+                        "CODE_SIGN_IDENTITY": "",
+                        "ENTITLEMENTS_REQUIRED": "NO",
+                    ].merging(
+                        buildSettings,
+                        uniquingKeysWith: { a, _ in
+                            Issue.record("should not be reached")
+                            return a
+                        }
+                    )
+                )
+            ],
+            buildPhases: [
+                TestSourcesBuildPhase(["best.c"]),
+                TestFrameworksBuildPhase([TestBuildFile("PackageLib.o")]),
+            ],
             dependencies: ["PackageLibProduct"]
         )
     }
@@ -674,7 +821,7 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
     func packageProductReferences() async throws {
         let core = try await getCore()
         let allPlatforms = core.platformRegistry.platforms.filter { !$0.isSimulator && core.sdkRegistry.lookup($0.name) != nil && $0.name != "none" }
-        #expect(allPlatforms.count > 0) // ensure we don't just pass this test because we somehow ended up with no platforms
+        #expect(allPlatforms.count > 0)  // ensure we don't just pass this test because we somehow ended up with no platforms
         let targets = allPlatforms.map { $0.name }.map {
             commandLineDynamicLibraryTarget(name: "\($0)Lib", buildSettings: ["SDKROOT": $0])
         }
@@ -682,30 +829,46 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
         let almostAllTargets = targets + (macCatalystTarget.map { [$0] } ?? [])
         let allTargets = [TestAggregateTarget("ALL", dependencies: almostAllTargets.map { $0.name })] + almostAllTargets.map { $0 as (any TestTarget) }
 
-        let package = TestPackageProject("aPackage", groupTree: TestGroup("Package", children: [TestFile("test.c")]), targets: [
-            TestPackageProductTarget(
-                "PackageLibProduct",
-                frameworksBuildPhase: TestFrameworksBuildPhase([
-                    TestBuildFile(.target("PackageLib"))]),
-                buildConfigurations: [
-                    // Targets need to opt-in to specialization.
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SDKROOT": "auto",
-                        "SDK_VARIANT": "auto",
-                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+        let package = TestPackageProject(
+            "aPackage",
+            groupTree: TestGroup("Package", children: [TestFile("test.c")]),
+            targets: [
+                TestPackageProductTarget(
+                    "PackageLibProduct",
+                    frameworksBuildPhase: TestFrameworksBuildPhase([
+                        TestBuildFile(.target("PackageLib"))
                     ]),
-                ],
-                dependencies: ["PackageLib"]
-            ),
-            TestStandardTarget("PackageLib", type: .objectFile,
-                               buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: [
+                    buildConfigurations: [
+                        // Targets need to opt-in to specialization.
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SDK_VARIANT": "auto",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                            ]
+                        )
+                    ],
+                    dependencies: ["PackageLib"]
+                ),
+                TestStandardTarget(
+                    "PackageLib",
+                    type: .objectFile,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
                                 "PRODUCT_NAME": "PackageLib",
                                 "SDKROOT": "auto",
                                 "SDK_VARIANT": "auto",
                                 "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                               ]) ],
-                               buildPhases: [TestSourcesBuildPhase(["test.c"])])
-        ])
+                            ]
+                        )
+                    ],
+                    buildPhases: [TestSourcesBuildPhase(["test.c"])]
+                ),
+            ]
+        )
 
         let workspace = TestWorkspace("Workspace", projects: [TestProject("aProject", groupTree: TestGroup("SomeFiles", children: [TestFile("best.c")]), targets: allTargets), package])
         let tester = try await TaskConstructionTester(getCore(), workspace)
@@ -733,7 +896,7 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                 if macCatalystTarget != nil {
                     // Check package got specialized correctly for MacCatalyst.
                     guard let input = findInput(for: "MacCatalystLib.dylib", in: tasks) else {
-                        return // `findInput()` will already error if there's no matching task or input
+                        return  // `findInput()` will already error if there's no matching task or input
                     }
                     #expect(input.path.str.hasSuffix("Debug\(MacCatalystInfo.publicSDKBuiltProductsDirSuffix)/PackageLib.o"), "incorrect linker input path for MacCatalyst: \(input.path.str)")
                 }
@@ -751,55 +914,69 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                     TestFile("SwiftyJSON.swift"),
                     TestFile("SwiftyJSONTests.swift"),
                     TestFile("Network.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "CODE_SIGN_IDENTITY": "",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "4.2",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "USE_HEADERMAP": "NO",
-                    "SKIP_INSTALL": "YES",
-                    "TAPI_EXEC": tapiToolPath.str,
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "CODE_SIGN_IDENTITY": "",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": "4.2",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "USE_HEADERMAP": "NO",
+                        "SKIP_INSTALL": "YES",
+                        "TAPI_EXEC": tapiToolPath.str,
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "SwiftyJSONTests", type: .unitTest,
+                    "SwiftyJSONTests",
+                    type: .unitTest,
                     buildPhases: [
                         TestSourcesBuildPhase(["SwiftyJSONTests.swift"]),
                         TestFrameworksBuildPhase([
-                            TestBuildFile(.target("Network")),
+                            TestBuildFile(.target("Network"))
                         ]),
                     ],
                     dependencies: [
                         "SwiftyJSON",
                         "Network",
-                    ]),
+                    ]
+                ),
 
                 TestStandardTarget(
-                    "SwiftyJSON", type: .application,
+                    "SwiftyJSON",
+                    type: .application,
                     buildPhases: [
                         TestSourcesBuildPhase(["SwiftyJSON.swift"]),
                         TestFrameworksBuildPhase([
-                            TestBuildFile(.target("Network")),
+                            TestBuildFile(.target("Network"))
                         ]),
                     ],
                     dependencies: [
-                        "Network",
-                    ]),
+                        "Network"
+                    ]
+                ),
                 TestStandardTarget(
-                    "Network", type: .framework,
+                    "Network",
+                    type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", impartedBuildProperties: TestImpartedBuildProperties(buildSettings: [
-                            "OTHER_SWIFT_FLAGS": "-Isome/path",
-                        ])),
+                        TestBuildConfiguration(
+                            "Debug",
+                            impartedBuildProperties: TestImpartedBuildProperties(buildSettings: [
+                                "OTHER_SWIFT_FLAGS": "-Isome/path"
+                            ])
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["Network.swift"])
-                    ]),
-            ])
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(runDestination: .macOS) { results in
@@ -824,31 +1001,42 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
             groupTree: TestGroup(
                 "SomeFiles",
                 children: [
-                    TestFile("foo.swift"),
-                ]),
+                    TestFile("foo.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "4.2",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "DEFINES_MODULE": "YES",
-                    "USE_HEADERMAP": "NO"]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": "4.2",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "DEFINES_MODULE": "YES",
+                        "USE_HEADERMAP": "NO",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "foo", type: .objectFile,
+                    "foo",
+                    type: .objectFile,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "MODULEMAP_FILE_CONTENTS": "foo",
-                            "SWIFT_OBJC_INTERFACE_HEADER_NAME": "Foo-Swift.h",
-                            "MODULEMAP_PATH": "$(BUILT_PRODUCTS_DIR)/somewhere/test.modulemap",
-                            "SWIFT_OBJC_INTERFACE_HEADER_DIR": "$(BUILT_PRODUCTS_DIR)/somewhere",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "MODULEMAP_FILE_CONTENTS": "foo",
+                                "SWIFT_OBJC_INTERFACE_HEADER_NAME": "Foo-Swift.h",
+                                "MODULEMAP_PATH": "$(BUILT_PRODUCTS_DIR)/somewhere/test.modulemap",
+                                "SWIFT_OBJC_INTERFACE_HEADER_DIR": "$(BUILT_PRODUCTS_DIR)/somewhere",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["foo.swift"])
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(runDestination: .macOS) { results in
@@ -861,10 +1049,10 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                 }
 
                 results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("test.modulemap")) { task in
-                    #expect(task.outputs.map{$0.path.str} == ["/tmp/Test/aProject/build/Debug/somewhere/test.modulemap"])
+                    #expect(task.outputs.map { $0.path.str } == ["/tmp/Test/aProject/build/Debug/somewhere/test.modulemap"])
                 }
                 results.checkTask(.matchTarget(target), .matchRuleType("SwiftMergeGeneratedHeaders"), .matchRuleItemBasename("Foo-Swift.h")) { task in
-                    #expect(task.outputs.map{$0.path.str} == ["/tmp/Test/aProject/build/Debug/somewhere/Foo-Swift.h"])
+                    #expect(task.outputs.map { $0.path.str } == ["/tmp/Test/aProject/build/Debug/somewhere/Foo-Swift.h"])
                 }
 
                 // Make sure we don't get the unextended module VFS overlay and import underlying module for pure Swift target which wants to emit a modulemap using MODULEMAP_FILE_CONTENTS setting.
@@ -884,16 +1072,21 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("main.swift"),
                     TestFile("best.txt"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "4.2",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "GENERATE_EMBED_IN_CODE_ACCESSORS": "YES",
-                    "USE_HEADERMAP": "NO"]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": "4.2",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "GENERATE_EMBED_IN_CODE_ACCESSORS": "YES",
+                        "USE_HEADERMAP": "NO",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -903,7 +1096,7 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                         TestSourcesBuildPhase(["main.swift"]),
                         TestCopyFilesBuildPhase([TestBuildFile(.file("best.txt"), resourceRule: .embedInCode)], destinationSubfolder: .builtProductsDir),
                     ]
-                ),
+                )
             ]
         )
         let tester = try await TaskConstructionTester(getCore(), testProject)
@@ -933,35 +1126,46 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                     TestFile("main.swift"),
                     TestFile("main.m"),
                     TestFile("Assets.xcassets"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ASSETCATALOG_EXEC": "$(DEVELOPER_DIR)/usr/bin/actool",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "4.2",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "GENERATE_RESOURCE_ACCESSORS": "YES",
-                    "USE_HEADERMAP": "NO"]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ASSETCATALOG_EXEC": "$(DEVELOPER_DIR)/usr/bin/actool",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": "4.2",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "GENERATE_RESOURCE_ACCESSORS": "YES",
+                        "USE_HEADERMAP": "NO",
+                    ]
+                )
             ],
             targets: [
                 TestAggregateTarget(
                     "ALL",
-                    dependencies: ["tool", "objctool",
-                                   "tool_without_resource_bundle_without_catalog",
-                                   "tool_without_resource_bundle_with_catalog"]
+                    dependencies: [
+                        "tool", "objctool",
+                        "tool_without_resource_bundle_without_catalog",
+                        "tool_without_resource_bundle_with_catalog",
+                    ]
                 ),
                 TestStandardTarget(
-                    "tool", type: .application,
+                    "tool",
+                    type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "USE_HEADERMAP": "NO",
-                            "DEFINES_MODULE": "YES",
-                            "PACKAGE_RESOURCE_BUNDLE_NAME": "tool_resources",
-                            "EMBED_PACKAGE_RESOURCE_BUNDLE_NAMES": "tool_resources",
-                            "CODE_SIGNING_ALLOWED": "NO",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "USE_HEADERMAP": "NO",
+                                "DEFINES_MODULE": "YES",
+                                "PACKAGE_RESOURCE_BUNDLE_NAME": "tool_resources",
+                                "EMBED_PACKAGE_RESOURCE_BUNDLE_NAMES": "tool_resources",
+                                "CODE_SIGNING_ALLOWED": "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["main.swift"]),
@@ -970,61 +1174,78 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                     dependencies: ["mallory", "toolslib"]
                 ),
                 TestStandardTarget(
-                    "objctool", type: .commandLineTool,
+                    "objctool",
+                    type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "USE_HEADERMAP": "NO",
-                            "DEFINES_MODULE": "YES",
-                            "PACKAGE_RESOURCE_BUNDLE_NAME": "tool_resources",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "USE_HEADERMAP": "NO",
+                                "DEFINES_MODULE": "YES",
+                                "PACKAGE_RESOURCE_BUNDLE_NAME": "tool_resources",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.m"]),
+                        TestSourcesBuildPhase(["main.m"])
                     ],
                     dependencies: ["mallory"]
                 ),
                 TestStandardTarget(
-                    "mallory", type: .bundle,
+                    "mallory",
+                    type: .bundle,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "USE_HEADERMAP": "NO",
-                            "DEFINES_MODULE": "YES",
-                            "PACKAGE_RESOURCE_BUNDLE_NAME":
-                                """
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "USE_HEADERMAP": "NO",
+                                "DEFINES_MODULE": "YES",
+                                "PACKAGE_RESOURCE_BUNDLE_NAME":
+                                    """
                                 "
                                 print("/etc/passwd")
                                 _ = "
                                 """,
-                        ]),
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.swift"]),
+                        TestSourcesBuildPhase(["main.swift"])
                     ]
                 ),
                 TestStandardTarget(
-                    "toolslib", type: .dynamicLibrary,
+                    "toolslib",
+                    type: .dynamicLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "PACKAGE_RESOURCE_BUNDLE_NAME": "tools_resources",
-                        ], impartedBuildProperties: TestImpartedBuildProperties(buildSettings: [
-                            "EMBED_PACKAGE_RESOURCE_BUNDLE_NAMES": "$(inherited) tool_resources",
-                        ]))
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "PACKAGE_RESOURCE_BUNDLE_NAME": "tools_resources",
+                            ],
+                            impartedBuildProperties: TestImpartedBuildProperties(buildSettings: [
+                                "EMBED_PACKAGE_RESOURCE_BUNDLE_NAMES": "$(inherited) tool_resources"
+                            ])
+                        )
                     ]
                 ),
                 TestStandardTarget(
-                    "tool_without_resource_bundle_without_catalog", type: .application,
+                    "tool_without_resource_bundle_without_catalog",
+                    type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "USE_HEADERMAP": "NO",
-                            "DEFINES_MODULE": "YES",
-                            "PACKAGE_RESOURCE_TARGET_KIND": "regular",
-                            "CODE_SIGNING_ALLOWED": "NO",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "USE_HEADERMAP": "NO",
+                                "DEFINES_MODULE": "YES",
+                                "PACKAGE_RESOURCE_TARGET_KIND": "regular",
+                                "CODE_SIGNING_ALLOWED": "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["main.swift"]),
@@ -1033,15 +1254,19 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                     dependencies: ["mallory", "toolslib"]
                 ),
                 TestStandardTarget(
-                    "tool_without_resource_bundle_with_catalog", type: .application,
+                    "tool_without_resource_bundle_with_catalog",
+                    type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "USE_HEADERMAP": "NO",
-                            "DEFINES_MODULE": "YES",
-                            "PACKAGE_RESOURCE_TARGET_KIND": "regular",
-                            "CODE_SIGNING_ALLOWED": "NO",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "USE_HEADERMAP": "NO",
+                                "DEFINES_MODULE": "YES",
+                                "PACKAGE_RESOURCE_TARGET_KIND": "regular",
+                                "CODE_SIGNING_ALLOWED": "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["main.swift"]),
@@ -1050,7 +1275,8 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                     ],
                     dependencies: ["mallory", "toolslib"]
                 ),
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(runDestination: .macOS) { results in
@@ -1113,26 +1339,31 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                     TestFile("SwiftyJSON.swift"),
                     TestFile("app.swift"),
                     TestFile("appex.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "",
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "4.2",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "USE_HEADERMAP": "NO",
-                    "SKIP_INSTALL": "YES",
-                    "MACOSX_DEPLOYMENT_TARGET": "10.15",
-                    "IPHONEOS_DEPLOYMENT_TARGET": "13.0",
-                    "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                    "SUPPORTS_MACCATALYST": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "",
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": "4.2",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "USE_HEADERMAP": "NO",
+                        "SKIP_INSTALL": "YES",
+                        "MACOSX_DEPLOYMENT_TARGET": "10.15",
+                        "IPHONEOS_DEPLOYMENT_TARGET": "13.0",
+                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                        "SUPPORTS_MACCATALYST": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "app", type: .application,
+                    "app",
+                    type: .application,
                     buildPhases: [
                         TestSourcesBuildPhase(["app.swift"]),
                         TestFrameworksBuildPhase([
@@ -1142,10 +1373,12 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                     dependencies: [
                         "appex",
                         "SwiftyJSON",
-                    ]),
+                    ]
+                ),
 
                 TestStandardTarget(
-                    "appex", type: .applicationExtension,
+                    "appex",
+                    type: .applicationExtension,
                     buildPhases: [
                         TestSourcesBuildPhase(["appex.swift"]),
                         TestFrameworksBuildPhase([
@@ -1153,27 +1386,35 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                         ]),
                     ],
                     dependencies: [
-                        "SwiftyJSON",
-                    ]),
+                        "SwiftyJSON"
+                    ]
+                ),
 
                 TestStandardTarget(
-                    "SwiftyJSON", type: .objectFile,
+                    "SwiftyJSON",
+                    type: .objectFile,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", impartedBuildProperties: TestImpartedBuildProperties(buildSettings: [
-                            "EMBED_PACKAGE_RESOURCE_BUNDLE_NAMES": "FOO",
-                        ])),
+                        TestBuildConfiguration(
+                            "Debug",
+                            impartedBuildProperties: TestImpartedBuildProperties(buildSettings: [
+                                "EMBED_PACKAGE_RESOURCE_BUNDLE_NAMES": "FOO"
+                            ])
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SwiftyJSON.swift"]),
+                        TestSourcesBuildPhase(["SwiftyJSON.swift"])
                     ],
                     dependencies: [
-                        "FOO",
-                    ]),
+                        "FOO"
+                    ]
+                ),
 
                 TestStandardTarget(
-                    "FOO", type: .bundle
+                    "FOO",
+                    type: .bundle
                 ),
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(runDestination: .macOS) { results in
@@ -1201,56 +1442,76 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                     TestFile("SwiftyJSON.swift"),
                     TestFile("CoreDataModel.xcdatamodeld"),
                     TestFile("CoreDataMapping.xcmappingmodel"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "",
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "4.2",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "USE_HEADERMAP": "NO",
-                    "SKIP_INSTALL": "YES",
-                    "MACOSX_DEPLOYMENT_TARGET": "10.15",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "",
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": "4.2",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "USE_HEADERMAP": "NO",
+                        "SKIP_INSTALL": "YES",
+                        "MACOSX_DEPLOYMENT_TARGET": "10.15",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "SwiftyJSON", type: .objectFile,
+                    "SwiftyJSON",
+                    type: .objectFile,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PACKAGE_RESOURCE_TARGET_KIND": "regular",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PACKAGE_RESOURCE_TARGET_KIND": "regular"
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SwiftyJSON.swift", "CoreDataModel.xcdatamodeld"]),
+                        TestSourcesBuildPhase(["SwiftyJSON.swift", "CoreDataModel.xcdatamodeld"])
                     ],
                     dependencies: [
-                        "SwiftyJSON_RESOURCES",
-                    ]),
+                        "SwiftyJSON_RESOURCES"
+                    ]
+                ),
 
                 TestStandardTarget(
-                    "SwiftyJSON_RESOURCES", type: .bundle,
+                    "SwiftyJSON_RESOURCES",
+                    type: .bundle,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PACKAGE_RESOURCE_TARGET_KIND": "resource",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PACKAGE_RESOURCE_TARGET_KIND": "resource"
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestResourcesBuildPhase(["CoreDataModel.xcdatamodeld", "CoreDataMapping.xcmappingmodel"]),
+                        TestResourcesBuildPhase(["CoreDataModel.xcdatamodeld", "CoreDataMapping.xcmappingmodel"])
                     ]
                 ),
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         /// Client to generate files from the core data model.
         final class TestCoreDataCompilerTaskPlanningClientDelegate: MockTestTaskPlanningClientDelegate, @unchecked Sendable {
-            override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+            override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
                 if commandLine.first.map(Path.init)?.basename == "momc", let outputDir = commandLine.last.map(Path.init) {
-                    return .result(status: .exit(0), stdout: Data([
-                        outputDir.join("EntityOne+CoreDataClass.swift"),
-                        outputDir.join("EntityOne+CoreDataProperties.swift"),
-                    ].map { $0.str }.joined(separator: "\n").utf8), stderr: .init())
+                    return .result(
+                        status: .exit(0),
+                        stdout: Data(
+                            [
+                                outputDir.join("EntityOne+CoreDataClass.swift"),
+                                outputDir.join("EntityOne+CoreDataProperties.swift"),
+                            ].map { $0.str }.joined(separator: "\n").utf8
+                        ),
+                        stderr: .init()
+                    )
                 }
                 return try await super.executeExternalTool(commandLine: commandLine, workingDirectory: workingDirectory, environment: environment)
             }
@@ -1285,45 +1546,59 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("SwiftyJSON.swift"),
                     TestFile("main.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "",
-                    "SWIFT_VERSION": "4.2",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "USE_HEADERMAP": "NO",
-                    "SKIP_INSTALL": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "",
+                        "SWIFT_VERSION": "4.2",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "USE_HEADERMAP": "NO",
+                        "SKIP_INSTALL": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "tool", type: .commandLineTool,
+                    "tool",
+                    type: .commandLineTool,
                     buildPhases: [
                         TestSourcesBuildPhase(["main.swift"]),
                         TestFrameworksBuildPhase([
-                            TestBuildFile(.target("SwiftyJSON")),
+                            TestBuildFile(.target("SwiftyJSON"))
                         ]),
                     ],
                     dependencies: [
-                        "SwiftyJSON",
-                    ]),
+                        "SwiftyJSON"
+                    ]
+                ),
                 TestPackageProductTarget(
                     "SwiftyJSON",
                     frameworksBuildPhase: TestFrameworksBuildPhase([
-                        TestBuildFile(.target("PACKAGE::SwiftyJSON"))]),
+                        TestBuildFile(.target("PACKAGE::SwiftyJSON"))
+                    ]),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "USES_SWIFTPM_UNSAFE_FLAGS": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "USES_SWIFTPM_UNSAFE_FLAGS": "YES"
+                            ]
+                        )
                     ],
-                    dependencies: ["PACKAGE::SwiftyJSON"]),
+                    dependencies: ["PACKAGE::SwiftyJSON"]
+                ),
 
                 TestStandardTarget(
-                    "PACKAGE::SwiftyJSON", type: .objectFile,
+                    "PACKAGE::SwiftyJSON",
+                    type: .objectFile,
                     buildPhases: [
                         TestSourcesBuildPhase(["SwiftyJSON.swift"])
-                    ]),
-            ])
+                    ]
+                ),
+            ]
+        )
         await #expect(throws: (any Error).self, "package target 'SwiftyJSON' must be contained within a package") {
             try await TaskConstructionTester(getCore(), testProject)
         }
diff --git a/Tests/SWBTaskConstructionTests/PlannedNodeTests.swift b/Tests/SWBTaskConstructionTests/PlannedNodeTests.swift
index edd0f82f..d008d77e 100644
--- a/Tests/SWBTaskConstructionTests/PlannedNodeTests.swift
+++ b/Tests/SWBTaskConstructionTests/PlannedNodeTests.swift
@@ -24,15 +24,23 @@ fileprivate struct PlannedNodeTests {
         #expect(MakePlannedPathNode(Path("/tmp")).path == Path("/tmp"))
 
         // Check reference==value equality
-        #expect(MakePlannedPathNode(Path("/tmp"))
-                === MakePlannedPathNode(Path("/tmp")))
+        #expect(
+            MakePlannedPathNode(Path("/tmp"))
+                === MakePlannedPathNode(Path("/tmp"))
+        )
 
         // Check expected normalization
-        #expect(MakePlannedPathNode(Path("/tmp/a/"))
-                === MakePlannedPathNode(Path("/tmp/a")))
-        #expect(MakePlannedPathNode(Path("/tmp/a/../b"))
-                === MakePlannedPathNode(Path("/tmp/b")))
-        #expect(MakePlannedPathNode(Path("/tmp/a/."))
-                === MakePlannedPathNode(Path("/tmp/a")))
+        #expect(
+            MakePlannedPathNode(Path("/tmp/a/"))
+                === MakePlannedPathNode(Path("/tmp/a"))
+        )
+        #expect(
+            MakePlannedPathNode(Path("/tmp/a/../b"))
+                === MakePlannedPathNode(Path("/tmp/b"))
+        )
+        #expect(
+            MakePlannedPathNode(Path("/tmp/a/."))
+                === MakePlannedPathNode(Path("/tmp/a"))
+        )
     }
 }
diff --git a/Tests/SWBTaskConstructionTests/PlatformTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/PlatformTaskConstructionTests.swift
index 317fe9f9..49bd0c59 100644
--- a/Tests/SWBTaskConstructionTests/PlatformTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/PlatformTaskConstructionTests.swift
@@ -32,11 +32,13 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("main.m"),
                     TestFile("Class.m"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -44,26 +46,32 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                         "INFOPLIST_FILE": "Info.plist",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "CODE_SIGN_IDENTITY": "Apple Development",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "iphoneos",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "iphoneos"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.m",
+                            "main.m"
                         ]),
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile("FwkTarget.framework", codeSignOnCopy: true),
-                        ], destinationSubfolder: .frameworks, onlyForDeployment: false
-                                               ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("FwkTarget.framework", codeSignOnCopy: true)
+                            ],
+                            destinationSubfolder: .frameworks,
+                            onlyForDeployment: false
+                        ),
                         TestShellScriptBuildPhase(name: "Run Script", originalObjectID: "Foo", contents: "echo \"Running script\"\nexit 0\n", alwaysOutOfDate: true),
                     ],
                     dependencies: ["FwkTarget"]
@@ -72,21 +80,24 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                     "FwkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "iphoneos",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "iphoneos"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Class.m",
+                            "Class.m"
                         ]),
                         TestFrameworksBuildPhase([
-                            "FwkTarget.framework",
+                            "FwkTarget.framework"
                         ]),
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -136,7 +147,7 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                     for platform in core.platformRegistry.platforms {
                         if let otherPlatformDeploymentTargetName = platform.deploymentTargetMacro?.name {
                             if otherPlatformDeploymentTargetName != "IPHONEOS_DEPLOYMENT_TARGET" {
-                                scriptVariables[otherPlatformDeploymentTargetName] = .none      // Set the value to nil, don't remove the entry
+                                scriptVariables[otherPlatformDeploymentTargetName] = .none  // Set the value to nil, don't remove the entry
                             }
                         }
                     }
@@ -151,7 +162,8 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                     #expect(task.inputs.contains { $0.path.str == "\(SRCROOT)/build/aProject.build/Debug-iphoneos/AppTarget.build/DerivedSources/Entitlements.plist" })
 
                     task.checkOutputs([
-                        .path("\(SRCROOT)/build/aProject.build/Debug-iphoneos/AppTarget.build/AppTarget.app.xcent"),])
+                        .path("\(SRCROOT)/build/aProject.build/Debug-iphoneos/AppTarget.build/AppTarget.app.xcent")
+                    ])
                 }
 
                 results.checkTask(.matchTarget(target), .matchRuleType("ProcessProductPackagingDER"), .matchRuleItemPattern(.suffix(".xcent"))) { task in
@@ -165,7 +177,7 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                     ])
 
                     task.checkOutputs([
-                        .path("\(SRCROOT)/build/aProject.build/Debug-iphoneos/AppTarget.build/AppTarget.app.xcent.der"),
+                        .path("\(SRCROOT)/build/aProject.build/Debug-iphoneos/AppTarget.build/AppTarget.app.xcent.der")
                     ])
                 }
 
@@ -177,7 +189,8 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                     #expect(task.inputs.contains { $0.path.str == "/Users/whoever/Library/MobileDevice/Provisioning Profiles/8db0e92c-592c-4f06-bfed-9d945841b78d.mobileprovision" })
 
                     task.checkOutputs([
-                        .path("\(SRCROOT)/build/Debug-iphoneos/AppTarget.app/embedded.mobileprovision"),])
+                        .path("\(SRCROOT)/build/Debug-iphoneos/AppTarget.app/embedded.mobileprovision")
+                    ])
                 }
 
                 // There should be a task to embed the framework and sign it.
@@ -212,9 +225,12 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemBasename("AppTarget.app")) { task in
                     #expect(task.ruleInfo[1] == "\(SRCROOT)/build/Debug-iphoneos/AppTarget.app")
                     task.checkCommandLine(["/usr/bin/codesign", "--force", "--sign", "105DE4E702E4", "--entitlements", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/AppTarget.build/AppTarget.app.xcent", "--timestamp=none", "--generate-entitlement-der", "\(SRCROOT)/build/Debug-iphoneos/AppTarget.app"])
-                    task.checkEnvironment([
-                        "CODESIGN_ALLOCATE": .equal("codesign_allocate"),
-                    ], exact: true)
+                    task.checkEnvironment(
+                        [
+                            "CODESIGN_ALLOCATE": .equal("codesign_allocate")
+                        ],
+                        exact: true
+                    )
                 }
 
                 // There should be one product validation task.
@@ -293,7 +309,7 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                     for platform in core.platformRegistry.platforms {
                         if let otherPlatformDeploymentTargetName = platform.deploymentTargetMacro?.name {
                             if otherPlatformDeploymentTargetName != "IPHONEOS_DEPLOYMENT_TARGET" {
-                                scriptVariables[otherPlatformDeploymentTargetName] = .none      // Set the value to nil, don't remove the entry
+                                scriptVariables[otherPlatformDeploymentTargetName] = .none  // Set the value to nil, don't remove the entry
                             }
                         }
                     }
@@ -390,37 +406,43 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("main.m"),
-                ]),
+                    TestFile("main.m")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "BUILD_VARIANTS": "normal asan",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "INFOPLIST_FILE": "Info.plist",
-                                                "SDKROOT": "iphoneos",
-                                                "CODE_SIGN_IDENTITY": "Apple Development",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "Info.plist",
+                                "SDKROOT": "iphoneos",
+                                "CODE_SIGN_IDENTITY": "Apple Development",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.m",
-                        ]),
+                            "main.m"
+                        ])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let srcRoot = tester.workspace.projects[0].sourceRoot
 
@@ -470,12 +492,16 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                     TestFile("StickerTarget-Info.plist"),
                     TestFile("Source.m"),
                     TestFile("Stickers.xcstickers"),
-                    TestVariantGroup("Sticker Pack.strings", children: [
-                        TestFile("Base.lproj/Sticker Pack.strings", regionVariantName: "Base"),
-                        TestFile("en.lproj/Sticker Pack.strings", regionVariantName: "en"),
-                    ]),
+                    TestVariantGroup(
+                        "Sticker Pack.strings",
+                        children: [
+                            TestFile("Base.lproj/Sticker Pack.strings", regionVariantName: "Base"),
+                            TestFile("en.lproj/Sticker Pack.strings", regionVariantName: "en"),
+                        ]
+                    ),
                     TestFile("Other.strings"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -484,7 +510,8 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                         "SDKROOT": "iphoneos",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "CODE_SIGN_IDENTITY": "Apple Development",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -494,17 +521,21 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
-                                "INFOPLIST_FILE": "AppTarget-Info.plist",
-                            ]),
+                                "INFOPLIST_FILE": "AppTarget-Info.plist"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         // TODO: PBX requires the target to already have a resources phase in order to inject the product type's storyboard, but it would be more robust to cons one up implicitly. No ERs about that yet.
                         TestResourcesBuildPhase([]),
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile("StickerTarget.appex", codeSignOnCopy: true),
-                            TestBuildFile("MessagesExtensionTarget.appex", codeSignOnCopy: true),
-                        ], destinationSubfolder: .plugins, onlyForDeployment: false
-                                               ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("StickerTarget.appex", codeSignOnCopy: true),
+                                TestBuildFile("MessagesExtensionTarget.appex", codeSignOnCopy: true),
+                            ],
+                            destinationSubfolder: .plugins,
+                            onlyForDeployment: false
+                        ),
                     ],
                     dependencies: ["StickerTarget", "MessagesExtensionTarget"]
                 ),
@@ -515,28 +546,30 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
-                                "INFOPLIST_FILE": "StickerTarget-Info.plist",
-                            ]),
+                                "INFOPLIST_FILE": "StickerTarget-Info.plist"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
                             TestBuildFile("Stickers.xcstickers"),
                             TestBuildFile("Sticker Pack.strings"),
                             TestBuildFile("Other.strings"),
-                        ]),
+                        ])
                     ]
                 ),
                 TestStandardTarget(
                     "MessagesExtensionTarget",
                     type: .messagesExtension,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["Source.m"]),
+                        TestSourcesBuildPhase(["Source.m"])
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         guard let platformPath = core.platformRegistry.lookup(name: "iphoneos")?.path else { throw StubError.error("Couldn't find iphoneos platform") }
@@ -587,14 +620,17 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                         "-output",
                         "/tmp/Test/aProject/build/Debug-iphoneos/AppTarget.app/AppTarget",
                         "-extract",
-                        "arm64"
+                        "arm64",
                     ])
                 }
 
                 // Implied Info.plist content
-                checkProductTypeInfoPlistAdditions(target: target, expectedContent: .plDict([
-                    "LSApplicationLaunchProhibited": .plBool(true),
-                ]))
+                checkProductTypeInfoPlistAdditions(
+                    target: target,
+                    expectedContent: .plDict([
+                        "LSApplicationLaunchProhibited": .plBool(true)
+                    ])
+                )
             }
 
             results.checkTarget("StickerTarget") { target in
@@ -606,14 +642,17 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                         "-output",
                         "/tmp/Test/aProject/build/Debug-iphoneos/StickerTarget.appex/StickerTarget",
                         "-extract",
-                        "arm64"
+                        "arm64",
                     ])
                 }
 
                 // Implied Info.plist content
-                checkProductTypeInfoPlistAdditions(target: target, expectedContent: .plDict([
-                    "LSApplicationIsStickerProvider": .plBool(true),
-                ]))
+                checkProductTypeInfoPlistAdditions(
+                    target: target,
+                    expectedContent: .plDict([
+                        "LSApplicationIsStickerProvider": .plBool(true)
+                    ])
+                )
 
                 // Strings files matching a sticker pack base name should be folded into the actool task
                 for variant in ["thinned", "unthinned"] {
@@ -657,31 +696,36 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("ClassOne.m"),
                     TestFile("ClassTwo.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ARCHS[sdk=iphoneos*]": "arm64",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SDKROOT": "iphoneos",
-                    "IPHONEOS_DEPLOYMENT_TARGET": IPHONEOS_DEPLOYMENT_TARGET,
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "CODE_SIGN_IDENTITY": "Apple Development",
-                    "SUPPORTS_MACCATALYST": "YES",
-                    "CLANG_USE_RESPONSE_FILE": "NO",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS[sdk=iphoneos*]": "arm64",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SDKROOT": "iphoneos",
+                        "IPHONEOS_DEPLOYMENT_TARGET": IPHONEOS_DEPLOYMENT_TARGET,
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "CODE_SIGN_IDENTITY": "Apple Development",
+                        "SUPPORTS_MACCATALYST": "YES",
+                        "CLANG_USE_RESPONSE_FILE": "NO",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -689,7 +733,8 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                             "ClassTwo.swift",
                         ]),
                         TestShellScriptBuildPhase(name: "Run Script", originalObjectID: "Foo", contents: "echo \"Running script\"\nexit 0\n", alwaysOutOfDate: true),
-                    ]),
+                    ]
+                )
             ]
         )
         let core = try await getCore()
@@ -698,7 +743,7 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
 
         // Perform a basic build.
         let macosOverrides = [
-            "ARCHS": archs.joined(separator: " "),
+            "ARCHS": archs.joined(separator: " ")
         ]
         await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: macosOverrides), runDestination: .anyMacCatalyst) { results in
             results.checkNoDiagnostics()
@@ -712,44 +757,47 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                 for arch in archs {
                     // There should be a clang task for the ObjC file.
                     results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), .matchRuleItem(arch)) { task in
-                        let expectedClangOptions = ["clang",
-                                                    "-target", "\(arch)-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)-macabi",
-                                                    "-isysroot", core.loadSDK(.macOS).path.str,
-                                                    "-isystem", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/usr/include",
-                                                    "-iframework", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/System/Library/Frameworks",
-                                                    "-c", "\(SRCROOT)/Sources/ClassOne.m",
-                                                    "-o", "\(SRCROOT)/build/aProject.build/Debug\(MacCatalystInfo.publicSDKBuiltProductsDirSuffix)/AppTarget.build/Objects-normal/\(arch)/ClassOne.o",
+                        let expectedClangOptions = [
+                            "clang",
+                            "-target", "\(arch)-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)-macabi",
+                            "-isysroot", core.loadSDK(.macOS).path.str,
+                            "-isystem", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/usr/include",
+                            "-iframework", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/System/Library/Frameworks",
+                            "-c", "\(SRCROOT)/Sources/ClassOne.m",
+                            "-o", "\(SRCROOT)/build/aProject.build/Debug\(MacCatalystInfo.publicSDKBuiltProductsDirSuffix)/AppTarget.build/Objects-normal/\(arch)/ClassOne.o",
                         ]
                         task.checkCommandLineContains(expectedClangOptions)
                     }
 
                     // Check the Swift compilation task and the tasks to copy its outputs.
                     results.checkTask(.matchTarget(target), .matchRuleType("SwiftDriver Compilation"), .matchRuleItem(arch)) { task in
-                        let expectedSwiftOptions = [swiftCompilerPath.str,
-                                                    "-module-name", "AppTarget",
-                                                    "-sdk", core.loadSDK(.macOS).path.str,
-                                                    "-target", "\(arch)-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)-macabi",
-                                                    "-Fsystem", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/System/Library/Frameworks",
-                                                    "-c",
-                                                    "-output-file-map", "\(SRCROOT)/build/aProject.build/Debug\(MacCatalystInfo.publicSDKBuiltProductsDirSuffix)/AppTarget.build/Objects-normal/\(arch)/AppTarget-OutputFileMap.json",
-                                                    "-serialize-diagnostics",
-                                                    "-emit-dependencies",
-                                                    "-emit-module", "-emit-module-path", "\(SRCROOT)/build/aProject.build/Debug\(MacCatalystInfo.publicSDKBuiltProductsDirSuffix)/AppTarget.build/Objects-normal/\(arch)/AppTarget.swiftmodule",
-                                                    "-Xcc", "-isystem", "-Xcc", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/usr/include",
-                                                    "-emit-objc-header", "-emit-objc-header-path", "\(SRCROOT)/build/aProject.build/Debug\(MacCatalystInfo.publicSDKBuiltProductsDirSuffix)/AppTarget.build/Objects-normal/\(arch)/AppTarget-Swift.h",
+                        let expectedSwiftOptions = [
+                            swiftCompilerPath.str,
+                            "-module-name", "AppTarget",
+                            "-sdk", core.loadSDK(.macOS).path.str,
+                            "-target", "\(arch)-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)-macabi",
+                            "-Fsystem", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/System/Library/Frameworks",
+                            "-c",
+                            "-output-file-map", "\(SRCROOT)/build/aProject.build/Debug\(MacCatalystInfo.publicSDKBuiltProductsDirSuffix)/AppTarget.build/Objects-normal/\(arch)/AppTarget-OutputFileMap.json",
+                            "-serialize-diagnostics",
+                            "-emit-dependencies",
+                            "-emit-module", "-emit-module-path", "\(SRCROOT)/build/aProject.build/Debug\(MacCatalystInfo.publicSDKBuiltProductsDirSuffix)/AppTarget.build/Objects-normal/\(arch)/AppTarget.swiftmodule",
+                            "-Xcc", "-isystem", "-Xcc", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/usr/include",
+                            "-emit-objc-header", "-emit-objc-header-path", "\(SRCROOT)/build/aProject.build/Debug\(MacCatalystInfo.publicSDKBuiltProductsDirSuffix)/AppTarget.build/Objects-normal/\(arch)/AppTarget-Swift.h",
                         ]
                         task.checkCommandLineContains(expectedSwiftOptions)
                     }
 
                     // Check the link task.
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld"), .matchRuleItem(arch)) { task in
-                        let expectedLinkerOptions = ["clang",
-                                                     "-target", "\(arch)-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)-macabi",
-                                                     "-isysroot", core.loadSDK(.macOS).path.str,
-                                                     "-L\(core.loadSDK(.macOS).path.str)/System/iOSSupport/usr/lib",
-                                                     "-L\(core.developerPath.path.str)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/maccatalyst",
-                                                     "-iframework", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/System/Library/Frameworks",
-                                                     "-o", "\(SRCROOT)/build/aProject.build/Debug\(MacCatalystInfo.publicSDKBuiltProductsDirSuffix)/AppTarget.build/Objects-normal/\(arch)/Binary/AppTarget",
+                        let expectedLinkerOptions = [
+                            "clang",
+                            "-target", "\(arch)-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)-macabi",
+                            "-isysroot", core.loadSDK(.macOS).path.str,
+                            "-L\(core.loadSDK(.macOS).path.str)/System/iOSSupport/usr/lib",
+                            "-L\(core.developerPath.path.str)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/maccatalyst",
+                            "-iframework", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/System/Library/Frameworks",
+                            "-o", "\(SRCROOT)/build/aProject.build/Debug\(MacCatalystInfo.publicSDKBuiltProductsDirSuffix)/AppTarget.build/Objects-normal/\(arch)/Binary/AppTarget",
                         ]
                         task.checkCommandLineContains(expectedLinkerOptions)
                     }
@@ -762,7 +810,7 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchTarget(target), .matchRuleType("PhaseScriptExecution"), .matchRuleItemBasename("Script-Foo.sh")) { task in
                     // Check export of build settings for macCatalyst.
                     task.checkEnvironment([
-                        "IS_MACCATALYST": .equal("YES"),
+                        "IS_MACCATALYST": .equal("YES")
                     ])
                 }
             }
@@ -783,37 +831,40 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                 // check that we have tasks building for the iOS SDK and arch.
                 // There should be a clang task for the ObjC file.
                 results.checkTask(.matchTarget(target), .matchRuleType("CompileC")) { task in
-                    let expectedClangOptions = ["clang",
-                                                "-target", "arm64-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)",
-                                                "-isysroot", core.loadSDK(.iOS).path.str,
-                                                "-c", "\(SRCROOT)/Sources/ClassOne.m",
-                                                "-o", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/AppTarget.build/Objects-normal/arm64/ClassOne.o",
+                    let expectedClangOptions = [
+                        "clang",
+                        "-target", "arm64-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)",
+                        "-isysroot", core.loadSDK(.iOS).path.str,
+                        "-c", "\(SRCROOT)/Sources/ClassOne.m",
+                        "-o", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/AppTarget.build/Objects-normal/arm64/ClassOne.o",
                     ]
                     task.checkCommandLineContains(expectedClangOptions)
                 }
 
                 // Check the Swift compilation task and the tasks to copy its outputs.
                 results.checkTask(.matchTarget(target), .matchRuleType("SwiftDriver Compilation")) { task in
-                    let expectedSwiftOptions = [swiftCompilerPath.str,
-                                                "-module-name", "AppTarget",
-                                                "-sdk", core.loadSDK(.iOS).path.str,
-                                                "-target", "arm64-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)",
-                                                "-c",
-                                                "-output-file-map", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/AppTarget.build/Objects-normal/arm64/AppTarget-OutputFileMap.json",
-                                                "-serialize-diagnostics",
-                                                "-emit-dependencies",
-                                                "-emit-module", "-emit-module-path", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/AppTarget.build/Objects-normal/arm64/AppTarget.swiftmodule",
-                                                "-emit-objc-header", "-emit-objc-header-path", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/AppTarget.build/Objects-normal/arm64/AppTarget-Swift.h",
+                    let expectedSwiftOptions = [
+                        swiftCompilerPath.str,
+                        "-module-name", "AppTarget",
+                        "-sdk", core.loadSDK(.iOS).path.str,
+                        "-target", "arm64-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)",
+                        "-c",
+                        "-output-file-map", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/AppTarget.build/Objects-normal/arm64/AppTarget-OutputFileMap.json",
+                        "-serialize-diagnostics",
+                        "-emit-dependencies",
+                        "-emit-module", "-emit-module-path", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/AppTarget.build/Objects-normal/arm64/AppTarget.swiftmodule",
+                        "-emit-objc-header", "-emit-objc-header-path", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/AppTarget.build/Objects-normal/arm64/AppTarget-Swift.h",
                     ]
                     task.checkCommandLineContains(expectedSwiftOptions)
                 }
 
                 // Check the link task.
                 results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                    let expectedLinkerOptions = ["clang",
-                                                 "-target", "arm64-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)",
-                                                 "-isysroot", core.loadSDK(.iOS).path.str,
-                                                 "-o", "\(SRCROOT)/build/Debug-iphoneos/AppTarget.app/AppTarget",
+                    let expectedLinkerOptions = [
+                        "clang",
+                        "-target", "arm64-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)",
+                        "-isysroot", core.loadSDK(.iOS).path.str,
+                        "-o", "\(SRCROOT)/build/Debug-iphoneos/AppTarget.app/AppTarget",
                     ]
                     task.checkCommandLineContains(expectedLinkerOptions)
                 }
@@ -838,42 +889,48 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("ClassOne.m"),
                     TestFile("ClassTwo.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SDKROOT": "iphoneos",
-                    "IPHONEOS_DEPLOYMENT_TARGET": IPHONEOS_DEPLOYMENT_TARGET,
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "CODE_SIGN_IDENTITY": "",
-                    "SUPPORTS_MACCATALYST": "YES",
-
-                    // These settings are the point of the test: They mask out the values from the SDK variant because they're not using $(inherited).
-                    "LIBRARY_SEARCH_PATHS": "/usr/local/lib",
-                    "SYSTEM_HEADER_SEARCH_PATHS": "/usr/local/include",
-                    "SYSTEM_FRAMEWORK_SEARCH_PATHS": "/Library/Frameworks",
-                    "CLANG_USE_RESPONSE_FILE": "NO",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SDKROOT": "iphoneos",
+                        "IPHONEOS_DEPLOYMENT_TARGET": IPHONEOS_DEPLOYMENT_TARGET,
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "CODE_SIGN_IDENTITY": "",
+                        "SUPPORTS_MACCATALYST": "YES",
+
+                        // These settings are the point of the test: They mask out the values from the SDK variant because they're not using $(inherited).
+                        "LIBRARY_SEARCH_PATHS": "/usr/local/lib",
+                        "SYSTEM_HEADER_SEARCH_PATHS": "/usr/local/include",
+                        "SYSTEM_FRAMEWORK_SEARCH_PATHS": "/Library/Frameworks",
+                        "CLANG_USE_RESPONSE_FILE": "NO",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "ClassOne.m",
                             "ClassTwo.swift",
-                        ]),
-                    ]),
+                        ])
+                    ]
+                )
             ]
         )
         let core = try await getCore()
@@ -891,45 +948,48 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
             results.checkTarget("AppTarget") { target in
                 // There should be a clang task for the ObjC file.
                 results.checkTask(.matchTarget(target), .matchRuleType("CompileC")) { task in
-                    let expectedClangOptions = ["clang",
-                                                "-target", "x86_64-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)-macabi",
-                                                "-isysroot", core.loadSDK(.macOS).path.str,
-                                                "-isystem", "/usr/local/include",
-                                                "-isystem", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/usr/include",
-                                                "-iframework", "/Library/Frameworks",
-                                                "-iframework", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/System/Library/Frameworks",
-                                                "-c", "\(SRCROOT)/Sources/ClassOne.m",
-                                                "-o", "\(SRCROOT)/build/aProject.build/Debug\(MacCatalystInfo.publicSDKBuiltProductsDirSuffix)/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/ClassOne.o",
+                    let expectedClangOptions = [
+                        "clang",
+                        "-target", "x86_64-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)-macabi",
+                        "-isysroot", core.loadSDK(.macOS).path.str,
+                        "-isystem", "/usr/local/include",
+                        "-isystem", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/usr/include",
+                        "-iframework", "/Library/Frameworks",
+                        "-iframework", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/System/Library/Frameworks",
+                        "-c", "\(SRCROOT)/Sources/ClassOne.m",
+                        "-o", "\(SRCROOT)/build/aProject.build/Debug\(MacCatalystInfo.publicSDKBuiltProductsDirSuffix)/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/ClassOne.o",
                     ]
                     task.checkCommandLineContains(expectedClangOptions)
                 }
 
                 // Check the Swift compilation task and the tasks to copy its outputs.
                 results.checkTask(.matchTarget(target), .matchRuleType("SwiftDriver Compilation")) { task in
-                    let expectedSwiftOptions = [swiftCompilerPath.str,
-                                                "-module-name", "AppTarget",
-                                                "-sdk", core.loadSDK(.macOS).path.str,
-                                                "-target", "x86_64-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)-macabi",
-                                                "-F", "/Library/Frameworks",
-                                                "-Fsystem", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/System/Library/Frameworks",
-                                                "-c",
-                                                "-Xcc", "-isystem", "-Xcc", "/usr/local/include",
-                                                "-Xcc", "-isystem", "-Xcc", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/usr/include",
+                    let expectedSwiftOptions = [
+                        swiftCompilerPath.str,
+                        "-module-name", "AppTarget",
+                        "-sdk", core.loadSDK(.macOS).path.str,
+                        "-target", "x86_64-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)-macabi",
+                        "-F", "/Library/Frameworks",
+                        "-Fsystem", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/System/Library/Frameworks",
+                        "-c",
+                        "-Xcc", "-isystem", "-Xcc", "/usr/local/include",
+                        "-Xcc", "-isystem", "-Xcc", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/usr/include",
                     ]
                     task.checkCommandLineContains(expectedSwiftOptions)
                 }
 
                 // Check the link task.
                 results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                    let expectedLinkerOptions = ["clang",
-                                                 "-target", "x86_64-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)-macabi",
-                                                 "-isysroot", core.loadSDK(.macOS).path.str,
-                                                 "-L/usr/local/lib",
-                                                 "-L\(core.loadSDK(.macOS).path.str)/System/iOSSupport/usr/lib",
-                                                 "-L\(core.developerPath.path.str)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/maccatalyst",
-                                                 "-iframework", "/Library/Frameworks",
-                                                 "-iframework", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/System/Library/Frameworks",
-                                                 "-o", "\(SRCROOT)/build/Debug\(MacCatalystInfo.publicSDKBuiltProductsDirSuffix)/AppTarget.app/Contents/MacOS/AppTarget",
+                    let expectedLinkerOptions = [
+                        "clang",
+                        "-target", "x86_64-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)-macabi",
+                        "-isysroot", core.loadSDK(.macOS).path.str,
+                        "-L/usr/local/lib",
+                        "-L\(core.loadSDK(.macOS).path.str)/System/iOSSupport/usr/lib",
+                        "-L\(core.developerPath.path.str)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/maccatalyst",
+                        "-iframework", "/Library/Frameworks",
+                        "-iframework", "\(core.loadSDK(.macOS).path.str)/System/iOSSupport/System/Library/Frameworks",
+                        "-o", "\(SRCROOT)/build/Debug\(MacCatalystInfo.publicSDKBuiltProductsDirSuffix)/AppTarget.app/Contents/MacOS/AppTarget",
                     ]
                     task.checkCommandLineContains(expectedLinkerOptions)
                 }
@@ -944,17 +1004,20 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("main.m"),
-                ]),
+                    TestFile("main.m")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestAggregateTarget(
@@ -975,12 +1038,13 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                             buildSettings: [
                                 "SDKROOT": "macosx",
                                 "PRODUCT_NAME": "Product",
-                            ]),
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.m",
-                        ]),
+                            "main.m"
+                        ])
                     ]
                 ),
 
@@ -996,15 +1060,17 @@ fileprivate struct PlatformTaskConstructionTests: CoreBasedTests {
                                 "SDKROOT": "macosx",
                                 "SDK_VARIANT": MacCatalystInfo.sdkVariantName,
                                 "PRODUCT_NAME": "Product",
-                            ]),
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.m",
-                        ]),
+                            "main.m"
+                        ])
                     ]
                 ),
-            ])
+            ]
+        )
         let tester = try TaskConstructionTester(core, testProject)
 
         await tester.checkBuild(runDestination: .macOS) { results in
diff --git a/Tests/SWBTaskConstructionTests/PostprocessingTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/PostprocessingTaskConstructionTests.swift
index 60684f5f..4be1c8b9 100644
--- a/Tests/SWBTaskConstructionTests/PostprocessingTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/PostprocessingTaskConstructionTests.swift
@@ -28,17 +28,22 @@ fileprivate struct PostprocessingTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("SourceFile.m"),
+                    TestFile("SourceFile.m")
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "BUILD_VARIANTS": buildVariants.joined(separator: " "),
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "BUILD_VARIANTS": buildVariants.joined(separator: " "),
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
+            ],
             targets: [
                 TestAggregateTarget(
                     "All",
@@ -49,7 +54,7 @@ fileprivate struct PostprocessingTaskConstructionTests: CoreBasedTests {
                     type: .dynamicLibrary,
                     buildConfigurations: [TestBuildConfiguration("Debug")],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SourceFile.m"]),
+                        TestSourcesBuildPhase(["SourceFile.m"])
                     ]
                 ),
                 TestStandardTarget(
@@ -57,9 +62,9 @@ fileprivate struct PostprocessingTaskConstructionTests: CoreBasedTests {
                     type: .framework,
                     buildConfigurations: [TestBuildConfiguration("Debug")],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SourceFile.m"]),
+                        TestSourcesBuildPhase(["SourceFile.m"])
                     ]
-                )
+                ),
             ]
         )
 
@@ -91,7 +96,8 @@ fileprivate struct PostprocessingTaskConstructionTests: CoreBasedTests {
 
                         task.checkOutputs([
                             .path("/tmp/aProject.dst/usr/local/lib/Library\(suffix).dylib"),
-                            .name("SetOwner /tmp/aProject.dst/usr/local/lib/Library\(suffix).dylib")])
+                            .name("SetOwner /tmp/aProject.dst/usr/local/lib/Library\(suffix).dylib"),
+                        ])
                     }
                 }
                 results.checkTasks(.matchTarget(target), .matchRuleType("SetMode")) { tasks in
@@ -113,7 +119,8 @@ fileprivate struct PostprocessingTaskConstructionTests: CoreBasedTests {
 
                         task.checkOutputs([
                             .path("/tmp/aProject.dst/usr/local/lib/Library\(suffix).dylib"),
-                            .name("SetMode /tmp/aProject.dst/usr/local/lib/Library\(suffix).dylib")])
+                            .name("SetMode /tmp/aProject.dst/usr/local/lib/Library\(suffix).dylib"),
+                        ])
                     }
                 }
             }
@@ -133,7 +140,8 @@ fileprivate struct PostprocessingTaskConstructionTests: CoreBasedTests {
 
                     task.checkOutputs([
                         .path("/tmp/aProject.dst/Library/Frameworks/Framework.framework"),
-                        .name("SetOwner /tmp/aProject.dst/Library/Frameworks/Framework.framework")])
+                        .name("SetOwner /tmp/aProject.dst/Library/Frameworks/Framework.framework"),
+                    ])
                 }
                 results.checkTask(.matchTarget(target), .matchRuleType("SetMode")) { task in
                     task.checkRuleInfo(["SetMode", "u+w,go-w,a+rX", "/tmp/aProject.dst/Library/Frameworks/Framework.framework"])
@@ -151,7 +159,8 @@ fileprivate struct PostprocessingTaskConstructionTests: CoreBasedTests {
 
                     task.checkOutputs([
                         .path("/tmp/aProject.dst/Library/Frameworks/Framework.framework"),
-                        .name("SetMode /tmp/aProject.dst/Library/Frameworks/Framework.framework")])
+                        .name("SetMode /tmp/aProject.dst/Library/Frameworks/Framework.framework"),
+                    ])
                 }
             }
         }
@@ -163,27 +172,33 @@ fileprivate struct PostprocessingTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("SourceFile.m"),
+                    TestFile("SourceFile.m")
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "BUILD_VARIANTS": "unexpected",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "BUILD_VARIANTS": "unexpected",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Application",
                     type: .application,
                     buildConfigurations: [TestBuildConfiguration("Debug")],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SourceFile.m"]),
+                        TestSourcesBuildPhase(["SourceFile.m"])
                     ]
                 )
-            ])
+            ]
+        )
 
         try await TaskConstructionTester(getCore(), testProject).checkBuild(runDestination: .macOS) { results in
             results.checkNoDiagnostics()
@@ -202,17 +217,22 @@ fileprivate struct PostprocessingTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("SourceFile.m"),
+                    TestFile("SourceFile.m")
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "LIBTOOL": libtoolPath.str,
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "LIBTOOL": libtoolPath.str,
+                    ]
+                )
+            ],
             targets: [
                 TestAggregateTarget(
                     "All",
@@ -223,7 +243,7 @@ fileprivate struct PostprocessingTaskConstructionTests: CoreBasedTests {
                     type: .dynamicLibrary,
                     buildConfigurations: [TestBuildConfiguration("Debug")],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SourceFile.m"]),
+                        TestSourcesBuildPhase(["SourceFile.m"])
                     ]
                 ),
                 TestStandardTarget(
@@ -231,7 +251,7 @@ fileprivate struct PostprocessingTaskConstructionTests: CoreBasedTests {
                     type: .staticLibrary,
                     buildConfigurations: [TestBuildConfiguration("Debug")],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SourceFile.m"]),
+                        TestSourcesBuildPhase(["SourceFile.m"])
                     ]
                 ),
                 TestStandardTarget(
@@ -239,7 +259,7 @@ fileprivate struct PostprocessingTaskConstructionTests: CoreBasedTests {
                     type: .framework,
                     buildConfigurations: [TestBuildConfiguration("Debug")],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SourceFile.m"]),
+                        TestSourcesBuildPhase(["SourceFile.m"])
                     ]
                 ),
                 TestStandardTarget(
@@ -247,7 +267,7 @@ fileprivate struct PostprocessingTaskConstructionTests: CoreBasedTests {
                     type: .staticFramework,
                     buildConfigurations: [TestBuildConfiguration("Debug")],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SourceFile.m"]),
+                        TestSourcesBuildPhase(["SourceFile.m"])
                     ]
                 ),
                 TestStandardTarget(
@@ -255,7 +275,7 @@ fileprivate struct PostprocessingTaskConstructionTests: CoreBasedTests {
                     type: .commandLineTool,
                     buildConfigurations: [TestBuildConfiguration("Debug")],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SourceFile.m"]),
+                        TestSourcesBuildPhase(["SourceFile.m"])
                     ]
                 ),
                 TestStandardTarget(
@@ -263,7 +283,7 @@ fileprivate struct PostprocessingTaskConstructionTests: CoreBasedTests {
                     type: .application,
                     buildConfigurations: [TestBuildConfiguration("Debug")],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SourceFile.m"]),
+                        TestSourcesBuildPhase(["SourceFile.m"])
                     ]
                 ),
                 TestStandardTarget(
@@ -271,9 +291,9 @@ fileprivate struct PostprocessingTaskConstructionTests: CoreBasedTests {
                     type: .applicationExtension,
                     buildConfigurations: [TestBuildConfiguration("Debug")],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SourceFile.m"]),
+                        TestSourcesBuildPhase(["SourceFile.m"])
                     ]
-                )
+                ),
             ]
         )
 
@@ -302,24 +322,29 @@ fileprivate struct PostprocessingTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("SourceFile.m"),
+                    TestFile("SourceFile.m")
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "PRODUCT_DEFINITION_PLIST": "prod.plist",
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "PRODUCT_DEFINITION_PLIST": "prod.plist",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Application",
                     type: .application,
                     buildConfigurations: [TestBuildConfiguration("Debug")],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SourceFile.m"]),
+                        TestSourcesBuildPhase(["SourceFile.m"])
                     ]
                 )
             ]
@@ -327,9 +352,12 @@ fileprivate struct PostprocessingTaskConstructionTests: CoreBasedTests {
 
         let fs = PseudoFS()
         try fs.createDirectory(Path("/tmp/Test/aProject"), recursive: true)
-        try await fs.writePlist(Path("/tmp/Test/aProject/prod.plist"), .plDict([
-            "sysctl-requirements": .plString("hw.optional.f16c == 1"),
-        ]))
+        try await fs.writePlist(
+            Path("/tmp/Test/aProject/prod.plist"),
+            .plDict([
+                "sysctl-requirements": .plString("hw.optional.f16c == 1")
+            ])
+        )
 
         try await TaskConstructionTester(getCore(), testProject).checkBuild(runDestination: .macOS, fs: fs) { results in
             results.checkNoDiagnostics()
diff --git a/Tests/SWBTaskConstructionTests/PrelinkedObjectFileTests.swift b/Tests/SWBTaskConstructionTests/PrelinkedObjectFileTests.swift
index 82dfc726..b0fcd6bc 100644
--- a/Tests/SWBTaskConstructionTests/PrelinkedObjectFileTests.swift
+++ b/Tests/SWBTaskConstructionTests/PrelinkedObjectFileTests.swift
@@ -26,9 +26,10 @@ fileprivate struct PrelinkedObjectFileTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
-                children: [
-                ]),
+                "SomeFiles",
+                path: "Sources",
+                children: []
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -36,7 +37,8 @@ fileprivate struct PrelinkedObjectFileTests: CoreBasedTests {
                         "CODE_SIGN_IDENTITY": "",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "MACOSX_DEPLOYMENT_TARGET": core.loadSDK(.macOS).defaultDeploymentTarget,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -50,14 +52,17 @@ fileprivate struct PrelinkedObjectFileTests: CoreBasedTests {
                                 "WARNING_LDFLAGS": "-lWarningLibrary",
                                 "PRELINK_LIBS": "-lSomeLibrary -lAnotherLibrary",
                                 "PRELINK_FLAGS": "-exported_symbols_list Exports.exp",
-                            ]),
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([]),
                         TestFrameworksBuildPhase([]),
                     ],
-                    dependencies: ["Tool"]),
-            ])
+                    dependencies: ["Tool"]
+                )
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try TaskConstructionTester(core, testWorkspace)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -159,9 +164,10 @@ fileprivate struct PrelinkedObjectFileTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
-                children: [
-                ]),
+                "SomeFiles",
+                path: "Sources",
+                children: []
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -169,7 +175,8 @@ fileprivate struct PrelinkedObjectFileTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "IPHONEOS_DEPLOYMENT_TARGET": core.loadSDK(.iOS).defaultDeploymentTarget,
                         "SDKROOT": "iphoneos",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -179,15 +186,18 @@ fileprivate struct PrelinkedObjectFileTests: CoreBasedTests {
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
-                                "GENERATE_PRELINK_OBJECT_FILE": "YES",
-                            ]),
+                                "GENERATE_PRELINK_OBJECT_FILE": "YES"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([]),
                         TestFrameworksBuildPhase([]),
                     ],
-                    dependencies: ["Tool"]),
-            ])
+                    dependencies: ["Tool"]
+                )
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try TaskConstructionTester(core, testWorkspace)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -228,9 +238,10 @@ fileprivate struct PrelinkedObjectFileTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
-                children: [
-                ]),
+                "SomeFiles",
+                path: "Sources",
+                children: []
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -238,7 +249,8 @@ fileprivate struct PrelinkedObjectFileTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "IPHONEOS_DEPLOYMENT_TARGET": core.loadSDK(.iOS).defaultDeploymentTarget,
                         "SDKROOT": "iphoneos",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -248,15 +260,18 @@ fileprivate struct PrelinkedObjectFileTests: CoreBasedTests {
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
-                                "GENERATE_PRELINK_OBJECT_FILE": "YES",
-                            ]),
+                                "GENERATE_PRELINK_OBJECT_FILE": "YES"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([]),
                         TestFrameworksBuildPhase([]),
                     ],
-                    dependencies: ["Tool"]),
-            ])
+                    dependencies: ["Tool"]
+                )
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try TaskConstructionTester(core, testWorkspace)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -296,9 +311,10 @@ fileprivate struct PrelinkedObjectFileTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
-                children: [
-                ]),
+                "SomeFiles",
+                path: "Sources",
+                children: []
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -306,7 +322,8 @@ fileprivate struct PrelinkedObjectFileTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "IPHONEOS_DEPLOYMENT_TARGET": core.loadSDK(.iOS).defaultDeploymentTarget,
                         "SDKROOT": "iphonesimulator",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -316,15 +333,18 @@ fileprivate struct PrelinkedObjectFileTests: CoreBasedTests {
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
-                                "GENERATE_PRELINK_OBJECT_FILE": "YES",
-                            ]),
+                                "GENERATE_PRELINK_OBJECT_FILE": "YES"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([]),
                         TestFrameworksBuildPhase([]),
                     ],
-                    dependencies: ["Tool"]),
-            ])
+                    dependencies: ["Tool"]
+                )
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try TaskConstructionTester(core, testWorkspace)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
diff --git a/Tests/SWBTaskConstructionTests/PreviewsTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/PreviewsTaskConstructionTests.swift
index 8f91814d..80d558c6 100644
--- a/Tests/SWBTaskConstructionTests/PreviewsTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/PreviewsTaskConstructionTests.swift
@@ -32,33 +32,40 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "ProjectName",
             groupTree: TestGroup(
-                "Sources", path: "Sources",
+                "Sources",
+                path: "Sources",
                 children: [
                     TestFile("File1.swift"),
                     TestFile("Info.plist"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "TargetName",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": swiftVersion,
-                            "ARCHS": archs.joined(separator: " "),
-                            "VALID_ARCHS": "$(inherited) x86_64h",
-                            "ENABLE_PREVIEWS": "YES",
-                            "INFOPLIST_FILE": "Sources/Info.plist",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                                "ARCHS": archs.joined(separator: " "),
+                                "VALID_ARCHS": "$(inherited) x86_64h",
+                                "ENABLE_PREVIEWS": "YES",
+                                "INFOPLIST_FILE": "Sources/Info.plist",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("File1.swift"),
-                        ]),
-                    ])
-            ])
+                            TestBuildFile("File1.swift")
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try TaskConstructionTester(core, testProject)
 
         await tester.checkBuild(runDestination: .anyMac) { results in
@@ -97,45 +104,52 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "ProjectName",
             groupTree: TestGroup(
-                "Sources", path: "Sources",
+                "Sources",
+                path: "Sources",
                 children: [
                     TestFile("File1.swift"),
                     TestFile("Info.plist"),
                     TestFile("Entitlements.plist"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "TargetName",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                            "SWIFT_VERSION": swiftVersion,
-                            "ARCHS": archsJoined,
-                            "VALID_ARCHS": "$(inherited) x86_64h",
-                            "ENABLE_XOJIT_PREVIEWS": "YES",
-                            "ENABLE_DEBUG_DYLIB": "YES",
-
-                            // Added this while the macOS platform is disabled to force building it with the dylib.
-                            // Remove with: rdar://122644133 (Re-enable macOS preview dylib mode)
-                            "ENABLE_DEBUG_DYLIB_OVERRIDE": "YES",
-
-                            "DEFINES_MODULE": "NO",
-                            "INFOPLIST_FILE": "Sources/Info.plist",
-                            "CODE_SIGN_ENTITLEMENTS": "Sources/Entitlements.plist",
-                            "CODE_SIGN_IDENTITY": "-",
-                            "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES",
-                            "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
-                            "LD_RUNPATH_SEARCH_PATHS": "@executable_path/../Frameworks2",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                                "SWIFT_VERSION": swiftVersion,
+                                "ARCHS": archsJoined,
+                                "VALID_ARCHS": "$(inherited) x86_64h",
+                                "ENABLE_XOJIT_PREVIEWS": "YES",
+                                "ENABLE_DEBUG_DYLIB": "YES",
+
+                                // Added this while the macOS platform is disabled to force building it with the dylib.
+                                // Remove with: rdar://122644133 (Re-enable macOS preview dylib mode)
+                                "ENABLE_DEBUG_DYLIB_OVERRIDE": "YES",
+
+                                "DEFINES_MODULE": "NO",
+                                "INFOPLIST_FILE": "Sources/Info.plist",
+                                "CODE_SIGN_ENTITLEMENTS": "Sources/Entitlements.plist",
+                                "CODE_SIGN_IDENTITY": "-",
+                                "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES",
+                                "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
+                                "LD_RUNPATH_SEARCH_PATHS": "@executable_path/../Frameworks2",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("File1.swift"),
-                        ]),
-                    ])
-            ])
+                            TestBuildFile("File1.swift")
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try TaskConstructionTester(core, testProject)
 
         // The localFS is used because we need a value for the swiftlang version in order for
@@ -258,7 +272,7 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                             .equal("-filelist"),
                             .equal("-Xlinker"),
                             .suffix("ExecutorLinkFileList-normal-\(arch).txt"),
-                            .anySequence
+                            .anySequence,
                         ]
                     )
 
@@ -308,34 +322,41 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "ProjectName",
             groupTree: TestGroup(
-                "Sources", path: "Sources",
+                "Sources",
+                path: "Sources",
                 children: [
                     TestFile("File.swift"),
                     TestFile("Info.plist"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "TargetName",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "iphoneos",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": swiftVersion,
-                            "ENABLE_PREVIEWS": "NO",
-                            "ENABLE_XOJIT_PREVIEWS": "YES",
-                            "ENABLE_DEBUG_DYLIB": "YES",
-                            "INFOPLIST_FILE": "Sources/Info.plist",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "iphoneos",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                                "ENABLE_PREVIEWS": "NO",
+                                "ENABLE_XOJIT_PREVIEWS": "YES",
+                                "ENABLE_DEBUG_DYLIB": "YES",
+                                "INFOPLIST_FILE": "Sources/Info.plist",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("File.swift"),
-                        ]),
-                    ])
-            ])
+                            TestBuildFile("File.swift")
+                        ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
 
@@ -347,7 +368,7 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
 
             results.checkTask(.matchRuleType("Ld"), .matchRuleItem("/tmp/Test/ProjectName/build/Debug-iphonesimulator/TargetName.app/TargetName.debug.dylib")) { task in
                 task.checkCommandLineNoMatch([
-                    .equal("/tmp/Test/ProjectName/build/ProjectName.build/Debug-iphonesimulator/TargetName.build/TargetName.app-Simulated.xcent"),
+                    .equal("/tmp/Test/ProjectName/build/ProjectName.build/Debug-iphonesimulator/TargetName.build/TargetName.app-Simulated.xcent")
                 ])
             }
 
@@ -369,14 +390,16 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "ProjectName",
             groupTree: TestGroup(
-                "Sources", path: "Sources",
+                "Sources",
+                path: "Sources",
                 children: [
                     TestFile("File1.swift"),
                     TestFile("Info.plist"),
                     TestFile("Entitlements.plist"),
                     TestFile("TestOne.swift"),
                     TestFile("UnitTestTarget-Info.plist"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "UnitTestTarget",
@@ -397,11 +420,11 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                                 "CODE_SIGN_ENTITLEMENTS": "Sources/Entitlements.plist",
                                 "CODE_SIGN_IDENTITY": "-",
                             ]
-                        ),
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "TestOne.swift",
+                            "TestOne.swift"
                         ])
                     ],
                     dependencies: ["TargetName"]
@@ -430,12 +453,12 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                                 "CODE_SIGN_ENTITLEMENTS": "Sources/Entitlements.plist",
                                 "CODE_SIGN_IDENTITY": "-",
                             ]
-                        ),
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("File1.swift"),
-                        ]),
+                            TestBuildFile("File1.swift")
+                        ])
                     ]
                 ),
             ]
@@ -474,14 +497,16 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "ProjectName",
             groupTree: TestGroup(
-                "Sources", path: "Sources",
+                "Sources",
+                path: "Sources",
                 children: [
                     TestFile("File1.swift"),
                     TestFile("Info.plist"),
                     TestFile("Entitlements.plist"),
                     TestFile("TestOne.swift"),
                     TestFile("UnitTestTarget-Info.plist"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "UnitTestTarget",
@@ -502,11 +527,11 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                                 "CODE_SIGN_ENTITLEMENTS": "Sources/Entitlements.plist",
                                 "CODE_SIGN_IDENTITY": "-",
                             ]
-                        ),
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "TestOne.swift",
+                            "TestOne.swift"
                         ])
                     ],
                     dependencies: ["TargetName"]
@@ -535,12 +560,12 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                                 "CODE_SIGN_ENTITLEMENTS": "Sources/Entitlements.plist",
                                 "CODE_SIGN_IDENTITY": "-",
                             ]
-                        ),
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("File1.swift"),
-                        ]),
+                            TestBuildFile("File1.swift")
+                        ])
                     ]
                 ),
             ]
@@ -574,13 +599,15 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "ProjectName",
             groupTree: TestGroup(
-                "Sources", path: "Sources",
+                "Sources",
+                path: "Sources",
                 children: [
                     TestFile("File1.swift"),
                     TestFile("Info.plist"),
                     TestFile("Entitlements.plist"),
                     TestFile("ClientName-Info.plist"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "TargetName",
@@ -607,14 +634,14 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                                 "CODE_SIGN_ENTITLEMENTS": "Sources/Entitlements.plist",
                                 "CODE_SIGN_IDENTITY": "-",
                             ]
-                        ),
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("File1.swift"),
-                        ]),
+                            TestBuildFile("File1.swift")
+                        ])
                     ]
-                ),
+                )
             ]
         )
         let tester = try TaskConstructionTester(core, testProject)
@@ -645,13 +672,15 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "ProjectName",
             groupTree: TestGroup(
-                "Sources", path: "Sources",
+                "Sources",
+                path: "Sources",
                 children: [
                     TestFile("File1.swift"),
                     TestFile("Info.plist"),
                     TestFile("Entitlements.plist"),
                     TestFile("ClientName-Info.plist"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "TargetName",
@@ -678,14 +707,14 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                                 "CODE_SIGN_ENTITLEMENTS": "Sources/Entitlements.plist",
                                 "CODE_SIGN_IDENTITY": "-",
                             ]
-                        ),
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("File1.swift"),
-                        ]),
+                            TestBuildFile("File1.swift")
+                        ])
                     ]
-                ),
+                )
             ]
         )
         let tester = try TaskConstructionTester(core, testProject)
@@ -748,25 +777,29 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                 "ProjectName",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "Sources", path: "Sources",
+                    "Sources",
+                    path: "Sources",
                     children: [
                         TestFile("main.swift"),
                         TestFile("Assets.xcassets"),
                     ]
                 ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ASSETCATALOG_EXEC": actoolPath.str,
-                        "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
-                        "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS": "YES",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "PRODUCT_BUNDLE_IDENTIFIER": "com.test.ProjectName",
-                        "SDKROOT": "iphoneos",
-                        "SWIFT_EXEC": swiftCompilerPath.str,
-                        "SWIFT_VERSION": "5.0",
-                        "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ASSETCATALOG_EXEC": actoolPath.str,
+                            "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
+                            "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS": "YES",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "PRODUCT_BUNDLE_IDENTIFIER": "com.test.ProjectName",
+                            "SDKROOT": "iphoneos",
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": "5.0",
+                            "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -774,13 +807,13 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                         type: .application,
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("main.swift"),
+                                TestBuildFile("main.swift")
                             ]),
                             TestResourcesBuildPhase([
-                                TestBuildFile("Assets.xcassets"),
-                            ])
+                                TestBuildFile("Assets.xcassets")
+                            ]),
                         ]
-                    ),
+                    )
                 ]
             )
 
@@ -788,26 +821,29 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
             let tester = try TaskConstructionTester(core, testProject)
 
             // Concrete iOS simulator destination with overrides for an iPhone 14 Pro
-            let buildParameters = BuildParameters(configuration: "Debug", overrides: [
-                "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL": "iPhone15,2",
-                "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION": core.loadSDK(.iOSSimulator).defaultDeploymentTarget,
-                "ASSETCATALOG_FILTER_FOR_THINNING_DEVICE_CONFIGURATION": "iPhone15,2",
-                "BUILD_ACTIVE_RESOURCES_ONLY": "YES",
-                "TARGET_DEVICE_IDENTIFIER": "DB9FA063-8DA7-41C1-835E-EC616E6AF448",
-                "TARGET_DEVICE_MODEL": "iPhone15,2",
-                "TARGET_DEVICE_OS_VERSION": core.loadSDK(.iOSSimulator).defaultDeploymentTarget,
-                "TARGET_DEVICE_PLATFORM_NAME": "iphonesimulator",
-
-                // And XOJIT previews enabled, which should be passed when the workspace setting is on
-                "ENABLE_XOJIT_PREVIEWS": "YES",
-
-                "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
-                "CODE_SIGNING_ALLOWED": "YES",
-                "CODE_SIGN_IDENTITY": "-",
-            ])
+            let buildParameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL": "iPhone15,2",
+                    "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION": core.loadSDK(.iOSSimulator).defaultDeploymentTarget,
+                    "ASSETCATALOG_FILTER_FOR_THINNING_DEVICE_CONFIGURATION": "iPhone15,2",
+                    "BUILD_ACTIVE_RESOURCES_ONLY": "YES",
+                    "TARGET_DEVICE_IDENTIFIER": "DB9FA063-8DA7-41C1-835E-EC616E6AF448",
+                    "TARGET_DEVICE_MODEL": "iPhone15,2",
+                    "TARGET_DEVICE_OS_VERSION": core.loadSDK(.iOSSimulator).defaultDeploymentTarget,
+                    "TARGET_DEVICE_PLATFORM_NAME": "iphonesimulator",
+
+                    // And XOJIT previews enabled, which should be passed when the workspace setting is on
+                    "ENABLE_XOJIT_PREVIEWS": "YES",
+
+                    "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
+                    "CODE_SIGNING_ALLOWED": "YES",
+                    "CODE_SIGN_IDENTITY": "-",
+                ]
+            )
 
             final class ClientDelegate: MockTestTaskPlanningClientDelegate, @unchecked Sendable {
-                override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+                override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
                     if commandLine.first.map(Path.init)?.basename == "actool", commandLine.dropFirst().first != "--version" {
                         return .result(status: .exit(0), stdout: Data("{}".utf8), stderr: Data())
                     }
@@ -832,12 +868,12 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                         .path("\(srcRoot.str)/Sources/Assets.xcassets"),
                         .namePattern(.and(.prefix("target-AppTarget-T-AppTarget-"), .suffix("--ModuleVerifierTaskProducer"))),
                         .namePattern(.and(.prefix("target-AppTarget-T-AppTarget-"), .suffix("--begin-compiling"))),
-                        .name("WorkspaceHeaderMapVFSFilesWritten")
+                        .name("WorkspaceHeaderMapVFSFilesWritten"),
                     ])
                     task.checkOutputs([
                         .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/DerivedSources/GeneratedAssetSymbols.swift"),
                         .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/DerivedSources/GeneratedAssetSymbols.h"),
-                        .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/DerivedSources/GeneratedAssetSymbols-Index.plist")
+                        .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/DerivedSources/GeneratedAssetSymbols-Index.plist"),
                     ])
                     task.checkRuleInfo(["GenerateAssetSymbols", "\(srcRoot.str)/Sources/Assets.xcassets"])
                     task.checkCommandLine([actoolPath.str, "\(srcRoot.str)/Sources/Assets.xcassets", "--compile", "\(srcRoot.str)/build/Debug-iphonesimulator/AppTarget.app", "--output-format", "human-readable-text", "--notices", "--warnings", "--export-dependency-info", "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_dependencies", "--output-partial-info-plist", "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_generated_info.plist", "--app-icon", "AppIcon", "--compress-pngs", "--enable-on-demand-resources", "YES", "--development-region", "English", "--target-device", "iphone", "--minimum-deployment-target", core.loadSDK(.iOSSimulator).defaultDeploymentTarget, "--platform", "iphonesimulator", "--bundle-identifier", "com.test.ProjectName", "--generate-swift-asset-symbol-extensions", "NO", "--generate-swift-asset-symbols", "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/DerivedSources/GeneratedAssetSymbols.swift", "--generate-objc-asset-symbols", "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/DerivedSources/GeneratedAssetSymbols.h", "--generate-asset-symbol-index", "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/DerivedSources/GeneratedAssetSymbols-Index.plist"])
@@ -846,16 +882,16 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("CompileAssetCatalogVariant"), .matchRuleItem("thinned")) { task in
                     task.checkInputs([
                         .path("\(srcRoot.str)/Sources/Assets.xcassets"),
-                        .name("MkDir \(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_output/thinned"), // path node
-                        .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_output/thinned"), // path node
+                        .name("MkDir \(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_output/thinned"),  // path node
+                        .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_output/thinned"),  // path node
                         .namePattern(.and(.prefix("target-AppTarget-T-AppTarget-"), .suffix("--ModuleVerifierTaskProducer"))),
                         .namePattern(.and(.prefix("target-AppTarget-T-AppTarget-"), .suffix("--begin-compiling"))),
                         .name("WorkspaceHeaderMapVFSFilesWritten"),
                     ])
                     task.checkOutputs([
-                        .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_output/thinned"), // directory tree node,
+                        .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_output/thinned"),  // directory tree node,
+                        .any,
                         .any,
-                        .any
                     ])
                     task.checkRuleInfo(["CompileAssetCatalogVariant", "thinned", "\(srcRoot.str)/build/Debug-iphonesimulator/AppTarget.app", "\(srcRoot.str)/Sources/Assets.xcassets"])
                     task.checkCommandLine([actoolPath.str, "\(srcRoot.str)/Sources/Assets.xcassets", "--compile", "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_output/thinned", "--output-format", "human-readable-text", "--notices", "--warnings", "--export-dependency-info", "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_dependencies_thinned", "--output-partial-info-plist", "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_generated_info.plist_thinned", "--app-icon", "AppIcon", "--compress-pngs", "--enable-on-demand-resources", "YES", "--filter-for-thinning-device-configuration", "iPhone15,2", "--filter-for-device-os-version", core.loadSDK(.iOSSimulator).defaultDeploymentTarget, "--development-region", "English", "--target-device", "iphone", "--minimum-deployment-target", core.loadSDK(.iOSSimulator).defaultDeploymentTarget, "--platform", "iphonesimulator"])
@@ -865,15 +901,15 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                     task.checkInputs([
                         .path("\(srcRoot.str)/Sources/Assets.xcassets"),
                         .name("MkDir \(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_output/unthinned"),
-                        .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_output/unthinned"), // path node
+                        .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_output/unthinned"),  // path node
                         .namePattern(.and(.prefix("target-AppTarget-T-AppTarget-"), .suffix("--ModuleVerifierTaskProducer"))),
                         .namePattern(.and(.prefix("target-AppTarget-T-AppTarget-"), .suffix("--begin-compiling"))),
-                        .name("WorkspaceHeaderMapVFSFilesWritten")
+                        .name("WorkspaceHeaderMapVFSFilesWritten"),
                     ])
                     task.checkOutputs([
-                        .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_output/unthinned"), // directory tree node
+                        .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_output/unthinned"),  // directory tree node
+                        .any,
                         .any,
-                        .any
                     ])
                     task.checkRuleInfo(["CompileAssetCatalogVariant", "unthinned", "\(srcRoot.str)/build/Debug-iphonesimulator/AppTarget.app", "\(srcRoot.str)/Sources/Assets.xcassets"])
                     task.checkCommandLine([actoolPath.str, "\(srcRoot.str)/Sources/Assets.xcassets", "--compile", "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_output/unthinned", "--output-format", "human-readable-text", "--notices", "--warnings", "--export-dependency-info", "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_dependencies_unthinned", "--output-partial-info-plist", "\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_generated_info.plist_unthinned", "--app-icon", "AppIcon", "--compress-pngs", "--enable-on-demand-resources", "YES", "--development-region", "English", "--target-device", "iphone", "--minimum-deployment-target", core.loadSDK(.iOSSimulator).defaultDeploymentTarget, "--platform", "iphonesimulator"])
@@ -884,12 +920,12 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                         .path("\(srcRoot.str)/Sources/Assets.xcassets"),
                         .name("MkDir \(srcRoot.str)/build/Debug-iphonesimulator/AppTarget.app"),
                         .path("\(srcRoot.str)/build/Debug-iphonesimulator/AppTarget.app"),
-                        .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_output/thinned"), // directory tree node
-                        .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_output/unthinned"), // directory tree node
+                        .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_output/thinned"),  // directory tree node
+                        .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_output/unthinned"),  // directory tree node
                         .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_signature"),
                         .namePattern(.and(.prefix("target-AppTarget-T-AppTarget-"), .suffix("--ModuleVerifierTaskProducer"))),
                         .namePattern(.and(.prefix("target-AppTarget-T-AppTarget-"), .suffix("--begin-compiling"))),
-                        .name("WorkspaceHeaderMapVFSFilesWritten")
+                        .name("WorkspaceHeaderMapVFSFilesWritten"),
                     ])
                     task.checkOutputs([
                         .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/assetcatalog_generated_info.plist"),
@@ -908,10 +944,10 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                         .namePattern(.and(.prefix("target-AppTarget-T-AppTarget-"), .suffix("--begin-linking"))),
                     ])
                     task.checkOutputs([
-                        .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/AppTarget-ExecutorLinkFileList-normal-x86_64.txt"),
+                        .path("\(srcRoot.str)/build/ProjectName.build/Debug-iphonesimulator/AppTarget.build/AppTarget-ExecutorLinkFileList-normal-x86_64.txt")
                     ])
                     task.checkRuleInfo([
-                        "ConstructStubExecutorLinkFileList", .suffix("AppTarget-ExecutorLinkFileList-normal-x86_64.txt")
+                        "ConstructStubExecutorLinkFileList", .suffix("AppTarget-ExecutorLinkFileList-normal-x86_64.txt"),
                     ])
                     task.checkCommandLineMatches(
                         [
@@ -940,22 +976,26 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                 "ProjectName",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "Sources", path: "Sources",
+                    "Sources",
+                    path: "Sources",
                     children: [
-                        TestFile("main.swift"),
+                        TestFile("main.swift")
                     ]
                 ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "CREATE_INFOPLIST_SECTION_IN_BINARY": "YES",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "PRODUCT_BUNDLE_IDENTIFIER": "com.test.ProjectName",
-                        "SDKROOT": "iphoneos",
-                        "SWIFT_EXEC": swiftCompilerPath.str,
-                        "SWIFT_VERSION": "5.0",
-                        "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "CREATE_INFOPLIST_SECTION_IN_BINARY": "YES",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "PRODUCT_BUNDLE_IDENTIFIER": "com.test.ProjectName",
+                            "SDKROOT": "iphoneos",
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": "5.0",
+                            "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -963,28 +1003,31 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                         type: .commandLineTool,
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("main.swift"),
-                            ]),
+                                TestBuildFile("main.swift")
+                            ])
                         ]
-                    ),
+                    )
                 ]
             )
 
             let core = try await self.getCore()
             let tester = try TaskConstructionTester(core, testProject)
 
-            let buildParameters = BuildParameters(configuration: "Debug", overrides: [
-                // XOJIT previews enabled, which should be passed when the workspace setting is on
-                "ENABLE_XOJIT_PREVIEWS": "YES",
-                "ENABLE_DEBUG_DYLIB": "YES",
+            let buildParameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    // XOJIT previews enabled, which should be passed when the workspace setting is on
+                    "ENABLE_XOJIT_PREVIEWS": "YES",
+                    "ENABLE_DEBUG_DYLIB": "YES",
 
-                "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
-                "CODE_SIGNING_ALLOWED": "YES",
-                "CODE_SIGN_IDENTITY": "-",
-            ])
+                    "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
+                    "CODE_SIGNING_ALLOWED": "YES",
+                    "CODE_SIGN_IDENTITY": "-",
+                ]
+            )
 
             final class ClientDelegate: MockTestTaskPlanningClientDelegate, @unchecked Sendable {
-                override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+                override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
                     if commandLine.first.map(Path.init)?.basename == "actool", commandLine.dropFirst().first != "--version" {
                         return .result(status: .exit(0), stdout: Data("{}".utf8), stderr: Data())
                     }
@@ -1029,27 +1072,31 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                 "ProjectName",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "Sources", path: "Sources",
+                    "Sources",
+                    path: "Sources",
                     children: [
-                        TestFile("main.swift"),
+                        TestFile("main.swift")
                     ]
                 ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "LD_ENVIRONMENT": "DYLD_X_PATH=/foo",
-                        "OTHER_LDFLAGS": """
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "LD_ENVIRONMENT": "DYLD_X_PATH=/foo",
+                            "OTHER_LDFLAGS": """
                             -Wl,-dyld_env,NOT=allowed_here -Xlinker -dyld_env -Xlinker NOR=this \
                             -Wl,-no_exported_symbols -Xlinker -no_exported_symbols
                             """,
-                        "LD_EXPORT_SYMBOLS": "NO",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "PRODUCT_BUNDLE_IDENTIFIER": "com.test.ProjectName",
-                        "SDKROOT": "iphoneos",
-                        "SWIFT_EXEC": swiftCompilerPath.str,
-                        "SWIFT_VERSION": "5.0",
-                        "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                    ])
+                            "LD_EXPORT_SYMBOLS": "NO",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "PRODUCT_BUNDLE_IDENTIFIER": "com.test.ProjectName",
+                            "SDKROOT": "iphoneos",
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": "5.0",
+                            "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -1057,28 +1104,31 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                         type: .commandLineTool,
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("main.swift"),
-                            ]),
+                                TestBuildFile("main.swift")
+                            ])
                         ]
-                    ),
+                    )
                 ]
             )
 
             let core = try await self.getCore()
             let tester = try TaskConstructionTester(core, testProject)
 
-            let buildParameters = BuildParameters(configuration: "Debug", overrides: [
-                // XOJIT previews enabled, which should be passed when the workspace setting is on
-                "ENABLE_XOJIT_PREVIEWS": "YES",
-                "ENABLE_DEBUG_DYLIB": "YES",
+            let buildParameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    // XOJIT previews enabled, which should be passed when the workspace setting is on
+                    "ENABLE_XOJIT_PREVIEWS": "YES",
+                    "ENABLE_DEBUG_DYLIB": "YES",
 
-                "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
-                "CODE_SIGNING_ALLOWED": "YES",
-                "CODE_SIGN_IDENTITY": "-",
-            ])
+                    "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
+                    "CODE_SIGNING_ALLOWED": "YES",
+                    "CODE_SIGN_IDENTITY": "-",
+                ]
+            )
 
             final class ClientDelegate: MockTestTaskPlanningClientDelegate, @unchecked Sendable {
-                override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+                override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
                     if commandLine.first.map(Path.init)?.basename == "actool", commandLine.dropFirst().first != "--version" {
                         return .result(status: .exit(0), stdout: Data("{}".utf8), stderr: Data())
                     }
@@ -1141,22 +1191,26 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                 "ProjectName",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "Sources", path: "Sources",
+                    "Sources",
+                    path: "Sources",
                     children: [
-                        TestFile("main.swift"),
+                        TestFile("main.swift")
                     ]
                 ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "PRODUCT_BUNDLE_IDENTIFIER": "com.test.ProjectName",
-                        "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @loader_path/Frameworks/Foo @loader_path/Frameworks/Foo @loader_path/Frameworks/Foo",
-                        "SDKROOT": "iphoneos",
-                        "SWIFT_EXEC": swiftCompilerPath.str,
-                        "SWIFT_VERSION": "5.0",
-                        "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "PRODUCT_BUNDLE_IDENTIFIER": "com.test.ProjectName",
+                            "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @loader_path/Frameworks/Foo @loader_path/Frameworks/Foo @loader_path/Frameworks/Foo",
+                            "SDKROOT": "iphoneos",
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": "5.0",
+                            "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -1164,28 +1218,31 @@ fileprivate struct PreviewsTaskConstructionTests: CoreBasedTests {
                         type: .commandLineTool,
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("main.swift"),
-                            ]),
+                                TestBuildFile("main.swift")
+                            ])
                         ]
-                    ),
+                    )
                 ]
             )
 
             let core = try await self.getCore()
             let tester = try TaskConstructionTester(core, testProject)
 
-            let buildParameters = BuildParameters(configuration: "Debug", overrides: [
-                // XOJIT previews enabled, which should be passed when the workspace setting is on
-                "ENABLE_XOJIT_PREVIEWS": "YES",
-                "ENABLE_DEBUG_DYLIB": "YES",
+            let buildParameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    // XOJIT previews enabled, which should be passed when the workspace setting is on
+                    "ENABLE_XOJIT_PREVIEWS": "YES",
+                    "ENABLE_DEBUG_DYLIB": "YES",
 
-                "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
-                "CODE_SIGNING_ALLOWED": "YES",
-                "CODE_SIGN_IDENTITY": "-",
-            ])
+                    "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
+                    "CODE_SIGNING_ALLOWED": "YES",
+                    "CODE_SIGN_IDENTITY": "-",
+                ]
+            )
 
             final class ClientDelegate: MockTestTaskPlanningClientDelegate, @unchecked Sendable {
-                override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+                override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
                     if commandLine.first.map(Path.init)?.basename == "actool", commandLine.dropFirst().first != "--version" {
                         return .result(status: .exit(0), stdout: Data("{}".utf8), stderr: Data())
                     }
diff --git a/Tests/SWBTaskConstructionTests/ReadOnlySettingsTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/ReadOnlySettingsTaskConstructionTests.swift
index b218034c..94bff2a2 100644
--- a/Tests/SWBTaskConstructionTests/ReadOnlySettingsTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/ReadOnlySettingsTaskConstructionTests.swift
@@ -30,7 +30,8 @@ fileprivate struct ReadOnlySettingsTaskConstructionTests: CoreBasedTests {
                     children: [
                         TestFile("ClassOne.cpp"),
                         TestFile("Info.plist"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -39,24 +40,25 @@ fileprivate struct ReadOnlySettingsTaskConstructionTests: CoreBasedTests {
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "SDKROOT": "macosx",
                             "PRODUCT_SPECIFIC_LDFLAGS": productSpecificLdFlagsSetting,
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "AppTarget",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "Info.plist"]),
+                            TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "Info.plist"])
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                "ClassOne.cpp",
-                            ]),
-                            TestFrameworksBuildPhase([
+                                "ClassOne.cpp"
                             ]),
+                            TestFrameworksBuildPhase([]),
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             return testProject
         }
         let core = try await getCore()
diff --git a/Tests/SWBTaskConstructionTests/RealityAssetsTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/RealityAssetsTaskConstructionTests.swift
index b29650d7..9f18fbaa 100644
--- a/Tests/SWBTaskConstructionTests/RealityAssetsTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/RealityAssetsTaskConstructionTests.swift
@@ -32,7 +32,8 @@ fileprivate struct RealityAssetsTaskConstructionTests: CoreBasedTests {
                     children: [
                         TestFile("Reality.rkassets"),
                         TestFile("Foo.txt"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -42,7 +43,8 @@ fileprivate struct RealityAssetsTaskConstructionTests: CoreBasedTests {
                             "GENERATE_INFOPLIST_FILE": "YES",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "VERSIONING_SYSTEM": "apple-generic",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -61,10 +63,12 @@ fileprivate struct RealityAssetsTaskConstructionTests: CoreBasedTests {
                             TestResourcesBuildPhase([
                                 TestBuildFile("Reality.rkassets"),
                                 TestBuildFile("Foo.txt"),
-                            ]),
+                            ])
                         ]
-                    ),
-                ], classPrefix: "XC")
+                    )
+                ],
+                classPrefix: "XC"
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
diff --git a/Tests/SWBTaskConstructionTests/ResourceTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/ResourceTaskConstructionTests.swift
index 48e8e1de..96a47d4a 100644
--- a/Tests/SWBTaskConstructionTests/ResourceTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/ResourceTaskConstructionTests.swift
@@ -34,32 +34,38 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                     TestFile("Bar.r"),
                     TestFile("RezPrefixFile.r"),
                     TestFile("de.lproj/Baz.r", regionVariantName: "de"),
-                    TestFile("en.lproj/Baz.r", regionVariantName: "en")]),
+                    TestFile("en.lproj/Baz.r", regionVariantName: "en"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "OTHER_REZFLAGS": "other_rez_flags",
-                    "REZ_SEARCH_PATHS": "rez_search_paths",
-                    "FRAMEWORK_SEARCH_PATHS": "framework_search_paths",
-                    "SYSTEM_FRAMEWORK_SEARCH_PATHS": "system_framework_search_paths1 system_framework_search_paths2",
-                    "HEADER_SEARCH_PATHS": "header_search_paths",
-                    "SYSTEM_HEADER_SEARCH_PATHS": "system_header_search_paths1 system_header_search_paths1",
-                    "REZ_PREFIX_FILE": "a/b/../../RezPrefixFile.r",
-                ]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "OTHER_REZFLAGS": "other_rez_flags",
+                        "REZ_SEARCH_PATHS": "rez_search_paths",
+                        "FRAMEWORK_SEARCH_PATHS": "framework_search_paths",
+                        "SYSTEM_FRAMEWORK_SEARCH_PATHS": "system_framework_search_paths1 system_framework_search_paths2",
+                        "HEADER_SEARCH_PATHS": "header_search_paths",
+                        "SYSTEM_HEADER_SEARCH_PATHS": "system_header_search_paths1 system_header_search_paths1",
+                        "REZ_PREFIX_FILE": "a/b/../../RezPrefixFile.r",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release"),
+                        TestBuildConfiguration("Release")
                     ],
                     buildPhases: [
-                        TestRezBuildPhase(["Foo.r", "Bar.r", "de.lproj/Baz.r", "en.lproj/Baz.r"]),
+                        TestRezBuildPhase(["Foo.r", "Bar.r", "de.lproj/Baz.r", "en.lproj/Baz.r"])
                     ]
                 )
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -88,9 +94,11 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/Bar.r"),
                         .path("\(SRCROOT)/RezPrefixFile.r"),
                         .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
-                        .namePattern(.prefix("target-"))])
+                        .namePattern(.prefix("target-")),
+                    ])
                     task.checkOutputs([
-                        .path("\(SRCROOT)/build/aProject.build/\(configuration)/App.build/ResourceManagerResources/Objects/Bar.rsrc"),])
+                        .path("\(SRCROOT)/build/aProject.build/\(configuration)/App.build/ResourceManagerResources/Objects/Bar.rsrc")
+                    ])
                 }
 
                 // Processing Foo.r
@@ -100,9 +108,11 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/Foo.r"),
                         .path("\(SRCROOT)/RezPrefixFile.r"),
                         .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
-                        .namePattern(.prefix("target-"))])
+                        .namePattern(.prefix("target-")),
+                    ])
                     task.checkOutputs([
-                        .path("\(SRCROOT)/build/aProject.build/\(configuration)/App.build/ResourceManagerResources/Objects/Foo.rsrc"),])
+                        .path("\(SRCROOT)/build/aProject.build/\(configuration)/App.build/ResourceManagerResources/Objects/Foo.rsrc")
+                    ])
                 }
 
                 // Processing Baz.r (de)
@@ -112,10 +122,12 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/de.lproj/Baz.r"),
                         .path("\(SRCROOT)/RezPrefixFile.r"),
                         .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
-                        .namePattern(.prefix("target-"))])
+                        .namePattern(.prefix("target-")),
+                    ])
 
                     task.checkOutputs([
-                        .path("\(SRCROOT)/build/aProject.build/\(configuration)/App.build/ResourceManagerResources/Objects/de.lproj/Baz.rsrc"),])
+                        .path("\(SRCROOT)/build/aProject.build/\(configuration)/App.build/ResourceManagerResources/Objects/de.lproj/Baz.rsrc")
+                    ])
                 }
 
                 // Processing Baz.r (en)
@@ -125,9 +137,11 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/en.lproj/Baz.r"),
                         .path("\(SRCROOT)/RezPrefixFile.r"),
                         .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
-                        .namePattern(.prefix("target-"))])
+                        .namePattern(.prefix("target-")),
+                    ])
                     task.checkOutputs([
-                        .path("\(SRCROOT)/build/aProject.build/\(configuration)/App.build/ResourceManagerResources/Objects/en.lproj/Baz.rsrc"),])
+                        .path("\(SRCROOT)/build/aProject.build/\(configuration)/App.build/ResourceManagerResources/Objects/en.lproj/Baz.rsrc")
+                    ])
                 }
 
                 // There should only be four Rez tasks.
@@ -142,24 +156,28 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         let inputs: [String]
                         if !region.isEmpty {
                             inputs = [
-                                "\(SRCROOT)/build/aProject.build/\(configuration)/App.build/ResourceManagerResources/Objects/\(rsrcName)",
+                                "\(SRCROOT)/build/aProject.build/\(configuration)/App.build/ResourceManagerResources/Objects/\(rsrcName)"
                             ]
                         } else {
                             inputs = [
                                 "\(SRCROOT)/build/aProject.build/\(configuration)/App.build/ResourceManagerResources/Objects/Foo.rsrc",
-                                "\(SRCROOT)/build/aProject.build/\(configuration)/App.build/ResourceManagerResources/Objects/Bar.rsrc"
+                                "\(SRCROOT)/build/aProject.build/\(configuration)/App.build/ResourceManagerResources/Objects/Bar.rsrc",
                             ]
                         }
 
                         task.checkRuleInfo(["ResMergerCollector", output])
                         task.checkCommandLine(["ResMerger", "-dstIs", "DF"] + inputs + ["-o", output])
 
-                        task.checkInputs(inputs.map { .path($0) } + [
-                            .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
-                            .namePattern(.prefix("target-"))])
+                        task.checkInputs(
+                            inputs.map { .path($0) } + [
+                                .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
+                                .namePattern(.prefix("target-")),
+                            ]
+                        )
 
                         task.checkOutputs([
-                            .path(output),])
+                            .path(output)
+                        ])
                     }
                 }
                 results.checkTasks(.matchTarget(target), .matchRuleType("ResMergerProduct")) { tasks in
@@ -175,10 +193,12 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         task.checkInputs([
                             .path(input),
                             .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
-                            .namePattern(.prefix("target-"))])
+                            .namePattern(.prefix("target-")),
+                        ])
 
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/\(configuration)/App.app/Contents/Resources/\(rsrcName)"),])
+                            .path("\(SRCROOT)/build/\(configuration)/App.app/Contents/Resources/\(rsrcName)")
+                        ])
                     }
                 }
             }
@@ -194,11 +214,13 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Info.plist"),
                     TestFile("foo.xcassets"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -206,25 +228,30 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         "CODE_SIGN_IDENTITY": "",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "ASSETCATALOG_EXEC": actoolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                                "INFOPLIST_FILE": "Sources/Info.plist",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "INFOPLIST_FILE": "Sources/Info.plist",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
-                            "foo.xcassets",
-                        ]),
-                    ])
-            ])
+                            "foo.xcassets"
+                        ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -257,7 +284,8 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                             .name("MkDir \(SRCROOT)/build/aProject.build/Debug/App.build/assetcatalog_output/\(variant)"),
                             .path("\(SRCROOT)/build/aProject.build/Debug/App.build/assetcatalog_output/\(variant)"),
                             .namePattern(.and(.prefix("target"), .suffix("Producer"))),
-                            .namePattern(.prefix("target-"))])
+                            .namePattern(.prefix("target-")),
+                        ])
 
                         // Check that we treat the generated Info.plist file as an output.
                         task.checkOutputs([
@@ -279,7 +307,7 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/assetcatalog_output/unthinned"),
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/assetcatalog_signature"),
                         .namePattern(.suffix("ModuleVerifierTaskProducer")),
-                        .namePattern(.suffix("-entry"))
+                        .namePattern(.suffix("-entry")),
                     ])
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/assetcatalog_generated_info.plist"),
@@ -319,12 +347,14 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Info.plist"),
                     TestFile("foo.xcassets"),
                     TestFile("SourceFile.m"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -334,28 +364,33 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         "ENABLE_ON_DEMAND_RESOURCES": "NO",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "PRODUCT_BUNDLE_IDENTIFIER": "com.test.aProject",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "appletvos",
-                                                "INFOPLIST_FILE": "Sources/Info.plist",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "appletvos",
+                                "INFOPLIST_FILE": "Sources/Info.plist",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "SourceFile.m",
+                            "SourceFile.m"
                         ]),
                         TestResourcesBuildPhase([
-                            "foo.xcassets",
+                            "foo.xcassets"
                         ]),
-                    ])
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -391,7 +426,6 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                 results.checkTaskExists(.matchTarget(target), .matchRuleType("LinkAssetCatalogSignature"))
             }
 
-
             results.checkNoTask()
             results.checkNoDiagnostics()
         }
@@ -403,11 +437,13 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Info.plist"),
                     TestFile("foo.xcassets"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -418,25 +454,30 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         "RESOURCES_MINIMUM_DEPLOYMENT_TARGET": "999.9",
                         "RESOURCES_TARGETED_DEVICE_FAMILY": "toastpad",
                         "ASSETCATALOG_EXEC": actoolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                                "INFOPLIST_FILE": "Sources/Info.plist",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "INFOPLIST_FILE": "Sources/Info.plist",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
-                            "foo.xcassets",
-                        ]),
-                    ])
-            ])
+                            "foo.xcassets"
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -467,7 +508,8 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/aProject.build/Debug/App.build/assetcatalog_output/\(variant)"),
                             .path("\(SRCROOT)/build/aProject.build/Debug/App.build/assetcatalog_dependencies_\(variant)"),
-                            .path("\(SRCROOT)/build/aProject.build/Debug/App.build/assetcatalog_generated_info.plist_\(variant)"),])
+                            .path("\(SRCROOT)/build/aProject.build/Debug/App.build/assetcatalog_generated_info.plist_\(variant)"),
+                        ])
                     }
 
                 }
@@ -496,41 +538,48 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Info.plist"),
                     TestFile("foo.xib"),
                     TestFile("bar.storyboard"),
                     TestFile("baz.storyboard"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "CODE_SIGN_IDENTITY": "",
-                                                "SDKROOT": "macosx",
-                                                "IBC_EXEC": ibtoolPath.str,
-                                                "INFOPLIST_FILE": "Sources/Info.plist",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "CODE_SIGN_IDENTITY": "",
+                                "SDKROOT": "macosx",
+                                "IBC_EXEC": ibtoolPath.str,
+                                "INFOPLIST_FILE": "Sources/Info.plist",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
                             "foo.xib",
                             "bar.storyboard",
                             "baz.storyboard",
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -560,17 +609,22 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                     task.checkInputs([
                         .path("\(SRCROOT)/Sources/foo.xib"),
                         .namePattern(.and(.prefix("target"), .suffix("Producer"))),
-                        .namePattern(.prefix("target-"))])
+                        .namePattern(.prefix("target-")),
+                    ])
 
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/Debug/App.app/Contents/Resources/foo.nib"),
                         .path("\(SRCROOT)/build/Debug/App.app/Contents/Resources/foo~iphone.nib"),
                         .path("\(SRCROOT)/build/Debug/App.app/Contents/Resources/foo~ipad.nib"),
-                        .path("\(SRCROOT)/build/aProject.build/Debug/App.build/foo-PartialInfo.plist"),])
+                        .path("\(SRCROOT)/build/aProject.build/Debug/App.build/foo-PartialInfo.plist"),
+                    ])
 
-                    task.checkEnvironment([
-                        "XCODE_DEVELOPER_USR_PATH": .equal("\(core.developerPath.path.str)/usr/bin/.."),
-                    ], exact: true)
+                    task.checkEnvironment(
+                        [
+                            "XCODE_DEVELOPER_USR_PATH": .equal("\(core.developerPath.path.str)/usr/bin/..")
+                        ],
+                        exact: true
+                    )
                 }
 
                 // Check the storyboard compiles.
@@ -579,16 +633,18 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                     for (i, base) in ["bar", "baz"].enumerated() {
                         let task = sortedTasks[i]
                         task.checkRuleInfo(["CompileStoryboard", "\(SRCROOT)/Sources/\(base).storyboard"])
-                        task.checkCommandLine([ibtoolPath.str, "--errors", "--warnings", "--notices", "--module", "App", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/App.build/\(base)-SBPartialInfo.plist", "--auto-activate-custom-fonts", "--target-device", "mac", "--minimum-deployment-target", "\(core.loadSDK(.macOS).defaultDeploymentTarget)", "--output-format", "human-readable-text",  "\(SRCROOT)/Sources/\(base).storyboard", "--compilation-directory", "\(SRCROOT)/build/aProject.build/Debug/App.build",])
+                        task.checkCommandLine([ibtoolPath.str, "--errors", "--warnings", "--notices", "--module", "App", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/App.build/\(base)-SBPartialInfo.plist", "--auto-activate-custom-fonts", "--target-device", "mac", "--minimum-deployment-target", "\(core.loadSDK(.macOS).defaultDeploymentTarget)", "--output-format", "human-readable-text", "\(SRCROOT)/Sources/\(base).storyboard", "--compilation-directory", "\(SRCROOT)/build/aProject.build/Debug/App.build"])
 
                         task.checkInputs([
                             .path("\(SRCROOT)/Sources/\(base).storyboard"),
                             .namePattern(.and(.prefix("target"), .suffix("Producer"))),
-                            .namePattern(.prefix("target-"))])
+                            .namePattern(.prefix("target-")),
+                        ])
 
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/aProject.build/Debug/App.build/\(base).storyboardc"),
-                            .path("\(SRCROOT)/build/aProject.build/Debug/App.build/\(base)-SBPartialInfo.plist"),])
+                            .path("\(SRCROOT)/build/aProject.build/Debug/App.build/\(base)-SBPartialInfo.plist"),
+                        ])
                     }
                 }
 
@@ -601,7 +657,7 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/bar.storyboardc"),
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/baz.storyboardc"),
                         .namePattern(.and(.prefix("target"), .suffix("Producer"))),
-                        .namePattern(.prefix("target-"))
+                        .namePattern(.prefix("target-")),
                     ])
 
                     task.checkOutputs([
@@ -635,42 +691,49 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Info.plist"),
                     TestFile("foo.xib"),
                     TestFile("bar.storyboard"),
                     TestFile("baz.storyboard"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "BUILD_VARIANTS": "normal debug",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "CODE_SIGN_IDENTITY": "",
-                                                "SDKROOT": "macosx",
-                                                "IBC_EXEC": ibtoolPath.str,
-                                                "INFOPLIST_FILE": "Sources/Info.plist",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "CODE_SIGN_IDENTITY": "",
+                                "SDKROOT": "macosx",
+                                "IBC_EXEC": ibtoolPath.str,
+                                "INFOPLIST_FILE": "Sources/Info.plist",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "foo.xib",
                             "bar.storyboard",
                             "baz.storyboard",
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -701,17 +764,22 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/Sources/foo.xib"),
                         .namePattern(.and(.prefix("target"), .suffix("Producer"))),
                         .namePattern(.prefix("target-")),
-                        .name("WorkspaceHeaderMapVFSFilesWritten")])
+                        .name("WorkspaceHeaderMapVFSFilesWritten"),
+                    ])
 
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/Debug/App.app/Contents/Resources/foo.nib"),
                         .path("\(SRCROOT)/build/Debug/App.app/Contents/Resources/foo~iphone.nib"),
                         .path("\(SRCROOT)/build/Debug/App.app/Contents/Resources/foo~ipad.nib"),
-                        .path("\(SRCROOT)/build/aProject.build/Debug/App.build/foo-PartialInfo.plist"),])
+                        .path("\(SRCROOT)/build/aProject.build/Debug/App.build/foo-PartialInfo.plist"),
+                    ])
 
-                    task.checkEnvironment([
-                        "XCODE_DEVELOPER_USR_PATH": .equal("\(core.developerPath.path.str)/usr/bin/.."),
-                    ], exact: true)
+                    task.checkEnvironment(
+                        [
+                            "XCODE_DEVELOPER_USR_PATH": .equal("\(core.developerPath.path.str)/usr/bin/..")
+                        ],
+                        exact: true
+                    )
                 }
 
                 // Check the storyboard compiles.
@@ -726,11 +794,13 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                             .path("\(SRCROOT)/Sources/\(base).storyboard"),
                             .namePattern(.and(.prefix("target"), .suffix("Producer"))),
                             .namePattern(.prefix("target-")),
-                            .name("WorkspaceHeaderMapVFSFilesWritten")])
+                            .name("WorkspaceHeaderMapVFSFilesWritten"),
+                        ])
 
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/aProject.build/Debug/App.build/\(base).storyboardc"),
-                            .path("\(SRCROOT)/build/aProject.build/Debug/App.build/\(base)-SBPartialInfo.plist"),])
+                            .path("\(SRCROOT)/build/aProject.build/Debug/App.build/\(base)-SBPartialInfo.plist"),
+                        ])
                     }
                 }
 
@@ -744,7 +814,7 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/baz.storyboardc"),
                         .namePattern(.and(.prefix("target"), .suffix("Producer"))),
                         .namePattern(.prefix("target-")),
-                        .name("WorkspaceHeaderMapVFSFilesWritten")
+                        .name("WorkspaceHeaderMapVFSFilesWritten"),
                     ])
 
                     task.checkOutputs([
@@ -778,40 +848,47 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestVariantGroup("foo.xib", children: [TestFile("Base.lproj/foo.xib", regionVariantName: "Base")]),
                     TestVariantGroup("bar.storyboard", children: [TestFile("Base.lproj/bar.storyboard", regionVariantName: "Base")]),
                     TestVariantGroup("baz.storyboard", children: [TestFile("Base.lproj/baz.storyboard", regionVariantName: "Base")]),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                                "CODE_SIGN_IDENTITY": "",
-                                                "IBC_EXEC": ibtoolPath.str,
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "CODE_SIGN_IDENTITY": "",
+                                "IBC_EXEC": ibtoolPath.str,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
                             "foo.xib",
                             "bar.storyboard",
                             "baz.storyboard",
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -841,18 +918,23 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                     task.checkInputs([
                         .path("\(SRCROOT)/Sources/Base.lproj/foo.xib"),
                         .namePattern(.and(.prefix("target"), .suffix("Producer"))),
-                        .namePattern(.prefix("target-"))])
+                        .namePattern(.prefix("target-")),
+                    ])
 
                     // The .nib files are localized, but the -PartialInfo.plist file is not.
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/Debug/App.app/Contents/Resources/Base.lproj/foo.nib"),
                         .path("\(SRCROOT)/build/Debug/App.app/Contents/Resources/Base.lproj/foo~iphone.nib"),
                         .path("\(SRCROOT)/build/Debug/App.app/Contents/Resources/Base.lproj/foo~ipad.nib"),
-                        .path("\(SRCROOT)/build/aProject.build/Debug/App.build/Base.lproj/foo-PartialInfo.plist"),])
+                        .path("\(SRCROOT)/build/aProject.build/Debug/App.build/Base.lproj/foo-PartialInfo.plist"),
+                    ])
 
-                    task.checkEnvironment([
-                        "XCODE_DEVELOPER_USR_PATH": .equal("\(core.developerPath.path.str)/usr/bin/.."),
-                    ], exact: true)
+                    task.checkEnvironment(
+                        [
+                            "XCODE_DEVELOPER_USR_PATH": .equal("\(core.developerPath.path.str)/usr/bin/..")
+                        ],
+                        exact: true
+                    )
                 }
 
                 // Check the storyboard compiles.
@@ -866,11 +948,13 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         task.checkInputs([
                             .path("\(SRCROOT)/Sources/Base.lproj/\(basename).storyboard"),
                             .namePattern(.and(.prefix("target"), .suffix("Producer"))),
-                            .namePattern(.prefix("target-"))])
+                            .namePattern(.prefix("target-")),
+                        ])
 
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/aProject.build/Debug/App.build/Base.lproj/\(basename).storyboardc"),
-                            .path("\(SRCROOT)/build/aProject.build/Debug/App.build/Base.lproj/\(basename)-SBPartialInfo.plist"),])
+                            .path("\(SRCROOT)/build/aProject.build/Debug/App.build/Base.lproj/\(basename)-SBPartialInfo.plist"),
+                        ])
                     }
                 }
 
@@ -884,7 +968,7 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/Base.lproj/bar.storyboardc"),
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/Base.lproj/baz.storyboardc"),
                         .namePattern(.and(.prefix("target"), .suffix("Producer"))),
-                        .namePattern(.prefix("target-"))
+                        .namePattern(.prefix("target-")),
                     ])
 
                     task.checkOutputs([
@@ -917,29 +1001,33 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestVariantGroup("foo.xib",
-                                     children: [
-                                        TestFile("Base.lproj/foo.xib", regionVariantName: "Base"),
-                                        // The French localized xib will be processed by a separate ibtool command from the other files.
-                                        TestFile("fr.lproj/foo.xib", regionVariantName: "fr"),
-                                        TestFile("en.lproj/foo.strings", regionVariantName: "en"),
-                                        TestFile("de.lproj/foo.strings", regionVariantName: "de"),
-                                     ]
-                                    ),
-                    TestVariantGroup("Main.storyboard",
-                                     children: [
-                                        TestFile("Base.lproj/Main.storyboard", regionVariantName: "Base"),
-                                        // The French localized storyboard will be processed by a separate ibtool command from the other files.
-                                        TestFile("fr.lproj/Main.storyboard", regionVariantName: "fr"),
-                                        TestFile("en.lproj/Main.strings", regionVariantName: "en"),
-                                        TestFile("de.lproj/Main.strings", regionVariantName: "de"),
-                                     ]
-                                    ),
+                    TestVariantGroup(
+                        "foo.xib",
+                        children: [
+                            TestFile("Base.lproj/foo.xib", regionVariantName: "Base"),
+                            // The French localized xib will be processed by a separate ibtool command from the other files.
+                            TestFile("fr.lproj/foo.xib", regionVariantName: "fr"),
+                            TestFile("en.lproj/foo.strings", regionVariantName: "en"),
+                            TestFile("de.lproj/foo.strings", regionVariantName: "de"),
+                        ]
+                    ),
+                    TestVariantGroup(
+                        "Main.storyboard",
+                        children: [
+                            TestFile("Base.lproj/Main.storyboard", regionVariantName: "Base"),
+                            // The French localized storyboard will be processed by a separate ibtool command from the other files.
+                            TestFile("fr.lproj/Main.storyboard", regionVariantName: "fr"),
+                            TestFile("en.lproj/Main.strings", regionVariantName: "en"),
+                            TestFile("de.lproj/Main.strings", regionVariantName: "de"),
+                        ]
+                    ),
                     TestFile("bar.storyboard"),
                     TestFile("baz.storyboard"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -947,18 +1035,21 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "CODE_SIGN_IDENTITY": "",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                                "IBC_EXEC": ibtoolPath.str,
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "IBC_EXEC": ibtoolPath.str,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
@@ -966,9 +1057,11 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                             "Main.storyboard",
                             "bar.storyboard",
                             "baz.storyboard",
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1010,9 +1103,12 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/Base.lproj/foo-PartialInfo.plist"),
                     ])
 
-                    task.checkEnvironment([
-                        "XCODE_DEVELOPER_USR_PATH": .equal("\(core.developerPath.path.str)/usr/bin/.."),
-                    ], exact: true)
+                    task.checkEnvironment(
+                        [
+                            "XCODE_DEVELOPER_USR_PATH": .equal("\(core.developerPath.path.str)/usr/bin/..")
+                        ],
+                        exact: true
+                    )
                 }
 
                 // Check compiling the French-localized xib.  This xib would be slightly different from the Base-localized xib in ways that can't be captured in a .strings file.
@@ -1033,15 +1129,18 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/fr.lproj/foo-PartialInfo.plist"),
                     ])
 
-                    task.checkEnvironment([
-                        "XCODE_DEVELOPER_USR_PATH": .equal("\(core.developerPath.path.str)/usr/bin/.."),
-                    ], exact: true)
+                    task.checkEnvironment(
+                        [
+                            "XCODE_DEVELOPER_USR_PATH": .equal("\(core.developerPath.path.str)/usr/bin/..")
+                        ],
+                        exact: true
+                    )
                 }
 
                 // Check compiling the base-localized Main storyboard with the strings files.
                 results.checkTask(.matchTarget(target), .matchRuleType("CompileStoryboard"), .matchRuleItem("\(SRCROOT)/Sources/Base.lproj/Main.storyboard")) { task in
                     task.checkRuleInfo(["CompileStoryboard", "\(SRCROOT)/Sources/Base.lproj/Main.storyboard"])
-                    task.checkCommandLine([ibtoolPath.str, "--errors", "--warnings", "--notices", "--companion-strings-file", "en:\(SRCROOT)/Sources/en.lproj/Main.strings", "--companion-strings-file", "de:\(SRCROOT)/Sources/de.lproj/Main.strings", "--module", "App", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/App.build/Base.lproj/Main-SBPartialInfo.plist", "--auto-activate-custom-fonts", "--target-device", "mac", "--minimum-deployment-target", "\(core.loadSDK(.macOS).defaultDeploymentTarget)", "--output-format", "human-readable-text", "\(SRCROOT)/Sources/Base.lproj/Main.storyboard", "--compilation-directory", "\(SRCROOT)/build/aProject.build/Debug/App.build/Base.lproj",])
+                    task.checkCommandLine([ibtoolPath.str, "--errors", "--warnings", "--notices", "--companion-strings-file", "en:\(SRCROOT)/Sources/en.lproj/Main.strings", "--companion-strings-file", "de:\(SRCROOT)/Sources/de.lproj/Main.strings", "--module", "App", "--output-partial-info-plist", "\(SRCROOT)/build/aProject.build/Debug/App.build/Base.lproj/Main-SBPartialInfo.plist", "--auto-activate-custom-fonts", "--target-device", "mac", "--minimum-deployment-target", "\(core.loadSDK(.macOS).defaultDeploymentTarget)", "--output-format", "human-readable-text", "\(SRCROOT)/Sources/Base.lproj/Main.storyboard", "--compilation-directory", "\(SRCROOT)/build/aProject.build/Debug/App.build/Base.lproj"])
 
                     task.checkInputs([
                         .path("\(SRCROOT)/Sources/Base.lproj/Main.storyboard"),
@@ -1074,9 +1173,12 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/fr.lproj/Main-SBPartialInfo.plist"),
                     ])
 
-                    task.checkEnvironment([
-                        "XCODE_DEVELOPER_USR_PATH": .equal("\(core.developerPath.path.str)/usr/bin/.."),
-                    ], exact: true)
+                    task.checkEnvironment(
+                        [
+                            "XCODE_DEVELOPER_USR_PATH": .equal("\(core.developerPath.path.str)/usr/bin/..")
+                        ],
+                        exact: true
+                    )
                 }
 
                 // Check compiling the unlocalized storyboards.
@@ -1111,7 +1213,7 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/bar.storyboardc"),
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/baz.storyboardc"),
                         .namePattern(.and(.prefix("target"), .suffix("Producer"))),
-                        .namePattern(.prefix("target-"))
+                        .namePattern(.prefix("target-")),
                     ])
 
                     task.checkOutputs([
@@ -1143,23 +1245,27 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestVariantGroup("foo.xib",
-                                     children: [
-                                        TestFile("en.lproj/foo.xib", regionVariantName: "en"),
-                                        TestFile("de.lproj/foo.xib", regionVariantName: "de"),
-                                     ]
-                                    ),
-                    TestVariantGroup("Main.storyboard",
-                                     children: [
-                                        TestFile("en.lproj/Main.storyboard", regionVariantName: "en"),
-                                        TestFile("fr.lproj/Main.storyboard", regionVariantName: "fr"),
-                                     ]
-                                    ),
+                    TestVariantGroup(
+                        "foo.xib",
+                        children: [
+                            TestFile("en.lproj/foo.xib", regionVariantName: "en"),
+                            TestFile("de.lproj/foo.xib", regionVariantName: "de"),
+                        ]
+                    ),
+                    TestVariantGroup(
+                        "Main.storyboard",
+                        children: [
+                            TestFile("en.lproj/Main.storyboard", regionVariantName: "en"),
+                            TestFile("fr.lproj/Main.storyboard", regionVariantName: "fr"),
+                        ]
+                    ),
                     TestFile("bar.storyboard"),
                     TestFile("baz.storyboard"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -1167,20 +1273,23 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         "IBC_EXEC": ibtoolPath.str,
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "GENERATE_INFOPLIST_FILE": "YES",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                                "CODE_SIGN_IDENTITY": "",
-                                                // Disable InterfaceBuilder source code generation, which makes the command lines differ on Xcode 7.x and 8.x.
-                                                "IBC_SOURCE_CODE_OUTPUT": "",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "CODE_SIGN_IDENTITY": "",
+                                // Disable InterfaceBuilder source code generation, which makes the command lines differ on Xcode 7.x and 8.x.
+                                "IBC_SOURCE_CODE_OUTPUT": "",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
@@ -1188,9 +1297,11 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                             "Main.storyboard",
                             "bar.storyboard",
                             "baz.storyboard",
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1221,17 +1332,22 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         task.checkInputs([
                             .path("\(SRCROOT)/Sources/\(region).lproj/foo.xib"),
                             .namePattern(.and(.prefix("target"), .suffix("Producer"))),
-                            .namePattern(.prefix("target-"))])
+                            .namePattern(.prefix("target-")),
+                        ])
 
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/App.app/Contents/Resources/\(region).lproj/foo.nib"),
                             .path("\(SRCROOT)/build/Debug/App.app/Contents/Resources/\(region).lproj/foo~iphone.nib"),
                             .path("\(SRCROOT)/build/Debug/App.app/Contents/Resources/\(region).lproj/foo~ipad.nib"),
-                            .path("\(SRCROOT)/build/aProject.build/Debug/App.build/\(region).lproj/foo-PartialInfo.plist"),])
+                            .path("\(SRCROOT)/build/aProject.build/Debug/App.build/\(region).lproj/foo-PartialInfo.plist"),
+                        ])
 
-                        task.checkEnvironment([
-                            "XCODE_DEVELOPER_USR_PATH": .equal("\(core.developerPath.path.str)/usr/bin/.."),
-                        ], exact: true)
+                        task.checkEnvironment(
+                            [
+                                "XCODE_DEVELOPER_USR_PATH": .equal("\(core.developerPath.path.str)/usr/bin/..")
+                            ],
+                            exact: true
+                        )
                     }
                 }
 
@@ -1244,12 +1360,14 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         task.checkInputs([
                             .path("\(SRCROOT)/Sources/\(region).lproj/Main.storyboard"),
                             .namePattern(.and(.prefix("target"), .suffix("Producer"))),
-                            .namePattern(.prefix("target-"))])
+                            .namePattern(.prefix("target-")),
+                        ])
 
                         // The .storyboardc gets placed in the intermediates dir so it can be linked later, but the .strings files get placed directly into the product.
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/aProject.build/Debug/App.build/\(region).lproj/Main.storyboardc"),
-                            .path("\(SRCROOT)/build/aProject.build/Debug/App.build/\(region).lproj/Main-SBPartialInfo.plist"),])
+                            .path("\(SRCROOT)/build/aProject.build/Debug/App.build/\(region).lproj/Main-SBPartialInfo.plist"),
+                        ])
                     }
                 }
 
@@ -1264,11 +1382,13 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         task.checkInputs([
                             .path("\(SRCROOT)/Sources/\(base).storyboard"),
                             .namePattern(.and(.prefix("target"), .suffix("Producer"))),
-                            .namePattern(.prefix("target-"))])
+                            .namePattern(.prefix("target-")),
+                        ])
 
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/aProject.build/Debug/App.build/\(base).storyboardc"),
-                            .path("\(SRCROOT)/build/aProject.build/Debug/App.build/\(base)-SBPartialInfo.plist"),])
+                            .path("\(SRCROOT)/build/aProject.build/Debug/App.build/\(base)-SBPartialInfo.plist"),
+                        ])
                     }
                 }
 
@@ -1283,7 +1403,7 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/bar.storyboardc"),
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/baz.storyboardc"),
                         .namePattern(.and(.prefix("target"), .suffix("Producer"))),
-                        .namePattern(.prefix("target-"))
+                        .namePattern(.prefix("target-")),
                     ])
 
                     task.checkOutputs([
@@ -1313,16 +1433,19 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestVariantGroup("InfoPlist.stringspreprocess",
-                                     children: [
-                                        TestFile("Base.lproj/InfoPlist.stringspreprocess", fileType: "file", regionVariantName: "Base"),
-                                        TestFile("en.lproj/InfoPlist.stringspreprocess", fileType: "file", regionVariantName: "en"),
-                                        TestFile("de.lproj/InfoPlist.stringspreprocess", fileType: "file", regionVariantName: "de"),
-                                     ]
-                                    ),
-                ]),
+                    TestVariantGroup(
+                        "InfoPlist.stringspreprocess",
+                        children: [
+                            TestFile("Base.lproj/InfoPlist.stringspreprocess", fileType: "file", regionVariantName: "Base"),
+                            TestFile("en.lproj/InfoPlist.stringspreprocess", fileType: "file", regionVariantName: "en"),
+                            TestFile("de.lproj/InfoPlist.stringspreprocess", fileType: "file", regionVariantName: "de"),
+                        ]
+                    )
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -1330,30 +1453,36 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "CODE_SIGN_IDENTITY": "",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
-                            "InfoPlist.stringspreprocess",
-                        ]),
+                            "InfoPlist.stringspreprocess"
+                        ])
                     ],
                     buildRules: [
                         TestBuildRule(
                             filePattern: "*InfoPlist.stringspreprocess",
                             script: "",
-                            outputs: ["${DERIVED_FILE_DIR}/${INPUT_FILE_REGION_PATH_COMPONENT}InfoPlist.strings"])
-                    ]),
-            ])
+                            outputs: ["${DERIVED_FILE_DIR}/${INPUT_FILE_REGION_PATH_COMPONENT}InfoPlist.strings"]
+                        )
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -1380,10 +1509,12 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         task.checkInputs([
                             .path("\(SRCROOT)/Sources/\(region).lproj/InfoPlist.stringspreprocess"),
                             .namePattern(.and(.prefix("target"), .suffix("Producer"))),
-                            .namePattern(.prefix("target-"))])
+                            .namePattern(.prefix("target-")),
+                        ])
 
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/aProject.build/Debug/App.build/DerivedSources/\(region).lproj/InfoPlist.strings"),])
+                            .path("\(SRCROOT)/build/aProject.build/Debug/App.build/DerivedSources/\(region).lproj/InfoPlist.strings")
+                        ])
                     }
 
                     results.checkTask(.matchTarget(target), .matchRuleType("CopyStringsFile"), .matchRuleItemPattern(.suffix("\(region).lproj/InfoPlist.strings"))) { task in
@@ -1392,10 +1523,12 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         task.checkInputs([
                             .path("\(SRCROOT)/build/aProject.build/Debug/App.build/DerivedSources/\(region).lproj/InfoPlist.strings"),
                             .namePattern(.and(.prefix("target"), .suffix("Producer"))),
-                            .namePattern(.prefix("target-"))])
+                            .namePattern(.prefix("target-")),
+                        ])
 
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/Debug/App.app/Contents/Resources/\(region).lproj/InfoPlist.strings"),])
+                            .path("\(SRCROOT)/build/Debug/App.app/Contents/Resources/\(region).lproj/InfoPlist.strings")
+                        ])
                     }
                 }
 
@@ -1419,7 +1552,8 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Info.plist"),
                     TestFile("foo.xib"),
@@ -1429,27 +1563,31 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                     TestFile("bar~ipad.xib"),
                     TestFile("baz.xib"),
                     TestFile("baz~ipad.xib"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "IBC_EXEC": ibtoolPath.str,
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                                // Disable InterfaceBuilder source code generation, which makes the command lines differ on Xcode 7.x and 8.x.
-                                                "IBC_SOURCE_CODE_OUTPUT": "",
-                                                "INFOPLIST_FILE": "Sources/Info.plist",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                // Disable InterfaceBuilder source code generation, which makes the command lines differ on Xcode 7.x and 8.x.
+                                "IBC_SOURCE_CODE_OUTPUT": "",
+                                "INFOPLIST_FILE": "Sources/Info.plist",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
@@ -1460,9 +1598,11 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                             "bar~ipad.xib",
                             "baz.xib",
                             "baz~ipad.xib",
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -1571,38 +1711,51 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Foo.fake-xcspec-direct"),
                     TestFile("Bar.fake-xcspec-twostep"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [
                         TestResourcesBuildPhase([
                             "Foo.fake-xcspec-direct",
                             "Bar.fake-xcspec-twostep",
-                        ]),
+                        ])
                     ],
                     buildRules: [
-                        TestBuildRule(filePattern: "*/*.fake-xcspec-direct", script: "ProcessDirect", outputs: [
-                            "$(TARGET_BUILD_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(INPUT_FILE_BASE).fake-xcspec-direct"
-                        ]),
-                        TestBuildRule(filePattern: "*/*.fake-xcspec-twostep", script: "ProcessTwoStep", outputs: [
-                            "$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).fake-xcspec-twostep"
-                        ]),
+                        TestBuildRule(
+                            filePattern: "*/*.fake-xcspec-direct",
+                            script: "ProcessDirect",
+                            outputs: [
+                                "$(TARGET_BUILD_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(INPUT_FILE_BASE).fake-xcspec-direct"
+                            ]
+                        ),
+                        TestBuildRule(
+                            filePattern: "*/*.fake-xcspec-twostep",
+                            script: "ProcessTwoStep",
+                            outputs: [
+                                "$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).fake-xcspec-twostep"
+                            ]
+                        ),
                     ]
                 )
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(runDestination: .macOS) { results in
@@ -1636,11 +1789,13 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Foo.png"),
                     TestFile("Bar.fake-twostep"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -1648,26 +1803,41 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "APPLY_RULES_IN_COPY_FILES": "YES",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [
-                        TestCopyFilesBuildPhase([
-                            "Foo.png",
-                        ], destinationSubfolder: .resources, onlyForDeployment: false),
-                        TestCopyFilesBuildPhase([
-                            "Bar.fake-twostep",
-                        ], destinationSubfolder: .resources, onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Foo.png"
+                            ],
+                            destinationSubfolder: .resources,
+                            onlyForDeployment: false
+                        ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Bar.fake-twostep"
+                            ],
+                            destinationSubfolder: .resources,
+                            onlyForDeployment: false
+                        ),
                     ],
                     buildRules: [
-                        TestBuildRule(filePattern: "*/*.fake-twostep", script: "ProcessTwoStep", outputs: [
-                            "$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).fake-twostep"
-                        ]),
+                        TestBuildRule(
+                            filePattern: "*/*.fake-twostep",
+                            script: "ProcessTwoStep",
+                            outputs: [
+                                "$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).fake-twostep"
+                            ]
+                        )
                     ]
                 )
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -1705,31 +1875,43 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestVariantGroup("Localizable.strings", children: [
-                        TestFile("English.lproj/Localizable.strings", regionVariantName: "English"),
-                    ]),
-                ]),
+                    TestVariantGroup(
+                        "Localizable.strings",
+                        children: [
+                            TestFile("English.lproj/Localizable.strings", regionVariantName: "English")
+                        ]
+                    )
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "CODE_SIGN_IDENTITY": "",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT" : "iphoneos",
-                    ]),
+                        "SDKROOT": "iphoneos",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [
-                        TestCopyFilesBuildPhase([
-                            "Localizable.strings",
-                        ], destinationSubfolder: .resources, onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Localizable.strings"
+                            ],
+                            destinationSubfolder: .resources,
+                            onlyForDeployment: false
+                        )
                     ]
                 )
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(runDestination: .iOS) { results in
@@ -1748,10 +1930,12 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("main.c"),
-                ]),
+                    TestFile("main.c")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -1760,14 +1944,19 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "VERSIONING_SYSTEM": "apple-generic",
                         "CURRENT_PROJECT_VERSION": "3.1",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "AppTarget", type: .framework,
+                    "AppTarget",
+                    type: .framework,
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.c"])]),
-            ])
+                        TestSourcesBuildPhase(["main.c"])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -1776,10 +1965,12 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
             // There should be a WriteAuxiliaryFile task to create the versioning file.
             results.checkWriteAuxiliaryFileTask(.matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/AppTarget_vers.c"])) { task, contents in
                 task.checkInputs([
-                    .namePattern(.and(.prefix("target-"), .suffix("-immediate")))])
+                    .namePattern(.and(.prefix("target-"), .suffix("-immediate")))
+                ])
 
                 task.checkOutputs([
-                    .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/AppTarget_vers.c"),])
+                    .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/AppTarget_vers.c")
+                ])
 
                 #expect(contents == "export extern const unsigned char AppTargetVersionString[];\nexport extern const double AppTargetVersionNumber;\n\nexport const unsigned char AppTargetVersionString[] __attribute__ ((used)) = \"@(#)PROGRAM:AppTarget  PROJECT:aProject-3.1\" \"\\n\";\nexport const double AppTargetVersionNumber __attribute__ ((used)) = (double)3.1;\n")
             }
@@ -1793,10 +1984,12 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
             // There should be a WriteAuxiliaryFile task to create the versioning file.
             results.checkWriteAuxiliaryFileTask(.matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/AppTarget_vers.c"])) { task, contents in
                 task.checkInputs([
-                    .namePattern(.and(.prefix("target-"), .suffix("-immediate")))])
+                    .namePattern(.and(.prefix("target-"), .suffix("-immediate")))
+                ])
 
                 task.checkOutputs([
-                    .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/AppTarget_vers.c"),])
+                    .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/AppTarget_vers.c")
+                ])
 
                 #expect(contents == "static const unsigned char AppTargetVersionString[] __attribute__ ((used)) = \"@(#)PROGRAM:AppTarget  PROJECT:aProject-3.1\" \"\\n\";\nstatic const double AppTargetVersionNumber __attribute__ ((used)) = (double)3.1;\n")
             }
@@ -1810,10 +2003,12 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
             // There should be a WriteAuxiliaryFile task to create the versioning file.
             results.checkWriteAuxiliaryFileTask(.matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/AppTarget_vers.c"])) { task, contents in
                 task.checkInputs([
-                    .namePattern(.and(.prefix("target-"), .suffix("-immediate")))])
+                    .namePattern(.and(.prefix("target-"), .suffix("-immediate")))
+                ])
 
                 task.checkOutputs([
-                    .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/AppTarget_vers.c"),])
+                    .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/AppTarget_vers.c")
+                ])
 
                 #expect(contents == "__attribute__ ((__visibility__(\"hidden\")))  extern const unsigned char AppTargetVersionString[];\n__attribute__ ((__visibility__(\"hidden\")))  extern const double AppTargetVersionNumber;\n\n__attribute__ ((__visibility__(\"hidden\")))  const unsigned char AppTargetVersionString[] __attribute__ ((used)) = \"@(#)PROGRAM:AppTarget  PROJECT:aProject-3.1\" \"\\n\";\n__attribute__ ((__visibility__(\"hidden\")))  const double AppTargetVersionNumber __attribute__ ((used)) = (double)3.1;\n")
             }
@@ -1823,15 +2018,25 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         }
 
         // Check that setting apple-generic-hidden works with VERSION_INFO_EXPORT_DECL and generates the expected file contents.
-        await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["VERSIONING_SYSTEM": "apple-generic-hidden",
-                                                                                    "VERSION_INFO_EXPORT_DECL": "somedeclattr"]), runDestination: .macOS) { results in
+        await tester.checkBuild(
+            BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    "VERSIONING_SYSTEM": "apple-generic-hidden",
+                    "VERSION_INFO_EXPORT_DECL": "somedeclattr",
+                ]
+            ),
+            runDestination: .macOS
+        ) { results in
             // There should be a WriteAuxiliaryFile task to create the versioning file.
             results.checkWriteAuxiliaryFileTask(.matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/AppTarget_vers.c"])) { task, contents in
                 task.checkInputs([
-                    .namePattern(.and(.prefix("target-"), .suffix("-immediate")))])
+                    .namePattern(.and(.prefix("target-"), .suffix("-immediate")))
+                ])
 
                 task.checkOutputs([
-                    .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/AppTarget_vers.c"),])
+                    .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/AppTarget_vers.c")
+                ])
 
                 #expect(contents == "__attribute__ ((__visibility__(\"hidden\"))) somedeclattr extern const unsigned char AppTargetVersionString[];\n__attribute__ ((__visibility__(\"hidden\"))) somedeclattr extern const double AppTargetVersionNumber;\n\n__attribute__ ((__visibility__(\"hidden\"))) somedeclattr const unsigned char AppTargetVersionString[] __attribute__ ((used)) = \"@(#)PROGRAM:AppTarget  PROJECT:aProject-3.1\" \"\\n\";\n__attribute__ ((__visibility__(\"hidden\"))) somedeclattr const double AppTargetVersionNumber __attribute__ ((used)) = (double)3.1;\n")
             }
@@ -1847,24 +2052,31 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("main.c"),
-                ]),
+                    TestFile("main.c")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.c"])]),
-            ])
+                        TestSourcesBuildPhase(["main.c"])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Check behavior with dSYMs disabled.
@@ -1894,19 +2106,29 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Thing-1.txt"),
                     TestFile("Thing-2.txt"),
-                ]),
+                ]
+            ),
             targets: [
-                TestAggregateTarget("All", buildPhases: [
-                    TestCopyFilesBuildPhase([
-                        TestBuildFile("Thing-1.txt", removeHeadersOnCopy: true),
-                        TestBuildFile("Thing-2.txt", removeHeadersOnCopy: false)], destinationSubfolder: .frameworks,
-                                            onlyForDeployment: false),
-                ])
-            ])
+                TestAggregateTarget(
+                    "All",
+                    buildPhases: [
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("Thing-1.txt", removeHeadersOnCopy: true),
+                                TestBuildFile("Thing-2.txt", removeHeadersOnCopy: false),
+                            ],
+                            destinationSubfolder: .frameworks,
+                            onlyForDeployment: false
+                        )
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Check default behavior (should honor the flag).
@@ -1944,7 +2166,8 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Single.png"),
                     TestFile("Missing1x@2x.png"),
@@ -1955,53 +2178,71 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                     TestFile("MixedType@2x.tiff"),
                     TestFile("sneaky.png"),
                     TestFile("other-directory/sneaky@2x.png"),
-                    TestVariantGroup("daily-schedule.png", children: [
-                        TestFile("Base.lproj/daily-schedule.png", regionVariantName: "Base"),
-                        TestFile("en.lproj/daily-schedule.png", regionVariantName: "en"),
-                        TestFile("de.lproj/daily-schedule.png", regionVariantName: "de")
-                    ]),
-                    TestVariantGroup("daily-schedule@2x.png", children: [
-                        TestFile("Base.lproj/daily-schedule@2x.png", regionVariantName: "Base"),
-                        TestFile("en.lproj/daily-schedule@2x.png", regionVariantName: "en"),
-                        TestFile("de.lproj/daily-schedule@2x.png", regionVariantName: "de")
-                    ]),
+                    TestVariantGroup(
+                        "daily-schedule.png",
+                        children: [
+                            TestFile("Base.lproj/daily-schedule.png", regionVariantName: "Base"),
+                            TestFile("en.lproj/daily-schedule.png", regionVariantName: "en"),
+                            TestFile("de.lproj/daily-schedule.png", regionVariantName: "de"),
+                        ]
+                    ),
+                    TestVariantGroup(
+                        "daily-schedule@2x.png",
+                        children: [
+                            TestFile("Base.lproj/daily-schedule@2x.png", regionVariantName: "Base"),
+                            TestFile("en.lproj/daily-schedule@2x.png", regionVariantName: "en"),
+                            TestFile("de.lproj/daily-schedule@2x.png", regionVariantName: "de"),
+                        ]
+                    ),
                     TestFile("CopiedPNG.png"),
-                    TestFile("CopiedJPEG.jpg")
-                ]),
+                    TestFile("CopiedJPEG.jpg"),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
-                TestStandardTarget("App", type: .application, buildPhases: [
-                    TestResourcesBuildPhase([
-                        // Single files which get copied rather than combined.
-                        "Single.png",
-                        "Missing1x@2x.png",
-                        "Another.jpg",
-                        // A pair of files which get combined.
-                        "Doubled.png",
-                        "Doubled@2x.png",
-                        // Single files which get copied rather than combined because they have different file extensions.
-                        "MixedType.png",
-                        "MixedType@2x.tiff",
-                        // Single files which get copied rather than combined because they're in separate directories.
-                        "sneaky.png",
-                        "other-directory/sneaky@2x.png",
-                        // Localized files which get combined.
-                        "daily-schedule.png",
-                        "daily-schedule@2x.png"
-                    ]),
-                    TestCopyFilesBuildPhase([
-                        "CopiedPNG.png",
-                        "CopiedJPEG.jpg"
-                    ], destinationSubfolder: .resources, destinationSubpath: "Sources", onlyForDeployment: false)
-                ])
-            ])
+                TestStandardTarget(
+                    "App",
+                    type: .application,
+                    buildPhases: [
+                        TestResourcesBuildPhase([
+                            // Single files which get copied rather than combined.
+                            "Single.png",
+                            "Missing1x@2x.png",
+                            "Another.jpg",
+                            // A pair of files which get combined.
+                            "Doubled.png",
+                            "Doubled@2x.png",
+                            // Single files which get copied rather than combined because they have different file extensions.
+                            "MixedType.png",
+                            "MixedType@2x.tiff",
+                            // Single files which get copied rather than combined because they're in separate directories.
+                            "sneaky.png",
+                            "other-directory/sneaky@2x.png",
+                            // Localized files which get combined.
+                            "daily-schedule.png",
+                            "daily-schedule@2x.png",
+                        ]),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "CopiedPNG.png",
+                                "CopiedJPEG.jpg",
+                            ],
+                            destinationSubfolder: .resources,
+                            destinationSubpath: "Sources",
+                            onlyForDeployment: false
+                        ),
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -2052,7 +2293,8 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                     .path("\(SRCROOT)/Sources/Doubled.png"),
                     .path("\(SRCROOT)/Sources/Doubled@2x.png"),
                     .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
-                    .namePattern(.prefix("target-"))])
+                    .namePattern(.prefix("target-")),
+                ])
             }
 
             // There should be an individual copy and copy-tiff for each of the MixedType images which have the same root name but different file types.
@@ -2095,9 +2337,14 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/Sources/\(region).lproj/daily-schedule.png"),
                         .path("\(SRCROOT)/Sources/\(region).lproj/daily-schedule@2x.png"),
                         .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
-                        .namePattern(.prefix("target-"))])
-                    XCTAssertMatch(task.outputs.map{ $0.path.str }, [
-                        .equal("\(SRCROOT)/build/Debug/App.app/Contents/Resources/\(region).lproj/daily-schedule.tiff")])
+                        .namePattern(.prefix("target-")),
+                    ])
+                    XCTAssertMatch(
+                        task.outputs.map { $0.path.str },
+                        [
+                            .equal("\(SRCROOT)/build/Debug/App.app/Contents/Resources/\(region).lproj/daily-schedule.tiff")
+                        ]
+                    )
                 }
             }
 
@@ -2119,8 +2366,12 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         task.checkCommandLine(["copypng", "\(SRCROOT)/Sources/\(name)", "\(SRCROOT)/build/Debug/App.app/Contents/Resources/\(name)"])
                     }
                     #expect(task.inputs.first?.path.str == "\(SRCROOT)/Sources/\(name)")
-                    XCTAssertMatch(task.outputs.map{ $0.path.str }, [
-                            .equal("\(SRCROOT)/build/Debug/App.app/Contents/Resources/\(name)")])
+                    XCTAssertMatch(
+                        task.outputs.map { $0.path.str },
+                        [
+                            .equal("\(SRCROOT)/build/Debug/App.app/Contents/Resources/\(name)")
+                        ]
+                    )
                 }
             }
 
@@ -2135,11 +2386,13 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Doubled@1x.png"),
                     TestFile("Doubled@2x.png"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -2147,16 +2400,22 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "CODE_SIGN_IDENTITY": "",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
-                TestStandardTarget("App", type: .application, buildPhases: [
-                    TestSourcesBuildPhase([
-                        "Doubled@1x.png",
-                        "Doubled@2x.png",
-                    ]),
-                ])
-            ])
+                TestStandardTarget(
+                    "App",
+                    type: .application,
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            "Doubled@1x.png",
+                            "Doubled@2x.png",
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Check behavior when combining.
@@ -2177,11 +2436,13 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("A.xcassets"),
                     TestFile("B C.xcassets"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -2189,16 +2450,22 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         "ASSETCATALOG_EXEC": actoolPath.str,
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
-                TestStandardTarget("App", type: .application, buildPhases: [
-                    TestResourcesBuildPhase([
-                        "A.xcassets",
-                        "B C.xcassets",
-                    ]),
-                ]),
-            ])
+                TestStandardTarget(
+                    "App",
+                    type: .application,
+                    buildPhases: [
+                        TestResourcesBuildPhase([
+                            "A.xcassets",
+                            "B C.xcassets",
+                        ])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -2220,11 +2487,13 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("A.xcassets"),
                     TestFile("B.xcassets"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -2233,16 +2502,22 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         "CODE_SIGN_IDENTITY": "",
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
-                TestStandardTarget("App", type: .application, buildPhases: [
-                    TestSourcesBuildPhase([
-                        "A.xcassets",
-                        "B.xcassets",
-                    ]),
-                ]),
-            ])
+                TestStandardTarget(
+                    "App",
+                    type: .application,
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            "A.xcassets",
+                            "B.xcassets",
+                        ])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -2266,29 +2541,37 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("A.dae"),
                     TestFile("B.dae"),
-                    TestFile("C.DAE"), // test that uppercase extensions work too
-                ]),
+                    TestFile("C.DAE"),  // test that uppercase extensions work too
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
-                TestStandardTarget("App", type: .application, buildPhases: [
-                    TestResourcesBuildPhase([
-                        TestBuildFile("A.dae", decompress: false),
-                        TestBuildFile("B.dae", decompress: true),
-                        TestBuildFile("C.DAE", decompress: false),
-                    ]),
-                ]),
-            ])
+                TestStandardTarget(
+                    "App",
+                    type: .application,
+                    buildPhases: [
+                        TestResourcesBuildPhase([
+                            TestBuildFile("A.dae", decompress: false),
+                            TestBuildFile("B.dae", decompress: true),
+                            TestBuildFile("C.DAE", decompress: false),
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -2317,26 +2600,30 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                 "SomeFiles",
                 path: "Sources",
                 children: [
-                    TestFile("foo.d"),
-                ]),
+                    TestFile("foo.d")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ])
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "Framework", type: .framework,
+                    "Framework",
+                    type: .framework,
                     buildPhases: [
                         TestResourcesBuildPhase([
-                            TestBuildFile("foo.d", additionalArgs: ["-Dextra"]),
-                        ]),
+                            TestBuildFile("foo.d", additionalArgs: ["-Dextra"])
+                        ])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -2354,24 +2641,33 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestVariantGroup("Localizable.strings", children: [
-                        TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
-                        TestFile("jp.lproj/Localizable.strings", regionVariantName: "jp"),
-                    ]),
-                    TestVariantGroup("Images", children: [
-                        TestFile("en.lproj/Images", fileType: "folder", regionVariantName: "en"),
-                        TestFile("jp.lproj/Images", fileType: "folder", regionVariantName: "jp"),
-                    ]),
-                ]),
+                    TestVariantGroup(
+                        "Localizable.strings",
+                        children: [
+                            TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
+                            TestFile("jp.lproj/Localizable.strings", regionVariantName: "jp"),
+                        ]
+                    ),
+                    TestVariantGroup(
+                        "Images",
+                        children: [
+                            TestFile("en.lproj/Images", fileType: "folder", regionVariantName: "en"),
+                            TestFile("jp.lproj/Images", fileType: "folder", regionVariantName: "jp"),
+                        ]
+                    ),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -2384,7 +2680,8 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         ])
                     ]
                 )
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -2410,15 +2707,17 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                 "SomeFiles",
                 path: "Sources",
                 children: [
-                    TestFile("foo.txt"),
-                ]),
+                    TestFile("foo.txt")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "GENERATE_INFOPLIST_FILE": "YES",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -2432,9 +2731,11 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                             destinationSubfolder: .wrapper,
                             destinationSubpath: "Modules",
                             onlyForDeployment: false
-                        ),
-                    ]),
-            ])
+                        )
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -2459,14 +2760,16 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("main.m"),
                     TestFile("Foo.applescript"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -2476,10 +2779,11 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         TestSourcesBuildPhase([
                             "main.m",
                             "Foo.applescript",
-                        ]),
+                        ])
                     ]
                 )
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -2507,15 +2811,17 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "Sources",
                     children: [
-                        TestFile("Foo.applescript"),
-                    ]),
+                        TestFile("Foo.applescript")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
                             "GENERATE_INFOPLIST_FILE": "YES",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -2523,11 +2829,12 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                         type: .application,
                         buildPhases: [
                             TestAppleScriptBuildPhase([
-                                "Foo.applescript",
-                            ]),
+                                "Foo.applescript"
+                            ])
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             await tester.checkBuild(runDestination: .macOS) { results in
@@ -2546,26 +2853,27 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
                 "aProject",
                 groupTree: TestGroup(
                     "Sources",
-                    children: [
-                    ]),
+                    children: []
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
                         buildSettings: [
                             "GENERATE_INFOPLIST_FILE": "YES",
                             "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "App",
                         type: .application,
                         buildPhases: [
-                            TestAppleScriptBuildPhase([
-                            ]),
+                            TestAppleScriptBuildPhase([])
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             await tester.checkBuild(runDestination: .macOS) { results in
@@ -2587,42 +2895,74 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         func createProject(extraSettings: [String: String]) -> TestProject {
             return TestProject(
                 "aProject",
-                groupTree: TestGroup("Sources", children: [
-                    TestFile("File.c"),
-                ]),
-                buildConfigurations: [TestBuildConfiguration(
-                    "Debug",
-                    buildSettings: [
-                        "BUILD_VARIANTS": "normal debug",
-                        "DEVELOPMENT_TEAM": "",
-                        "CODE_SIGN_IDENTITY": "-",
-                        "CODE_SIGN_STYLE": "Automatic",
-                        "SDKROOT": "watchsimulator"].addingContents(of: extraSettings))],
+                groupTree: TestGroup(
+                    "Sources",
+                    children: [
+                        TestFile("File.c")
+                    ]
+                ),
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "BUILD_VARIANTS": "normal debug",
+                            "DEVELOPMENT_TEAM": "",
+                            "CODE_SIGN_IDENTITY": "-",
+                            "CODE_SIGN_STYLE": "Automatic",
+                            "SDKROOT": "watchsimulator",
+                        ].addingContents(of: extraSettings)
+                    )
+                ],
                 targets: [
-                    TestAggregateTarget("All",
-                                        dependencies: ["anAppex_watchOS"]),
+                    TestAggregateTarget(
+                        "All",
+                        dependencies: ["anAppex_watchOS"]
+                    ),
                     TestStandardTarget(
-                        "aBundle_watchOS", type: .bundle,
+                        "aBundle_watchOS",
+                        type: .bundle,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug",
-                                                   buildSettings: ["PRODUCT_NAME": "aBundle",
-                                                                   "SDKROOT": "watchsimulator"])],
-                        buildPhases: [TestSourcesBuildPhase([]),]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "aBundle",
+                                    "SDKROOT": "watchsimulator",
+                                ]
+                            )
+                        ],
+                        buildPhases: [TestSourcesBuildPhase([])]
+                    ),
                     TestStandardTarget(
-                        "aFramework_watchOS", type: .framework,
+                        "aFramework_watchOS",
+                        type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug",
-                                                   buildSettings: ["PRODUCT_NAME": "aFramework",
-                                                                   "SDKROOT": "watchsimulator"])],
-                        buildPhases: [TestSourcesBuildPhase(["File.c"]),]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "aFramework",
+                                    "SDKROOT": "watchsimulator",
+                                ]
+                            )
+                        ],
+                        buildPhases: [TestSourcesBuildPhase(["File.c"])]
+                    ),
                     TestStandardTarget(
-                        "anAppex_watchOS", type: .applicationExtension,
+                        "anAppex_watchOS",
+                        type: .applicationExtension,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug",
-                                                   buildSettings: ["PRODUCT_NAME": "anAppex",
-                                                                   "SDKROOT": "watchsimulator"])],
-                        buildPhases: [TestSourcesBuildPhase(["File.c"]),],
-                        dependencies: ["aFramework_watchOS", "aBundle_watchOS"])])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "anAppex",
+                                    "SDKROOT": "watchsimulator",
+                                ]
+                            )
+                        ],
+                        buildPhases: [TestSourcesBuildPhase(["File.c"])],
+                        dependencies: ["aFramework_watchOS", "aBundle_watchOS"]
+                    ),
+                ]
+            )
         }
 
         // Convenience method for toggling between debug and release builds.
@@ -2664,7 +3004,7 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         do {
             let testProject = createProject(extraSettings: [
                 "VALID_ARCHS": "x86_64 powerpc",
-                "EXCLUDED_ARCHS": "x86_64"
+                "EXCLUDED_ARCHS": "x86_64",
             ])
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
@@ -2723,7 +3063,7 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         // Test with ONLY_ACTIVE_ARCH = YES.
         do {
             let testProject = createProject(extraSettings: [
-                "VALID_ARCHS": "powerpc",
+                "VALID_ARCHS": "powerpc"
             ])
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
@@ -2833,29 +3173,34 @@ fileprivate struct ResourcesTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Scripts", fileType: "folder"),
-                ]),
+                    TestFile("Scripts", fileType: "folder")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [
                         // Copy the Scripts folder into the Resources build phase.
                         TestResourcesBuildPhase([
-                            "Scripts",
-                        ]),
+                            "Scripts"
+                        ])
                     ]
                 )
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
diff --git a/Tests/SWBTaskConstructionTests/ShellScriptTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/ShellScriptTaskConstructionTests.swift
index c04bbef6..d55af4eb 100644
--- a/Tests/SWBTaskConstructionTests/ShellScriptTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/ShellScriptTaskConstructionTests.swift
@@ -65,7 +65,9 @@ fileprivate struct ShellScriptTaskConstructionTests: CoreBasedTests {
                         buildSettings: [
                             "PRODUCT_NAME": "$(TARGET_NAME)",
                             "CODE_SIGNING_ALLOWED": "NO",
-                        ])],
+                        ]
+                    )
+                ],
                 targets: [
                     TestStandardTarget(
                         "MyFramework",
@@ -129,7 +131,9 @@ extension CoreBasedTests {
                         "TVOS_DEPLOYMENT_TARGET": "13.0",
                         "WATCHOS_DEPLOYMENT_TARGET": "6.0",
                         "DRIVERKIT_DEPLOYMENT_TARGET": "19.0",
-                    ])],
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
diff --git a/Tests/SWBTaskConstructionTests/SignatureCollectionTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/SignatureCollectionTaskConstructionTests.swift
index d6a9276a..1539109e 100644
--- a/Tests/SWBTaskConstructionTests/SignatureCollectionTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/SignatureCollectionTaskConstructionTests.swift
@@ -33,16 +33,20 @@ fileprivate struct SignatureCollectionTaskConstructionTests: CoreBasedTests {
                     TestFile("Framework.framework"),
                     TestFile("libAnotherStatic.a"),
                     TestFile("Goodies.xcframework"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "ARCHS": "x86_64",
-                    "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator macosx",
-                    "SUPPORTS_MACCATALYST": "YES",
-                    "LIBTOOL": libtoolPath.str,
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "ARCHS": "x86_64",
+                        "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator macosx",
+                        "SUPPORTS_MACCATALYST": "YES",
+                        "LIBTOOL": libtoolPath.str,
+                    ]
+                )
             ],
             targets: [
                 // Test building a tool target which links a static library.
@@ -50,7 +54,7 @@ fileprivate struct SignatureCollectionTaskConstructionTests: CoreBasedTests {
                     "Tool",
                     type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["File.c"]),
@@ -63,7 +67,7 @@ fileprivate struct SignatureCollectionTaskConstructionTests: CoreBasedTests {
                     "StaticLib1",
                     type: .staticLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["File.c"]),
@@ -82,17 +86,18 @@ fileprivate struct SignatureCollectionTaskConstructionTests: CoreBasedTests {
                     "StaticLib2",
                     type: .staticLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["File.c"]),
                         TestFrameworksBuildPhase([
                             // Link the same framework another library links...
-                            TestBuildFile("Framework.framework", shouldLinkWeakly: true),
+                            TestBuildFile("Framework.framework", shouldLinkWeakly: true)
                         ]),
                     ]
                 ),
-            ])
+            ]
+        )
 
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
@@ -102,11 +107,14 @@ fileprivate struct SignatureCollectionTaskConstructionTests: CoreBasedTests {
         try fs.createDirectory(Path(SRCROOT), recursive: true)
         try fs.write(Path(SRCROOT).join("file.c"), contents: "int f() { return 0; }")
 
-        let goodiesXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-            XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Goodies.framework"), binaryPath: Path("Goodies.framework/Versions/A/Goodies"), headersPath: nil),
-            XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Goodies.framework"), binaryPath: Path("Goodies.framework/Goodies"), headersPath: nil),
-            XCFramework.Library(libraryIdentifier: "x86_64-apple-ios\(core.loadSDK(.iOS).defaultDeploymentTarget)-maccatalyst", supportedPlatform: "ios", supportedArchitectures: ["x86_64"], platformVariant: "macabi", libraryPath: Path("Goodies.framework"), binaryPath: Path("Goodies.framework/Goodies"), headersPath: nil),
-        ])
+        let goodiesXCFramework = try XCFramework(
+            version: Version(1, 0),
+            libraries: [
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Goodies.framework"), binaryPath: Path("Goodies.framework/Versions/A/Goodies"), headersPath: nil),
+                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Goodies.framework"), binaryPath: Path("Goodies.framework/Goodies"), headersPath: nil),
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-ios\(core.loadSDK(.iOS).defaultDeploymentTarget)-maccatalyst", supportedPlatform: "ios", supportedArchitectures: ["x86_64"], platformVariant: "macabi", libraryPath: Path("Goodies.framework"), binaryPath: Path("Goodies.framework/Goodies"), headersPath: nil),
+            ]
+        )
         let goodiesXCFrameworkPath = Path(SRCROOT).join("Goodies.xcframework")
         try fs.createDirectory(goodiesXCFrameworkPath, recursive: true)
         let infoLookup = try await getCore()
diff --git a/Tests/SWBTaskConstructionTests/SwiftABICheckerTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/SwiftABICheckerTaskConstructionTests.swift
index f88d516b..a297c9f8 100644
--- a/Tests/SWBTaskConstructionTests/SwiftABICheckerTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/SwiftABICheckerTaskConstructionTests.swift
@@ -27,34 +27,42 @@ fileprivate struct SwiftABICheckerTaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Fwk.swift"),
-                ]),
+                    TestFile("Fwk.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ARCHS": "arm64 arm64e",
-                    "SDKROOT": "iphoneos",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "RUN_SWIFT_ABI_CHECKER_TOOL": "YES",
-                    "SWIFT_VERSION": swiftVersion,
-                    "FRAMEWORK_SEARCH_PATHS": "/Target/Framework/Search/Path/A",
-                    "SYSTEM_FRAMEWORK_SEARCH_PATHS": "/Target/System/Framework/Search/Path/A",
-                    "SWIFT_INCLUDE_PATHS": "/Target/Import/Search/Path/A",
-                    "SWIFT_SYSTEM_INCLUDE_PATHS": "/Target/System/Import/Search/Path/A",
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "BUILD_LIBRARY_FOR_DISTRIBUTION": "YES",
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS": "arm64 arm64e",
+                        "SDKROOT": "iphoneos",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "RUN_SWIFT_ABI_CHECKER_TOOL": "YES",
+                        "SWIFT_VERSION": swiftVersion,
+                        "FRAMEWORK_SEARCH_PATHS": "/Target/Framework/Search/Path/A",
+                        "SYSTEM_FRAMEWORK_SEARCH_PATHS": "/Target/System/Framework/Search/Path/A",
+                        "SWIFT_INCLUDE_PATHS": "/Target/Import/Search/Path/A",
+                        "SWIFT_SYSTEM_INCLUDE_PATHS": "/Target/System/Import/Search/Path/A",
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "BUILD_LIBRARY_FOR_DISTRIBUTION": "YES",
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.swift"])
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         // Check the `Debug` build.
@@ -85,33 +93,41 @@ fileprivate struct SwiftABICheckerTaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Fwk.swift"),
-                ]),
+                    TestFile("Fwk.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ARCHS": "arm64 arm64e",
-                    "SDKROOT": "iphoneos",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "RUN_SWIFT_ABI_GENERATION_TOOL": "YES",
-                    "SWIFT_ABI_GENERATION_TOOL_OUTPUT_DIR": "/tmp/user_given_generated_baseline",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "FRAMEWORK_SEARCH_PATHS": "/Target/Framework/Search/Path/A",
-                    "SYSTEM_FRAMEWORK_SEARCH_PATHS": "/Target/System/Framework/Search/Path/A",
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "BUILD_LIBRARY_FOR_DISTRIBUTION": "YES",
-                    "TAPI_EXEC": tapiToolPath.str,
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS": "arm64 arm64e",
+                        "SDKROOT": "iphoneos",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "RUN_SWIFT_ABI_GENERATION_TOOL": "YES",
+                        "SWIFT_ABI_GENERATION_TOOL_OUTPUT_DIR": "/tmp/user_given_generated_baseline",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "FRAMEWORK_SEARCH_PATHS": "/Target/Framework/Search/Path/A",
+                        "SYSTEM_FRAMEWORK_SEARCH_PATHS": "/Target/System/Framework/Search/Path/A",
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "BUILD_LIBRARY_FOR_DISTRIBUTION": "YES",
+                        "TAPI_EXEC": tapiToolPath.str,
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.swift"])
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         // Check the `Debug` build.
@@ -144,30 +160,38 @@ fileprivate struct SwiftABICheckerTaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Fwk.swift"),
-                ]),
+                    TestFile("Fwk.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ARCHS": "arm64",
-                    "SDKROOT": "iphoneos",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "RUN_SWIFT_ABI_GENERATION_TOOL": "YES",
-                    "SWIFT_ABI_GENERATION_TOOL_OUTPUT_DIR": "/tmp/user_given_generated_baseline",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "TAPI_EXEC": tapiToolPath.str,
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS": "arm64",
+                        "SDKROOT": "iphoneos",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "RUN_SWIFT_ABI_GENERATION_TOOL": "YES",
+                        "SWIFT_ABI_GENERATION_TOOL_OUTPUT_DIR": "/tmp/user_given_generated_baseline",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "TAPI_EXEC": tapiToolPath.str,
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.swift"])
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         await tester.checkBuild(BuildParameters(action: .build, configuration: "Debug", overrides: ["SWIFT_API_DIGESTER_MODE": "abi"]), runDestination: .anyiOSDevice) { results in
@@ -197,33 +221,41 @@ fileprivate struct SwiftABICheckerTaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Fwk.swift"),
-                ]),
+                    TestFile("Fwk.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ARCHS": "arm64e",
-                    "SDKROOT": "iphoneos",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "RUN_SWIFT_ABI_CHECKER_TOOL": "YES",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "FRAMEWORK_SEARCH_PATHS": "/Target/Framework/Search/Path/A",
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "BUILD_LIBRARY_FOR_DISTRIBUTION": "YES",
-                    "SWIFT_ABI_CHECKER_BASELINE_DIR": "/tmp/mybaseline",
-                    "SWIFT_ABI_CHECKER_EXCEPTIONS_FILE": "/tmp/allow.txt",
-                    "TAPI_EXEC": tapiToolPath.str,
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS": "arm64e",
+                        "SDKROOT": "iphoneos",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "RUN_SWIFT_ABI_CHECKER_TOOL": "YES",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "FRAMEWORK_SEARCH_PATHS": "/Target/Framework/Search/Path/A",
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "BUILD_LIBRARY_FOR_DISTRIBUTION": "YES",
+                        "SWIFT_ABI_CHECKER_BASELINE_DIR": "/tmp/mybaseline",
+                        "SWIFT_ABI_CHECKER_EXCEPTIONS_FILE": "/tmp/allow.txt",
+                        "TAPI_EXEC": tapiToolPath.str,
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.swift"])
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
 
@@ -262,7 +294,7 @@ fileprivate struct SwiftABICheckerTaskConstructionTests: CoreBasedTests {
                     "-breakage-allowlist-path",
                     "/tmp/allow.txt",
                     "-I",
-                    "/TEST/build/Debug-iphoneos"
+                    "/TEST/build/Debug-iphoneos",
                 ])
             }
             results.checkNoTask(.matchRuleType("SwiftDriver"))
@@ -275,33 +307,41 @@ fileprivate struct SwiftABICheckerTaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Fwk.swift"),
-                ]),
+                    TestFile("Fwk.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ARCHS": "arm64e",
-                    "SDKROOT": "iphoneos",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "RUN_SWIFT_ABI_CHECKER_TOOL": "YES",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "FRAMEWORK_SEARCH_PATHS": "/Target/Framework/Search/Path/A",
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "BUILD_LIBRARY_FOR_DISTRIBUTION": "YES",
-                    "SWIFT_ABI_CHECKER_BASELINE_DIR": "/tmp/mybaseline",
-                    "SWIFT_ABI_CHECKER_EXCEPTIONS_FILE": "/tmp/allow.txt",
-                    "TAPI_EXEC": tapiToolPath.str,
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS": "arm64e",
+                        "SDKROOT": "iphoneos",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "RUN_SWIFT_ABI_CHECKER_TOOL": "YES",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "FRAMEWORK_SEARCH_PATHS": "/Target/Framework/Search/Path/A",
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "BUILD_LIBRARY_FOR_DISTRIBUTION": "YES",
+                        "SWIFT_ABI_CHECKER_BASELINE_DIR": "/tmp/mybaseline",
+                        "SWIFT_ABI_CHECKER_EXCEPTIONS_FILE": "/tmp/allow.txt",
+                        "TAPI_EXEC": tapiToolPath.str,
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.swift"])
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
 
@@ -333,31 +373,39 @@ fileprivate struct SwiftABICheckerTaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Fwk.swift"),
-                ]),
+                    TestFile("Fwk.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ARCHS": "arm64 arm64e",
-                    "SDKROOT": "iphoneos",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "RUN_SWIFT_ABI_CHECKER_TOOL": "YES",
-                    "RUN_SWIFT_ABI_GENERATION_TOOL": "YES",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "BUILD_LIBRARY_FOR_DISTRIBUTION": "YES",
-                    "TAPI_EXEC": tapiToolPath.str,
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS": "arm64 arm64e",
+                        "SDKROOT": "iphoneos",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "RUN_SWIFT_ABI_CHECKER_TOOL": "YES",
+                        "RUN_SWIFT_ABI_GENERATION_TOOL": "YES",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "BUILD_LIBRARY_FOR_DISTRIBUTION": "YES",
+                        "TAPI_EXEC": tapiToolPath.str,
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.swift"])
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         // Check the `Debug` build.
         await tester.checkBuild(BuildParameters(action: .build, configuration: "Debug"), runDestination: .iOS) { results in
@@ -365,8 +413,8 @@ fileprivate struct SwiftABICheckerTaskConstructionTests: CoreBasedTests {
             // Check CheckSwiftABI is always after GenerateSwiftABIBaseline
             results.checkTasks(.matchRuleType("CheckSwiftABI")) { tasks in
                 for task in tasks {
-                    let variant = task.ruleInfo[1] // "normal"
-                    let arch = task.ruleInfo[2] // "arm64" or "arm64e"
+                    let variant = task.ruleInfo[1]  // "normal"
+                    let arch = task.ruleInfo[2]  // "arm64" or "arm64e"
                     results.checkTaskFollows(task, .matchRule(["GenerateSwiftABIBaseline", variant, arch]))
                 }
             }
@@ -381,31 +429,39 @@ fileprivate struct SwiftABICheckerTaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Fwk.swift"),
-                ]),
+                    TestFile("Fwk.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ARCHS": "arm64",
-                    "SDKROOT": "iphoneos",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "RUN_SWIFT_ABI_CHECKER_TOOL_DRIVER": "YES",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "BUILD_LIBRARY_FOR_DISTRIBUTION": "YES",
-                    "SWIFT_ABI_CHECKER_BASELINE_DIR": tmp.str,
-                    "TAPI_EXEC": tapiToolPath.str,
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS": "arm64",
+                        "SDKROOT": "iphoneos",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "RUN_SWIFT_ABI_CHECKER_TOOL_DRIVER": "YES",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "BUILD_LIBRARY_FOR_DISTRIBUTION": "YES",
+                        "SWIFT_ABI_CHECKER_BASELINE_DIR": tmp.str,
+                        "TAPI_EXEC": tapiToolPath.str,
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.swift"])
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         // Check the `Debug` build.
         await tester.checkBuild(BuildParameters(action: .build, configuration: "Debug"), runDestination: .iOS, fs: fs) { results in
@@ -423,31 +479,39 @@ fileprivate struct SwiftABICheckerTaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Fwk.swift"),
-                ]),
+                    TestFile("Fwk.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ARCHS": "arm64 arm64e",
-                    "SDKROOT": "iphoneos",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "RUN_SWIFT_ABI_CHECKER_TOOL_DRIVER": "YES",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "BUILD_LIBRARY_FOR_DISTRIBUTION": "YES",
-                    "SWIFT_ABI_CHECKER_BASELINE_DIR": tmp.str,
-                    "TAPI_EXEC": tapiToolPath.str,
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS": "arm64 arm64e",
+                        "SDKROOT": "iphoneos",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "RUN_SWIFT_ABI_CHECKER_TOOL_DRIVER": "YES",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "BUILD_LIBRARY_FOR_DISTRIBUTION": "YES",
+                        "SWIFT_ABI_CHECKER_BASELINE_DIR": tmp.str,
+                        "TAPI_EXEC": tapiToolPath.str,
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Fwk",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Fwk.swift"])
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         // Check the `Debug` build.
         await tester.checkBuild(BuildParameters(action: .build, configuration: "Debug"), runDestination: .iOS, fs: fs) { results in
@@ -455,10 +519,11 @@ fileprivate struct SwiftABICheckerTaskConstructionTests: CoreBasedTests {
             results.checkTasks(.matchRuleType("SwiftDriver Compilation")) { tasks in
                 #expect(tasks.count > 0)
                 for task in tasks {
-                    task.checkCommandLineContains([swiftCompilerPath.str,
-                                                   "-digester-mode", "abi",
-                                                   "-compare-to-baseline-path"
-                                                  ])
+                    task.checkCommandLineContains([
+                        swiftCompilerPath.str,
+                        "-digester-mode", "abi",
+                        "-compare-to-baseline-path",
+                    ])
                 }
             }
         }
diff --git a/Tests/SWBTaskConstructionTests/SwiftModuleOnlyTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/SwiftModuleOnlyTaskConstructionTests.swift
index e3d75e46..b03670f4 100644
--- a/Tests/SWBTaskConstructionTests/SwiftModuleOnlyTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/SwiftModuleOnlyTaskConstructionTests.swift
@@ -25,42 +25,48 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
     func swiftModuleOnlyArchsDynamicLibraryDebugBuild() async throws {
         try await checkSwiftModuleOnlyArchsAllPlatforms(
             targetType: .dynamicLibrary,
-            buildConfiguration: "Debug")
+            buildConfiguration: "Debug"
+        )
     }
 
     @Test(.requireSDKs(.macOS, .iOS))
     func swiftModuleOnlyArchsDynamicLibraryReleaseBuild() async throws {
         try await checkSwiftModuleOnlyArchsAllPlatforms(
             targetType: .dynamicLibrary,
-            buildConfiguration: "Release")
+            buildConfiguration: "Release"
+        )
     }
 
     @Test(.requireSDKs(.macOS, .iOS))
     func swiftModuleOnlyArchsStaticLibraryDebugBuild() async throws {
         try await checkSwiftModuleOnlyArchsAllPlatforms(
             targetType: .staticLibrary,
-            buildConfiguration: "Debug")
+            buildConfiguration: "Debug"
+        )
     }
 
     @Test(.requireSDKs(.macOS, .iOS))
     func swiftModuleOnlyArchsStaticLibraryReleaseBuild() async throws {
         try await checkSwiftModuleOnlyArchsAllPlatforms(
             targetType: .staticLibrary,
-            buildConfiguration: "Release")
+            buildConfiguration: "Release"
+        )
     }
 
     @Test(.requireSDKs(.macOS, .iOS))
     func swiftModuleOnlyArchsFrameworkDebugBuild() async throws {
         try await checkSwiftModuleOnlyArchsAllPlatforms(
             targetType: .framework,
-            buildConfiguration: "Debug")
+            buildConfiguration: "Debug"
+        )
     }
 
     @Test(.requireSDKs(.macOS, .iOS))
     func swiftModuleOnlyArchsFrameworkReleaseBuild() async throws {
         try await checkSwiftModuleOnlyArchsAllPlatforms(
             targetType: .framework,
-            buildConfiguration: "Release")
+            buildConfiguration: "Release"
+        )
     }
 
     /// Check swiftmodule content when overloading arch-specific deployment targets
@@ -80,8 +86,10 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 moduleOnlyDeploymentTarget: "10.13",
                 moduleOnlyArchs: ["i386"],
                 archDeploymentTargets: [
-                    "i386": "10.14.4",
-                ]))
+                    "i386": "10.14.4"
+                ]
+            )
+        )
 
         // macOS (Zippered)
         try await checkSwiftModuleOnlyArchs(
@@ -95,13 +103,15 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 moduleOnlyDeploymentTarget: "10.13",
                 moduleOnlyArchs: ["x86_64h"],
                 archDeploymentTargets: [
-                    "x86_64h": "10.14.4",
+                    "x86_64h": "10.14.4"
                 ],
                 zipperedDeploymentTarget: "13.0",
                 zipperedModuleOnlyDeploymentTarget: "10.0",
                 zipperedArchDeploymentTargets: [
-                    "x86_64": "10.3",
-                ]))
+                    "x86_64": "10.3"
+                ]
+            )
+        )
 
         // Mac Catalyst
         try await checkSwiftModuleOnlyArchs(
@@ -115,7 +125,9 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 moduleOnlyArchs: ["x86_64h"],
                 archDeploymentTargets: [
                     "x86_64h": "10.3"
-                ]))
+                ]
+            )
+        )
 
         // Mac Catalyst (Zippered)
         try await checkSwiftModuleOnlyArchs(
@@ -134,8 +146,10 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 zipperedDeploymentTarget: "10.15",
                 zipperedModuleOnlyDeploymentTarget: "10.13",
                 zipperedArchDeploymentTargets: [
-                    "x86_64": "10.14.4",
-                ]))
+                    "x86_64": "10.14.4"
+                ]
+            )
+        )
 
         // iOS
         try await checkSwiftModuleOnlyArchs(
@@ -150,7 +164,9 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 archDeploymentTargets: [
                     "armv7": "10.1",
                     "armv7s": "10.2",
-                ]))
+                ]
+            )
+        )
 
         // iOS Simulator
         try await checkSwiftModuleOnlyArchs(
@@ -163,8 +179,10 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 moduleOnlyDeploymentTarget: "10.0",
                 moduleOnlyArchs: ["x86_64"],
                 archDeploymentTargets: [
-                    "x86_64": "10.3",
-                ]))
+                    "x86_64": "10.3"
+                ]
+            )
+        )
     }
 
     /// Check no Swift module-only tasks are generated for 32-bit architectures
@@ -182,7 +200,9 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 deploymentTarget: "10.15",
                 archs: ["x86_64", "x86_64h"],
                 moduleOnlyDeploymentTarget: "10.13",
-                moduleOnlyArchs: ["i386"]))
+                moduleOnlyArchs: ["i386"]
+            )
+        )
 
         // macOS (Zippered)
         try await checkSwiftModuleOnly32bitTasks(
@@ -196,7 +216,9 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 moduleOnlyDeploymentTarget: "10.13",
                 moduleOnlyArchs: ["i386"],
                 zipperedDeploymentTarget: "13.0",
-                zipperedModuleOnlyDeploymentTarget: "10.3"))
+                zipperedModuleOnlyDeploymentTarget: "10.3"
+            )
+        )
 
         // Mac Catalyst
         try await checkSwiftModuleOnly32bitTasks(
@@ -207,7 +229,9 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 deploymentTarget: "13.0",
                 archs: ["x86_64", "x86_64h"],
                 moduleOnlyDeploymentTarget: "10.3",
-                moduleOnlyArchs: ["i386"]))
+                moduleOnlyArchs: ["i386"]
+            )
+        )
 
         // Mac Catalyst (Zippered)
         try await checkSwiftModuleOnly32bitTasks(
@@ -221,7 +245,9 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 moduleOnlyDeploymentTarget: "10.3",
                 moduleOnlyArchs: ["i386"],
                 zipperedDeploymentTarget: "10.15",
-                zipperedModuleOnlyDeploymentTarget: "10.13"))
+                zipperedModuleOnlyDeploymentTarget: "10.13"
+            )
+        )
     }
 
     /// Check no 'RuleScriptExecution' tasks are generated
@@ -245,9 +271,10 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
             script: "fake-langc",
             inputs: [],
             outputs: [
-                buildDir.join("$(INPUT_FILE_REGION_PATH_COMPONENT)-$(INPUT_FILE_BASE).o").str,
+                buildDir.join("$(INPUT_FILE_REGION_PATH_COMPONENT)-$(INPUT_FILE_BASE).o").str
             ],
-            runOncePerArchitecture: true)
+            runOncePerArchitecture: true
+        )
 
         // macOS
         try await checkNoSwiftModuleOnlyRuleScriptExecutionTasks(
@@ -260,7 +287,9 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 moduleOnlyDeploymentTarget: "10.13",
                 moduleOnlyArchs: ["x86_64h"],
                 inputFiles: inputFiles,
-                buildRules: [customBuildRule]))
+                buildRules: [customBuildRule]
+            )
+        )
 
         // macOS (Zippered)
         try await checkNoSwiftModuleOnlyRuleScriptExecutionTasks(
@@ -276,7 +305,9 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 zipperedDeploymentTarget: "13.0",
                 zipperedModuleOnlyDeploymentTarget: "10.0",
                 inputFiles: inputFiles,
-                buildRules: [customBuildRule]))
+                buildRules: [customBuildRule]
+            )
+        )
 
         // Mac Catalyst
         try await checkNoSwiftModuleOnlyRuleScriptExecutionTasks(
@@ -289,7 +320,9 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 moduleOnlyDeploymentTarget: "10.0",
                 moduleOnlyArchs: ["x86_64h"],
                 inputFiles: inputFiles,
-                buildRules: [customBuildRule]))
+                buildRules: [customBuildRule]
+            )
+        )
 
         // Mac Catalyst (Zippered)
         try await checkNoSwiftModuleOnlyRuleScriptExecutionTasks(
@@ -305,7 +338,9 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 zipperedDeploymentTarget: "10.15",
                 zipperedModuleOnlyDeploymentTarget: "10.13",
                 inputFiles: inputFiles,
-                buildRules: [customBuildRule]))
+                buildRules: [customBuildRule]
+            )
+        )
 
         // iOS
         try await checkNoSwiftModuleOnlyRuleScriptExecutionTasks(
@@ -318,7 +353,9 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 moduleOnlyDeploymentTarget: "10.3",
                 moduleOnlyArchs: ["armv7", "armv7s"],
                 inputFiles: inputFiles,
-                buildRules: [customBuildRule]))
+                buildRules: [customBuildRule]
+            )
+        )
 
         // iOS Simulator
         try await checkNoSwiftModuleOnlyRuleScriptExecutionTasks(
@@ -331,7 +368,9 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 moduleOnlyDeploymentTarget: "10.0",
                 moduleOnlyArchs: ["x86_64"],
                 inputFiles: inputFiles,
-                buildRules: [customBuildRule]))
+                buildRules: [customBuildRule]
+            )
+        )
     }
 
     // MARK: - Private test constants.
@@ -340,7 +379,7 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
         "CompileSwift",
         "CompileSwiftSources",
         "Ld",
-        "CreateUniversalBinary"
+        "CreateUniversalBinary",
     ]
 
     // MARK: Private structs and helper methods.
@@ -356,11 +395,11 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
         var archs: [String]
         var moduleOnlyDeploymentTarget: String?
         var moduleOnlyArchs: [String]
-        var archDeploymentTargets: [String:String] = [:]
+        var archDeploymentTargets: [String: String] = [:]
 
         var zipperedDeploymentTarget: String? = nil
         var zipperedModuleOnlyDeploymentTarget: String? = nil
-        var zipperedArchDeploymentTargets: [String:String] = [:]
+        var zipperedArchDeploymentTargets: [String: String] = [:]
 
         var inputFiles: [String] = ["File1.swift", "File2.swift"]
         var buildRules: [TestBuildRule] = []
@@ -407,8 +446,10 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
         }
     }
 
-    private func buildTestProject(testProjectConfig tpc: TestProjectConfig,
-                                  overrides: [String:String] = [:]) async throws -> TestProject {
+    private func buildTestProject(
+        testProjectConfig tpc: TestProjectConfig,
+        overrides: [String: String] = [:]
+    ) async throws -> TestProject {
         let infoLookup = try await getCore()
 
         var buildSettings = try await [
@@ -458,24 +499,28 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
             groupTree: TestGroup(
                 "SomeFiles",
                 path: "Sources",
-                children: tpc.inputFiles.map { TestFile($0) }),
+                children: tpc.inputFiles.map { TestFile($0) }
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     tpc.buildConfiguration,
-                    buildSettings: buildSettings.addingContents(of: overrides)),
+                    buildSettings: buildSettings.addingContents(of: overrides)
+                )
             ],
             targets: [
                 TestStandardTarget(
                     tpc.targetName,
                     type: tpc.targetType,
                     buildConfigurations: [
-                        TestBuildConfiguration(tpc.buildConfiguration),
+                        TestBuildConfiguration(tpc.buildConfiguration)
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(tpc.inputFiles.map { TestBuildFile($0) }),
+                        TestSourcesBuildPhase(tpc.inputFiles.map { TestBuildFile($0) })
                     ],
-                    buildRules: tpc.buildRules),
-            ])
+                    buildRules: tpc.buildRules
+                )
+            ]
+        )
     }
 
     private struct TestContext {
@@ -517,12 +562,12 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
 
             if testProjectConfig.archs.contains(arch) {
                 return testProjectConfig.archDeploymentTargets[arch]
-                ?? testProjectConfig.deploymentTarget
+                    ?? testProjectConfig.deploymentTarget
             }
 
             if testProjectConfig.moduleOnlyArchs.contains(arch) {
                 return testProjectConfig.archDeploymentTargets[arch]
-                ?? testProjectConfig.moduleOnlyDeploymentTarget
+                    ?? testProjectConfig.moduleOnlyDeploymentTarget
             }
 
             return nil
@@ -531,12 +576,12 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
         var zipperedDeploymentTarget: String? {
             if testProjectConfig.archs.contains(arch) {
                 return testProjectConfig.zipperedArchDeploymentTargets[arch]
-                ?? testProjectConfig.zipperedDeploymentTarget
+                    ?? testProjectConfig.zipperedDeploymentTarget
             }
 
             if testProjectConfig.moduleOnlyArchs.contains(arch) {
                 return testProjectConfig.zipperedArchDeploymentTargets[arch]
-                ?? testProjectConfig.zipperedModuleOnlyDeploymentTarget
+                    ?? testProjectConfig.zipperedModuleOnlyDeploymentTarget
             }
 
             return nil
@@ -545,12 +590,14 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
         func getSwiftmoduleBuildDir() -> Path? {
             switch testProjectConfig.targetType {
             case .dynamicLibrary, .staticLibrary:
-                return sourceRoot
+                return
+                    sourceRoot
                     .join("build")
                     .join(testProjectConfig.buildConfigurationDirName)
                     .join("\(testProjectConfig.targetName).swiftmodule")
             case .framework:
-                return sourceRoot
+                return
+                    sourceRoot
                     .join("build")
                     .join(testProjectConfig.buildConfigurationDirName)
                     .join("\(testProjectConfig.targetName).framework")
@@ -578,62 +625,65 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
         let targetTriple = context.platform.targetTripleString(
             arch: context.arch,
             deploymentTarget: try context.deploymentTarget.map { try Version($0) } ?? nil,
-            infoLookup: infoLookup)
+            infoLookup: infoLookup
+        )
         let sdkPath = try await getSDKPath(platform: tpc.platform)
 
         let swiftCompilerPath = try await self.swiftCompilerPath
 
         // Check the Swift task to generate the Swift module and tasks to copy its outputs.
-        context.results.checkTask(.matchRuleType("SwiftDriver Compilation Requirements"),
-                                  .matchTarget(context.target),
-                                  .matchRuleItem("\(context.arch)\(platformSuffix)")) { task in
-                                      #expect(task.execDescription == "Unblock downstream dependents of \(context.target.target.name) (\(context.arch))")
-
-                                      // Validate command line arguments
-                                      do {
-                                          // Check that expected options are passed to generate the module.
-                                          task.checkCommandLineContains([
-                                            swiftCompilerPath.str,
-                                            "-module-name", tpc.targetName,
-                                            "-sdk", sdkPath.str,
-                                            "-target", targetTriple,
-
-                                            // FIXME: We don't pass -index-store-path (for now) per rdar://48211996
-                                            // "-index-store-path",
-                                            //    context.sourceRoot.join("build").join("\(projectName).build").join("Index").str,
-
-                                            "-output-file-map",
-                                            archBuildDir.join("\(tpc.targetName)\(platformSuffix)-OutputFileMap.json").str,
-                                            "-serialize-diagnostics",
-                                            "-emit-dependencies",
-                                            "-emit-module",
-                                            "-emit-module-path",
-                                            archBuildDir.join("\(tpc.targetName)\(platformSuffix).swiftmodule").str,
-                                            "-emit-module-interface-path",
-                                            archBuildDir.join("\(tpc.targetName)\(platformSuffix).swiftinterface").str,
-                                            "-emit-private-module-interface-path",
-                                            archBuildDir.join("\(tpc.targetName)\(platformSuffix).private.swiftinterface").str,
-                                          ])
-
-                                          // Check that options that should *not* be passed when generating the module are indeed absent.
-                                          task.checkCommandLineDoesNotContain("-target-variant")
-                                          task.checkCommandLineDoesNotContain("-c")
-                                          if context.isZippered {
-                                              task.checkCommandLineDoesNotContain("-emit-objc-header")
-                                              task.checkCommandLineDoesNotContain("-emit-objc-header-path")
-                                          } else {
-                                              task.checkCommandLineContains(["-emit-objc-header"])
-                                              task.checkCommandLineContains(["-emit-objc-header-path"])
-                                          }
-                                          task.checkCommandLineDoesNotContain("-whole-module-optimization")
-
-                                          // Make sure we're not passing -index-store-path (for now) per rdar://48211996
-                                          task.checkCommandLineDoesNotContain("-index-store-path")
-                                      }
-
-                                      // Check the dependency data.
-                                      #expect(task.dependencyData == .makefileIgnoringSubsequentOutputs(archBuildDir.join("\(tpc.targetName)\(platformSuffix)-primary-emit-module.d")))
-                                  }
+        context.results.checkTask(
+            .matchRuleType("SwiftDriver Compilation Requirements"),
+            .matchTarget(context.target),
+            .matchRuleItem("\(context.arch)\(platformSuffix)")
+        ) { task in
+            #expect(task.execDescription == "Unblock downstream dependents of \(context.target.target.name) (\(context.arch))")
+
+            // Validate command line arguments
+            do {
+                // Check that expected options are passed to generate the module.
+                task.checkCommandLineContains([
+                    swiftCompilerPath.str,
+                    "-module-name", tpc.targetName,
+                    "-sdk", sdkPath.str,
+                    "-target", targetTriple,
+
+                    // FIXME: We don't pass -index-store-path (for now) per rdar://48211996
+                    // "-index-store-path",
+                    //    context.sourceRoot.join("build").join("\(projectName).build").join("Index").str,
+
+                    "-output-file-map",
+                    archBuildDir.join("\(tpc.targetName)\(platformSuffix)-OutputFileMap.json").str,
+                    "-serialize-diagnostics",
+                    "-emit-dependencies",
+                    "-emit-module",
+                    "-emit-module-path",
+                    archBuildDir.join("\(tpc.targetName)\(platformSuffix).swiftmodule").str,
+                    "-emit-module-interface-path",
+                    archBuildDir.join("\(tpc.targetName)\(platformSuffix).swiftinterface").str,
+                    "-emit-private-module-interface-path",
+                    archBuildDir.join("\(tpc.targetName)\(platformSuffix).private.swiftinterface").str,
+                ])
+
+                // Check that options that should *not* be passed when generating the module are indeed absent.
+                task.checkCommandLineDoesNotContain("-target-variant")
+                task.checkCommandLineDoesNotContain("-c")
+                if context.isZippered {
+                    task.checkCommandLineDoesNotContain("-emit-objc-header")
+                    task.checkCommandLineDoesNotContain("-emit-objc-header-path")
+                } else {
+                    task.checkCommandLineContains(["-emit-objc-header"])
+                    task.checkCommandLineContains(["-emit-objc-header-path"])
+                }
+                task.checkCommandLineDoesNotContain("-whole-module-optimization")
+
+                // Make sure we're not passing -index-store-path (for now) per rdar://48211996
+                task.checkCommandLineDoesNotContain("-index-store-path")
+            }
+
+            // Check the dependency data.
+            #expect(task.dependencyData == .makefileIgnoringSubsequentOutputs(archBuildDir.join("\(tpc.targetName)\(platformSuffix)-primary-emit-module.d")))
+        }
     }
 
     private func checkCopySwiftmoduleContentTasks(_ context: TestContext) async throws {
@@ -678,20 +728,23 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
         let archBuildDir = context.archBuildDir
         let platformSuffix = filenameSuffix(for: context.platform, infoLookup: infoLookup)
 
-        func checkGlobalDict(dict: [String:PropertyListItem]) throws {
+        func checkGlobalDict(dict: [String: PropertyListItem]) throws {
             // Check the global dictionary.
             let globalDict = try #require(dict[""])
 
-            XCTAssertEqualPropertyListItems(globalDict, .plDict([
-                "swift-dependencies": .plString(archBuildDir.join("\(tpc.targetName)\(platformSuffix)-primary.swiftdeps").str),
-                "diagnostics": .plString(archBuildDir.join("\(tpc.targetName)\(platformSuffix)-primary.dia").str),
-                "emit-module-diagnostics": .plString(archBuildDir.join("\(tpc.targetName)\(platformSuffix)-primary-emit-module.dia").str),
-                "emit-module-dependencies": .plString(archBuildDir.join("\(tpc.targetName)\(platformSuffix)-primary-emit-module.d").str),
-                "pch": .plString(archBuildDir.join("\(tpc.targetName)\(platformSuffix)-primary-Bridging-header.pch").str),
-            ]))
+            XCTAssertEqualPropertyListItems(
+                globalDict,
+                .plDict([
+                    "swift-dependencies": .plString(archBuildDir.join("\(tpc.targetName)\(platformSuffix)-primary.swiftdeps").str),
+                    "diagnostics": .plString(archBuildDir.join("\(tpc.targetName)\(platformSuffix)-primary.dia").str),
+                    "emit-module-diagnostics": .plString(archBuildDir.join("\(tpc.targetName)\(platformSuffix)-primary-emit-module.dia").str),
+                    "emit-module-dependencies": .plString(archBuildDir.join("\(tpc.targetName)\(platformSuffix)-primary-emit-module.d").str),
+                    "pch": .plString(archBuildDir.join("\(tpc.targetName)\(platformSuffix)-primary-Bridging-header.pch").str),
+                ])
+            )
         }
 
-        func checkFileDict(file: String, dict: [String:PropertyListItem]) {
+        func checkFileDict(file: String, dict: [String: PropertyListItem]) {
             let basename = Path(file).basenameWithoutSuffix
             let filePath = context.sourceRoot.join("Sources").join(file)
 
@@ -715,32 +768,34 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
         ]
 
         // Check the contents of the output file map file for the module generation task.
-        try context.results.checkWriteAuxiliaryFileTask(.matchTarget(context.target),
-                                                        .matchRule(wafMatchRule)) { task, contents in
-                                                            guard let plist = try? PropertyList.fromJSONData(contents) else {
-                                                                Issue.record("could not convert output file map from JSON to plist")
-                                                                return
-                                                            }
-
-                                                            guard let dict = plist.dictValue else {
-                                                                Issue.record("output file map is not a dictionary")
-                                                                return
-                                                            }
-
-                                                            #expect(dict.count == 3)
-
-                                                            // Check global dict is valid
-                                                            try checkGlobalDict(dict: dict)
-
-                                                            // Check the dictionary for each Swift input file.
-                                                            for file in tpc.inputFiles {
-                                                                // Check output file map contains dictionary for <file>
-                                                                checkFileDict(file: file, dict: dict)
-                                                            }
-                                                        }
+        try context.results.checkWriteAuxiliaryFileTask(
+            .matchTarget(context.target),
+            .matchRule(wafMatchRule)
+        ) { task, contents in
+            guard let plist = try? PropertyList.fromJSONData(contents) else {
+                Issue.record("could not convert output file map from JSON to plist")
+                return
+            }
+
+            guard let dict = plist.dictValue else {
+                Issue.record("output file map is not a dictionary")
+                return
+            }
+
+            #expect(dict.count == 3)
+
+            // Check global dict is valid
+            try checkGlobalDict(dict: dict)
+
+            // Check the dictionary for each Swift input file.
+            for file in tpc.inputFiles {
+                // Check output file map contains dictionary for <file>
+                checkFileDict(file: file, dict: dict)
+            }
+        }
     }
 
-    private func checkSwiftModuleOnlyArchs(_ tpc: TestProjectConfig, overrides: [String:String] = [:]) async throws {
+    private func checkSwiftModuleOnlyArchs(_ tpc: TestProjectConfig, overrides: [String: String] = [:]) async throws {
         let testProject = try await buildTestProject(testProjectConfig: tpc, overrides: overrides)
         let infoLookup = try await getCore()
 
@@ -813,24 +868,30 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                             try await checkOutputFileMap(context)
                         }
 
-                        try await runChecks(TestContext(
-                            testProjectConfig: tpc,
-                            results: results,
-                            target: target,
-                            platform: tpc.platform,
-                            arch: arch,
-                            sourceRoot: sourceRoot))
-
-                        if tpc.isZippered {
-                            // Check zippered tasks for <arch>
-                            try await runChecks(TestContext(
+                        try await runChecks(
+                            TestContext(
                                 testProjectConfig: tpc,
                                 results: results,
                                 target: target,
-                                platform: tpc.secondaryPlatform,
+                                platform: tpc.platform,
                                 arch: arch,
-                                sourceRoot: sourceRoot,
-                                isZippered: tpc.isZippered))
+                                sourceRoot: sourceRoot
+                            )
+                        )
+
+                        if tpc.isZippered {
+                            // Check zippered tasks for <arch>
+                            try await runChecks(
+                                TestContext(
+                                    testProjectConfig: tpc,
+                                    results: results,
+                                    target: target,
+                                    platform: tpc.secondaryPlatform,
+                                    arch: arch,
+                                    sourceRoot: sourceRoot,
+                                    isZippered: tpc.isZippered
+                                )
+                            )
                         }
                     }
                 }
@@ -838,7 +899,7 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
         }
     }
 
-    private func checkSwiftModuleOnly32bitTasks(_ tpc: TestProjectConfig, overrides: [String:String] = [:]) async throws {
+    private func checkSwiftModuleOnly32bitTasks(_ tpc: TestProjectConfig, overrides: [String: String] = [:]) async throws {
         let testProject = try await buildTestProject(testProjectConfig: tpc, overrides: overrides)
         let infoLookup = try await getCore()
 
@@ -877,13 +938,15 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                             results.checkTaskExists(
                                 .matchTarget(target),
                                 .matchRuleItem(arch + platformSuffix),
-                                .matchRuleType("SwiftDriver Compilation Requirements"))
+                                .matchRuleType("SwiftDriver Compilation Requirements")
+                            )
 
                             // Check 'Copy' tasks are generated for <arch>
                             results.checkTaskExists(
                                 .matchTarget(target),
                                 .matchRuleItemPattern(.suffix("\(moduleTriple).swiftmodule")),
-                                .matchRuleType("Copy"))
+                                .matchRuleType("Copy")
+                            )
                         }
 
                         else if platform == .macCatalyst {
@@ -891,13 +954,15 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                             results.checkNoTask(
                                 .matchTarget(target),
                                 .matchRuleItem(arch + platformSuffix),
-                                .matchRuleType("GenerateSwiftModule"))
+                                .matchRuleType("GenerateSwiftModule")
+                            )
 
                             // Check no 'Copy' tasks are generated for <arch>
                             results.checkNoTask(
                                 .matchTarget(target),
                                 .matchRuleItemPattern(.suffix("\(moduleTriple).swiftmodule")),
-                                .matchRuleType("Copy"))
+                                .matchRuleType("Copy")
+                            )
                         }
                     }
 
@@ -906,7 +971,8 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                     if tpc.isZippered {
                         try checkPlatform(
                             tpc.secondaryPlatform,
-                            deploymentTarget: tpc.zipperedModuleOnlyDeploymentTarget)
+                            deploymentTarget: tpc.zipperedModuleOnlyDeploymentTarget
+                        )
                     }
                 }
             }
@@ -956,8 +1022,10 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
     }
 
     /// Check swiftmodule content when building `targetType` in `buildConfiguration` mode
-    private func checkSwiftModuleOnlyArchsAllPlatforms(targetType: TestStandardTarget.TargetType,
-                                                       buildConfiguration: String) async throws {
+    private func checkSwiftModuleOnlyArchsAllPlatforms(
+        targetType: TestStandardTarget.TargetType,
+        buildConfiguration: String
+    ) async throws {
         // macOS
         try await checkSwiftModuleOnlyArchs(
             TestProjectConfig(
@@ -967,7 +1035,9 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 deploymentTarget: "10.15",
                 archs: ["x86_64", "x86_64h"],
                 moduleOnlyDeploymentTarget: "10.13",
-                moduleOnlyArchs: ["i386"]))
+                moduleOnlyArchs: ["i386"]
+            )
+        )
 
         // macOS (Zippered)
         try await checkSwiftModuleOnlyArchs(
@@ -981,7 +1051,9 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 moduleOnlyDeploymentTarget: "10.13",
                 moduleOnlyArchs: ["x86_64h"],
                 zipperedDeploymentTarget: "13.0",
-                zipperedModuleOnlyDeploymentTarget: "10.3"))
+                zipperedModuleOnlyDeploymentTarget: "10.3"
+            )
+        )
 
         // Mac Catalyst
         try await checkSwiftModuleOnlyArchs(
@@ -992,7 +1064,9 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 deploymentTarget: "13.0",
                 archs: ["x86_64"],
                 moduleOnlyDeploymentTarget: "10.3",
-                moduleOnlyArchs: ["x86_64h"]))
+                moduleOnlyArchs: ["x86_64h"]
+            )
+        )
 
         // Mac Catalyst (Zippered)
         try await checkSwiftModuleOnlyArchs(
@@ -1006,7 +1080,9 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 moduleOnlyDeploymentTarget: "10.3",
                 moduleOnlyArchs: ["x86_64h"],
                 zipperedDeploymentTarget: "10.15",
-                zipperedModuleOnlyDeploymentTarget: "10.13"))
+                zipperedModuleOnlyDeploymentTarget: "10.13"
+            )
+        )
 
         // iOS
         try await checkSwiftModuleOnlyArchs(
@@ -1017,7 +1093,9 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 deploymentTarget: "13.0",
                 archs: ["arm64", "arm64e"],
                 moduleOnlyDeploymentTarget: "10.3",
-                moduleOnlyArchs: ["armv7", "armv7s"]))
+                moduleOnlyArchs: ["armv7", "armv7s"]
+            )
+        )
 
         // iOS Simulator
         try await checkSwiftModuleOnlyArchs(
@@ -1028,6 +1106,8 @@ fileprivate struct SwiftModuleOnlyTaskConstructionTests: CoreBasedTests {
                 deploymentTarget: "13.0",
                 archs: ["arm64"],
                 moduleOnlyDeploymentTarget: "10.3",
-                moduleOnlyArchs: ["x86_64"]))
+                moduleOnlyArchs: ["x86_64"]
+            )
+        )
     }
 }
diff --git a/Tests/SWBTaskConstructionTests/SwiftTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/SwiftTaskConstructionTests.swift
index 7b43ae69..11ef9829 100644
--- a/Tests/SWBTaskConstructionTests/SwiftTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/SwiftTaskConstructionTests.swift
@@ -101,12 +101,27 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
 
     @Test(.requireSDKs(.macOS), .userDefaults(["AllowRuntimeSearchPathAdditionForSwiftConcurrency": "0"]))
     func swiftAppBasics_postSwiftOSDeploymentTarget_preSwiftConcurrencySupportedNatively_DisallowRpathInjection() async throws {
-        try await _testSwiftAppBasics(deploymentTargetVersion: "11.0", shouldEmitSwiftRPath:true, shouldFilterSwiftLibs: true, shouldBackDeploySwiftConcurrency: true, shouldBackDeploySwiftSpan: true,
-        missingSpanCompatibilitySuppressesRPath: true)
+        try await _testSwiftAppBasics(
+            deploymentTargetVersion: "11.0",
+            shouldEmitSwiftRPath: true,
+            shouldFilterSwiftLibs: true,
+            shouldBackDeploySwiftConcurrency: true,
+            shouldBackDeploySwiftSpan: true,
+            missingSpanCompatibilitySuppressesRPath: true
+        )
     }
 
-    func _testSwiftAppBasics(deploymentTargetVersion: String, targetDeviceOSVersion: String? = nil, targetDevicePlatformName: String? = nil, toolchain toolchainIdentifier: String = "default", shouldEmitSwiftRPath: Bool, shouldFilterSwiftLibs: Bool, shouldBackDeploySwiftConcurrency: Bool, shouldBackDeploySwiftSpan: Bool,
-        missingSpanCompatibilitySuppressesRPath: Bool = false) async throws {
+    func _testSwiftAppBasics(
+        deploymentTargetVersion: String,
+        targetDeviceOSVersion: String? = nil,
+        targetDevicePlatformName: String? = nil,
+        toolchain toolchainIdentifier: String = "default",
+        shouldEmitSwiftRPath: Bool,
+        shouldFilterSwiftLibs: Bool,
+        shouldBackDeploySwiftConcurrency: Bool,
+        shouldBackDeploySwiftSpan: Bool,
+        missingSpanCompatibilitySuppressesRPath: Bool = false
+    ) async throws {
         let swiftCompilerPath = try await self.swiftCompilerPath
         let swiftVersion = try await self.swiftVersion
         let swiftFeatures = try await self.swiftFeatures
@@ -121,7 +136,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                     TestFile("foo.swift"),
                     TestFile("bar.swift"),
                     TestFile("baz.fake-swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -139,16 +155,20 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "SWIFT_INCLUDE_PATHS": "/tmp/include",
                         "SWIFT_SYSTEM_INCLUDE_PATHS": "/tmp/system/include",
                         "TAPI_EXEC": tapiToolPath.str,
-                    ])],
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "VERSIONING_SYSTEM": "apple-generic",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "VERSIONING_SYSTEM": "apple-generic"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -157,22 +177,34 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                             "baz.fake-swift",
                         ]),
                         TestFrameworksBuildPhase([
-                            "FwkTarget.framework"])
+                            "FwkTarget.framework"
+                        ]),
+                    ],
+                    buildRules: [
+                        TestBuildRule(
+                            filePattern: "*/*.fake-swift",
+                            script: "echo \"make some swift stuff\"",
+                            outputs: [
+                                "$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).swift"
+                            ]
+                        )
                     ],
-                    buildRules: [TestBuildRule(filePattern: "*/*.fake-swift", script: "echo \"make some swift stuff\"", outputs: [
-                        "$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).swift"
-                    ])],
-                    dependencies: ["FwkTarget"]),
+                    dependencies: ["FwkTarget"]
+                ),
                 TestStandardTarget(
                     "FwkTarget",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "bar.swift"])],
-                    dependencies: ["MockTarget"]),
+                            "bar.swift"
+                        ])
+                    ],
+                    dependencies: ["MockTarget"]
+                ),
                 // This target is a mock to ensure we still generate a VFS, even if we wouldn't for the "key" target.
                 TestAggregateTarget("MockTarget"),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -203,9 +235,11 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                 // There should be a WriteAuxiliaryFile task to create the versioning file.
                 results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/AppTarget_vers.c"])) { task, contents in
                     task.checkInputs([
-                        .namePattern(.and(.prefix("target-"), .suffix("-immediate")))])
+                        .namePattern(.and(.prefix("target-"), .suffix("-immediate")))
+                    ])
                     task.checkOutputs([
-                        .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/AppTarget_vers.c")])
+                        .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/AppTarget_vers.c")
+                    ])
 
                     #expect(contents == " extern const unsigned char AppTargetVersionString[];\n extern const double AppTargetVersionNumber;\n\n const unsigned char AppTargetVersionString[] __attribute__ ((used)) = \"@(#)PROGRAM:AppTarget  PROJECT:aProject-3.1\" \"\\n\";\n const double AppTargetVersionNumber __attribute__ ((used)) = (double)3.1;\n")
                 }
@@ -218,7 +252,7 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/baz.fake-swift"),
                         .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
                         .namePattern(.prefix("target-")),
-                        .name("WorkspaceHeaderMapVFSFilesWritten")
+                        .name("WorkspaceHeaderMapVFSFilesWritten"),
                     ])
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/baz.swift")
@@ -248,7 +282,7 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         .namePattern(.suffix("copy-headers-completion")),
                         .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
                         .namePattern(.prefix("target-")),
-                        .name("WorkspaceHeaderMapVFSFilesWritten")
+                        .name("WorkspaceHeaderMapVFSFilesWritten"),
                     ])
 
                     task.checkOutputs([
@@ -284,7 +318,7 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         .namePattern(.suffix("copy-headers-completion")),
                         .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
                         .namePattern(.prefix("target-")),
-                        .name("WorkspaceHeaderMapVFSFilesWritten")
+                        .name("WorkspaceHeaderMapVFSFilesWritten"),
                     ])
 
                     task.checkOutputs([
@@ -296,17 +330,19 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget.swiftinterface"),
                         .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget.private.swiftinterface"),
                         .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget-Swift.h"),
-                        .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget.swiftdoc")
+                        .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget.swiftdoc"),
                     ])
                 }
 
                 results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget-OutputFileMap.json"])) { task, contents in
                     // Check the inputs and outputs.
                     task.checkInputs([
-                        .namePattern(.and(.prefix("target-"), .suffix("-immediate")))])
+                        .namePattern(.and(.prefix("target-"), .suffix("-immediate")))
+                    ])
 
                     task.checkOutputs([
-                        .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget-OutputFileMap.json")])
+                        .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget-OutputFileMap.json")
+                    ])
 
                     // Check the contents.
                     guard let plist = try? PropertyList.fromJSONData(contents) else {
@@ -322,15 +358,17 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
 
                     // Check the global dictionary.
                     if let globalDict = dict[""] {
-                        XCTAssertEqualPropertyListItems(globalDict, .plDict([
-                            "swift-dependencies": .plString("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget-primary.swiftdeps"),
-                            "diagnostics": .plString("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget-primary.dia"),
-                            "emit-module-diagnostics": .plString("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget-primary-emit-module.dia"),
-                            "emit-module-dependencies": .plString("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget-primary-emit-module.d"),
-                            "pch": .plString("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget-primary-Bridging-header.pch"),
-                        ]))
-                    }
-                    else {
+                        XCTAssertEqualPropertyListItems(
+                            globalDict,
+                            .plDict([
+                                "swift-dependencies": .plString("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget-primary.swiftdeps"),
+                                "diagnostics": .plString("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget-primary.dia"),
+                                "emit-module-diagnostics": .plString("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget-primary-emit-module.dia"),
+                                "emit-module-dependencies": .plString("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget-primary-emit-module.d"),
+                                "pch": .plString("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget-primary-Bridging-header.pch"),
+                            ])
+                        )
+                    } else {
                         Issue.record("output file map does not contain a global dictionary")
                     }
 
@@ -355,8 +393,7 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                             } else {
                                 #expect(fileDict.count == 6)
                             }
-                        }
-                        else {
+                        } else {
                             Issue.record("output file map does not contain a dictionary for '\(filename).swift'")
                         }
                     }
@@ -398,11 +435,13 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                     task.checkRuleInfo(["Ld", "\(SRCROOT)/build/Debug/AppTarget.app/Contents/MacOS/AppTarget", "normal"])
 
                     let toolchain = toolchainIdentifier != "default" ? "OSX10.15" : "XcodeDefault"
-                    task.checkCommandLine(([
-                        ["clang", "-Xlinker", "-reproducible", "-target", "\(results.runDestinationTargetArchitecture)-apple-macos\(MACOSX_DEPLOYMENT_TARGET)", "-isysroot", core.loadSDK(.macOS).path.str, "-Os", "-L\(SRCROOT)/build/EagerLinkingTBDs/Debug", "-L\(SRCROOT)/build/Debug", "-F\(SRCROOT)/build/EagerLinkingTBDs/Debug", "-F\(SRCROOT)/build/Debug", "-filelist", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget.LinkFileList"],
-                        shouldEmitSwiftRPath ? ["-Xlinker", "-rpath", "-Xlinker", "/usr/lib/swift"] : [],
-                        ["-Xlinker", "-dependency_info", "-Xlinker", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget_dependency_info.dat", "-fobjc-link-runtime", "-L\(core.developerPath.path.str)/Toolchains/\(toolchain).xctoolchain/usr/lib/swift/macosx", "-L/usr/lib/swift", "-framework", "FwkTarget", "-o", "\(SRCROOT)/build/Debug/AppTarget.app/Contents/MacOS/AppTarget"]
-                    ] as [[String]]).reduce([], +))
+                    task.checkCommandLine(
+                        ([
+                            ["clang", "-Xlinker", "-reproducible", "-target", "\(results.runDestinationTargetArchitecture)-apple-macos\(MACOSX_DEPLOYMENT_TARGET)", "-isysroot", core.loadSDK(.macOS).path.str, "-Os", "-L\(SRCROOT)/build/EagerLinkingTBDs/Debug", "-L\(SRCROOT)/build/Debug", "-F\(SRCROOT)/build/EagerLinkingTBDs/Debug", "-F\(SRCROOT)/build/Debug", "-filelist", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget.LinkFileList"],
+                            shouldEmitSwiftRPath ? ["-Xlinker", "-rpath", "-Xlinker", "/usr/lib/swift"] : [],
+                            ["-Xlinker", "-dependency_info", "-Xlinker", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget_dependency_info.dat", "-fobjc-link-runtime", "-L\(core.developerPath.path.str)/Toolchains/\(toolchain).xctoolchain/usr/lib/swift/macosx", "-L/usr/lib/swift", "-framework", "FwkTarget", "-o", "\(SRCROOT)/build/Debug/AppTarget.app/Contents/MacOS/AppTarget"],
+                        ] as [[String]]).reduce([], +)
+                    )
 
                     task.checkInputs([
                         .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget_vers.o"),
@@ -412,7 +451,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget.LinkFileList"),
                         .path("\(SRCROOT)/build/Debug"),
                         .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
-                        .namePattern(.prefix("target-"))])
+                        .namePattern(.prefix("target-")),
+                    ])
 
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/MacOS/AppTarget"),
@@ -431,18 +471,23 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/MacOS/AppTarget"),
                         .namePattern(.prefix("target-")),
                         .namePattern(.prefix("target-")),
-                        .namePattern(.and(.prefix("target-"), .suffix("-immediate")))])
+                        .namePattern(.and(.prefix("target-"), .suffix("-immediate"))),
+                    ])
 
                     task.checkOutputs([
-                        .name("CopySwiftStdlib \(SRCROOT)/build/Debug/AppTarget.app"),])
-
-                    task.checkEnvironment([
-                        "CODESIGN_ALLOCATE":    .equal(core.developerPath.path.join("Toolchains/XcodeDefault.xctoolchain/usr/bin/codesign_allocate").str),
-                        "DEVELOPER_DIR":        .equal(core.developerPath.path.str),
-                        "SDKROOT":              .equal(core.loadSDK(.macOS).path.str),
-                        // This is coming from our overrides in unit test infrastructure.
-                        "TOOLCHAINS": .equal(toolchainIdentifier),
-                    ], exact: true)
+                        .name("CopySwiftStdlib \(SRCROOT)/build/Debug/AppTarget.app")
+                    ])
+
+                    task.checkEnvironment(
+                        [
+                            "CODESIGN_ALLOCATE": .equal(core.developerPath.path.join("Toolchains/XcodeDefault.xctoolchain/usr/bin/codesign_allocate").str),
+                            "DEVELOPER_DIR": .equal(core.developerPath.path.str),
+                            "SDKROOT": .equal(core.loadSDK(.macOS).path.str),
+                            // This is coming from our overrides in unit test infrastructure.
+                            "TOOLCHAINS": .equal(toolchainIdentifier),
+                        ],
+                        exact: true
+                    )
                 }
 
                 // There should be a product 'Touch' task.
@@ -464,8 +509,11 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         .namePattern(.and(.prefix("target-"), .suffix("-will-sign"))),
                         .namePattern(.and(.prefix("target"), .suffix("-entry"))),
                     ])
-                    #expect(task.outputs.map{ $0.name } == [
-                        "AppTarget.app", "LSRegisterURL \(SRCROOT)/build/Debug/AppTarget.app"])
+                    #expect(
+                        task.outputs.map { $0.name } == [
+                            "AppTarget.app", "LSRegisterURL \(SRCROOT)/build/Debug/AppTarget.app",
+                        ]
+                    )
                 }
 
                 // Ignore all the MkDir tasks.
@@ -514,8 +562,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
 
             // check the remaining auxiliary files tasks, which should just be headermaps.
             results.checkTasks(.matchRuleType("WriteAuxiliaryFile")) { tasks in
-                #expect(tasks.contains(where: {$0.ruleInfo[1].hasSuffix(".hmap")}))
-                #expect(tasks.contains(where: {$0.ruleInfo[1].hasSuffix("const_extract_protocols.json")}))
+                #expect(tasks.contains(where: { $0.ruleInfo[1].hasSuffix(".hmap") }))
+                #expect(tasks.contains(where: { $0.ruleInfo[1].hasSuffix("const_extract_protocols.json") }))
             }
 
             // Ignore all Gate and build directory tasks.
@@ -543,36 +591,46 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "Test",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("File1.swift"),
-                ]),
+                    TestFile("File1.swift")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SDKROOT": "auto",
-                    "SDK_VARIANT": "auto",
-                    "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SDKROOT": "auto",
+                        "SDK_VARIANT": "auto",
+                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Executable",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "iphoneos",
-                            "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "iphoneos",
+                                "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("File1.swift")]),
-                    ]),
-            ])
+                        TestSourcesBuildPhase([TestBuildFile("File1.swift")])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(BuildParameters(action: .build, configuration: "Debug"), runDestination: .iOSSimulator) { results in
@@ -587,10 +645,12 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Foo.swift"),
-                ]),
+                    TestFile("Foo.swift")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -598,36 +658,45 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "GCC_GENERATE_DEBUGGING_SYMBOLS": "NO",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                                "DEFINES_MODULE": "YES",
-                                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                                "SWIFT_VERSION": swiftVersion,
-                                                "TAPI_EXEC": tapiToolPath.str,
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "DEFINES_MODULE": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                                "TAPI_EXEC": tapiToolPath.str,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Foo.swift",
-                        ]),
-                    ])
-            ])
+                            "Foo.swift"
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(BuildParameters(action: .install, configuration: "Debug"), runDestination: .macOS) { results in
             // Check the actual module map.
             results.checkWriteAuxiliaryFileTask(.matchRule(["WriteAuxiliaryFile", "/tmp/Test/aProject/build/aProject.build/Debug/CoreFoo.build/module.modulemap"])) { task, contents in
-                #expect(contents == (OutputByteStream()
-                                     <<< "framework module CoreFoo {\n"
-                                     <<< "  header \"CoreFoo-Swift.h\"\n"
-                                     <<< "}\n").bytes)
+                #expect(
+                    contents
+                        == (OutputByteStream()
+                        <<< "framework module CoreFoo {\n"
+                        <<< "  header \"CoreFoo-Swift.h\"\n"
+                        <<< "}\n").bytes
+                )
             }
         }
     }
@@ -640,11 +709,13 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Foo.swift"),
                     TestFile("CoreFoo.h"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -652,31 +723,37 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "CODE_SIGN_IDENTITY": "",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "GCC_GENERATE_DEBUGGING_SYMBOLS": "NO",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                                "DEFINES_MODULE": "YES",
-                                                "SWIFT_VERSION": swiftVersion,
-                                                "SWIFT_PACKAGE_NAME": "FooPkg",
-                                                "SWIFT_EMIT_MODULE_INTERFACE": "YES",
-                                                "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "DEFINES_MODULE": "YES",
+                                "SWIFT_VERSION": swiftVersion,
+                                "SWIFT_PACKAGE_NAME": "FooPkg",
+                                "SWIFT_EMIT_MODULE_INTERFACE": "YES",
+                                "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Foo.swift",
+                            "Foo.swift"
                         ]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("CoreFoo.h", headerVisibility: .public),
+                            TestBuildFile("CoreFoo.h", headerVisibility: .public)
                         ]),
-                    ])
-            ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -732,7 +809,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         // Import the target's public module, while hiding the Swift generated header.
                         "-import-underlying-module", "-Xcc", "-ivfsoverlay", "-Xcc", "/tmp/Test/aProject/build/aProject.build/Debug/CoreFoo.build/unextended-module-overlay.yaml",
                         "-working-directory", "/tmp/Test/aProject",
-                        .anySequence])
+                        .anySequence,
+                    ])
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/aProject.build/Debug/CoreFoo.build/Objects-normal/\(results.runDestinationTargetArchitecture)/CoreFoo Swift Compilation Finished"),
                         .path("\(SRCROOT)/build/aProject.build/Debug/CoreFoo.build/Objects-normal/\(results.runDestinationTargetArchitecture)/Foo.o"),
@@ -786,7 +864,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         // Import the target's public module, while hiding the Swift generated header.
                         "-import-underlying-module", "-Xcc", "-ivfsoverlay", "-Xcc", "/tmp/Test/aProject/build/aProject.build/Debug/CoreFoo.build/unextended-module-overlay.yaml",
                         "-working-directory", "/tmp/Test/aProject",
-                        .anySequence])
+                        .anySequence,
+                    ])
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/aProject.build/Debug/CoreFoo.build/Objects-normal/\(results.runDestinationTargetArchitecture)/CoreFoo Swift Compilation Requirements Finished"),
                         .path("\(SRCROOT)/build/aProject.build/Debug/CoreFoo.build/Objects-normal/\(results.runDestinationTargetArchitecture)/CoreFoo.swiftmodule"),
@@ -826,11 +905,13 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Foo.swift"),
                     TestFile("CoreFoo.h"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -839,29 +920,35 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "GCC_GENERATE_DEBUGGING_SYMBOLS": "NO",
                         "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                                "DEFINES_MODULE": "YES",
-                                                "SWIFT_VERSION": swiftVersion,
-                                                "SWIFT_EMIT_MODULE_INTERFACE": "YES",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "DEFINES_MODULE": "YES",
+                                "SWIFT_VERSION": swiftVersion,
+                                "SWIFT_EMIT_MODULE_INTERFACE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Foo.swift",
+                            "Foo.swift"
                         ]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("CoreFoo.h", headerVisibility: .public),
+                            TestBuildFile("CoreFoo.h", headerVisibility: .public)
                         ]),
-                    ])
-            ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -896,7 +983,7 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         // Compilation mode arguments.
                         "-parse-as-library", "-c", "-j\(compilerParallelismLevel)",
 
-                            .anySequence,
+                        .anySequence,
                         "-incremental",
 
                         // The output file map.
@@ -925,7 +1012,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "-import-underlying-module", "-Xcc", "-ivfsoverlay", "-Xcc", "/tmp/Test/aProject/build/aProject.build/Debug/CoreFoo.build/unextended-module-overlay.yaml",
 
                         "-working-directory", "/tmp/Test/aProject",
-                        .anySequence])
+                        .anySequence,
+                    ])
 
                     task.checkInputs([
                         .path("\(SRCROOT)/Sources/Foo.swift"),
@@ -944,7 +1032,7 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         .namePattern(.suffix("copy-headers-completion")),
                         .namePattern(.prefix("target")),
                         .namePattern(.prefix("target-")),
-                        .name("WorkspaceHeaderMapVFSFilesWritten")
+                        .name("WorkspaceHeaderMapVFSFilesWritten"),
                     ])
 
                     task.checkOutputs([
@@ -953,7 +1041,6 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/build/aProject.build/Debug/CoreFoo.build/Objects-normal/\(results.runDestinationTargetArchitecture)/Foo.swiftconstvalues"),
                     ])
 
-
                     return task
                 }
 
@@ -980,7 +1067,7 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         // Compilation mode arguments.
                         "-parse-as-library", "-c", "-j\(compilerParallelismLevel)",
 
-                            .anySequence,
+                        .anySequence,
                         "-incremental",
 
                         // The output file map.
@@ -1009,7 +1096,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "-import-underlying-module", "-Xcc", "-ivfsoverlay", "-Xcc", "/tmp/Test/aProject/build/aProject.build/Debug/CoreFoo.build/unextended-module-overlay.yaml",
 
                         "-working-directory", "/tmp/Test/aProject",
-                        .anySequence])
+                        .anySequence,
+                    ])
 
                     task.checkInputs([
                         .path("\(SRCROOT)/Sources/Foo.swift"),
@@ -1027,7 +1115,7 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         .namePattern(.suffix("copy-headers-completion")),
                         .namePattern(.prefix("target")),
                         .namePattern(.prefix("target-")),
-                        .name("WorkspaceHeaderMapVFSFilesWritten")
+                        .name("WorkspaceHeaderMapVFSFilesWritten"),
                     ])
 
                     task.checkOutputs([
@@ -1042,7 +1130,6 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/build/aProject.build/Debug/CoreFoo.build/Objects-normal/\(results.runDestinationTargetArchitecture)/CoreFoo.swiftdoc"),
                     ])
 
-
                     return task
                 }
 
@@ -1051,7 +1138,7 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                     task.checkInputs([
                         .path("\(SRCROOT)/build/aProject.build/Debug/CoreFoo.build/Objects-normal/\(results.runDestinationTargetArchitecture)/CoreFoo-Swift.h"),
                         .namePattern(.and(.prefix("target"), .suffix("begin-compiling"))),
-                        .name("WorkspaceHeaderMapVFSFilesWritten")
+                        .name("WorkspaceHeaderMapVFSFilesWritten"),
                     ])
                     task.checkOutputs([
                         .path("/tmp/aProject.dst/Library/Frameworks/CoreFoo.framework/Versions/A/Headers/CoreFoo-Swift.h")
@@ -1162,9 +1249,9 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
             results.checkTasks(.matchRuleType("ExtractAppIntentsMetadata")) { _ in }
 
             // Ignore other install tasks.
-            results.checkTasks(.matchRuleType("SetMode")) { _ in  }
-            results.checkTasks(.matchRuleType("SetOwnerAndGroup")) { _ in  }
-            results.checkTasks(.matchRuleType("Strip")) { _ in  }
+            results.checkTasks(.matchRuleType("SetMode")) { _ in }
+            results.checkTasks(.matchRuleType("SetOwnerAndGroup")) { _ in }
+            results.checkTasks(.matchRuleType("Strip")) { _ in }
 
             // Check there are no other tasks.
             results.checkNoTask()
@@ -1181,10 +1268,12 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Foo.swift"),
-                ]),
+                    TestFile("Foo.swift")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -1194,24 +1283,30 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "GCC_GENERATE_DEBUGGING_SYMBOLS": "NO",
                         "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
                         "SWIFT_EXPLICIT_MODULES_OUTPUT_PATH": "/path/to/ExplicitModules",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                                "SWIFT_VERSION": swiftVersion,
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "SWIFT_VERSION": swiftVersion,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Foo.swift",
-                        ]),
-                    ])
-            ])
+                            "Foo.swift"
+                        ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
 
@@ -1220,7 +1315,7 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         try await fs.writeFileContents(swiftCompilerPath) { $0 <<< "binary" }
         let arena = ArenaInfo(derivedDataPath: Path("/path/to/DerivedData"), buildProductsPath: Path.root, buildIntermediatesPath: Path.root, pchPath: Path.root, indexRegularBuildProductsPath: nil, indexRegularBuildIntermediatesPath: nil, indexPCHPath: Path.root, indexDataStoreFolderPath: nil, indexEnableDataStore: false)
         await tester.checkBuild(BuildParameters(configuration: "Debug", arena: arena), runDestination: .macOS, fs: fs) { results in
-            results.checkTarget("CoreFoo")  { target in
+            results.checkTarget("CoreFoo") { target in
                 results.checkTask(.matchTarget(target), .matchRuleType("SwiftDriver Compilation")) { task in
                     task.checkCommandLineContains(["-module-cache-path", "/path/to/ExplicitModules"])
                     if LibSwiftDriver.supportsDriverFlag(spelled: "-clang-scanner-module-cache-path") {
@@ -1240,11 +1335,13 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Foo.swift"),
                     TestFile("Bar.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -1253,23 +1350,30 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "SWIFT_VERSION": swiftVersion,
                         "LIBTOOL": libtoolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase(["Foo.swift"]),
-                        TestFrameworksBuildPhase([TestBuildFile("libBar.a"),])
-                    ], dependencies: ["Bar"]),
+                        TestFrameworksBuildPhase([TestBuildFile("libBar.a")]),
+                    ],
+                    dependencies: ["Bar"]
+                ),
                 TestStandardTarget(
-                    "Bar", type: .staticLibrary,
+                    "Bar",
+                    type: .staticLibrary,
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Bar.swift",
-                        ]),
-                    ])
-            ])
+                            "Bar.swift"
+                        ])
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let fs = PseudoFS()
         try await fs.writeFileContents(swiftCompilerPath) { $0 <<< "binary" }
@@ -1317,11 +1421,13 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Foo.swift"),
                     TestFile("CoreFoo.h"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -1331,31 +1437,37 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "GCC_GENERATE_DEBUGGING_SYMBOLS": "NO",
                         "SWIFT_ALLOW_INSTALL_OBJC_HEADER": "YES",
                         "TAPI_EXEC": tapiToolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": sdkroot,
-                                                "DEFINES_MODULE": "YES",
-                                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                                "SWIFT_VERSION": swiftVersion,
-                                                "ARCHS": archs.joined(separator: " "),
-                                                "EXCLUDED_ARCHS": excludedArchs.joined(separator: " "),
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": sdkroot,
+                                "DEFINES_MODULE": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                                "ARCHS": archs.joined(separator: " "),
+                                "EXCLUDED_ARCHS": excludedArchs.joined(separator: " "),
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Foo.swift",
+                            "Foo.swift"
                         ]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("CoreFoo.h", headerVisibility: .public),
+                            TestBuildFile("CoreFoo.h", headerVisibility: .public)
                         ]),
-                    ])
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -1408,7 +1520,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         try await testMultipleArchs(
             runDestination: .anyiOSDevice,
             archs: ["arm64", "arm64e"],
-            targetTripleSuffix: "-apple-ios")
+            targetTripleSuffix: "-apple-ios"
+        )
     }
 
     @Test(.requireSDKs(.watchOS))
@@ -1416,17 +1529,20 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         try await testMultipleArchs(
             runDestination: .anywatchOSDevice,
             archs: ["armv7k"],
-            targetTripleSuffix: "-apple-watchos")
+            targetTripleSuffix: "-apple-watchos"
+        )
 
         try await testMultipleArchs(
             runDestination: .anywatchOSDevice,
             archs: ["arm64_32"],
-            targetTripleSuffix: "-apple-watchos")
+            targetTripleSuffix: "-apple-watchos"
+        )
 
         try await testMultipleArchs(
             runDestination: .anywatchOSDevice,
             archs: ["armv7k", "arm64_32"],
-            targetTripleSuffix: "-apple-watchos")
+            targetTripleSuffix: "-apple-watchos"
+        )
     }
 
     /// Check handling of Swift combined with explicit module map files.
@@ -1435,10 +1551,12 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Foo.swift"),
-                ]),
+                    TestFile("Foo.swift")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -1446,26 +1564,32 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "MODULEMAP_FILE": "Foo.modulemap",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                                "DEFINES_MODULE": "YES",
-                                                "SWIFT_VERSION": swiftVersion,
-                                                "TAPI_EXEC": tapiToolPath.str,
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "DEFINES_MODULE": "YES",
+                                "SWIFT_VERSION": swiftVersion,
+                                "TAPI_EXEC": tapiToolPath.str,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Foo.swift",
-                        ]),
-                    ])
-            ])
+                            "Foo.swift"
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot
 
@@ -1482,7 +1606,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
 
                     task.checkCommandLineContains([
                         // Import the target's public module, while hiding the Swift generated header.
-                        "-import-underlying-module", "-Xcc", "-ivfsoverlay", "-Xcc", "/tmp/Test/aProject/build/aProject.build/Debug/CoreFoo.build/unextended-module-overlay.yaml"])
+                        "-import-underlying-module", "-Xcc", "-ivfsoverlay", "-Xcc", "/tmp/Test/aProject/build/aProject.build/Debug/CoreFoo.build/unextended-module-overlay.yaml",
+                    ])
                 }
             }
 
@@ -1496,34 +1621,42 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("main.swift"),
-                ]),
+                    TestFile("main.swift")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "Exec", type: .commandLineTool,
+                    "Exec",
+                    type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                                "SWIFT_VERSION": swiftVersion,
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.swift",
-                        ]),
-                    ])
-            ])
+                            "main.swift"
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(runDestination: .macOS) { results in
@@ -1559,34 +1692,42 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("main.swift"),
-                ]),
+                    TestFile("main.swift")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "Exec", type: .commandLineTool,
+                    "Exec",
+                    type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                                "SWIFT_VERSION": swiftVersion,
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.swift",
-                        ]),
-                    ])
-            ])
+                            "main.swift"
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["SWIFT_ENABLE_INCREMENTAL_SCAN": "YES"]), runDestination: .macOS) { results in
@@ -1617,33 +1758,41 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("main.swift"),
-                ]),
+                    TestFile("main.swift")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "Exec", type: .commandLineTool,
+                    "Exec",
+                    type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SWIFT_EXEC": swiftCompilerPath.str
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.swift",
-                        ]),
-                    ])
-            ])
+                            "main.swift"
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["SWIFT_VERSION": "6.0"]), runDestination: .macOS) { results in
@@ -1698,34 +1847,42 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("main.swift"),
-                ]),
+                    TestFile("main.swift")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "Exec", type: .commandLineTool,
+                    "Exec",
+                    type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                                "SWIFT_VERSION": swiftVersion,
-                                                "SWIFT_INSTALL_MODULE": "NO",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                                "SWIFT_INSTALL_MODULE": "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.swift",
-                        ]),
-                    ])
-            ])
+                            "main.swift"
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         let fs = PseudoFS()
@@ -1754,36 +1911,44 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Foo.swift"),
-                ]),
+                    TestFile("Foo.swift")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "FooApp", type: .application,
+                    "FooApp",
+                    type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                                "SWIFT_OBJC_BRIDGING_HEADER": "swift-bridge-header.h",
-                                                "SWIFT_BRIDGING_HEADER_IS_INTERNAL": bridgingHeaderIsInternal,
-                                                "SWIFT_VERSION": swiftVersion,
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "SWIFT_OBJC_BRIDGING_HEADER": "swift-bridge-header.h",
+                                "SWIFT_BRIDGING_HEADER_IS_INTERNAL": bridgingHeaderIsInternal,
+                                "SWIFT_VERSION": swiftVersion,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Foo.swift",
-                        ]),
-                    ])
-            ])
+                            "Foo.swift"
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot
 
@@ -1801,7 +1966,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
 
                     let expectedFlag = isInternal ? "-internal-import-bridging-header" : "-import-objc-header"
                     task.checkCommandLineContains([
-                        expectedFlag, bridgeHeader.str])
+                        expectedFlag, bridgeHeader.str,
+                    ])
                     task.checkInputs(contain: [.path(bridgeHeader.str)])
                 }
             }
@@ -1817,35 +1983,43 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Foo.swift"),
-                ]),
+                    TestFile("Foo.swift")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "FooApp", type: .application,
+                    "FooApp",
+                    type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                                "SWIFT_OBJC_BRIDGING_HEADER": "../aProject/./swift-bridge-header.h",
-                                                "SWIFT_VERSION": swiftVersion,
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "SWIFT_OBJC_BRIDGING_HEADER": "../aProject/./swift-bridge-header.h",
+                                "SWIFT_VERSION": swiftVersion,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Foo.swift",
-                        ]),
-                    ])
-            ])
+                            "Foo.swift"
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot
 
@@ -1862,7 +2036,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                     task.checkRuleInfo(["SwiftDriver Compilation", "FooApp", "normal", results.runDestinationTargetArchitecture, "com.apple.xcode.tools.swift.compiler"])
 
                     task.checkCommandLineContains([
-                        "-import-objc-header", bridgeHeader.str])
+                        "-import-objc-header", bridgeHeader.str,
+                    ])
                 }
             }
 
@@ -1877,10 +2052,12 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("main.swift"),
-                ]),
+                    TestFile("main.swift")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -1890,7 +2067,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
                         "LIBTOOL": libtoolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestAggregateTarget(
@@ -1902,14 +2080,15 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "StaticFrameworkNoInstallHeader",
                         "DynamicFrameworkNoInstallModule",
                         "StaticFrameworkNoInstallModule",
-                    ]),
+                    ]
+                ),
                 TestStandardTarget(
                     "DynamicFramework",
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.swift",
-                        ]),
+                            "main.swift"
+                        ])
                     ]
                 ),
                 TestStandardTarget(
@@ -1917,67 +2096,80 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                     type: .staticFramework,
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.swift",
-                        ]),
+                            "main.swift"
+                        ])
                     ]
                 ),
                 TestStandardTarget(
                     "DynamicFrameworkNoInstallHeader",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SWIFT_INSTALL_OBJC_HEADER": "NO",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SWIFT_INSTALL_OBJC_HEADER": "NO"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.swift",
-                        ]),
+                            "main.swift"
+                        ])
                     ]
                 ),
                 TestStandardTarget(
                     "StaticFrameworkNoInstallHeader",
                     type: .staticFramework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SWIFT_INSTALL_OBJC_HEADER": "NO",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SWIFT_INSTALL_OBJC_HEADER": "NO"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.swift",
-                        ]),
+                            "main.swift"
+                        ])
                     ]
                 ),
                 TestStandardTarget(
                     "DynamicFrameworkNoInstallModule",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SWIFT_INSTALL_MODULE": "NO",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SWIFT_INSTALL_MODULE": "NO"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.swift",
-                        ]),
+                            "main.swift"
+                        ])
                     ]
                 ),
                 TestStandardTarget(
                     "StaticFrameworkNoInstallModule",
                     type: .staticFramework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SWIFT_INSTALL_MODULE": "NO",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SWIFT_INSTALL_MODULE": "NO"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.swift",
-                        ]),
+                            "main.swift"
+                        ])
                     ]
                 ),
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         let fs = PseudoFS()
@@ -1988,7 +2180,7 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
             results.checkTarget("DynamicFramework") { target in
                 results.checkTask(.matchTarget(target), .matchRuleType("SwiftMergeGeneratedHeaders")) { task in
                     task.checkOutputs([
-                        .path("/tmp/Test/aProject/build/Debug/DynamicFramework.framework/Versions/A/Headers/DynamicFramework-Swift.h"),
+                        .path("/tmp/Test/aProject/build/Debug/DynamicFramework.framework/Versions/A/Headers/DynamicFramework-Swift.h")
                     ])
                 }
 
@@ -2000,7 +2192,7 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
             results.checkTarget("StaticFramework") { target in
                 results.checkTask(.matchTarget(target), .matchRuleType("SwiftMergeGeneratedHeaders")) { task in
                     task.checkOutputs([
-                        .path("/tmp/Test/aProject/build/Debug/StaticFramework.framework/Versions/A/Headers/StaticFramework-Swift.h"),
+                        .path("/tmp/Test/aProject/build/Debug/StaticFramework.framework/Versions/A/Headers/StaticFramework-Swift.h")
                     ])
                 }
 
@@ -2014,7 +2206,7 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
             results.checkTarget("DynamicFrameworkNoInstallHeader") { target in
                 results.checkTask(.matchTarget(target), .matchRuleType("SwiftMergeGeneratedHeaders")) { task in
                     task.checkOutputs([
-                        .path("/tmp/Test/aProject/build/aProject.build/Debug/DynamicFrameworkNoInstallHeader.build/DerivedSources/DynamicFrameworkNoInstallHeader-Swift.h"),
+                        .path("/tmp/Test/aProject/build/aProject.build/Debug/DynamicFrameworkNoInstallHeader.build/DerivedSources/DynamicFrameworkNoInstallHeader-Swift.h")
                     ])
                 }
             }
@@ -2022,7 +2214,7 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
             results.checkTarget("StaticFrameworkNoInstallHeader") { target in
                 results.checkTask(.matchTarget(target), .matchRuleType("SwiftMergeGeneratedHeaders")) { task in
                     task.checkOutputs([
-                        .path("/tmp/Test/aProject/build/aProject.build/Debug/StaticFrameworkNoInstallHeader.build/DerivedSources/StaticFrameworkNoInstallHeader-Swift.h"),
+                        .path("/tmp/Test/aProject/build/aProject.build/Debug/StaticFrameworkNoInstallHeader.build/DerivedSources/StaticFrameworkNoInstallHeader-Swift.h")
                     ])
                 }
             }
@@ -2051,32 +2243,39 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "ProjectName",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("TestFile.swift"),
-                ]),
+                    TestFile("TestFile.swift")
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "TestTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "CODE_SIGNING_ALLOWED": "NO",
-                            "PRODUCT_NAME": "TestProduct",
-                            "ARCHS": "x86_64",
-                            "SWIFT_VERSION": swiftVersion,
-                            "SDKROOT": sdkRoot,
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_ENABLE_EMIT_CONST_VALUES": "YES",
-                            "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "CODE_SIGNING_ALLOWED": "NO",
+                                "PRODUCT_NAME": "TestProduct",
+                                "ARCHS": "x86_64",
+                                "SWIFT_VERSION": swiftVersion,
+                                "SDKROOT": sdkRoot,
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_ENABLE_EMIT_CONST_VALUES": "YES",
+                                "SWIFT_EMIT_CONST_VALUE_PROTOCOLS": "Foo Bar",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("TestFile.swift"),
-                        ]),
-                    ])
-            ])
+                            TestBuildFile("TestFile.swift")
+                        ])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -2098,7 +2297,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                     // Verify protocol list specification contents
                     results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/ProjectName.build/Debug/TestTarget.build/Objects-normal/x86_64/TestTarget_const_extract_protocols.json"])) { task, contents in
                         guard let plist = try? PropertyList.fromJSONData(contents),
-                              let array = plist.arrayValue else {
+                            let array = plist.arrayValue
+                        else {
                             Issue.record("could not convert output file map from JSON to plist array")
                             return
                         }
@@ -2110,7 +2310,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                 // Verify output file map contents
                 results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/ProjectName.build/Debug/TestTarget.build/Objects-normal/x86_64/TestTarget-OutputFileMap.json"])) { task, contents in
                     guard let plist = try? PropertyList.fromJSONData(contents),
-                          let dict = plist.dictValue else {
+                        let dict = plist.dictValue
+                    else {
                         Issue.record("could not convert output file map from JSON to plist dictionary")
                         return
                     }
@@ -2124,8 +2325,7 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         } else {
                             #expect(fileDict["const-values"] == nil)
                         }
-                    }
-                    else {
+                    } else {
                         Issue.record("output file map does not contain a dictionary for '\(filename).swift'")
                     }
 
@@ -2139,30 +2339,37 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "ProjectName",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("TestFile.swift"),
-                ]),
+                    TestFile("TestFile.swift")
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "TestTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "CODE_SIGNING_ALLOWED": "NO",
-                            "PRODUCT_NAME": "TestProduct",
-                            "ARCHS": "x86_64",
-                            "SWIFT_VERSION": swiftVersion,
-                            "SDKROOT": "macosx",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "CODE_SIGNING_ALLOWED": "NO",
+                                "PRODUCT_NAME": "TestProduct",
+                                "ARCHS": "x86_64",
+                                "SWIFT_VERSION": swiftVersion,
+                                "SDKROOT": "macosx",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("TestFile.swift"),
-                        ]),
-                    ])
-            ])
+                            TestBuildFile("TestFile.swift")
+                        ])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(runDestination: .macOS) { results in
@@ -2213,32 +2420,39 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "ProjectName",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("File2.swift"),
-                ]),
+                    TestFile("File2.swift")
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "TargetName",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "ProductName",
-                            "ARCHS": "x86_64",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": swiftVersion,
-                            "TAPI_EXEC": tapiToolPath.str,
-                            "SUPPORTS_TEXT_BASED_API": "YES",
-                            "SDKROOT": sdkRoot
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "ProductName",
+                                "ARCHS": "x86_64",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                                "TAPI_EXEC": tapiToolPath.str,
+                                "SUPPORTS_TEXT_BASED_API": "YES",
+                                "SDKROOT": sdkRoot,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("File2.swift"),
-                        ]),
-                    ])
-            ])
+                            TestBuildFile("File2.swift")
+                        ])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -2268,32 +2482,39 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "ProjectName",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("File1.m"),
                     TestFile("File2.swift"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "TargetName",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "ProductName",
-                            "ARCHS": "x86_64",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": swiftVersion,
-                            "TAPI_EXEC": tapiToolPath.str,
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "ProductName",
+                                "ARCHS": "x86_64",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                                "TAPI_EXEC": tapiToolPath.str,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("File1.m"),
                             TestBuildFile("File2.swift"),
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
         return try await TaskConstructionTester(getCore(), testProject)
     }
 
@@ -2335,18 +2556,23 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "Test",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("File1.swift"),
                     TestFile("File2.swift"),
                     TestFile("File3.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -2356,21 +2582,26 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         TestSourcesBuildPhase([TestBuildFile("File1.swift")]),
                         TestFrameworksBuildPhase([
                             TestBuildFile("libFirstLib.a"),
-                            TestBuildFile("libSecondLib.a")])
-                    ]),
+                            TestBuildFile("libSecondLib.a"),
+                        ]),
+                    ]
+                ),
                 TestStandardTarget(
                     "FirstLib",
                     type: .staticLibrary,
                     buildPhases: [
                         TestSourcesBuildPhase([TestBuildFile("File2.swift")])
-                    ]),
+                    ]
+                ),
                 TestStandardTarget(
                     "SecondLib",
                     type: .staticLibrary,
                     buildPhases: [
                         TestSourcesBuildPhase([TestBuildFile("File3.swift")])
-                    ]),
-            ])
+                    ]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(runDestination: .macOS) { results in
@@ -2392,34 +2623,42 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "Test",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("File1.swift"),
                     TestFile("File2.swift"),
                     TestFile("File3.swift"),
-                    TestFile("SwiftyJSON.swift")
-                ]),
+                    TestFile("SwiftyJSON.swift"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SDKROOT": "auto",
-                    "SDK_VARIANT": "auto",
-                    "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SDKROOT": "auto",
+                        "SDK_VARIANT": "auto",
+                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Executable",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "iphoneos",
-                            "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "iphoneos",
+                                "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([TestBuildFile("File1.swift")]),
@@ -2428,15 +2667,19 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                             TestBuildFile("libSecondLib.a"),
                         ]),
                     ],
-                    dependencies: ["WatchExecutable"]),
+                    dependencies: ["WatchExecutable"]
+                ),
                 TestStandardTarget(
                     "WatchExecutable",
                     type: .applicationExtension,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "watchos",
-                            "SUPPORTED_PLATFORMS": "watchos watchsimulator",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "watchos",
+                                "SUPPORTED_PLATFORMS": "watchos watchsimulator",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([TestBuildFile("File1.swift")]),
@@ -2444,20 +2687,24 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                             TestBuildFile("libFirstLib.a"),
                             TestBuildFile("libSecondLib.a"),
                         ]),
-                    ]),
+                    ]
+                ),
                 TestStandardTarget(
                     "FirstLib",
                     type: .staticLibrary,
                     buildPhases: [
                         TestSourcesBuildPhase([TestBuildFile("File2.swift")])
-                    ]),
+                    ]
+                ),
                 TestStandardTarget(
                     "SecondLib",
                     type: .staticLibrary,
                     buildPhases: [
                         TestSourcesBuildPhase([TestBuildFile("File3.swift")])
-                    ]),
-            ])
+                    ]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(BuildParameters(action: .build, configuration: "Debug"), runDestination: .iOSSimulator) { results in
@@ -2492,7 +2739,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                     TestFile("main.swift"),
                     TestFile("foo.swift"),
                     TestFile("bar.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -2507,16 +2755,20 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "USE_SWIFT_RESPONSE_FILE": "YES",
                         // remove in 51621328
                         "SWIFT_RESPONSE_FILE_PATH": "$(SWIFT_RESPONSE_FILE_PATH_$(variant)_$(arch))",
-                    ])],
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "VERSIONING_SYSTEM": "apple-generic",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "VERSIONING_SYSTEM": "apple-generic"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -2524,14 +2776,17 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                             "foo.swift",
                             "bar.swift",
                         ])
-                    ])
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
         // Check the debug build.
         try await tester.checkBuild(runDestination: .macOS) { results in
-            results.checkWriteAuxiliaryFileTask(.matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget.SwiftFileList"])) { task, contents in task.checkOutputs([.pathPattern(.suffix("Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget.SwiftFileList"))])
+            results.checkWriteAuxiliaryFileTask(.matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget.SwiftFileList"])) { task, contents in
+                task.checkOutputs([.pathPattern(.suffix("Objects-normal/\(results.runDestinationTargetArchitecture)/AppTarget.SwiftFileList"))])
 
                 #expect(contents.asString.components(separatedBy: .newlines).dropLast().sorted() == ["\(SRCROOT)/bar.swift", "\(SRCROOT)/foo.swift", "\(SRCROOT)/main.swift"])
             }
@@ -2584,7 +2839,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                     TestFile("main.swift"),
                     TestFile("foo.swift"),
                     TestFile("bar.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -2596,16 +2852,20 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "CURRENT_PROJECT_VERSION": "3.1",
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
-                    ])],
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "VERSIONING_SYSTEM": "apple-generic",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "VERSIONING_SYSTEM": "apple-generic"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -2613,8 +2873,10 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                             "foo.swift",
                             "bar.swift",
                         ])
-                    ])
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -2702,7 +2964,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
             "aProject",
             groupTree: TestGroup(
                 "SomeFiles",
-                children: [ TestFile("main.swift") ]),
+                children: [TestFile("main.swift")]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -2715,21 +2978,27 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
                         "SWIFT_INCLUDE_PATHS": "/tmp/some-dir",
-                    ])],
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "VERSIONING_SYSTEM": "apple-generic",
-                                               ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "VERSIONING_SYSTEM": "apple-generic"
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([ "main.swift" ])
-                    ])
-            ])
+                        TestSourcesBuildPhase(["main.swift"])
+                    ]
+                )
+            ]
+        )
 
         do {
             let tester = try await TaskConstructionTester(getCore(), testProject)
@@ -2768,7 +3037,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
             "aProject",
             groupTree: TestGroup(
                 "SomeFiles",
-                children: [ TestFile("main.swift") ]),
+                children: [TestFile("main.swift")]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -2782,21 +3052,27 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "SWIFT_VERSION": swiftVersion,
                         "SWIFT_RESPONSE_FILE_PATH": "",
                         "USE_SWIFT_RESPONSE_FILE": "YES",
-                    ])],
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "VERSIONING_SYSTEM": "apple-generic",
-                                               ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "VERSIONING_SYSTEM": "apple-generic"
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([ "main.swift" ])
-                    ])
-            ])
+                        TestSourcesBuildPhase(["main.swift"])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(runDestination: .macOS) { results in
             results.checkError("The path for Swift input file list cannot be empty. (in target 'AppTarget' from project 'aProject')")
@@ -2810,7 +3086,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
             "aProject",
             groupTree: TestGroup(
                 "SomeFiles",
-                children: [ TestFile("main.swift") ]),
+                children: [TestFile("main.swift")]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -2824,21 +3101,27 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "SWIFT_VERSION": swiftVersion,
                         "SWIFT_RESPONSE_FILE_PATH": "",
                         "USE_SWIFT_RESPONSE_FILE": "NO",
-                    ])],
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "VERSIONING_SYSTEM": "apple-generic",
-                                               ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "VERSIONING_SYSTEM": "apple-generic"
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([ "main.swift" ])
-                    ])
-            ])
+                        TestSourcesBuildPhase(["main.swift"])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(runDestination: .macOS) { results in
             results.checkNoDiagnostics()
@@ -2851,7 +3134,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
             "aProject",
             groupTree: TestGroup(
                 "SomeFiles",
-                children: [ TestFile("ma\nin.swift") ]),
+                children: [TestFile("ma\nin.swift")]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -2866,21 +3150,27 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "USE_SWIFT_RESPONSE_FILE": "YES",
                         // remove in 51621328
                         "SWIFT_RESPONSE_FILE_PATH": "$(SWIFT_RESPONSE_FILE_PATH_$(variant)_$(arch))",
-                    ])],
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "VERSIONING_SYSTEM": "apple-generic",
-                                               ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "VERSIONING_SYSTEM": "apple-generic"
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([ "ma\nin.swift" ])
-                    ])
-            ])
+                        TestSourcesBuildPhase(["ma\nin.swift"])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let srcroot = tester.workspace.projects[0].sourceRoot
         await tester.checkBuild(runDestination: .macOS) { results in
@@ -3016,24 +3306,30 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         TestFile("Source.m"),
                     ]
                 ),
-                buildConfigurations: [TestBuildConfiguration(
-                    "Debug",
-                    buildSettings: [
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ALWAYS_SEARCH_USER_PATHS": "false",
-                        "ARCHS": "arm64 arm64e",
-                        "SDKROOT": "iphoneos",
-                        "SWIFT_OBJC_INTERFACE_HEADER_NAME": "Target-Swift.h",
-                        "SWIFT_EXEC": swiftCompilerPath.str,
-                        "SWIFT_VERSION": swiftVersion,
-                    ]
-                )],
+                buildConfigurations: [
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ALWAYS_SEARCH_USER_PATHS": "false",
+                            "ARCHS": "arm64 arm64e",
+                            "SDKROOT": "iphoneos",
+                            "SWIFT_OBJC_INTERFACE_HEADER_NAME": "Target-Swift.h",
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": swiftVersion,
+                        ]
+                    )
+                ],
                 targets: [
-                    TestStandardTarget("Target", type: .framework, buildPhases: [
-                        TestHeadersBuildPhase([TestBuildFile("Header.h", headerVisibility: .public)]),
-                        TestSourcesBuildPhase(["Source.swift", "Source.m"]),
-                    ])
+                    TestStandardTarget(
+                        "Target",
+                        type: .framework,
+                        buildPhases: [
+                            TestHeadersBuildPhase([TestBuildFile("Header.h", headerVisibility: .public)]),
+                            TestSourcesBuildPhase(["Source.swift", "Source.m"]),
+                        ]
+                    )
                 ]
             )
 
@@ -3060,10 +3356,12 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Foo.swift"),
-                ]),
+                    TestFile("Foo.swift")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -3073,17 +3371,21 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
                         "TAPI_EXEC": tapiToolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("Foo.swift", additionalArgs: ["-customflag"])
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -3099,10 +3401,12 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Foo.swift"),
-                ]),
+                    TestFile("Foo.swift")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -3113,17 +3417,21 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "SWIFT_VERSION": swiftVersion,
                         "SWIFT_USE_INTEGRATED_DRIVER": "YES",
                         "TAPI_EXEC": tapiToolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("Foo.swift")
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -3139,10 +3447,12 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Foo.swift"),
-                ]),
+                    TestFile("Foo.swift")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -3154,17 +3464,21 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "SWIFT_USE_INTEGRATED_DRIVER": "NO",
                         "SWIFT_ENABLE_EXPLICIT_MODULES": "NO",
                         "_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES": "NO",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("Foo.swift")
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -3180,10 +3494,12 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("Foo.swift"),
-                ]),
+                    TestFile("Foo.swift")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -3195,17 +3511,21 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                         "TAPI_EXEC": tapiToolPath.str,
 
                         "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("Foo.swift")
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -3232,70 +3552,84 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS))
     func tBDOutput() async throws {
         let target = try await TestStandardTarget(
-            "Core", type: .framework,
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "SWIFT_USE_INTEGRATED_DRIVER": "YES",
-                    "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                ])],
+            "Core",
+            type: .framework,
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "SWIFT_USE_INTEGRATED_DRIVER": "YES",
+                        "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                    ]
+                )
+            ],
             buildPhases: [
                 TestSourcesBuildPhase(["foo.swift"])
-            ])
+            ]
+        )
         let testProject = TestProject(
             "aProject",
-            groupTree: TestGroup("Sources", children: [
-                TestFile("foo.swift")
-            ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
+            groupTree: TestGroup(
+                "Sources",
+                children: [
+                    TestFile("foo.swift")
                 ]
-            )],
-            targets: [target])
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
+            ],
+            targets: [target]
+        )
         let testWorkspace = TestWorkspace("Test", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
         // If eager compilation is on, the tbd file is an output of the compilation requirements (module emission) step
         await tester.checkBuild(runDestination: .macOS) { results in
             results.checkTask(.matchRuleType("SwiftDriver Compilation Requirements")) { moduleTask in
-                moduleTask.checkOutputs([.pathPattern(.suffix("Core Swift Compilation Requirements Finished")),
-                                         .pathPattern(.suffix("Swift-API.tbd")),
-                                         .pathPattern(.suffix("Core.swiftmodule")),
-                                         .pathPattern(.suffix("Core-linker-args.resp")),
-                                         .pathPattern(.suffix("Core.swiftsourceinfo")),
-                                         .pathPattern(.suffix("Core.abi.json")),
-                                         .pathPattern(.suffix("Core-Swift.h")),
-                                         .pathPattern(.suffix("Core.swiftdoc")),
+                moduleTask.checkOutputs([
+                    .pathPattern(.suffix("Core Swift Compilation Requirements Finished")),
+                    .pathPattern(.suffix("Swift-API.tbd")),
+                    .pathPattern(.suffix("Core.swiftmodule")),
+                    .pathPattern(.suffix("Core-linker-args.resp")),
+                    .pathPattern(.suffix("Core.swiftsourceinfo")),
+                    .pathPattern(.suffix("Core.abi.json")),
+                    .pathPattern(.suffix("Core-Swift.h")),
+                    .pathPattern(.suffix("Core.swiftdoc")),
                 ])
 
             }
             results.checkTask(.matchRuleType("SwiftDriver Compilation")) { compileTask in
-                compileTask.checkOutputs([.pathPattern(.suffix("Core Swift Compilation Finished")),
-                                          .pathPattern(.suffix("foo.o")),
-                                          .pathPattern(.suffix("foo.swiftconstvalues")),
+                compileTask.checkOutputs([
+                    .pathPattern(.suffix("Core Swift Compilation Finished")),
+                    .pathPattern(.suffix("foo.o")),
+                    .pathPattern(.suffix("foo.swiftconstvalues")),
                 ])
 
             }
         }
 
         // If eager compilation is off, everything is an output of CompileSwiftSources.
-        await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["SWIFT_USE_INTEGRATED_DRIVER": "NO","SWIFT_ENABLE_EXPLICIT_MODULES": "NO", "_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES": "NO",]), runDestination: .macOS) { results in
+        await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["SWIFT_USE_INTEGRATED_DRIVER": "NO", "SWIFT_ENABLE_EXPLICIT_MODULES": "NO", "_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES": "NO"]), runDestination: .macOS) { results in
             results.checkTask(.matchRuleType("CompileSwiftSources")) { moduleTask in
-                moduleTask.checkOutputs([.pathPattern(.suffix("foo.o")),
-                                         .pathPattern(.suffix("foo.swiftconstvalues")),
-                                         .pathPattern(.suffix("Swift-API.tbd")),
-                                         .pathPattern(.suffix("Core.swiftmodule")),
-                                         .pathPattern(.suffix("Core.swiftsourceinfo")),
-                                         .pathPattern(.suffix("Core.abi.json")),
-                                         .pathPattern(.suffix("Core-Swift.h")),
-                                         .pathPattern(.suffix("Core.swiftdoc")),
+                moduleTask.checkOutputs([
+                    .pathPattern(.suffix("foo.o")),
+                    .pathPattern(.suffix("foo.swiftconstvalues")),
+                    .pathPattern(.suffix("Swift-API.tbd")),
+                    .pathPattern(.suffix("Core.swiftmodule")),
+                    .pathPattern(.suffix("Core.swiftsourceinfo")),
+                    .pathPattern(.suffix("Core.abi.json")),
+                    .pathPattern(.suffix("Core-Swift.h")),
+                    .pathPattern(.suffix("Core.swiftdoc")),
                 ])
             }
 
@@ -3312,28 +3646,35 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                 "ProjectName",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("File1.swift"),
-                    ]),
+                        TestFile("File1.swift")
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "TargetName",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "ProductName",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SWIFT_VERSION": swiftVersion,
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "ProductName",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("File1.swift"),
-                            ]),
-                        ])
-                ])
+                                TestBuildFile("File1.swift")
+                            ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             let fs = PseudoFS()
@@ -3381,47 +3722,59 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                 "ProjectName",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("File1.swift"),
                         TestFile("File2.swift"),
-                    ]),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "AppWithoutRegex",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "ProductName",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SWIFT_VERSION": swiftVersion,
-                                "SWIFT_ENABLE_BARE_SLASH_REGEX": "NO",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "ProductName",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "SWIFT_ENABLE_BARE_SLASH_REGEX": "NO",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("File1.swift"),
-                            ]),
-                        ], dependencies: ["FrameworkWithRegex"]),
+                                TestBuildFile("File1.swift")
+                            ])
+                        ],
+                        dependencies: ["FrameworkWithRegex"]
+                    ),
                     TestStandardTarget(
                         "FrameworkWithRegex",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "ProductName",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SWIFT_VERSION": "5.0",
-                                "SWIFT_ENABLE_BARE_SLASH_REGEX": "YES",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "ProductName",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": "5.0",
+                                    "SWIFT_ENABLE_BARE_SLASH_REGEX": "YES",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("File2.swift"),
-                            ]),
-                        ])
-                ])
+                                TestBuildFile("File2.swift")
+                            ])
+                        ]
+                    ),
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             await tester.checkBuild(BuildParameters(action: .install, configuration: "Debug"), runDestination: .macOS) { results in
@@ -3448,82 +3801,102 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                 "ProjectName",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("File1.swift"),
                         TestFile("File2.swift"),
                         TestFile("File3.swift"),
                         TestFile("File4.swift"),
-                    ]),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "Default",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SWIFT_VERSION": "5.0",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": "5.0",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("File1.swift"),
-                            ]),
-                        ], dependencies: ["Minimal", "Targeted", "Complete"]),
+                                TestBuildFile("File1.swift")
+                            ])
+                        ],
+                        dependencies: ["Minimal", "Targeted", "Complete"]
+                    ),
                     TestStandardTarget(
                         "Minimal",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SWIFT_VERSION": "5.0",
-                                "SWIFT_STRICT_CONCURRENCY": "minimal",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": "5.0",
+                                    "SWIFT_STRICT_CONCURRENCY": "minimal",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("File2.swift"),
-                            ]),
-                        ]),
+                                TestBuildFile("File2.swift")
+                            ])
+                        ]
+                    ),
                     TestStandardTarget(
                         "Targeted",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SWIFT_VERSION": "5.0",
-                                "SWIFT_STRICT_CONCURRENCY": "targeted",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": "5.0",
+                                    "SWIFT_STRICT_CONCURRENCY": "targeted",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("File3.swift"),
-                            ]),
-                        ]),
+                                TestBuildFile("File3.swift")
+                            ])
+                        ]
+                    ),
                     TestStandardTarget(
                         "Complete",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SWIFT_VERSION": "5.0",
-                                "SWIFT_STRICT_CONCURRENCY": "complete",
-                            ]),
-                        ],
-                        buildPhases: [
-                            TestSourcesBuildPhase([
-                                TestBuildFile("File4.swift"),
-                            ]),
-                        ]),
-                ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": "5.0",
+                                    "SWIFT_STRICT_CONCURRENCY": "complete",
+                                ]
+                            )
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase([
+                                TestBuildFile("File4.swift")
+                            ])
+                        ]
+                    ),
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             await tester.checkBuild(BuildParameters(action: .install, configuration: "Debug"), runDestination: .macOS) { results in
@@ -3561,64 +3934,80 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                 "ProjectName",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("File1.swift"),
                         TestFile("File2.swift"),
                         TestFile("File3.swift"),
-                    ]),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "Default",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SWIFT_VERSION": "5.0",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": "5.0",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("File1.swift"),
-                            ]),
-                        ], dependencies: ["Nonisolated", "MainActor"]),
+                                TestBuildFile("File1.swift")
+                            ])
+                        ],
+                        dependencies: ["Nonisolated", "MainActor"]
+                    ),
                     TestStandardTarget(
                         "Nonisolated",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SWIFT_VERSION": "5.0",
-                                "SWIFT_DEFAULT_ACTOR_ISOLATION": "nonisolated",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": "5.0",
+                                    "SWIFT_DEFAULT_ACTOR_ISOLATION": "nonisolated",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("File2.swift"),
-                            ]),
-                        ]),
+                                TestBuildFile("File2.swift")
+                            ])
+                        ]
+                    ),
                     TestStandardTarget(
                         "MainActor",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SWIFT_VERSION": "5.0",
-                                "SWIFT_DEFAULT_ACTOR_ISOLATION": "MainActor",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": "5.0",
+                                    "SWIFT_DEFAULT_ACTOR_ISOLATION": "MainActor",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("File3.swift"),
-                            ]),
-                        ]),
-                ])
+                                TestBuildFile("File3.swift")
+                            ])
+                        ]
+                    ),
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             await tester.checkBuild(BuildParameters(action: .install, configuration: "Debug"), runDestination: .macOS) { results in
@@ -3645,42 +4034,56 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS))
     func libraryLevel() async throws {
         if try await !swiftFeatures.has(.libraryLevel) {
-            try await checkLibraryLevelForConfig(targetType: .framework,
-                                                 buildSettings: ["SWIFT_LIBRARY_LEVEL" : "api"]) { task in
+            try await checkLibraryLevelForConfig(
+                targetType: .framework,
+                buildSettings: ["SWIFT_LIBRARY_LEVEL": "api"]
+            ) { task in
                 task.checkCommandLineDoesNotContain("-library-level")
             }
             return
         }
 
         // Explicit library-level build setting.
-        try await checkLibraryLevelForConfig(targetType: .framework,
-                                             buildSettings: ["SWIFT_LIBRARY_LEVEL" : "api"]) { task in
+        try await checkLibraryLevelForConfig(
+            targetType: .framework,
+            buildSettings: ["SWIFT_LIBRARY_LEVEL": "api"]
+        ) { task in
             task.checkCommandLineContains(["-library-level", "api"])
         }
 
         // Infer "api" from public install path.
-        try await checkLibraryLevelForConfig(targetType: .framework,
-                                             buildSettings: ["INSTALL_PATH" : "/System/Library/Frameworks/MyFramework"]) { task in
+        try await checkLibraryLevelForConfig(
+            targetType: .framework,
+            buildSettings: ["INSTALL_PATH": "/System/Library/Frameworks/MyFramework"]
+        ) { task in
             task.checkCommandLineContains(["-library-level", "api"])
         }
-        try await checkLibraryLevelForConfig(targetType: .framework,
-                                             buildSettings: ["INSTALL_PATH" : "/System/Library/SubFrameworks/MyFramework"]) { task in
+        try await checkLibraryLevelForConfig(
+            targetType: .framework,
+            buildSettings: ["INSTALL_PATH": "/System/Library/SubFrameworks/MyFramework"]
+        ) { task in
             task.checkCommandLineContains(["-library-level", "api"])
         }
 
         // Don't infer library-level from an unknown install path.
-        try await checkLibraryLevelForConfig(targetType: .framework,
-                                             buildSettings: [:]) { task in
+        try await checkLibraryLevelForConfig(
+            targetType: .framework,
+            buildSettings: [:]
+        ) { task in
             task.checkCommandLineDoesNotContain("-library-level")
         }
-        try await checkLibraryLevelForConfig(targetType: .framework,
-                                             buildSettings: ["INSTALL_PATH" : "/SomeOtherApp/MyFramework"]) { task in
+        try await checkLibraryLevelForConfig(
+            targetType: .framework,
+            buildSettings: ["INSTALL_PATH": "/SomeOtherApp/MyFramework"]
+        ) { task in
             task.checkCommandLineDoesNotContain("-library-level")
         }
 
         // Don't infer library-level for a non-framework.
-        try await checkLibraryLevelForConfig(targetType: .application,
-                                             buildSettings: ["INSTALL_PATH" : "/System/Library/Frameworks/MyFramework"]) { task in
+        try await checkLibraryLevelForConfig(
+            targetType: .application,
+            buildSettings: ["INSTALL_PATH": "/System/Library/Frameworks/MyFramework"]
+        ) { task in
             task.checkCommandLineDoesNotContain("-library-level")
         }
     }
@@ -3693,29 +4096,36 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                 "ProjectName",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("File1.swift"),
                         TestFile("File2.swift"),
-                    ]),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "Tool",
                         type: .commandLineTool,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "Tool",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SWIFT_VERSION": swiftVersion,
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "Tool",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
                                 TestBuildFile("File1.swift"),
                                 TestBuildFile("File2.swift"),
-                            ]),
-                        ]),
-                ])
+                            ])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             await tester.checkBuild(BuildParameters(action: .install, configuration: "Debug"), runDestination: .host) { results in
@@ -3735,37 +4145,46 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         }
     }
 
-    private func checkLibraryLevelForConfig(targetType: TestStandardTarget.TargetType,
-                                            buildSettings: [String:String],
-                                            body: (any PlannedTask) -> Void) async throws {
+    private func checkLibraryLevelForConfig(
+        targetType: TestStandardTarget.TargetType,
+        buildSettings: [String: String],
+        body: (any PlannedTask) -> Void
+    ) async throws {
         try await withTemporaryDirectory { tmpDir in
             let srcRoot = tmpDir.join("srcroot")
             let testProject = try await TestProject(
                 "ProjectName",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("File1.swift"),
-                    ]),
+                        TestFile("File1.swift")
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "TargetName",
                         type: targetType,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "ProductName",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SWIFT_VERSION": swiftVersion,
-                            ].addingContents(of: buildSettings)),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "ProductName",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": swiftVersion,
+                                ].addingContents(of: buildSettings)
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("File1.swift"),
-                            ]),
-                        ])
-                ])
+                                TestBuildFile("File1.swift")
+                            ])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             await tester.checkBuild(BuildParameters(action: .install, configuration: "Debug"), runDestination: .macOS) { results in
@@ -3784,31 +4203,38 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                 "ProjectName",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("File1.swift"),
-                    ]),
+                        TestFile("File1.swift")
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "TargetName",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "ProductName",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SWIFT_VERSION": swiftVersion,
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "ProductName",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("File1.swift"),
-                            ]),
-                        ])
-                ])
+                                TestBuildFile("File1.swift")
+                            ])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
-            await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["SWIFT_VALIDATE_CLANG_MODULES_ONCE_PER_BUILD_SESSION":"YES"]), runDestination: .macOS) { results in
+            await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["SWIFT_VALIDATE_CLANG_MODULES_ONCE_PER_BUILD_SESSION": "YES"]), runDestination: .macOS) { results in
                 results.checkTarget("TargetName") { target in
                     results.checkTask(.matchTarget(target), .matchRuleType("SwiftDriver Compilation")) { task in
                         task.checkCommandLineContains(["-validate-clang-modules-once", "-clang-build-session-file"])
@@ -3816,7 +4242,7 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                 }
             }
 
-            await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["SWIFT_VALIDATE_CLANG_MODULES_ONCE_PER_BUILD_SESSION":"NO"]), runDestination: .macOS) { results in
+            await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["SWIFT_VALIDATE_CLANG_MODULES_ONCE_PER_BUILD_SESSION": "NO"]), runDestination: .macOS) { results in
                 results.checkTarget("TargetName") { target in
                     results.checkTask(.matchTarget(target), .matchRuleType("SwiftDriver Compilation")) { task in
                         task.checkCommandLineDoesNotContain("-validate-clang-modules-once")
@@ -3835,28 +4261,35 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                 "ProjectName",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("File1.swift"),
-                    ]),
+                        TestFile("File1.swift")
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "TargetName",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "ProductName",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SWIFT_VERSION": swiftVersion,
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "ProductName",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("File1.swift"),
-                            ]),
-                        ])
-                ])
+                                TestBuildFile("File1.swift")
+                            ])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             await tester.checkBuild(runDestination: .macOS) { results in
@@ -3879,36 +4312,43 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         }
     }
 
-        @Test(.requireSDKs(.macOS))
-        func workingDirectoryOverride() async throws {
+    @Test(.requireSDKs(.macOS))
+    func workingDirectoryOverride() async throws {
         try await withTemporaryDirectory { tmpDir in
             let srcRoot = tmpDir.join("srcroot")
             let testProject = try await TestProject(
                 "ProjectName",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("File1.swift"),
-                    ]),
+                        TestFile("File1.swift")
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "TargetName",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "ProductName",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SWIFT_VERSION": swiftVersion,
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "ProductName",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("File1.swift"),
-                            ]),
-                        ])
-                ])
+                                TestBuildFile("File1.swift")
+                            ])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             await tester.checkBuild(runDestination: .macOS) { results in
@@ -3933,37 +4373,46 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
 
     @Test(.requireSDKs(.macOS))
     func userModuleVersion() async throws {
-        func checkUserModuleVersionForConfig(targetType: TestStandardTarget.TargetType,
-                                             buildSettings: [String:String],
-                                             body: (any PlannedTask) -> Void) async throws {
+        func checkUserModuleVersionForConfig(
+            targetType: TestStandardTarget.TargetType,
+            buildSettings: [String: String],
+            body: (any PlannedTask) -> Void
+        ) async throws {
             try await withTemporaryDirectory { tmpDir in
                 let srcRoot = tmpDir.join("srcroot")
                 let testProject = try await TestProject(
                     "ProjectName",
                     sourceRoot: srcRoot,
                     groupTree: TestGroup(
-                        "SomeFiles", path: "Sources",
+                        "SomeFiles",
+                        path: "Sources",
                         children: [
-                            TestFile("File1.swift"),
-                        ]),
+                            TestFile("File1.swift")
+                        ]
+                    ),
                     targets: [
                         TestStandardTarget(
                             "TargetName",
                             type: targetType,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: [
-                                    "GENERATE_INFOPLIST_FILE": "YES",
-                                    "PRODUCT_NAME": "ProductName",
-                                    "SWIFT_EXEC": swiftCompilerPath.str,
-                                    "SWIFT_VERSION": swiftVersion,
-                                ].addingContents(of: buildSettings)),
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "GENERATE_INFOPLIST_FILE": "YES",
+                                        "PRODUCT_NAME": "ProductName",
+                                        "SWIFT_EXEC": swiftCompilerPath.str,
+                                        "SWIFT_VERSION": swiftVersion,
+                                    ].addingContents(of: buildSettings)
+                                )
                             ],
                             buildPhases: [
                                 TestSourcesBuildPhase([
-                                    TestBuildFile("File1.swift"),
-                                ]),
-                            ])
-                    ])
+                                    TestBuildFile("File1.swift")
+                                ])
+                            ]
+                        )
+                    ]
+                )
 
                 let tester = try await TaskConstructionTester(getCore(), testProject)
                 await tester.checkBuild(BuildParameters(action: .install, configuration: "Debug"), runDestination: .macOS) { results in
@@ -3974,24 +4423,34 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
             }
         }
 
-        try await checkUserModuleVersionForConfig(targetType: .framework,
-                                                  buildSettings: [:]) { task in
+        try await checkUserModuleVersionForConfig(
+            targetType: .framework,
+            buildSettings: [:]
+        ) { task in
             task.checkCommandLineDoesNotContain("-user-module-version")
         }
 
-        try await checkUserModuleVersionForConfig(targetType: .framework,
-                                                  buildSettings: ["SWIFT_USER_MODULE_VERSION": ""]) { task in
+        try await checkUserModuleVersionForConfig(
+            targetType: .framework,
+            buildSettings: ["SWIFT_USER_MODULE_VERSION": ""]
+        ) { task in
             task.checkCommandLineDoesNotContain("-user-module-version")
         }
 
-        try await checkUserModuleVersionForConfig(targetType: .framework,
-                                                  buildSettings: ["SWIFT_USER_MODULE_VERSION": "22"]) { task in
+        try await checkUserModuleVersionForConfig(
+            targetType: .framework,
+            buildSettings: ["SWIFT_USER_MODULE_VERSION": "22"]
+        ) { task in
             task.checkCommandLineContains(["-user-module-version", "22"])
         }
 
-        try await checkUserModuleVersionForConfig(targetType: .framework,
-                                                  buildSettings: ["SWIFT_USER_MODULE_VERSION": "22",
-                                                                  "OTHER_SWIFT_FLAGS": "-user-module-version 42"]) { task in
+        try await checkUserModuleVersionForConfig(
+            targetType: .framework,
+            buildSettings: [
+                "SWIFT_USER_MODULE_VERSION": "22",
+                "OTHER_SWIFT_FLAGS": "-user-module-version 42",
+            ]
+        ) { task in
             task.checkCommandLineContains(["-user-module-version", "42", "-user-module-version", "22"])
         }
     }
@@ -3999,8 +4458,11 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS))
     func swiftTakesCxxFlagsIfCxxInteropEnabled() async throws {
 
-        func setupInteropTest(_ tmpDir: Path, enableInterop: Bool,
-                              cxxLangStandard: String = "gnu++20") async throws -> TaskConstructionTester {
+        func setupInteropTest(
+            _ tmpDir: Path,
+            enableInterop: Bool,
+            cxxLangStandard: String = "gnu++20"
+        ) async throws -> TaskConstructionTester {
             let testProject = try await TestProject(
                 "TestProject",
                 sourceRoot: tmpDir,
@@ -4008,26 +4470,32 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift"),
-                        TestFile("source.cpp")
-                    ]),
+                        TestFile("source.cpp"),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
-                        "testFramework", type: .framework,
+                        "testFramework",
+                        type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SWIFT_VERSION": swiftVersion,
-                                "SWIFT_OBJC_INTEROP_MODE": enableInterop ? "objcxx" : "objc",
-                                "CLANG_CXX_LANGUAGE_STANDARD": cxxLangStandard
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "SWIFT_OBJC_INTEROP_MODE": enableInterop ? "objcxx" : "objc",
+                                    "CLANG_CXX_LANGUAGE_STANDARD": cxxLangStandard,
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["source.swift", "source.cpp"])
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
             return tester
         }
@@ -4076,8 +4544,10 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS))
     func enableHardeningInSwift() async throws {
 
-        func setupHardeningTest(_ tmpDir: Path,
-                              hardeningMode: String) async throws -> TaskConstructionTester {
+        func setupHardeningTest(
+            _ tmpDir: Path,
+            hardeningMode: String
+        ) async throws -> TaskConstructionTester {
             let testProject = try await TestProject(
                 "TestProject",
                 sourceRoot: tmpDir,
@@ -4085,25 +4555,31 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("source.swift"),
-                        TestFile("source.cpp")
-                    ]),
+                        TestFile("source.cpp"),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
-                        "testFramework", type: .framework,
+                        "testFramework",
+                        type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SWIFT_VERSION": swiftVersion,
-                                "CLANG_CXX_STANDARD_LIBRARY_HARDENING": hardeningMode
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "CLANG_CXX_STANDARD_LIBRARY_HARDENING": hardeningMode,
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["source.swift", "source.cpp"])
                         ]
                     )
-                ])
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
             return tester
         }
@@ -4175,20 +4651,25 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "Test",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("File1.swift"),
                     TestFile("File2.c"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "LIBTOOL": libtoolPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "LIBTOOL": libtoolPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -4196,20 +4677,27 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                     type: .framework,
                     buildPhases: [
                         TestSourcesBuildPhase([TestBuildFile("File2.c")]),
-                        TestFrameworksBuildPhase(["libStaticLib.a"])
-                    ], dependencies: ["StaticLib"]),
+                        TestFrameworksBuildPhase(["libStaticLib.a"]),
+                    ],
+                    dependencies: ["StaticLib"]
+                ),
                 TestStandardTarget(
                     "StaticLib",
                     type: .staticLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SWIFT_OBJC_INTEROP_MODE": "objcxx"
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SWIFT_OBJC_INTEROP_MODE": "objcxx"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([TestBuildFile("File1.swift")])
-                    ]),
-            ])
+                    ]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(runDestination: .macOS) { results in
@@ -4231,26 +4719,32 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("File1.swift"),
-                    ]),
+                        TestFile("File1.swift")
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "TargetName",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "SWIFT_UPCOMING_FEATURE_CONCISE_MAGIC_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "CODE_SIGN_IDENTITY": "",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SWIFT_UPCOMING_FEATURE_CONCISE_MAGIC_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "CODE_SIGN_IDENTITY": "",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("File1.swift"),
-                            ]),
-                        ])
-                ])
+                                TestBuildFile("File1.swift")
+                            ])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["SWIFT_VERSION": "5.0"]), runDestination: .macOS) { results in
@@ -4282,26 +4776,32 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("File1.swift"),
-                    ]),
+                        TestFile("File1.swift")
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         targetName,
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "CODE_SIGN_IDENTITY": "",
-                                "SWIFT_VERSION": swiftVersion,
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "CODE_SIGN_IDENTITY": "",
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("File1.swift"),
-                            ]),
-                        ])
-                ])
+                                TestBuildFile("File1.swift")
+                            ])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             await tester.checkBuild(
@@ -4326,7 +4826,6 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                 }
             }
 
-
         }
     }
 
@@ -4339,26 +4838,32 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("File1.swift"),
-                    ]),
+                        TestFile("File1.swift")
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "TargetName",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "CODE_SIGN_IDENTITY": "",
-                                "SWIFT_VERSION": swiftVersion,
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "CODE_SIGN_IDENTITY": "",
+                                    "SWIFT_VERSION": swiftVersion,
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("File1.swift"),
-                            ]),
-                        ])
-                ])
+                                TestBuildFile("File1.swift")
+                            ])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["SWIFT_ENABLE_LAYOUT_STRING_VALUE_WITNESSES": "NO"]), runDestination: .macOS) { results in
@@ -4387,38 +4892,46 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
     @Test(.requireSDKs(.host))
     func nonConformantPathsCauseDiagnostics() async throws {
         let destination: RunDestinationInfo = .host
-        let testFilename = (destination == .windows) ? "main\t\n.swift": "main\u{0}.swift"
+        let testFilename = (destination == .windows) ? "main\t\n.swift" : "main\u{0}.swift"
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile(testFilename),
-                ]),
+                    TestFile(testFilename)
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "Exec", type: .commandLineTool,
+                    "Exec",
+                    type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                                "SWIFT_VERSION": swiftVersion,
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile(testFilename),
-                        ]),
-                    ])
-            ])
+                            TestBuildFile(testFilename)
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         await tester.checkBuild(runDestination: .host) { results in
             results.checkError(.regex(#/Input .* is non-conformant to path conventions on this platform/#))
@@ -4436,26 +4949,32 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("File1.swift"),
-                    ]),
+                        TestFile("File1.swift")
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "TargetName",
                         type: .dynamicLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "SWIFT_WARNINGS_AS_WARNINGS_GROUPS": "Unsafe DeprecatedDeclaration",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SDKROOT": "$(HOST_PLATFORM)",
-                                "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SWIFT_WARNINGS_AS_WARNINGS_GROUPS": "Unsafe DeprecatedDeclaration",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SDKROOT": "$(HOST_PLATFORM)",
+                                    "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("File1.swift"),
-                            ]),
-                        ])
-                ])
+                                TestBuildFile("File1.swift")
+                            ])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -4464,7 +4983,7 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                     results.checkTask(.matchTarget(target), .matchRuleType("SwiftDriver Compilation")) { task in
                         task.checkCommandLineContains([
                             "-Wwarning", "Unsafe",
-                            "-Wwarning", "DeprecatedDeclaration"
+                            "-Wwarning", "DeprecatedDeclaration",
                         ])
                     }
                 }
@@ -4481,26 +5000,32 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("File1.swift"),
-                    ]),
+                        TestFile("File1.swift")
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "TargetName",
                         type: .dynamicLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "SWIFT_WARNINGS_AS_ERRORS_GROUPS": "UnknownWarningGroup PreconcurrencyImport",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SDKROOT": "$(HOST_PLATFORM)",
-                                "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SWIFT_WARNINGS_AS_ERRORS_GROUPS": "UnknownWarningGroup PreconcurrencyImport",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SDKROOT": "$(HOST_PLATFORM)",
+                                    "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("File1.swift"),
-                            ]),
-                        ])
-                ])
+                                TestBuildFile("File1.swift")
+                            ])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -4509,7 +5034,7 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                     results.checkTask(.matchTarget(target), .matchRuleType("SwiftDriver Compilation")) { task in
                         task.checkCommandLineContains([
                             "-Werror", "UnknownWarningGroup",
-                            "-Werror","PreconcurrencyImport"
+                            "-Werror", "PreconcurrencyImport",
                         ])
                     }
                 }
@@ -4527,7 +5052,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("File1.swift")
-                    ]),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "Test",
@@ -4541,15 +5067,16 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                                     "COMPILER_INDEX_STORE_ENABLE": "YES",
                                     "INDEX_DATA_STORE_DIR": tmpDir.join("index").str,
                                     "INDEX_STORE_COMPRESS": "YES",
-                                    "INDEX_STORE_ONLY_PROJECT_FILES": "YES"
+                                    "INDEX_STORE_ONLY_PROJECT_FILES": "YES",
                                 ]
-                            ),
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["File1.swift"]),
+                            TestSourcesBuildPhase(["File1.swift"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
@@ -4583,7 +5110,8 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("File1.swift")
-                    ]),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "Test",
@@ -4597,15 +5125,16 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
                                     "COMPILER_INDEX_STORE_ENABLE": "NO",
                                     "INDEX_DATA_STORE_DIR": tmpDir.join("index").str,
                                     "INDEX_STORE_COMPRESS": "YES",
-                                    "INDEX_STORE_ONLY_PROJECT_FILES": "YES"
+                                    "INDEX_STORE_ONLY_PROJECT_FILES": "YES",
                                 ]
-                            ),
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["File1.swift"]),
+                            TestSourcesBuildPhase(["File1.swift"])
                         ]
                     )
-                ])
+                ]
+            )
 
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
diff --git a/Tests/SWBTaskConstructionTests/TaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/TaskConstructionTests.swift
index 244c4949..0b3e8759 100644
--- a/Tests/SWBTaskConstructionTests/TaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/TaskConstructionTests.swift
@@ -33,7 +33,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("SourceFile.m"),
                         // See EXCLUDED/INCLUDED patterns for Debug config.
@@ -73,7 +74,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         TestFile("Stuff.dat"),
                         TestFile("Script-Input-File.txt"),
                         TestFile("AlternatePermissions.txt"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration(
                         "Debug",
@@ -89,31 +91,41 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             "GCC_PREFIX_HEADER": "Sources/Prefix.pch",
                             "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
                             "CLANG_ENABLE_OBJC_ARC": "YES",
-                        ]),
-                    TestBuildConfiguration("Release", buildSettings: [
-                        "CODE_SIGN_IDENTITY": "-",
-                        "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ALTERNATE_OWNER": "fooOwner",
-                        "ALTERNATE_GROUP": "",
-                        "ALTERNATE_MODE": "",
-                        "GENERATE_PRELINK_OBJECT_FILE": "YES",
-                    ]),
+                        ]
+                    ),
+                    TestBuildConfiguration(
+                        "Release",
+                        buildSettings: [
+                            "CODE_SIGN_IDENTITY": "-",
+                            "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ALTERNATE_OWNER": "fooOwner",
+                            "ALTERNATE_GROUP": "",
+                            "ALTERNATE_MODE": "",
+                            "GENERATE_PRELINK_OBJECT_FILE": "YES",
+                        ]
+                    ),
                 ],
                 targets: [
                     TestStandardTarget(
                         "AppTarget",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "INFOPLIST_FILE": "Sources/Info.plist",
-                                "GENERATE_PKGINFO_FILE": "YES",
-                            ]),
-                            TestBuildConfiguration("Release", buildSettings: [
-                                "INFOPLIST_FILE": "Sources/Info.plist",
-                                "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
-                                "ALTERNATE_PERMISSIONS_FILES": "AlternatePermissions.txt",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "INFOPLIST_FILE": "Sources/Info.plist",
+                                    "GENERATE_PKGINFO_FILE": "YES",
+                                ]
+                            ),
+                            TestBuildConfiguration(
+                                "Release",
+                                buildSettings: [
+                                    "INFOPLIST_FILE": "Sources/Info.plist",
+                                    "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
+                                    "ALTERNATE_PERMISSIONS_FILES": "AlternatePermissions.txt",
+                                ]
+                            ),
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
@@ -123,21 +135,33 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                                 "NonUnique.m",
                                 "NonUnique.mm",
                                 TestBuildFile("Lex.l", additionalArgs: ["-LEXFLAG"]),
-                                TestBuildFile("Yacc.y",additionalArgs: ["-YACCFLAG"]),
+                                TestBuildFile("Yacc.y", additionalArgs: ["-YACCFLAG"]),
                                 "Custom.fake-lang",
                                 TestBuildFile("en.lproj/Standard.fake-lang", additionalArgs: ["-CoolStuff", "with a space!", "$(SRCROOT)"]),
                                 TestBuildFile("SourceFile_MRR.m", additionalArgs: ["-fno-objc-arc"]),
                             ]),
-                            TestHeadersBuildPhase([TestBuildFile("HeaderFile.h", headerVisibility: .public),
-                                                   TestBuildFile("HeaderFile.fake-lang-header", headerVisibility: .public)]),
+                            TestHeadersBuildPhase([
+                                TestBuildFile("HeaderFile.h", headerVisibility: .public),
+                                TestBuildFile("HeaderFile.fake-lang-header", headerVisibility: .public),
+                            ]),
                             TestCopyFilesBuildPhase(["FileToCopy.txt", "PlistFileToCopy.plist"], destinationSubfolder: .frameworks, onlyForDeployment: false),
                             TestCopyFilesBuildPhase(["FileToCopyOnlyDeploy.txt", TestBuildFile("FWToCopy.framework", codeSignOnCopy: true), TestBuildFile("libdynamic.dylib", codeSignOnCopy: true)], destinationSubfolder: .frameworks),
                             TestResourcesBuildPhase(["StringsResource.strings", "SingleResImage.png", "SingleResTiffImage.tiff", "Image@2x.png", "Image.png", "MyIcons.iconset"]),
-                            TestShellScriptBuildPhase(name: "Run Script", shellPath: "/bin/super-fancy-shell $(TARGET_NAME)", originalObjectID: "Foo With Spaces", contents: "echo \"Running script\"\nexit 0",
-                                                      inputs: ["Foo/../Sources/Script-Input-File.txt", "$(EXPANDS_TO_EMPTY)"],
-                                                      dependencyInfo: .makefile(.string("$(DERIVED_FILES_DIR)/super-fancy-shell.d")), alwaysOutOfDate: true),
-                            TestShellScriptBuildPhase(name: "Run Script", originalObjectID: "ScriptWithOutput", contents: "echo \"Running script\"\nexit 0",
-                                                      outputs: ["$(TARGET_TEMP_DIR)/Script-Output-File.txt"]),
+                            TestShellScriptBuildPhase(
+                                name: "Run Script",
+                                shellPath: "/bin/super-fancy-shell $(TARGET_NAME)",
+                                originalObjectID: "Foo With Spaces",
+                                contents: "echo \"Running script\"\nexit 0",
+                                inputs: ["Foo/../Sources/Script-Input-File.txt", "$(EXPANDS_TO_EMPTY)"],
+                                dependencyInfo: .makefile(.string("$(DERIVED_FILES_DIR)/super-fancy-shell.d")),
+                                alwaysOutOfDate: true
+                            ),
+                            TestShellScriptBuildPhase(
+                                name: "Run Script",
+                                originalObjectID: "ScriptWithOutput",
+                                contents: "echo \"Running script\"\nexit 0",
+                                outputs: ["$(TARGET_TEMP_DIR)/Script-Output-File.txt"]
+                            ),
                             TestShellScriptBuildPhase(name: "Copy Stuff", originalObjectID: "Bar", contents: "cp \"${INPUT_FILE_0}\" \"${OUTPUT_FILE_0}\"\nexit 0", inputs: ["Sources/Stuff.dat"], outputs: ["$(DERIVED_FILES_DIR)/Stuff.dat"]),
                             TestShellScriptBuildPhase(name: "Install Script", originalObjectID: "InstallScript", onlyForDeployment: true, alwaysOutOfDate: true),
                             TestFrameworksBuildPhase([
@@ -151,39 +175,60 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             ]),
                             TestCopyFilesBuildPhase(["AlternatePermissions.txt"], destinationSubfolder: .absolute, destinationSubpath: "Applications", onlyForDeployment: true),
                         ],
-                        buildRules: [TestBuildRule(filePattern: "*/*.fake-lang", script: "echo hi", inputs: [
-                            "Sources/Project.fake-lang-settings",
-                            "$(INPUT_FILE_PATH)-settings",
-                        ], outputs: [
-                            "$(DERIVED_FILES_DIR)-$(CURRENT_VARIANT)/$(CURRENT_ARCH)/$(INPUT_FILE_REGION_PATH_COMPONENT)foo-$(INPUT_FILE_BASE).h",
-                            "$(DERIVED_FILES_DIR)-$(CURRENT_VARIANT)/$(CURRENT_ARCH)/$(INPUT_FILE_REGION_PATH_COMPONENT)Script-Output-$(INPUT_FILE_BASE)-SourceFile.c",
-                            "$(DERIVED_FILES_DIR)-$(CURRENT_VARIANT)/$(CURRENT_ARCH)/$(INPUT_FILE_REGION_PATH_COMPONENT)foo.plist",
-                            // Write another fake-lang file, to test recursion.
-                            "$(DERIVED_FILES_DIR)-$(CURRENT_VARIANT)/$(CURRENT_ARCH)/$(INPUT_FILE_REGION_PATH_COMPONENT)$(INPUT_FILE_BASE).fake-lang"
-                        ]),TestBuildRule(filePattern: "*/*.fake-lang-header", script: "cp ${SCRIPT_INPUT_FILE} ${SCRIPT_OUTPUT_FILE_0}", outputs: [
-                            "$(HEADER_OUTPUT_DIR)/$(INPUT_FILE_NAME)"
-                        ], dependencyInfo: .makefile(.string("$(DERIVED_FILES_DIR)/$(INPUT_FILE_NAME).d")))],
+                        buildRules: [
+                            TestBuildRule(
+                                filePattern: "*/*.fake-lang",
+                                script: "echo hi",
+                                inputs: [
+                                    "Sources/Project.fake-lang-settings",
+                                    "$(INPUT_FILE_PATH)-settings",
+                                ],
+                                outputs: [
+                                    "$(DERIVED_FILES_DIR)-$(CURRENT_VARIANT)/$(CURRENT_ARCH)/$(INPUT_FILE_REGION_PATH_COMPONENT)foo-$(INPUT_FILE_BASE).h",
+                                    "$(DERIVED_FILES_DIR)-$(CURRENT_VARIANT)/$(CURRENT_ARCH)/$(INPUT_FILE_REGION_PATH_COMPONENT)Script-Output-$(INPUT_FILE_BASE)-SourceFile.c",
+                                    "$(DERIVED_FILES_DIR)-$(CURRENT_VARIANT)/$(CURRENT_ARCH)/$(INPUT_FILE_REGION_PATH_COMPONENT)foo.plist",
+                                    // Write another fake-lang file, to test recursion.
+                                    "$(DERIVED_FILES_DIR)-$(CURRENT_VARIANT)/$(CURRENT_ARCH)/$(INPUT_FILE_REGION_PATH_COMPONENT)$(INPUT_FILE_BASE).fake-lang",
+                                ]
+                            ),
+                            TestBuildRule(
+                                filePattern: "*/*.fake-lang-header",
+                                script: "cp ${SCRIPT_INPUT_FILE} ${SCRIPT_OUTPUT_FILE_0}",
+                                outputs: [
+                                    "$(HEADER_OUTPUT_DIR)/$(INPUT_FILE_NAME)"
+                                ],
+                                dependencyInfo: .makefile(.string("$(DERIVED_FILES_DIR)/$(INPUT_FILE_NAME).d"))
+                            ),
+                        ],
                         dependencies: ["AppCore"]
                     ),
                     TestStandardTarget(
                         "AppCore",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "DEFINES_MODULE": "YES",
-                                "MODULEMAP_PRIVATE_FILE": "AppCore-Private.modulemap",
-                            ]),
-                            TestBuildConfiguration("Release", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "DEFINES_MODULE": "YES"
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "DEFINES_MODULE": "YES",
+                                    "MODULEMAP_PRIVATE_FILE": "AppCore-Private.modulemap",
+                                ]
+                            ),
+                            TestBuildConfiguration(
+                                "Release",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "DEFINES_MODULE": "YES",
+                                ]
+                            ),
                         ],
                         buildPhases: [
                             TestHeadersBuildPhase([TestBuildFile("AppCore.h", headerVisibility: .public)]),
                             TestSourcesBuildPhase(["SourceFile.m"]),
-                        ])
-                ])
+                        ]
+                    ),
+                ]
+            )
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -252,9 +297,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         task.checkInputs([
                             .path("\(SRCROOT)/Sources/Info.plist"),
                             .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
-                            .namePattern(.and(.prefix("target-"), .suffix("-entry")))])
+                            .namePattern(.and(.prefix("target-"), .suffix("-entry"))),
+                        ])
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/normal/\(results.runDestinationTargetArchitecture)/Preprocessed-Info.plist")])
+                            .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/normal/\(results.runDestinationTargetArchitecture)/Preprocessed-Info.plist")
+                        ])
                     }
                     results.checkTask(.matchTarget(target), .matchRuleType("ProcessInfoPlistFile")) { task in
                         task.checkRuleInfo(["ProcessInfoPlistFile", "\(SRCROOT)/build/Debug/AppTarget.app/Contents/Info.plist", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Preprocessed-Info.plist"])
@@ -263,14 +310,14 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         task.checkInputs([
                             .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Preprocessed-Info.plist"),
                             .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
-                            .namePattern(.and(.prefix("target-"), .suffix("-entry")))])
+                            .namePattern(.and(.prefix("target-"), .suffix("-entry"))),
+                        ])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Info.plist"),
                             .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/PkgInfo"),
                         ])
                     }
 
-
                     // There should be one Lex task.
                     results.checkTask(.matchTarget(target), .matchRuleType("Lex")) { task in
                         task.checkRuleInfo(["Lex", "\(SRCROOT)/Sources/Lex.l"])
@@ -280,10 +327,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             .path("\(SRCROOT)/Sources/Lex.l"),
                             .namePattern(.prefix("target-")),
                             .namePattern(.and(.prefix("target-"), .suffix("-begin-compiling"))),
-                            .name("WorkspaceHeaderMapVFSFilesWritten")])
+                            .name("WorkspaceHeaderMapVFSFilesWritten"),
+                        ])
 
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/Lex.yy.c")])
+                            .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/Lex.yy.c")
+                        ])
                     }
 
                     // There should be one Yacc task.
@@ -295,11 +344,13 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             .path("\(SRCROOT)/Sources/Yacc.y"),
                             .namePattern(.prefix("target-")),
                             .namePattern(.prefix("target-")),
-                            .name("WorkspaceHeaderMapVFSFilesWritten")])
+                            .name("WorkspaceHeaderMapVFSFilesWritten"),
+                        ])
 
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/y.tab.c"),
-                            .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/y.tab.h"),])
+                            .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/y.tab.h"),
+                        ])
                     }
 
                     // Check the CompileC tasks.
@@ -364,10 +415,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/en.lproj/foo.plist"),
                             .namePattern(.prefix("target-")),
                             .namePattern(.prefix("target-")),
-                            .name("WorkspaceHeaderMapVFSFilesWritten")])
+                            .name("WorkspaceHeaderMapVFSFilesWritten"),
+                        ])
 
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Resources/en.lproj/foo.plist"),])
+                            .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Resources/en.lproj/foo.plist")
+                        ])
                     }
 
                     results.checkTask(.matchTarget(target), .matchRuleType("CopyPlistFile"), .matchRuleItemPattern(.suffix("foo.plist"))) { task in
@@ -378,15 +431,17 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/foo.plist"),
                             .namePattern(.prefix("target-")),
                             .namePattern(.prefix("target-")),
-                            .name("WorkspaceHeaderMapVFSFilesWritten")])
+                            .name("WorkspaceHeaderMapVFSFilesWritten"),
+                        ])
 
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Resources/foo.plist"),])
+                            .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Resources/foo.plist")
+                        ])
                     }
 
                     // There should be two RuleScriptExecution tasks.
                     results.checkTask(.matchTarget(target), .matchRuleType("RuleScriptExecution"), .matchRuleItemBasename("Custom.fake-lang")) { task in
-                        task.checkRuleInfo(["RuleScriptExecution",  "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/foo-Custom.h", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/Script-Output-Custom-SourceFile.c", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/foo.plist", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/Custom.fake-lang", "\(SRCROOT)/Sources/Custom.fake-lang", "normal", .equal(results.runDestinationTargetArchitecture)])
+                        task.checkRuleInfo(["RuleScriptExecution", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/foo-Custom.h", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/Script-Output-Custom-SourceFile.c", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/foo.plist", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/Custom.fake-lang", "\(SRCROOT)/Sources/Custom.fake-lang", "normal", .equal(results.runDestinationTargetArchitecture)])
                         task.checkCommandLine(["/bin/sh", "-c", "echo hi"])
 
                         // Check that we pushed the script rule specific variables correctly.
@@ -417,12 +472,14 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             .path("\(SRCROOT)/Sources/Custom.fake-lang-settings"),
                             .namePattern(.prefix("target-")),
                             .namePattern(.prefix("target-")),
-                            .name("WorkspaceHeaderMapVFSFilesWritten")])
+                            .name("WorkspaceHeaderMapVFSFilesWritten"),
+                        ])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/foo-Custom.h"),
                             .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/Script-Output-Custom-SourceFile.c"),
                             .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/foo.plist"),
-                            .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/Custom.fake-lang")])
+                            .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/Custom.fake-lang"),
+                        ])
                     }
 
                     results.checkTask(.matchTarget(target), .matchRuleType("RuleScriptExecution"), .matchRuleItemBasename("Standard.fake-lang")) { task in
@@ -458,12 +515,14 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             .path("\(SRCROOT)/Sources/en.lproj/Standard.fake-lang-settings"),
                             .namePattern(.prefix("target-")),
                             .namePattern(.prefix("target-")),
-                            .name("WorkspaceHeaderMapVFSFilesWritten")])
+                            .name("WorkspaceHeaderMapVFSFilesWritten"),
+                        ])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/en.lproj/foo-Standard.h"),
                             .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/en.lproj/Script-Output-Standard-SourceFile.c"),
                             .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/en.lproj/foo.plist"),
-                            .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/en.lproj/Standard.fake-lang")])
+                            .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)/en.lproj/Standard.fake-lang"),
+                        ])
                     }
 
                     // There should be one file copy of the strings file.
@@ -473,7 +532,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         task.checkInputs([
                             .path("\(SRCROOT)/Sources/PlistFileToCopy.plist"),
                             .namePattern(.and(.prefix("target-"), .suffix("-phase1-compile-sources"))),
-                            .namePattern(.prefix("target-"))])
+                            .namePattern(.prefix("target-")),
+                        ])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Frameworks/PlistFileToCopy.plist"),
                             .name("Copy \(SRCROOT)/build/Debug/AppTarget.app/Contents/Frameworks/PlistFileToCopy.plist"),
@@ -487,7 +547,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         task.checkInputs([
                             .path("\(SRCROOT)/Sources/FileToCopy.txt"),
                             .namePattern(.and(.prefix("target-"), .suffix("-phase1-compile-sources"))),
-                            .namePattern(.prefix("target-"))])
+                            .namePattern(.prefix("target-")),
+                        ])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Frameworks/FileToCopy.txt"),
                             .name("Copy \(SRCROOT)/build/Debug/AppTarget.app/Contents/Frameworks/FileToCopy.txt"),
@@ -515,7 +576,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             .namePattern(.and(.prefix("target-"), .suffix("-generated-headers"))),
                             .namePattern(.and(.prefix("target-"), .suffix("-swift-generated-headers"))),
                             .namePattern(.prefix("target-")),
-                            .namePattern(.prefix("target-"))])
+                            .namePattern(.prefix("target-")),
+                        ])
 
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/MacOS/AppTarget"),
@@ -526,28 +588,36 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     }
 
                     // There should be two CpHeader tasks.
-                    results.checkTasks(.matchTarget(target), .matchRuleType("CpHeader"), body: { (tasks) -> Void in
-                        let sortedTasks = tasks.sorted { $0.ruleInfo.lexicographicallyPrecedes($1.ruleInfo) }
-                        #expect(sortedTasks.count == 2)
+                    results.checkTasks(
+                        .matchTarget(target),
+                        .matchRuleType("CpHeader"),
+                        body: { (tasks) -> Void in
+                            let sortedTasks = tasks.sorted { $0.ruleInfo.lexicographicallyPrecedes($1.ruleInfo) }
+                            #expect(sortedTasks.count == 2)
 
-                        sortedTasks[0].checkRuleInfo(["CpHeader", "\(SRCROOT)/build/Debug/AppTarget.app/Contents/Headers/HeaderFile.fake-lang-header", "\(SRCROOT)/Sources/HeaderFile.fake-lang-header"])
+                            sortedTasks[0].checkRuleInfo(["CpHeader", "\(SRCROOT)/build/Debug/AppTarget.app/Contents/Headers/HeaderFile.fake-lang-header", "\(SRCROOT)/Sources/HeaderFile.fake-lang-header"])
 
-                        sortedTasks[0].checkInputs([
-                            .path("\(SRCROOT)/Sources/HeaderFile.fake-lang-header"),
-                            .namePattern(.suffix("-immediate")),])
+                            sortedTasks[0].checkInputs([
+                                .path("\(SRCROOT)/Sources/HeaderFile.fake-lang-header"),
+                                .namePattern(.suffix("-immediate")),
+                            ])
 
-                        sortedTasks[0].checkOutputs([
-                            .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Headers/HeaderFile.fake-lang-header"),])
+                            sortedTasks[0].checkOutputs([
+                                .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Headers/HeaderFile.fake-lang-header")
+                            ])
 
-                        sortedTasks[1].checkRuleInfo(["CpHeader", "\(SRCROOT)/build/Debug/AppTarget.app/Contents/Headers/HeaderFile.h", "\(SRCROOT)/Sources/HeaderFile.h"])
+                            sortedTasks[1].checkRuleInfo(["CpHeader", "\(SRCROOT)/build/Debug/AppTarget.app/Contents/Headers/HeaderFile.h", "\(SRCROOT)/Sources/HeaderFile.h"])
 
-                        sortedTasks[1].checkInputs([
-                            .path("\(SRCROOT)/Sources/HeaderFile.h"),
-                            .namePattern(.suffix("-immediate")),])
+                            sortedTasks[1].checkInputs([
+                                .path("\(SRCROOT)/Sources/HeaderFile.h"),
+                                .namePattern(.suffix("-immediate")),
+                            ])
 
-                        sortedTasks[1].checkOutputs([
-                            .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Headers/HeaderFile.h"),])
-                    })
+                            sortedTasks[1].checkOutputs([
+                                .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Headers/HeaderFile.h")
+                            ])
+                        }
+                    )
 
                     // There should be one strings file copy (from the resources phase).
                     results.checkTask(.matchTarget(target), .matchRuleType("CopyStringsFile")) { task in
@@ -557,10 +627,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         task.checkInputs([
                             .path("\(SRCROOT)/Sources/StringsResource.strings"),
                             .namePattern(.and(.prefix("target-"), .suffix("-phase3-copy-files"))),
-                            .namePattern(.prefix("target-")),])
+                            .namePattern(.prefix("target-")),
+                        ])
 
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Resources/StringsResource.strings"),])
+                            .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Resources/StringsResource.strings")
+                        ])
                     }
 
                     // There should be one copy-png operation (for the image that just has one resolution).
@@ -572,9 +644,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         task.checkInputs([
                             .path("\(SRCROOT)/Sources/SingleResImage.png"),
                             .namePattern(.and(.prefix("target-"), .suffix("-phase3-copy-files"))),
-                            .namePattern(.prefix("target-"))])
+                            .namePattern(.prefix("target-")),
+                        ])
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Resources/SingleResImage.png")])
+                            .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Resources/SingleResImage.png")
+                        ])
                     }
 
                     // There should be one combine-images operation (for the 1x and 2x resolution images).
@@ -587,10 +661,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             .path("\(SRCROOT)/Sources/Image@2x.png"),
                             .path("\(SRCROOT)/Sources/Image.png"),
                             .namePattern(.and(.prefix("target-"), .suffix("-phase3-copy-files"))),
-                            .namePattern(.prefix("target-")),])
+                            .namePattern(.prefix("target-")),
+                        ])
 
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Resources/Image.tiff"),])
+                            .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Resources/Image.tiff")
+                        ])
                     }
                     // There should be one CopyTiffFile operation (for the non-HiDPI image).
                     results.checkTask(.matchTarget(target), .matchRuleType("CopyTiffFile")) { task in
@@ -600,9 +676,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         task.checkInputs([
                             .path("\(SRCROOT)/Sources/SingleResTiffImage.tiff"),
                             .namePattern(.and(.prefix("target-"), .suffix("-phase3-copy-files"))),
-                            .namePattern(.prefix("target-")),])
+                            .namePattern(.prefix("target-")),
+                        ])
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Resources/SingleResTiffImage.tiff"),])
+                            .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Resources/SingleResTiffImage.tiff")
+                        ])
                     }
 
                     // There should be one ConvertIconsetFile task.
@@ -613,9 +691,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         task.checkInputs([
                             .path("\(SRCROOT)/Sources/MyIcons.iconset"),
                             .namePattern(.and(.prefix("target-"), .suffix("-phase3-copy-files"))),
-                            .namePattern(.prefix("target-")),])
+                            .namePattern(.prefix("target-")),
+                        ])
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Resources/MyIcons.icns"),])
+                            .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Resources/MyIcons.icns")
+                        ])
                     }
 
                     // There should be a PhaseScriptExecution operation with no outputs, and a WriteAuxiliaryFile task to generate its contents.
@@ -623,14 +703,19 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         task.checkRuleInfo(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Script-Foo With Spaces.sh"])
 
                         task.checkInputs([
-                            .namePattern(.and(.prefix("target-"), .suffix("-immediate")))])
+                            .namePattern(.and(.prefix("target-"), .suffix("-immediate")))
+                        ])
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Script-Foo With Spaces.sh"),])
+                            .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Script-Foo With Spaces.sh")
+                        ])
 
-                        #expect(contents == (OutputByteStream()
-                                             <<< "#!/bin/super-fancy-shell AppTarget\n"
-                                             <<< "echo \"Running script\"\n"
-                                             <<< "exit 0\n").bytes)
+                        #expect(
+                            contents
+                                == (OutputByteStream()
+                                <<< "#!/bin/super-fancy-shell AppTarget\n"
+                                <<< "echo \"Running script\"\n"
+                                <<< "exit 0\n").bytes
+                        )
                         #expect(permissions == 0o755)
 
                     }
@@ -648,7 +733,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         task.checkOutputs([
                             // Verify the command has a virtual output node that can be used as a dependency.
                             .namePattern(.prefix("execute-shell-script-")),
-                            .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/super-fancy-shell.d")
+                            .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/super-fancy-shell.d"),
                         ])
 
                         // Validate that the task has a reasonable environment.
@@ -668,18 +753,19 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         for platform in core.platformRegistry.platforms {
                             if let otherPlatformDeploymentTargetName = platform.deploymentTargetMacro?.name {
                                 if otherPlatformDeploymentTargetName != "MACOSX_DEPLOYMENT_TARGET" {
-                                    scriptVariables[otherPlatformDeploymentTargetName] = .none      // Set the value to nil, don't remove the entry
+                                    scriptVariables[otherPlatformDeploymentTargetName] = .none  // Set the value to nil, don't remove the entry
                                 }
                             }
                         }
                         // Make sure that we're *not* exporting any macCatalyst-related build settings in the environment.
                         scriptVariables.addContents(of: [
-                            "IS_MACCATALYST": .equal("NO"),
+                            "IS_MACCATALYST": .equal("NO")
                         ])
 
                         task.checkEnvironment(scriptVariables)
                         task.checkDependencyData(
-                            .makefile(Path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/super-fancy-shell.d")))
+                            .makefile(Path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/super-fancy-shell.d"))
+                        )
 
                     }
 
@@ -697,9 +783,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         task.checkRuleInfo(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Script-Bar.sh"])
 
                         task.checkInputs([
-                            .namePattern(.and(.prefix("target-"), .suffix("-immediate")))])
+                            .namePattern(.and(.prefix("target-"), .suffix("-immediate")))
+                        ])
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Script-Bar.sh"),])
+                            .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Script-Bar.sh")
+                        ])
 
                         #expect(contents == "#!/bin/sh\ncp \"${INPUT_FILE_0}\" \"${OUTPUT_FILE_0}\"\nexit 0\n")
                     }
@@ -710,9 +798,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             .path("\(SRCROOT)/Sources/Stuff.dat"),
                             .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/Script-Bar.sh"),
                             .namePattern(.and(.prefix("target-"), .suffix("-phase6-run-script"))),
-                            .namePattern(.prefix("target-")),])
+                            .namePattern(.prefix("target-")),
+                        ])
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/Stuff.dat"),])
+                            .path("\(SRCROOT)/build/aProject.build/Debug/AppTarget.build/DerivedSources/Stuff.dat")
+                        ])
                     }
 
                     // There shouldn't be a PhaseScriptExecution for the install script.
@@ -759,26 +849,30 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
                 results.checkTarget("AppCore") { target in
                     // There should be the expected mkdir tasks for the framework.
-                    results.checkTasks(.matchTarget(target), .matchRuleType("MkDir"), body: { (tasks) -> Void in
-                        let sortedTasks = tasks.sorted { $0.ruleInfo.lexicographicallyPrecedes($1.ruleInfo) }
-                        #expect(sortedTasks.count == 5)
-                        sortedTasks[0].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCore.framework")])
-                        sortedTasks[1].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCore.framework/Versions")])
-                        sortedTasks[2].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCore.framework/Versions/A")])
-                        sortedTasks[3].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCore.framework/Versions/A/Headers")])
-                        if SWBFeatureFlag.enableDefaultInfoPlistTemplateKeys.value {
-                            sortedTasks[4].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCore.framework/Versions/A/Resources")])
-                        }
+                    results.checkTasks(
+                        .matchTarget(target),
+                        .matchRuleType("MkDir"),
+                        body: { (tasks) -> Void in
+                            let sortedTasks = tasks.sorted { $0.ruleInfo.lexicographicallyPrecedes($1.ruleInfo) }
+                            #expect(sortedTasks.count == 5)
+                            sortedTasks[0].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCore.framework")])
+                            sortedTasks[1].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCore.framework/Versions")])
+                            sortedTasks[2].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCore.framework/Versions/A")])
+                            sortedTasks[3].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCore.framework/Versions/A/Headers")])
+                            if SWBFeatureFlag.enableDefaultInfoPlistTemplateKeys.value {
+                                sortedTasks[4].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCore.framework/Versions/A/Resources")])
+                            }
 
-                        // Validate we also construct command lines.
-                        sortedTasks[0].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCore.framework"])
-                        sortedTasks[1].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCore.framework/Versions"])
-                        sortedTasks[2].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCore.framework/Versions/A"])
-                        sortedTasks[3].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCore.framework/Versions/A/Headers"])
-                        if SWBFeatureFlag.enableDefaultInfoPlistTemplateKeys.value {
-                            sortedTasks[4].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCore.framework/Versions/A/Resources"])
+                            // Validate we also construct command lines.
+                            sortedTasks[0].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCore.framework"])
+                            sortedTasks[1].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCore.framework/Versions"])
+                            sortedTasks[2].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCore.framework/Versions/A"])
+                            sortedTasks[3].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCore.framework/Versions/A/Headers"])
+                            if SWBFeatureFlag.enableDefaultInfoPlistTemplateKeys.value {
+                                sortedTasks[4].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCore.framework/Versions/A/Resources"])
+                            }
                         }
-                    })
+                    )
 
                     // And a CpHeader task.
                     results.checkTask(.matchTarget(target), .matchRule(["CpHeader", "\(SRCROOT)/build/Debug/AppCore.framework/Versions/A/Headers/AppCore.h", "\(SRCROOT)/Sources/AppCore.h"])) { task in
@@ -790,10 +884,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         task.checkRuleInfo(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/AppCore.build/module.modulemap"])
 
                         task.checkInputs([
-                            .namePattern(.and(.prefix("target-"), .suffix("-immediate"))),
+                            .namePattern(.and(.prefix("target-"), .suffix("-immediate")))
                         ])
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/aProject.build/Debug/AppCore.build/module.modulemap")])
+                            .path("\(SRCROOT)/build/aProject.build/Debug/AppCore.build/module.modulemap")
+                        ])
 
                         #expect(contents == "framework module AppCore {\n  umbrella header \"AppCore.h\"\n  export *\n\n  module * { export * }\n}\n")
                     }
@@ -805,7 +900,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             .namePattern(.prefix("target-AppCore")),
                         ])
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/Debug/AppCore.framework/Versions/A/Modules/module.modulemap")])
+                            .path("\(SRCROOT)/build/Debug/AppCore.framework/Versions/A/Modules/module.modulemap")
+                        ])
                     }
 
                     // We should be copying the private module map file.
@@ -815,7 +911,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             .namePattern(.prefix("target-AppCore")),
                         ])
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/aProject.build/Debug/AppCore.build/module.private.modulemap")])
+                            .path("\(SRCROOT)/build/aProject.build/Debug/AppCore.build/module.private.modulemap")
+                        ])
                     }
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItem("\(SRCROOT)/build/Debug/AppCore.framework/Versions/A/Modules/module.private.modulemap")) { task in
                         task.checkRuleInfo(["Copy", "\(SRCROOT)/build/Debug/AppCore.framework/Versions/A/Modules/module.private.modulemap", "\(SRCROOT)/build/aProject.build/Debug/AppCore.build/module.private.modulemap"])
@@ -825,7 +922,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             .namePattern(.prefix("target-AppCore")),
                         ])
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/Debug/AppCore.framework/Versions/A/Modules/module.private.modulemap")])
+                            .path("\(SRCROOT)/build/Debug/AppCore.framework/Versions/A/Modules/module.private.modulemap")
+                        ])
                     }
                 }
 
@@ -915,10 +1013,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             .namePattern(.and(.prefix("target-"), .suffix("-generated-headers"))),
                             .namePattern(.and(.prefix("target-"), .suffix("-swift-generated-headers"))),
                             .namePattern(.prefix("target-")),
-                            .namePattern(.prefix("target-"))])
+                            .namePattern(.prefix("target-")),
+                        ])
 
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/aProject.build/Release/AppTarget.build/Objects-normal/AppTarget-\(results.runDestinationTargetArchitecture)-prelink.o"),])
+                            .path("\(SRCROOT)/build/aProject.build/Release/AppTarget.build/Objects-normal/AppTarget-\(results.runDestinationTargetArchitecture)-prelink.o")
+                        ])
 
                     }
 
@@ -932,7 +1032,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     results.checkTask(.matchTarget(target), .matchRule(["CpHeader", "/tmp/aProject.dst/Applications/AppTarget.app/Contents/Headers/HeaderFile.fake-lang-header", "\(SRCROOT)/Sources/HeaderFile.fake-lang-header"])) { task in
                         task.checkInputs([
                             .path("\(SRCROOT)/Sources/HeaderFile.fake-lang-header"),
-                            .namePattern(.suffix("-immediate"))
+                            .namePattern(.suffix("-immediate")),
                         ])
                         task.checkOutputs([
                             .path("/tmp/aProject.dst/Applications/AppTarget.app/Contents/Headers/HeaderFile.fake-lang-header")
@@ -975,7 +1075,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
                         task.checkOutputs([
                             .path("/tmp/aProject.dst/Applications/AppTarget.app"),
-                            .name("SetOwner /tmp/aProject.dst/Applications/AppTarget.app")])
+                            .name("SetOwner /tmp/aProject.dst/Applications/AppTarget.app"),
+                        ])
                     }
                     results.checkTask(.matchTarget(target), .matchRuleType("SetMode")) { task in
                         task.checkRuleInfo(["SetMode", "u+w,go-w,a+rX", "/tmp/aProject.dst/Applications/AppTarget.app"])
@@ -993,7 +1094,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
                         task.checkOutputs([
                             .path("/tmp/aProject.dst/Applications/AppTarget.app"),
-                            .name("SetMode /tmp/aProject.dst/Applications/AppTarget.app")])
+                            .name("SetMode /tmp/aProject.dst/Applications/AppTarget.app"),
+                        ])
                     }
 
                     // There should be a chown task targeting the file in the the ALTERNATE_PERMISSIONS_FILES build setting.
@@ -1011,7 +1113,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
                         task.checkOutputs([
                             .path("/tmp/aProject.dst/Applications/AlternatePermissions.txt"),
-                            .name("SetOwner /tmp/aProject.dst/Applications/AlternatePermissions.txt")])
+                            .name("SetOwner /tmp/aProject.dst/Applications/AlternatePermissions.txt"),
+                        ])
                     }
 
                     // There shouldn't be any copy tasks.
@@ -1028,11 +1131,13 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             .namePattern(.and(.prefix("target-"), .suffix("-Barrier-CopyAside"))),
                             .namePattern(.and(.prefix("target-"), .suffix("-will-sign"))),
                             // Postprocessing tasks depend on the end phase nodes of earlier task producers.
-                            .namePattern(.and(.prefix("target-"), .suffix("-entry")))])
+                            .namePattern(.and(.prefix("target-"), .suffix("-entry"))),
+                        ])
 
                         task.checkOutputs([
                             .path("/tmp/aProject.dst/Applications/AppTarget.app/Contents/MacOS/AppTarget"),
-                            .name("Strip /tmp/aProject.dst/Applications/AppTarget.app/Contents/MacOS/AppTarget")])
+                            .name("Strip /tmp/aProject.dst/Applications/AppTarget.app/Contents/MacOS/AppTarget"),
+                        ])
 
                         // Make sure the strip task is ordered after the dsymutil task.
                         if let dsymutilTask {
@@ -1051,10 +1156,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             "{\n    \"application-identifier\" = \"F154D0C.com.apple.dt.AppTarget\";\n    \"com.apple.developer.team-identifier\" = F154D0C;\n    \"get-task-allow\" = 1;\n    \"keychain-access-groups\" =     (\n        \"F154D0C.com.apple.dt.AppTarget\"\n    );\n}",
                         ])
 
-                        #expect(task.inputs.contains{ $0.path.str == "\(SRCROOT)/build/aProject.build/Release/AppTarget.build/DerivedSources/Entitlements.plist" })
+                        #expect(task.inputs.contains { $0.path.str == "\(SRCROOT)/build/aProject.build/Release/AppTarget.build/DerivedSources/Entitlements.plist" })
 
                         task.checkOutputs([
-                            .path("\(SRCROOT)/build/aProject.build/Release/AppTarget.build/AppTarget.app.xcent"),])
+                            .path("\(SRCROOT)/build/aProject.build/Release/AppTarget.build/AppTarget.app.xcent")
+                        ])
                     }
 
                     // There should be three codesign tasks (one for the copied FW, one for the copied dylib, one for the app), two of which should be re-signing tasks.
@@ -1066,7 +1172,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             .name("Copy /tmp/aProject.dst/Applications/AppTarget.app/Contents/Frameworks/FWToCopy.framework"),
                             .path("/tmp/aProject.dst/Applications/AppTarget.app/Contents/Frameworks/FWToCopy.framework/Versions/A/FWToCopy"),
                             .namePattern(.and(.prefix("target-"), .suffix("-phase2-copy-files"))),
-                            .namePattern(.and(.prefix("target-"), .suffix("-entry")))
+                            .namePattern(.and(.prefix("target-"), .suffix("-entry"))),
                         ])
                         task.checkOutputs([
                             .path("/tmp/aProject.dst/Applications/AppTarget.app/Contents/Frameworks/FWToCopy.framework/Versions/A"),
@@ -1076,7 +1182,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         ])
 
                         task.checkAdditionalOutput([
-                            "Signing Identity:     \"-\"",
+                            "Signing Identity:     \"-\""
                         ])
                     }
                     results.checkTask(.matchTarget(target), .matchRule(["CodeSign", "/tmp/aProject.dst/Applications/AppTarget.app/Contents/Frameworks/libdynamic.dylib"])) { task in
@@ -1086,7 +1192,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             .path("/tmp/aProject.dst/Applications/AppTarget.app/Contents/Frameworks/libdynamic.dylib"),
                             .name("Copy /tmp/aProject.dst/Applications/AppTarget.app/Contents/Frameworks/libdynamic.dylib"),
                             .namePattern(.and(.prefix("target-"), .suffix("-phase2-copy-files"))),
-                            .namePattern(.and(.prefix("target-"), .suffix("-entry")))
+                            .namePattern(.and(.prefix("target-"), .suffix("-entry"))),
                         ])
                         task.checkOutputs([
                             .path("/tmp/aProject.dst/Applications/AppTarget.app/Contents/Frameworks/libdynamic.dylib"),
@@ -1094,7 +1200,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         ])
 
                         task.checkAdditionalOutput([
-                            "Signing Identity:     \"-\"",
+                            "Signing Identity:     \"-\""
                         ])
                     }
                     results.checkTask(.matchTarget(target), .matchRule(["CodeSign", "/tmp/aProject.dst/Applications/AppTarget.app"])) { task in
@@ -1118,7 +1224,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         ])
 
                         task.checkAdditionalOutput([
-                            "Signing Identity:     \"-\"",
+                            "Signing Identity:     \"-\""
                         ])
                     }
                     results.checkNoTask(.matchTarget(target), .matchRuleType("CodeSign"))
@@ -1139,9 +1245,13 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
             // Check additional behaviors for an install release build.
             do {
-                let parameters = BuildParameters(action: .install, configuration: "Release", overrides: [
-                    "RETAIN_RAW_BINARIES": "YES",
-                ])
+                let parameters = BuildParameters(
+                    action: .install,
+                    configuration: "Release",
+                    overrides: [
+                        "RETAIN_RAW_BINARIES": "YES"
+                    ]
+                )
                 await tester.checkBuild(parameters, runDestination: .macOS, fs: localFS) {
                     results in
                     results.checkTarget("AppTarget") { target in
@@ -1157,9 +1267,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
             // Check behavior of APPLY_RULES_IN_COPY_FILES setting.
             do {
-                let parameters = BuildParameters(configuration: "Release", overrides: [
-                    "APPLY_RULES_IN_COPY_FILES": "YES",
-                ])
+                let parameters = BuildParameters(
+                    configuration: "Release",
+                    overrides: [
+                        "APPLY_RULES_IN_COPY_FILES": "YES"
+                    ]
+                )
                 await tester.checkBuild(parameters, runDestination: .macOS, fs: localFS) {
                     results in
                     results.checkTarget("AppTarget") { target in
@@ -1184,9 +1297,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
             // Check behavior of APPLY_RULES_IN_COPY_HEADERS setting.
             do {
-                let parameters = BuildParameters(configuration: "Release", overrides: [
-                    "APPLY_RULES_IN_COPY_HEADERS": "YES",
-                ])
+                let parameters = BuildParameters(
+                    configuration: "Release",
+                    overrides: [
+                        "APPLY_RULES_IN_COPY_HEADERS": "YES"
+                    ]
+                )
                 await tester.checkBuild(parameters, runDestination: .macOS, fs: localFS) {
                     results in
                     results.checkTarget("AppTarget") { target in
@@ -1196,13 +1312,14 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
                             task.checkInputs([
                                 .path("\(SRCROOT)/Sources/HeaderFile.h"),
-                                .namePattern(.suffix("-immediate")),])
+                                .namePattern(.suffix("-immediate")),
+                            ])
 
                             task.checkOutputs([
-                                .path("\(SRCROOT)/build/Release/AppTarget.app/Contents/Headers/HeaderFile.h"),])
+                                .path("\(SRCROOT)/build/Release/AppTarget.app/Contents/Headers/HeaderFile.h")
+                            ])
                         }
 
-
                         results.checkTask(.matchTarget(target), .matchRuleType("RuleScriptExecution"), .matchRuleItemBasename("HeaderFile.fake-lang-header")) { task in
                             task.checkRuleInfo(["RuleScriptExecution", "\(SRCROOT)/build/Release/AppTarget.app/Contents/Headers/HeaderFile.fake-lang-header", "\(SRCROOT)/build/aProject.build/Release/AppTarget.build/DerivedSources/HeaderFile.fake-lang-header.d", "\(SRCROOT)/Sources/HeaderFile.fake-lang-header", "normal", "undefined_arch"])
 
@@ -1226,12 +1343,15 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
                             task.checkInputs([
                                 .path("\(SRCROOT)/Sources/HeaderFile.fake-lang-header"),
-                                .namePattern(.prefix("target-"))])
+                                .namePattern(.prefix("target-")),
+                            ])
                             task.checkOutputs([
                                 .path("\(SRCROOT)/build/Release/AppTarget.app/Contents/Headers/HeaderFile.fake-lang-header"),
-                                .path("\(SRCROOT)/build/aProject.build/Release/AppTarget.build/DerivedSources/HeaderFile.fake-lang-header.d")])
+                                .path("\(SRCROOT)/build/aProject.build/Release/AppTarget.build/DerivedSources/HeaderFile.fake-lang-header.d"),
+                            ])
                             task.checkDependencyData(
-                                .makefile(Path("\(SRCROOT)/build/aProject.build/Release/AppTarget.build/DerivedSources/HeaderFile.fake-lang-header.d")))
+                                .makefile(Path("\(SRCROOT)/build/aProject.build/Release/AppTarget.build/DerivedSources/HeaderFile.fake-lang-header.d"))
+                            )
                         }
                     }
 
@@ -1263,7 +1383,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     TestFile("MyInfo.plist"),
                     TestFile("Exports.exp"),
                     TestFile("Unexports.exp"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -1271,14 +1392,18 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "DEFINES_MODULE": "YES",
 
-                    ]),
-                TestBuildConfiguration("Release", buildSettings: [
-                    "DEFINES_MODULE": "YES",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "EXPORTED_SYMBOLS_FILE": "Exports.exp",
-                    "UNEXPORTED_SYMBOLS_FILE": "Unexports.exp",
-                ]),
+                    ]
+                ),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "DEFINES_MODULE": "YES",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "EXPORTED_SYMBOLS_FILE": "Exports.exp",
+                        "UNEXPORTED_SYMBOLS_FILE": "Unexports.exp",
+                    ]
+                ),
             ],
             targets: [
                 TestStandardTarget(
@@ -1297,18 +1422,19 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             TestBuildFile("FrameworkTarget.h", headerVisibility: .public),
                             TestBuildFile("PublicHeaderFile.h", headerVisibility: .public),
                             TestBuildFile("PrivateHeaderFile.h", headerVisibility: .private),
-                            TestBuildFile("ProjectHeaderFile.h"),   // visibility: project
+                            TestBuildFile("ProjectHeaderFile.h"),  // visibility: project
                         ]),
                         TestResourcesBuildPhase([
-                            "StringsResource.strings",
+                            "StringsResource.strings"
                         ]),
                         TestFrameworksBuildPhase([
                             "libstatic.a",
                             "libdynamic.dylib",
-                        ])
+                        ]),
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1335,13 +1461,15 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/FrameworkTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/FrameworkTarget.LinkFileList"])) { _ in }
                 results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
                     task.checkRuleInfo(["Ld", "\(SRCROOT)/build/Debug/FrameworkTarget.framework/Versions/A/FrameworkTarget", "normal"])
-                    task.checkCommandLine([
-                        ["clang"],
-                        ["-Xlinker", "-reproducible"],
-                        ["-target", "\(results.runDestinationTargetArchitecture)-apple-macos\(MACOSX_DEPLOYMENT_TARGET)"],
-                        ["-dynamiclib", "-isysroot", core.loadSDK(.macOS).path.str, "-Os", "-L\(SRCROOT)/build/EagerLinkingTBDs/Debug", "-L\(SRCROOT)/build/Debug", "-F\(SRCROOT)/build/EagerLinkingTBDs/Debug", "-F\(SRCROOT)/build/Debug", "-filelist", "\(SRCROOT)/build/aProject.build/Debug/FrameworkTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/FrameworkTarget.LinkFileList", "-install_name", "/Library/Frameworks/FrameworkTarget.framework/Versions/A/FrameworkTarget"],
-                        ["-Xlinker", "-object_path_lto", "-Xlinker", "\(SRCROOT)/build/aProject.build/Debug/FrameworkTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/FrameworkTarget_lto.o", "-Xlinker", "-dependency_info", "-Xlinker", "\(SRCROOT)/build/aProject.build/Debug/FrameworkTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/FrameworkTarget_dependency_info.dat", "-fobjc-link-runtime", "-lstatic", "-ldynamic", "-Xlinker", "-no_adhoc_codesign", "-o", "\(SRCROOT)/build/Debug/FrameworkTarget.framework/Versions/A/FrameworkTarget"]
-                    ].reduce([], +))
+                    task.checkCommandLine(
+                        [
+                            ["clang"],
+                            ["-Xlinker", "-reproducible"],
+                            ["-target", "\(results.runDestinationTargetArchitecture)-apple-macos\(MACOSX_DEPLOYMENT_TARGET)"],
+                            ["-dynamiclib", "-isysroot", core.loadSDK(.macOS).path.str, "-Os", "-L\(SRCROOT)/build/EagerLinkingTBDs/Debug", "-L\(SRCROOT)/build/Debug", "-F\(SRCROOT)/build/EagerLinkingTBDs/Debug", "-F\(SRCROOT)/build/Debug", "-filelist", "\(SRCROOT)/build/aProject.build/Debug/FrameworkTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/FrameworkTarget.LinkFileList", "-install_name", "/Library/Frameworks/FrameworkTarget.framework/Versions/A/FrameworkTarget"],
+                            ["-Xlinker", "-object_path_lto", "-Xlinker", "\(SRCROOT)/build/aProject.build/Debug/FrameworkTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/FrameworkTarget_lto.o", "-Xlinker", "-dependency_info", "-Xlinker", "\(SRCROOT)/build/aProject.build/Debug/FrameworkTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/FrameworkTarget_dependency_info.dat", "-fobjc-link-runtime", "-lstatic", "-ldynamic", "-Xlinker", "-no_adhoc_codesign", "-o", "\(SRCROOT)/build/Debug/FrameworkTarget.framework/Versions/A/FrameworkTarget"],
+                        ].reduce([], +)
+                    )
                 }
 
                 // There should be three CpHeader tasks.
@@ -1458,13 +1586,15 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Release/FrameworkTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/FrameworkTarget.LinkFileList"])) { _ in }
                 results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
                     task.checkRuleInfo(["Ld", "/tmp/aProject.dst/Library/Frameworks/FrameworkTarget.framework/Versions/A/FrameworkTarget", "normal"])
-                    task.checkCommandLine([
-                        ["clang"],
-                        ["-Xlinker", "-reproducible"],
-                        ["-target", "\(results.runDestinationTargetArchitecture)-apple-macos\(MACOSX_DEPLOYMENT_TARGET)"],
-                        ["-dynamiclib", "-isysroot", core.loadSDK(.macOS).path.str, "-Os", "-L\(SRCROOT)/build/EagerLinkingTBDs/Release", "-L\(SRCROOT)/build/Release", "-F\(SRCROOT)/build/EagerLinkingTBDs/Release", "-F\(SRCROOT)/build/Release", "-filelist", "\(SRCROOT)/build/aProject.build/Release/FrameworkTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/FrameworkTarget.LinkFileList", "-exported_symbols_list", "Exports.exp", "-unexported_symbols_list", "Unexports.exp", "-install_name", "/Library/Frameworks/FrameworkTarget.framework/Versions/A/FrameworkTarget"],
-                        ["-Xlinker", "-object_path_lto", "-Xlinker", "\(SRCROOT)/build/aProject.build/Release/FrameworkTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/FrameworkTarget_lto.o", "-Xlinker", "-final_output", "-Xlinker", "/Library/Frameworks/FrameworkTarget.framework/Versions/A/FrameworkTarget", "-Xlinker", "-dependency_info", "-Xlinker", "\(SRCROOT)/build/aProject.build/Release/FrameworkTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/FrameworkTarget_dependency_info.dat", "-fobjc-link-runtime", "-lstatic", "-ldynamic", "-Xlinker", "-no_adhoc_codesign", "-o", "/tmp/aProject.dst/Library/Frameworks/FrameworkTarget.framework/Versions/A/FrameworkTarget"]
-                    ].reduce([], +))
+                    task.checkCommandLine(
+                        [
+                            ["clang"],
+                            ["-Xlinker", "-reproducible"],
+                            ["-target", "\(results.runDestinationTargetArchitecture)-apple-macos\(MACOSX_DEPLOYMENT_TARGET)"],
+                            ["-dynamiclib", "-isysroot", core.loadSDK(.macOS).path.str, "-Os", "-L\(SRCROOT)/build/EagerLinkingTBDs/Release", "-L\(SRCROOT)/build/Release", "-F\(SRCROOT)/build/EagerLinkingTBDs/Release", "-F\(SRCROOT)/build/Release", "-filelist", "\(SRCROOT)/build/aProject.build/Release/FrameworkTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/FrameworkTarget.LinkFileList", "-exported_symbols_list", "Exports.exp", "-unexported_symbols_list", "Unexports.exp", "-install_name", "/Library/Frameworks/FrameworkTarget.framework/Versions/A/FrameworkTarget"],
+                            ["-Xlinker", "-object_path_lto", "-Xlinker", "\(SRCROOT)/build/aProject.build/Release/FrameworkTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/FrameworkTarget_lto.o", "-Xlinker", "-final_output", "-Xlinker", "/Library/Frameworks/FrameworkTarget.framework/Versions/A/FrameworkTarget", "-Xlinker", "-dependency_info", "-Xlinker", "\(SRCROOT)/build/aProject.build/Release/FrameworkTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/FrameworkTarget_dependency_info.dat", "-fobjc-link-runtime", "-lstatic", "-ldynamic", "-Xlinker", "-no_adhoc_codesign", "-o", "/tmp/aProject.dst/Library/Frameworks/FrameworkTarget.framework/Versions/A/FrameworkTarget"],
+                        ].reduce([], +)
+                    )
 
                     task.checkInputs([
                         .path("\(SRCROOT)/build/aProject.build/Release/FrameworkTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/SourceOne.o"),
@@ -1532,7 +1662,6 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     #expect(task.ruleInfo[1] == "/tmp/aProject.dst/Library/Frameworks/FrameworkTarget.framework/Versions/A")
                 }
 
-
                 // There should be the expected mkdir tasks for the framework.
                 results.checkTask(.matchTarget(target), .matchRule(["MkDir", "/tmp/aProject.dst/Library/Frameworks/FrameworkTarget.framework"])) { task in
                     task.checkCommandLine(["/bin/mkdir", "-p", "/tmp/aProject.dst/Library/Frameworks/FrameworkTarget.framework"])
@@ -1584,7 +1713,6 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 // There should be a 'Touch' task.
                 results.checkTask(.matchTarget(target), .matchRule(["Touch", "/tmp/aProject.dst/Library/Frameworks/FrameworkTarget.framework"])) { _ in }
 
-
                 // There shouldn't be any diagnostics.
                 results.checkNoDiagnostics()
             }
@@ -1611,23 +1739,31 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     TestFile("PerArchFile.m"),
                     TestFile("Prefix.pch"),
                     TestFile("Tool.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "LIBTOOL": libtoolPath.str,
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "GCC_PREFIX_HEADER": "Prefix.pch",
-                    "CLANG_USE_RESPONSE_FILE": "NO",]),
-                TestBuildConfiguration("Release", buildSettings: [
-                    "LIBTOOL": libtoolPath.str,
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "CREATE_INFOPLIST_SECTION_IN_BINARY": "YES",
-                    "INFOPLIST_FILE": "Tool.plist",
-                    "INFOPLIST_PREPROCESS": "YES",
-                    "CLANG_USE_RESPONSE_FILE": "NO",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "LIBTOOL": libtoolPath.str,
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "GCC_PREFIX_HEADER": "Prefix.pch",
+                        "CLANG_USE_RESPONSE_FILE": "NO",
+                    ]
+                ),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "LIBTOOL": libtoolPath.str,
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "CREATE_INFOPLIST_SECTION_IN_BINARY": "YES",
+                        "INFOPLIST_FILE": "Tool.plist",
+                        "INFOPLIST_PREPROCESS": "YES",
+                        "CLANG_USE_RESPONSE_FILE": "NO",
+                    ]
+                ),
             ],
             targets: [
                 TestStandardTarget(
@@ -1641,7 +1777,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         TestSourcesBuildPhase([
                             "SourceFile.m",
                             TestBuildFile("PerArchFile.m", additionalArgs: ["-D", "check-that-we-can-reference-a-$(CURRENT_ARCH)-macro"]),
-                        ]),
+                        ])
                     ],
                     dependencies: ["Support"]
                 ),
@@ -1653,10 +1789,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         TestBuildConfiguration("Release"),
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SupportSourceFile.m"]),
+                        TestSourcesBuildPhase(["SupportSourceFile.m"])
                     ]
                 ),
-            ])
+            ]
+        )
 
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
@@ -1664,14 +1801,14 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let MACOSX_DEPLOYMENT_TARGET = runDestination == .macOS ? core.loadSDK(.macOS).defaultDeploymentTarget : ""
 
         // MacOS is the only platform where we can create universal binaries
-        let architectures = runDestination == .macOS ?  ["arm64", "x86_64"] : [runDestination.targetArchitecture]
+        let architectures = runDestination == .macOS ? ["arm64", "x86_64"] : [runDestination.targetArchitecture]
 
         // Check the debug build.
         let overrides = [
-            "ARCHS": architectures.joined(separator: " "),
+            "ARCHS": architectures.joined(separator: " ")
         ]
 
-        await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: overrides), runDestination: runDestination == .macOS ? .anyMac: .host) { results in
+        await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: overrides), runDestination: runDestination == .macOS ? .anyMac : .host) { results in
             results.consumeTasksMatchingRuleTypes(["CreateBuildDirectory", "Gate", "MkDir", "Touch", "RegisterExecutionPolicyException"])
             results.checkTarget("Tool") { target in
                 let effectivePlatformName = results.builtProductsDirSuffix(target)
@@ -1688,10 +1825,15 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         task.checkCommandLineContainsUninterrupted(["-D", "check-that-we-can-reference-a-\(arch)-macro"])
                     }
                     // There should be link tasks (one per arch), and tasks to generate their link file lists.
-                    results.checkTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile",
-                                                                        targetObjectsPerArchBuildDir.join("Tool.LinkFileList").str])) { _ in }
+                    results.checkTask(
+                        .matchTarget(target),
+                        .matchRule([
+                            "WriteAuxiliaryFile",
+                            targetObjectsPerArchBuildDir.join("Tool.LinkFileList").str,
+                        ])
+                    ) { _ in }
 
-                    results.checkTask(.matchTarget(target), .matchRuleType("Ld"), .matchRuleItem(architectures.count > 1 ? arch: "normal")) { task in
+                    results.checkTask(.matchTarget(target), .matchRuleType("Ld"), .matchRuleItem(architectures.count > 1 ? arch : "normal")) { task in
                         if architectures.count > 1 {
                             task.checkRuleInfo(["Ld", targetObjectsPerArchBuildDir.join("Binary/Tool").str, "normal", arch])
                         } else {
@@ -1700,27 +1842,29 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     }
                 }
 
-
                 if architectures.count > 1 {
                     // There should be one lipo task if there are multiple architectures
                     results.checkTask(.matchTarget(target), .matchRuleType("CreateUniversalBinary")) { task in
                         task.checkRuleInfo(["CreateUniversalBinary", targetBuildDir.join("Tool").str, "normal", architectures.joined(separator: " ")])
-                        task.checkCommandLine(["lipo",
-                                               "-create",
-                                               targetObjectsPerArchBuildBaseDir.join("\(architectures[0])/Binary/Tool").str,
-                                               targetObjectsPerArchBuildBaseDir.join("\(architectures[1])/Binary/Tool").str,
-                                               "-output",
-                                               targetBuildDir.join("Tool").str])
+                        task.checkCommandLine([
+                            "lipo",
+                            "-create",
+                            targetObjectsPerArchBuildBaseDir.join("\(architectures[0])/Binary/Tool").str,
+                            targetObjectsPerArchBuildBaseDir.join("\(architectures[1])/Binary/Tool").str,
+                            "-output",
+                            targetBuildDir.join("Tool").str,
+                        ])
 
                         task.checkInputs([
                             .path(targetObjectsPerArchBuildBaseDir.join("\(architectures[0])/Binary/Tool").str),
                             .path(targetObjectsPerArchBuildBaseDir.join("\(architectures[1])/Binary/Tool").str),
                             .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
-                            .namePattern(.prefix("target-"))])
+                            .namePattern(.prefix("target-")),
+                        ])
 
                         task.checkOutputs([
                             .path(targetBuildDir.join("Tool").str),
-                            .name("Linked Binary \(targetBuildDir.join("Tool").str)")
+                            .name("Linked Binary \(targetBuildDir.join("Tool").str)"),
                         ])
                     }
                 }
@@ -1730,8 +1874,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 results.checkTasks(.matchTarget(target), .matchRuleType("WriteAuxiliaryFile"), .matchRuleItemPattern(.suffix(".yaml"))) { _ in }
 
                 // Consume metadata dependency generate task.
-                results.checkTasks(.matchTarget(target),.matchRuleType("WriteAuxiliaryFile"),.matchRuleItemPattern(.suffix(".DependencyMetadataFileList"))) { _ in }
-                results.checkTasks(.matchTarget(target),.matchRuleType("WriteAuxiliaryFile"),.matchRuleItemPattern(.suffix(".DependencyStaticMetadataFileList"))) { _ in }
+                results.checkTasks(.matchTarget(target), .matchRuleType("WriteAuxiliaryFile"), .matchRuleItemPattern(.suffix(".DependencyMetadataFileList"))) { _ in }
+                results.checkTasks(.matchTarget(target), .matchRuleType("WriteAuxiliaryFile"), .matchRuleItemPattern(.suffix(".DependencyStaticMetadataFileList"))) { _ in }
 
                 // There shouldn't be any other tasks.
                 results.checkNoTask(.matchTarget(target))
@@ -1764,7 +1908,6 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         #expect(includeArgs == ["-include"])
                     }
 
-
                     // There should be a libtool task (one per arch), with a link file list written for each.
                     results.checkTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", targetObjectsPerArchBuildDir.join("Support.LinkFileList").str])) { _ in }
                     results.checkTask(.matchTarget(target), .matchRuleType("Libtool"), .matchRuleItem(architectures.count > 1 ? arch : "normal")) { task in
@@ -1776,17 +1919,20 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         }
                         switch runDestination {
                         case .macOS:
-                            task.checkCommandLine([libtoolPath.str, "-static", "-arch_only", arch, "-D", "-syslibroot", core.loadSDK(.macOS).path.str,
-                                                   "-L\(SRCROOT)/build/Debug", "-filelist", targetObjectsPerArchBuildDir.join("Support.LinkFileList").str,
-                                                   "-dependency_info", targetObjectsPerArchBuildDir.join("Support_libtool_dependency_info.dat").str,
-                                                   "-o", targetObjectsPerArchBuildDir.join("Binary/\(libSupportFileName)").str
-                                                  ])
+                            task.checkCommandLine([
+                                libtoolPath.str, "-static", "-arch_only", arch, "-D", "-syslibroot", core.loadSDK(.macOS).path.str,
+                                "-L\(SRCROOT)/build/Debug", "-filelist", targetObjectsPerArchBuildDir.join("Support.LinkFileList").str,
+                                "-dependency_info", targetObjectsPerArchBuildDir.join("Support_libtool_dependency_info.dat").str,
+                                "-o", targetObjectsPerArchBuildDir.join("Binary/\(libSupportFileName)").str,
+                            ])
                         case .linux:
                             task.checkCommandLine(["llvm-ar", "rcs", targetBuildDir.join(libSupportFileName).str, "@\(targetObjectsPerArchBuildDir.join("Support.LinkFileList").str)"])
                         case .windows:
-                            task.checkCommandLine(["llvm-lib.exe",
-                                                   "/out:\(architectures.count > 1 ? targetObjectsPerArchBuildDir.join("Binary/\(libSupportFileName)").str : targetBuildDir.join(libSupportFileName).str)",
-                                                   "@\(targetObjectsPerArchBuildDir.join("Support.LinkFileList").str)"])
+                            task.checkCommandLine([
+                                "llvm-lib.exe",
+                                "/out:\(architectures.count > 1 ? targetObjectsPerArchBuildDir.join("Binary/\(libSupportFileName)").str : targetBuildDir.join(libSupportFileName).str)",
+                                "@\(targetObjectsPerArchBuildDir.join("Support.LinkFileList").str)",
+                            ])
                         default:
                             #expect(Bool(false), "Unsupported destination: \(runDestination)")
                         }
@@ -1797,18 +1943,21 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             .path(targetObjectsPerArchBuildDir.join("SupportSourceFile.o").str),
                             .path(targetObjectsPerArchBuildDir.join("Support.LinkFileList").str),
                             .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
-                            .namePattern(.prefix("target-"))
+                            .namePattern(.prefix("target-")),
                         ]
-                        task.checkInputs(versioningSupported ? inputFiles: Array(inputFiles[1...]))
+                        task.checkInputs(versioningSupported ? inputFiles : Array(inputFiles[1...]))
 
                         if runDestination == .macOS {
                             task.checkOutputs([
                                 .path(architectures.count > 1 ? targetObjectsPerArchBuildDir.join("Binary/\(libSupportFileName)").str : targetBuildDir.join(libSupportFileName).str),
-                                .path(targetObjectsPerArchBuildDir.join("Support_libtool_dependency_info.dat").str)
+                                .path(targetObjectsPerArchBuildDir.join("Support_libtool_dependency_info.dat").str),
                             ])
-                            task.checkEnvironment([
-                                "MACOSX_DEPLOYMENT_TARGET": .equal(MACOSX_DEPLOYMENT_TARGET),
-                            ], exact: true)
+                            task.checkEnvironment(
+                                [
+                                    "MACOSX_DEPLOYMENT_TARGET": .equal(MACOSX_DEPLOYMENT_TARGET)
+                                ],
+                                exact: true
+                            )
                         } else {
                             // There are two outputs, a PathNode and a VirtualNode on non-mac platforms
                             task.checkOutputs([
@@ -1819,18 +1968,18 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     }
                 }
 
-
                 if architectures.count > 1 {
                     // There should be one libtool task to create the universal binary.
                     results.checkTask(.matchTarget(target), .matchRuleType("CreateUniversalBinary")) { task in
                         task.checkRuleInfo(["CreateUniversalBinary", targetBuildDir.join(libSupportFileName).str, "normal", "arm64 x86_64"])
-                        task.checkCommandLineMatches([.suffix("lipo"),
-                                                      "-create",
-                                                      .equal(targetObjectsPerArchBuildBaseDir.join("arm64/Binary/\(libSupportFileName)").str),
-                                                      .equal(targetObjectsPerArchBuildBaseDir.join("x86_64/Binary/\(libSupportFileName)").str),
-                                                      "-output",
-                                                      .equal(targetBuildDir.join(libSupportFileName).str)
-                                                     ])
+                        task.checkCommandLineMatches([
+                            .suffix("lipo"),
+                            "-create",
+                            .equal(targetObjectsPerArchBuildBaseDir.join("arm64/Binary/\(libSupportFileName)").str),
+                            .equal(targetObjectsPerArchBuildBaseDir.join("x86_64/Binary/\(libSupportFileName)").str),
+                            "-output",
+                            .equal(targetBuildDir.join(libSupportFileName).str),
+                        ])
                     }
                 }
 
@@ -1859,7 +2008,6 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 let targetPerArchBuildBaseDir = Path("\(SRCROOT)/build/aProject.build/Release\(effectivePlatformName)/Tool.build/normal/")
                 let targetObjectsPerArchBuildBaseDir = Path("\(SRCROOT)/build/aProject.build/Release\(effectivePlatformName)/Tool.build/Objects-normal/")
 
-
                 if runDestination != .windows {
                     // There should be a symlink task.
                     results.checkTask(.matchTarget(target), .matchRuleType("SymLink")) { task in
@@ -1875,7 +2023,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         // Validate that the symlink task doesn't pretend the contents are an input.
                         task.checkInputs([
                             .namePattern(.prefix("target-")),
-                            .namePattern(.and(.prefix("target-"), .suffix("-immediate")))])
+                            .namePattern(.and(.prefix("target-"), .suffix("-immediate"))),
+                        ])
                     }
                 }
 
@@ -1927,45 +2076,66 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("AppSource.m"),
                     TestFile("FwkSource.m"),
                     TestFile("XPCSource.m"),
                     TestFile("AppExSource.m"),
                     TestFile("Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration( "Debug", buildSettings: [
-                    "INFOPLIST_FILE": "Info.plist",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "INFOPLIST_FILE": "Info.plist",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "INFOPLIST_FILE": "Sources/Info.plist",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "Sources/Info.plist"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "AppSource.m",
+                            "AppSource.m"
                         ]),
                         TestFrameworksBuildPhase([]),
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile("FwkTarget.framework", codeSignOnCopy: true),
-                        ], destinationSubfolder: .frameworks, onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("FwkTarget.framework", codeSignOnCopy: true)
+                            ],
+                            destinationSubfolder: .frameworks,
+                            onlyForDeployment: false
+                        ),
                         // The destination here matches how the "XPCServices" popup in the build phase UI populates it.  See <rdar://problem/15366863>
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile("Serviceable.xpc", codeSignOnCopy: true),
-                        ], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(CONTENTS_FOLDER_PATH)/XPCServices", onlyForDeployment: false),
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile("Extending.appex", codeSignOnCopy: true),
-                        ], destinationSubfolder: .plugins, onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("Serviceable.xpc", codeSignOnCopy: true)
+                            ],
+                            destinationSubfolder: .builtProductsDir,
+                            destinationSubpath: "$(CONTENTS_FOLDER_PATH)/XPCServices",
+                            onlyForDeployment: false
+                        ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("Extending.appex", codeSignOnCopy: true)
+                            ],
+                            destinationSubfolder: .plugins,
+                            onlyForDeployment: false
+                        ),
                     ],
                     dependencies: ["FwkTarget", "Serviceable", "Extending"]
                 ),
@@ -1973,15 +2143,18 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     "FwkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            // This is a somewhat-common model of specifying the dylib install name for a framework.
-                            "DYLIB_INSTALL_NAME_BASE": "@executable_path/../Frameworks",
-                            "LD_DYLIB_INSTALL_NAME": "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                // This is a somewhat-common model of specifying the dylib install name for a framework.
+                                "DYLIB_INSTALL_NAME_BASE": "@executable_path/../Frameworks",
+                                "LD_DYLIB_INSTALL_NAME": "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "FwkSource.m",
+                            "FwkSource.m"
                         ]),
                         TestFrameworksBuildPhase([]),
                     ]
@@ -1990,11 +2163,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     "Serviceable",
                     type: .xpcService,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "XPCSource.m",
+                            "XPCSource.m"
                         ]),
                         TestFrameworksBuildPhase([]),
                     ]
@@ -2003,11 +2176,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     "Extending",
                     type: .applicationExtension,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "AppExSource.m",
+                            "AppExSource.m"
                         ]),
                         TestFrameworksBuildPhase([]),
                     ]
@@ -2088,16 +2261,23 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             groupTree: TestGroup("SomeFiles"),
             buildConfigurations: [TestBuildConfiguration("Release")],
             targets: [
-                TestStandardTarget("EmptyTool",
-                                   type: .commandLineTool,
-                                   buildConfigurations: [TestBuildConfiguration("Release")],
-                                   buildPhases: [])
-            ])
+                TestStandardTarget(
+                    "EmptyTool",
+                    type: .commandLineTool,
+                    buildConfigurations: [TestBuildConfiguration("Release")],
+                    buildPhases: []
+                )
+            ]
+        )
 
-        let parameters = BuildParameters(action: .install, configuration: "Release", overrides: [
-            "RETAIN_RAW_BINARIES": "YES",
-            "INSTALL_USER": "root",
-        ])
+        let parameters = BuildParameters(
+            action: .install,
+            configuration: "Release",
+            overrides: [
+                "RETAIN_RAW_BINARIES": "YES",
+                "INSTALL_USER": "root",
+            ]
+        )
         let runDestination = RunDestinationInfo.host
         try await TaskConstructionTester(getCore(), testProject).checkBuild(parameters, runDestination: runDestination) { results in
             // There should be no tasks.
@@ -2153,16 +2333,16 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         ])
                     }
                     task.checkOutputs([
-                        .namePattern(.and(.prefix("target-"), .suffix("-entry"))),
+                        .namePattern(.and(.prefix("target-"), .suffix("-entry")))
                     ])
                 }
                 #expect(targetExitTask != nil)
                 if let task = targetExitTask {
                     task.checkInputs([
-                        .namePattern(.and(.prefix("target-"), .suffix("-entry"))),
+                        .namePattern(.and(.prefix("target-"), .suffix("-entry")))
                     ])
                     task.checkOutputs([
-                        .namePattern(.and(.prefix("target-"), .suffix("-end"))),
+                        .namePattern(.and(.prefix("target-"), .suffix("-end")))
                     ])
                 }
             }
@@ -2179,35 +2359,47 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             groupTree: TestGroup("SomeFiles"),
             buildConfigurations: [TestBuildConfiguration("Release")],
             targets: [
-                TestStandardTarget("EmptyTool",
-                                   type: .commandLineTool,
-                                   buildConfigurations: [TestBuildConfiguration("Release", buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "RETAIN_RAW_BINARIES": "YES",
-                                    "CODE_SIGN_IDENTITY": "-",
-                                   ])],
-                                   buildPhases: [
-                                    TestSourcesBuildPhase([]),
-                                   ])
-            ])
-        let tester = try await TaskConstructionTester(getCore(), testProject)
-
-        let parameters = BuildParameters(action: .install, configuration: "Release", overrides: [
-            "INSTALL_USER": "root",
-        ])
-        await tester.checkBuild(parameters, runDestination: .host) { results in
-            // There should be no tasks other than gate and auxiliary file tasks (writing headermaps).
-            results.checkTasks(.matchRuleType("Gate")) { _ in }
-            results.checkTasks(.matchRuleType("WriteAuxiliaryFile")) { _ in }
-            results.checkTasks(.matchRuleType("CreateBuildDirectory")) { _ in }
-
-            // FIXME: Right now, we have an extraneous ProcessProductPackaging task.
-            results.checkTasks(.matchRuleType("ProcessProductPackaging")) { _ in }
-
-            results.checkNoTask()
-
-            // There shouldn't be any diagnostics.
-            results.checkNoDiagnostics()
+                TestStandardTarget(
+                    "EmptyTool",
+                    type: .commandLineTool,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "RETAIN_RAW_BINARIES": "YES",
+                                "CODE_SIGN_IDENTITY": "-",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase([])
+                    ]
+                )
+            ]
+        )
+        let tester = try await TaskConstructionTester(getCore(), testProject)
+
+        let parameters = BuildParameters(
+            action: .install,
+            configuration: "Release",
+            overrides: [
+                "INSTALL_USER": "root"
+            ]
+        )
+        await tester.checkBuild(parameters, runDestination: .host) { results in
+            // There should be no tasks other than gate and auxiliary file tasks (writing headermaps).
+            results.checkTasks(.matchRuleType("Gate")) { _ in }
+            results.checkTasks(.matchRuleType("WriteAuxiliaryFile")) { _ in }
+            results.checkTasks(.matchRuleType("CreateBuildDirectory")) { _ in }
+
+            // FIXME: Right now, we have an extraneous ProcessProductPackaging task.
+            results.checkTasks(.matchRuleType("ProcessProductPackaging")) { _ in }
+
+            results.checkNoTask()
+
+            // There shouldn't be any diagnostics.
+            results.checkNoDiagnostics()
         }
     }
 
@@ -2223,19 +2415,31 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             ),
             buildConfigurations: [TestBuildConfiguration("Release")],
             targets: [
-                TestStandardTarget("EmptyTool",
-                                   type: .commandLineTool,
-                                   buildConfigurations: [TestBuildConfiguration("Release", buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "RETAIN_RAW_BINARIES": "YES",
-                                    "CODE_SIGN_IDENTITY": "-",
-                                   ])],
-                                   buildPhases: [
-                                    TestCopyFilesBuildPhase([
-                                        TestBuildFile("script.txt", codeSignOnCopy: true),
-                                    ], destinationSubfolder: .plugins, onlyForDeployment: true),
-                                   ])
-            ])
+                TestStandardTarget(
+                    "EmptyTool",
+                    type: .commandLineTool,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "RETAIN_RAW_BINARIES": "YES",
+                                "CODE_SIGN_IDENTITY": "-",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("script.txt", codeSignOnCopy: true)
+                            ],
+                            destinationSubfolder: .plugins,
+                            onlyForDeployment: true
+                        )
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Test a regular build.  Since `only-for-deployment` is set, this should not result in any tasks.
@@ -2256,9 +2460,13 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         }
 
         // Test an install.  In this case, we should end up with tasks to copy `script.txt` to the destination and to sign it.
-        let installParameters = BuildParameters(action: .install, configuration: "Release", overrides: [
-            "INSTALL_USER": "root",
-        ])
+        let installParameters = BuildParameters(
+            action: .install,
+            configuration: "Release",
+            overrides: [
+                "INSTALL_USER": "root"
+            ]
+        )
         await tester.checkBuild(installParameters, runDestination: .host) { results in
             // We need to filter out boilerplate tasks such as `Gate` and `WriteAuxiliaryFile`.
             results.checkTasks(.matchRuleType("Gate")) { _ in }
@@ -2286,17 +2494,23 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 TestBuildConfiguration("SkipInstall"),
             ],
             targets: [
-                TestExternalTarget("External",
-                                   toolPath: "fooBar",
-                                   arguments: "this $(ACTION) and that",
-                                   workingDirectory: "/tmp",
-                                   buildConfigurations: [
-                                    TestBuildConfiguration("Release"),
-                                    TestBuildConfiguration("SkipInstall", buildSettings: [
-                                        "SKIP_INSTALL": "YES",
-                                    ]),
-                                   ])
-            ])
+                TestExternalTarget(
+                    "External",
+                    toolPath: "fooBar",
+                    arguments: "this $(ACTION) and that",
+                    workingDirectory: "/tmp",
+                    buildConfigurations: [
+                        TestBuildConfiguration("Release"),
+                        TestBuildConfiguration(
+                            "SkipInstall",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES"
+                            ]
+                        ),
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -2325,7 +2539,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
                     // Check interesting environment variables.
                     task.checkEnvironment([
-                        "ACTION": .equal(""),                                       // No ACTION is passed for a 'build' action.
+                        "ACTION": .equal(""),  // No ACTION is passed for a 'build' action.
                         "TARGET_BUILD_DIR": .equal("\(SRCROOT)/build/Release\(runDestination.builtProductsDirSuffix)"),
                         "BUILT_PRODUCTS_DIR": .equal("\(SRCROOT)/build/Release\(runDestination.builtProductsDirSuffix)"),
                         // Check that we don't export SDK_VARIANT or macCatalyst settings.
@@ -2352,7 +2566,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     for path in searchPaths + platformSearchPaths.map(\.str) + [
                         developerPath.path.join("usr/bin").str,
                         developerPath.path.join("usr/local/bin").str,
-                        "/usr/local/bin"
+                        "/usr/local/bin",
                     ] {
                         #expect(task.environment.bindingsDictionary["PATH"]?.contains(path) == true, "PATH environment variable did not contain entry: \(path)")
                     }
@@ -2484,30 +2698,41 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "SomeFiles",
                 children: [
                     TestFile("main.c")
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release"),
+                TestBuildConfiguration("Release")
             ],
             targets: [
-                TestStandardTarget("EmptyTool",
-                                   type: .commandLineTool,
-                                   buildConfigurations: [TestBuildConfiguration("Release", buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "RETAIN_RAW_BINARIES": "YES",
-                                    "CODE_SIGN_IDENTITY": "-",
-                                   ])],
-                                   buildPhases: [
-                                    TestSourcesBuildPhase([TestBuildFile("main.c")])
-                                   ],
-                                   dependencies: ["External"]),
-                TestExternalTarget("External",
-                                   toolPath: "fooBar",
-                                   arguments: "this $(ACTION) and that",
-                                   workingDirectory: "/tmp",
-                                   buildConfigurations: [
-                                    TestBuildConfiguration("Release"),
-                                   ]),
-            ])
+                TestStandardTarget(
+                    "EmptyTool",
+                    type: .commandLineTool,
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "RETAIN_RAW_BINARIES": "YES",
+                                "CODE_SIGN_IDENTITY": "-",
+                            ]
+                        )
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase([TestBuildFile("main.c")])
+                    ],
+                    dependencies: ["External"]
+                ),
+                TestExternalTarget(
+                    "External",
+                    toolPath: "fooBar",
+                    arguments: "this $(ACTION) and that",
+                    workingDirectory: "/tmp",
+                    buildConfigurations: [
+                        TestBuildConfiguration("Release")
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Check a release build.
@@ -2533,26 +2758,35 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             groupTree: TestGroup(
                 "SomeFiles",
                 children: [
-                    TestFile("Interfaces.defs")]),
+                    TestFile("Interfaces.defs")
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "MIG_EXEC": migPath.str,
-                ]),
-                TestBuildConfiguration("Release", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "MIG_EXEC": migPath.str,
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "MIG_EXEC": migPath.str,
+                    ]
+                ),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "MIG_EXEC": migPath.str,
+                    ]
+                ),
             ],
             targets: [
                 TestStandardTarget(
                     "Tool",
                     type: .commandLineTool,
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("Interfaces.defs", migCodegenFiles: .both)]),
+                        TestSourcesBuildPhase([TestBuildFile("Interfaces.defs", migCodegenFiles: .both)])
                     ]
                 )
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -2564,12 +2798,15 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     task.checkRuleInfo(["Mig", "\(SRCROOT)/build/aProject.build/Debug/Tool.build/DerivedSources/\(results.runDestinationTargetArchitecture)/Interfaces.h", "\(SRCROOT)/build/aProject.build/Debug/Tool.build/DerivedSources/\(results.runDestinationTargetArchitecture)/InterfacesUser.c", "\(SRCROOT)/build/aProject.build/Debug/Tool.build/DerivedSources/\(results.runDestinationTargetArchitecture)/InterfacesServer.h", "\(SRCROOT)/build/aProject.build/Debug/Tool.build/DerivedSources/\(results.runDestinationTargetArchitecture)/InterfacesServer.c", "\(SRCROOT)/Interfaces.defs", "normal", results.runDestinationTargetArchitecture])
 
                     // Check that the outputs are correct.
-                    XCTAssertMatch(task.outputs.map { $0.path.str }, [
+                    XCTAssertMatch(
+                        task.outputs.map { $0.path.str },
+                        [
                             .suffix("/Interfaces.h"),
                             .suffix("/InterfacesUser.c"),
                             .suffix("/InterfacesServer.h"),
                             .suffix("/InterfacesServer.c"),
-                        ])
+                        ]
+                    )
                 }
 
                 // There should be two compile of the Mig-generated client and server.
@@ -2601,7 +2838,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     TestFile("foo_debug_x86_64h.c"),
                     TestFile("foo_debug_arm64.c"),
                     TestFile("foo_debug_arm64e.c"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -2612,15 +2850,18 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "EXCLUDED_SOURCE_FILE_NAMES": "*",
                         "INCLUDED_SOURCE_FILE_NAMES": "foo_$(CURRENT_VARIANT)_$(CURRENT_ARCH).c",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .dynamicLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [:]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [:]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -2632,10 +2873,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             "foo_debug_x86_64h.c",
                             "foo_debug_arm64.c",
                             "foo_debug_arm64e.c",
-                        ]),
+                        ])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         try await TaskConstructionTester(getCore(), testProject).checkBuild(BuildParameters(configuration: "Debug"), runDestination: .anyMac, userPreferences: UserPreferences.defaultForTesting.with(enableDebugActivityLogs: true)) { results in
             results.checkTask(.matchRuleType("CompileC"), .matchRuleItemBasename("foo_normal_x86_64.c")) { _ in }
             results.checkTask(.matchRuleType("CompileC"), .matchRuleItemBasename("foo_normal_x86_64h.c")) { _ in }
@@ -2686,17 +2928,21 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     TestFile("FrameworkSource.swift"),
                     TestFile("AppSource.swift"),
                     TestFile("Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "BUILD_VARIANTS": variants.joined(separator: " "),
-                    "INFOPLIST_FILE": "Info.plist",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "TAPI_EXEC": tapiToolPath.str,
-                ]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "BUILD_VARIANTS": variants.joined(separator: " "),
+                        "INFOPLIST_FILE": "Info.plist",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "TAPI_EXEC": tapiToolPath.str,
+                    ]
+                )
             ],
             targets: [
                 TestAggregateTarget(
@@ -2707,7 +2953,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     "Tool",
                     type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release"),
+                        TestBuildConfiguration("Release")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["Foo.c"]),
@@ -2718,20 +2964,20 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     "Framework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release"),
+                        TestBuildConfiguration("Release")
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["FrameworkSource.swift"]),
+                        TestSourcesBuildPhase(["FrameworkSource.swift"])
                     ]
                 ),
                 TestStandardTarget(
                     "Application",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release"),
+                        TestBuildConfiguration("Release")
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["AppSource.swift"]),
+                        TestSourcesBuildPhase(["AppSource.swift"])
                     ]
                 ),
                 // Test a target with an empty sources build phase but which generates a versioning stub file.
@@ -2739,12 +2985,15 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     "VersioningStubOnly",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release", buildSettings: [
-                            "VERSIONING_SYSTEM": "apple-generic",
-                        ]),
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "VERSIONING_SYSTEM": "apple-generic"
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([]),
+                        TestSourcesBuildPhase([])
                     ]
                 ),
                 // Test a target with no sources build phase.  There will still be a product since we'll be copying an Info.plist file into it.
@@ -2752,12 +3001,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     "NoSources",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release"),
+                        TestBuildConfiguration("Release")
                     ],
-                    buildPhases: [
-                    ]
+                    buildPhases: []
                 ),
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -2808,8 +3057,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchTarget(target), .matchRule(["CodeSign", "/tmp/aProject.dst/Library/Frameworks/Framework.framework/Versions/A"])) { task in
                     if let debugSigningTask {
                         results.checkTaskFollows(task, antecedent: debugSigningTask)
-                    }
-                    else {
+                    } else {
                         Issue.record("no task to sign the debug variant binary")
                     }
                 }
@@ -2836,8 +3084,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     task.checkCommandLineContains(["--entitlements", "\(SRCROOT)/build/aProject.build/Release/Application.build/Application.app.xcent", "/tmp/aProject.dst/Applications/Application.app/Contents/MacOS/Application_debug"])
                     if let entitlementsTask {
                         results.checkTaskFollows(task, antecedent: entitlementsTask)
-                    }
-                    else {
+                    } else {
                         Issue.record("no task to generate the entitlements file")
                     }
                     debugSigningTask = task
@@ -2846,14 +3093,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     task.checkCommandLineContains(["--entitlements", "\(SRCROOT)/build/aProject.build/Release/Application.build/Application.app.xcent", "/tmp/aProject.dst/Applications/Application.app"])
                     if let entitlementsTask {
                         results.checkTaskFollows(task, antecedent: entitlementsTask)
-                    }
-                    else {
+                    } else {
                         Issue.record("no task to generate the entitlements file")
                     }
                     if let debugSigningTask {
                         results.checkTaskFollows(task, antecedent: debugSigningTask)
-                    }
-                    else {
+                    } else {
                         Issue.record("no task to sign the debug variant binary")
                     }
                 }
@@ -2875,8 +3120,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchTarget(target), .matchRule(["CodeSign", "/tmp/aProject.dst/Library/Frameworks/VersioningStubOnly.framework/Versions/A"])) { task in
                     if let debugSigningTask {
                         results.checkTaskFollows(task, antecedent: debugSigningTask)
-                    }
-                    else {
+                    } else {
                         Issue.record("no task to sign the debug variant binary")
                     }
                 }
@@ -2916,32 +3160,37 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("FrameworkSource.swift"),
                     TestFile("DockServerDefs.defs"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "BUILD_VARIANTS": variants.joined(separator: " "),
-                    "CODE_SIGN_IDENTITY": "-",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "TAPI_EXEC": tapiToolPath.str,
-                    "MIG_EXEC": migPath.str,
-                    "DEFINES_MODULE": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "BUILD_VARIANTS": variants.joined(separator: " "),
+                        "CODE_SIGN_IDENTITY": "-",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "TAPI_EXEC": tapiToolPath.str,
+                        "MIG_EXEC": migPath.str,
+                        "DEFINES_MODULE": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Framework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release"),
+                        TestBuildConfiguration("Release")
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["FrameworkSource.swift", "DockServerDefs.defs"]),
+                        TestSourcesBuildPhase(["FrameworkSource.swift", "DockServerDefs.defs"])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Check an install build to examine per-variant postprocessing steps.
@@ -2966,11 +3215,13 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("main.m"),
                     TestFile("foo.y"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -2978,24 +3229,30 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "CLANG_USE_RESPONSE_FILE": "NO",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "macosx",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "foo.y",
-                            "main.m"]),
-                    ])
-            ])
+                            "main.m",
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(runDestination: .macOS) { results in
@@ -3021,13 +3278,16 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 }
 
                 // Validate that they are connected by a gate.
-                XCTAssertMatch(compileTask.inputs.map({ $0.name }), [
+                XCTAssertMatch(
+                    compileTask.inputs.map({ $0.name }),
+                    [
                         .equal("main.m"),
                         .and(.prefix("target"), .suffix("-generated-headers")),
                         .and(.prefix("target"), .suffix("-swift-generated-headers")),
                         .and(.prefix("target"), .suffix("Producer")),
                         .and(.prefix("target"), .suffix("-begin-compiling")),
-                    ])
+                    ]
+                )
                 guard let generatedHeadersGate = compileTask.inputs[safe: 1] else {
                     Issue.record("missing expected gate")
                     return
@@ -3046,10 +3306,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("main.c"),
-                ]),
+                    TestFile("main.c")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -3058,17 +3320,19 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "VERSIONING_SYSTEM": "apple-generic",
                         "CURRENT_PROJECT_VERSION": "3.1",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Framework",
                     type: .framework,
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.c"]),
+                        TestSourcesBuildPhase(["main.c"])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -3077,10 +3341,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             // There should be a WriteAuxiliaryFile task to create the versioning file.
             results.checkWriteAuxiliaryFileTask(.matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/Framework.build/DerivedSources/Framework_vers.c"])) { task, contents in
                 task.checkInputs([
-                    .namePattern(.and(.prefix("target-"), .suffix("-immediate")))])
+                    .namePattern(.and(.prefix("target-"), .suffix("-immediate")))
+                ])
 
                 task.checkOutputs([
-                    .path("\(SRCROOT)/build/aProject.build/Debug/Framework.build/DerivedSources/Framework_vers.c"),])
+                    .path("\(SRCROOT)/build/aProject.build/Debug/Framework.build/DerivedSources/Framework_vers.c")
+                ])
 
                 #expect(contents == "export extern const unsigned char FrameworkVersionString[];\nexport extern const double FrameworkVersionNumber;\n\nexport const unsigned char FrameworkVersionString[] __attribute__ ((used)) = \"@(#)PROGRAM:Framework  PROJECT:aProject-3.1\" \"\\n\";\nexport const double FrameworkVersionNumber __attribute__ ((used)) = (double)3.1;\n")
             }
@@ -3094,10 +3360,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             // There should be a WriteAuxiliaryFile task to create the versioning file.
             results.checkWriteAuxiliaryFileTask(.matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/Framework.build/DerivedSources/Framework_vers.c"])) { task, contents in
                 task.checkInputs([
-                    .namePattern(.and(.prefix("target-"), .suffix("-immediate")))])
+                    .namePattern(.and(.prefix("target-"), .suffix("-immediate")))
+                ])
 
                 task.checkOutputs([
-                    .path("\(SRCROOT)/build/aProject.build/Debug/Framework.build/DerivedSources/Framework_vers.c"),])
+                    .path("\(SRCROOT)/build/aProject.build/Debug/Framework.build/DerivedSources/Framework_vers.c")
+                ])
 
                 #expect(contents == "static const unsigned char FrameworkVersionString[] __attribute__ ((used)) = \"@(#)PROGRAM:Framework  PROJECT:aProject-3.1\" \"\\n\";\nstatic const double FrameworkVersionNumber __attribute__ ((used)) = (double)3.1;\n")
             }
@@ -3116,41 +3384,50 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("SourceFile.cpp"),
                     TestFile("SourceFile-2.swift"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "ARCHS": archs.joined(separator: " "),
-                                                "BUILD_VARIANTS": buildVariants.joined(separator: " "),
-                                                "GENERATE_INFOPLIST_FILE": "YES",
-                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                "SDKROOT": "macosx",
-                                                "SWIFT_VERSION": swiftVersion,
-                                                "CLANG_USE_RESPONSE_FILE": "NO",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ARCHS": archs.joined(separator: " "),
+                                "BUILD_VARIANTS": buildVariants.joined(separator: " "),
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SDKROOT": "macosx",
+                                "SWIFT_VERSION": swiftVersion,
+                                "CLANG_USE_RESPONSE_FILE": "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("SourceFile.cpp"),
                             TestBuildFile("SourceFile-2.swift"),
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
 
         // Choose any include path that's part of the macosx SDK.
-        let parameters = BuildParameters(configuration: "Debug", overrides: [
-            "HEADER_SEARCH_PATHS": "/usr/include/libxml2 $(CURRENT_VARIANT)/variantbased $(CURRENT_ARCH)/archbased",
-        ])
+        let parameters = BuildParameters(
+            configuration: "Debug",
+            overrides: [
+                "HEADER_SEARCH_PATHS": "/usr/include/libxml2 $(CURRENT_VARIANT)/variantbased $(CURRENT_ARCH)/archbased"
+            ]
+        )
 
         // Need to use `localFS` so that the remapping logic can find the filesystem SDK in order to check for the presence
         // of the include path that may require remapping.
@@ -3187,39 +3464,48 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("SourceFile.cpp"),
                     TestFile("SourceFile-2.swift"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "GENERATE_INFOPLIST_FILE": "YES",
-                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                "SDKROOT": "macosx",
-                                                "SWIFT_VERSION": swiftVersion,
-                                                "CLANG_USE_RESPONSE_FILE": "NO",
-                                               ]),
-                    ],
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SDKROOT": "macosx",
+                                "SWIFT_VERSION": swiftVersion,
+                                "CLANG_USE_RESPONSE_FILE": "NO",
+                            ]
+                        )
+                    ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("SourceFile.cpp"),
                             TestBuildFile("SourceFile-2.swift"),
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
 
         // Choose any include path that's part of the macosx SDK.
-        let parameters = BuildParameters(configuration: "Debug", overrides: [
-            "HEADER_SEARCH_PATHS": "/usr/include/libxml2",
-        ])
+        let parameters = BuildParameters(
+            configuration: "Debug",
+            overrides: [
+                "HEADER_SEARCH_PATHS": "/usr/include/libxml2"
+            ]
+        )
 
         // Need to use `localFS` so that the remapping logic can find the filesystem SDK in order to check for the presence
         // of the include path that may require remapping.
@@ -3227,7 +3513,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             results.checkTarget(targetName) { target in
                 results.checkTask(.matchTarget(target), .matchRuleType("CompileC")) { task in
                     task.checkCommandLineContains([
-                        "-I\(core.loadSDK(.macOS).path.str)/usr/include/libxml2",
+                        "-I\(core.loadSDK(.macOS).path.str)/usr/include/libxml2"
                     ])
                     task.checkCommandLineDoesNotContain("-I/usr/include/libxml2")
                 }
@@ -3297,33 +3583,37 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("SourceFile.m"),
                         TestFile("SourceFile-2.swift"),
-                    ]),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         targetName,
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug",
-                                                   buildSettings: [
-                                                    "GENERATE_INFOPLIST_FILE": "YES",
-                                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                    "SDKROOT": "macosx",
-                                                    "ADDITIONAL_SDKS": "\(nonEmbeddedSparseSDKPath.str) $(SRCROOT)/EmbeddedSparseSDK.sdk",
-                                                    "CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING": "",
-                                                    "CLANG_WARN_COMMA": "",
-                                                    "CLANG_WARN_FLOAT_CONVERSION": "",
-                                                    "CLANG_WARN_NON_LITERAL_NULL_CONVERSION": "",
-                                                    "CLANG_WARN_OBJC_LITERAL_CONVERSION": "",
-                                                    "CLANG_WARN_STRICT_PROTOTYPES": "",
-                                                    "CLANG_WARN_IMPLICIT_FALLTHROUGH": "",
-                                                    "FRAMEWORK_SEARCH_PATHS": "/Target/Framework/Search/Path/A /Target/Framework/Search/Path/B",
-                                                    "SWIFT_VERSION": swiftVersion,
-                                                    "CLANG_USE_RESPONSE_FILE": "NO",
-                                                   ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SDKROOT": "macosx",
+                                    "ADDITIONAL_SDKS": "\(nonEmbeddedSparseSDKPath.str) $(SRCROOT)/EmbeddedSparseSDK.sdk",
+                                    "CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING": "",
+                                    "CLANG_WARN_COMMA": "",
+                                    "CLANG_WARN_FLOAT_CONVERSION": "",
+                                    "CLANG_WARN_NON_LITERAL_NULL_CONVERSION": "",
+                                    "CLANG_WARN_OBJC_LITERAL_CONVERSION": "",
+                                    "CLANG_WARN_STRICT_PROTOTYPES": "",
+                                    "CLANG_WARN_IMPLICIT_FALLTHROUGH": "",
+                                    "FRAMEWORK_SEARCH_PATHS": "/Target/Framework/Search/Path/A /Target/Framework/Search/Path/B",
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "CLANG_USE_RESPONSE_FILE": "NO",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
@@ -3331,8 +3621,10 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                                 TestBuildFile("SourceFile-2.swift"),
                             ]),
                             TestShellScriptBuildPhase(name: "Run Script", originalObjectID: "Foo", contents: "echo \"Running script\"\nexit 0\n", alwaysOutOfDate: true),
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -3426,11 +3718,14 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             }
 
             // Also check that remapping of search paths get remapped appropriately.
-            let parameters = BuildParameters(configuration: "Debug", overrides: [
-                "HEADER_SEARCH_PATHS": "/usr/local/include/one $(SDKROOT)/usr/local/include/two $(inherited)",
-                "LIBRARY_SEARCH_PATHS": "/usr/local/lib/one $(SDKROOT)/usr/local/lib/two $(inherited)",
-                "FRAMEWORK_SEARCH_PATHS": "/Library/Frameworks/one $(SDKROOT)/Library/Frameworks/two $(inherited)",
-            ])
+            let parameters = BuildParameters(
+                configuration: "Debug",
+                overrides: [
+                    "HEADER_SEARCH_PATHS": "/usr/local/include/one $(SDKROOT)/usr/local/include/two $(inherited)",
+                    "LIBRARY_SEARCH_PATHS": "/usr/local/lib/one $(SDKROOT)/usr/local/lib/two $(inherited)",
+                    "FRAMEWORK_SEARCH_PATHS": "/Library/Frameworks/one $(SDKROOT)/Library/Frameworks/two $(inherited)",
+                ]
+            )
             await tester.checkBuild(parameters, runDestination: .macOS, fs: localFS) { results in
                 results.checkTarget(targetName) { target in
                     // Check the search paths in the CompileC task.
@@ -3522,75 +3817,84 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("SourceFile.m"),
                     TestFile("SwiftFile.swift"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "GENERATE_INFOPLIST_FILE": "YES",
-                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                "SDKROOT": "macosx",
-                                                "CLANG_ENABLE_MODULES": "YES",
-                                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                                "SWIFT_VERSION": swiftVersion,
-                                                "TAPI_EXEC": tapiToolPath.str,
-                                                "CC": clangCompilerPath.str,
-                                                "CLANG_EXPLICIT_MODULES_LIBCLANG_PATH": libClangPath.str,
-                                                "CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING": "",
-                                                "CLANG_WARN_COMMA": "",
-                                                "CLANG_WARN_FLOAT_CONVERSION": "",
-                                                "CLANG_WARN_NON_LITERAL_NULL_CONVERSION": "",
-                                                "CLANG_WARN_OBJC_LITERAL_CONVERSION": "",
-                                                "CLANG_WARN_STRICT_PROTOTYPES": "",
-                                                "CLANG_WARN_IMPLICIT_FALLTHROUGH": "",
-                                                "CLANG_USE_RESPONSE_FILE": "NO",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SDKROOT": "macosx",
+                                "CLANG_ENABLE_MODULES": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                                "TAPI_EXEC": tapiToolPath.str,
+                                "CC": clangCompilerPath.str,
+                                "CLANG_EXPLICIT_MODULES_LIBCLANG_PATH": libClangPath.str,
+                                "CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING": "",
+                                "CLANG_WARN_COMMA": "",
+                                "CLANG_WARN_FLOAT_CONVERSION": "",
+                                "CLANG_WARN_NON_LITERAL_NULL_CONVERSION": "",
+                                "CLANG_WARN_OBJC_LITERAL_CONVERSION": "",
+                                "CLANG_WARN_STRICT_PROTOTYPES": "",
+                                "CLANG_WARN_IMPLICIT_FALLTHROUGH": "",
+                                "CLANG_USE_RESPONSE_FILE": "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("SourceFile.m"),
                             TestBuildFile("SwiftFile.swift"),
-                        ]),
-                    ]),
+                        ])
+                    ]
+                ),
                 TestStandardTarget(
                     "FrameworkWithModule",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "GENERATE_INFOPLIST_FILE": "YES",
-                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                "SDKROOT": "macosx",
-                                                "CLANG_ENABLE_MODULES": "YES",
-                                                "DEFINES_MODULE": "YES",
-                                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                                "SWIFT_VERSION": swiftVersion,
-                                                "TAPI_EXEC": tapiToolPath.str,
-                                                "CC": clangCompilerPath.str,
-                                                "CLANG_EXPLICIT_MODULES_LIBCLANG_PATH": libClangPath.str,
-                                                "CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING": "",
-                                                "CLANG_WARN_COMMA": "",
-                                                "CLANG_WARN_FLOAT_CONVERSION": "",
-                                                "CLANG_WARN_NON_LITERAL_NULL_CONVERSION": "",
-                                                "CLANG_WARN_OBJC_LITERAL_CONVERSION": "",
-                                                "CLANG_WARN_STRICT_PROTOTYPES": "",
-                                                "CLANG_WARN_IMPLICIT_FALLTHROUGH": "",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SDKROOT": "macosx",
+                                "CLANG_ENABLE_MODULES": "YES",
+                                "DEFINES_MODULE": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                                "TAPI_EXEC": tapiToolPath.str,
+                                "CC": clangCompilerPath.str,
+                                "CLANG_EXPLICIT_MODULES_LIBCLANG_PATH": libClangPath.str,
+                                "CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING": "",
+                                "CLANG_WARN_COMMA": "",
+                                "CLANG_WARN_FLOAT_CONVERSION": "",
+                                "CLANG_WARN_NON_LITERAL_NULL_CONVERSION": "",
+                                "CLANG_WARN_OBJC_LITERAL_CONVERSION": "",
+                                "CLANG_WARN_STRICT_PROTOTYPES": "",
+                                "CLANG_WARN_IMPLICIT_FALLTHROUGH": "",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("SourceFile.m"),
                             TestBuildFile("SwiftFile.swift"),
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                ),
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -3608,12 +3912,14 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 // There should be one CompileC task.
                 results.checkTask(.matchTarget(target), .matchRuleType("CompileC")) { task in
                     task.checkRuleInfo(["CompileC", "\(intermediates.str)/aProject.build/Debug/\(targetName).build/Objects-normal/\(results.runDestinationTargetArchitecture)/SourceFile.o", "\(SRCROOT)/Sources/SourceFile.m", "normal", results.runDestinationTargetArchitecture, "objective-c", "com.apple.compilers.llvm.clang.1_0.compiler"])
-                    task.checkCommandLineContains([
-                        [clangCompilerPath.str, "-x", "objective-c"],
-                        ["-target", "\(results.runDestinationTargetArchitecture)-apple-macos\(MACOSX_DEPLOYMENT_TARGET)"],
-                        ["-fmessage-length=0", "-fdiagnostics-show-note-include-stack", "-fmacro-backtrace-limit=0", "-fmodules", "-gmodules", "-fmodules-cache-path=\(derivedData.str)/ModuleCache.noindex", "-fmodules-prune-interval=86400", "-fmodules-prune-after=345600", "-fbuild-session-file=\(derivedData.str)/ModuleCache.noindex/Session.modulevalidation", "-fmodules-validate-once-per-build-session", "-Wnon-modular-include-in-framework-module", "-Werror=non-modular-include-in-framework-module", /* non-module standard flags go here */ "-isysroot", core.loadSDK(.macOS).path.str], ["-fstrict-aliasing", "-Wprotocol", "-Wdeprecated-declarations"],
-                        ["-g", "-Wno-sign-conversion", "-Wno-infinite-recursion", "-iquote", "\(intermediates.str)/aProject.build/Debug/CoreFoo.build/CoreFoo-generated-files.hmap", "-I\(intermediates.str)/aProject.build/Debug/CoreFoo.build/CoreFoo-own-target-headers.hmap", "-I\(intermediates.str)/aProject.build/Debug/CoreFoo.build/CoreFoo-all-non-framework-target-headers.hmap", "-ivfsoverlay"], ["-iquote", "\(intermediates.str)/aProject.build/Debug/CoreFoo.build/CoreFoo-project-headers.hmap", "-I\(products.str)/Debug/include", "-I\(intermediates.str)/aProject.build/Debug/\(targetName).build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)", "-I\(intermediates.str)/aProject.build/Debug/\(targetName).build/DerivedSources", "-F\(products.str)/Debug", "-MMD", "-MT", "dependencies", "-MF", "\(intermediates.str)/aProject.build/Debug/\(targetName).build/Objects-normal/\(results.runDestinationTargetArchitecture)/SourceFile.d", "--serialize-diagnostics", "\(intermediates.str)/aProject.build/Debug/\(targetName).build/Objects-normal/\(results.runDestinationTargetArchitecture)/SourceFile.dia", "-c", "\(SRCROOT)/Sources/SourceFile.m", "-o", "\(intermediates.str)/aProject.build/Debug/\(targetName).build/Objects-normal/\(results.runDestinationTargetArchitecture)/SourceFile.o"]
-                    ].reduce([], +))
+                    task.checkCommandLineContains(
+                        [
+                            [clangCompilerPath.str, "-x", "objective-c"],
+                            ["-target", "\(results.runDestinationTargetArchitecture)-apple-macos\(MACOSX_DEPLOYMENT_TARGET)"],
+                            ["-fmessage-length=0", "-fdiagnostics-show-note-include-stack", "-fmacro-backtrace-limit=0", "-fmodules", "-gmodules", "-fmodules-cache-path=\(derivedData.str)/ModuleCache.noindex", "-fmodules-prune-interval=86400", "-fmodules-prune-after=345600", "-fbuild-session-file=\(derivedData.str)/ModuleCache.noindex/Session.modulevalidation", "-fmodules-validate-once-per-build-session", "-Wnon-modular-include-in-framework-module", "-Werror=non-modular-include-in-framework-module", /* non-module standard flags go here */ "-isysroot", core.loadSDK(.macOS).path.str], ["-fstrict-aliasing", "-Wprotocol", "-Wdeprecated-declarations"],
+                            ["-g", "-Wno-sign-conversion", "-Wno-infinite-recursion", "-iquote", "\(intermediates.str)/aProject.build/Debug/CoreFoo.build/CoreFoo-generated-files.hmap", "-I\(intermediates.str)/aProject.build/Debug/CoreFoo.build/CoreFoo-own-target-headers.hmap", "-I\(intermediates.str)/aProject.build/Debug/CoreFoo.build/CoreFoo-all-non-framework-target-headers.hmap", "-ivfsoverlay"], ["-iquote", "\(intermediates.str)/aProject.build/Debug/CoreFoo.build/CoreFoo-project-headers.hmap", "-I\(products.str)/Debug/include", "-I\(intermediates.str)/aProject.build/Debug/\(targetName).build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)", "-I\(intermediates.str)/aProject.build/Debug/\(targetName).build/DerivedSources", "-F\(products.str)/Debug", "-MMD", "-MT", "dependencies", "-MF", "\(intermediates.str)/aProject.build/Debug/\(targetName).build/Objects-normal/\(results.runDestinationTargetArchitecture)/SourceFile.d", "--serialize-diagnostics", "\(intermediates.str)/aProject.build/Debug/\(targetName).build/Objects-normal/\(results.runDestinationTargetArchitecture)/SourceFile.dia", "-c", "\(SRCROOT)/Sources/SourceFile.m", "-o", "\(intermediates.str)/aProject.build/Debug/\(targetName).build/Objects-normal/\(results.runDestinationTargetArchitecture)/SourceFile.o"],
+                        ].reduce([], +)
+                    )
                 }
 
                 // There should be one SwiftDriver task.
@@ -3639,12 +3945,14 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 // There should be one CompileC task.
                 results.checkTask(.matchTarget(target), .matchRuleType("CompileC")) { task in
                     task.checkRuleInfo(["CompileC", "\(intermediates.str)/aProject.build/Debug/\(targetName).build/Objects-normal/\(results.runDestinationTargetArchitecture)/SourceFile.o", "\(SRCROOT)/Sources/SourceFile.m", "normal", results.runDestinationTargetArchitecture, "objective-c", "com.apple.compilers.llvm.clang.1_0.compiler"])
-                    task.checkCommandLineContains([
-                        [clangCompilerPath.str, "-x", "objective-c"],
-                        ["-target", "\(results.runDestinationTargetArchitecture)-apple-macos\(MACOSX_DEPLOYMENT_TARGET)"],
-                        ["-fmessage-length=0", "-fdiagnostics-show-note-include-stack", "-fmacro-backtrace-limit=0", "-fmodules", "-gmodules", "-fmodules-cache-path=\(derivedData.str)/ModuleCache.noindex", "-fmodules-prune-interval=86400", "-fmodules-prune-after=345600", "-fbuild-session-file=\(derivedData.str)/ModuleCache.noindex/Session.modulevalidation", "-fmodules-validate-once-per-build-session", "-Wnon-modular-include-in-framework-module", "-Werror=non-modular-include-in-framework-module", /* non-module standard flags go here */ "-isysroot", core.loadSDK(.macOS).path.str], ["-fstrict-aliasing", "-Wprotocol", "-Wdeprecated-declarations"],
-                        ["-g", "-Wno-sign-conversion", "-Wno-infinite-recursion", "-iquote", "\(intermediates.str)/aProject.build/Debug/CoreFoo.build/CoreFoo-generated-files.hmap", "-I\(intermediates.str)/aProject.build/Debug/CoreFoo.build/CoreFoo-own-target-headers.hmap", "-I\(intermediates.str)/aProject.build/Debug/CoreFoo.build/CoreFoo-all-target-headers.hmap", "-iquote", "\(intermediates.str)/aProject.build/Debug/CoreFoo.build/CoreFoo-project-headers.hmap", "-I\(products.str)/Debug/include", "-I\(intermediates.str)/aProject.build/Debug/\(targetName).build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)", "-I\(intermediates.str)/aProject.build/Debug/\(targetName).build/DerivedSources", "-F\(products.str)/Debug", "-MMD", "-MT", "dependencies", "-MF", "\(intermediates.str)/aProject.build/Debug/\(targetName).build/Objects-normal/\(results.runDestinationTargetArchitecture)/SourceFile.d", "--serialize-diagnostics", "\(intermediates.str)/aProject.build/Debug/\(targetName).build/Objects-normal/\(results.runDestinationTargetArchitecture)/SourceFile.dia", "-c", "\(SRCROOT)/Sources/SourceFile.m", "-o", "\(intermediates.str)/aProject.build/Debug/\(targetName).build/Objects-normal/\(results.runDestinationTargetArchitecture)/SourceFile.o"]
-                    ].reduce([], +))
+                    task.checkCommandLineContains(
+                        [
+                            [clangCompilerPath.str, "-x", "objective-c"],
+                            ["-target", "\(results.runDestinationTargetArchitecture)-apple-macos\(MACOSX_DEPLOYMENT_TARGET)"],
+                            ["-fmessage-length=0", "-fdiagnostics-show-note-include-stack", "-fmacro-backtrace-limit=0", "-fmodules", "-gmodules", "-fmodules-cache-path=\(derivedData.str)/ModuleCache.noindex", "-fmodules-prune-interval=86400", "-fmodules-prune-after=345600", "-fbuild-session-file=\(derivedData.str)/ModuleCache.noindex/Session.modulevalidation", "-fmodules-validate-once-per-build-session", "-Wnon-modular-include-in-framework-module", "-Werror=non-modular-include-in-framework-module", /* non-module standard flags go here */ "-isysroot", core.loadSDK(.macOS).path.str], ["-fstrict-aliasing", "-Wprotocol", "-Wdeprecated-declarations"],
+                            ["-g", "-Wno-sign-conversion", "-Wno-infinite-recursion", "-iquote", "\(intermediates.str)/aProject.build/Debug/CoreFoo.build/CoreFoo-generated-files.hmap", "-I\(intermediates.str)/aProject.build/Debug/CoreFoo.build/CoreFoo-own-target-headers.hmap", "-I\(intermediates.str)/aProject.build/Debug/CoreFoo.build/CoreFoo-all-target-headers.hmap", "-iquote", "\(intermediates.str)/aProject.build/Debug/CoreFoo.build/CoreFoo-project-headers.hmap", "-I\(products.str)/Debug/include", "-I\(intermediates.str)/aProject.build/Debug/\(targetName).build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)", "-I\(intermediates.str)/aProject.build/Debug/\(targetName).build/DerivedSources", "-F\(products.str)/Debug", "-MMD", "-MT", "dependencies", "-MF", "\(intermediates.str)/aProject.build/Debug/\(targetName).build/Objects-normal/\(results.runDestinationTargetArchitecture)/SourceFile.d", "--serialize-diagnostics", "\(intermediates.str)/aProject.build/Debug/\(targetName).build/Objects-normal/\(results.runDestinationTargetArchitecture)/SourceFile.dia", "-c", "\(SRCROOT)/Sources/SourceFile.m", "-o", "\(intermediates.str)/aProject.build/Debug/\(targetName).build/Objects-normal/\(results.runDestinationTargetArchitecture)/SourceFile.o"],
+                        ].reduce([], +)
+                    )
                 }
 
                 // There should be one SwiftDriver task.
@@ -3667,23 +3975,27 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("File.metal"),
-                ]),
+                    TestFile("File.metal")
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "aTarget",
                     type: .bundle,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: ["CODE_SIGN_IDENTITY": ""]),
+                        TestBuildConfiguration("Debug", buildSettings: ["CODE_SIGN_IDENTITY": ""])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("File.metal"),
-                        ]),
-                    ])
-            ])
+                            TestBuildFile("File.metal")
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Check for a set of expected tasks instead of checking for the absence of Ld, because checking checkNoTask("Ld") exposes us to bugs if Ld changes name.
@@ -3704,27 +4016,34 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "ProjectName",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("File.s"),
-                ]),
+                    TestFile("File.s")
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "TargetName",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "ProductName",
-                            "ARCHS": "x86_64",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "ProductName",
+                                "ARCHS": "x86_64",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("File.s"),
-                        ]),
-                    ])
-            ])
+                            TestBuildFile("File.s")
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(runDestination: .macOS) { results in
@@ -3741,36 +4060,43 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "ProjectName",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("File1.m"),
                     TestFile("File2.swift"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "TargetName",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "ProductName",
-                            "ARCHS": "x86_64",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": swiftVersion,
-                            "TAPI_EXEC": tapiToolPath.str,
-                            // Indexing while building is only enabled for debug builds.
-                            "GCC_OPTIMIZATION_LEVEL": "0",
-                            "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                            "CC": clangCompilerPath.str,
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "ProductName",
+                                "ARCHS": "x86_64",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                                "TAPI_EXEC": tapiToolPath.str,
+                                // Indexing while building is only enabled for debug builds.
+                                "GCC_OPTIMIZATION_LEVEL": "0",
+                                "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                                "CC": clangCompilerPath.str,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("File1.m"),
                             TestBuildFile("File2.swift"),
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -3813,36 +4139,43 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "ProjectName",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("File1.m"),
                     TestFile("File2.swift"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "TargetName",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "ProductName",
-                            "ARCHS": "x86_64",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": swiftVersion,
-                            "TAPI_EXEC": tapiToolPath.str,
-                            // Indexing while building is disabled for optimized builds, even in debug
-                            "GCC_OPTIMIZATION_LEVEL": "s",
-                            "SWIFT_OPTIMIZATION_LEVEL": "-Os",
-                            "CC": clangCompilerPath.str,
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "ProductName",
+                                "ARCHS": "x86_64",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                                "TAPI_EXEC": tapiToolPath.str,
+                                // Indexing while building is disabled for optimized builds, even in debug
+                                "GCC_OPTIMIZATION_LEVEL": "s",
+                                "SWIFT_OPTIMIZATION_LEVEL": "-Os",
+                                "CC": clangCompilerPath.str,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("File1.m"),
                             TestBuildFile("File2.swift"),
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -3882,33 +4215,47 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Strings-UTF8.strings", fileTextEncoding: .utf8),
                     TestFile("Strings-UTF16.strings", fileTextEncoding: .utf16),
                     TestFile("Strings-NoEncoding.strings"),
-                    TestVariantGroup("Strings.strings", children: [
-                        TestFile("de.lproj/Strings.strings", regionVariantName: "de", fileTextEncoding: .utf16),
-                        TestFile("en.lproj/Strings.strings", regionVariantName: "en", fileTextEncoding: nil),
-                        TestFile("fr.lproj/Strings.strings", regionVariantName: "fr", fileTextEncoding: .utf8),
-                    ]),
-                    TestVariantGroup("Strings-VariantGroup.strings", children: [
-                        TestFile("Strings-UTF99.strings", fileTextEncoding: FileTextEncoding("utf-99"))
-                    ])
-                ]),
+                    TestVariantGroup(
+                        "Strings.strings",
+                        children: [
+                            TestFile("de.lproj/Strings.strings", regionVariantName: "de", fileTextEncoding: .utf16),
+                            TestFile("en.lproj/Strings.strings", regionVariantName: "en", fileTextEncoding: nil),
+                            TestFile("fr.lproj/Strings.strings", regionVariantName: "fr", fileTextEncoding: .utf8),
+                        ]
+                    ),
+                    TestVariantGroup(
+                        "Strings-VariantGroup.strings",
+                        children: [
+                            TestFile("Strings-UTF99.strings", fileTextEncoding: FileTextEncoding("utf-99"))
+                        ]
+                    ),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
-                    "Bundle", type: .bundle,
+                    "Bundle",
+                    type: .bundle,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestResourcesBuildPhase(["Strings-UTF8.strings", "Strings-UTF16.strings", "Strings-NoEncoding.strings", "Strings.strings", "Strings-VariantGroup.strings"]),
+                        TestResourcesBuildPhase(["Strings-UTF8.strings", "Strings-UTF16.strings", "Strings-NoEncoding.strings", "Strings.strings", "Strings-VariantGroup.strings"])
                     ]
-                )])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -3945,41 +4292,47 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("SourceFile.m"),
                     TestFile("SwiftFile.swift"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     targetName,
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "GENERATE_INFOPLIST_FILE": "YES",
-                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                "SDKROOT": "macosx",
-
-                                                "HEADER_SEARCH_PATHS": "/Local/Library/Headers ../../Sources",
-                                                "SYSTEM_HEADER_SEARCH_PATHS": "/System/Library/Include /Local/Library/Headers",
-                                                "FRAMEWORK_SEARCH_PATHS": "/Local/Library/Frameworks ///Local/Foo/./../Library/Frameworks",
-                                                "SYSTEM_FRAMEWORK_SEARCH_PATHS": "/System/Library/PrivateFrameworks /Local/Library/Frameworks ///Local/Foo/./../Library/Frameworks",
-                                                "LIBRARY_SEARCH_PATHS": "/Local/Library/Libs",
-
-                                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                                "SWIFT_VERSION": swiftVersion,
-                                                "TAPI_EXEC": tapiToolPath.str,
-                                                "CLANG_USE_RESPONSE_FILE": "NO",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "SDKROOT": "macosx",
+
+                                "HEADER_SEARCH_PATHS": "/Local/Library/Headers ../../Sources",
+                                "SYSTEM_HEADER_SEARCH_PATHS": "/System/Library/Include /Local/Library/Headers",
+                                "FRAMEWORK_SEARCH_PATHS": "/Local/Library/Frameworks ///Local/Foo/./../Library/Frameworks",
+                                "SYSTEM_FRAMEWORK_SEARCH_PATHS": "/System/Library/PrivateFrameworks /Local/Library/Frameworks ///Local/Foo/./../Library/Frameworks",
+                                "LIBRARY_SEARCH_PATHS": "/Local/Library/Libs",
+
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                                "TAPI_EXEC": tapiToolPath.str,
+                                "CLANG_USE_RESPONSE_FILE": "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("SourceFile.m"),
                             TestBuildFile("SwiftFile.swift"),
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -3994,8 +4347,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     for (i, arg) in commandLine.enumerated() {
                         // 2-arg search paths.
                         if ["-I", "-isystem", "-iquote", "-F", "-iframework"].contains(arg) {
-                            if i<commandLine.count {
-                                searchPaths.append(contentsOf: Array(commandLine[i...i+1]))
+                            if i < commandLine.count {
+                                searchPaths.append(contentsOf: Array(commandLine[i...i + 1]))
                             }
                         }
                         // Single-arg search paths.
@@ -4003,7 +4356,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             searchPaths.append(arg)
                         }
                     }
-                    #expect(searchPaths == ["-iquote", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/\(targetName)-generated-files.hmap", "-I\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/\(targetName)-own-target-headers.hmap", "-I\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/\(targetName)-all-target-headers.hmap", "-iquote", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/\(targetName)-project-headers.hmap", "-I\(SRCROOT)/build/Debug/include", "-I/Local/Library/Headers", "-I../../Sources", "-isystem", "/System/Library/Include", "-I\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)", "-I\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/\(results.runDestinationTargetArchitecture)", "-I\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources",  "-F\(SRCROOT)/build/Debug", "-F/Local/Library/Frameworks", "-F/Local/Library/Frameworks", "-iframework", "/System/Library/PrivateFrameworks"])
+                    #expect(searchPaths == ["-iquote", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/\(targetName)-generated-files.hmap", "-I\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/\(targetName)-own-target-headers.hmap", "-I\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/\(targetName)-all-target-headers.hmap", "-iquote", "\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/\(targetName)-project-headers.hmap", "-I\(SRCROOT)/build/Debug/include", "-I/Local/Library/Headers", "-I../../Sources", "-isystem", "/System/Library/Include", "-I\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)", "-I\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources/\(results.runDestinationTargetArchitecture)", "-I\(SRCROOT)/build/aProject.build/Debug/\(targetName).build/DerivedSources", "-F\(SRCROOT)/build/Debug", "-F/Local/Library/Frameworks", "-F/Local/Library/Frameworks", "-iframework", "/System/Library/PrivateFrameworks"])
                 }
 
                 // Check options in the swiftc command.
@@ -4013,19 +4366,17 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     for (i, arg) in commandLine.enumerated() {
                         // 2-arg search paths, each one of which might be prepended by -Xcc.
                         if ["-I", "-isystem", "-iquote", "-F", "-iframework"].contains(arg) {
-                            if i>0, commandLine[i-1] == "-Xcc", i+2<commandLine.count {
-                                searchPaths.append(contentsOf: Array(commandLine[i-1...i+2]))
-                            }
-                            else if i<commandLine.count {
-                                searchPaths.append(contentsOf: Array(commandLine[i...i+1]))
+                            if i > 0, commandLine[i - 1] == "-Xcc", i + 2 < commandLine.count {
+                                searchPaths.append(contentsOf: Array(commandLine[i - 1...i + 2]))
+                            } else if i < commandLine.count {
+                                searchPaths.append(contentsOf: Array(commandLine[i...i + 1]))
                             }
                         }
                         // Single-arg search paths, which might be prepended by -Xcc.
                         else if arg.hasPrefix("-I") || arg.hasPrefix("-F") {
-                            if i>0, commandLine[i-1] == "-Xcc" {
-                                searchPaths.append(contentsOf: Array(commandLine[i-1...i]))
-                            }
-                            else {
+                            if i > 0, commandLine[i - 1] == "-Xcc" {
+                                searchPaths.append(contentsOf: Array(commandLine[i - 1...i]))
+                            } else {
                                 searchPaths.append(arg)
                             }
                         }
@@ -4040,8 +4391,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     for (i, arg) in commandLine.enumerated() {
                         // 2-arg search paths.
                         if ["-L", "-F", "-iframework"].contains(arg) {
-                            if i<commandLine.count {
-                                searchPaths.append(contentsOf: Array(commandLine[i...i+1]))
+                            if i < commandLine.count {
+                                searchPaths.append(contentsOf: Array(commandLine[i...i + 1]))
                             }
                         }
                         // Single-arg search paths, which might be prepended by -Xcc.
@@ -4069,36 +4420,41 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("SourceFile.m"),
                         TestFile("SwiftFile.swift"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug",
-                                           buildSettings: [
-                                            "INFOPLIST_FILE": "Info.plist",
-                                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                                            "CODE_SIGN_IDENTITY": "-",
-                                            "SWIFT_VERSION": swiftVersion,
-                                            "CLANG_USE_RESPONSE_FILE": "NO",
-                                           ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "INFOPLIST_FILE": "Info.plist",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "CODE_SIGN_IDENTITY": "-",
+                            "SWIFT_VERSION": swiftVersion,
+                            "CLANG_USE_RESPONSE_FILE": "NO",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         targetName,
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug"),
+                            TestBuildConfiguration("Debug")
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
                                 "SourceFile.m",
                                 "SwiftFile.swift",
-                            ]),
+                            ])
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             let core = try await getCore()
             let tester = try TaskConstructionTester(core, testProject)
             let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -4115,7 +4471,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             }
 
             // Check the LibSystem address sanitizer.
-            await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["ENABLE_ADDRESS_SANITIZER": "YES","ENABLE_SYSTEM_SANITIZERS": "YES" ]), runDestination: .macOS, fs: fs) { results in
+            await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["ENABLE_ADDRESS_SANITIZER": "YES", "ENABLE_SYSTEM_SANITIZERS": "YES"]), runDestination: .macOS, fs: fs) { results in
                 results.checkTarget(targetName) { target in
                     // There should be one CompileC task, which includes the ASan option, and which puts its output in a -asan directory.
                     results.checkTask(.matchTarget(target), .matchRuleType("CompileC")) { task in
@@ -4129,7 +4485,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     }
                     results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
                         task.checkCommandLineContains(
-                            ["-fsanitize=address", "-fsanitize-stable-abi", "\(SRCROOT)/build/Debug/\(targetName).app/Contents/MacOS/\(targetName)"
+                            [
+                                "-fsanitize=address", "-fsanitize-stable-abi", "\(SRCROOT)/build/Debug/\(targetName).app/Contents/MacOS/\(targetName)",
                             ])
                     }
                 }
@@ -4156,9 +4513,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
                     // There should be one task to copy the Asan library into the product.
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("libclang_rt.asan_osx_dynamic.dylib")) { task in
-                        task.checkRuleInfo([.equal("Copy"),
-                                            .equal("\(SRCROOT)/build/Debug/\(targetName).app/Contents/Frameworks/libclang_rt.asan_osx_dynamic.dylib"),
-                                            .equal(clangLibDarwinPath.join("libclang_rt.asan_osx_dynamic.dylib").str)])
+                        task.checkRuleInfo([
+                            .equal("Copy"),
+                            .equal("\(SRCROOT)/build/Debug/\(targetName).app/Contents/Frameworks/libclang_rt.asan_osx_dynamic.dylib"),
+                            .equal(clangLibDarwinPath.join("libclang_rt.asan_osx_dynamic.dylib").str),
+                        ])
                         task.checkCommandLineContains(["builtin-copy", "-exclude", ".DS_Store", "-exclude", "CVS", "-exclude", ".svn", "-exclude", ".git", "-exclude", ".hg", "-resolve-src-symlinks", clangLibDarwinPath.join("libclang_rt.asan_osx_dynamic.dylib").str, "\(SRCROOT)/build/Debug/\(targetName).app/Contents/Frameworks"])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Frameworks/libclang_rt.asan_osx_dynamic.dylib"),
@@ -4201,9 +4560,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 results.checkTarget(targetName) { target in
                     // There should be one task to copy the ASan library into the product.
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("libclang_rt.asan_osx_dynamic.dylib")) { task in
-                        task.checkRuleInfo([.equal("Copy"),
-                                            .equal("\(SRCROOT)/build/Debug/\(targetName).app/Contents/Frameworks/libclang_rt.asan_osx_dynamic.dylib"),
-                                            .equal(clangLibDarwinPath.join("libclang_rt.asan_osx_dynamic.dylib").str),])
+                        task.checkRuleInfo([
+                            .equal("Copy"),
+                            .equal("\(SRCROOT)/build/Debug/\(targetName).app/Contents/Frameworks/libclang_rt.asan_osx_dynamic.dylib"),
+                            .equal(clangLibDarwinPath.join("libclang_rt.asan_osx_dynamic.dylib").str),
+                        ])
                         task.checkCommandLineContains(["builtin-copy", "-exclude", ".DS_Store", "-exclude", "CVS", "-exclude", ".svn", "-exclude", ".git", "-exclude", ".hg", "-resolve-src-symlinks", clangLibDarwinPath.join("libclang_rt.asan_osx_dynamic.dylib").str, "\(SRCROOT)/build/Debug/\(targetName).app/Contents/Frameworks"])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Frameworks/libclang_rt.asan_osx_dynamic.dylib"),
@@ -4214,9 +4575,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
                     // There should be one task to copy the TSan library into the product.
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("libclang_rt.tsan_osx_dynamic.dylib")) { task in
-                        task.checkRuleInfo([.equal("Copy"),
-                                            .equal("\(SRCROOT)/build/Debug/\(targetName).app/Contents/Frameworks/libclang_rt.tsan_osx_dynamic.dylib"),
-                                            .equal(clangLibDarwinPath.join("libclang_rt.tsan_osx_dynamic.dylib").str)])
+                        task.checkRuleInfo([
+                            .equal("Copy"),
+                            .equal("\(SRCROOT)/build/Debug/\(targetName).app/Contents/Frameworks/libclang_rt.tsan_osx_dynamic.dylib"),
+                            .equal(clangLibDarwinPath.join("libclang_rt.tsan_osx_dynamic.dylib").str),
+                        ])
                         task.checkCommandLineContains(["builtin-copy", "-exclude", ".DS_Store", "-exclude", "CVS", "-exclude", ".svn", "-exclude", ".git", "-exclude", ".hg", "-resolve-src-symlinks", clangLibDarwinPath.join("libclang_rt.tsan_osx_dynamic.dylib").str, "\(SRCROOT)/build/Debug/\(targetName).app/Contents/Frameworks"])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Frameworks/libclang_rt.tsan_osx_dynamic.dylib"),
@@ -4290,9 +4653,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
                     // There should be one task to copy the TSan library into the product.
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("libclang_rt.tsan_osx_dynamic.dylib")) { task in
-                        task.checkRuleInfo([.equal("Copy"),
-                                            .equal("\(SRCROOT)/build/Debug/\(targetName).app/Contents/Frameworks/libclang_rt.tsan_osx_dynamic.dylib"),
-                                            .equal(clangLibDarwinPath.join("libclang_rt.tsan_osx_dynamic.dylib").str)])
+                        task.checkRuleInfo([
+                            .equal("Copy"),
+                            .equal("\(SRCROOT)/build/Debug/\(targetName).app/Contents/Frameworks/libclang_rt.tsan_osx_dynamic.dylib"),
+                            .equal(clangLibDarwinPath.join("libclang_rt.tsan_osx_dynamic.dylib").str),
+                        ])
                         task.checkCommandLineContains(["builtin-copy", "-exclude", ".DS_Store", "-exclude", "CVS", "-exclude", ".svn", "-exclude", ".git", "-exclude", ".hg", "-resolve-src-symlinks", clangLibDarwinPath.join("libclang_rt.tsan_osx_dynamic.dylib").str, "\(SRCROOT)/build/Debug/\(targetName).app/Contents/Frameworks"])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Frameworks/libclang_rt.tsan_osx_dynamic.dylib"),
@@ -4345,9 +4710,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
                     // There should be one task to copy the UBSan library into the product.
                     results.checkTask(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("libclang_rt.ubsan_osx_dynamic.dylib")) { task in
-                        task.checkRuleInfo([.equal("Copy"),
-                                            .equal("\(SRCROOT)/build/Debug/\(targetName).app/Contents/Frameworks/libclang_rt.ubsan_osx_dynamic.dylib"),
-                                            .equal(clangLibDarwinPath.join("libclang_rt.ubsan_osx_dynamic.dylib").str)])
+                        task.checkRuleInfo([
+                            .equal("Copy"),
+                            .equal("\(SRCROOT)/build/Debug/\(targetName).app/Contents/Frameworks/libclang_rt.ubsan_osx_dynamic.dylib"),
+                            .equal(clangLibDarwinPath.join("libclang_rt.ubsan_osx_dynamic.dylib").str),
+                        ])
                         task.checkCommandLineContains(["builtin-copy", "-exclude", ".DS_Store", "-exclude", "CVS", "-exclude", ".svn", "-exclude", ".git", "-exclude", ".hg", "-resolve-src-symlinks", clangLibDarwinPath.join("libclang_rt.ubsan_osx_dynamic.dylib").str, "\(SRCROOT)/build/Debug/\(targetName).app/Contents/Frameworks"])
                         task.checkOutputs([
                             .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/Frameworks/libclang_rt.ubsan_osx_dynamic.dylib"),
@@ -4385,19 +4752,26 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
     /// This is important because we allowing this to be valid can simplify the client logic in some situations.
     @Test(.requireSDKs(.macOS))
     func missingTargetDependency() async throws {
-        let testTarget = TestPackageProductTarget("Foo",
-                                                  frameworksBuildPhase: TestFrameworksBuildPhase(),
-                                                  dependencies: ["Lib", "MISSING-DEP"])
-        let libTarget = TestStandardTarget("Lib", type: .dynamicLibrary,
-                                           buildPhases: [
-                                            TestSourcesBuildPhase(["foo.c"]),
-                                            TestFrameworksBuildPhase(
-                                                [TestBuildFile(.target("OTHER-MISSING-DEP"))])])
+        let testTarget = TestPackageProductTarget(
+            "Foo",
+            frameworksBuildPhase: TestFrameworksBuildPhase(),
+            dependencies: ["Lib", "MISSING-DEP"]
+        )
+        let libTarget = TestStandardTarget(
+            "Lib",
+            type: .dynamicLibrary,
+            buildPhases: [
+                TestSourcesBuildPhase(["foo.c"]),
+                TestFrameworksBuildPhase(
+                    [TestBuildFile(.target("OTHER-MISSING-DEP"))]),
+            ]
+        )
         let testProject = TestPackageProject(
             "aProject",
             defaultConfigurationName: "Release",
             groupTree: TestGroup("Foo", children: [TestFile("foo.c")]),
-            targets: [testTarget, libTarget])
+            targets: [testTarget, libTarget]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
 
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
@@ -4420,12 +4794,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
         // Marshal the workspace into a build request from which we can create a product plan.
         let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
-        workspaceContext.updateUserInfo(UserInfo(user: "exampleUser", group: "exampleGroup", uid: 1234, gid:12345, home: Path("/Users/exampleUser"), environment: [:]))
+        workspaceContext.updateUserInfo(UserInfo(user: "exampleUser", group: "exampleGroup", uid: 1234, gid: 12345, home: Path("/Users/exampleUser"), environment: [:]))
         workspaceContext.updateSystemInfo(SystemInfo(operatingSystemVersion: Version(99, 98, 97), productBuildVersion: "99A98", nativeArchitecture: "x86_64"))
 
         let project = workspace.projects[0]
         let parameters = BuildParameters(configuration: "Debug")
-        let buildTargets = project.targets.map{ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }
+        let buildTargets = project.targets.map { BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }
         let buildRequest = BuildRequest(parameters: parameters, buildTargets: buildTargets, continueBuildingAfterErrors: true, useParallelTargets: true, useImplicitDependencies: false, useDryRun: false)
         let buildRequestContext = BuildRequestContext(workspaceContext: workspaceContext)
         let buildGraph = await TargetBuildGraph(workspaceContext: workspaceContext, buildRequest: buildRequest, buildRequestContext: buildRequestContext)
@@ -4459,8 +4833,9 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             groupTree: TestGroup(
                 "Foo",
                 children: [
-                    TestFile("foo.c"),
-                ]),
+                    TestFile("foo.c")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -4469,7 +4844,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "BUILD_VARIANTS": "normal profile",
                         "CODE_SIGN_IDENTITY": "-",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestAggregateTarget(
@@ -4484,21 +4860,25 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     "Tool",
                     type: .commandLineTool,
                     buildPhases: [
-                        TestSourcesBuildPhase(["foo.c"]),
-                    ]),
+                        TestSourcesBuildPhase(["foo.c"])
+                    ]
+                ),
                 TestStandardTarget(
                     "Framework",
                     type: .framework,
                     buildPhases: [
-                        TestSourcesBuildPhase(["foo.c"]),
-                    ]),
+                        TestSourcesBuildPhase(["foo.c"])
+                    ]
+                ),
                 TestStandardTarget(
                     "Application",
                     type: .application,
                     buildPhases: [
-                        TestSourcesBuildPhase(["foo.c"]),
-                    ]),
-            ])
+                        TestSourcesBuildPhase(["foo.c"])
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -4553,31 +4933,35 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             groupTree: TestGroup(
                 "Foo",
                 children: [
-                    TestFile("foo.c"),
-                ]),
+                    TestFile("foo.c")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "INSTALL_PATH": "/foo/../bar", // rdar://32178321
-                    ]),
+                        "INSTALL_PATH": "/foo/../bar",  // rdar://32178321
+                    ]
+                )
             ],
             targets: [
                 TestAggregateTarget(
                     "Aggregate",
                     dependencies: [
-                        "Tool",
+                        "Tool"
                     ]
                 ),
                 TestStandardTarget(
                     "Tool",
                     type: .commandLineTool,
                     buildPhases: [
-                        TestSourcesBuildPhase(["foo.c"]),
-                    ]),
-            ])
-
+                        TestSourcesBuildPhase(["foo.c"])
+                    ]
+                ),
+            ]
+        )
+
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
@@ -4612,7 +4996,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "SWIFT_VERSION": swiftVersion,
                         "GENERATE_INFOPLIST_FILE": "YES",
                     ]
-                ),
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -4627,17 +5011,17 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                                 "SKIP_INSTALL": "NO",
                                 "DEFINES_MODULE": "YES",
                                 "SWIFT_OBJC_INTERFACE_HEADER_NAME": "Header-Swift.h",
-                                "SWIFT_INSTALL_OBJC_HEADER" : "YES",
+                                "SWIFT_INSTALL_OBJC_HEADER": "YES",
                             ]
-                        ),
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
-                            TestBuildFile("MyFramework.h", headerVisibility: .public),
+                            TestBuildFile("MyFramework.h", headerVisibility: .public)
                         ]),
                         TestSourcesBuildPhase(["foo.swift"]),
                     ]
-                ),
+                )
             ]
         )
 
@@ -4665,11 +5049,13 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("main.m"),
                     TestFile("Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -4677,7 +5063,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "CODE_SIGN_IDENTITY": "",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "ARCHS": "x86_64",
-                    ]),
+                    ]
+                ),
                 TestBuildConfiguration(
                     "Release",
                     buildSettings: [
@@ -4686,7 +5073,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "ARCHS": "x86_64 x86_64h",
                         "VALID_ARCHS": "$(inherited) x86_64h",
                         "BUILD_VARIANTS": "normal debug profile",
-                    ]),
+                    ]
+                ),
             ],
             targets: [
                 TestStandardTarget(
@@ -4698,11 +5086,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.m",
+                            "main.m"
                         ]),
-                        TestShellScriptBuildPhase(name: "Run Script", shellPath: "/bin/sh", originalObjectID: "Run Script", contents: "echo \"Running script\"\nexit 0", alwaysOutOfDate: true)
+                        TestShellScriptBuildPhase(name: "Run Script", shellPath: "/bin/sh", originalObjectID: "Run Script", contents: "echo \"Running script\"\nexit 0", alwaysOutOfDate: true),
                     ]
-                ),
+                )
             ]
         )
         let tester = try await TaskConstructionTester(getCore(), testProject)
@@ -4776,8 +5164,9 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             groupTree: TestGroup(
                 "SomeFiles",
                 children: [
-                    TestFile("Foo.c"),
-                ]),
+                    TestFile("Foo.c")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -4788,18 +5177,21 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "HEADER_SEARCH_PATHS": "System/**",
                         "FRAMEWORK_SEARCH_PATHS": "Framework/**",
                         "CLANG_USE_RESPONSE_FILE": "NO",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "Tool", type: .commandLineTool,
+                    "Tool",
+                    type: .commandLineTool,
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Foo.c",
-                        ]),
+                            "Foo.c"
+                        ])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -4816,22 +5208,31 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     let buildProductsDirSuffix = RunDestinationInfo.host.builtProductsDirSuffix
                     let iQuoteArgs = task.commandLine.enumerated().filter { (i, arg) in
                         (task.commandLine[safe: i - 1]?.asString ?? "") == "-iquote"
-                    }.map{ $0.1.asString }
-                    let capIArgs = task.commandLine.filter{ $0.asString.hasPrefix("-I") }.map{ $0.asString }
-                    let capFArgs = task.commandLine.filter{ $0.asString.hasPrefix("-F") }.map{ $0.asString }
-                    #expect(iQuoteArgs == [
-                        "User", Path("User/FooUser").str, Path("User/FooUser/Bar").str,
-                        Path("/MissingPath").str, "OtherMissingPath"])
-                    #expect(capIArgs == [
-                        "-I\(Path(SRCROOT).join("build/Debug\(buildProductsDirSuffix)/include").str)",
-                        "-ISystem", "-I\(Path("System/FooSystem").str)", "-I\(Path("System/FooSystem/Bar").str)",
-                        "-I\(Path(SRCROOT).join("build/aProject.build/Debug\(buildProductsDirSuffix)/Tool.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)").str)",
-                        "-I\(Path(SRCROOT).join("build/aProject.build/Debug\(buildProductsDirSuffix)/Tool.build/DerivedSources/\(results.runDestinationTargetArchitecture)").str)",
-                        "-I\(Path(SRCROOT).join("build/aProject.build/Debug\(buildProductsDirSuffix)/Tool.build/DerivedSources").str)"])
+                    }.map { $0.1.asString }
+                    let capIArgs = task.commandLine.filter { $0.asString.hasPrefix("-I") }.map { $0.asString }
+                    let capFArgs = task.commandLine.filter { $0.asString.hasPrefix("-F") }.map { $0.asString }
+                    #expect(
+                        iQuoteArgs == [
+                            "User", Path("User/FooUser").str, Path("User/FooUser/Bar").str,
+                            Path("/MissingPath").str, "OtherMissingPath",
+                        ]
+                    )
+                    #expect(
+                        capIArgs == [
+                            "-I\(Path(SRCROOT).join("build/Debug\(buildProductsDirSuffix)/include").str)",
+                            "-ISystem", "-I\(Path("System/FooSystem").str)", "-I\(Path("System/FooSystem/Bar").str)",
+                            "-I\(Path(SRCROOT).join("build/aProject.build/Debug\(buildProductsDirSuffix)/Tool.build/DerivedSources-normal/\(results.runDestinationTargetArchitecture)").str)",
+                            "-I\(Path(SRCROOT).join("build/aProject.build/Debug\(buildProductsDirSuffix)/Tool.build/DerivedSources/\(results.runDestinationTargetArchitecture)").str)",
+                            "-I\(Path(SRCROOT).join("build/aProject.build/Debug\(buildProductsDirSuffix)/Tool.build/DerivedSources").str)",
+                        ]
+                    )
                     if RunDestinationInfo.host == .macOS {
-                        #expect(capFArgs == [
-                            "-F\(SRCROOT)/build/Debug",
-                            "-FFramework", "-FFramework/FooFramework", "-FFramework/FooFramework/Bar"])
+                        #expect(
+                            capFArgs == [
+                                "-F\(SRCROOT)/build/Debug",
+                                "-FFramework", "-FFramework/FooFramework", "-FFramework/FooFramework/Bar",
+                            ]
+                        )
                     }
                 }
             }
@@ -4849,8 +5250,9 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             groupTree: TestGroup(
                 "SomeFiles",
                 children: [
-                    TestFile("Foo.c"),
-                ]),
+                    TestFile("Foo.c")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -4859,18 +5261,21 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "USE_HEADERMAP": "NO",
                         "FRAMEWORK_SEARCH_PATHS": "Framework/**",
                         "LIBRARY_SEARCH_PATHS": "Library/**",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "Tool", type: .commandLineTool,
+                    "Tool",
+                    type: .commandLineTool,
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Foo.c",
-                        ]),
+                            "Foo.c"
+                        ])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -4883,16 +5288,22 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         await tester.checkBuild(runDestination: .macOS, fs: fs) { results in
             results.checkTarget("Tool") { target in
                 results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
-                    let capLArgs = task.commandLine.filter{ $0.asString.hasPrefix("-L") }.map{ $0.asString }
-                    let capFArgs = task.commandLine.filter{ $0.asString.hasPrefix("-F") }.map{ $0.asString }
-                    #expect(capLArgs == [
-                        "-L\(SRCROOT)/build/EagerLinkingTBDs/Debug",
-                        "-L\(SRCROOT)/build/Debug",
-                        "-LLibrary", "-LLibrary/A", "-LLibrary/A/B"])
-                    #expect(capFArgs == [
-                        "-F\(SRCROOT)/build/EagerLinkingTBDs/Debug",
-                        "-F\(SRCROOT)/build/Debug",
-                        "-FFramework", "-FFramework/A", "-FFramework/A/B"])
+                    let capLArgs = task.commandLine.filter { $0.asString.hasPrefix("-L") }.map { $0.asString }
+                    let capFArgs = task.commandLine.filter { $0.asString.hasPrefix("-F") }.map { $0.asString }
+                    #expect(
+                        capLArgs == [
+                            "-L\(SRCROOT)/build/EagerLinkingTBDs/Debug",
+                            "-L\(SRCROOT)/build/Debug",
+                            "-LLibrary", "-LLibrary/A", "-LLibrary/A/B",
+                        ]
+                    )
+                    #expect(
+                        capFArgs == [
+                            "-F\(SRCROOT)/build/EagerLinkingTBDs/Debug",
+                            "-F\(SRCROOT)/build/Debug",
+                            "-FFramework", "-FFramework/A", "-FFramework/A/B",
+                        ]
+                    )
                 }
             }
 
@@ -4906,9 +5317,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "Sources", children: [
-                    TestFile("PackageDefinition.instrpkg"),
-                ]),
+                "Sources",
+                children: [
+                    TestFile("PackageDefinition.instrpkg")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -4916,19 +5329,21 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
                     ]
-                )],
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Measure",
                     type: .instrumentsPackage,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [:]),
+                        TestBuildConfiguration("Debug", buildSettings: [:])
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["PackageDefinition.instrpkg"]),
+                        TestSourcesBuildPhase(["PackageDefinition.instrpkg"])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -4959,14 +5374,18 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     TestFile("Object.o"),
                     TestFile("Framework.framework"),
                     TestFile("libAnotherStatic.a"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "ARCHS": "arm64",
-                    "LIBTOOL": libtoolPath.str,
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "ARCHS": "arm64",
+                        "LIBTOOL": libtoolPath.str,
+                    ]
+                )
             ],
             targets: [
                 // Test building a tool target which links a static library.
@@ -4974,7 +5393,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     "Tool",
                     type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["File.c"]),
@@ -4987,7 +5406,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     "StaticLib1",
                     type: .staticLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["File.c"]),
@@ -5005,23 +5424,24 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     "StaticLib2",
                     type: .staticLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["File.c"]),
+                        TestSourcesBuildPhase(["File.c"])
                     ]
                 ),
                 TestStandardTarget(
                     "DynamicLib1",
                     type: .dynamicLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["File.c"]),
+                        TestSourcesBuildPhase(["File.c"])
                     ]
                 ),
-            ])
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -5061,10 +5481,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRuleType("WriteAuxiliaryFile"), .matchRuleItemPattern(.suffix("/StaticLib1.LinkFileList"))) { task, contents in
                     task.checkRuleInfo(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/StaticLib1.build/Objects-normal/arm64/StaticLib1.LinkFileList"])
                     let contentsLines = contents.asString.dropLast().components(separatedBy: .newlines)
-                    #expect(contentsLines == [
-                        "\(SRCROOT)/build/aProject.build/Debug/StaticLib1.build/Objects-normal/arm64/File.o",
-                        "\(SRCROOT)/Object.o",
-                  ])
+                    #expect(
+                        contentsLines == [
+                            "\(SRCROOT)/build/aProject.build/Debug/StaticLib1.build/Objects-normal/arm64/File.o",
+                            "\(SRCROOT)/Object.o",
+                        ]
+                    )
                 }
             }
 
@@ -5086,71 +5508,90 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
     @Test(.requireSDKs(.macOS, .iOS))
     func packageProductsNoDuplicatedOutputs() async throws {
-        let project = TestPackageProject("aPackage", groupTree: TestGroup("Package", children: [TestFile("File.c")]),
-                                         buildConfigurations: [
-                                            TestBuildConfiguration("Debug", buildSettings: [
-                                                "GENERATE_INFOPLIST_FILE": "YES",
-                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                            ]),
-                                         ], targets: [
-                                            TestStandardTarget("Tool", type: .application, buildConfigurations: [ TestBuildConfiguration("Debug") ], buildPhases: [ TestSourcesBuildPhase(["File.c"]), TestFrameworksBuildPhase([TestBuildFile(.target("PackageLibProduct2")), TestBuildFile(.target("PackageLibProduct")) ]), TestCopyFilesBuildPhase([TestBuildFile(.target("PackageLibProduct"))], destinationSubfolder: .frameworks, onlyForDeployment: false) ], dependencies: ["PackageLibProduct2"]),
-                                            TestStandardTarget("PackageLib", type: .objectFile),
-                                            TestStandardTarget("PackageLib4", type: .objectFile),
-                                            TestStandardTarget(
-                                                "PackageLibProduct",
-                                                type: .framework,
-                                                buildConfigurations: [
-                                                    // Targets need to opt-in to specialization.
-                                                    TestBuildConfiguration("Debug", buildSettings: [
-                                                        "SDKROOT": "auto",
-                                                        "SDK_VARIANT": "auto",
-                                                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                                    ]),
-                                                ],
-                                                buildPhases: [TestFrameworksBuildPhase([TestBuildFile(.target("PackageLib"))])],
-                                                dependencies: ["PackageLib"]
-                                            ),
-                                            TestPackageProductTarget(
-                                                "PackageLibProduct2",
-                                                frameworksBuildPhase: TestFrameworksBuildPhase([ TestBuildFile(.target("PackageLibProduct")), TestBuildFile(.target("PackageLibProduct3")), TestBuildFile(.target("PackageLibProduct4"), platformFilters: PlatformFilter.iOSFilters) ]),
-                                                buildConfigurations: [
-                                                    // Targets need to opt-in to specialization.
-                                                    TestBuildConfiguration("Debug", buildSettings: [
-                                                        "SDKROOT": "auto",
-                                                        "SDK_VARIANT": "auto",
-                                                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                                    ]),
-                                                ],
-                                                dependencies: ["PackageLibProduct", "PackageLibProduct3", "PackageLibProduct4"]
-                                            ),
-                                            TestPackageProductTarget(
-                                                "PackageLibProduct3",
-                                                frameworksBuildPhase: TestFrameworksBuildPhase([ TestBuildFile(.target("PackageLibProduct4"), platformFilters: PlatformFilter.macOSFilters)]),
-                                                buildConfigurations: [
-                                                    // Targets need to opt-in to specialization.
-                                                    TestBuildConfiguration("Debug", buildSettings: [
-                                                        "SDKROOT": "auto",
-                                                        "SDK_VARIANT": "auto",
-                                                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                                    ]),
-                                                ],
-                                                dependencies: ["PackageLibProduct4"]
-                                            ),
-                                            TestStandardTarget(
-                                                "PackageLibProduct4",
-                                                type: .framework,
-                                                buildConfigurations: [
-                                                    // Targets need to opt-in to specialization.
-                                                    TestBuildConfiguration("Debug", buildSettings: [
-                                                        "SDKROOT": "auto",
-                                                        "SDK_VARIANT": "auto",
-                                                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                                    ]),
-                                                ],
-                                                buildPhases: [TestFrameworksBuildPhase([TestBuildFile(.target("PackageLib4"))])],
-                                                dependencies: ["PackageLib4"]
-                                            ),
-                                         ])
+        let project = TestPackageProject(
+            "aPackage",
+            groupTree: TestGroup("Package", children: [TestFile("File.c")]),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
+            ],
+            targets: [
+                TestStandardTarget("Tool", type: .application, buildConfigurations: [TestBuildConfiguration("Debug")], buildPhases: [TestSourcesBuildPhase(["File.c"]), TestFrameworksBuildPhase([TestBuildFile(.target("PackageLibProduct2")), TestBuildFile(.target("PackageLibProduct"))]), TestCopyFilesBuildPhase([TestBuildFile(.target("PackageLibProduct"))], destinationSubfolder: .frameworks, onlyForDeployment: false)], dependencies: ["PackageLibProduct2"]),
+                TestStandardTarget("PackageLib", type: .objectFile),
+                TestStandardTarget("PackageLib4", type: .objectFile),
+                TestStandardTarget(
+                    "PackageLibProduct",
+                    type: .framework,
+                    buildConfigurations: [
+                        // Targets need to opt-in to specialization.
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SDK_VARIANT": "auto",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                            ]
+                        )
+                    ],
+                    buildPhases: [TestFrameworksBuildPhase([TestBuildFile(.target("PackageLib"))])],
+                    dependencies: ["PackageLib"]
+                ),
+                TestPackageProductTarget(
+                    "PackageLibProduct2",
+                    frameworksBuildPhase: TestFrameworksBuildPhase([TestBuildFile(.target("PackageLibProduct")), TestBuildFile(.target("PackageLibProduct3")), TestBuildFile(.target("PackageLibProduct4"), platformFilters: PlatformFilter.iOSFilters)]),
+                    buildConfigurations: [
+                        // Targets need to opt-in to specialization.
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SDK_VARIANT": "auto",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                            ]
+                        )
+                    ],
+                    dependencies: ["PackageLibProduct", "PackageLibProduct3", "PackageLibProduct4"]
+                ),
+                TestPackageProductTarget(
+                    "PackageLibProduct3",
+                    frameworksBuildPhase: TestFrameworksBuildPhase([TestBuildFile(.target("PackageLibProduct4"), platformFilters: PlatformFilter.macOSFilters)]),
+                    buildConfigurations: [
+                        // Targets need to opt-in to specialization.
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SDK_VARIANT": "auto",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                            ]
+                        )
+                    ],
+                    dependencies: ["PackageLibProduct4"]
+                ),
+                TestStandardTarget(
+                    "PackageLibProduct4",
+                    type: .framework,
+                    buildConfigurations: [
+                        // Targets need to opt-in to specialization.
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SDK_VARIANT": "auto",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                            ]
+                        )
+                    ],
+                    buildPhases: [TestFrameworksBuildPhase([TestBuildFile(.target("PackageLib4"))])],
+                    dependencies: ["PackageLib4"]
+                ),
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), project)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -5191,46 +5632,60 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
     func testDynamicPackageProductGetsLinkedAndEmbedded(destination: RunDestinationInfo) async throws {
         let core = try await getCore()
-        let project = TestPackageProject("aPackage", groupTree: TestGroup("Package", children: [TestFile("File.c")]),
-                                         buildConfigurations: [
-                                            TestBuildConfiguration("Debug", buildSettings: [
-                                                "GENERATE_INFOPLIST_FILE": "YES",
-                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                                "IPHONEOS_DEPLOYMENT_TARGET": core.loadSDK(.iOS).defaultDeploymentTarget,
-                                            ]),
-                                         ], targets: [
-                                            TestStandardTarget("Tool", type: .application, buildConfigurations: [ TestBuildConfiguration("Debug", buildSettings: ["SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)"]) ], buildPhases: [ TestSourcesBuildPhase(["File.c"]), TestFrameworksBuildPhase([TestBuildFile(.target("PackageLibProduct")) ]) ], dependencies: ["PackageLibProduct"]),
-                                            TestPackageProductTarget(
-                                                "PackageLibProduct",
-                                                frameworksBuildPhase: TestFrameworksBuildPhase([
-                                                    TestBuildFile(.target("PackageLib"))]),
-                                                dynamicTargetVariantName: "PackageLibProduct-dynamic",
-                                                buildConfigurations: [
-                                                    // Targets need to opt-in to specialization.
-                                                    TestBuildConfiguration("Debug", buildSettings: [
-                                                        "SDKROOT": "auto",
-                                                        "SDK_VARIANT": "auto",
-                                                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                                    ]),
-                                                ],
-                                                dependencies: ["PackageLib"]
-                                            ),
-                                            TestStandardTarget("PackageLib", type: .objectFile),
-                                            TestStandardTarget(
-                                                "PackageLibProduct-dynamic",
-                                                type: .framework,
-                                                buildConfigurations: [
-                                                    // Targets need to opt-in to specialization.
-                                                    TestBuildConfiguration("Debug", buildSettings: [
-                                                        "SDKROOT": "auto",
-                                                        "SDK_VARIANT": "auto",
-                                                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                                    ]),
-                                                ],
-                                                buildPhases: [TestFrameworksBuildPhase([TestBuildFile(.target("PackageLib"))])],
-                                                dependencies: ["PackageLib"]
-                                            ),
-                                         ])
+        let project = TestPackageProject(
+            "aPackage",
+            groupTree: TestGroup("Package", children: [TestFile("File.c")]),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "IPHONEOS_DEPLOYMENT_TARGET": core.loadSDK(.iOS).defaultDeploymentTarget,
+                    ]
+                )
+            ],
+            targets: [
+                TestStandardTarget("Tool", type: .application, buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)"])], buildPhases: [TestSourcesBuildPhase(["File.c"]), TestFrameworksBuildPhase([TestBuildFile(.target("PackageLibProduct"))])], dependencies: ["PackageLibProduct"]),
+                TestPackageProductTarget(
+                    "PackageLibProduct",
+                    frameworksBuildPhase: TestFrameworksBuildPhase([
+                        TestBuildFile(.target("PackageLib"))
+                    ]),
+                    dynamicTargetVariantName: "PackageLibProduct-dynamic",
+                    buildConfigurations: [
+                        // Targets need to opt-in to specialization.
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SDK_VARIANT": "auto",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                            ]
+                        )
+                    ],
+                    dependencies: ["PackageLib"]
+                ),
+                TestStandardTarget("PackageLib", type: .objectFile),
+                TestStandardTarget(
+                    "PackageLibProduct-dynamic",
+                    type: .framework,
+                    buildConfigurations: [
+                        // Targets need to opt-in to specialization.
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "auto",
+                                "SDK_VARIANT": "auto",
+                                "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                            ]
+                        )
+                    ],
+                    buildPhases: [TestFrameworksBuildPhase([TestBuildFile(.target("PackageLib"))])],
+                    dependencies: ["PackageLib"]
+                ),
+            ]
+        )
 
         // This adds `PACKAGE_BUILD_DYNAMICALLY` as an override to activate dynamic variants of targets.
         let buildParameters = BuildParameters(action: .build, configuration: "Debug", activeRunDestination: RunDestinationInfo.macOS, activeArchitecture: nil, overrides: ["PACKAGE_BUILD_DYNAMICALLY": "YES"], commandLineOverrides: [:], commandLineConfigOverrides: [:], environmentConfigOverrides: [:], toolchainOverride: nil, arena: nil)
@@ -5274,72 +5729,85 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
     @Test(.requireSDKs(.macOS))
     func weakLinking() async throws {
         try await withTemporaryDirectory { (tmpDirPath: Path) in
-            let testWorkspace = try await TestWorkspace("aWorkspace", sourceRoot: tmpDirPath, projects: [
-                TestProject(
-                    "aToolProject",
-                    groupTree: TestGroup(
-                        "SomeFiles",
-                        children: [
-                            TestFile("SourceFile.swift"),
-                            TestFile("Framework.framework"),
-                        ]),
-                    buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "ARCH": "x86_64",
-                            "CODE_SIGN_IDENTITY": "-",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": swiftVersion,
-                            "TAPI_EXEC": tapiToolPath.str,
-                        ]),
-                    ],
-                    targets: [
-                        TestStandardTarget(
-                            "Tool",
-                            type: .commandLineTool,
-                            buildConfigurations: [
-                                TestBuildConfiguration("Debug"),
-                            ],
-                            buildPhases: [
-                                TestSourcesBuildPhase(["SourceFile.swift"]),
-                                TestFrameworksBuildPhase([
-                                    TestBuildFile(.target("Framework"), shouldLinkWeakly: true)
-                                ])
-                            ],
-                            dependencies: ["Framework"]
-                        ),
-                    ]),
-                TestProject(
-                    "aFrameworkProject",
-                    groupTree: TestGroup(
-                        "SomeFiles",
-                        children: [
-                        ]),
-                    buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "ARCH": "x86_64",
-                            "CODE_SIGN_IDENTITY": "-",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": swiftVersion,
-                            "TAPI_EXEC": tapiToolPath.str,
-                        ]),
-                    ],
-                    targets: [
-                        TestStandardTarget(
-                            "Framework",
-                            type: .framework,
-                            buildConfigurations: [
-                                TestBuildConfiguration("Debug"),
-                            ],
-                            buildPhases: [
-                                TestSourcesBuildPhase(["SourceFile.swift"]),
+            let testWorkspace = try await TestWorkspace(
+                "aWorkspace",
+                sourceRoot: tmpDirPath,
+                projects: [
+                    TestProject(
+                        "aToolProject",
+                        groupTree: TestGroup(
+                            "SomeFiles",
+                            children: [
+                                TestFile("SourceFile.swift"),
+                                TestFile("Framework.framework"),
                             ]
                         ),
-                    ])
-            ])
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ARCH": "x86_64",
+                                    "CODE_SIGN_IDENTITY": "-",
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "TAPI_EXEC": tapiToolPath.str,
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "Tool",
+                                type: .commandLineTool,
+                                buildConfigurations: [
+                                    TestBuildConfiguration("Debug")
+                                ],
+                                buildPhases: [
+                                    TestSourcesBuildPhase(["SourceFile.swift"]),
+                                    TestFrameworksBuildPhase([
+                                        TestBuildFile(.target("Framework"), shouldLinkWeakly: true)
+                                    ]),
+                                ],
+                                dependencies: ["Framework"]
+                            )
+                        ]
+                    ),
+                    TestProject(
+                        "aFrameworkProject",
+                        groupTree: TestGroup(
+                            "SomeFiles",
+                            children: []
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ARCH": "x86_64",
+                                    "CODE_SIGN_IDENTITY": "-",
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "TAPI_EXEC": tapiToolPath.str,
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "Framework",
+                                type: .framework,
+                                buildConfigurations: [
+                                    TestBuildConfiguration("Debug")
+                                ],
+                                buildPhases: [
+                                    TestSourcesBuildPhase(["SourceFile.swift"])
+                                ]
+                            )
+                        ]
+                    ),
+                ]
+            )
 
             let fs = localFS
             let tester = try await TaskConstructionTester(getCore(), testWorkspace)
@@ -5375,16 +5843,20 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     TestFile("SourceFile.swift"),
                     TestFile("OtherObject.o"),
                     TestFile("Framework.framework"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "ARCH": "x86_64",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "TAPI_EXEC": tapiToolPath.str,
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ARCH": "x86_64",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "TAPI_EXEC": tapiToolPath.str,
+                    ]
+                )
             ],
             targets: [
                 // Test building a tool target that links an object file product.
@@ -5392,7 +5864,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     "Tool",
                     type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["SourceFile.swift"]),
@@ -5405,7 +5877,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     "ObjectFile1",
                     type: .objectFile,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["SourceFile.swift"]),
@@ -5422,23 +5894,24 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     "ObjectFile2",
                     type: .objectFile,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: ["OTHER_LDFLAGS": "-d"]),
+                        TestBuildConfiguration("Debug", buildSettings: ["OTHER_LDFLAGS": "-d"])
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SourceFile.swift"]),
+                        TestSourcesBuildPhase(["SourceFile.swift"])
                     ]
                 ),
                 TestStandardTarget(
                     "DynamicLib1",
                     type: .dynamicLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SourceFile.swift"]),
+                        TestSourcesBuildPhase(["SourceFile.swift"])
                     ]
                 ),
-            ])
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -5498,17 +5971,27 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "SomeFiles",
                 children: [
                     TestFile("File.c", guid: "UPPER"),
-                    TestFile("file.c", guid: "LOWER")]),
+                    TestFile("file.c", guid: "LOWER"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)"])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Tool",
                     type: .commandLineTool,
                     buildPhases: [
-                        TestSourcesBuildPhase(["File.c", "file.c"])]
-                )])
+                        TestSourcesBuildPhase(["File.c", "file.c"])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -5531,17 +6014,28 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
-                children: [TestFile("a.c")]),
+                "SomeFiles",
+                path: "Sources",
+                children: [TestFile("a.c")]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)", "CLANG_USE_RESPONSE_FILE": "NO",])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)", "CLANG_USE_RESPONSE_FILE": "NO",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Tool",
                     type: .commandLineTool,
                     buildPhases: [
-                        TestSourcesBuildPhase(["a.c"])])])
+                        TestSourcesBuildPhase(["a.c"])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(runDestination: .macOS) { results in
@@ -5560,22 +6054,32 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
-                children: [TestFile("a.s")]),
+                "SomeFiles",
+                path: "Sources",
+                children: [TestFile("a.s")]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
-                    "GCC_PREFIX_HEADER": "/tmp/does-not-exist",
-                    "VERSIONING_SYSTEM": "apple-generic",
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
+                        "GCC_PREFIX_HEADER": "/tmp/does-not-exist",
+                        "VERSIONING_SYSTEM": "apple-generic",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Tool",
                     type: .commandLineTool,
                     buildPhases: [
-                        TestSourcesBuildPhase(["a.s"])])])
+                        TestSourcesBuildPhase(["a.s"])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(runDestination: .macOS) { results in
@@ -5599,40 +6103,61 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             "ReferencedProject",
             sourceRoot: Path("/TEST/REFERENCED"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
-                children: [TestFile("Core.c")]),
+                "SomeFiles",
+                path: "Sources",
+                children: [TestFile("Core.c")]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "LIBTOOL": libtoolPath.str,
-                ])],
-            targets: [TestStandardTarget(
-                "Core",
-                type: .staticLibrary,
-                buildPhases: [TestSourcesBuildPhase(["Core.c"])])])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "LIBTOOL": libtoolPath.str,
+                    ]
+                )
+            ],
+            targets: [
+                TestStandardTarget(
+                    "Core",
+                    type: .staticLibrary,
+                    buildPhases: [TestSourcesBuildPhase(["Core.c"])]
+                )
+            ]
+        )
         let testProject = try await TestProject(
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
-                children: [TestFile("main.c"), TestFile("Other.c")]),
+                "SomeFiles",
+                path: "Sources",
+                children: [TestFile("main.c"), TestFile("Other.c")]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "LIBTOOL": libtoolPath.str,
-                ])],
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "LIBTOOL": libtoolPath.str,
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Tool",
                     type: .commandLineTool,
                     buildPhases: [
                         TestSourcesBuildPhase(["main.c"]),
-                        TestFrameworksBuildPhase(["libCore.a", "libOther.a"])],
-                    dependencies: ["Core", "Other"]),
+                        TestFrameworksBuildPhase(["libCore.a", "libOther.a"]),
+                    ],
+                    dependencies: ["Core", "Other"]
+                ),
                 TestStandardTarget(
                     "Other",
                     type: .staticLibrary,
-                    buildPhases: [TestSourcesBuildPhase(["Other.c"])])])
+                    buildPhases: [TestSourcesBuildPhase(["Other.c"])]
+                ),
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject, referencedProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
@@ -5654,19 +6179,23 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("main.c"),
                     TestFile("lex.l"),
                     TestFile("image.png"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ])],
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "App",
@@ -5676,24 +6205,32 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         TestResourcesBuildPhase(["lex.l"], onlyForDeployment: false),
                         TestCopyFilesBuildPhase(["image.png"], destinationSubfolder: .builtProductsDir, destinationSubpath: "images", onlyForDeployment: false),
                     ],
-                    dependencies: ["Tool"]),
+                    dependencies: ["Tool"]
+                ),
                 TestStandardTarget(
                     "Tool",
                     type: .commandLineTool,
                     buildPhases: [
                         TestSourcesBuildPhase(["main.c"]),
                         TestCopyFilesBuildPhase(["image.png"], destinationSubfolder: .builtProductsDir, destinationSubpath: "images", onlyForDeployment: false),
-                    ])])
+                    ]
+                ),
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
         await tester.checkBuild(runDestination: .macOS, checkTaskGraphIntegrity: false) { results in
             // The sources and resources build phase generate identical tasks in the same target.
-            results.checkError(.equal([
-                "Unexpected duplicate tasks",
-                "Target 'App' (project 'aProject'): Lex /TEST/Sources/lex.l",
-                "Target 'App' (project 'aProject'): Lex /TEST/Sources/lex.l"
-            ].joined(separator: "\n")))
+            results.checkError(
+                .equal(
+                    [
+                        "Unexpected duplicate tasks",
+                        "Target 'App' (project 'aProject'): Lex /TEST/Sources/lex.l",
+                        "Target 'App' (project 'aProject'): Lex /TEST/Sources/lex.l",
+                    ].joined(separator: "\n")
+                )
+            )
 
             // This is currently an expected warning as a result of putting lex.l in a resources phase
             results.checkWarning("unexpected C compiler invocation with specified outputs: '/TEST/build/Debug/App.app/Contents/Resources/lex.yy.c' (for input: '/TEST/build/aProject.build/Debug/App.build/DerivedSources/lex.yy.c') (in target 'App' from project 'aProject')")
@@ -5717,16 +6254,19 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("main.c"),
-                ]),
+                    TestFile("main.c")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -5739,13 +6279,16 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                                 // This path has extra slashes in it.
                                 "INSTALL_PATH": "///foo/bar",
                                 "SKIP_INSTALL": "NO",
-                            ]),
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["main.c"]),
                         TestFrameworksBuildPhase([]),
-                    ]),
-            ])
+                    ]
+                )
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
@@ -5775,7 +6318,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     TestFile("SourceOne.m"),
                     TestFile("FrameworkTarget.h"),
                     TestFile("MyInfo.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -5785,25 +6329,27 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "DEFINES_MODULE": "YES",
                         // Public module map will be automatically generated
                         "MODULEMAP_PRIVATE_FILE": "A/B/private.modulemap",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "FrameworkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"]),
+                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "SourceOne.m",
+                            "SourceOne.m"
                         ]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("FrameworkTarget.h", headerVisibility: .public),
+                            TestBuildFile("FrameworkTarget.h", headerVisibility: .public)
                         ]),
                     ]
-                ),
-            ])
+                )
+            ]
+        )
 
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
@@ -5819,7 +6365,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         await tester.checkBuild(BuildParameters(action: .install, configuration: "Debug"), runDestination: .macOS, fs: fs) { results in
             results.checkTarget("FrameworkTarget") { target in
 
-                func recursivelyForEachDict(_ item: PropertyListItem, _ body: ([String:PropertyListItem]) -> Void) {
+                func recursivelyForEachDict(_ item: PropertyListItem, _ body: ([String: PropertyListItem]) -> Void) {
                     if let item = item.dictValue {
                         body(item)
                         for (_, value) in item {
@@ -5861,7 +6407,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     TestFile("SourceOne.m"),
                     TestFile("FrameworkTarget.h"),
                     TestFile("FrameworkTarget2.h"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -5871,16 +6418,20 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "DEFINES_MODULE": "YES",
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "FrameworkTarget1",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SWIFT_INSTALL_OBJC_HEADER": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SWIFT_INSTALL_OBJC_HEADER": "YES"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -5888,7 +6439,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             "SourceOne.m",
                         ]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("FrameworkTarget.h", headerVisibility: .public),
+                            TestBuildFile("FrameworkTarget.h", headerVisibility: .public)
                         ]),
                     ]
                 ),
@@ -5896,9 +6447,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     "FrameworkTarget2",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SWIFT_INSTALL_OBJC_HEADER": "NO",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SWIFT_INSTALL_OBJC_HEADER": "NO"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -5906,18 +6460,19 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             "SourceOne.m",
                         ]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("FrameworkTarget2.h", headerVisibility: .public),
+                            TestBuildFile("FrameworkTarget2.h", headerVisibility: .public)
                         ]),
                     ]
                 ),
-            ])
+            ]
+        )
 
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
         let parameters = BuildParameters(configuration: "Debug")
-        let buildTargets = tester.workspace.projects[0].targets.map{ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }
+        let buildTargets = tester.workspace.projects[0].targets.map { BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }
 
-        func recursivelyForEachDict(_ item: PropertyListItem, _ body: ([String:PropertyListItem]) -> Void) {
+        func recursivelyForEachDict(_ item: PropertyListItem, _ body: ([String: PropertyListItem]) -> Void) {
             if let item = item.dictValue {
                 body(item)
                 for (_, value) in item {
@@ -5966,7 +6521,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 var buildSettings = try await [
                     "CODE_SIGN_IDENTITY": "",
                     "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "5"
+                    "SWIFT_VERSION": "5",
                 ]
                 if let installHeaderSetting {
                     buildSettings["SWIFT_INSTALL_OBJC_HEADER"] = installHeaderSetting
@@ -5981,11 +6536,14 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     groupTree: TestGroup(
                         "SomeFiles",
                         path: "Sources",
-                        children: [TestFile("SourceFile1.swift")]),
+                        children: [TestFile("SourceFile1.swift")]
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
-                            buildSettings: buildSettings)],
+                            buildSettings: buildSettings
+                        )
+                    ],
                     targets: [
                         TestStandardTarget(
                             "MyFramework1",
@@ -6015,31 +6573,39 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
     /// Tests that clang's PatternsOfFlagsNotAffectingPrecomps don't contribute to PCH hash.
     @Test(.requireSDKs(.macOS))
     func prefixHeaderHashIgnoresNeutralFlags() async throws {
-        let testProject = TestProject("MyProject",
-                                      sourceRoot: Path("/MyProject"),
-                                      groupTree: TestGroup("SomeFiles",
-                                                           path: "Sources",
-                                                           children: [
-                                                            TestFile("Prefix.pch"),
-                                                            TestFile("SourceFile.m"),
-                                                           ]),
-                                      buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: [
-                                            "GENERATE_INFOPLIST_FILE": "YES",
-                                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                                            "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
-                                            "GCC_PREFIX_HEADER": "Prefix.pch",
-                                        ])],
-                                      targets: [
-                                        TestStandardTarget("MyFramework",
-                                                           type: .framework,
-                                                           buildPhases: [
-                                                            TestSourcesBuildPhase([
-                                                                "SourceFile.m"
-                                                            ])
-                                                           ]
-                                                          )
-                                      ]
+        let testProject = TestProject(
+            "MyProject",
+            sourceRoot: Path("/MyProject"),
+            groupTree: TestGroup(
+                "SomeFiles",
+                path: "Sources",
+                children: [
+                    TestFile("Prefix.pch"),
+                    TestFile("SourceFile.m"),
+                ]
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
+                        "GCC_PREFIX_HEADER": "Prefix.pch",
+                    ]
+                )
+            ],
+            targets: [
+                TestStandardTarget(
+                    "MyFramework",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            "SourceFile.m"
+                        ])
+                    ]
+                )
+            ]
         )
         let fs = PseudoFS()
         try fs.createDirectory(Path("/MyProject/"), recursive: true)
@@ -6088,7 +6654,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     TestFile("Prefix2.pch"),
                     TestFile("SourceFile1.m"),
                     TestFile("SourceFile2.m"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -6099,7 +6666,9 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "DERIVED_FILE_DIR": "$(CONFIGURATION_BUILD_DIR)/DerivedFileDir",
                         "USE_HEADERMAP": "NO",
                         "LIBTOOL": libtoolPath.str,
-                    ])],
+                    ]
+                )
+            ],
             targets: [
                 TestAggregateTarget(
                     "All",
@@ -6112,9 +6681,13 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     "MyFramework1",
                     type: .staticLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GCC_PREFIX_HEADER": "Prefix1.pch",
-                        ])],
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GCC_PREFIX_HEADER": "Prefix1.pch"
+                            ]
+                        )
+                    ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "SourceFile1.m"
@@ -6125,9 +6698,13 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     "MyFramework2",
                     type: .staticLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GCC_PREFIX_HEADER": "Prefix2.pch",
-                        ])],
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GCC_PREFIX_HEADER": "Prefix2.pch"
+                            ]
+                        )
+                    ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "SourceFile2.m"
@@ -6159,33 +6736,41 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
     /// Check the dependencies between prefix headers and module maps.
     @Test(.requireSDKs(.macOS))
     func prefixHeaderModuleMapDependencies() async throws {
-        let testProject = TestProject("MyProject",
-                                      sourceRoot: Path("/MyProject"),
-                                      groupTree: TestGroup("SomeFiles",
-                                                           path: "Sources",
-                                                           children: [
-                                                            TestFile("Prefix.pch"),
-                                                            TestFile("SourceFile.m"),
-                                                           ]),
-                                      buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: [
-                                            "CODE_SIGN_IDENTITY": "",
-                                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                                            "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
-                                            "GCC_PREFIX_HEADER": "Prefix.pch",
-                                            "DEFINES_MODULE": "YES",
-                                            "MODULEMAP_FILE": "MyFramework.modulemap",
-                                        ])],
-                                      targets: [
-                                        TestStandardTarget("MyFramework",
-                                                           type: .framework,
-                                                           buildPhases: [
-                                                            TestSourcesBuildPhase([
-                                                                "SourceFile.m"
-                                                            ])
-                                                           ]
-                                                          )
-                                      ]
+        let testProject = TestProject(
+            "MyProject",
+            sourceRoot: Path("/MyProject"),
+            groupTree: TestGroup(
+                "SomeFiles",
+                path: "Sources",
+                children: [
+                    TestFile("Prefix.pch"),
+                    TestFile("SourceFile.m"),
+                ]
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
+                        "GCC_PREFIX_HEADER": "Prefix.pch",
+                        "DEFINES_MODULE": "YES",
+                        "MODULEMAP_FILE": "MyFramework.modulemap",
+                    ]
+                )
+            ],
+            targets: [
+                TestStandardTarget(
+                    "MyFramework",
+                    type: .framework,
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            "SourceFile.m"
+                        ])
+                    ]
+                )
+            ]
         )
         let fs = PseudoFS()
         try fs.createDirectory(Path("/MyProject/"), recursive: true)
@@ -6215,23 +6800,25 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         }
     }
 
-
     // Check that we can emit build plan diagnostics when asked to do so.
     @Test(.requireSDKs(.macOS))
     func buildPlanDumping() async throws {
         let testProject = TestProject(
             "MyToolProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("main.c"),
-                ]),
+                    TestFile("main.c")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -6243,14 +6830,17 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             buildSettings: [
                                 "INSTALL_PATH": "/foo",
                                 "SKIP_INSTALL": "NO",
-                            ]),
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["main.c"]),
                         TestFrameworksBuildPhase([]),
                     ],
-                    dependencies: []),
-            ])
+                    dependencies: []
+                )
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
@@ -6285,8 +6875,9 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("main.swift"),
                     TestFile("other.m"),
-                    TestFile("header.pch")
-                ]),
+                    TestFile("header.pch"),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -6300,14 +6891,19 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
                         "SWIFT_OBJC_INTERFACE_HEADER_NAME": "Header-Swift.h",
                         "CLANG_USE_RESPONSE_FILE": "NO",
-                    ])],
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.swift", "other.m"]),
-                    ])])
+                        TestSourcesBuildPhase(["main.swift", "other.m"])
+                    ]
+                )
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
@@ -6340,21 +6936,24 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Framework-Prefix.pch"),
                     TestFile("FileOne.c"),
                     TestFile("ClassTwo.m"),
                     TestFile("ClassThree.cpp"),
                     TestFile("ClassFour.mm"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
                     buildSettings: [
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ])
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -6366,7 +6965,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             buildSettings: [
                                 "GCC_PREFIX_HEADER": "Sources/Framework-Prefix.pch",
                                 "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
-                            ]),
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -6374,10 +6974,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             "ClassTwo.m",
                             "ClassThree.cpp",
                             "ClassFour.mm",
-                        ]),
+                        ])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
@@ -6425,12 +7026,14 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Framework.h"),
                     TestFile("ClassOne.m"),
                     TestFile("Framework-Prefix.pch"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -6439,7 +7042,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "SWIFT_VERSION": swiftVersion,
                         "CLANG_USE_RESPONSE_FILE": "NO",
-                    ])
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -6455,14 +7059,16 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                                 "PRODUCT_MODULE_NAME": "Framework",
                                 // The public .modulemap file will be synthesized.
                                 "MODULEMAP_PRIVATE_FILE": "Sources/Framework-Private.modulemap",
-                            ]),
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([TestBuildFile("Framework.h", headerVisibility: .public)]),
                         TestSourcesBuildPhase(["ClassOne.m"]),
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -6523,11 +7129,13 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             "aProject",
             sourceRoot: Path("/TEST"),
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("main.swift"),
-                    TestFile("other.m")
-                ]),
+                    TestFile("other.m"),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -6540,14 +7148,19 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "SWIFT_OBJC_INTERFACE_HEADER_NAME": "Header-Swift.h",
                         "RUN_CLANG_STATIC_ANALYZER": "YES",
                         "CLANG_USE_RESPONSE_FILE": "NO",
-                    ])],
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "App",
                     type: .application,
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.swift", "other.m"]),
-                    ])])
+                        TestSourcesBuildPhase(["main.swift", "other.m"])
+                    ]
+                )
+            ]
+        )
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
@@ -6579,8 +7192,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
         // Defines expected required arch for a given ARCHS build setting
         let testScenarios = [
-            (archsBuildSetting: "arm64",        requiredArch: "arm64"),
-            (archsBuildSetting: "arm64e",       requiredArch: "arm64e"),
+            (archsBuildSetting: "arm64", requiredArch: "arm64"),
+            (archsBuildSetting: "arm64e", requiredArch: "arm64e"),
             (archsBuildSetting: "arm64 arm64e", requiredArch: "arm64"),
         ]
 
@@ -6588,38 +7201,45 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             let testProject = try await TestProject(
                 "aProject",
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("Foo.swift"),
                         TestFile("CoreFoo.h"),
                         TestFile("Info.plist"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                    TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
                 ],
                 targets: [
                     TestStandardTarget(
-                        "CoreFoo", type: .framework,
+                        "CoreFoo",
+                        type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug",
-                                                   buildSettings: [
-                                                    "CODE_SIGN_IDENTITY": "",
-                                                    "SDKROOT": "iphoneos",
-                                                    "DEFINES_MODULE": "YES",
-                                                    "SWIFT_EXEC": swiftCompilerPath.str,
-                                                    "SWIFT_VERSION": swiftVersion,
-                                                    "TAPI_EXEC": tapiToolPath.str,
-                                                    "ARCHS": archsBuildSetting,
-                                                    "INFOPLIST_FILE": "Sources/Info.plist"
-                                                   ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CODE_SIGN_IDENTITY": "",
+                                    "SDKROOT": "iphoneos",
+                                    "DEFINES_MODULE": "YES",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "TAPI_EXEC": tapiToolPath.str,
+                                    "ARCHS": archsBuildSetting,
+                                    "INFOPLIST_FILE": "Sources/Info.plist",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["Foo.swift"]),
                             TestHeadersBuildPhase([
-                                TestBuildFile("CoreFoo.h", headerVisibility: .public),
+                                TestBuildFile("CoreFoo.h", headerVisibility: .public)
                             ]),
-                        ])
-                ])
+                        ]
+                    )
+                ]
+            )
 
             let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
             let tester = try await TaskConstructionTester(getCore(), testWorkspace)
@@ -6642,38 +7262,45 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Foo.swift"),
                     TestFile("CoreFoo.h"),
                     TestFile("Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "CODE_SIGN_IDENTITY": "",
-                                                "SDKROOT": "watchos",
-                                                "DEFINES_MODULE": "YES",
-                                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                                "SWIFT_VERSION": swiftVersion,
-                                                "TAPI_EXEC": tapiToolPath.str,
-                                                "ARCHS": "arm64_32",
-                                                "INFOPLIST_FILE": "Sources/Info.plist"
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "CODE_SIGN_IDENTITY": "",
+                                "SDKROOT": "watchos",
+                                "DEFINES_MODULE": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                                "TAPI_EXEC": tapiToolPath.str,
+                                "ARCHS": "arm64_32",
+                                "INFOPLIST_FILE": "Sources/Info.plist",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["Foo.swift"]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("CoreFoo.h", headerVisibility: .public),
+                            TestBuildFile("CoreFoo.h", headerVisibility: .public)
                         ]),
-                    ])
-            ])
+                    ]
+                )
+            ]
+        )
 
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
@@ -6701,34 +7328,45 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("main.m"),
                     TestFile("Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SDKROOT": SDKROOT,
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SDKROOT": SDKROOT,
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            // It's hard to find multiple architectures
-                            "ARCHS": "\(builtArch) \(skippedArch)",
-                            "INFOPLIST_FILE": "Sources/Info.plist",
-                            "EXCLUDED_SOURCE_FILE_NAMES[arch=\(skippedArch)]": "*",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                // It's hard to find multiple architectures
+                                "ARCHS": "\(builtArch) \(skippedArch)",
+                                "INFOPLIST_FILE": "Sources/Info.plist",
+                                "EXCLUDED_SOURCE_FILE_NAMES[arch=\(skippedArch)]": "*",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.m",
-                        ]),
-                    ])
-            ])
+                            "main.m"
+                        ])
+                    ]
+                )
+            ]
+        )
 
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
@@ -6766,8 +7404,9 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     TestFile("MyInfo.plist"),
                     TestFile("LinkOrderFile.txt"),
                     TestFile("Some/Config/Location/ExportedSymbols.exp"),
-                    TestFile("UnexportedSymbols.exp")
-                ]),
+                    TestFile("UnexportedSymbols.exp"),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -6776,12 +7415,16 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "CODE_SIGN_ENTITLEMENTS": "Entitlements.entitlements",
                         "ORDER_FILE": "LinkOrderFile.txt",
                         "EXPORTED_SYMBOLS_FILE": "Some/Config/Location/ExportedSymbols.exp",
-                        "UNEXPORTED_SYMBOLS_FILE": "Fake/Location/../../UnexportedSymbols.exp"
-                    ]),
-                TestBuildConfiguration("Release", buildSettings: [
-                    "CODE_SIGN_IDENTITY": "-",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ]),
+                        "UNEXPORTED_SYMBOLS_FILE": "Fake/Location/../../UnexportedSymbols.exp",
+                    ]
+                ),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "CODE_SIGN_IDENTITY": "-",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                ),
             ],
             targets: [
                 TestStandardTarget(
@@ -6793,32 +7436,38 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "SourceOne.m",
+                            "SourceOne.m"
                         ]),
                         TestHeadersBuildPhase([
                             TestBuildFile("Entitlements.entitlements"),
                             TestBuildFile("MyInfo.plist"),
                             TestBuildFile("Some/Config/Location/ExportedSymbols.exp"),
                             TestBuildFile("LinkOrderFile.txt"),
-                            TestBuildFile("UnexportedSymbols.exp")
+                            TestBuildFile("UnexportedSymbols.exp"),
                         ]),
                         TestResourcesBuildPhase([
                             "Entitlements.entitlements",
                             "MyInfo.plist",
                             "Some/Config/Location/ExportedSymbols.exp",
                             "LinkOrderFile.txt",
-                            "UnexportedSymbols.exp"
+                            "UnexportedSymbols.exp",
                         ]),
-                        TestCopyFilesBuildPhase([
-                            "Entitlements.entitlements",
-                            "MyInfo.plist",
-                            "Some/Config/Location/ExportedSymbols.exp",
-                            "LinkOrderFile.txt",
-                            "UnexportedSymbols.exp"
-                        ], destinationSubfolder: .resources, destinationSubpath: "Test", onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Entitlements.entitlements",
+                                "MyInfo.plist",
+                                "Some/Config/Location/ExportedSymbols.exp",
+                                "LinkOrderFile.txt",
+                                "UnexportedSymbols.exp",
+                            ],
+                            destinationSubfolder: .resources,
+                            destinationSubpath: "Test",
+                            onlyForDeployment: false
+                        ),
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -6861,12 +7510,16 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     TestFile("input2.xcfilelist"),
                     TestFile("output1.xcfilelist"),
                     TestFile("output2.xcfilelist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -6876,8 +7529,10 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     buildPhases: [
                         TestShellScriptBuildPhase(name: "Run Script", shellPath: "/bin/sh", originalObjectID: "FileList", contents: "echo hi", inputs: ["$(SRCROOT)/foo.c.txt"], inputFileLists: ["$(SRCROOT)/input1.xcfilelist", "$(SRCROOT)/input2.xcfilelist"], outputs: ["$(DERIVED_FILE_DIR)/foo.c"], outputFileLists: ["$(SRCROOT)/output1.xcfilelist", "$(SRCROOT)/output2.xcfilelist"])
                     ],
-                    buildRules: []),
-            ])
+                    buildRules: []
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -6917,7 +7572,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/OutputFileList-FileList-output2-49b85065e1ab5f8726dafd7606a852ce-resolved.xcfilelist"),
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/Script-FileList.sh"),
                         .any,
-                        .any
+                        .any,
                     ])
 
                     #expect(task.inputs.filter({ $0.name == "bar.c.txt" }).count == 1)
@@ -6984,7 +7639,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/OutputFileList-FileList-output2-49b85065e1ab5f8726dafd7606a852ce-resolved.xcfilelist"),
                         .path("\(SRCROOT)/build/aProject.build/Debug/App.build/Script-FileList.sh"),
                         .any,
-                        .any
+                        .any,
                     ])
 
                     #expect(task.inputs.filter({ $0.name == "bar.c.txt/" }).count == 1)
@@ -7036,12 +7691,16 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("input1-noexists.xcfilelist"),
                     TestFile("output1-noexists.xcfilelist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -7051,8 +7710,10 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     buildPhases: [
                         TestShellScriptBuildPhase(name: "Run Script", shellPath: "/bin/sh", originalObjectID: "FileList", contents: "echo hi", inputs: [], inputFileLists: ["$(SRCROOT)/input1-noexists.xcfilelist"], outputs: [], outputFileLists: ["$(SRCROOT)/output1-noexists.xcfilelist"], alwaysOutOfDate: true)
                     ],
-                    buildRules: []),
-            ])
+                    buildRules: []
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -7072,12 +7733,16 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("Foo.cpp"),
                     TestFile("Foo.hpp"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -7086,7 +7751,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     buildConfigurations: [TestBuildConfiguration("Debug")],
                     buildPhases: [TestSourcesBuildPhase(["Foo.cpp", "Foo.hpp"])]
                 )
-            ])
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -7127,7 +7793,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
                     // Child group to hold classes which differ only in case.
                     TestGroup(
-                        "MoreSources", path: "MoreSources",
+                        "MoreSources",
+                        path: "MoreSources",
                         children: [
                             differentDirectoriesObjC2,
                             differentDirectoriesSwift2,
@@ -7139,15 +7806,19 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     // check that some files which don't have name collisions don't end up with uniquingSuffixes.
                     TestFile("UniqueObjC.m"),
                     uniqueSwift,
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": swiftVersion,
-                    "TAPI_EXEC": tapiToolPath.str,
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": swiftVersion,
+                        "TAPI_EXEC": tapiToolPath.str,
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -7173,8 +7844,9 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                             TestBuildFile(uniqueSwift),
                         ])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -7250,8 +7922,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         let objFileName = "\(rootName)-\(BuildPhaseWithBuildFiles.filenameUniquefierSuffixFor(path: testFilePath)).o"
                         #expect(outputPathBasenames.contains(objFileName), "could not find object file named '\(objFileName)' among outputs: \(outputPaths.map { $0.str })", sourceLocation: sourceLocation)
                     }
-                    checkOutputFileIsPresent(for:  Path(SRCROOT).join("DifferentDirectories.swift"))
-                    checkOutputFileIsPresent(for:  Path(SRCROOT).join("MoreSources").join("DifferentDirectories.swift"))
+                    checkOutputFileIsPresent(for: Path(SRCROOT).join("DifferentDirectories.swift"))
+                    checkOutputFileIsPresent(for: Path(SRCROOT).join("MoreSources").join("DifferentDirectories.swift"))
                     checkOutputFileIsPresent(for: Path(SRCROOT).join("DifferentDirectoriesDifferentCase.swift"))
                     checkOutputFileIsPresent(for: Path(SRCROOT).join("MoreSources").join("differentdirectoriesdifferentcase.swift"))
 
@@ -7270,12 +7942,16 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "SomeFiles",
                 children: [
                     TestVersionGroup("Foo.xcdatamodeld", children: [TestFile("Foo.xcdatamodeld")])
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-"
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -7284,13 +7960,14 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     buildConfigurations: [TestBuildConfiguration("Debug")],
                     buildPhases: [TestSourcesBuildPhase(["Foo.xcdatamodeld"])]
                 )
-            ])
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         /// Client to generate files from the core data model.
         class TestCoreDataCompilerTaskPlanningClientDelegate: TaskPlanningClientDelegate {
-            func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+            func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
                 return .emptyResult
             }
         }
@@ -7310,28 +7987,39 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 path: "Sources",
                 children: [
                     TestFile("mock.c"),
-                    TestVariantGroup("Intents.intentdefinition", children: [
-                        TestFile("Base.lproj/Intents.intentdefinition"),
-                        TestFile("en.lproj/Intents.strings", regionVariantName: "en"),
-                        TestFile("de.lproj/Intents.strings", regionVariantName: "de"),
-                    ])
-                ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "ARCHS": "x86_64 x86_64h",
-                    "BUILD_VARIANTS": "normal debug profile",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)"])],
+                    TestVariantGroup(
+                        "Intents.intentdefinition",
+                        children: [
+                            TestFile("Base.lproj/Intents.intentdefinition"),
+                            TestFile("en.lproj/Intents.strings", regionVariantName: "en"),
+                            TestFile("de.lproj/Intents.strings", regionVariantName: "de"),
+                        ]
+                    ),
+                ]
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS": "x86_64 x86_64h",
+                        "BUILD_VARIANTS": "normal debug profile",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Foo",
                     type: .framework,
                     buildConfigurations: [TestBuildConfiguration("Debug")],
-                    buildPhases: [TestSourcesBuildPhase([
-                        "mock.c",
-                        "Intents.intentdefinition"
-                    ])]),
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            "mock.c",
+                            "Intents.intentdefinition",
+                        ])
+                    ]
+                )
             ]
         )
 
@@ -7361,34 +8049,44 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 path: "Sources",
                 children: [
                     TestFile("mock.c"),
-                    TestVariantGroup("Intents.intentdefinition", children: [
-                        TestFile("Base.lproj/Intents.intentdefinition"),
-                        TestFile("en.lproj/Intents.strings", regionVariantName: "en"),
-                        TestFile("de.lproj/Intents.strings", regionVariantName: "de"),
-                    ])
-                ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "ARCHS": "x86_64 x86_64h",
-                    "BUILD_VARIANTS": "normal debug profile",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "SKIP_INSTALL": " NO",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "INTENTS_CODEGEN_LANGUAGE": "Objective-C",
-                    "SUPPORTS_TEXT_BASED_API": "YES",
-                    "SWIFT_VERSION": "5.2",
-                    "TAPI_EXEC": tapiToolPath.str,
-                ])],
+                    TestVariantGroup(
+                        "Intents.intentdefinition",
+                        children: [
+                            TestFile("Base.lproj/Intents.intentdefinition"),
+                            TestFile("en.lproj/Intents.strings", regionVariantName: "en"),
+                            TestFile("de.lproj/Intents.strings", regionVariantName: "de"),
+                        ]
+                    ),
+                ]
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS": "x86_64 x86_64h",
+                        "BUILD_VARIANTS": "normal debug profile",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "SKIP_INSTALL": " NO",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "INTENTS_CODEGEN_LANGUAGE": "Objective-C",
+                        "SUPPORTS_TEXT_BASED_API": "YES",
+                        "SWIFT_VERSION": "5.2",
+                        "TAPI_EXEC": tapiToolPath.str,
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Foo",
                     type: .framework,
                     buildConfigurations: [TestBuildConfiguration("Debug")],
-                    buildPhases: [TestSourcesBuildPhase([
-                        "mock.c",
-                        TestBuildFile("Intents.intentdefinition", intentsCodegenVisibility: .public),
-                    ])]),
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            "mock.c",
+                            TestBuildFile("Intents.intentdefinition", intentsCodegenVisibility: .public),
+                        ])
+                    ]
+                )
             ]
         )
 
@@ -7396,12 +8094,13 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
         final class Delegate: MockTestTaskPlanningClientDelegate, @unchecked Sendable {
-            override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+            override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
                 if commandLine.first.map(Path.init)?.basename == "intentbuilderc",
-                   let outputDir = commandLine.elementAfterElements(["-output"]).map(Path.init),
-                   let classPrefix = commandLine.elementAfterElements(["-classPrefix"]),
-                   let language = commandLine.elementAfterElements(["-language"]),
-                   let visibility = commandLine.elementAfterElements(["-visibility"]) {
+                    let outputDir = commandLine.elementAfterElements(["-output"]).map(Path.init),
+                    let classPrefix = commandLine.elementAfterElements(["-classPrefix"]),
+                    let language = commandLine.elementAfterElements(["-language"]),
+                    let visibility = commandLine.elementAfterElements(["-visibility"])
+                {
                     if visibility != "public" {
                         throw StubError.error("Visibility should be public")
                     }
@@ -7420,7 +8119,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
         // Explicitly opted-out of header filtering support.
         await tester.checkBuild(BuildParameters(action: .installHeaders, configuration: "Debug"), runDestination: .macOS, clientDelegate: Delegate()) { results in
-            results.consumeTasksMatchingRuleTypes(["CreateBuildDirectory","Gate", "MkDir", "SymLink", "Touch"])
+            results.consumeTasksMatchingRuleTypes(["CreateBuildDirectory", "Gate", "MkDir", "SymLink", "Touch"])
             results.checkTasks(.matchRuleType("WriteAuxiliaryFile")) { _ in }
 
             // NOTE: This is implicitly ensuring that there is no `IntentDefinitionCodegen` and `IntentDefinitionCompile` tasks as they are not consumed above.
@@ -7430,8 +8129,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         }
 
         // Explicitly opted-in to header filtering support.
-        await tester.checkBuild(BuildParameters(action: .installHeaders, configuration: "Debug", overrides: ["EXPERIMENTAL_ALLOW_INSTALL_HEADERS_FILTERING":"YES"]), runDestination: .macOS, clientDelegate: Delegate()) { results in
-            results.consumeTasksMatchingRuleTypes(["CreateBuildDirectory","Gate", "MkDir", "SymLink", "Touch", "WriteAuxiliaryFile"])
+        await tester.checkBuild(BuildParameters(action: .installHeaders, configuration: "Debug", overrides: ["EXPERIMENTAL_ALLOW_INSTALL_HEADERS_FILTERING": "YES"]), runDestination: .macOS, clientDelegate: Delegate()) { results in
+            results.consumeTasksMatchingRuleTypes(["CreateBuildDirectory", "Gate", "MkDir", "SymLink", "Touch", "WriteAuxiliaryFile"])
 
             results.checkTarget("Foo") { target in
                 results.checkTask(.matchTarget(target), .matchRule(["IntentDefinitionCodegen", "/tmp/aWorkspace/aProject/Sources/Base.lproj/Intents.intentdefinition"])) { _ in }
@@ -7444,8 +8143,8 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         }
 
         // Explicitly opted-in to header filtering support.
-        await tester.checkBuild(BuildParameters(action: .installAPI, configuration: "Debug", overrides: ["EXPERIMENTAL_ALLOW_INSTALL_HEADERS_FILTERING":"YES"]), runDestination: .macOS, clientDelegate: Delegate()) { results in
-            results.consumeTasksMatchingRuleTypes(["CreateBuildDirectory","Gate", "MkDir", "SymLink", "Touch", "WriteAuxiliaryFile"])
+        await tester.checkBuild(BuildParameters(action: .installAPI, configuration: "Debug", overrides: ["EXPERIMENTAL_ALLOW_INSTALL_HEADERS_FILTERING": "YES"]), runDestination: .macOS, clientDelegate: Delegate()) { results in
+            results.consumeTasksMatchingRuleTypes(["CreateBuildDirectory", "Gate", "MkDir", "SymLink", "Touch", "WriteAuxiliaryFile"])
 
             results.checkTarget("Foo") { target in
                 results.checkTask(.matchTarget(target), .matchRule(["IntentDefinitionCodegen", "/tmp/aWorkspace/aProject/Sources/Base.lproj/Intents.intentdefinition"])) { _ in }
@@ -7469,22 +8168,30 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "SomeFiles",
                 path: "Sources",
                 children: [
-                    TestFile("mock.c"),
-                ]),
-            buildConfigurations: [TestBuildConfiguration(
-                "Debug",
-                buildSettings: [
-                    "ARCHS": "x86_64 x86_64",
-                    "GENERATE_INFOPLIST_FILE": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)"])],
+                    TestFile("mock.c")
+                ]
+            ),
+            buildConfigurations: [
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS": "x86_64 x86_64",
+                        "GENERATE_INFOPLIST_FILE": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
+            ],
             targets: [
                 TestStandardTarget(
                     "Foo",
                     type: .framework,
                     buildConfigurations: [TestBuildConfiguration("Debug")],
-                    buildPhases: [TestSourcesBuildPhase([
-                        "mock.c",
-                    ])]),
+                    buildPhases: [
+                        TestSourcesBuildPhase([
+                            "mock.c"
+                        ])
+                    ]
+                )
             ]
         )
 
@@ -7518,15 +8225,17 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         TestBuildConfiguration(
                             "Release",
                             buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "PRODUCT_NAME": "$(TARGET_NAME)"
                             ]
                         )
                     ],
                     buildPhases: [
                         TestCopyFilesBuildPhase([TestBuildFile(.namedReference(name: "Foo.framework", fileTypeIdentifier: "wrapper.framework"))], destinationSubfolder: .frameworks),
                         TestFrameworksBuildPhase([TestBuildFile(.namedReference(name: "Foo.framework", fileTypeIdentifier: "wrapper.framework"))]),
-                    ])
-            ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(BuildParameters(action: .install, configuration: "Release"), runDestination: .macOS) { results in
@@ -7560,9 +8269,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let core = try await getCore()
         let testProject = TestProject(
             "aProject",
-            groupTree: TestGroup("SomeFiles", children: [
-                TestFile("Test.c")
-            ]),
+            groupTree: TestGroup(
+                "SomeFiles",
+                children: [
+                    TestFile("Test.c")
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "Foo",
@@ -7596,8 +8308,10 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["Test.c"])
-                    ])
-            ])
+                    ]
+                )
+            ]
+        )
         return try TaskConstructionTester(core, testProject)
     }
     @Test(.requireSDKs(.macOS))
@@ -7668,10 +8382,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
-                    TestFile("SourceFile.m"),
-                ]),
+                    TestFile("SourceFile.m")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -7679,20 +8395,24 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "CODE_SIGN_IDENTITY": "-",
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GENERATE_PKGINFO_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_PKGINFO_FILE": "YES"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "SourceFile.m",
+                            "SourceFile.m"
                         ]),
                         TestCopyFilesBuildPhase([TestBuildFile("AppCore.framework", codeSignOnCopy: true)], destinationSubfolder: .frameworks, onlyForDeployment: false),
                     ],
@@ -7702,14 +8422,19 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     "AppCore",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "FRAMEWORK_VERSION": "B",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "FRAMEWORK_VERSION": "B"
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SourceFile.m"]),
-                    ])
-            ])
+                        TestSourcesBuildPhase(["SourceFile.m"])
+                    ]
+                ),
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -7733,18 +8458,22 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
             results.checkTarget("AppCore") { target in
                 // There should be the expected mkdir tasks for the framework.
-                results.checkTasks(.matchTarget(target), .matchRuleType("MkDir"), body: { (tasks) -> Void in
-                    let sortedTasks = tasks.sorted { $0.ruleInfo.lexicographicallyPrecedes($1.ruleInfo) }
-                    #expect(sortedTasks.count == 4)
-                    sortedTasks[0].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCore.framework")])
-                    sortedTasks[1].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCore.framework/Versions")])
-                    sortedTasks[2].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCore.framework/Versions/B")])
+                results.checkTasks(
+                    .matchTarget(target),
+                    .matchRuleType("MkDir"),
+                    body: { (tasks) -> Void in
+                        let sortedTasks = tasks.sorted { $0.ruleInfo.lexicographicallyPrecedes($1.ruleInfo) }
+                        #expect(sortedTasks.count == 4)
+                        sortedTasks[0].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCore.framework")])
+                        sortedTasks[1].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCore.framework/Versions")])
+                        sortedTasks[2].checkRuleInfo([.equal("MkDir"), .equal("\(SRCROOT)/build/Debug/AppCore.framework/Versions/B")])
 
-                    // Validate we also construct command lines.
-                    sortedTasks[0].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCore.framework"])
-                    sortedTasks[1].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCore.framework/Versions"])
-                    sortedTasks[2].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCore.framework/Versions/B"])
-                })
+                        // Validate we also construct command lines.
+                        sortedTasks[0].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCore.framework"])
+                        sortedTasks[1].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCore.framework/Versions"])
+                        sortedTasks[2].checkCommandLine(["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/AppCore.framework/Versions/B"])
+                    }
+                )
             }
 
             // Check there are no other targets.
@@ -7762,25 +8491,33 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("Strings-InfoPlist.strings", fileTextEncoding: .utf8),
                         TestFile("Strings-InfoPlist.stringsdict", fileTextEncoding: .utf8),
-                    ]),
+                    ]
+                ),
                 targets: [
-                    TestStandardTarget(
-                        "Bundle", type: .bundle,
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "INFOPLIST_FILE":"Sources/Strings-Info.plist",
-                            ]),
+                    TestStandardTarget(
+                        "Bundle",
+                        type: .bundle,
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "INFOPLIST_FILE": "Sources/Strings-Info.plist",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestResourcesBuildPhase(["Strings-InfoPlist.strings", "Strings-InfoPlist.stringsdict"]),
+                            TestResourcesBuildPhase(["Strings-InfoPlist.strings", "Strings-InfoPlist.stringsdict"])
                         ]
-                    )])
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             let fs = PseudoFS()
@@ -7810,23 +8547,31 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("MyBundle-InfoPlist.strings", fileTextEncoding: .utf8),
-                    ]),
+                        TestFile("MyBundle-InfoPlist.strings", fileTextEncoding: .utf8)
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
-                        "MyBundle", type: .bundle,
+                        "MyBundle",
+                        type: .bundle,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestResourcesBuildPhase(["MyBundle-InfoPlist.strings"]),
+                            TestResourcesBuildPhase(["MyBundle-InfoPlist.strings"])
                         ]
-                    )])
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             let fs = PseudoFS()
@@ -7853,24 +8598,32 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("Info-MyBundle-InfoPlist.strings", fileTextEncoding: .utf8),
-                    ]),
+                        TestFile("Info-MyBundle-InfoPlist.strings", fileTextEncoding: .utf8)
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
-                        "MyBundle", type: .bundle,
+                        "MyBundle",
+                        type: .bundle,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "INFOPLIST_FILE":"Sources/Info-MyBundle.plist",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "INFOPLIST_FILE": "Sources/Info-MyBundle.plist",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestResourcesBuildPhase(["Info-MyBundle-InfoPlist.strings"]),
+                            TestResourcesBuildPhase(["Info-MyBundle-InfoPlist.strings"])
                         ]
-                    )])
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             let fs = PseudoFS()
@@ -7897,24 +8650,32 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("InfoPlist.strings", fileTextEncoding: .utf8),
-                    ]),
+                        TestFile("InfoPlist.strings", fileTextEncoding: .utf8)
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
-                        "MyBundle", type: .bundle,
+                        "MyBundle",
+                        type: .bundle,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "INFOPLIST_FILE":"Sources/info.plist",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "INFOPLIST_FILE": "Sources/info.plist",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestResourcesBuildPhase(["InfoPlist.strings"]),
+                            TestResourcesBuildPhase(["InfoPlist.strings"])
                         ]
-                    )])
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             let fs = PseudoFS()
@@ -7941,24 +8702,32 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("MycustominfoPlist.strings", fileTextEncoding: .utf8),
-                    ]),
+                        TestFile("MycustominfoPlist.strings", fileTextEncoding: .utf8)
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
-                        "MyBundle", type: .bundle,
+                        "MyBundle",
+                        type: .bundle,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "INFOPLIST_FILE":"Sources/Mycustominfo.plist",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "INFOPLIST_FILE": "Sources/Mycustominfo.plist",
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestResourcesBuildPhase(["MycustominfoPlist.strings"]),
+                            TestResourcesBuildPhase(["MycustominfoPlist.strings"])
                         ]
-                    )])
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             let fs = PseudoFS()
@@ -7980,30 +8749,37 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "ProjectName",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("File1.m"),
                     TestFile("File2.swift"),
-                ]),
+                ]
+            ),
             targets: [
                 TestStandardTarget(
                     "TargetName",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "ProductName",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": swiftVersion,
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "ProductName",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": swiftVersion,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("File1.m"),
                             TestBuildFile("File2.swift"),
-                        ]),
-                    ])
-            ])
+                        ])
+                    ]
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
         let ObjectsNormal = "\(SRCROOT)/build/ProjectName.build/Debug/TargetName.build/Objects-normal"
@@ -8013,7 +8789,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         // * we don't pass the flags to swift
         // * we don't pass the flags to ld
         // * we generate a dSYM
-        await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["CLANG_GENERATE_OPTIMIZATION_REMARKS":"YES"]), runDestination: .macOS) { results in
+        await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["CLANG_GENERATE_OPTIMIZATION_REMARKS": "YES"]), runDestination: .macOS) { results in
             results.checkNoDiagnostics()
             results.checkTask(.matchRule(["CompileC", "\(ObjectsNormal)/\(results.runDestinationTargetArchitecture)/File1.o", "/tmp/Test/ProjectName/Sources/File1.m", "normal", "\(results.runDestinationTargetArchitecture)", "objective-c", "com.apple.compilers.llvm.clang.1_0.compiler"])) { task in
                 task.checkCommandLineContains(["-fsave-optimization-record=bitstream", "-foptimization-record-file=\(ObjectsNormal)/\(results.runDestinationTargetArchitecture)/File1.opt.bitstream"])
@@ -8033,7 +8809,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         // * we pass the flags to ld
         // * we generate a dSYM
         for LTOSetting in ["YES", "YES_THIN"] {
-            await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["CLANG_GENERATE_OPTIMIZATION_REMARKS":"YES", "LLVM_LTO":LTOSetting]), runDestination: .macOS) { results in
+            await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["CLANG_GENERATE_OPTIMIZATION_REMARKS": "YES", "LLVM_LTO": LTOSetting]), runDestination: .macOS) { results in
                 results.checkNoDiagnostics()
                 results.checkTask(.matchRuleType("CompileC")) { task in
                     task.checkCommandLineDoesNotContain("optimization-record")
@@ -8049,7 +8825,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         }
 
         // Check that we pass the filters properly.
-        await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["CLANG_GENERATE_OPTIMIZATION_REMARKS":"YES", "CLANG_GENERATE_OPTIMIZATION_REMARKS_FILTER":"pass0|pass1|pass2"]), runDestination: .macOS) { results in
+        await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["CLANG_GENERATE_OPTIMIZATION_REMARKS": "YES", "CLANG_GENERATE_OPTIMIZATION_REMARKS_FILTER": "pass0|pass1|pass2"]), runDestination: .macOS) { results in
             results.checkNoDiagnostics()
             results.checkTask(.matchRuleType("CompileC")) { task in
                 task.checkCommandLineContains(["-fsave-optimization-record=bitstream", "-foptimization-record-file=\(ObjectsNormal)/\(results.runDestinationTargetArchitecture)/File1.opt.bitstream", "-foptimization-record-passes=pass0|pass1|pass2"])
@@ -8057,7 +8833,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         }
 
         // Check that no filters doesn't add an empty regex.
-        await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["CLANG_GENERATE_OPTIMIZATION_REMARKS":"YES", "CLANG_GENERATE_OPTIMIZATION_REMARKS_FILTER":""]), runDestination: .macOS) { results in
+        await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["CLANG_GENERATE_OPTIMIZATION_REMARKS": "YES", "CLANG_GENERATE_OPTIMIZATION_REMARKS_FILTER": ""]), runDestination: .macOS) { results in
             results.checkNoDiagnostics()
             results.checkTask(.matchRuleType("CompileC")) { task in
                 task.checkCommandLineContains(["-fsave-optimization-record=bitstream", "-foptimization-record-file=\(ObjectsNormal)/\(results.runDestinationTargetArchitecture)/File1.opt.bitstream"])
@@ -8066,11 +8842,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         }
 
         // Check that we get a dSYM even though we disabled debug info.
-        await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["CLANG_GENERATE_OPTIMIZATION_REMARKS":"YES", "GCC_GENERATE_DEBUGGING_SYMBOLS":"NO"]), runDestination: .macOS) { results in
+        await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["CLANG_GENERATE_OPTIMIZATION_REMARKS": "YES", "GCC_GENERATE_DEBUGGING_SYMBOLS": "NO"]), runDestination: .macOS) { results in
             results.checkTask(.matchRuleType("GenerateDSYMFile")) { _ in }
         }
         // Check that we get a dSYM even though we requested just "dwarf".
-        await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["CLANG_GENERATE_OPTIMIZATION_REMARKS":"YES", "GCC_GENERATE_DEBUGGING_SYMBOLS":"YES", "DEBUG_INFORMATION_FORMAT":"dwarf"]), runDestination: .macOS) { results in
+        await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["CLANG_GENERATE_OPTIMIZATION_REMARKS": "YES", "GCC_GENERATE_DEBUGGING_SYMBOLS": "YES", "DEBUG_INFORMATION_FORMAT": "dwarf"]), runDestination: .macOS) { results in
             results.checkTask(.matchRuleType("GenerateDSYMFile")) { _ in }
         }
 
@@ -8090,9 +8866,9 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         }
 
         // Check that we don't pass anything if it's disabled.
-        await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["CLANG_GENERATE_OPTIMIZATION_REMARKS":"NO"]), runDestination: .macOS, body: checkNoRemarks)
+        await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["CLANG_GENERATE_OPTIMIZATION_REMARKS": "NO"]), runDestination: .macOS, body: checkNoRemarks)
         // Check that we don't pass anything if any other related flag is set.
-        await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["CLANG_GENERATE_OPTIMIZATION_REMARKS_FILTER":"pass0"]), runDestination: .macOS, body: checkNoRemarks)
+        await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["CLANG_GENERATE_OPTIMIZATION_REMARKS_FILTER": "pass0"]), runDestination: .macOS, body: checkNoRemarks)
     }
 
     @Test(.requireSDKs(.macOS, .iOS))
@@ -8122,62 +8898,84 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
+                            "Sources",
+                            path: "Sources",
+                            children: [
                                 TestFile("A1.c"),
                                 TestFile("A2.c"),
                                 TestFile("A3.c"),
                                 TestFile("sample.xcframework"),
                                 TestFile("Info.plist"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "USE_HEADERMAP": "NO",
-                                "SKIP_INSTALL": "NO",
-                                "INFOPLIST_FILE": "Sources/Info.plist",
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "USE_HEADERMAP": "NO",
+                                    "SKIP_INSTALL": "NO",
+                                    "INFOPLIST_FILE": "Sources/Info.plist",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "F4", type: .application,
+                                "F4",
+                                type: .application,
                                 buildPhases: [
-                                    TestFrameworksBuildPhase([TestBuildFile(.target("P1Product"))]),
-                                ], dependencies: ["P1Product"]),
-                        ]),
+                                    TestFrameworksBuildPhase([TestBuildFile(.target("P1Product"))])
+                                ],
+                                dependencies: ["P1Product"]
+                            )
+                        ]
+                    ),
                     TestPackageProject(
                         "aPackageProject",
                         groupTree: TestGroup(
-                            "Sources", path: "Sources", children: [
-                                TestFile("sample.xcframework", guid: "PKG-sample.xcframework"),
-                            ]),
-                        buildConfigurations: [TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "CLANG_ENABLE_MODULES": "YES",
-                                "USE_HEADERMAP": "NO",
-                                "SKIP_INSTALL": "NO",
-                                "INFOPLIST_FILE": "Sources/Info.plist",
+                            "Sources",
+                            path: "Sources",
+                            children: [
+                                TestFile("sample.xcframework", guid: "PKG-sample.xcframework")
                             ]
-                        )],
+                        ),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    "CLANG_ENABLE_MODULES": "YES",
+                                    "USE_HEADERMAP": "NO",
+                                    "SKIP_INSTALL": "NO",
+                                    "INFOPLIST_FILE": "Sources/Info.plist",
+                                ]
+                            )
+                        ],
                         targets: [
                             TestPackageProductTarget(
                                 "P1Product",
-                                frameworksBuildPhase: TestFrameworksBuildPhase([TestBuildFile("sample.xcframework", codeSignOnCopy: true)])),
-                        ]),
-                ])
+                                frameworksBuildPhase: TestFrameworksBuildPhase([TestBuildFile("sample.xcframework", codeSignOnCopy: true)])
+                            )
+                        ]
+                    ),
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testWorkspace)
             let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
             let parameters = BuildParameters(configuration: "Debug")
             let packageTarget = try #require(tester.workspace.allTargets.first { $0.name == "F4" })
-            let request = BuildRequest(parameters: parameters,
-                                       buildTargets: [BuildRequest.BuildTargetInfo(parameters: parameters, target: packageTarget)],
-                                       continueBuildingAfterErrors: false, useParallelTargets: true, useImplicitDependencies: true, useDryRun: false)
+            let request = BuildRequest(
+                parameters: parameters,
+                buildTargets: [BuildRequest.BuildTargetInfo(parameters: parameters, target: packageTarget)],
+                continueBuildingAfterErrors: false,
+                useParallelTargets: true,
+                useImplicitDependencies: true,
+                useDryRun: false
+            )
 
             await tester.checkBuild(runDestination: .macOS, buildRequest: request, fs: localFS) { results in
                 results.checkNoDiagnostics()
@@ -8201,32 +8999,47 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 projects: [
                     TestProject(
                         "aProject",
-                        groupTree: TestGroup("Sources", children: [ TestFile("foo.c") ]),
+                        groupTree: TestGroup("Sources", children: [TestFile("foo.c")]),
                         buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)", "GENERATE_INFOPLIST_FILE": "YES"])],
                         targets: [
                             TestStandardTarget(
-                                "CoreFoo", type: .framework,
+                                "CoreFoo",
+                                type: .framework,
                                 buildConfigurations: [
                                     TestBuildConfiguration(
                                         "Debug",
-                                        buildSettings: ["OBJROOT": buildFolderPaths[0].str, "SYMROOT": buildFolderPaths[0].str, "DSTROOT": buildFolderPaths[0].str])],
-                                buildPhases: [TestSourcesBuildPhase(["foo.c"])], dependencies: ["OtherFramework", "OtherFramework2"]),
+                                        buildSettings: ["OBJROOT": buildFolderPaths[0].str, "SYMROOT": buildFolderPaths[0].str, "DSTROOT": buildFolderPaths[0].str]
+                                    )
+                                ],
+                                buildPhases: [TestSourcesBuildPhase(["foo.c"])],
+                                dependencies: ["OtherFramework", "OtherFramework2"]
+                            ),
                             TestStandardTarget(
-                                "OtherFramework", type: .framework,
+                                "OtherFramework",
+                                type: .framework,
                                 buildConfigurations: [
                                     TestBuildConfiguration(
                                         "Debug",
-                                        buildSettings: ["OBJROOT": buildFolderPaths[1].str, "SYMROOT": buildFolderPaths[1].str, "DSTROOT": buildFolderPaths[1].str])],
-                                buildPhases: [ TestSourcesBuildPhase(["foo.c"]) ]),
+                                        buildSettings: ["OBJROOT": buildFolderPaths[1].str, "SYMROOT": buildFolderPaths[1].str, "DSTROOT": buildFolderPaths[1].str]
+                                    )
+                                ],
+                                buildPhases: [TestSourcesBuildPhase(["foo.c"])]
+                            ),
                             TestStandardTarget(
-                                "OtherFramework2", type: .framework,
+                                "OtherFramework2",
+                                type: .framework,
                                 buildConfigurations: [
                                     TestBuildConfiguration(
                                         "Debug",
-                                        buildSettings: ["OBJROOT": buildFolderPaths[2].str, "SYMROOT": buildFolderPaths[2].str, "DSTROOT": buildFolderPaths[2].str])],
-                                buildPhases: [ TestSourcesBuildPhase(["foo.c"]) ]),
-                        ])
-                ])
+                                        buildSettings: ["OBJROOT": buildFolderPaths[2].str, "SYMROOT": buildFolderPaths[2].str, "DSTROOT": buildFolderPaths[2].str]
+                                    )
+                                ],
+                                buildPhases: [TestSourcesBuildPhase(["foo.c"])]
+                            ),
+                        ]
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testWorkspace)
 
             // CreateBuildDirectory tasks should be ordered such that outer directories are created before inner ones.
@@ -8308,27 +9121,34 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "ProjectName",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("SourceFile.m"),
-                    ]),
+                        TestFile("SourceFile.m")
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "TargetName",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "CC": clangCompilerPath.str,
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "CC": clangCompilerPath.str,
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                TestBuildFile("SourceFile.m"),
-                            ]),
-                        ])
-                ])
+                                TestBuildFile("SourceFile.m")
+                            ])
+                        ]
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
 
             let fs = PseudoFS()
@@ -8377,10 +9197,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("SourceFile.c"),
-                    ]),
+                        TestFile("SourceFile.c")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration("Debug", buildSettings: ["CLANG_USE_RESPONSE_FILE": "NO"])
                 ],
@@ -8389,16 +9211,20 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "AppTarget",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES"
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES"
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
                                 "SourceFile.c"
                             ])
                         ]
-                    )]
+                    )
+                ]
             )
 
             let fs = PseudoFS()
@@ -8412,7 +9238,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 let baseFlags = "signed-integer-overflow,unsigned-integer-overflow,implicit-conversion,bounds,pointer-overflow"
                 let baseFlagsVariants = ["-fsanitize=" + baseFlags, "-fsanitize-trap=" + baseFlags]
                 let optFlags = "object-size"
-                let optFlagsVariants = ["-fsanitize=" + optFlags , "-fsanitize-trap=" + optFlags]
+                let optFlagsVariants = ["-fsanitize=" + optFlags, "-fsanitize-trap=" + optFlags]
                 let allFlags = baseFlagsVariants + optFlagsVariants
 
                 if overrides[hardeningSetting] == "YES" {
@@ -8448,7 +9274,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             for override in overrides {
                 await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: override), runDestination: .macOS, fs: fs) { results -> Void in
                     results.checkTarget("AppTarget") { target -> Void in
-                        results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: {task in test(task: task, overrides: override)})
+                        results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: { task in test(task: task, overrides: override) })
                     }
                 }
             }
@@ -8462,10 +9288,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("SourceFile.c"),
-                    ]),
+                        TestFile("SourceFile.c")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration("Debug")
                 ],
@@ -8474,16 +9302,20 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "AppTarget",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES"
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES"
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
                                 "SourceFile.c"
                             ])
                         ]
-                    )]
+                    )
+                ]
             )
 
             let fs = PseudoFS()
@@ -8524,7 +9356,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             for override in overrides {
                 await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: override), runDestination: .macOS, fs: fs) { results -> Void in
                     results.checkTarget("AppTarget") { target -> Void in
-                        results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: {task in test(task: task, overrides: override)})
+                        results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: { task in test(task: task, overrides: override) })
                     }
                 }
             }
@@ -8538,10 +9370,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("SourceFile.c"),
-                    ]),
+                        TestFile("SourceFile.c")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration("Debug")
                 ],
@@ -8550,16 +9384,20 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "AppTarget",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES"
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES"
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
                                 "SourceFile.c"
                             ])
                         ]
-                    )]
+                    )
+                ]
             )
 
             let fs = PseudoFS()
@@ -8633,11 +9471,15 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             for override in overrides {
                 await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: override), runDestination: .macOS, fs: fs) { results -> Void in
                     results.checkTarget("AppTarget") { target -> Void in
-                        results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: {task in test(task: task, overrides: override)})
+                        results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: { task in test(task: task, overrides: override) })
                         if let val = override[typedMemoryOperationsCXX], val == "YES" {
-                            results.checkTask(.matchTarget(target), .matchRuleType("Ld"), body: {task in
-                                task.checkCommandLineContains(["-ftyped-cxx-new-delete", "-ftyped-cxx-delete"])
-                            })
+                            results.checkTask(
+                                .matchTarget(target),
+                                .matchRuleType("Ld"),
+                                body: { task in
+                                    task.checkCommandLineContains(["-ftyped-cxx-new-delete", "-ftyped-cxx-delete"])
+                                }
+                            )
                         }
                     }
                 }
@@ -8652,10 +9494,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("SourceFile.c"),
-                    ]),
+                        TestFile("SourceFile.c")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration("Debug")
                 ],
@@ -8664,16 +9508,20 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "AppTarget",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES"
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES"
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
                                 "SourceFile.c"
                             ])
                         ]
-                    )]
+                    )
+                ]
             )
 
             let fs = PseudoFS()
@@ -8713,7 +9561,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             for override in overrides {
                 await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: override), runDestination: .macOS, fs: fs) { results -> Void in
                     results.checkTarget("AppTarget") { target -> Void in
-                        results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: {task in test(task: task, overrides: override)})
+                        results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: { task in test(task: task, overrides: override) })
                     }
                 }
             }
@@ -8727,10 +9575,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("SourceFile.c"),
-                    ]),
+                        TestFile("SourceFile.c")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration("Debug")
                 ],
@@ -8739,16 +9589,20 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "AppTarget",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES"
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES"
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
                                 "SourceFile.c"
                             ])
                         ]
-                    )]
+                    )
+                ]
             )
 
             let fs = PseudoFS()
@@ -8788,7 +9642,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             for override in overrides {
                 await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: override), runDestination: .macOS, fs: fs) { results -> Void in
                     results.checkTarget("AppTarget") { target -> Void in
-                        results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: {task in test(task: task, overrides: override)})
+                        results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: { task in test(task: task, overrides: override) })
                     }
                 }
             }
@@ -8802,10 +9656,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("SourceFile.c"),
-                    ]),
+                        TestFile("SourceFile.c")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration("Debug")
                 ],
@@ -8814,16 +9670,20 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "AppTarget",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES"
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES"
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
                                 "SourceFile.c"
                             ])
                         ]
-                    )]
+                    )
+                ]
             )
 
             let fs = PseudoFS()
@@ -8835,14 +9695,16 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
 
             func generateWarningFlags(enabled: Bool) -> [String] {
                 let prefix = enabled ? "-W" : "-Wno-"
-                return ["\(prefix)builtin-memcpy-chk-size",
-                        "\(prefix)format-nonliteral",
-                        "\(prefix)array-bounds",
-                        "\(prefix)array-bounds-pointer-arithmetic",
-                        "\(prefix)suspicious-memaccess",
-                        "\(prefix)sizeof-array-div",
-                        "\(prefix)sizeof-pointer-div",
-                        "\(prefix)return-stack-address",]
+                return [
+                    "\(prefix)builtin-memcpy-chk-size",
+                    "\(prefix)format-nonliteral",
+                    "\(prefix)array-bounds",
+                    "\(prefix)array-bounds-pointer-arithmetic",
+                    "\(prefix)suspicious-memaccess",
+                    "\(prefix)sizeof-array-div",
+                    "\(prefix)sizeof-pointer-div",
+                    "\(prefix)return-stack-address",
+                ]
             }
 
             func test(task: any PlannedTask, overrides: [String: String]) -> Void {
@@ -8899,14 +9761,13 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             for override in overrides {
                 await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: override), runDestination: .macOS, fs: fs) { results -> Void in
                     results.checkTarget("AppTarget") { target -> Void in
-                        results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: {task in test(task: task, overrides: override)})
+                        results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: { task in test(task: task, overrides: override) })
                     }
                 }
             }
         }
     }
 
-
     @Test(.requireSDKs(.macOS))
     func unsafeBufferUsage() async throws {
         try await withTemporaryDirectory { tmpDir in
@@ -8914,10 +9775,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("SourceFile.cpp"),
-                    ]),
+                        TestFile("SourceFile.cpp")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration("Debug")
                 ],
@@ -8926,16 +9789,20 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "AppTarget",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES"
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES"
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
                                 "SourceFile.cpp"
                             ])
                         ]
-                    )]
+                    )
+                ]
             )
 
             let fs = PseudoFS()
@@ -8990,7 +9857,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             for override in overrides {
                 await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: override), runDestination: .macOS, fs: fs) { results -> Void in
                     results.checkTarget("AppTarget") { target -> Void in
-                        results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: {task in test(task: task, overrides: override)})
+                        results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: { task in test(task: task, overrides: override) })
                     }
                 }
             }
@@ -9004,16 +9871,21 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
                         TestFile("SourceFile.c"),
                         TestFile("Source.swift"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "SWIFT_EXEC": swiftCompilerPath.str,
-                        "SWIFT_VERSION": swiftVersion,
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": swiftVersion,
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -9025,10 +9897,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         buildPhases: [
                             TestSourcesBuildPhase([
                                 "SourceFile.c",
-                                "Source.swift"
+                                "Source.swift",
                             ])
                         ]
-                    )]
+                    )
+                ]
             )
 
             let fs = PseudoFS()
@@ -9078,15 +9951,20 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("SourceFile.c"),
-                    ]),
+                        TestFile("SourceFile.c")
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "DEAD_CODE_STRIPPING": "YES",
-                        "ONLY_ACTIVE_ARCH": "YES"
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "DEAD_CODE_STRIPPING": "YES",
+                            "ONLY_ACTIVE_ARCH": "YES",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -9097,10 +9975,11 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                "SourceFile.c",
+                                "SourceFile.c"
                             ])
                         ]
-                    )]
+                    )
+                ]
             )
 
             let fs = PseudoFS()
@@ -9136,10 +10015,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("SourceFile.c"),
-                    ]),
+                        TestFile("SourceFile.c")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration("Debug")
                 ],
@@ -9148,16 +10029,20 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "AppTarget",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES"
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES"
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
                                 "SourceFile.c"
                             ])
                         ]
-                    )]
+                    )
+                ]
             )
 
             let fs = PseudoFS()
@@ -9184,7 +10069,7 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             for override in overrides {
                 await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: override), runDestination: .macOS, fs: fs) { results -> Void in
                     results.checkTarget("AppTarget") { target -> Void in
-                        results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: {task in test(task: task, overrides: override)})
+                        results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: { task in test(task: task, overrides: override) })
                     }
                 }
             }
@@ -9195,61 +10080,71 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             let boundsSafetyMissingChecksOptOutsSetting = "CLANG_BOUNDS_SAFETY_BRINGUP_MISSING_CHECKS_OPT_OUTS"
 
             for (enableBoundsSafetyBuildSetting, enableBoundsSafetyFlag) in [
-                (enableBoundsSafetySetting,"-fbounds-safety"),
-                (enableBoundsAttributesSetting, "-fbounds-attributes")] {
+                (enableBoundsSafetySetting, "-fbounds-safety"),
+                (enableBoundsAttributesSetting, "-fbounds-attributes"),
+            ] {
 
                 // Maps an array of build overrides to a closure that tests properties of the build overrides
                 let missingChecksOverrides = [
-                    [ enableBoundsSafetyBuildSetting: "YES", boundsSafetyMissingChecksSetting: "none"]: { (task: any PlannedTask) in
+                    [enableBoundsSafetyBuildSetting: "YES", boundsSafetyMissingChecksSetting: "none"]: { (task: any PlannedTask) in
                         task.checkCommandLineContains(["-fno-bounds-safety-bringup-missing-checks"])
                     },
 
                     // Default behavior is not pass the compiler flag and thus use the compiler default
-                    [ enableBoundsSafetyBuildSetting: "YES", boundsSafetyMissingChecksSetting: "default"]: { (task: any PlannedTask) in
+                    [enableBoundsSafetyBuildSetting: "YES", boundsSafetyMissingChecksSetting: "default"]: { (task: any PlannedTask) in
                         task.checkCommandLineDoesNotContain("-fno-bounds-safety-bringup-missing-checks")
                         task.checkCommandLineDoesNotContain("-fbounds-safety-bringup-missing-checks")
                     },
-                    [ enableBoundsSafetyBuildSetting: "YES"]: { (task: any PlannedTask) in
+                    [enableBoundsSafetyBuildSetting: "YES"]: { (task: any PlannedTask) in
                         task.checkCommandLineDoesNotContain("-fno-bounds-safety-bringup-missing-checks")
                         task.checkCommandLineDoesNotContain("-fbounds-safety-bringup-missing-checks")
                     },
 
-
-                    [ enableBoundsSafetyBuildSetting: "YES", boundsSafetyMissingChecksSetting: "batch_0"]: { (task: any PlannedTask) in
+                    [enableBoundsSafetyBuildSetting: "YES", boundsSafetyMissingChecksSetting: "batch_0"]: { (task: any PlannedTask) in
                         task.checkCommandLineContains(["-fbounds-safety-bringup-missing-checks=batch_0"])
                         task.checkCommandLineDoesNotContain("-fno-bounds-safety-bringup-missing-checks")
                     },
-                    [ enableBoundsSafetyBuildSetting: "YES", boundsSafetyMissingChecksSetting: "access_size,return_size"]: { (task: any PlannedTask) in
+                    [enableBoundsSafetyBuildSetting: "YES", boundsSafetyMissingChecksSetting: "access_size,return_size"]: { (task: any PlannedTask) in
                         task.checkCommandLineContains(["-fbounds-safety-bringup-missing-checks=access_size,return_size"])
                         task.checkCommandLineDoesNotContain("-fno-bounds-safety-bringup-missing-checks")
                     },
 
                     // Opt-outs
-                    [ enableBoundsSafetyBuildSetting: "YES",
-                      boundsSafetyMissingChecksSetting: "batch_0",
-                      boundsSafetyMissingChecksOptOutsSetting: "access_size"]: { (task: any PlannedTask) in
+                    [
+                        enableBoundsSafetyBuildSetting: "YES",
+                        boundsSafetyMissingChecksSetting: "batch_0",
+                        boundsSafetyMissingChecksOptOutsSetting: "access_size",
+                    ]: { (task: any PlannedTask) in
                         task.checkCommandLineContains([
                             "-fbounds-safety-bringup-missing-checks=batch_0",
-                            "-fno-bounds-safety-bringup-missing-checks=access_size"])
+                            "-fno-bounds-safety-bringup-missing-checks=access_size",
+                        ])
                     },
-                    [ enableBoundsSafetyBuildSetting: "YES",
-                      boundsSafetyMissingChecksSetting: "batch_0",
-                      boundsSafetyMissingChecksOptOutsSetting: "access_size,return_size"]: { (task: any PlannedTask) in
+                    [
+                        enableBoundsSafetyBuildSetting: "YES",
+                        boundsSafetyMissingChecksSetting: "batch_0",
+                        boundsSafetyMissingChecksOptOutsSetting: "access_size,return_size",
+                    ]: { (task: any PlannedTask) in
                         task.checkCommandLineContains([
                             "-fbounds-safety-bringup-missing-checks=batch_0",
-                            "-fno-bounds-safety-bringup-missing-checks=access_size,return_size"])
+                            "-fno-bounds-safety-bringup-missing-checks=access_size,return_size",
+                        ])
                     },
                 ]
 
                 for (overrides, checkOverrideProperties) in missingChecksOverrides {
                     await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: overrides), runDestination: .macOS, fs: fs) { results -> Void in
                         results.checkTarget("AppTarget") { target -> Void in
-                            results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: {task in
-                                // Check the overrides contains -fbounds-safety or -fbounds-attributes
-                                task.checkCommandLineContains([enableBoundsSafetyFlag])
-                                // Check properties specific to this array of overrides
-                                checkOverrideProperties(task)
-                            })
+                            results.checkTask(
+                                .matchTarget(target),
+                                .matchRuleType("CompileC"),
+                                body: { task in
+                                    // Check the overrides contains -fbounds-safety or -fbounds-attributes
+                                    task.checkCommandLineContains([enableBoundsSafetyFlag])
+                                    // Check properties specific to this array of overrides
+                                    checkOverrideProperties(task)
+                                }
+                            )
                         }
                     }
                 }
@@ -9257,7 +10152,6 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
         }
     }
 
-
     @Test(.requireSDKs(.macOS))
     func libCPPLibraryHardening() async throws {
         try await withTemporaryDirectory { tmpDir in
@@ -9265,10 +10159,12 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "SomeFiles", path: "Sources",
+                    "SomeFiles",
+                    path: "Sources",
                     children: [
-                        TestFile("SourceFile.cpp"),
-                    ]),
+                        TestFile("SourceFile.cpp")
+                    ]
+                ),
                 buildConfigurations: [
                     TestBuildConfiguration("Debug")
                 ],
@@ -9277,16 +10173,20 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                         "AppTarget",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES"
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES"
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
                                 "SourceFile.cpp"
                             ])
                         ]
-                    )]
+                    )
+                ]
             )
 
             let fs = PseudoFS()
@@ -9317,7 +10217,6 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                     task.checkCommandLineNoMatch([.contains("-D_LIBCPP_HARDENING_MODE")])
                 }
 
-
                 if let cppHardeningSettingVal = overrides[cppHardeningSetting] {
                     // When CLANG_CXX_STANDARD_LIBRARY_HARDENING is set, it wins and sets hardening mode policy
                     switch cppHardeningSettingVal {
@@ -9406,14 +10305,13 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
             for override in overrides {
                 await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: override), runDestination: .macOS, fs: fs) { results -> Void in
                     results.checkTarget("AppTarget") { target -> Void in
-                        results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: {task in test(task: task, overrides: override)})
+                        results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), body: { task in test(task: task, overrides: override) })
                     }
                 }
             }
         }
     }
 
-
     @Test(.requireSDKs(.macOS))
     func warningSuppression() async throws {
         try await withTemporaryDirectory { tmpDir in
@@ -9422,31 +10320,38 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 "ProjectName",
                 sourceRoot: srcRoot,
                 groupTree: TestGroup(
-                    "Sources", path: "Sources",
+                    "Sources",
+                    path: "Sources",
                     children: [
                         TestFile("File1.swift"),
                         TestFile("File2.m"),
-                    ]),
+                    ]
+                ),
                 targets: [
                     TestStandardTarget(
                         "MyFramework",
                         type: .framework,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                "SWIFT_VERSION": swiftVersion,
-                                "SUPPRESS_WARNINGS": "YES"
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "SWIFT_EXEC": swiftCompilerPath.str,
+                                    "SWIFT_VERSION": swiftVersion,
+                                    "SUPPRESS_WARNINGS": "YES",
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase([
                                 TestBuildFile("File1.swift"),
                                 TestBuildFile("File2.m"),
-                            ]),
-                        ]),
-                ])
+                            ])
+                        ]
+                    )
+                ]
+            )
 
             let tester = try await TaskConstructionTester(getCore(), testProject)
             await tester.checkBuild(BuildParameters(action: .install, configuration: "Debug"), runDestination: .macOS) { results in
@@ -9474,32 +10379,41 @@ fileprivate struct TaskConstructionTests: CoreBasedTests {
                 groupTree: TestGroup(
                     "SomeFiles",
                     children: [
-                        TestFile("main.swift"),
-                    ]),
+                        TestFile("main.swift")
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SWIFT_EXEC": swiftCompilerPath.str,
-                        "SWIFT_VERSION": try await swiftVersion,
-                        "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
-                        "SDKROOT": "$(HOST_PLATFORM)",
-                        "LIBRARY_SEARCH_PATHS": "$(inherited) $(BUILT_PRODUCTS_DIR)/PackageFrameworks"
-                    ]),
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SWIFT_EXEC": swiftCompilerPath.str,
+                            "SWIFT_VERSION": try await swiftVersion,
+                            "SUPPORTED_PLATFORMS": "$(HOST_PLATFORM)",
+                            "SDKROOT": "$(HOST_PLATFORM)",
+                            "LIBRARY_SEARCH_PATHS": "$(inherited) $(BUILT_PRODUCTS_DIR)/PackageFrameworks",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
-                        "swifttool", type: .commandLineTool,
+                        "swifttool",
+                        type: .commandLineTool,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "PRODUCT_NAME": "$(TARGET_NAME)"
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["main.swift"]),
+                            TestSourcesBuildPhase(["main.swift"])
                         ],
                         dependencies: []
-                    ),
-                ])
+                    )
+                ]
+            )
             let tester = try await TaskConstructionTester(getCore(), testProject)
             try await tester.checkBuild(BuildParameters(action: .install, configuration: "Debug"), runDestination: .host) { results in
                 try results.checkTask(.matchRuleType("Ld")) { task in
diff --git a/Tests/SWBTaskConstructionTests/TaskOrderingTests.swift b/Tests/SWBTaskConstructionTests/TaskOrderingTests.swift
index 7ec04ecd..e5711496 100644
--- a/Tests/SWBTaskConstructionTests/TaskOrderingTests.swift
+++ b/Tests/SWBTaskConstructionTests/TaskOrderingTests.swift
@@ -27,28 +27,33 @@ fileprivate struct TaskOrderingTests: CoreBasedTests {
             "aProject",
             groupTree: TestGroup(
                 "SomeFiles",
-                children: [TestFile("SourceFile.m")]),
+                children: [TestFile("SourceFile.m")]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "SKIP_INSTALL": "NO",
-                    "DEFINES_MODULE": "YES",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "RETAIN_RAW_BINARIES": "YES",
-                ]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "SKIP_INSTALL": "NO",
+                        "DEFINES_MODULE": "YES",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "RETAIN_RAW_BINARIES": "YES",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Tool",
                     type: .commandLineTool,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release"),
+                        TestBuildConfiguration("Release")
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["SourceFile.m"]),
+                        TestSourcesBuildPhase(["SourceFile.m"])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(BuildParameters(action: .install, configuration: "Release"), runDestination: .macOS) { results in
@@ -67,4 +72,3 @@ fileprivate struct TaskOrderingTests: CoreBasedTests {
         }
     }
 }
-
diff --git a/Tests/SWBTaskConstructionTests/TrackedDomainTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/TrackedDomainTaskConstructionTests.swift
index 950f8855..f0fbd89e 100644
--- a/Tests/SWBTaskConstructionTests/TrackedDomainTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/TrackedDomainTaskConstructionTests.swift
@@ -38,7 +38,8 @@ fileprivate struct TrackedDomainTaskConstructionTests: CoreBasedTests {
                     TestFile("FrameworkB/PrivacyInfo.xcprivacy"),
                     TestFile("FrameworkC/PrivacyInfo.xcprivacy"),
                     TestFile("Support.xcframework"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -50,18 +51,22 @@ fileprivate struct TrackedDomainTaskConstructionTests: CoreBasedTests {
                         "SWIFT_VERSION": "5",
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "LIBTOOL": libtoolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "INFOPLIST_FILE": "MyInfo.plist",
-                            // This should be enabled by default, so do not explicitly set this.
-                            // "AGGREGATE_TRACKED_DOMAINS": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "MyInfo.plist"
+                                    // This should be enabled by default, so do not explicitly set this.
+                                    // "AGGREGATE_TRACKED_DOMAINS": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -76,11 +81,15 @@ fileprivate struct TrackedDomainTaskConstructionTests: CoreBasedTests {
                             TestBuildFile(.target("OtherPackageProduct")),
                             TestBuildFile(.target("PackageProductWithTransitiveRefs")),
                         ]),
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile(.target("FrameworkTargetB")),
-                            TestBuildFile(.target("FrameworkTargetC")),
-                            TestBuildFile("Support.xcframework"),
-                        ], destinationSubfolder: TestCopyFilesBuildPhase.TestDestinationSubfolder.frameworks, onlyForDeployment: false)
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile(.target("FrameworkTargetB")),
+                                TestBuildFile(.target("FrameworkTargetC")),
+                                TestBuildFile("Support.xcframework"),
+                            ],
+                            destinationSubfolder: TestCopyFilesBuildPhase.TestDestinationSubfolder.frameworks,
+                            onlyForDeployment: false
+                        ),
                     ],
                     dependencies: [
                         "FrameworkTargetA",
@@ -95,43 +104,44 @@ fileprivate struct TrackedDomainTaskConstructionTests: CoreBasedTests {
                     "FrameworkTargetA",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"]),
+                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "main.swift",
                             "FrameworkA/PrivacyInfo.xcprivacy",
-                        ]),
+                        ])
                     ]
                 ),
                 TestStandardTarget(
                     "FrameworkTargetB",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"]),
+                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "main.swift",
                             "FrameworkB/PrivacyInfo.xcprivacy",
-                        ]),
+                        ])
                     ]
                 ),
                 TestStandardTarget(
                     "FrameworkTargetC",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"]),
+                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "MyInfo.plist"])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "main.swift",
                             "FrameworkC/PrivacyInfo.xcprivacy",
-                        ]),
+                        ])
                     ]
                 ),
 
-            ])
+            ]
+        )
 
         let testPackage = try await TestPackageProject(
             "Package",
@@ -140,88 +150,123 @@ fileprivate struct TrackedDomainTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("foo.c"),
                     TestFile("Package/PrivacyInfo.xcprivacy"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "CODE_SIGNING_ALLOWED": "NO",
-                    "CODE_SIGN_IDENTITY": "",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "USE_HEADERMAP": "NO",
-                    "LIBTOOL": libtoolPath.str,
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "CODE_SIGNING_ALLOWED": "NO",
+                        "CODE_SIGN_IDENTITY": "",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "USE_HEADERMAP": "NO",
+                        "LIBTOOL": libtoolPath.str,
+                    ]
+                )
             ],
             targets: [
                 TestPackageProductTarget(
                     "SomePackageProduct",
                     frameworksBuildPhase: TestFrameworksBuildPhase([
-                        TestBuildFile(.target("A"))]),
-                    dependencies: ["A"]),
+                        TestBuildFile(.target("A"))
+                    ]),
+                    dependencies: ["A"]
+                ),
                 TestPackageProductTarget(
                     "OtherPackageProduct",
                     frameworksBuildPhase: TestFrameworksBuildPhase([
-                        TestBuildFile(.target("A"))]),
-                    dependencies: ["A"]),
+                        TestBuildFile(.target("A"))
+                    ]),
+                    dependencies: ["A"]
+                ),
                 TestPackageProductTarget(
                     "NestedPackagedProduct",
                     frameworksBuildPhase: TestFrameworksBuildPhase([
-                        TestBuildFile(.target("B"))]),
-                    dependencies: ["B"]),
+                        TestBuildFile(.target("B"))
+                    ]),
+                    dependencies: ["B"]
+                ),
                 TestPackageProductTarget(
                     "PackageProductWithTransitiveRefs",
                     frameworksBuildPhase: TestFrameworksBuildPhase([
                         TestBuildFile(.target("SomePackageProduct")),
                         TestBuildFile(.target("NestedPackagedProduct")),
                         TestBuildFile(.target("C")),
-                        TestBuildFile(.target("E"))]),
-                    dependencies: ["SomePackageProduct", "NestedPackageProduct", "C", "E"]),
+                        TestBuildFile(.target("E")),
+                    ]),
+                    dependencies: ["SomePackageProduct", "NestedPackageProduct", "C", "E"]
+                ),
                 TestStandardTarget(
-                    "A", type: .staticLibrary,
+                    "A",
+                    type: .staticLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", impartedBuildProperties: TestImpartedBuildProperties(buildSettings: [
-                            "EMBED_PACKAGE_RESOURCE_BUNDLE_NAMES": "FOO",
-                        ])),
+                        TestBuildConfiguration(
+                            "Debug",
+                            impartedBuildProperties: TestImpartedBuildProperties(buildSettings: [
+                                "EMBED_PACKAGE_RESOURCE_BUNDLE_NAMES": "FOO"
+                            ])
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["foo.c"]),
-                        TestCopyFilesBuildPhase(["Package/PrivacyInfo.xcprivacy"], destinationSubfolder: .resources)
-                    ], dependencies: [
-                        "FOO",
-                    ]),
+                        TestCopyFilesBuildPhase(["Package/PrivacyInfo.xcprivacy"], destinationSubfolder: .resources),
+                    ],
+                    dependencies: [
+                        "FOO"
+                    ]
+                ),
 
                 TestStandardTarget(
-                    "B", type: .framework,
-                    buildPhases: [TestSourcesBuildPhase(["foo.c"])]),
+                    "B",
+                    type: .framework,
+                    buildPhases: [TestSourcesBuildPhase(["foo.c"])]
+                ),
                 TestStandardTarget(
-                    "C", type: .dynamicLibrary,
+                    "C",
+                    type: .dynamicLibrary,
                     buildPhases: [
                         TestSourcesBuildPhase(["foo.c"]),
                         TestFrameworksBuildPhase([
-                            TestBuildFile(.target("C_Impl"))])],
-                    dependencies: ["C_Impl"]),
+                            TestBuildFile(.target("C_Impl"))
+                        ]),
+                    ],
+                    dependencies: ["C_Impl"]
+                ),
                 TestStandardTarget(
-                    "C_Impl", type: .staticLibrary,
-                    buildPhases: [TestSourcesBuildPhase(["foo.c"])]),
+                    "C_Impl",
+                    type: .staticLibrary,
+                    buildPhases: [TestSourcesBuildPhase(["foo.c"])]
+                ),
                 TestPackageProductTarget(
                     "SwiftyJSON",
                     frameworksBuildPhase: TestFrameworksBuildPhase([]),
                     buildConfigurations: [],
-                    dependencies: ["D"]),
+                    dependencies: ["D"]
+                ),
                 TestStandardTarget(
-                    "E", type: .objectFile,
+                    "E",
+                    type: .objectFile,
                     buildPhases: [
                         TestSourcesBuildPhase([]),
                         TestFrameworksBuildPhase([
-                            TestBuildFile(.target("F"))])
-                    ], dependencies: ["F"]),
+                            TestBuildFile(.target("F"))
+                        ]),
+                    ],
+                    dependencies: ["F"]
+                ),
                 TestStandardTarget(
-                    "F", type: .objectFile,
+                    "F",
+                    type: .objectFile,
                     buildPhases: [
                         TestSourcesBuildPhase(["foo.c"])
-                    ]),
+                    ]
+                ),
                 TestStandardTarget(
-                    "FOO", type: .bundle
-                )
-            ])
+                    "FOO",
+                    type: .bundle
+                ),
+            ]
+        )
 
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject, testPackage])
         let core = try await getCore()
@@ -232,10 +277,13 @@ fileprivate struct TrackedDomainTaskConstructionTests: CoreBasedTests {
         try fs.createDirectory(Path(SRCROOT), recursive: true)
         try fs.write(Path(SRCROOT).join("file.c"), contents: "int f() { return 0; }")
 
-        let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-            XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
-            XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
-        ])
+        let supportXCFramework = try XCFramework(
+            version: Version(1, 0),
+            libraries: [
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
+                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
+            ]
+        )
         let supportXCFrameworkPath = Path(SRCROOT).join("Support.xcframework")
         try fs.createDirectory(supportXCFrameworkPath, recursive: true)
         let infoLookup = try await getCore()
diff --git a/Tests/SWBTaskConstructionTests/UnitTestTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/UnitTestTaskConstructionTests.swift
index f818fbef..11ff3e89 100644
--- a/Tests/SWBTaskConstructionTests/UnitTestTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/UnitTestTaskConstructionTests.swift
@@ -41,7 +41,8 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     TestFile("TestOne.swift"),
                     TestFile("TestTwo.swift"),
                     TestFile("UnitTestTarget-Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -53,17 +54,20 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         "_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES": "NO",
                         "SWIFT_VERSION": swiftVersion,
                         "TAPI_EXEC": tapiToolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "UnitTestTarget",
                     type: .unitTest,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "INFOPLIST_FILE": "UnitTestTarget-Info.plist",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "UnitTestTarget-Info.plist"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -71,8 +75,8 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                             "TestTwo.swift",
                         ]),
                         TestFrameworksBuildPhase([
-                            "FrameworkTarget.framework",
-                        ])
+                            "FrameworkTarget.framework"
+                        ]),
                     ],
                     dependencies: ["FrameworkTarget"]
                 ),
@@ -80,18 +84,18 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     "FrameworkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "FrameworkTarget-Info.plist"]),
+                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "FrameworkTarget-Info.plist"])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "ClassOne.swift",
                             "ClassTwo.swift",
                         ]),
-                        TestFrameworksBuildPhase([
-                        ])
+                        TestFrameworksBuildPhase([]),
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let defaultToolchain = try #require(core.toolchainRegistry.defaultToolchain)
         let tester = try TaskConstructionTester(core, testProject)
@@ -149,7 +153,7 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         .namePattern(.suffix("copy-headers-completion")),
                         .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
                         .namePattern(.prefix("target-")),
-                        .name("WorkspaceHeaderMapVFSFilesWritten")
+                        .name("WorkspaceHeaderMapVFSFilesWritten"),
                     ])
 
                     task.checkOutputs([
@@ -181,7 +185,7 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         .namePattern(.suffix("copy-headers-completion")),
                         .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
                         .namePattern(.prefix("target-")),
-                        .name("WorkspaceHeaderMapVFSFilesWritten")
+                        .name("WorkspaceHeaderMapVFSFilesWritten"),
                     ])
 
                     task.checkOutputs([
@@ -195,10 +199,12 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
 
                 results.checkTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/UnitTestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UnitTestTarget-OutputFileMap.json"])) { task in
                     task.checkInputs([
-                        .namePattern(.and(.prefix("target-"), .suffix("-immediate")))])
+                        .namePattern(.and(.prefix("target-"), .suffix("-immediate")))
+                    ])
 
                     task.checkOutputs([
-                        .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UnitTestTarget-OutputFileMap.json"),])
+                        .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UnitTestTarget-OutputFileMap.json")
+                    ])
                 }
 
                 results.checkTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/UnitTestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UnitTestTarget_const_extract_protocols.json"])) { task in
@@ -210,8 +216,10 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     #expect(lines == inputFiles + [""])
                 }
                 results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/UnitTestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UnitTestTarget.SwiftConstValuesFileList"])) { task, contents in
-                    let inputFiles = ["\(SRCROOT)/build/aProject.build/Debug/UnitTestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/TestOne.swiftconstvalues",
-                                      "\(SRCROOT)/build/aProject.build/Debug/UnitTestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/TestTwo.swiftconstvalues"]
+                    let inputFiles = [
+                        "\(SRCROOT)/build/aProject.build/Debug/UnitTestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/TestOne.swiftconstvalues",
+                        "\(SRCROOT)/build/aProject.build/Debug/UnitTestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/TestTwo.swiftconstvalues",
+                    ]
                     let lines = contents.asString.components(separatedBy: .newlines)
                     #expect(lines == inputFiles + [""])
                 }
@@ -246,22 +254,26 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchTarget(target), .matchRule(["Copy", "\(SRCROOT)/build/Debug/UnitTestTarget.swiftmodule/\(results.runDestinationTargetArchitecture)-apple-macos.swiftdoc", "\(SRCROOT)/build/aProject.build/Debug/UnitTestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UnitTestTarget.swiftdoc"])) { _ in }
 
                 // There should be the expected mkdir tasks for the test bundle.
-                results.checkTasks(.matchTarget(target), .matchRuleType("MkDir"), body: { (tasks) -> Void in
-                    let sortedTasks = tasks.sorted { $0.ruleInfo.lexicographicallyPrecedes($1.ruleInfo) }
-                    #expect(sortedTasks.count == 4)
-                    for (idx, (ruleInfo, commandLine)) in [
-                        (["MkDir", "\(SRCROOT)/build/Debug/UnitTestTarget.xctest"], ["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/UnitTestTarget.xctest"]),
-                        (["MkDir", "\(SRCROOT)/build/Debug/UnitTestTarget.xctest/Contents"], ["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/UnitTestTarget.xctest/Contents"]),
-                        (["MkDir", "\(SRCROOT)/build/Debug/UnitTestTarget.xctest/Contents/MacOS"], ["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/UnitTestTarget.xctest/Contents/MacOS"]),
-                        (["MkDir", "\(SRCROOT)/build/Debug/UnitTestTarget.xctest/Contents/Resources"], ["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/UnitTestTarget.xctest/Contents/Resources"]),
-                    ].enumerated() {
-                        // Assuming we have at least 'idx' many tasks, then check the rule info and command line.
-                        if idx < sortedTasks.count {
-                            sortedTasks[idx].checkRuleInfo(ruleInfo)
-                            sortedTasks[idx].checkCommandLine(commandLine)
+                results.checkTasks(
+                    .matchTarget(target),
+                    .matchRuleType("MkDir"),
+                    body: { (tasks) -> Void in
+                        let sortedTasks = tasks.sorted { $0.ruleInfo.lexicographicallyPrecedes($1.ruleInfo) }
+                        #expect(sortedTasks.count == 4)
+                        for (idx, (ruleInfo, commandLine)) in [
+                            (["MkDir", "\(SRCROOT)/build/Debug/UnitTestTarget.xctest"], ["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/UnitTestTarget.xctest"]),
+                            (["MkDir", "\(SRCROOT)/build/Debug/UnitTestTarget.xctest/Contents"], ["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/UnitTestTarget.xctest/Contents"]),
+                            (["MkDir", "\(SRCROOT)/build/Debug/UnitTestTarget.xctest/Contents/MacOS"], ["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/UnitTestTarget.xctest/Contents/MacOS"]),
+                            (["MkDir", "\(SRCROOT)/build/Debug/UnitTestTarget.xctest/Contents/Resources"], ["/bin/mkdir", "-p", "\(SRCROOT)/build/Debug/UnitTestTarget.xctest/Contents/Resources"]),
+                        ].enumerated() {
+                            // Assuming we have at least 'idx' many tasks, then check the rule info and command line.
+                            if idx < sortedTasks.count {
+                                sortedTasks[idx].checkRuleInfo(ruleInfo)
+                                sortedTasks[idx].checkCommandLine(commandLine)
+                            }
                         }
                     }
-                })
+                )
 
                 // There should be a task to copy the testing baselines.
                 results.checkTask(.matchTarget(target), .matchRule(["Copy", "\(SRCROOT)/build/Debug/UnitTestTarget.xctest/Contents/Resources/xcbaselines", baselineDir.str])) { _ in }
@@ -310,7 +322,8 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("TestOne.swift"),
                     TestFile("TestTwo.swift"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -321,7 +334,8 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         "SWIFT_VERSION": swiftVersion,
                         "INDEX_DATA_STORE_DIR": "/index",
                         "LINKER_DRIVER": "swiftc",
-                    ])
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -330,7 +344,8 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
-                            buildSettings: [:])
+                            buildSettings: [:]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(),
@@ -346,7 +361,8 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
-                            buildSettings: [:])
+                            buildSettings: [:]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -357,7 +373,8 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     dependencies: [],
                     productReferenceName: "$(EXCTABLE_NAME)"
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
 
@@ -380,7 +397,7 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         "--linker-filelist", .suffix("UnitTestTarget.LinkFileList"),
                         "--index-store", .equal(Path("/index").str),
                         "--index-unit-base-path",
-                        .equal(Path.root.join("/tmp/Test/aProject/build").str)
+                        .equal(Path.root.join("/tmp/Test/aProject/build").str),
                     ])
                     task.checkInputs([
                         .pathPattern(.suffix("UnitTestTarget.LinkFileList")),
@@ -396,7 +413,6 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
         }
     }
 
-
     // MARK: Application test target using TEST_HOST
 
     /// Test task construction for an application target on macOS with two test targets which are testing it using TEST_HOST. Both debug and install builds are tested.
@@ -421,7 +437,8 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     TestFile("UnitTestTargetOne-Info.plist"),
                     TestFile("TestTwo.swift"),
                     TestFile("UnitTestTargetTwo-Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -435,7 +452,8 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         "SWIFT_EXEC": swiftCompilerPath.str,
                         "SWIFT_VERSION": swiftVersion,
                         "TAPI_EXEC": tapiToolPath.str,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestAggregateTarget(
@@ -447,17 +465,19 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     "UnitTestTargetOne",
                     type: .unitTest,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "INFOPLIST_FILE": "UnitTestTargetOne-Info.plist",
-                                                "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/Contents/MacOS/AppTarget",
-                                                "BUNDLE_LOADER": "$(TEST_HOST)",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "UnitTestTargetOne-Info.plist",
+                                "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/Contents/MacOS/AppTarget",
+                                "BUNDLE_LOADER": "$(TEST_HOST)",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "TestOne.swift",
-                        ]),
+                            "TestOne.swift"
+                        ])
                     ],
                     dependencies: ["AppTarget"]
                 ),
@@ -465,17 +485,19 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     "UnitTestTargetTwo",
                     type: .unitTest,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "INFOPLIST_FILE": "UnitTestTargetTwo-Info.plist",
-                                                "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/Contents/MacOS/AppTarget",
-                                                "BUNDLE_LOADER": "$(TEST_HOST)",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "UnitTestTargetTwo-Info.plist",
+                                "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/Contents/MacOS/AppTarget",
+                                "BUNDLE_LOADER": "$(TEST_HOST)",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "TestTwo.swift",
-                        ]),
+                            "TestTwo.swift"
+                        ])
                     ],
                     dependencies: ["AppTarget"]
                 ),
@@ -483,18 +505,18 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "AppTarget-Info.plist"]),
+                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "AppTarget-Info.plist"])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "ClassOne.swift",
                             "ClassTwo.swift",
                         ]),
-                        TestFrameworksBuildPhase([
-                        ])
+                        TestFrameworksBuildPhase([]),
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let defaultToolchain = try #require(core.toolchainRegistry.defaultToolchain)
         let tester = try TaskConstructionTester(core, testProject)
@@ -553,13 +575,13 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         .namePattern(.suffix("copy-headers-completion")),
                         .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
                         .namePattern(.prefix("target-")),
-                        .name("WorkspaceHeaderMapVFSFilesWritten")
+                        .name("WorkspaceHeaderMapVFSFilesWritten"),
                     ])
 
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UnitTestTargetOne Swift Compilation Requirements Finished"),
 
-                            .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UnitTestTargetOne.swiftmodule"),
+                        .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UnitTestTargetOne.swiftmodule"),
                         .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UnitTestTargetOne.swiftsourceinfo"),
                         .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UnitTestTargetOne.abi.json"),
                         .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UnitTestTargetOne-Swift.h"),
@@ -585,13 +607,13 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         .namePattern(.suffix("copy-headers-completion")),
                         .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
                         .namePattern(.prefix("target-")),
-                        .name("WorkspaceHeaderMapVFSFilesWritten")
+                        .name("WorkspaceHeaderMapVFSFilesWritten"),
                     ])
 
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UnitTestTargetOne Swift Compilation Finished"),
                         .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/Objects-normal/\(results.runDestinationTargetArchitecture)/TestOne.o"),
-                        .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/Objects-normal/\(results.runDestinationTargetArchitecture)/TestOne.swiftconstvalues")
+                        .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/Objects-normal/\(results.runDestinationTargetArchitecture)/TestOne.swiftconstvalues"),
                     ])
 
                     testTargetCompileTasks.append(task)
@@ -599,10 +621,12 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
 
                 results.checkTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UnitTestTargetOne-OutputFileMap.json"])) { task in
                     task.checkInputs([
-                        .namePattern(.and(.prefix("target-"), .suffix("-immediate")))])
+                        .namePattern(.and(.prefix("target-"), .suffix("-immediate")))
+                    ])
 
                     task.checkOutputs([
-                        .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UnitTestTargetOne-OutputFileMap.json"),])
+                        .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UnitTestTargetOne-OutputFileMap.json")
+                    ])
 
                 }
                 results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UnitTestTargetOne.SwiftFileList"])) { task, contents in
@@ -676,7 +700,7 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         .any,
                     ])
                     task.checkOutputs([
-                        .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/UnitTestTargetOne.xctest.xcent"),
+                        .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/UnitTestTargetOne.xctest.xcent")
                     ])
                 }
                 results.checkTask(.matchTarget(target), .matchRuleType("ProcessProductPackagingDER"), .matchRuleItemPattern(.suffix(".xcent"))) { task in
@@ -688,7 +712,7 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         .any,
                     ])
                     task.checkOutputs([
-                        .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/UnitTestTargetOne.xctest.xcent.der"),
+                        .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/UnitTestTargetOne.xctest.xcent.der")
                     ])
                 }
                 results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemBasename("UnitTestTargetOne.xctest")) { task in
@@ -700,9 +724,9 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/PlugIns/UnitTestTargetOne.xctest/Contents/Info.plist"),
                         .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/UnitTestTargetOne.xctest.xcent"),
                         .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/PlugIns/UnitTestTargetOne.xctest/Contents/MacOS/UnitTestTargetOne"),
-                        .any,   // -will-sign
-                        .any,   // -Barrier-ChangeAlternatePermissions
-                        .any,   // -entry
+                        .any,  // -will-sign
+                        .any,  // -Barrier-ChangeAlternatePermissions
+                        .any,  // -entry
                     ])
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/Debug/AppTarget.app/Contents/PlugIns/UnitTestTargetOne.xctest"),
@@ -886,9 +910,9 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         .path("\(SRCROOT)/build/UninstalledProducts/macosx/UnitTestTargetOne.xctest/Contents/Info.plist"),
                         .path("\(SRCROOT)/build/aProject.build/Debug/UnitTestTargetOne.build/UnitTestTargetOne.xctest.xcent"),
                         .path("\(SRCROOT)/build/UninstalledProducts/macosx/UnitTestTargetOne.xctest/Contents/MacOS/UnitTestTargetOne"),
-                        .any,   // -will-sign
-                        .any,   // -Barrier-ChangeAlternatePermissions
-                        .any,   // -entry
+                        .any,  // -will-sign
+                        .any,  // -Barrier-ChangeAlternatePermissions
+                        .any,  // -entry
                     ])
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/UninstalledProducts/macosx/UnitTestTargetOne.xctest"),
@@ -970,7 +994,8 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     TestFile("TestOne.swift"),
                     TestFile("TestTwo.swift"),
                     TestFile("UnitTestTarget-Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -983,24 +1008,27 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
                         "SDKROOT": "watchos",
                         "SWIFT_VERSION": swiftVersion,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "UnitTestTarget",
                     type: .unitTest,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "INFOPLIST_FILE": "UnitTestTarget-Info.plist",
-                                                "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/AppTarget",
-                                                "BUNDLE_LOADER": "$(TEST_HOST)",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "UnitTestTarget-Info.plist",
+                                "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/AppTarget",
+                                "BUNDLE_LOADER": "$(TEST_HOST)",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "TestOne.swift",
-                        ]),
+                            "TestOne.swift"
+                        ])
                     ],
                     dependencies: ["AppTarget"]
                 ),
@@ -1008,18 +1036,18 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "AppTarget-Info.plist"]),
+                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "AppTarget-Info.plist"])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "ClassOne.swift",
                             "ClassTwo.swift",
                         ]),
-                        TestFrameworksBuildPhase([
-                        ])
+                        TestFrameworksBuildPhase([]),
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1246,7 +1274,8 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     // Test target sources
                     TestFile("TestOne.swift"),
                     TestFile("ExtensionTests-Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -1259,19 +1288,24 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
                         "SDKROOT": "watchos",
                         "SWIFT_VERSION": swiftVersion,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "WatchApp",
                     type: .watchKitApp,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "WatchApp-Info.plist"]),
+                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "WatchApp-Info.plist"])
                     ],
                     buildPhases: [
-                        TestCopyFilesBuildPhase([
-                            TestBuildFile("WatchExtension.appex", codeSignOnCopy: true)
-                        ], destinationSubfolder: .plugins, onlyForDeployment: false),
+                        TestCopyFilesBuildPhase(
+                            [
+                                TestBuildFile("WatchExtension.appex", codeSignOnCopy: true)
+                            ],
+                            destinationSubfolder: .plugins,
+                            onlyForDeployment: false
+                        )
                     ],
                     dependencies: ["WatchExtension"]
                 ),
@@ -1279,34 +1313,37 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     "WatchExtension",
                     type: .watchKitExtension,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "WatchExtension-Info.plist"]),
+                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "WatchExtension-Info.plist"])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassOne.swift",
-                        ]),
+                            "ClassOne.swift"
+                        ])
                     ]
                 ),
                 TestStandardTarget(
                     "ExtensionTests",
                     type: .unitTest,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "INFOPLIST_FILE": "ExtensionTests-Info.plist",
-                                                "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/WatchExtension.appex/WatchExtension",
-                                                "BUNDLE_LOADER": "$(TEST_HOST)",
-                                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "ExtensionTests-Info.plist",
+                                "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/WatchExtension.appex/WatchExtension",
+                                "BUNDLE_LOADER": "$(TEST_HOST)",
+                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "TestOne.swift",
-                        ]),
+                            "TestOne.swift"
+                        ])
                     ],
                     dependencies: ["WatchExtension"]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1638,7 +1675,8 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     // Test target sources
                     TestFile("TestOne.swift"),
                     TestFile("UnitTestTarget-Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -1651,24 +1689,27 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         "SDKROOT": "iphoneos",
                         "SUPPORTS_MACCATALYST": "YES",
                         "SWIFT_VERSION": swiftVersion,
-                        "INFOPLIST_FILE": "$(TARGET_NAME)-Info.plist"
-                    ]),
+                        "INFOPLIST_FILE": "$(TARGET_NAME)-Info.plist",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "UnitTestTarget",
                     type: .unitTest,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/AppTarget",
-                                                "BUNDLE_LOADER": "$(TEST_HOST)",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/AppTarget",
+                                "BUNDLE_LOADER": "$(TEST_HOST)",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "TestOne.swift",
-                        ]),
+                            "TestOne.swift"
+                        ])
                     ],
                     dependencies: ["AppTarget"]
                 ),
@@ -1677,11 +1718,12 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     type: .application,
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassOne.swift",
-                        ]),
+                            "ClassOne.swift"
+                        ])
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -1734,7 +1776,6 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
         }
     }
 
-
     /// Due to the interleaving of a host and hosted target, if Parallelize Build is turned *off* we take special measures to avoid known dependency cycles.  (Serial target builds are far more likely to lead to dependency cycles because of the strict ordering of targets.)  c.f. rdar://problem/72563741
     @Test(.requireSDKs(.macOS))
     func applicationUnitTestTarget_usingSerializedTargetBuild() async throws {
@@ -1756,7 +1797,8 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     TestFile("HostedTestTargetOne-Info.plist"),
                     TestFile("TestTwo.swift"),
                     TestFile("HostedTestTargetTwo-Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -1769,37 +1811,44 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         "SWIFT_VERSION": swiftVersion,
                         "TAPI_EXEC": tapiToolPath.str,
                         "DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING": "YES",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "INFOPLIST_FILE": "AppTarget-Info.plist",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "AppTarget-Info.plist"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassOne.swift",
-                        ]),
+                            "ClassOne.swift"
+                        ])
                     ]
                 ),
                 TestStandardTarget(
                     "HostedTestTargetOne",
                     type: .unitTest,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "INFOPLIST_FILE": "HostedTestTargetOne-Info.plist",
-                            "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/Contents/MacOS/AppTarget",
-                            "BUNDLE_LOADER": "$(TEST_HOST)",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "HostedTestTargetOne-Info.plist",
+                                "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/Contents/MacOS/AppTarget",
+                                "BUNDLE_LOADER": "$(TEST_HOST)",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "TestOne.swift",
-                        ]),
+                            "TestOne.swift"
+                        ])
                     ],
                     dependencies: ["AppTarget"]
                 ),
@@ -1807,16 +1856,19 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     "HostedTestTargetTwo",
                     type: .unitTest,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "INFOPLIST_FILE": "HostedTestTargetTwo-Info.plist",
-                            "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/Contents/MacOS/AppTarget",
-                            "BUNDLE_LOADER": "$(TEST_HOST)",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "HostedTestTargetTwo-Info.plist",
+                                "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/Contents/MacOS/AppTarget",
+                                "BUNDLE_LOADER": "$(TEST_HOST)",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "TestTwo.swift",
-                        ]),
+                            "TestTwo.swift"
+                        ])
                     ],
                     dependencies: ["AppTarget"]
                 ),
@@ -1825,18 +1877,22 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     "FwkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "INFOPLIST_FILE": "FwkTarget-Info.plist",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "FwkTarget-Info.plist"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassTwo.swift",
-                        ]),
+                            "ClassTwo.swift"
+                        ])
                     ],
                     dependencies: []
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
 
@@ -1975,7 +2031,6 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
         }
     }
 
-
     /// This test exercises another case where when Parallelize Build is turned *off* there could be a cycle. In this case, the test target depends on the app target and an additional framework target, which used to result in a cycle if the framework target were listed after the app target.  c.f. rdar://problem/73210420
     ///
     /// This is different from `testApplicationUnitTestTarget_usingSerializedTargetBuild()` above because the framework target is a dependency of the test target, rather than being an intervening top-level target.
@@ -1997,7 +2052,8 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     // Test target sources
                     TestFile("TestOne.swift"),
                     TestFile("HostedTestTarget-Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -2010,37 +2066,44 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         "SWIFT_VERSION": swiftVersion,
                         "TAPI_EXEC": tapiToolPath.str,
                         "DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING": "YES",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "INFOPLIST_FILE": "AppTarget-Info.plist",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "AppTarget-Info.plist"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassOne.swift",
-                        ]),
+                            "ClassOne.swift"
+                        ])
                     ]
                 ),
                 TestStandardTarget(
                     "HostedTestTarget",
                     type: .unitTest,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "INFOPLIST_FILE": "HostedTestTarget-Info.plist",
-                            "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/Contents/MacOS/AppTarget",
-                            "BUNDLE_LOADER": "$(TEST_HOST)",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "HostedTestTarget-Info.plist",
+                                "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/Contents/MacOS/AppTarget",
+                                "BUNDLE_LOADER": "$(TEST_HOST)",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "TestOne.swift",
-                        ]),
+                            "TestOne.swift"
+                        ])
                     ],
                     // This is the key to this test: If FwkTarget is listed after AppTarget here, then there would previously have been a cycle.
                     dependencies: [
@@ -2052,18 +2115,22 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     "FwkTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "INFOPLIST_FILE": "FwkTarget-Info.plist",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "FwkTarget-Info.plist"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassTwo.swift",
-                        ]),
+                            "ClassTwo.swift"
+                        ])
                     ],
                     dependencies: []
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
 
@@ -2196,10 +2263,8 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
         }
     }
 
-
     // MARK: UI test target using a test runner
 
-
     /// Test task construction for a UI test target for macOS.  Both debug and install builds are tested.
     @Test(.requireSDKs(.macOS), .requireXcode26())
     func uITestTarget_macOS() async throws {
@@ -2220,7 +2285,8 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     TestFile("TestOne.swift"),
                     TestFile("TestTwo.swift"),
                     TestFile("UITestTarget-Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -2230,29 +2296,31 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         "SWIFT_ENABLE_EXPLICIT_MODULES": "NO",
                         "_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES": "NO",
                         "SWIFT_VERSION": swiftVersion,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "UITestTarget",
                     type: .uiTest,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "INFOPLIST_FILE": "UITestTarget-Info.plist",
-                                                "PRODUCT_BUNDLE_IDENTIFIER": "com.dev.UITestTarget",
-                                                "CODE_SIGN_IDENTITY": "-",
-                                                "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
-                                                "TEST_FRAMEWORK_DEVELOPER_VARIANT_SUBPATH": "",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "UITestTarget-Info.plist",
+                                "PRODUCT_BUNDLE_IDENTIFIER": "com.dev.UITestTarget",
+                                "CODE_SIGN_IDENTITY": "-",
+                                "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
+                                "TEST_FRAMEWORK_DEVELOPER_VARIANT_SUBPATH": "",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "TestOne.swift",
                             "TestTwo.swift",
                         ]),
-                        TestFrameworksBuildPhase([
-                        ])
+                        TestFrameworksBuildPhase([]),
                     ],
                     dependencies: ["AppTarget"]
                 ),
@@ -2260,7 +2328,7 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "AppTarget-Info.plist"]),
+                        TestBuildConfiguration("Debug", buildSettings: ["INFOPLIST_FILE": "AppTarget-Info.plist"])
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -2268,11 +2336,11 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                             "ClassOne.swift",
                             "ClassTwo.swift",
                         ]),
-                        TestFrameworksBuildPhase([
-                        ])
+                        TestFrameworksBuildPhase([]),
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let defaultToolchain = try #require(core.toolchainRegistry.defaultToolchain)
         let tester = try TaskConstructionTester(core, testProject)
@@ -2334,7 +2402,7 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         .namePattern(.suffix("copy-headers-completion")),
                         .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
                         .namePattern(.prefix("target-")),
-                        .name("WorkspaceHeaderMapVFSFilesWritten")
+                        .name("WorkspaceHeaderMapVFSFilesWritten"),
                     ])
 
                     task.checkOutputs([
@@ -2361,7 +2429,7 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         .namePattern(.suffix("copy-headers-completion")),
                         .namePattern(.and(.prefix("target-"), .suffix("Producer"))),
                         .namePattern(.prefix("target-")),
-                        .name("WorkspaceHeaderMapVFSFilesWritten")
+                        .name("WorkspaceHeaderMapVFSFilesWritten"),
                     ])
 
                     task.checkOutputs([
@@ -2376,10 +2444,12 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
 
                 results.checkTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UITestTarget-OutputFileMap.json"])) { task in
                     task.checkInputs([
-                        .namePattern(.and(.prefix("target-"), .suffix("-immediate")))])
+                        .namePattern(.and(.prefix("target-"), .suffix("-immediate")))
+                    ])
 
                     task.checkOutputs([
-                        .path("\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UITestTarget-OutputFileMap.json"),])
+                        .path("\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UITestTarget-OutputFileMap.json")
+                    ])
                 }
                 results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UITestTarget.SwiftFileList"])) { task, contents in
                     let inputFiles = ["\(SRCROOT)/TestOne.swift", "\(SRCROOT)/TestTwo.swift"]
@@ -2387,8 +2457,10 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     #expect(lines == inputFiles + [""])
                 }
                 results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UITestTarget.SwiftConstValuesFileList"])) { task, contents in
-                    let inputFiles = ["\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/TestOne.swiftconstvalues",
-                                      "\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/TestTwo.swiftconstvalues"]
+                    let inputFiles = [
+                        "\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/TestOne.swiftconstvalues",
+                        "\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/TestTwo.swiftconstvalues",
+                    ]
                     let lines = contents.asString.components(separatedBy: .newlines)
                     #expect(lines == inputFiles + [""])
                 }
@@ -2401,7 +2473,6 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     #expect(lines == [""])
                 }
 
-
                 // There should be one link task, and a task to generate its link file list.
                 results.checkTask(.matchTarget(target), .matchRule(["WriteAuxiliaryFile", "\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/Objects-normal/\(results.runDestinationTargetArchitecture)/UITestTarget.LinkFileList"])) { _ in }
                 results.checkTask(.matchTarget(target), .matchRuleType("Ld")) { task in
@@ -2536,7 +2607,7 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         .any,
                     ])
                     task.checkOutputs([
-                        .path("\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/UITestTarget.xctest.xcent"),
+                        .path("\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/UITestTarget.xctest.xcent")
                     ])
                 }
                 results.checkTask(.matchTarget(target), .matchRuleType("ProcessProductPackagingDER")) { task in
@@ -2548,7 +2619,7 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         .any,
                     ])
                     task.checkOutputs([
-                        .path("\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/UITestTarget.xctest.xcent.der"),
+                        .path("\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/UITestTarget.xctest.xcent.der")
                     ])
                 }
                 results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemBasename("UITestTarget.xctest")) { task in
@@ -2574,29 +2645,33 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemBasename("UITestTarget-Runner.app")) { task in
                     task.checkRuleInfo(["CodeSign", "\(SRCROOT)/build/Debug/UITestTarget-Runner.app"])
                     task.checkCommandLine(["/usr/bin/codesign", "--force", "--sign", "-", "--entitlements", "\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/UITestTarget.xctest.xcent", "--timestamp=none", "--generate-entitlement-der", "\(SRCROOT)/build/Debug/UITestTarget-Runner.app"])
-                    task.checkInputs(contain: ([[
-                        .path("\(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/PlugIns/UITestTarget.xctest"),
-                        .path("\(SRCROOT)/build/Debug/UITestTarget-Runner.app"),
-                        .path("\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/UITestTarget.xctest.xcent"),
-                        // The task to sign the runner depends on the tasks to copy the runner and the test frameworks.
-                        .name("MkDir \(SRCROOT)/build/Debug/UITestTarget-Runner.app"),
-                        .name("Preprocess \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/Info.plist"),
-                        .name("Copy \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/PkgInfo"),
-                        .name("Copy \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/MacOS/UITestTarget-Runner"),
-                        .name("SignTestFramework \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/Frameworks/XCTest.framework"),
-                        .name("SignTestFramework \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/Frameworks/XCUnit.framework"),
-                        .name("SignTestFramework \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/Frameworks/XCUIAutomation.framework"),
-                        .name("SignTestFramework \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/Frameworks/XCTestCore.framework"),
-                        .name("SignTestFramework \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/Frameworks/XCTestSupport.framework"),
-                        .name("SignTestFramework \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/Frameworks/XCTAutomationSupport.framework"),
-                        .name("SignTestFramework \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/Frameworks/libXCTestSwiftSupport.dylib"),
-                        .name("SignTestFramework \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/Frameworks/Testing.framework"),
-                        .name("CodeSign \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/PlugIns/UITestTarget.xctest"),
-                        .path("\(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/MacOS/UITestTarget-Runner"),
-                        .name("Copy \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/MacOS/UITestTarget-Runner"),
-                        .namePattern(.and(.prefix("target-UITestTarget-"), .suffix("-ProductPostprocessingTaskProducer"))),
-                        .namePattern(.and(.prefix("target-UITestTarget-"), .suffix("-entry"))),
-                    ]] as [[NodePattern]]).reduce([], +))
+                    task.checkInputs(
+                        contain: ([
+                            [
+                                .path("\(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/PlugIns/UITestTarget.xctest"),
+                                .path("\(SRCROOT)/build/Debug/UITestTarget-Runner.app"),
+                                .path("\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/UITestTarget.xctest.xcent"),
+                                // The task to sign the runner depends on the tasks to copy the runner and the test frameworks.
+                                .name("MkDir \(SRCROOT)/build/Debug/UITestTarget-Runner.app"),
+                                .name("Preprocess \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/Info.plist"),
+                                .name("Copy \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/PkgInfo"),
+                                .name("Copy \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/MacOS/UITestTarget-Runner"),
+                                .name("SignTestFramework \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/Frameworks/XCTest.framework"),
+                                .name("SignTestFramework \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/Frameworks/XCUnit.framework"),
+                                .name("SignTestFramework \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/Frameworks/XCUIAutomation.framework"),
+                                .name("SignTestFramework \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/Frameworks/XCTestCore.framework"),
+                                .name("SignTestFramework \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/Frameworks/XCTestSupport.framework"),
+                                .name("SignTestFramework \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/Frameworks/XCTAutomationSupport.framework"),
+                                .name("SignTestFramework \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/Frameworks/libXCTestSwiftSupport.dylib"),
+                                .name("SignTestFramework \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/Frameworks/Testing.framework"),
+                                .name("CodeSign \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/PlugIns/UITestTarget.xctest"),
+                                .path("\(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/MacOS/UITestTarget-Runner"),
+                                .name("Copy \(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/MacOS/UITestTarget-Runner"),
+                                .namePattern(.and(.prefix("target-UITestTarget-"), .suffix("-ProductPostprocessingTaskProducer"))),
+                                .namePattern(.and(.prefix("target-UITestTarget-"), .suffix("-entry"))),
+                            ]
+                        ] as [[NodePattern]]).reduce([], +)
+                    )
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/Debug/UITestTarget-Runner.app"),
                         .path("\(SRCROOT)/build/Debug/UITestTarget-Runner.app/Contents/MacOS/UITestTarget-Runner"),
@@ -2748,29 +2823,33 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchTarget(target), .matchRuleType("CodeSign"), .matchRuleItemBasename("UITestTarget-Runner.app")) { task in
                     task.checkRuleInfo(["CodeSign", "\(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app"])
                     task.checkCommandLine(["/usr/bin/codesign", "--force", "--sign", "-", "--entitlements", "\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/UITestTarget.xctest.xcent", "--generate-entitlement-der", "\(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app"])
-                    task.checkInputs(contain: ([[
-                        .path("\(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/PlugIns/UITestTarget.xctest"),
-                        .path("\(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app"),
-                        .path("\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/UITestTarget.xctest.xcent"),
-                        // The task to sign the runner depends on the tasks to copy the runner and the test frameworks.
-                        .name("MkDir \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app"),
-                        .name("Preprocess \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/Info.plist"),
-                        .name("Copy \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/PkgInfo"),
-                        .name("Copy \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/MacOS/UITestTarget-Runner"),
-                        .name("SignTestFramework \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/Frameworks/XCTest.framework"),
-                        .name("SignTestFramework \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/Frameworks/XCUnit.framework"),
-                        .name("SignTestFramework \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/Frameworks/XCUIAutomation.framework"),
-                        .name("SignTestFramework \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/Frameworks/XCTestCore.framework"),
-                        .name("SignTestFramework \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/Frameworks/XCTestSupport.framework"),
-                        .name("SignTestFramework \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/Frameworks/XCTAutomationSupport.framework"),
-                        .name("SignTestFramework \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/Frameworks/libXCTestSwiftSupport.dylib"),
-                        .name("SignTestFramework \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/Frameworks/Testing.framework"),
-                        .name("CodeSign \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/PlugIns/UITestTarget.xctest"),
-                        .path("\(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/MacOS/UITestTarget-Runner"),
-                        .name("Copy \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/MacOS/UITestTarget-Runner"),
-                        .namePattern(.and(.prefix("target-UITestTarget-"), .suffix("-ProductPostprocessingTaskProducer"))),
-                        .namePattern(.and(.prefix("target-UITestTarget-"), .suffix("-entry"))),
-                    ]] as [[NodePattern]]).reduce([], +))
+                    task.checkInputs(
+                        contain: ([
+                            [
+                                .path("\(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/PlugIns/UITestTarget.xctest"),
+                                .path("\(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app"),
+                                .path("\(SRCROOT)/build/aProject.build/Debug/UITestTarget.build/UITestTarget.xctest.xcent"),
+                                // The task to sign the runner depends on the tasks to copy the runner and the test frameworks.
+                                .name("MkDir \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app"),
+                                .name("Preprocess \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/Info.plist"),
+                                .name("Copy \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/PkgInfo"),
+                                .name("Copy \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/MacOS/UITestTarget-Runner"),
+                                .name("SignTestFramework \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/Frameworks/XCTest.framework"),
+                                .name("SignTestFramework \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/Frameworks/XCUnit.framework"),
+                                .name("SignTestFramework \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/Frameworks/XCUIAutomation.framework"),
+                                .name("SignTestFramework \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/Frameworks/XCTestCore.framework"),
+                                .name("SignTestFramework \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/Frameworks/XCTestSupport.framework"),
+                                .name("SignTestFramework \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/Frameworks/XCTAutomationSupport.framework"),
+                                .name("SignTestFramework \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/Frameworks/libXCTestSwiftSupport.dylib"),
+                                .name("SignTestFramework \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/Frameworks/Testing.framework"),
+                                .name("CodeSign \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/PlugIns/UITestTarget.xctest"),
+                                .path("\(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/MacOS/UITestTarget-Runner"),
+                                .name("Copy \(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/MacOS/UITestTarget-Runner"),
+                                .namePattern(.and(.prefix("target-UITestTarget-"), .suffix("-ProductPostprocessingTaskProducer"))),
+                                .namePattern(.and(.prefix("target-UITestTarget-"), .suffix("-entry"))),
+                            ]
+                        ] as [[NodePattern]]).reduce([], +)
+                    )
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app"),
                         .path("\(SRCROOT)/build/UninstalledProducts/macosx/UITestTarget-Runner.app/Contents/MacOS/UITestTarget-Runner"),
@@ -2784,7 +2863,6 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     }
                 }
 
-
                 // Check there are no more tasks for this target.
                 results.checkNoTask(.matchTarget(target))
             }
@@ -2817,7 +2895,8 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     TestFile("TestOne.swift"),
                     TestFile("TestTwo.swift"),
                     TestFile("UITestTarget-Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -2826,27 +2905,29 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "SDKROOT": "iphoneos",
                         "SWIFT_VERSION": swiftVersion,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "UITestTarget",
                     type: .uiTest,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "INFOPLIST_FILE": "UITestTarget-Info.plist",
-                                                "CODE_SIGN_IDENTITY": "Apple Development",
-                                                "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "UITestTarget-Info.plist",
+                                "CODE_SIGN_IDENTITY": "Apple Development",
+                                "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "TestOne.swift",
                             "TestTwo.swift",
                         ]),
-                        TestFrameworksBuildPhase([
-                        ])
+                        TestFrameworksBuildPhase([]),
                     ],
                     dependencies: ["AppTarget"]
                 ),
@@ -2854,12 +2935,14 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "INFOPLIST_FILE": "AppTarget-Info.plist",
-                                                "CODE_SIGN_IDENTITY": "Apple Development",
-                                                "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "AppTarget-Info.plist",
+                                "CODE_SIGN_IDENTITY": "Apple Development",
+                                "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -2867,11 +2950,11 @@ fileprivate struct UnitTestTaskConstructionTests: CoreBasedTests {
                             "ClassOne.swift",
                             "ClassTwo.swift",
                         ]),
-                        TestFrameworksBuildPhase([
-                        ])
+                        TestFrameworksBuildPhase([]),
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let defaultToolchain = try #require(core.toolchainRegistry.defaultToolchain)
         let tester = try TaskConstructionTester(core, testProject)
diff --git a/Tests/SWBTaskConstructionTests/UnsupportedBehaviorTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/UnsupportedBehaviorTaskConstructionTests.swift
index 85630110..a94bc3ba 100644
--- a/Tests/SWBTaskConstructionTests/UnsupportedBehaviorTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/UnsupportedBehaviorTaskConstructionTests.swift
@@ -37,7 +37,8 @@ fileprivate struct UnsupportedBehaviorTaskConstructionTests: CoreBasedTests {
                     // Test target sources
                     TestFile("TestOne.swift"),
                     TestFile("UnitTestTarget-Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -56,29 +57,32 @@ fileprivate struct UnsupportedBehaviorTaskConstructionTests: CoreBasedTests {
                         "SYMROOT[sdk=iphonesimulator*]": "$(REDIRECT_CONFIG_BUILD_DIR)/$(PROJECT)/$(IOS_CONFIG_BUILD_DIR)",
                         "SYMROOT[sdk=iphoneos*]": "$(REDIRECT_CONFIG_BUILD_DIR)/$(PROJECT)/$(IOS_CONFIG_BUILD_DIR)",
                         "CONFIGURATION_BUILD_DIR": "$(SYMROOT)",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "UnitTestTarget",
                     type: .unitTest,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "INFOPLIST_FILE": "UnitTestTarget-Info.plist",
-                                                // We need to use this value - rather than the commented-out value below which is the default value from the target template - in order to get this to work when redirecting TARGET_BUILD_DIR.
-                                                "TEST_HOST": "$(REDIRECT_OUT_DIR)/$(PROJECT_NAME)/AppTarget.app/AppTarget",
-                                                //                                "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/AppTarget",
-                                                "BUNDLE_LOADER": "$(TEST_HOST)",
-                                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks",
-                                                // Settings to redirect TARGET_BUILD_DIR.
-                                                "TARGET_BUILD_DIR": "$(REDIRECT_OUT_DIR)/$(PROJECT_NAME)/AppTarget.app/PlugIns",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "UnitTestTarget-Info.plist",
+                                // We need to use this value - rather than the commented-out value below which is the default value from the target template - in order to get this to work when redirecting TARGET_BUILD_DIR.
+                                "TEST_HOST": "$(REDIRECT_OUT_DIR)/$(PROJECT_NAME)/AppTarget.app/AppTarget",
+                                //                                "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/AppTarget.app/AppTarget",
+                                "BUNDLE_LOADER": "$(TEST_HOST)",
+                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks",
+                                // Settings to redirect TARGET_BUILD_DIR.
+                                "TARGET_BUILD_DIR": "$(REDIRECT_OUT_DIR)/$(PROJECT_NAME)/AppTarget.app/PlugIns",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "TestOne.swift",
-                        ]),
+                            "TestOne.swift"
+                        ])
                     ],
                     dependencies: ["AppTarget"]
                 ),
@@ -86,20 +90,23 @@ fileprivate struct UnsupportedBehaviorTaskConstructionTests: CoreBasedTests {
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "INFOPLIST_FILE": "AppTarget-Info.plist",
-                                                // Settings to redirect TARGET_BUILD_DIR.
-                                                "TARGET_BUILD_DIR": "$(REDIRECT_OUT_DIR)/$(PROJECT_NAME)",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "INFOPLIST_FILE": "AppTarget-Info.plist",
+                                // Settings to redirect TARGET_BUILD_DIR.
+                                "TARGET_BUILD_DIR": "$(REDIRECT_OUT_DIR)/$(PROJECT_NAME)",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "ClassOne.swift",
-                        ]),
+                            "ClassOne.swift"
+                        ])
                     ]
                 ),
-            ])
+            ]
+        )
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
 
@@ -216,8 +223,9 @@ fileprivate struct UnsupportedBehaviorTaskConstructionTests: CoreBasedTests {
             groupTree: TestGroup(
                 "SomeFiles",
                 children: [
-                    TestFile("foo.c"),
-                ]),
+                    TestFile("foo.c")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -225,23 +233,27 @@ fileprivate struct UnsupportedBehaviorTaskConstructionTests: CoreBasedTests {
                         "SDKROOT": "iphoneos",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "EXCLUDED_SOURCE_FILE_NAMES": "*",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .dynamicLibrary,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [:]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [:]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "foo.c",
-                        ]),
+                            "foo.c"
+                        ])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         try await TaskConstructionTester(getCore(), testProject).checkBuild(runDestination: .iOS) { results in
             results.checkNoDiagnostics()
         }
@@ -255,8 +267,9 @@ fileprivate struct UnsupportedBehaviorTaskConstructionTests: CoreBasedTests {
             groupTree: TestGroup(
                 "SomeFiles",
                 children: [
-                    TestFile("foo.c"),
-                ]),
+                    TestFile("foo.c")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -264,23 +277,27 @@ fileprivate struct UnsupportedBehaviorTaskConstructionTests: CoreBasedTests {
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "PRODUCT_TYPE": "com.apple.product-type.tool",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "AppTarget",
                     type: .xpcService,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [:]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [:]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "foo.c",
-                        ]),
+                            "foo.c"
+                        ])
                     ]
-                ),
-            ])
+                )
+            ]
+        )
         try await TaskConstructionTester(getCore(), testProject).checkBuild(runDestination: .macOS) { results in
             results.checkNoDiagnostics()
 
diff --git a/Tests/SWBTaskConstructionTests/WatchTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/WatchTaskConstructionTests.swift
index 4bb83b9d..0fb8a107 100644
--- a/Tests/SWBTaskConstructionTests/WatchTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/WatchTaskConstructionTests.swift
@@ -31,7 +31,8 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "Sources", path: "Sources",
+                "Sources",
+                path: "Sources",
                 children: [
                     // iOS app files
                     TestFile("iosApp/main.m"),
@@ -51,7 +52,8 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                     TestFile("watchosExtension/Assets.xcassets"),
                     TestFile("watchosExtension/Info.plist"),
                     TestFile("watchosExtension/PrivacyInfo.xcprivacy"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -67,20 +69,23 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                         "SWIFT_VERSION": swiftVersion,
                         "PRODUCT_BUNDLE_IDENTIFIER": "com.test.aProject",
                         "CLANG_USE_RESPONSE_FILE": "NO",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Watchable",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS": "YES",
-                                                "INFOPLIST_FILE": "Sources/iosApp/Info.plist",
-                                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks",
-                                                "TARGETED_DEVICE_FAMILY": "1,2",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS": "YES",
+                                "INFOPLIST_FILE": "Sources/iosApp/Info.plist",
+                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks",
+                                "TARGETED_DEVICE_FAMILY": "1,2",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -91,10 +96,14 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                             "Base.lproj/Main.storyboard",
                             "iosApp/Assets.xcassets",
                         ]),
-                        TestCopyFilesBuildPhase([
-                            "Watchable WatchKit App.app",
-                        ], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch", onlyForDeployment: false
-                                               ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Watchable WatchKit App.app"
+                            ],
+                            destinationSubfolder: .builtProductsDir,
+                            destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch",
+                            onlyForDeployment: false
+                        ),
                     ],
                     dependencies: ["Watchable WatchKit App"]
                 ),
@@ -102,28 +111,33 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                     "Watchable WatchKit App",
                     type: .watchKitApp,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "ARCHS[sdk=watchos*]": "arm64_32",
-                                                "ARCHS[sdk=watchsimulator*]": "x86_64",
-                                                "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
-                                                "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
-                                                "INFOPLIST_FILE": "Sources/watchosApp/Info.plist",
-                                                "SDKROOT": "watchos",
-                                                "SKIP_INSTALL": "YES",
-                                                "TARGETED_DEVICE_FAMILY": "4",
-                                                "WATCHOS_DEPLOYMENT_TARGET": core.loadSDK(.watchOS).defaultDeploymentTarget,
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ARCHS[sdk=watchos*]": "arm64_32",
+                                "ARCHS[sdk=watchsimulator*]": "x86_64",
+                                "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
+                                "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
+                                "INFOPLIST_FILE": "Sources/watchosApp/Info.plist",
+                                "SDKROOT": "watchos",
+                                "SKIP_INSTALL": "YES",
+                                "TARGETED_DEVICE_FAMILY": "4",
+                                "WATCHOS_DEPLOYMENT_TARGET": core.loadSDK(.watchOS).defaultDeploymentTarget,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
                             "Base.lproj/Interface.storyboard",
                             "watchosApp/Assets.xcassets",
                         ]),
-                        TestCopyFilesBuildPhase([
-                            "Watchable WatchKit Extension.appex",
-                        ], destinationSubfolder: .plugins, onlyForDeployment: false
-                                               ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Watchable WatchKit Extension.appex"
+                            ],
+                            destinationSubfolder: .plugins,
+                            onlyForDeployment: false
+                        ),
                     ],
                     dependencies: ["Watchable WatchKit Extension", "Watchable WatchKit Extension (old)"]
                 ),
@@ -131,20 +145,22 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                     "Watchable WatchKit Extension",
                     type: .watchKitExtension,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "ARCHS[sdk=watchos*]": "arm64_32",
-                                                "ARCHS[sdk=watchsimulator*]": "x86_64",
-                                                "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
-                                                "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS": "YES",
-                                                "INFOPLIST_FILE": "Sources/watchosExtension/Info.plist",
-                                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
-                                                "SDKROOT": "watchos",
-                                                "SKIP_INSTALL": "YES",
-                                                "SWIFT_VERSION": swiftVersion,
-                                                "TARGETED_DEVICE_FAMILY": "4",
-                                                "WATCHOS_DEPLOYMENT_TARGET": core.loadSDK(.watchOS).defaultDeploymentTarget,
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ARCHS[sdk=watchos*]": "arm64_32",
+                                "ARCHS[sdk=watchsimulator*]": "x86_64",
+                                "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
+                                "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS": "YES",
+                                "INFOPLIST_FILE": "Sources/watchosExtension/Info.plist",
+                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
+                                "SDKROOT": "watchos",
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": swiftVersion,
+                                "TARGETED_DEVICE_FAMILY": "4",
+                                "WATCHOS_DEPLOYMENT_TARGET": core.loadSDK(.watchOS).defaultDeploymentTarget,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -161,19 +177,21 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                     "Watchable WatchKit Extension (old)",
                     type: .watchKitExtension,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "ARCHS[sdk=watchos*]": "arm64_32",
-                                                "ARCHS[sdk=watchsimulator*]": "x86_64",
-                                                "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
-                                                "INFOPLIST_FILE": "Sources/watchosExtension/Info.plist",
-                                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
-                                                "SDKROOT": "watchos",
-                                                "SKIP_INSTALL": "YES",
-                                                "SWIFT_VERSION": swiftVersion,
-                                                "TARGETED_DEVICE_FAMILY": "4",
-                                                "WATCHOS_DEPLOYMENT_TARGET": "5.0",
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ARCHS[sdk=watchos*]": "arm64_32",
+                                "ARCHS[sdk=watchsimulator*]": "x86_64",
+                                "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
+                                "INFOPLIST_FILE": "Sources/watchosExtension/Info.plist",
+                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
+                                "SDKROOT": "watchos",
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": swiftVersion,
+                                "TARGETED_DEVICE_FAMILY": "4",
+                                "WATCHOS_DEPLOYMENT_TARGET": "5.0",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -186,7 +204,8 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                         ]),
                     ]
                 ),
-            ])
+            ]
+        )
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
         let IPHONEOS_DEPLOYMENT_TARGET = core.loadSDK(.iOS).defaultDeploymentTarget
@@ -231,7 +250,7 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                         ["clang"],
                         ["-target", "arm64_32-apple-watchos\(WATCHOS_DEPLOYMENT_TARGET)"],
                         ["-isysroot", core.loadSDK(.watchOS).path.str],
-                        ["-o", "\(SRCROOT)/build/aProject.build/Debug-watchos/\(target.target.name).build/Objects-\(variant)/\(arch)/Controller.o"]
+                        ["-o", "\(SRCROOT)/build/aProject.build/Debug-watchos/\(target.target.name).build/Objects-\(variant)/\(arch)/Controller.o"],
                     ].reduce([], +)
                     task.checkCommandLineContains(expectedCommandLine)
                     #expect(!task.commandLine.contains("-fasm-blocks"))
@@ -250,7 +269,7 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                         ["clang"],
                         ["-target", "\(arch)-apple-watchos\(WATCHOS_DEPLOYMENT_TARGET)"],
                         ["-isysroot", core.loadSDK(.watchOS).path.str, "-Xlinker", "-rpath", "-Xlinker", "@executable_path/Frameworks", "-Xlinker", "-rpath", "-Xlinker", "@executable_path/../../Frameworks"],
-                        ["-fapplication-extension", "\(SRCROOT)/build/Debug-watchos/\(target.target.name).appex/\(target.target.name)"]
+                        ["-fapplication-extension", "\(SRCROOT)/build/Debug-watchos/\(target.target.name).appex/\(target.target.name)"],
                     ].reduce([], +)
                     task.checkCommandLineContains(expectedCommandLine)
                     if try Version(WATCHOS_DEPLOYMENT_TARGET) >= Version(6) {
@@ -299,9 +318,12 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchTarget(target), .matchRuleType("CodeSign")) { task in
                     #expect(task.ruleInfo[1] == "\(SRCROOT)/build/Debug-watchos/Watchable WatchKit Extension.appex")
                     task.checkCommandLine(["/usr/bin/codesign", "--force", "--sign", "105DE4E702E4", "--entitlements", "\(SRCROOT)/build/aProject.build/Debug-watchos/\(target.target.name).build/\(target.target.name).appex.xcent", "--timestamp=none", "--generate-entitlement-der", "\(SRCROOT)/build/Debug-watchos/\(target.target.name).appex"])
-                    task.checkEnvironment([
-                        "CODESIGN_ALLOCATE": .equal("codesign_allocate"),
-                    ], exact: true)
+                    task.checkEnvironment(
+                        [
+                            "CODESIGN_ALLOCATE": .equal("codesign_allocate")
+                        ],
+                        exact: true
+                    )
                 }
 
                 // There should be no other tasks for this target.
@@ -315,7 +337,7 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                         ["clang"],
                         ["-target", "arm64_32-apple-watchos5.0"],
                         ["-isysroot", core.loadSDK(.watchOS).path.str, "-Xlinker", "-rpath", "-Xlinker", "@executable_path/Frameworks", "-Xlinker", "-rpath", "-Xlinker", "@executable_path/../../Frameworks"],
-                        ["-fapplication-extension", "\(SRCROOT)/build/Debug-watchos/Watchable WatchKit Extension (old).appex/Watchable WatchKit Extension (old)"]
+                        ["-fapplication-extension", "\(SRCROOT)/build/Debug-watchos/Watchable WatchKit Extension (old).appex/Watchable WatchKit Extension (old)"],
                     ].reduce([], +)
                     task.checkCommandLineContains(expectedCommandLine)
                     task.checkCommandLineContainsUninterrupted(["-e", "_WKExtensionMain"])
@@ -381,16 +403,19 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
 
                 // There should be a task to embed the Swift standard libraries.
                 results.checkTask(.matchTarget(target), .matchRuleType("CopySwiftLibs"), .matchRuleItemBasename("Watchable WatchKit App.app")) { task in
-                    task.checkCommandLineContains(["builtin-swiftStdLibTool", "--scan-executable", "\(builtWatchAppPath)/Watchable WatchKit App", "--scan-folder", "\(builtWatchAppPath)/Frameworks", "--scan-folder", "\(builtWatchAppPath)/PlugIns", "--platform", "watchos", "--destination",  "\(builtWatchAppPath)/Frameworks"])
+                    task.checkCommandLineContains(["builtin-swiftStdLibTool", "--scan-executable", "\(builtWatchAppPath)/Watchable WatchKit App", "--scan-folder", "\(builtWatchAppPath)/Frameworks", "--scan-folder", "\(builtWatchAppPath)/PlugIns", "--platform", "watchos", "--destination", "\(builtWatchAppPath)/Frameworks"])
                 }
 
                 // There should be one codesign task.
                 results.checkTask(.matchTarget(target), .matchRuleType("CodeSign")) { task in
                     #expect(task.ruleInfo[1] == builtWatchAppPath)
                     task.checkCommandLine(["/usr/bin/codesign", "--force", "--sign", "105DE4E702E4", "--entitlements", "\(SRCROOT)/build/aProject.build/Debug-watchos/Watchable WatchKit App.build/Watchable WatchKit App.app.xcent", "--timestamp=none", "--generate-entitlement-der", builtWatchAppPath])
-                    task.checkEnvironment([
-                        "CODESIGN_ALLOCATE": .equal("codesign_allocate"),
-                    ], exact: true)
+                    task.checkEnvironment(
+                        [
+                            "CODESIGN_ALLOCATE": .equal("codesign_allocate")
+                        ],
+                        exact: true
+                    )
                 }
 
                 // There should be one product validation task.
@@ -406,7 +431,6 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
             results.checkTarget("Watchable") { target in
                 let builtHostIOSAppPath = "\(SRCROOT)/build/Debug-iphoneos/Watchable.app"
 
-
                 // We should have one clang, one swiftc, and link task per arch.
                 for arch in archs {
                     // CompileC
@@ -416,7 +440,7 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                             ["clang"],
                             ["-target", "\(arch)-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)"],
                             ["-isysroot", core.loadSDK(.iOS).path.str],
-                            ["-o", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/Watchable.build/Objects-normal/\(arch)/main.o"]
+                            ["-o", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/Watchable.build/Objects-normal/\(arch)/main.o"],
                         ].reduce([], +)
                         task.checkCommandLineContains(expectedCommandLine)
                         #expect(!task.commandLine.contains("-fasm-blocks"))
@@ -443,7 +467,7 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                     }
                 }
                 results.checkTask(.matchTarget(target), .matchRuleType("GenerateAssetSymbols")) { task in
-                    task.checkCommandLineContains([actoolPath.str, "\(SRCROOT)/Sources/iosApp/Assets.xcassets", "--compile", "\(SRCROOT)/build/Debug-iphoneos/Watchable.app", "--target-device", "iphone", "--target-device", "ipad", "--minimum-deployment-target", IPHONEOS_DEPLOYMENT_TARGET, "--platform", "iphoneos", "--bundle-identifier", "com.test.aProject",  "--generate-swift-asset-symbols", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/Watchable.build/DerivedSources/GeneratedAssetSymbols.swift", "--generate-objc-asset-symbols", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/Watchable.build/DerivedSources/GeneratedAssetSymbols.h"])
+                    task.checkCommandLineContains([actoolPath.str, "\(SRCROOT)/Sources/iosApp/Assets.xcassets", "--compile", "\(SRCROOT)/build/Debug-iphoneos/Watchable.app", "--target-device", "iphone", "--target-device", "ipad", "--minimum-deployment-target", IPHONEOS_DEPLOYMENT_TARGET, "--platform", "iphoneos", "--bundle-identifier", "com.test.aProject", "--generate-swift-asset-symbols", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/Watchable.build/DerivedSources/GeneratedAssetSymbols.swift", "--generate-objc-asset-symbols", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/Watchable.build/DerivedSources/GeneratedAssetSymbols.h"])
                 }
                 results.checkTaskExists(.matchTarget(target), .matchRuleType("LinkAssetCatalog"))
                 results.checkTaskExists(.matchTarget(target), .matchRuleType("LinkAssetCatalogSignature"))
@@ -452,7 +476,7 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchTarget(target), .matchRuleType("CompileStoryboard")) { _ in }
                 results.checkTask(.matchTarget(target), .matchRuleType("LinkStoryboards")) { task in
                     task.checkOutputs([
-                        .path("\(builtHostIOSAppPath)/Base.lproj/Main.storyboardc"),
+                        .path("\(builtHostIOSAppPath)/Base.lproj/Main.storyboardc")
                     ])
                 }
 
@@ -487,16 +511,19 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
 
                 // There should be a task to embed the Swift standard libraries.
                 results.checkTask(.matchTarget(target), .matchRuleType("CopySwiftLibs"), .matchRuleItemBasename("Watchable.app")) { task in
-                    task.checkCommandLineContains(["builtin-swiftStdLibTool", "--scan-executable", "\(builtHostIOSAppPath)/Watchable", "--scan-folder", "\(builtHostIOSAppPath)/Frameworks", "--scan-folder", "\(builtHostIOSAppPath)/PlugIns", "--platform", "iphoneos", "--destination",  "\(builtHostIOSAppPath)/Frameworks"])
+                    task.checkCommandLineContains(["builtin-swiftStdLibTool", "--scan-executable", "\(builtHostIOSAppPath)/Watchable", "--scan-folder", "\(builtHostIOSAppPath)/Frameworks", "--scan-folder", "\(builtHostIOSAppPath)/PlugIns", "--platform", "iphoneos", "--destination", "\(builtHostIOSAppPath)/Frameworks"])
                 }
 
                 // There should be one codesign task.
                 results.checkTask(.matchTarget(target), .matchRuleType("CodeSign")) { task in
                     #expect(task.ruleInfo[1] == builtHostIOSAppPath)
                     task.checkCommandLine(["/usr/bin/codesign", "--force", "--sign", "105DE4E702E4", "--entitlements", "\(SRCROOT)/build/aProject.build/Debug-iphoneos/Watchable.build/Watchable.app.xcent", "--timestamp=none", "--generate-entitlement-der", builtHostIOSAppPath])
-                    task.checkEnvironment([
-                        "CODESIGN_ALLOCATE": .equal("codesign_allocate"),
-                    ], exact: true)
+                    task.checkEnvironment(
+                        [
+                            "CODESIGN_ALLOCATE": .equal("codesign_allocate")
+                        ],
+                        exact: true
+                    )
                 }
 
                 // There should be one product validation task.
@@ -539,7 +566,7 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                         ["clang"],
                         ["-target", "\(arch)-apple-watchos\(WATCHOS_DEPLOYMENT_TARGET)-simulator"],
                         ["-isysroot", core.loadSDK(.watchOSSimulator).path.str],
-                        ["-o", "\(SRCROOT)/build/aProject.build/Debug-watchsimulator/Watchable WatchKit Extension.build/Objects-\(variant)/\(arch)/Controller.o"]
+                        ["-o", "\(SRCROOT)/build/aProject.build/Debug-watchsimulator/Watchable WatchKit Extension.build/Objects-\(variant)/\(arch)/Controller.o"],
                     ].reduce([], +)
                     task.checkCommandLineContains(expectedCommandLine)
                 }
@@ -557,7 +584,7 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                         ["clang"],
                         ["-target", "x86_64-apple-watchos\(WATCHOS_DEPLOYMENT_TARGET)-simulator"],
                         ["-isysroot", core.loadSDK(.watchOSSimulator).path.str, "-Xlinker", "-rpath", "-Xlinker", "@executable_path/Frameworks", "-Xlinker", "-rpath", "-Xlinker", "@executable_path/../../Frameworks"],
-                        ["-fapplication-extension", "\(SRCROOT)/build/Debug-watchsimulator/Watchable WatchKit Extension.appex/Watchable WatchKit Extension"]
+                        ["-fapplication-extension", "\(SRCROOT)/build/Debug-watchsimulator/Watchable WatchKit Extension.appex/Watchable WatchKit Extension"],
                     ].reduce([], +)
                     task.checkCommandLineContains(expectedCommandLine)
                 }
@@ -603,9 +630,12 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchTarget(target), .matchRuleType("CodeSign")) { task in
                     #expect(task.ruleInfo[1] == "\(SRCROOT)/build/Debug-watchsimulator/Watchable WatchKit Extension.appex")
                     task.checkCommandLine(["/usr/bin/codesign", "--force", "--sign", "105DE4E702E4", "--entitlements", "\(SRCROOT)/build/aProject.build/Debug-watchsimulator/Watchable WatchKit Extension.build/Watchable WatchKit Extension.appex.xcent", "--timestamp=none", "--generate-entitlement-der", "\(SRCROOT)/build/Debug-watchsimulator/Watchable WatchKit Extension.appex"])
-                    task.checkEnvironment([
-                        "CODESIGN_ALLOCATE": .equal("codesign_allocate"),
-                    ], exact: true)
+                    task.checkEnvironment(
+                        [
+                            "CODESIGN_ALLOCATE": .equal("codesign_allocate")
+                        ],
+                        exact: true
+                    )
                 }
 
                 // There should be no other tasks for this target.
@@ -621,7 +651,7 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                 // There should be one actool task
                 for variant in ["thinned", "unthinned"] {
                     results.checkTask(.matchTarget(target), .matchRuleType("CompileAssetCatalogVariant"), .matchRuleItem(variant)) { task in
-                        task.checkCommandLineContains([actoolPath.str, "\(SRCROOT)/Sources/watchosApp/Assets.xcassets", "--compile", "\(SRCROOT)/build/aProject.build/Debug-watchsimulator/Watchable WatchKit App.build/assetcatalog_output/\(variant)", "--target-device", "watch", "--minimum-deployment-target", WATCHOS_DEPLOYMENT_TARGET,  "--platform", "watchsimulator"])
+                        task.checkCommandLineContains([actoolPath.str, "\(SRCROOT)/Sources/watchosApp/Assets.xcassets", "--compile", "\(SRCROOT)/build/aProject.build/Debug-watchsimulator/Watchable WatchKit App.build/assetcatalog_output/\(variant)", "--target-device", "watch", "--minimum-deployment-target", WATCHOS_DEPLOYMENT_TARGET, "--platform", "watchsimulator"])
                     }
                 }
                 results.checkTaskExists(.matchTarget(target), .matchRuleType("LinkAssetCatalog"))
@@ -658,7 +688,7 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
 
                 // There should be a task to embed the Swift standard libraries.
                 results.checkTask(.matchTarget(target), .matchRuleType("CopySwiftLibs"), .matchRuleItemBasename("Watchable WatchKit App.app")) { task in
-                    task.checkCommandLineContains(["builtin-swiftStdLibTool", "--scan-executable", "\(builtWatchAppPath)/Watchable WatchKit App", "--scan-folder", "\(builtWatchAppPath)/Frameworks", "--scan-folder", "\(builtWatchAppPath)/PlugIns", "--platform", "watchsimulator", "--destination",  "\(builtWatchAppPath)/Frameworks"])
+                    task.checkCommandLineContains(["builtin-swiftStdLibTool", "--scan-executable", "\(builtWatchAppPath)/Watchable WatchKit App", "--scan-folder", "\(builtWatchAppPath)/Frameworks", "--scan-folder", "\(builtWatchAppPath)/PlugIns", "--platform", "watchsimulator", "--destination", "\(builtWatchAppPath)/Frameworks"])
                 }
 
                 // There should be a task to generate the entitlements file.
@@ -671,9 +701,12 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchTarget(target), .matchRuleType("CodeSign")) { task in
                     #expect(task.ruleInfo[1] == builtWatchAppPath)
                     task.checkCommandLine(["/usr/bin/codesign", "--force", "--sign", "105DE4E702E4", "--entitlements", "\(SRCROOT)/build/aProject.build/Debug-watchsimulator/Watchable WatchKit App.build/Watchable WatchKit App.app.xcent", "--timestamp=none", "--generate-entitlement-der", builtWatchAppPath])
-                    task.checkEnvironment([
-                        "CODESIGN_ALLOCATE": .equal("codesign_allocate"),
-                    ], exact: true)
+                    task.checkEnvironment(
+                        [
+                            "CODESIGN_ALLOCATE": .equal("codesign_allocate")
+                        ],
+                        exact: true
+                    )
                 }
 
                 // There should be one product validation task.
@@ -698,7 +731,7 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                             ["clang"],
                             ["-target", "\(arch)-apple-ios\(IPHONEOS_DEPLOYMENT_TARGET)-simulator"],
                             ["-isysroot", core.loadSDK(.iOSSimulator).path.str, "-fasm-blocks"],
-                            ["-o", "\(SRCROOT)/build/aProject.build/Debug-iphonesimulator/Watchable.build/Objects-normal/\(arch)/main.o"]
+                            ["-o", "\(SRCROOT)/build/aProject.build/Debug-iphonesimulator/Watchable.build/Objects-normal/\(arch)/main.o"],
                         ].reduce([], +)
                         task.checkCommandLineContains(expectedCommandLine)
                     }
@@ -732,7 +765,7 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchTarget(target), .matchRuleType("CompileStoryboard")) { _ in }
                 results.checkTask(.matchTarget(target), .matchRuleType("LinkStoryboards")) { task in
                     task.checkOutputs([
-                        .path("\(builtHostIOSAppPath)/Base.lproj/Main.storyboardc"),
+                        .path("\(builtHostIOSAppPath)/Base.lproj/Main.storyboardc")
                     ])
                 }
 
@@ -759,7 +792,7 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
 
                 // There should be a task to embed the Swift standard libraries.
                 results.checkTask(.matchTarget(target), .matchRuleType("CopySwiftLibs"), .matchRuleItemBasename("Watchable.app")) { task in
-                    task.checkCommandLineContains(["builtin-swiftStdLibTool", "--scan-executable", "\(builtHostIOSAppPath)/Watchable", "--scan-folder", "\(builtHostIOSAppPath)/Frameworks", "--scan-folder", "\(builtHostIOSAppPath)/PlugIns", "--platform", "iphonesimulator", "--destination",  "\(builtHostIOSAppPath)/Frameworks"])
+                    task.checkCommandLineContains(["builtin-swiftStdLibTool", "--scan-executable", "\(builtHostIOSAppPath)/Watchable", "--scan-folder", "\(builtHostIOSAppPath)/Frameworks", "--scan-folder", "\(builtHostIOSAppPath)/PlugIns", "--platform", "iphonesimulator", "--destination", "\(builtHostIOSAppPath)/Frameworks"])
                 }
 
                 // There should be a task to generate the entitlements file.
@@ -772,9 +805,12 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                 results.checkTask(.matchTarget(target), .matchRuleType("CodeSign")) { task in
                     #expect(task.ruleInfo[1] == builtHostIOSAppPath)
                     task.checkCommandLine(["/usr/bin/codesign", "--force", "--sign", "105DE4E702E4", "--entitlements", "\(SRCROOT)/build/aProject.build/Debug-iphonesimulator/Watchable.build/Watchable.app.xcent", "--timestamp=none", "--generate-entitlement-der", builtHostIOSAppPath])
-                    task.checkEnvironment([
-                        "CODESIGN_ALLOCATE": .equal("codesign_allocate"),
-                    ], exact: true)
+                    task.checkEnvironment(
+                        [
+                            "CODESIGN_ALLOCATE": .equal("codesign_allocate")
+                        ],
+                        exact: true
+                    )
                 }
 
                 // There should be one product validation task.
@@ -815,7 +851,7 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                 results.checkTaskExists(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("Watchable_WatchKit_Extension.swiftdoc"), .matchRuleItemBasename("arm64_32-apple-watchos.swiftdoc"))
                 results.checkTaskExists(.matchTarget(target), .matchRuleType("SwiftMergeGeneratedHeaders"), .matchRuleItemBasename("Watchable_WatchKit_Extension-Swift.h"), .matchRuleItemBasename("Watchable_WatchKit_Extension-Swift.h"))
                 results.checkTaskExists(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("Watchable_WatchKit_Extension.swiftmodule"), .matchRuleItemBasename("arm64_32-apple-watchos.swiftmodule"))
-                results.checkTaskExists(.matchTarget(target), .matchRuleType("Copy"),   .matchRuleItemBasename("Watchable_WatchKit_Extension.abi.json"), .matchRuleItemBasename("arm64_32-apple-watchos.abi.json"))
+                results.checkTaskExists(.matchTarget(target), .matchRuleType("Copy"), .matchRuleItemBasename("Watchable_WatchKit_Extension.abi.json"), .matchRuleItemBasename("arm64_32-apple-watchos.abi.json"))
                 results.checkTaskExists(.matchTarget(target), .matchRuleType("CompileAssetCatalogVariant"), .matchRuleItem("thinned"))
                 results.checkTaskExists(.matchTarget(target), .matchRuleType("CompileAssetCatalogVariant"), .matchRuleItem("unthinned"))
                 results.checkTaskExists(.matchTarget(target), .matchRuleType("LinkAssetCatalog"))
@@ -997,7 +1033,8 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "Sources", path: "Sources",
+                "Sources",
+                path: "Sources",
                 children: [
                     // watchOS app files
                     TestFile("watchosApp/Base.lproj/Interface.storyboard"),
@@ -1010,7 +1047,8 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                     TestFile("watchosExtension/Assets.xcassets"),
                     TestFile("watchosExtension/Info.plist"),
                     TestFile("watchosExtension/PrivacyInfo.xcprivacy"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -1022,24 +1060,31 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                         "CODE_SIGN_IDENTITY": "Apple Development",
                         "SDKROOT": "iphoneos",
                         "SWIFT_VERSION": swiftVersion,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Watchable",
                     type: .watchKitAppContainer,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [:]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [:]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
                             // The target must at least HAVE an empty phase for the automatic asset catalog to work
                         ]),
-                        TestCopyFilesBuildPhase([
-                            "Watchable WatchKit App.app",
-                        ], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch", onlyForDeployment: false
-                                               ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Watchable WatchKit App.app"
+                            ],
+                            destinationSubfolder: .builtProductsDir,
+                            destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch",
+                            onlyForDeployment: false
+                        ),
                     ],
                     dependencies: ["Watchable WatchKit App"]
                 ),
@@ -1047,28 +1092,33 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                     "Watchable WatchKit App",
                     type: .watchKitApp,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "ARCHS[sdk=watchos*]": "arm64_32",
-                                                "ARCHS[sdk=watchsimulator*]": "x86_64",
-                                                "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
-                                                "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
-                                                "INFOPLIST_FILE": "Sources/watchosApp/Info.plist",
-                                                "SDKROOT": "watchos",
-                                                "SKIP_INSTALL": "YES",
-                                                "TARGETED_DEVICE_FAMILY": "4",
-                                                "WATCHOS_DEPLOYMENT_TARGET": core.loadSDK(.watchOS).defaultDeploymentTarget,
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ARCHS[sdk=watchos*]": "arm64_32",
+                                "ARCHS[sdk=watchsimulator*]": "x86_64",
+                                "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
+                                "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
+                                "INFOPLIST_FILE": "Sources/watchosApp/Info.plist",
+                                "SDKROOT": "watchos",
+                                "SKIP_INSTALL": "YES",
+                                "TARGETED_DEVICE_FAMILY": "4",
+                                "WATCHOS_DEPLOYMENT_TARGET": core.loadSDK(.watchOS).defaultDeploymentTarget,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
                             "Base.lproj/Interface.storyboard",
                             "watchosApp/Assets.xcassets",
                         ]),
-                        TestCopyFilesBuildPhase([
-                            "Watchable WatchKit Extension.appex",
-                        ], destinationSubfolder: .plugins, onlyForDeployment: false
-                                               ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Watchable WatchKit Extension.appex"
+                            ],
+                            destinationSubfolder: .plugins,
+                            onlyForDeployment: false
+                        ),
                     ],
                     dependencies: ["Watchable WatchKit Extension", "Watchable WatchKit Extension (old)"]
                 ),
@@ -1076,19 +1126,21 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                     "Watchable WatchKit Extension",
                     type: .watchKitExtension,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "ARCHS[sdk=watchos*]": "arm64_32",
-                                                "ARCHS[sdk=watchsimulator*]": "x86_64",
-                                                "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
-                                                "INFOPLIST_FILE": "Sources/watchosExtension/Info.plist",
-                                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
-                                                "SDKROOT": "watchos",
-                                                "SKIP_INSTALL": "YES",
-                                                "SWIFT_VERSION": swiftVersion,
-                                                "TARGETED_DEVICE_FAMILY": "4",
-                                                "WATCHOS_DEPLOYMENT_TARGET": core.loadSDK(.watchOS).defaultDeploymentTarget,
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ARCHS[sdk=watchos*]": "arm64_32",
+                                "ARCHS[sdk=watchsimulator*]": "x86_64",
+                                "ASSETCATALOG_COMPILER_COMPLICATION_NAME": "Complication",
+                                "INFOPLIST_FILE": "Sources/watchosExtension/Info.plist",
+                                "LD_RUNPATH_SEARCH_PATHS": "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
+                                "SDKROOT": "watchos",
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": swiftVersion,
+                                "TARGETED_DEVICE_FAMILY": "4",
+                                "WATCHOS_DEPLOYMENT_TARGET": core.loadSDK(.watchOS).defaultDeploymentTarget,
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -1102,10 +1154,11 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                         ]),
                     ]
                 ),
-            ])
+            ]
+        )
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
-        let IPHONEOS_DEPLOYMENT_TARGET = "13.0" // watch-only app stub containers are hardcoded to 13.0 by default
+        let IPHONEOS_DEPLOYMENT_TARGET = "13.0"  // watch-only app stub containers are hardcoded to 13.0 by default
 
         // Create files in the filesystem so they're known to exist.
         let fs = PseudoFS()
@@ -1170,28 +1223,32 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                         "CODE_SIGN_IDENTITY": "Apple Development",
                         "SDKROOT": "iphoneos",
                         "SWIFT_VERSION": swiftVersion,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Watchable",
                     type: .watchKitAppContainer,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [:]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [:]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
                             // The target must at least HAVE an empty phase for the automatic asset catalog to work
-                        ]),
+                        ])
                     ],
                     dependencies: ["Watchable WatchKit App"]
-                ),
-            ])
+                )
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
-        let IPHONEOS_DEPLOYMENT_TARGET = "13.0" // watch-only app stub containers are hardcoded to 13.0 by default
+        let IPHONEOS_DEPLOYMENT_TARGET = "13.0"  // watch-only app stub containers are hardcoded to 13.0 by default
 
         let actoolPath = try await self.actoolPath
 
@@ -1241,7 +1298,8 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "Sources", path: "Sources",
+                "Sources",
+                path: "Sources",
                 children: [
                     // iOS app files
                     TestFile("iosApp/main.m"),
@@ -1253,7 +1311,8 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                     // watchOS extension files
                     TestFile("watchosExtension/Controller.m"),
                     TestFile("watchosExtension/Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -1262,7 +1321,8 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                         "CODE_SIGN_IDENTITY": "-",
                         "SDKROOT": "iphoneos",
                         "AD_HOC_CODE_SIGNING_ALLOWED": "YES",
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
@@ -1272,18 +1332,23 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
-                                "INFOPLIST_FILE": "Sources/iosApp/Info.plist",
-                            ]),
+                                "INFOPLIST_FILE": "Sources/iosApp/Info.plist"
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "main.m",
+                            "main.m"
                         ]),
-                        TestCopyFilesBuildPhase([
-                            "Watchable WatchKit App.app",
-                            "Watchable WatchKit App 2.app",
-                        ], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch", onlyForDeployment: false
-                                               ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Watchable WatchKit App.app",
+                                "Watchable WatchKit App 2.app",
+                            ],
+                            destinationSubfolder: .builtProductsDir,
+                            destinationSubpath: "$(CONTENTS_FOLDER_PATH)/Watch",
+                            onlyForDeployment: false
+                        ),
                     ],
                     dependencies: ["Watchable WatchKit App", "Watchable WatchKit App 2"]
                 ),
@@ -1297,13 +1362,17 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                                 "INFOPLIST_FILE": "Sources/watchosApp/Info.plist",
                                 "SDKROOT": "watchos",
                                 "SKIP_INSTALL": "YES",
-                            ]),
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestCopyFilesBuildPhase([
-                            "Watchable WatchKit Extension.appex",
-                        ], destinationSubfolder: .plugins, onlyForDeployment: false
-                                               ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Watchable WatchKit Extension.appex"
+                            ],
+                            destinationSubfolder: .plugins,
+                            onlyForDeployment: false
+                        )
                     ],
                     dependencies: ["Watchable WatchKit Extension"]
                 ),
@@ -1317,13 +1386,17 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                                 "INFOPLIST_FILE": "Sources/watchosApp/Info.plist",
                                 "SDKROOT": "watchos",
                                 "SKIP_INSTALL": "YES",
-                            ]),
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestCopyFilesBuildPhase([
-                            "Watchable WatchKit Extension.appex",
-                        ], destinationSubfolder: .plugins, onlyForDeployment: false
-                                               ),
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Watchable WatchKit Extension.appex"
+                            ],
+                            destinationSubfolder: .plugins,
+                            onlyForDeployment: false
+                        )
                     ],
                     dependencies: ["Watchable WatchKit Extension"]
                 ),
@@ -1337,15 +1410,17 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                                 "INFOPLIST_FILE": "Sources/watchosExtension/Info.plist",
                                 "SDKROOT": "watchos",
                                 "SKIP_INSTALL": "YES",
-                            ]),
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Controller.m",
-                        ]),
+                            "Controller.m"
+                        ])
                     ]
                 ),
-            ])
+            ]
+        )
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
 
@@ -1373,10 +1448,12 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "Sources", path: "Sources",
+                "Sources",
+                path: "Sources",
                 children: [
-                    TestFile("Settings-Watch.bundle"),
-                ]),
+                    TestFile("Settings-Watch.bundle")
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -1386,24 +1463,28 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "SDKROOT": "iphoneos",
                         "SWIFT_VERSION": swiftVersion,
-                    ]),
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Watchable",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [:]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [:]
+                        )
                     ],
                     buildPhases: [
                         TestResourcesBuildPhase([
                             "Settings-Watch.bundle"
-                        ]),
+                        ])
                     ],
                     dependencies: []
-                ),
-            ])
+                )
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         // Expect a warning when deploying to iOS 13 or later.
@@ -1424,38 +1505,45 @@ fileprivate struct WatchTaskConstructionTests: CoreBasedTests {
         let testProject = try await TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Foo.swift"),
                     TestFile("CoreFoo.h"),
                     TestFile("Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"]),
+                TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "$(TARGET_NAME)"])
             ],
             targets: [
                 TestStandardTarget(
-                    "CoreFoo", type: .framework,
+                    "CoreFoo",
+                    type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "watchos",
-                                                "DEFINES_MODULE": "YES",
-                                                "SWIFT_EXEC": swiftCompilerPath.str,
-                                                "CODE_SIGNING_ALLOWED": "NO",
-                                                "SWIFT_VERSION": swiftVersion,
-                                                "TAPI_EXEC": tapiToolPath.str,
-                                                "ARCHS": "arm64 arm64_32",
-                                                "INFOPLIST_FILE": "Sources/Info.plist"
-                                               ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "watchos",
+                                "DEFINES_MODULE": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "CODE_SIGNING_ALLOWED": "NO",
+                                "SWIFT_VERSION": swiftVersion,
+                                "TAPI_EXEC": tapiToolPath.str,
+                                "ARCHS": "arm64 arm64_32",
+                                "INFOPLIST_FILE": "Sources/Info.plist",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["Foo.swift"]),
                         TestHeadersBuildPhase([
-                            TestBuildFile("CoreFoo.h", headerVisibility: .public),
+                            TestBuildFile("CoreFoo.h", headerVisibility: .public)
                         ]),
-                    ])
-            ])
+                    ]
+                )
+            ]
+        )
 
         let testWorkspace = TestWorkspace("aWorkspace", projects: [testProject])
         let tester = try await TaskConstructionTester(getCore(), testWorkspace)
diff --git a/Tests/SWBTaskConstructionTests/XCFrameworkTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/XCFrameworkTaskConstructionTests.swift
index 0a4c0884..0a0450bf 100644
--- a/Tests/SWBTaskConstructionTests/XCFrameworkTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/XCFrameworkTaskConstructionTests.swift
@@ -29,17 +29,21 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("file.c"),
                     TestFile("Support.xcframework"),
-                    TestFile("Info.plist")
-                ]),
+                    TestFile("Info.plist"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GCC_WARN_64_TO_32_BIT_CONVERSION": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "ARCHS": "x86_64",
-                    "INFOPLIST_FILE": "Info.plist",
-                    "CLANG_USE_RESPONSE_FILE": "NO",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GCC_WARN_64_TO_32_BIT_CONVERSION": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "ARCHS": "x86_64",
+                        "INFOPLIST_FILE": "Info.plist",
+                        "CLANG_USE_RESPONSE_FILE": "NO",
+                    ]
+                )
             ],
             targets: [
                 // Test building an app which links and embeds an xcframework.
@@ -47,7 +51,7 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["file.c"]),
@@ -55,8 +59,9 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                         TestCopyFilesBuildPhase(["Support.xcframework"], destinationSubfolder: .frameworks),
                     ],
                     dependencies: []
-                ),
-            ])
+                )
+            ]
+        )
 
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
@@ -66,10 +71,13 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
         try fs.createDirectory(Path(SRCROOT), recursive: true)
         try fs.write(Path(SRCROOT).join("file.c"), contents: "int f() { return 0; }")
 
-        let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-            XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
-            XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
-        ])
+        let supportXCFramework = try XCFramework(
+            version: Version(1, 0),
+            libraries: [
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
+                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
+            ]
+        )
         let supportXCFrameworkPath = Path(SRCROOT).join("Support.xcframework")
         try fs.createDirectory(supportXCFrameworkPath, recursive: true)
         let infoLookup = try await getCore()
@@ -81,12 +89,12 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                 task.checkCommandLine(["builtin-process-xcframework", "--xcframework", "\(SRCROOT)/Support.xcframework", "--platform", "macos", "--target-path", "\(SRCROOT)/build/Debug"])
                 task.checkInputs([
                     .path("\(SRCROOT)/Support.xcframework"),
-                    .path("\(SRCROOT)/build/Debug")
+                    .path("\(SRCROOT)/build/Debug"),
                 ])
                 task.checkOutputs([
                     .path("\(SRCROOT)/build/Debug/Support.framework"),
                     .path("\(SRCROOT)/build/Debug/Support.framework/Info.plist"),
-                    .path("\(SRCROOT)/build/Debug/Support.framework/Support")
+                    .path("\(SRCROOT)/build/Debug/Support.framework/Support"),
                 ])
                 processSupportXCFrameworkTask = task
             }
@@ -121,17 +129,21 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("file.c"),
                     TestFile("Support.xcframework"),
-                    TestFile("Info.plist")
-                ]),
+                    TestFile("Info.plist"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GCC_WARN_64_TO_32_BIT_CONVERSION": "YES",
-                    "DEAD_CODE_STRIPPING": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "ARCHS": "x86_64",
-                    "INFOPLIST_FILE": "Info.plist",
-                    "CLANG_USE_RESPONSE_FILE": "NO",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GCC_WARN_64_TO_32_BIT_CONVERSION": "YES",
+                        "DEAD_CODE_STRIPPING": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "ARCHS": "x86_64",
+                        "INFOPLIST_FILE": "Info.plist",
+                        "CLANG_USE_RESPONSE_FILE": "NO",
+                    ]
+                )
             ],
             targets: [
                 // Test building an app which links and embeds an xcframework.
@@ -139,7 +151,7 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["file.c"]),
@@ -152,18 +164,22 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     "Driver",
                     type: .driverExtension,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "CODE_SIGN_IDENTITY": "Apple Development",
-                            "SDKROOT": "driverkit"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "CODE_SIGN_IDENTITY": "Apple Development",
+                                "SDKROOT": "driverkit",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["file.c"]),
                         TestFrameworksBuildPhase(["Support.xcframework"]),
                         TestCopyFilesBuildPhase(["Support.xcframework"], destinationSubfolder: .frameworks),
                     ]
-                )
-            ])
+                ),
+            ]
+        )
 
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
@@ -174,10 +190,13 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
         try fs.write(Path(SRCROOT).join("file.c"), contents: "int f() { return 0; }")
         try fs.writeSimulatedProvisioningProfile(uuid: "8db0e92c-592c-4f06-bfed-9d945841b78d")
 
-        let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-            XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
-            XCFramework.Library(libraryIdentifier: "x86_64-apple-driverkit\(core.loadSDK(.driverKit).defaultDeploymentTarget)", supportedPlatform: "driverkit", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
-        ])
+        let supportXCFramework = try XCFramework(
+            version: Version(1, 0),
+            libraries: [
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-driverkit\(core.loadSDK(.driverKit).defaultDeploymentTarget)", supportedPlatform: "driverkit", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
+            ]
+        )
         let supportXCFrameworkPath = Path(SRCROOT).join("Support.xcframework")
         try fs.createDirectory(supportXCFrameworkPath, recursive: true)
         let infoLookup = try await getCore()
@@ -192,12 +211,12 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     task.checkCommandLine(["builtin-process-xcframework", "--xcframework", "\(SRCROOT)/Support.xcframework", "--platform", "macos", "--target-path", "\(SRCROOT)/build/Debug"])
                     task.checkInputs([
                         .path("\(SRCROOT)/Support.xcframework"),
-                        .path("\(SRCROOT)/build/Debug")
+                        .path("\(SRCROOT)/build/Debug"),
                     ])
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/Debug/Support.framework"),
                         .path("\(SRCROOT)/build/Debug/Support.framework/Info.plist"),
-                        .path("\(SRCROOT)/build/Debug/Support.framework/Support")
+                        .path("\(SRCROOT)/build/Debug/Support.framework/Support"),
                     ])
                     processSupportXCFrameworkTask = task
                 }
@@ -227,12 +246,12 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     task.checkCommandLine(["builtin-process-xcframework", "--xcframework", "\(SRCROOT)/Support.xcframework", "--platform", "driverkit", "--target-path", "\(SRCROOT)/build/Debug-driverkit"])
                     task.checkInputs([
                         .path("\(SRCROOT)/Support.xcframework"),
-                        .path("\(SRCROOT)/build/Debug-driverkit")
+                        .path("\(SRCROOT)/build/Debug-driverkit"),
                     ])
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/Debug-driverkit/Support.framework"),
                         .path("\(SRCROOT)/build/Debug-driverkit/Support.framework/Info.plist"),
-                        .path("\(SRCROOT)/build/Debug-driverkit/Support.framework/Support")
+                        .path("\(SRCROOT)/build/Debug-driverkit/Support.framework/Support"),
                     ])
                     processSupportXCFrameworkTask = task
                 }
@@ -242,9 +261,11 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     // There needs to be a strong dependency on the XCFramework processing.
                     results.checkTaskFollows(task, antecedent: try #require(processSupportXCFrameworkTask))
 
-                    task.checkCommandLine(["clang", "-x", "c", "-target", "x86_64-apple-driverkit\(core.loadSDK(.driverKit).defaultDeploymentTarget)", "-fmessage-length=0", "-fdiagnostics-show-note-include-stack", "-fmacro-backtrace-limit=0", "-fno-color-diagnostics", "-Wno-trigraphs", "-fpascal-strings", "-Os", "-Wno-missing-field-initializers", "-Wno-missing-prototypes", "-Wno-return-type", "-Wno-missing-braces", "-Wparentheses", "-Wswitch", "-Wno-unused-function", "-Wno-unused-label", "-Wno-unused-parameter", "-Wno-unused-variable", "-Wunused-value", "-Wno-empty-body", "-Wno-uninitialized", "-Wno-unknown-pragmas", "-Wno-shadow", "-Wno-four-char-constants", "-Wno-conversion", "-Wno-constant-conversion", "-Wno-int-conversion", "-Wno-bool-conversion", "-Wno-enum-conversion", "-Wno-float-conversion", "-Wno-non-literal-null-conversion", "-Wno-objc-literal-conversion", "-Wshorten-64-to-32", "-Wpointer-sign", "-Wno-newline-eof", "-Wno-implicit-fallthrough", "-isysroot", core.loadSDK(.driverKit).path.str, "-fasm-blocks", "-fstrict-aliasing", "-Wdeprecated-declarations", "-g", "-Wno-sign-conversion", "-Wno-infinite-recursion", "-Wno-comma", "-Wno-block-capture-autoreleasing", "-Wno-strict-prototypes", "-Wno-semicolon-before-method-body", "-iquote", "\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/Driver-generated-files.hmap", "-I\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/Driver-own-target-headers.hmap", "-I\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/Driver-all-target-headers.hmap", "-iquote", "\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/Driver-project-headers.hmap",
-                                           "-I\(SRCROOT)/build/Debug-driverkit/include",
-                                           "-I\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/DerivedSources-normal/x86_64", "-I\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/DerivedSources/x86_64", "-I\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/DerivedSources", "-F\(SRCROOT)/build/Debug-driverkit", "-MMD", "-MT", "dependencies", "-MF", "\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/Objects-normal/x86_64/file.d", "--serialize-diagnostics", "\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/Objects-normal/x86_64/file.dia", "-c", "\(SRCROOT)/file.c", "-o", "\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/Objects-normal/x86_64/file.o"])
+                    task.checkCommandLine([
+                        "clang", "-x", "c", "-target", "x86_64-apple-driverkit\(core.loadSDK(.driverKit).defaultDeploymentTarget)", "-fmessage-length=0", "-fdiagnostics-show-note-include-stack", "-fmacro-backtrace-limit=0", "-fno-color-diagnostics", "-Wno-trigraphs", "-fpascal-strings", "-Os", "-Wno-missing-field-initializers", "-Wno-missing-prototypes", "-Wno-return-type", "-Wno-missing-braces", "-Wparentheses", "-Wswitch", "-Wno-unused-function", "-Wno-unused-label", "-Wno-unused-parameter", "-Wno-unused-variable", "-Wunused-value", "-Wno-empty-body", "-Wno-uninitialized", "-Wno-unknown-pragmas", "-Wno-shadow", "-Wno-four-char-constants", "-Wno-conversion", "-Wno-constant-conversion", "-Wno-int-conversion", "-Wno-bool-conversion", "-Wno-enum-conversion", "-Wno-float-conversion", "-Wno-non-literal-null-conversion", "-Wno-objc-literal-conversion", "-Wshorten-64-to-32", "-Wpointer-sign", "-Wno-newline-eof", "-Wno-implicit-fallthrough", "-isysroot", core.loadSDK(.driverKit).path.str, "-fasm-blocks", "-fstrict-aliasing", "-Wdeprecated-declarations", "-g", "-Wno-sign-conversion", "-Wno-infinite-recursion", "-Wno-comma", "-Wno-block-capture-autoreleasing", "-Wno-strict-prototypes", "-Wno-semicolon-before-method-body", "-iquote", "\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/Driver-generated-files.hmap", "-I\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/Driver-own-target-headers.hmap", "-I\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/Driver-all-target-headers.hmap", "-iquote", "\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/Driver-project-headers.hmap",
+                        "-I\(SRCROOT)/build/Debug-driverkit/include",
+                        "-I\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/DerivedSources-normal/x86_64", "-I\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/DerivedSources/x86_64", "-I\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/DerivedSources", "-F\(SRCROOT)/build/Debug-driverkit", "-MMD", "-MT", "dependencies", "-MF", "\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/Objects-normal/x86_64/file.d", "--serialize-diagnostics", "\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/Objects-normal/x86_64/file.dia", "-c", "\(SRCROOT)/file.c", "-o", "\(SRCROOT)/build/aProject.build/Debug-driverkit/Driver.build/Objects-normal/x86_64/file.o",
+                    ])
                 }
 
                 // Validate that we are getting the "-framework Support" flag added an no unexpected parameters.
@@ -269,17 +290,21 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("file.c"),
                     TestFile("Support.xcframework"),
-                    TestFile("Info.plist")
-                ]),
+                    TestFile("Info.plist"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "GCC_WARN_64_TO_32_BIT_CONVERSION": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "ARCHS": "x86_64",
-                    "INFOPLIST_FILE": "Info.plist",
-                    "CLANG_USE_RESPONSE_FILE": "NO",
-                ]),
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "GCC_WARN_64_TO_32_BIT_CONVERSION": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "ARCHS": "x86_64",
+                        "INFOPLIST_FILE": "Info.plist",
+                        "CLANG_USE_RESPONSE_FILE": "NO",
+                    ]
+                )
             ],
             targets: [
                 // Test building an app which links and embeds an xcframework.
@@ -287,7 +312,7 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release"),
+                        TestBuildConfiguration("Release")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["file.c"]),
@@ -295,8 +320,9 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                         TestCopyFilesBuildPhase(["Support.xcframework"], destinationSubfolder: .frameworks),
                     ],
                     dependencies: []
-                ),
-            ])
+                )
+            ]
+        )
 
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
@@ -306,10 +332,13 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
         try fs.createDirectory(Path(SRCROOT), recursive: true)
         try fs.write(Path(SRCROOT).join("file.c"), contents: "int f() { return 0; }")
 
-        let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-            XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
-            XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
-        ])
+        let supportXCFramework = try XCFramework(
+            version: Version(1, 0),
+            libraries: [
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
+                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
+            ]
+        )
         let supportXCFrameworkPath = Path(SRCROOT).join("Support.xcframework")
         try fs.createDirectory(supportXCFrameworkPath, recursive: true)
         let infoLookup = try await getCore()
@@ -321,12 +350,12 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                 task.checkCommandLine(["builtin-process-xcframework", "--xcframework", "\(SRCROOT)/Support.xcframework", "--platform", "macos", "--target-path", "\(SRCROOT)/build/Release"])
                 task.checkInputs([
                     .path("\(SRCROOT)/Support.xcframework"),
-                    .path("\(SRCROOT)/build/Release")
+                    .path("\(SRCROOT)/build/Release"),
                 ])
                 task.checkOutputs([
                     .path("\(SRCROOT)/build/Release/Support.framework"),
                     .path("\(SRCROOT)/build/Release/Support.framework/Info.plist"),
-                    .path("\(SRCROOT)/build/Release/Support.framework/Support")
+                    .path("\(SRCROOT)/build/Release/Support.framework/Support"),
                 ])
                 processSupportXCFrameworkTask = task
             }
@@ -364,19 +393,23 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("main.swift"),
                     TestFile("Support.xcframework"),
-                    TestFile("Info.plist")
-                ]),
+                    TestFile("Info.plist"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "ARCHS": "x86_64",
-                    "INFOPLIST_FILE": "Info.plist",
-                    "SWIFT_ENABLE_EXPLICIT_MODULES": "NO",
-                    "_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES": "NO",
-                    "SWIFT_VERSION": "5",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "ARCHS": "x86_64",
+                        "INFOPLIST_FILE": "Info.plist",
+                        "SWIFT_ENABLE_EXPLICIT_MODULES": "NO",
+                        "_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES": "NO",
+                        "SWIFT_VERSION": "5",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                    ]
+                )
             ],
             targets: [
                 // Test building an app which links and embeds an xcframework.
@@ -384,15 +417,16 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["main.swift"]),
                         TestFrameworksBuildPhase(["Support.xcframework"]),
                     ],
                     dependencies: []
-                ),
-            ])
+                )
+            ]
+        )
 
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -401,10 +435,13 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
         try fs.createDirectory(Path(SRCROOT), recursive: true)
         try fs.write(Path(SRCROOT).join("main.swift"), contents: "func f() -> Int { return 0 }")
 
-        let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-            XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
-            XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
-        ])
+        let supportXCFramework = try XCFramework(
+            version: Version(1, 0),
+            libraries: [
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
+                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
+            ]
+        )
         let supportXCFrameworkPath = Path(SRCROOT).join("Support.xcframework")
         try fs.createDirectory(supportXCFrameworkPath, recursive: true)
         let infoLookup = try await getCore()
@@ -416,12 +453,12 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                 task.checkCommandLine(["builtin-process-xcframework", "--xcframework", "\(SRCROOT)/Support.xcframework", "--platform", "macos", "--target-path", "\(SRCROOT)/build/Debug"])
                 task.checkInputs([
                     .path("\(SRCROOT)/Support.xcframework"),
-                    .path("\(SRCROOT)/build/Debug")
+                    .path("\(SRCROOT)/build/Debug"),
                 ])
                 task.checkOutputs([
                     .path("\(SRCROOT)/build/Debug/Support.framework"),
                     .path("\(SRCROOT)/build/Debug/Support.framework/Info.plist"),
-                    .path("\(SRCROOT)/build/Debug/Support.framework/Support")
+                    .path("\(SRCROOT)/build/Debug/Support.framework/Support"),
                 ])
                 processSupportXCFrameworkTask = task
             }
@@ -468,17 +505,21 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("file.c"),
                     TestFile("Support.xcframework"),
-                    TestFile("Info.plist")
-                ]),
+                    TestFile("Info.plist"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GCC_WARN_64_TO_32_BIT_CONVERSION": "YES",
-                    "DEAD_CODE_STRIPPING": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "ARCHS": "x86_64",
-                    "INFOPLIST_FILE": "Info.plist",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GCC_WARN_64_TO_32_BIT_CONVERSION": "YES",
+                        "DEAD_CODE_STRIPPING": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "ARCHS": "x86_64",
+                        "INFOPLIST_FILE": "Info.plist",
+                    ]
+                )
             ],
             targets: [
                 // Test building an app which links and embeds an xcframework.
@@ -490,7 +531,7 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["file.c"]),
@@ -502,10 +543,13 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     "AppTests",
                     type: .unitTest,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "BUNDLE_LOADER": "$(TEST_HOST)",
-                            "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/App.app/Contents/MacOS/App",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "BUNDLE_LOADER": "$(TEST_HOST)",
+                                "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/App.app/Contents/MacOS/App",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["file.c"]),
@@ -518,11 +562,14 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     "AppUITests",
                     type: .uiTest,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "BUNDLE_LOADER": "$(TEST_HOST)",
-                            "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/App.app/Contents/MacOS/App",
-                            "USES_XCTRUNNER": "YES", // default
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "BUNDLE_LOADER": "$(TEST_HOST)",
+                                "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/App.app/Contents/MacOS/App",
+                                "USES_XCTRUNNER": "YES",  // default
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["file.c"]),
@@ -530,8 +577,9 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                         TestCopyFilesBuildPhase(["Support.xcframework"], destinationSubfolder: .frameworks),
                     ],
                     dependencies: ["App"]
-                )
-            ])
+                ),
+            ]
+        )
 
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -543,9 +591,12 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
         let xctrunnerPath = core.developerPath.path.join("Platforms/MacOSX.platform/Developer/Library/Xcode/Agents/XCTRunner.app")
         try await fs.writeXCTRunnerApp(xctrunnerPath, archs: ["arm64", "arm64e", "x86_64"], platform: .macOS, infoLookup: core)
 
-        let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-            XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
-        ])
+        let supportXCFramework = try XCFramework(
+            version: Version(1, 0),
+            libraries: [
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil)
+            ]
+        )
         let supportXCFrameworkPath = Path(SRCROOT).join("Support.xcframework")
         try fs.createDirectory(supportXCFrameworkPath, recursive: true)
         let infoLookup = try await getCore()
@@ -556,12 +607,12 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                 task.checkCommandLine(["builtin-process-xcframework", "--xcframework", "\(SRCROOT)/Support.xcframework", "--platform", "macos", "--target-path", "\(SRCROOT)/build/Debug"])
                 task.checkInputs([
                     .path("\(SRCROOT)/Support.xcframework"),
-                    .path("\(SRCROOT)/build/Debug")
+                    .path("\(SRCROOT)/build/Debug"),
                 ])
                 task.checkOutputs([
                     .path("\(SRCROOT)/build/Debug/Support.framework"),
                     .path("\(SRCROOT)/build/Debug/Support.framework/Info.plist"),
-                    .path("\(SRCROOT)/build/Debug/Support.framework/Support")
+                    .path("\(SRCROOT)/build/Debug/Support.framework/Support"),
                 ])
             }
 
@@ -579,15 +630,19 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("file.c"),
                     TestFile("Support.xcframework"),
-                    TestFile("Info.plist")
-                ]),
+                    TestFile("Info.plist"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "ARCHS": "x86_64",
-                    "INFOPLIST_FILE": "Info.plist",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "ARCHS": "x86_64",
+                        "INFOPLIST_FILE": "Info.plist",
+                    ]
+                )
             ],
             targets: [
                 // Test building an app which links and embeds an xcframework.
@@ -595,15 +650,16 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["file.c"]),
                         TestCopyFilesBuildPhase(["Support.xcframework"], destinationSubfolder: .builtProductsDir, destinationSubpath: "MyFrameworks/more/subpaths", onlyForDeployment: false),
                     ],
                     dependencies: []
-                ),
-            ])
+                )
+            ]
+        )
 
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
@@ -613,10 +669,13 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
         try fs.createDirectory(Path(SRCROOT), recursive: true)
         try fs.write(Path(SRCROOT).join("file.c"), contents: "int f() { return 0; }")
 
-        let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-            XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
-            XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
-        ])
+        let supportXCFramework = try XCFramework(
+            version: Version(1, 0),
+            libraries: [
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
+                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
+            ]
+        )
         let supportXCFrameworkPath = Path(SRCROOT).join("Support.xcframework")
         try fs.createDirectory(supportXCFrameworkPath, recursive: true)
         let infoLookup = try await getCore()
@@ -628,12 +687,12 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                 task.checkCommandLine(["builtin-process-xcframework", "--xcframework", "\(SRCROOT)/Support.xcframework", "--platform", "macos", "--target-path", "\(SRCROOT)/build/Debug"])
                 task.checkInputs([
                     .path("\(SRCROOT)/Support.xcframework"),
-                    .path("\(SRCROOT)/build/Debug")
+                    .path("\(SRCROOT)/build/Debug"),
                 ])
                 task.checkOutputs([
                     .path("\(SRCROOT)/build/Debug/Support.framework"),
                     .path("\(SRCROOT)/build/Debug/Support.framework/Info.plist"),
-                    .path("\(SRCROOT)/build/Debug/Support.framework/Support")
+                    .path("\(SRCROOT)/build/Debug/Support.framework/Support"),
                 ])
                 processSupportXCFrameworkTask = task
             }
@@ -660,18 +719,22 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("file.c"),
                     TestFile("Support.xcframework"),
-                    TestFile("Info.plist")
-                ]),
+                    TestFile("Info.plist"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "GCC_WARN_64_TO_32_BIT_CONVERSION": "YES",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "ARCHS": "x86_64",
-                    "INFOPLIST_FILE": "Info.plist",
-                    "HEADER_SEARCH_PATHS": "hp1 hp2",
-                    "CLANG_USE_RESPONSE_FILE": "NO",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "GCC_WARN_64_TO_32_BIT_CONVERSION": "YES",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "ARCHS": "x86_64",
+                        "INFOPLIST_FILE": "Info.plist",
+                        "HEADER_SEARCH_PATHS": "hp1 hp2",
+                        "CLANG_USE_RESPONSE_FILE": "NO",
+                    ]
+                )
             ],
             targets: [
                 // Test building an app which links and embeds an xcframework.
@@ -679,15 +742,16 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["file.c"]),
                         TestFrameworksBuildPhase(["Support.xcframework"]),
                     ],
                     dependencies: []
-                ),
-            ])
+                )
+            ]
+        )
 
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
@@ -697,10 +761,13 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
         try fs.createDirectory(Path(SRCROOT), recursive: true)
         try fs.write(Path(SRCROOT).join("file.c"), contents: "int f() { return 0; }")
 
-        let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-            XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("libsupport.a"), binaryPath: Path("libsupport.a"), headersPath: Path("Headers")),
-            XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("libsupport.a"), binaryPath: Path("libsupport.a"), headersPath: Path("Headers")),
-        ])
+        let supportXCFramework = try XCFramework(
+            version: Version(1, 0),
+            libraries: [
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("libsupport.a"), binaryPath: Path("libsupport.a"), headersPath: Path("Headers")),
+                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("libsupport.a"), binaryPath: Path("libsupport.a"), headersPath: Path("Headers")),
+            ]
+        )
         let supportXCFrameworkPath = Path(SRCROOT).join("Support.xcframework")
         try fs.createDirectory(supportXCFrameworkPath, recursive: true)
         let infoLookup = try await getCore()
@@ -729,7 +796,7 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                 task.checkCommandLine(["builtin-process-xcframework", "--xcframework", "\(SRCROOT)/Support.xcframework", "--platform", "macos", "--target-path", "\(SRCROOT)/build/Debug"])
                 task.checkInputs([
                     .path("\(SRCROOT)/Support.xcframework"),
-                    .path("\(SRCROOT)/build/Debug")
+                    .path("\(SRCROOT)/build/Debug"),
                 ])
                 task.checkOutputs([
                     .path("\(SRCROOT)/build/Debug/include/Header1.h"),
@@ -773,17 +840,21 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     TestFile("Support.xcframework"),
                     TestFile("Other.xcframework"),
                     TestFile("Info.plist"),
-                ]),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "ARCHS": "x86_64",
-                    "INFOPLIST_FILE": "Info.plist",
-                    "HEADER_SEARCH_PATHS": "hp1 hp2",
-                    "SWIFT_EXEC": swiftCompilerPath.str,
-                    "SWIFT_VERSION": "5.0",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "ARCHS": "x86_64",
+                        "INFOPLIST_FILE": "Info.plist",
+                        "HEADER_SEARCH_PATHS": "hp1 hp2",
+                        "SWIFT_EXEC": swiftCompilerPath.str,
+                        "SWIFT_VERSION": "5.0",
+                    ]
+                )
             ],
             targets: [
                 // Test building an app which links and embeds an xcframework.
@@ -791,15 +862,16 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["file.swift"]),
                         TestFrameworksBuildPhase(["Support.xcframework", "Other.xcframework"]),
                     ],
                     dependencies: []
-                ),
-            ])
+                )
+            ]
+        )
 
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
@@ -809,19 +881,25 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
         try fs.createDirectory(Path(SRCROOT), recursive: true)
         try fs.write(Path(SRCROOT).join("file.c"), contents: "int f() { return 0; }")
 
-        let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-            XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("support.framework"), binaryPath: Path("support.framework/Versions/A/support"), headersPath: nil),
-            XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("support.framework"), binaryPath: Path("support.framework/support"), headersPath: nil),
-        ])
+        let supportXCFramework = try XCFramework(
+            version: Version(1, 0),
+            libraries: [
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("support.framework"), binaryPath: Path("support.framework/Versions/A/support"), headersPath: nil),
+                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("support.framework"), binaryPath: Path("support.framework/support"), headersPath: nil),
+            ]
+        )
         let supportXCFrameworkPath = Path(SRCROOT).join("Support.xcframework")
         try fs.createDirectory(supportXCFrameworkPath, recursive: true)
         let infoLookup = try await getCore()
         try await XCFrameworkTestSupport.writeXCFramework(supportXCFramework, fs: fs, path: supportXCFrameworkPath, infoLookup: infoLookup)
 
-        let otherXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-            XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("other.dylib"), binaryPath: Path("other.dylib"), headersPath: nil),
-            XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("other.dylib"), binaryPath: Path("other.dylib"), headersPath: nil),
-        ])
+        let otherXCFramework = try XCFramework(
+            version: Version(1, 0),
+            libraries: [
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("other.dylib"), binaryPath: Path("other.dylib"), headersPath: nil),
+                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("other.dylib"), binaryPath: Path("other.dylib"), headersPath: nil),
+            ]
+        )
         let otherXCFrameworkPath = Path(SRCROOT).join("Other.xcframework")
         try fs.createDirectory(otherXCFrameworkPath, recursive: true)
         try await XCFrameworkTestSupport.writeXCFramework(otherXCFramework, fs: fs, path: otherXCFrameworkPath, infoLookup: infoLookup)
@@ -839,12 +917,12 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
             results.checkTask(.matchRule(["ProcessXCFramework", "\(SRCROOT)/Support.xcframework", "\(SRCROOT)/build/Debug/support.framework", "macos"])) { task in
                 task.checkInputs([
                     .path("\(SRCROOT)/Support.xcframework"),
-                    .path("\(SRCROOT)/build/Debug")
+                    .path("\(SRCROOT)/build/Debug"),
                 ])
                 task.checkOutputs([
                     .path("\(SRCROOT)/build/Debug/support.framework"),
                     .path("\(SRCROOT)/build/Debug/support.framework/Info.plist"),
-                    .path("\(SRCROOT)/build/Debug/support.framework/support")
+                    .path("\(SRCROOT)/build/Debug/support.framework/support"),
                 ])
                 processSupportXCFrameworkTask = task
             }
@@ -853,7 +931,7 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
             results.checkTask(.matchRule(["ProcessXCFramework", "\(SRCROOT)/Other.xcframework", "\(SRCROOT)/build/Debug/other.dylib", "macos"])) { task in
                 task.checkInputs([
                     .path("\(SRCROOT)/Other.xcframework"),
-                    .path("\(SRCROOT)/build/Debug")
+                    .path("\(SRCROOT)/build/Debug"),
                 ])
                 task.checkOutputs([
                     .path("\(SRCROOT)/build/Debug/other.dylib"),
@@ -903,18 +981,22 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     TestFile("file.c"),
                     TestFile("Support.xcframework"),
                     TestFile("Extras.xcframework"),
-                    TestFile("Info.plist")
-                ]),
+                    TestFile("Info.plist"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "ARCHS[sdk=iphoneos*]": "arm64",
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "IPHONEOS_DEPLOYMENT_TARGET": core.loadSDK(.iOS).defaultDeploymentTarget,
-                    "SDKROOT": "iphoneos",
-                    "INFOPLIST_FILE": "Info.plist",
-                    "CODE_SIGN_IDENTITY": "Apple Development",
-                    "CODE_SIGN_ENTITLEMENTS": "codesign.entitlements",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "ARCHS[sdk=iphoneos*]": "arm64",
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "IPHONEOS_DEPLOYMENT_TARGET": core.loadSDK(.iOS).defaultDeploymentTarget,
+                        "SDKROOT": "iphoneos",
+                        "INFOPLIST_FILE": "Info.plist",
+                        "CODE_SIGN_IDENTITY": "Apple Development",
+                        "CODE_SIGN_ENTITLEMENTS": "codesign.entitlements",
+                    ]
+                )
             ],
             targets: [
                 // Test building an app which links and embeds an xcframework.
@@ -922,15 +1004,16 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["file.c"]),
                         TestFrameworksBuildPhase(["Support.xcframework", "Extras.xcframework"]),
                     ],
                     dependencies: []
-                ),
-            ])
+                )
+            ]
+        )
 
         let tester = try TaskConstructionTester(core, testProject)
         let SRCROOT = tester.workspace.projects[0].sourceRoot.str
@@ -939,19 +1022,25 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
         try fs.createDirectory(Path(SRCROOT), recursive: true)
         try fs.write(Path(SRCROOT).join("file.c"), contents: "int f() { return 0; }")
 
-        let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-            XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
-            XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
-        ])
+        let supportXCFramework = try XCFramework(
+            version: Version(1, 0),
+            libraries: [
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
+                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
+            ]
+        )
         let supportXCFrameworkPath = Path(SRCROOT).join("Support.xcframework")
         try fs.createDirectory(supportXCFrameworkPath, recursive: true)
         let infoLookup = try await getCore()
         try await XCFrameworkTestSupport.writeXCFramework(supportXCFramework, fs: fs, path: supportXCFrameworkPath, infoLookup: infoLookup)
 
-        let extrasXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-            XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Extras.framework"), binaryPath: Path("Extras.framework/Versions/A/Extras"), headersPath: nil),
-            XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Extras.framework"), binaryPath: Path("Extras.framework/Extras"), headersPath: nil),
-        ])
+        let extrasXCFramework = try XCFramework(
+            version: Version(1, 0),
+            libraries: [
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Extras.framework"), binaryPath: Path("Extras.framework/Versions/A/Extras"), headersPath: nil),
+                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Extras.framework"), binaryPath: Path("Extras.framework/Extras"), headersPath: nil),
+            ]
+        )
         let extrasXCFrameworkPath = Path(SRCROOT).join("Extras.xcframework")
         try fs.createDirectory(extrasXCFrameworkPath, recursive: true)
         try await XCFrameworkTestSupport.writeXCFramework(extrasXCFramework, fs: fs, path: extrasXCFrameworkPath, infoLookup: infoLookup)
@@ -966,12 +1055,12 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                 task.checkCommandLine(["builtin-process-xcframework", "--xcframework", "\(SRCROOT)/Extras.xcframework", "--platform", "ios", "--target-path", "\(SRCROOT)/build/Debug-iphoneos"])
                 task.checkInputs([
                     .path("\(SRCROOT)/Extras.xcframework"),
-                    .path("\(SRCROOT)/build/Debug-iphoneos")
+                    .path("\(SRCROOT)/build/Debug-iphoneos"),
                 ])
                 task.checkOutputs([
                     .path("\(SRCROOT)/build/Debug-iphoneos/Extras.framework"),
                     .path("\(SRCROOT)/build/Debug-iphoneos/Extras.framework/Extras"),
-                    .path("\(SRCROOT)/build/Debug-iphoneos/Extras.framework/Info.plist")
+                    .path("\(SRCROOT)/build/Debug-iphoneos/Extras.framework/Info.plist"),
                 ])
                 processExtrasXCFrameworkTask = task
             }
@@ -981,12 +1070,12 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                 task.checkCommandLine(["builtin-process-xcframework", "--xcframework", "\(SRCROOT)/Support.xcframework", "--platform", "ios", "--target-path", "\(SRCROOT)/build/Debug-iphoneos"])
                 task.checkInputs([
                     .path("\(SRCROOT)/Support.xcframework"),
-                    .path("\(SRCROOT)/build/Debug-iphoneos")
+                    .path("\(SRCROOT)/build/Debug-iphoneos"),
                 ])
                 task.checkOutputs([
                     .path("\(SRCROOT)/build/Debug-iphoneos/Support.framework"),
                     .path("\(SRCROOT)/build/Debug-iphoneos/Support.framework/Info.plist"),
-                    .path("\(SRCROOT)/build/Debug-iphoneos/Support.framework/Support")
+                    .path("\(SRCROOT)/build/Debug-iphoneos/Support.framework/Support"),
                 ])
                 processSupportXCFrameworkTask = task
             }
@@ -1017,14 +1106,18 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     TestFile("lib1.c"),
                     TestFile("Support.xcframework"),
                     TestFile("Extras.xcframework"),
-                    TestFile("Info.plist")
-                ]),
+                    TestFile("Info.plist"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "INFOPLIST_FILE": "Info.plist",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "INFOPLIST_FILE": "Info.plist",
+                    ]
+                )
             ],
             targets: [
                 // Test building an app which links and embeds an xcframework.
@@ -1032,7 +1125,7 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["file.c"]),
@@ -1045,7 +1138,7 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     "lib1",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["lib1.c"]),
@@ -1057,10 +1150,13 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     "lib2",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "CODE_SIGNING_ALLOWED": "NO",
-                            "SDKROOT": "appletvos"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "CODE_SIGNING_ALLOWED": "NO",
+                                "SDKROOT": "appletvos",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["lib1.c"]),
@@ -1072,10 +1168,13 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     "App2",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ARCHS": "x86_64h",
-                            "VALID_ARCHS": "$(inherited) x86_64h",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ARCHS": "x86_64h",
+                                "VALID_ARCHS": "$(inherited) x86_64h",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["lib1.c"]),
@@ -1083,7 +1182,8 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     ],
                     dependencies: []
                 ),
-            ])
+            ]
+        )
 
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
@@ -1094,19 +1194,25 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
         try fs.write(Path(SRCROOT).join("file.c"), contents: "int f() { return 0; }")
         try fs.write(Path(SRCROOT).join("lib1.c"), contents: "int l() { return 0; }")
 
-        let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-            XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
-            XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
-        ])
+        let supportXCFramework = try XCFramework(
+            version: Version(1, 0),
+            libraries: [
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
+                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
+            ]
+        )
         let supportXCFrameworkPath = Path(SRCROOT).join("Support.xcframework")
         try fs.createDirectory(supportXCFrameworkPath, recursive: true)
         let infoLookup = try await getCore()
         try await XCFrameworkTestSupport.writeXCFramework(supportXCFramework, fs: fs, path: supportXCFrameworkPath, infoLookup: infoLookup)
 
-        let extrasXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-            XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Extras.framework"), binaryPath: Path("Extras.framework/Versions/A/Extras"), headersPath: nil),
-            XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Extras.framework"), binaryPath: Path("Extras.framework/Extras"), headersPath: nil),
-        ])
+        let extrasXCFramework = try XCFramework(
+            version: Version(1, 0),
+            libraries: [
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Extras.framework"), binaryPath: Path("Extras.framework/Versions/A/Extras"), headersPath: nil),
+                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Extras.framework"), binaryPath: Path("Extras.framework/Extras"), headersPath: nil),
+            ]
+        )
         let extrasXCFrameworkPath = Path(SRCROOT).join("Extras.xcframework")
         try fs.createDirectory(extrasXCFrameworkPath, recursive: true)
         try await XCFrameworkTestSupport.writeXCFramework(extrasXCFramework, fs: fs, path: extrasXCFrameworkPath, infoLookup: infoLookup)
@@ -1117,12 +1223,12 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                 task.checkCommandLine(["builtin-process-xcframework", "--xcframework", "\(SRCROOT)/Support.xcframework", "--platform", "macos", "--target-path", "\(SRCROOT)/build/Debug"])
                 task.checkInputs([
                     .path("\(SRCROOT)/Support.xcframework"),
-                    .path("\(SRCROOT)/build/Debug")
+                    .path("\(SRCROOT)/build/Debug"),
                 ])
                 task.checkOutputs([
                     .path("\(SRCROOT)/build/Debug/Support.framework"),
                     .path("\(SRCROOT)/build/Debug/Support.framework/Info.plist"),
-                    .path("\(SRCROOT)/build/Debug/Support.framework/Support")
+                    .path("\(SRCROOT)/build/Debug/Support.framework/Support"),
                 ])
                 processSupportXCFrameworkTask = task
             }
@@ -1132,12 +1238,12 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                 task.checkCommandLine(["builtin-process-xcframework", "--xcframework", "\(SRCROOT)/Extras.xcframework", "--platform", "macos", "--target-path", "\(SRCROOT)/build/Debug"])
                 task.checkInputs([
                     .path("\(SRCROOT)/Extras.xcframework"),
-                    .path("\(SRCROOT)/build/Debug")
+                    .path("\(SRCROOT)/build/Debug"),
                 ])
                 task.checkOutputs([
                     .path("\(SRCROOT)/build/Debug/Extras.framework"),
                     .path("\(SRCROOT)/build/Debug/Extras.framework/Extras"),
-                    .path("\(SRCROOT)/build/Debug/Extras.framework/Info.plist")
+                    .path("\(SRCROOT)/build/Debug/Extras.framework/Info.plist"),
                 ])
                 processExtrasXCFrameworkTask = task
             }
@@ -1181,12 +1287,12 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     task.checkCommandLine(["builtin-process-xcframework", "--xcframework", "\(SRCROOT)/Support.xcframework", "--platform", "macos", "--target-path", "\(SRCROOT)/build/Debug"])
                     task.checkInputs([
                         .path("\(SRCROOT)/Support.xcframework"),
-                        .path("\(SRCROOT)/build/Debug")
+                        .path("\(SRCROOT)/build/Debug"),
                     ])
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/Debug/Support.framework"),
                         .path("\(SRCROOT)/build/Debug/Support.framework/Info.plist"),
-                        .path("\(SRCROOT)/build/Debug/Support.framework/Support")
+                        .path("\(SRCROOT)/build/Debug/Support.framework/Support"),
                     ])
                     processSupportXCFrameworkTask = task
                 }
@@ -1196,12 +1302,12 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     task.checkCommandLine(["builtin-process-xcframework", "--xcframework", "\(SRCROOT)/Extras.xcframework", "--platform", "macos", "--target-path", "\(SRCROOT)/build/Debug"])
                     task.checkInputs([
                         .path("\(SRCROOT)/Extras.xcframework"),
-                        .path("\(SRCROOT)/build/Debug")
+                        .path("\(SRCROOT)/build/Debug"),
                     ])
                     task.checkOutputs([
                         .path("\(SRCROOT)/build/Debug/Extras.framework"),
                         .path("\(SRCROOT)/build/Debug/Extras.framework/Extras"),
-                        .path("\(SRCROOT)/build/Debug/Extras.framework/Info.plist")
+                        .path("\(SRCROOT)/build/Debug/Extras.framework/Info.plist"),
                     ])
                     processExtrasXCFrameworkTask = task
                 }
@@ -1231,15 +1337,19 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("file.c"),
                     TestFile("Support.xcframework"),
-                    TestFile("Info.plist")
-                ]),
+                    TestFile("Info.plist"),
+                ]
+            ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "CODE_SIGN_IDENTITY": "-",
-                    "ARCHS": "x86_64",
-                    "INFOPLIST_FILE": "Info.plist",
-                ]),
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "CODE_SIGN_IDENTITY": "-",
+                        "ARCHS": "x86_64",
+                        "INFOPLIST_FILE": "Info.plist",
+                    ]
+                )
             ],
             targets: [
                 // Test building an app which links and embeds an xcframework.
@@ -1247,7 +1357,7 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["file.c"]),
@@ -1255,8 +1365,9 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
                         TestCopyFilesBuildPhase(["Support.xcframework"], destinationSubfolder: .frameworks),
                     ],
                     dependencies: []
-                ),
-            ])
+                )
+            ]
+        )
 
         let core = try await getCore()
         let tester = try TaskConstructionTester(core, testProject)
@@ -1266,10 +1377,13 @@ fileprivate struct XCFrameworkTaskConstructionTests: CoreBasedTests {
         try fs.createDirectory(Path(SRCROOT), recursive: true)
         try fs.write(Path(SRCROOT).join("file.c"), contents: "int f() { return 0; }")
 
-        let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-            XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
-            XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
-        ])
+        let supportXCFramework = try XCFramework(
+            version: Version(1, 0),
+            libraries: [
+                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos\(core.loadSDK(.macOS).defaultDeploymentTarget)", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
+                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos\(core.loadSDK(.iOS).defaultDeploymentTarget)", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
+            ]
+        )
 
         // Purposefully write this out to the wrong path.
         let supportXCFrameworkPath = Path(SRCROOT).join("Support_wrongpath.xcframework")
diff --git a/Tests/SWBTaskConstructionTests/XCStringsSymbolGenTests.swift b/Tests/SWBTaskConstructionTests/XCStringsSymbolGenTests.swift
index a11cc955..c476a3c8 100644
--- a/Tests/SWBTaskConstructionTests/XCStringsSymbolGenTests.swift
+++ b/Tests/SWBTaskConstructionTests/XCStringsSymbolGenTests.swift
@@ -37,22 +37,28 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "STRING_CATALOG_GENERATE_SYMBOLS": "YES" // This is what we're primarily testing
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "STRING_CATALOG_GENERATE_SYMBOLS": "YES",  // This is what we're primarily testing
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -60,7 +66,7 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
             ],
@@ -69,17 +75,22 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
 
         // Mock xcstringstool since it will be called for --dry-run.
         // Pretend our xcstrings file contains English and German strings, and that they have variations.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [ "/tmp/Test/Project/Sources/Localizable.xcstrings" : [ // input
-            "en.lproj/Localizable.strings",
-            "en.lproj/Localizable.stringsdict",
-            "de.lproj/Localizable.strings",
-            "de.lproj/Localizable.stringsdict",
-        ]], requiredCommandLine: [
-            "xcstringstool", "compile",
-            "--dry-run",
-            "--output-directory", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build",
-            "/tmp/Test/Project/Sources/Localizable.xcstrings" // input file
-        ])
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Localizable.xcstrings": [  // input
+                    "en.lproj/Localizable.strings",
+                    "en.lproj/Localizable.stringsdict",
+                    "de.lproj/Localizable.strings",
+                    "de.lproj/Localizable.stringsdict",
+                ]
+            ],
+            requiredCommandLine: [
+                "xcstringstool", "compile",
+                "--dry-run",
+                "--output-directory", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build",
+                "/tmp/Test/Project/Sources/Localizable.xcstrings",  // input file
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let swiftFeatures = try await self.swiftFeatures
@@ -99,14 +110,14 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
 
                     // Output is .swift file.
                     task.checkOutputs([
-                        .path("/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/DerivedSources/GeneratedStringSymbols_Localizable.swift"),
+                        .path("/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/DerivedSources/GeneratedStringSymbols_Localizable.swift")
                     ])
 
                     task.checkCommandLine([
                         "xcstringstool", "generate-symbols",
                         "--language", "swift",
                         "--output-directory", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/DerivedSources",
-                        "/tmp/Test/Project/Sources/Localizable.xcstrings" // input file
+                        "/tmp/Test/Project/Sources/Localizable.xcstrings",  // input file
                     ])
                 }
 
@@ -139,11 +150,10 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                     task.checkCommandLine([
                         "xcstringstool", "compile",
                         "--output-directory", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build",
-                        "/tmp/Test/Project/Sources/Localizable.xcstrings" // input file
+                        "/tmp/Test/Project/Sources/Localizable.xcstrings",  // input file
                     ])
                 }
 
-
                 // Then we need the standard CopyStringsFile tasks to have the compiled .strings/dict as input.
                 results.checkTask(.matchTarget(target), .matchRule(["CopyStringsFile", "/tmp/Test/Project/build/Debug/MyFramework.framework/Versions/A/Resources/en.lproj/Localizable.strings", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/en.lproj/Localizable.strings"])) { _ in }
                 results.checkTask(.matchTarget(target), .matchRule(["CopyStringsFile", "/tmp/Test/Project/build/Debug/MyFramework.framework/Versions/A/Resources/en.lproj/Localizable.stringsdict", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/en.lproj/Localizable.stringsdict"])) { _ in }
@@ -171,22 +181,28 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "STRING_CATALOG_GENERATE_SYMBOLS": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "STRING_CATALOG_GENERATE_SYMBOLS": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -196,7 +212,7 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                             "Localizable.xcstrings",
                             "CustomTable.xcstrings",
                             "Table with spaces.xcstrings",
-                        ])
+                        ]),
                     ]
                 )
             ],
@@ -204,20 +220,23 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
         )
 
         // Pretend our xcstrings files contain English and German strings, without variation.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [
-            "/tmp/Test/Project/Sources/Localizable.xcstrings" : [
-                "en.lproj/Localizable.strings",
-                "de.lproj/Localizable.strings",
-            ],
-            "/tmp/Test/Project/Sources/CustomTable.xcstrings" : [
-                "en.lproj/CustomTable.strings",
-                "de.lproj/CustomTable.strings",
-            ],
-            "/tmp/Test/Project/Sources/Table with spaces.xcstrings" : [
-                "en.lproj/Table with spaces.strings",
-                "de.lproj/Table with spaces.strings",
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Localizable.xcstrings": [
+                    "en.lproj/Localizable.strings",
+                    "de.lproj/Localizable.strings",
+                ],
+                "/tmp/Test/Project/Sources/CustomTable.xcstrings": [
+                    "en.lproj/CustomTable.strings",
+                    "de.lproj/CustomTable.strings",
+                ],
+                "/tmp/Test/Project/Sources/Table with spaces.xcstrings": [
+                    "en.lproj/Table with spaces.strings",
+                    "de.lproj/Table with spaces.strings",
+                ],
             ],
-        ], requiredCommandLine: nil)
+            requiredCommandLine: nil
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let swiftFeatures = try await self.swiftFeatures
@@ -283,30 +302,40 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "STRING_CATALOG_GENERATE_SYMBOLS": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "STRING_CATALOG_GENERATE_SYMBOLS": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyFramework.swift"
                         ]),
-                        TestCopyFilesBuildPhase([
-                            "Localizable.xcstrings",
-                        ], destinationSubfolder: .resources, onlyForDeployment: false)
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Localizable.xcstrings"
+                            ],
+                            destinationSubfolder: .resources,
+                            onlyForDeployment: false
+                        ),
                     ]
                 )
             ],
@@ -347,31 +376,37 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "STRING_CATALOG_GENERATE_SYMBOLS": "YES" // This is what we're primarily testing
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "STRING_CATALOG_GENERATE_SYMBOLS": "YES",  // This is what we're primarily testing
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyFramework.swift",
-                            "Localizable.xcstrings"
+                            "Localizable.xcstrings",
                         ]),
                         TestResourcesBuildPhase([
 
-                        ])
+                            ]),
                     ]
                 )
             ],
@@ -380,17 +415,22 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
 
         // Mock xcstringstool since it will be called for --dry-run.
         // Pretend our xcstrings file contains English and German strings, and that they have variations.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [ "/tmp/Test/Project/Sources/Localizable.xcstrings" : [ // input
-            "en.lproj/Localizable.strings",
-            "en.lproj/Localizable.stringsdict",
-            "de.lproj/Localizable.strings",
-            "de.lproj/Localizable.stringsdict",
-        ]], requiredCommandLine: [
-            "xcstringstool", "compile",
-            "--dry-run",
-            "--output-directory", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build",
-            "/tmp/Test/Project/Sources/Localizable.xcstrings" // input file
-        ])
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Localizable.xcstrings": [  // input
+                    "en.lproj/Localizable.strings",
+                    "en.lproj/Localizable.stringsdict",
+                    "de.lproj/Localizable.strings",
+                    "de.lproj/Localizable.stringsdict",
+                ]
+            ],
+            requiredCommandLine: [
+                "xcstringstool", "compile",
+                "--dry-run",
+                "--output-directory", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build",
+                "/tmp/Test/Project/Sources/Localizable.xcstrings",  // input file
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let swiftFeatures = try await self.swiftFeatures
@@ -410,14 +450,14 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
 
                     // Output is .swift file.
                     task.checkOutputs([
-                        .path("/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/DerivedSources/GeneratedStringSymbols_Localizable.swift"),
+                        .path("/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/DerivedSources/GeneratedStringSymbols_Localizable.swift")
                     ])
 
                     task.checkCommandLine([
                         "xcstringstool", "generate-symbols",
                         "--language", "swift",
                         "--output-directory", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/DerivedSources",
-                        "/tmp/Test/Project/Sources/Localizable.xcstrings" // input file
+                        "/tmp/Test/Project/Sources/Localizable.xcstrings",  // input file
                     ])
                 }
 
@@ -450,11 +490,10 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                     task.checkCommandLine([
                         "xcstringstool", "compile",
                         "--output-directory", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build",
-                        "/tmp/Test/Project/Sources/Localizable.xcstrings" // input file
+                        "/tmp/Test/Project/Sources/Localizable.xcstrings",  // input file
                     ])
                 }
 
-
                 // Then we need the standard CopyStringsFile tasks to have the compiled .strings/dict as input.
                 results.checkTask(.matchTarget(target), .matchRule(["CopyStringsFile", "/tmp/Test/Project/build/Debug/MyFramework.framework/Versions/A/Resources/en.lproj/Localizable.strings", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/en.lproj/Localizable.strings"])) { _ in }
                 results.checkTask(.matchTarget(target), .matchRule(["CopyStringsFile", "/tmp/Test/Project/build/Debug/MyFramework.framework/Versions/A/Resources/en.lproj/Localizable.stringsdict", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/en.lproj/Localizable.stringsdict"])) { _ in }
@@ -478,29 +517,38 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                 children: [
                     TestFile("MyFramework.swift"),
                     TestFile("Localizable.xcstrings"),
-                    TestVariantGroup("CustomTable.strings", children: [
-                        TestFile("en.lproj/CustomTable.strings", regionVariantName: "en"),
-                        TestFile("de.lproj/CustomTable.strings", regionVariantName: "de"),
-                    ]),
+                    TestVariantGroup(
+                        "CustomTable.strings",
+                        children: [
+                            TestFile("en.lproj/CustomTable.strings", regionVariantName: "en"),
+                            TestFile("de.lproj/CustomTable.strings", regionVariantName: "de"),
+                        ]
+                    ),
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "STRING_CATALOG_GENERATE_SYMBOLS": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "STRING_CATALOG_GENERATE_SYMBOLS": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -508,8 +556,8 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings",
-                            "CustomTable.strings"
-                        ])
+                            "CustomTable.strings",
+                        ]),
                     ]
                 )
             ],
@@ -517,12 +565,15 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
         )
 
         // Pretend our xcstrings files contain English and German strings, without variation.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [
-            "/tmp/Test/Project/Sources/Localizable.xcstrings" : [
-                "en.lproj/Localizable.strings",
-                "de.lproj/Localizable.strings",
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Localizable.xcstrings": [
+                    "en.lproj/Localizable.strings",
+                    "de.lproj/Localizable.strings",
+                ]
             ],
-        ], requiredCommandLine: nil)
+            requiredCommandLine: nil
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -562,22 +613,28 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "STRING_CATALOG_GENERATE_SYMBOLS": "YES"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "STRING_CATALOG_GENERATE_SYMBOLS": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestHeadersBuildPhase([
@@ -588,7 +645,7 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
             ],
@@ -597,17 +654,22 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
 
         // Mock xcstringstool since it will be called for --dry-run.
         // Pretend our xcstrings file contains English and German strings, and that they have variations.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [ "/tmp/Test/Project/Sources/Localizable.xcstrings" : [ // input
-            "en.lproj/Localizable.strings",
-            "en.lproj/Localizable.stringsdict",
-            "de.lproj/Localizable.strings",
-            "de.lproj/Localizable.stringsdict",
-        ]], requiredCommandLine: [
-            "xcstringstool", "compile",
-            "--dry-run",
-            "--output-directory", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build",
-            "/tmp/Test/Project/Sources/Localizable.xcstrings" // input file
-        ])
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Localizable.xcstrings": [  // input
+                    "en.lproj/Localizable.strings",
+                    "en.lproj/Localizable.stringsdict",
+                    "de.lproj/Localizable.strings",
+                    "de.lproj/Localizable.stringsdict",
+                ]
+            ],
+            requiredCommandLine: [
+                "xcstringstool", "compile",
+                "--dry-run",
+                "--output-directory", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build",
+                "/tmp/Test/Project/Sources/Localizable.xcstrings",  // input file
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -624,7 +686,6 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                 // We need a task to compile the XCStrings into .strings and .stringsdict files.
                 results.checkTask(.matchTarget(target), .matchRule(["CompileXCStrings", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/", "/tmp/Test/Project/Sources/Localizable.xcstrings"])) { _ in }
 
-
                 // Then we need the standard CopyStringsFile tasks to have the compiled .strings/dict as input.
                 results.checkTask(.matchTarget(target), .matchRule(["CopyStringsFile", "/tmp/Test/Project/build/Debug/MyFramework.framework/Versions/A/Resources/en.lproj/Localizable.strings", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/en.lproj/Localizable.strings"])) { _ in }
                 results.checkTask(.matchTarget(target), .matchRule(["CopyStringsFile", "/tmp/Test/Project/build/Debug/MyFramework.framework/Versions/A/Resources/en.lproj/Localizable.stringsdict", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/en.lproj/Localizable.stringsdict"])) { _ in }
@@ -650,33 +711,46 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                 children: [
                     TestFile("MyFramework.swift"),
                     TestFile("Localizable.xcstrings"),
-                    TestVariantGroup("Localizable.strings", children: [
-                        TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
-                        TestFile("de.lproj/Localizable.strings", regionVariantName: "de"),
-                    ]),
+                    TestVariantGroup(
+                        "Localizable.strings",
+                        children: [
+                            TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
+                            TestFile("de.lproj/Localizable.strings", regionVariantName: "de"),
+                        ]
+                    ),
                     catalog1,
-                    TestGroup("Subdir", path: "Subdir", children: [
-                        catalog2
-                    ]),
+                    TestGroup(
+                        "Subdir",
+                        path: "Subdir",
+                        children: [
+                            catalog2
+                        ]
+                    ),
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "STRING_CATALOG_GENERATE_SYMBOLS": "YES"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "STRING_CATALOG_GENERATE_SYMBOLS": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -687,7 +761,7 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                             "Localizable.strings",
                             TestBuildFile(catalog1),
                             TestBuildFile(catalog2),
-                        ])
+                        ]),
                     ]
                 )
             ],
@@ -695,16 +769,19 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
         )
 
         // Pretend our xcstrings files contain English and German strings, without variation.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [
-            "/tmp/Test/Project/Sources/Localizable.xcstrings" : [
-                "en.lproj/Localizable.strings",
-                "de.lproj/Localizable.strings",
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Localizable.xcstrings": [
+                    "en.lproj/Localizable.strings",
+                    "de.lproj/Localizable.strings",
+                ],
+                "/tmp/Test/Project/Sources/Dupe.xcstrings": [
+                    "en.lproj/Dupe.strings",
+                    "de.lproj/Dupe.strings",
+                ],
             ],
-            "/tmp/Test/Project/Sources/Dupe.xcstrings" : [
-                "en.lproj/Dupe.strings",
-                "de.lproj/Dupe.strings",
-            ],
-        ], requiredCommandLine: nil)
+            requiredCommandLine: nil
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -730,24 +807,30 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT" : "iphoneos",
-                ])
+                        "SDKROOT": "iphoneos",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_ALLOW_INSTALL_OBJC_HEADER": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "STRING_CATALOG_GENERATE_SYMBOLS": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_ALLOW_INSTALL_OBJC_HEADER": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "STRING_CATALOG_GENERATE_SYMBOLS": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -755,7 +838,7 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
             ],
@@ -763,18 +846,23 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
         )
 
         // Pretend our xcstrings file contains English and German strings, and that they have variations.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [ "/tmp/Test/Project/Sources/Localizable.xcstrings" : [ // input
-            "en.lproj/Localizable.strings",
-            "en.lproj/Localizable.stringsdict",
-            "de.lproj/Localizable.strings",
-            "de.lproj/Localizable.stringsdict",
-        ]], requiredCommandLine: [
-            "xcstringstool", "compile",
-            "--dry-run",
-            "-l", "de", // installloc builds are language-specific
-            "--output-directory", "/tmp/Test/Project/build/Project.build/Release-iphoneos/MyFramework.build",
-            "/tmp/Test/Project/Sources/Localizable.xcstrings" // input file
-        ])
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Localizable.xcstrings": [  // input
+                    "en.lproj/Localizable.strings",
+                    "en.lproj/Localizable.stringsdict",
+                    "de.lproj/Localizable.strings",
+                    "de.lproj/Localizable.stringsdict",
+                ]
+            ],
+            requiredCommandLine: [
+                "xcstringstool", "compile",
+                "--dry-run",
+                "-l", "de",  // installloc builds are language-specific
+                "--output-directory", "/tmp/Test/Project/build/Project.build/Release-iphoneos/MyFramework.build",
+                "/tmp/Test/Project/Sources/Localizable.xcstrings",  // input file
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -788,7 +876,6 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                 // We need a task to compile the XCStrings into .strings and .stringsdict files.
                 results.checkTask(.matchTarget(target), .matchRule(["CompileXCStrings", "/tmp/Test/Project/build/Project.build/Release-iphoneos/MyFramework.build/", "/tmp/Test/Project/Sources/Localizable.xcstrings"])) { _ in }
 
-
                 // Then we need the standard CopyStringsFile tasks to have the compiled .strings/dict as input.
                 // Only the German variants should be copied.
                 results.checkTask(.matchTarget(target), .matchRule(["CopyStringsFile", "/tmp/Test/Project/build/UninstalledProducts/iphoneos/MyFramework.framework/de.lproj/Localizable.strings", "/tmp/Test/Project/build/Project.build/Release-iphoneos/MyFramework.build/de.lproj/Localizable.strings"])) { _ in }
@@ -821,32 +908,42 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT" : "iphoneos",
-                ])
+                        "SDKROOT": "iphoneos",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_ALLOW_INSTALL_OBJC_HEADER": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "STRING_CATALOG_GENERATE_SYMBOLS": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_ALLOW_INSTALL_OBJC_HEADER": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "STRING_CATALOG_GENERATE_SYMBOLS": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyFramework.swift"
                         ]),
-                        TestCopyFilesBuildPhase([
-                            "Localizable.xcstrings"
-                        ], destinationSubfolder: .resources, onlyForDeployment: false)
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Localizable.xcstrings"
+                            ],
+                            destinationSubfolder: .resources,
+                            onlyForDeployment: false
+                        ),
                     ]
                 )
             ],
@@ -854,18 +951,23 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
         )
 
         // Pretend our xcstrings file contains English and German strings, and that they have variations.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [ "/tmp/Test/Project/Sources/Localizable.xcstrings" : [ // input
-            "en.lproj/Localizable.strings",
-            "en.lproj/Localizable.stringsdict",
-            "de.lproj/Localizable.strings",
-            "de.lproj/Localizable.stringsdict",
-        ]], requiredCommandLine: [
-            "xcstringstool", "compile",
-            "--dry-run",
-            "-l", "de", // installloc builds are language-specific
-            "--output-directory", "/tmp/Test/Project/build/Project.build/Release-iphoneos/MyFramework.build",
-            "/tmp/Test/Project/Sources/Localizable.xcstrings" // input file
-        ])
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Localizable.xcstrings": [  // input
+                    "en.lproj/Localizable.strings",
+                    "en.lproj/Localizable.stringsdict",
+                    "de.lproj/Localizable.strings",
+                    "de.lproj/Localizable.stringsdict",
+                ]
+            ],
+            requiredCommandLine: [
+                "xcstringstool", "compile",
+                "--dry-run",
+                "-l", "de",  // installloc builds are language-specific
+                "--output-directory", "/tmp/Test/Project/build/Project.build/Release-iphoneos/MyFramework.build",
+                "/tmp/Test/Project/Sources/Localizable.xcstrings",  // input file
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -899,38 +1001,47 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                 path: "Sources",
                 children: [
                     TestFile("MyFramework.swift"),
-                    TestVariantGroup("View.xib", children: [
-                        TestFile("Base.lproj/View.xib", regionVariantName: "Base"),
-                        TestFile("mul.lproj/View.xcstrings", regionVariantName: "mul"), // mul is the ISO code for multi-lingual
-                    ]),
+                    TestVariantGroup(
+                        "View.xib",
+                        children: [
+                            TestFile("Base.lproj/View.xib", regionVariantName: "Base"),
+                            TestFile("mul.lproj/View.xcstrings", regionVariantName: "mul"),  // mul is the ISO code for multi-lingual
+                        ]
+                    ),
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "IBC_EXEC": ibtoolPath.str,
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "IBC_EXEC": ibtoolPath.str,
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "STRING_CATALOG_GENERATE_SYMBOLS": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "STRING_CATALOG_GENERATE_SYMBOLS": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyFramework.swift"
                         ]),
                         TestResourcesBuildPhase([
-                            "View.xib",
-                        ])
+                            "View.xib"
+                        ]),
                     ]
                 )
             ],
@@ -939,12 +1050,15 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
 
         // Pretend our xcstrings file contains French and German strings.
         // We won't have English because those are in the IB file itself and not typically overridden by xcstrings.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [
-            "/tmp/Test/Project/Sources/mul.lproj/View.xcstrings" : [
-                "fr.lproj/View.strings",
-                "de.lproj/View.strings",
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/mul.lproj/View.xcstrings": [
+                    "fr.lproj/View.strings",
+                    "de.lproj/View.strings",
+                ]
             ],
-        ], requiredCommandLine: nil)
+            requiredCommandLine: nil
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -985,22 +1099,28 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "STRING_CATALOG_GENERATE_SYMBOLS": "YES"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "STRING_CATALOG_GENERATE_SYMBOLS": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -1008,7 +1128,7 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
             ],
@@ -1016,14 +1136,19 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
         )
 
         // xcstringstool should not be called during planning since exportloc should not compile xcstrings.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [ "/tmp/Test/Project/Sources/Localizable.xcstrings" : [ // input
-            "en.lproj/Localizable.strings",
-            "en.lproj/Localizable.stringsdict",
-            "de.lproj/Localizable.strings",
-            "de.lproj/Localizable.stringsdict",
-        ]], requiredCommandLine: [
-            "don't call me"
-        ])
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Localizable.xcstrings": [  // input
+                    "en.lproj/Localizable.strings",
+                    "en.lproj/Localizable.stringsdict",
+                    "de.lproj/Localizable.strings",
+                    "de.lproj/Localizable.stringsdict",
+                ]
+            ],
+            requiredCommandLine: [
+                "don't call me"
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
         let swiftFeatures = try await self.swiftFeatures
@@ -1040,14 +1165,14 @@ fileprivate struct XCStringsSymbolGenTests: CoreBasedTests {
 
                     // Output is .swift file.
                     task.checkOutputs([
-                        .path("/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/DerivedSources/GeneratedStringSymbols_Localizable.swift"),
+                        .path("/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/DerivedSources/GeneratedStringSymbols_Localizable.swift")
                     ])
 
                     task.checkCommandLine([
                         "xcstringstool", "generate-symbols",
                         "--language", "swift",
                         "--output-directory", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/DerivedSources",
-                        "/tmp/Test/Project/Sources/Localizable.xcstrings" // input file
+                        "/tmp/Test/Project/Sources/Localizable.xcstrings",  // input file
                     ])
                 }
 
diff --git a/Tests/SWBTaskConstructionTests/XCStringsTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/XCStringsTaskConstructionTests.swift
index d1af5e84..70fab481 100644
--- a/Tests/SWBTaskConstructionTests/XCStringsTaskConstructionTests.swift
+++ b/Tests/SWBTaskConstructionTests/XCStringsTaskConstructionTests.swift
@@ -27,12 +27,12 @@ final class MockXCStringsTool: MockTestTaskPlanningClientDelegate, @unchecked Se
     let relativeOutputFilePaths: [String: [String]]
     let requiredCommandLine: [String]?
 
-    init(relativeOutputFilePaths: [String : [String]], requiredCommandLine: [String]?) {
+    init(relativeOutputFilePaths: [String: [String]], requiredCommandLine: [String]?) {
         self.relativeOutputFilePaths = relativeOutputFilePaths
         self.requiredCommandLine = requiredCommandLine
     }
 
-    override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+    override func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
         switch commandLine.first.map(Path.init)?.basename {
         case "xcstringstool":
             break
@@ -64,13 +64,14 @@ final class MockXCStringsTool: MockTestTaskPlanningClientDelegate, @unchecked Se
         }
 
         // Create full list of output paths.
-        var outputPaths = relativeOutputFilePaths[inputPath.str]?.map { relativePath in
-            return outputDir.join(relativePath)
-        } ?? []
+        var outputPaths =
+            relativeOutputFilePaths[inputPath.str]?.map { relativePath in
+                return outputDir.join(relativePath)
+            } ?? []
 
         // Grab requested languages from command line.
         var requestedLangs = Set<String>()
-        var cmdLine = commandLine[commandLine.startIndex...] // Create Array Slice
+        var cmdLine = commandLine[commandLine.startIndex...]  // Create Array Slice
         while let index = cmdLine.firstIndex(of: "-l"), cmdLine.indices.contains(index + 1) {
             let lang = cmdLine[index + 1]
             let (inserted, _) = requestedLangs.insert(lang)
@@ -108,28 +109,37 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 path: "Sources",
                 children: [
                     TestFile("MyFramework.swift"),
-                    TestVariantGroup("Localizable.strings", children: [
-                        TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
-                        TestFile("de.lproj/Localizable.strings", regionVariantName: "de"),
-                    ]),
+                    TestVariantGroup(
+                        "Localizable.strings",
+                        children: [
+                            TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
+                            TestFile("de.lproj/Localizable.strings", regionVariantName: "de"),
+                        ]
+                    ),
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -137,7 +147,7 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.strings"
-                        ])
+                        ]),
                     ]
                 )
             ],
@@ -168,25 +178,31 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 path: "Sources",
                 children: [
                     TestFile("MyFramework.swift"),
-                    TestFile("Localizable.xcstrings"), // Note: xcstrings don't belong in lprojs / variant groups.
+                    TestFile("Localizable.xcstrings"),  // Note: xcstrings don't belong in lprojs / variant groups.
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -194,7 +210,7 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
             ],
@@ -202,17 +218,22 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
         )
 
         // Pretend our xcstrings file contains English and German strings, and that they have variations.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [ "/tmp/Test/Project/Sources/Localizable.xcstrings" : [ // input
-            "en.lproj/Localizable.strings",
-            "en.lproj/Localizable.stringsdict",
-            "de.lproj/Localizable.strings",
-            "de.lproj/Localizable.stringsdict",
-                                                                                                                             ]], requiredCommandLine: [
-                                                                                                                                "xcstringstool", "compile",
-                                                                                                                                "--dry-run",
-                                                                                                                                "--output-directory", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build",
-                                                                                                                                "/tmp/Test/Project/Sources/Localizable.xcstrings" // input file
-                                                                                                                             ])
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Localizable.xcstrings": [  // input
+                    "en.lproj/Localizable.strings",
+                    "en.lproj/Localizable.stringsdict",
+                    "de.lproj/Localizable.strings",
+                    "de.lproj/Localizable.stringsdict",
+                ]
+            ],
+            requiredCommandLine: [
+                "xcstringstool", "compile",
+                "--dry-run",
+                "--output-directory", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build",
+                "/tmp/Test/Project/Sources/Localizable.xcstrings",  // input file
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -240,11 +261,10 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                     task.checkCommandLine([
                         "xcstringstool", "compile",
                         "--output-directory", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build",
-                        "/tmp/Test/Project/Sources/Localizable.xcstrings" // input file
+                        "/tmp/Test/Project/Sources/Localizable.xcstrings",  // input file
                     ])
                 }
 
-
                 // Then we need the standard CopyStringsFile tasks to have the compiled .strings/dict as input.
                 results.checkTask(.matchTarget(target), .matchRule(["CopyStringsFile", "/tmp/Test/Project/build/Debug/MyFramework.framework/Versions/A/Resources/en.lproj/Localizable.strings", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/en.lproj/Localizable.strings"])) { _ in }
                 results.checkTask(.matchTarget(target), .matchRule(["CopyStringsFile", "/tmp/Test/Project/build/Debug/MyFramework.framework/Versions/A/Resources/en.lproj/Localizable.stringsdict", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/en.lproj/Localizable.stringsdict"])) { _ in }
@@ -268,25 +288,31 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 path: "Sources",
                 children: [
                     TestFile("MyFramework.swift"),
-                    TestFile("Localizable.xcstrings"), // Note: In this test we pretend this file doesn't contain any strings that need built.
+                    TestFile("Localizable.xcstrings"),  // Note: In this test we pretend this file doesn't contain any strings that need built.
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -294,7 +320,7 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
             ],
@@ -302,12 +328,15 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
         )
 
         // Pretend our xcstrings file doesn't contain any strings needing to be built.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [ "/tmp/Test/Project/Sources/Localizable.xcstrings" : []], requiredCommandLine: [
-            "xcstringstool", "compile",
-            "--dry-run",
-            "--output-directory", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build",
-            "/tmp/Test/Project/Sources/Localizable.xcstrings" // input file
-        ])
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: ["/tmp/Test/Project/Sources/Localizable.xcstrings": []],
+            requiredCommandLine: [
+                "xcstringstool", "compile",
+                "--dry-run",
+                "--output-directory", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build",
+                "/tmp/Test/Project/Sources/Localizable.xcstrings",  // input file
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -336,25 +365,31 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 path: "Sources",
                 children: [
                     TestFile("MyFramework.swift"),
-                    TestFile("Localizable.xcstrings"), // Note: In this test we pretend this file doesn't contain any strings that need built.
+                    TestFile("Localizable.xcstrings"),  // Note: In this test we pretend this file doesn't contain any strings that need built.
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -362,19 +397,22 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 ),
                 TestStandardTarget(
                     "MyFramework_Clone",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -382,15 +420,15 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
-                )
+                ),
             ],
             developmentRegion: "en"
         )
 
         // Pretend our xcstrings file doesn't contain any strings needing to be built.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [ "/tmp/Test/Project/Sources/Localizable.xcstrings" : []], requiredCommandLine: nil)
+        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: ["/tmp/Test/Project/Sources/Localizable.xcstrings": []], requiredCommandLine: nil)
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -416,33 +454,43 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 path: "Sources",
                 children: [
                     TestFile("MyFramework.swift"),
-                    TestFile("Localizable.xcstrings"), // Note: xcstrings don't belong in lprojs / variant groups.
+                    TestFile("Localizable.xcstrings"),  // Note: xcstrings don't belong in lprojs / variant groups.
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyFramework.swift"
                         ]),
-                        TestCopyFilesBuildPhase([
-                            "Localizable.xcstrings",
-                        ], destinationSubfolder: .resources, onlyForDeployment: false)
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Localizable.xcstrings"
+                            ],
+                            destinationSubfolder: .resources,
+                            onlyForDeployment: false
+                        ),
                     ]
                 )
             ],
@@ -483,21 +531,27 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -505,8 +559,8 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings",
-                            "CustomTable.xcstrings"
-                        ])
+                            "CustomTable.xcstrings",
+                        ]),
                     ]
                 )
             ],
@@ -514,16 +568,19 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
         )
 
         // Pretend our xcstrings files contain English and German strings, without variation.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [
-            "/tmp/Test/Project/Sources/Localizable.xcstrings" : [
-                "en.lproj/Localizable.strings",
-                "de.lproj/Localizable.strings",
-            ],
-            "/tmp/Test/Project/Sources/CustomTable.xcstrings" : [
-                "en.lproj/CustomTable.strings",
-                "de.lproj/CustomTable.strings",
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Localizable.xcstrings": [
+                    "en.lproj/Localizable.strings",
+                    "de.lproj/Localizable.strings",
+                ],
+                "/tmp/Test/Project/Sources/CustomTable.xcstrings": [
+                    "en.lproj/CustomTable.strings",
+                    "de.lproj/CustomTable.strings",
+                ],
             ],
-        ], requiredCommandLine: nil)
+            requiredCommandLine: nil
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -556,28 +613,37 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("MyFramework.swift"),
                     TestFile("Localizable.xcstrings"),
-                    TestVariantGroup("CustomTable.strings", children: [
-                        TestFile("en.lproj/CustomTable.strings", regionVariantName: "en"),
-                        TestFile("de.lproj/CustomTable.strings", regionVariantName: "de"),
-                    ]),
+                    TestVariantGroup(
+                        "CustomTable.strings",
+                        children: [
+                            TestFile("en.lproj/CustomTable.strings", regionVariantName: "en"),
+                            TestFile("de.lproj/CustomTable.strings", regionVariantName: "de"),
+                        ]
+                    ),
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -585,8 +651,8 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings",
-                            "CustomTable.strings"
-                        ])
+                            "CustomTable.strings",
+                        ]),
                     ]
                 )
             ],
@@ -594,12 +660,15 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
         )
 
         // Pretend our xcstrings files contain English and German strings, without variation.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [
-            "/tmp/Test/Project/Sources/Localizable.xcstrings" : [
-                "en.lproj/Localizable.strings",
-                "de.lproj/Localizable.strings",
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Localizable.xcstrings": [
+                    "en.lproj/Localizable.strings",
+                    "de.lproj/Localizable.strings",
+                ]
             ],
-        ], requiredCommandLine: nil)
+            requiredCommandLine: nil
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -632,28 +701,37 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("MyFramework.swift"),
                     TestFile("Localizable.xcstrings"),
-                    TestVariantGroup("Localizable.strings", children: [
-                        TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
-                        TestFile("de.lproj/Localizable.strings", regionVariantName: "de"),
-                    ]),
+                    TestVariantGroup(
+                        "Localizable.strings",
+                        children: [
+                            TestFile("en.lproj/Localizable.strings", regionVariantName: "en"),
+                            TestFile("de.lproj/Localizable.strings", regionVariantName: "de"),
+                        ]
+                    ),
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -661,8 +739,8 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings",
-                            "Localizable.strings"
-                        ])
+                            "Localizable.strings",
+                        ]),
                     ]
                 )
             ],
@@ -670,12 +748,15 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
         )
 
         // Pretend our xcstrings files contain English and German strings, without variation.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [
-            "/tmp/Test/Project/Sources/Localizable.xcstrings" : [
-                "en.lproj/Localizable.strings",
-                "de.lproj/Localizable.strings",
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Localizable.xcstrings": [
+                    "en.lproj/Localizable.strings",
+                    "de.lproj/Localizable.strings",
+                ]
             ],
-        ], requiredCommandLine: nil)
+            requiredCommandLine: nil
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -700,28 +781,38 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("MyFramework.swift"),
                     catalog1,
-                    TestGroup("Subdir", path: "Subdir", children: [
-                        catalog2
-                    ]),
-                    TestFile("Other.xcstrings")
+                    TestGroup(
+                        "Subdir",
+                        path: "Subdir",
+                        children: [
+                            catalog2
+                        ]
+                    ),
+                    TestFile("Other.xcstrings"),
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -731,7 +822,7 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                             "Other.xcstrings",
                             TestBuildFile(catalog1),
                             TestBuildFile(catalog2),
-                        ])
+                        ]),
                     ]
                 )
             ],
@@ -739,20 +830,23 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
         )
 
         // Pretend our xcstrings files contain English and German strings, without variation.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [
-            "/tmp/Test/Project/Sources/Localizable.xcstrings" : [
-                "en.lproj/Localizable.strings",
-                "de.lproj/Localizable.strings",
-            ],
-            "/tmp/Test/Project/Sources/Subdir/Localizable.xcstrings" : [
-                "en.lproj/Localizable.strings",
-                "de.lproj/Localizable.strings",
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Localizable.xcstrings": [
+                    "en.lproj/Localizable.strings",
+                    "de.lproj/Localizable.strings",
+                ],
+                "/tmp/Test/Project/Sources/Subdir/Localizable.xcstrings": [
+                    "en.lproj/Localizable.strings",
+                    "de.lproj/Localizable.strings",
+                ],
+                "/tmp/Test/Project/Sources/Other.xcstrings": [
+                    "en.lproj/Other.strings",
+                    "de.lproj/Other.strings",
+                ],
             ],
-            "/tmp/Test/Project/Sources/Other.xcstrings" : [
-                "en.lproj/Other.strings",
-                "de.lproj/Other.strings",
-            ],
-        ], requiredCommandLine: nil)
+            requiredCommandLine: nil
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -774,77 +868,97 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 "ProjectSources",
                 path: "Sources",
                 children: [
-                    TestGroup("Target1", path: "Target1", children: [
-                        TestFile("Target1.swift"),
-                        catalog1,
-                    ]),
-                    TestGroup("Target2", path: "Target2", children: [
-                        TestFile("Target2.swift"),
-                        catalog2,
-                    ])
+                    TestGroup(
+                        "Target1",
+                        path: "Target1",
+                        children: [
+                            TestFile("Target1.swift"),
+                            catalog1,
+                        ]
+                    ),
+                    TestGroup(
+                        "Target2",
+                        path: "Target2",
+                        children: [
+                            TestFile("Target2.swift"),
+                            catalog2,
+                        ]
+                    ),
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "Target1",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "Target1.swift"
                         ]),
                         TestResourcesBuildPhase([
-                            TestBuildFile(catalog1),
-                        ])
+                            TestBuildFile(catalog1)
+                        ]),
                     ]
                 ),
                 TestStandardTarget(
                     "Target2",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "Target2.swift"
                         ]),
                         TestResourcesBuildPhase([
-                            TestBuildFile(catalog2),
-                        ])
+                            TestBuildFile(catalog2)
+                        ]),
                     ]
-                )
+                ),
             ],
             developmentRegion: "en"
         )
 
         // Pretend our xcstrings files contain English and German strings, without variation.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [
-            "/tmp/Test/Project/Sources/Target1/Localizable.xcstrings" : [
-                "en.lproj/Localizable.strings",
-                "de.lproj/Localizable.strings",
-            ],
-            "/tmp/Test/Project/Sources/Target2/Localizable.xcstrings" : [
-                "en.lproj/Localizable.strings",
-                "de.lproj/Localizable.strings",
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Target1/Localizable.xcstrings": [
+                    "en.lproj/Localizable.strings",
+                    "de.lproj/Localizable.strings",
+                ],
+                "/tmp/Test/Project/Sources/Target2/Localizable.xcstrings": [
+                    "en.lproj/Localizable.strings",
+                    "de.lproj/Localizable.strings",
+                ],
             ],
-        ], requiredCommandLine: nil)
+            requiredCommandLine: nil
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -883,29 +997,35 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyFramework.swift"
                         ]),
                         TestResourcesBuildPhase([
-                            TestBuildFile(catalog),
-                        ])
+                            TestBuildFile(catalog)
+                        ]),
                     ]
                 )
             ],
@@ -913,12 +1033,15 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
         )
 
         // Pretend our xcstrings file contains English and German strings, without variation.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [
-            "/tmp/Test/Project/Sources/en.lproj/Localizable.xcstrings" : [
-                "en.lproj/Localizable.strings",
-                "de.lproj/Localizable.strings",
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/en.lproj/Localizable.xcstrings": [
+                    "en.lproj/Localizable.strings",
+                    "de.lproj/Localizable.strings",
+                ]
             ],
-        ], requiredCommandLine: nil)
+            requiredCommandLine: nil
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -938,27 +1061,33 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 path: "Sources",
                 children: [
                     TestFile("MyFramework.swift"),
-                    TestFile("Localizable.xcstrings"), // Note: xcstrings don't belong in lprojs / variant groups.
+                    TestFile("Localizable.xcstrings"),  // Note: xcstrings don't belong in lprojs / variant groups.
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SDKROOT" : "iphoneos",
-                ])
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SDKROOT": "iphoneos",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_ALLOW_INSTALL_OBJC_HEADER": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_ALLOW_INSTALL_OBJC_HEADER": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -966,7 +1095,7 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
             ],
@@ -974,18 +1103,23 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
         )
 
         // Pretend our xcstrings file contains English and German strings, and that they have variations.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [ "/tmp/Test/Project/Sources/Localizable.xcstrings" : [ // input
-            "en.lproj/Localizable.strings",
-            "en.lproj/Localizable.stringsdict",
-            "de.lproj/Localizable.strings",
-            "de.lproj/Localizable.stringsdict",
-                                                                                                                             ]], requiredCommandLine: [
-                                                                                                                                "xcstringstool", "compile",
-                                                                                                                                "--dry-run",
-                                                                                                                                "-l", "de", // installloc builds are language-specific
-                                                                                                                                "--output-directory", "/tmp/Test/Project/build/Project.build/Release-iphoneos/MyFramework.build",
-                                                                                                                                "/tmp/Test/Project/Sources/Localizable.xcstrings" // input file
-                                                                                                                             ])
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Localizable.xcstrings": [  // input
+                    "en.lproj/Localizable.strings",
+                    "en.lproj/Localizable.stringsdict",
+                    "de.lproj/Localizable.strings",
+                    "de.lproj/Localizable.stringsdict",
+                ]
+            ],
+            requiredCommandLine: [
+                "xcstringstool", "compile",
+                "--dry-run",
+                "-l", "de",  // installloc builds are language-specific
+                "--output-directory", "/tmp/Test/Project/build/Project.build/Release-iphoneos/MyFramework.build",
+                "/tmp/Test/Project/Sources/Localizable.xcstrings",  // input file
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -999,7 +1133,6 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 // There should be a CompileXCStrings rule.
                 results.checkTask(.matchTarget(target), .matchRule(["CompileXCStrings", "/tmp/Test/Project/build/Project.build/Release-iphoneos/MyFramework.build/", "/tmp/Test/Project/Sources/Localizable.xcstrings"])) { _ in }
 
-
                 // Then we need the standard CopyStringsFile tasks to have the compiled .strings/dict as input.
                 // Only the German variants should be copied.
                 results.checkTask(.matchTarget(target), .matchRule(["CopyStringsFile", "/tmp/Test/Project/build/UninstalledProducts/iphoneos/MyFramework.framework/de.lproj/Localizable.strings", "/tmp/Test/Project/build/Project.build/Release-iphoneos/MyFramework.build/de.lproj/Localizable.strings"])) { _ in }
@@ -1027,27 +1160,33 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 path: "Sources",
                 children: [
                     TestFile("MyFramework.swift"),
-                    TestFile("Localizable.xcstrings"), // Note: xcstrings don't belong in lprojs / variant groups.
+                    TestFile("Localizable.xcstrings"),  // Note: xcstrings don't belong in lprojs / variant groups.
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SDKROOT" : "iphoneos",
-                ])
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SDKROOT": "iphoneos",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_ALLOW_INSTALL_OBJC_HEADER": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_ALLOW_INSTALL_OBJC_HEADER": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -1055,7 +1194,7 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
             ],
@@ -1063,21 +1202,26 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
         )
 
         // Pretend our xcstrings file contains English, German, and Japanese strings, and that they have variations.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [ "/tmp/Test/Project/Sources/Localizable.xcstrings" : [ // input
-            "en.lproj/Localizable.strings",
-            "en.lproj/Localizable.stringsdict",
-            "de.lproj/Localizable.strings",
-            "de.lproj/Localizable.stringsdict",
-            "ja.lproj/Localizable.strings",
-            "ja.lproj/Localizable.stringsdict",
-                                                                                                                             ]], requiredCommandLine: [
-                                                                                                                                "xcstringstool", "compile",
-                                                                                                                                "--dry-run",
-                                                                                                                                "-l", "de",
-                                                                                                                                "-l", "ja",
-                                                                                                                                "--output-directory", "/tmp/Test/Project/build/Project.build/Release-iphoneos/MyFramework.build",
-                                                                                                                                "/tmp/Test/Project/Sources/Localizable.xcstrings" // input file
-                                                                                                                             ])
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Localizable.xcstrings": [  // input
+                    "en.lproj/Localizable.strings",
+                    "en.lproj/Localizable.stringsdict",
+                    "de.lproj/Localizable.strings",
+                    "de.lproj/Localizable.stringsdict",
+                    "ja.lproj/Localizable.strings",
+                    "ja.lproj/Localizable.stringsdict",
+                ]
+            ],
+            requiredCommandLine: [
+                "xcstringstool", "compile",
+                "--dry-run",
+                "-l", "de",
+                "-l", "ja",
+                "--output-directory", "/tmp/Test/Project/build/Project.build/Release-iphoneos/MyFramework.build",
+                "/tmp/Test/Project/Sources/Localizable.xcstrings",  // input file
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -1091,7 +1235,6 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 // There should be a CompileXCStrings rule.
                 results.checkTask(.matchTarget(target), .matchRule(["CompileXCStrings", "/tmp/Test/Project/build/Project.build/Release-iphoneos/MyFramework.build/", "/tmp/Test/Project/Sources/Localizable.xcstrings"])) { _ in }
 
-
                 // Then we need the standard CopyStringsFile tasks to have the compiled .strings/dict as input.
                 // English variants should not be copied.
                 results.checkTask(.matchTarget(target), .matchRule(["CopyStringsFile", "/tmp/Test/Project/build/UninstalledProducts/iphoneos/MyFramework.framework/de.lproj/Localizable.strings", "/tmp/Test/Project/build/Project.build/Release-iphoneos/MyFramework.build/de.lproj/Localizable.strings"])) { _ in }
@@ -1122,35 +1265,45 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 path: "Sources",
                 children: [
                     TestFile("MyFramework.swift"),
-                    TestFile("Localizable.xcstrings"), // Note: xcstrings don't belong in lprojs / variant groups.
+                    TestFile("Localizable.xcstrings"),  // Note: xcstrings don't belong in lprojs / variant groups.
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                    "SDKROOT" : "iphoneos",
-                ])
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                        "SDKROOT": "iphoneos",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_ALLOW_INSTALL_OBJC_HEADER": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_ALLOW_INSTALL_OBJC_HEADER": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyFramework.swift"
                         ]),
-                        TestCopyFilesBuildPhase([
-                            "Localizable.xcstrings"
-                        ], destinationSubfolder: .resources, onlyForDeployment: false)
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Localizable.xcstrings"
+                            ],
+                            destinationSubfolder: .resources,
+                            onlyForDeployment: false
+                        ),
                     ]
                 )
             ],
@@ -1158,18 +1311,23 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
         )
 
         // Pretend our xcstrings file contains English and German strings, and that they have variations.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [ "/tmp/Test/Project/Sources/Localizable.xcstrings" : [ // input
-            "en.lproj/Localizable.strings",
-            "en.lproj/Localizable.stringsdict",
-            "de.lproj/Localizable.strings",
-            "de.lproj/Localizable.stringsdict",
-                                                                                                                             ]], requiredCommandLine: [
-                                                                                                                                "xcstringstool", "compile",
-                                                                                                                                "--dry-run",
-                                                                                                                                "-l", "de", // installloc builds are language-specific
-                                                                                                                                "--output-directory", "/tmp/Test/Project/build/Project.build/Release-iphoneos/MyFramework.build",
-                                                                                                                                "/tmp/Test/Project/Sources/Localizable.xcstrings" // input file
-                                                                                                                             ])
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Localizable.xcstrings": [  // input
+                    "en.lproj/Localizable.strings",
+                    "en.lproj/Localizable.stringsdict",
+                    "de.lproj/Localizable.strings",
+                    "de.lproj/Localizable.stringsdict",
+                ]
+            ],
+            requiredCommandLine: [
+                "xcstringstool", "compile",
+                "--dry-run",
+                "-l", "de",  // installloc builds are language-specific
+                "--output-directory", "/tmp/Test/Project/build/Project.build/Release-iphoneos/MyFramework.build",
+                "/tmp/Test/Project/Sources/Localizable.xcstrings",  // input file
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -1207,21 +1365,27 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -1229,7 +1393,7 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
             ],
@@ -1237,14 +1401,19 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
         )
 
         // xcstringstool should not be called during planning since exportloc should not compile xcstrings.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [ "/tmp/Test/Project/Sources/Localizable.xcstrings" : [ // input
-            "en.lproj/Localizable.strings",
-            "en.lproj/Localizable.stringsdict",
-            "de.lproj/Localizable.strings",
-            "de.lproj/Localizable.stringsdict",
-        ]], requiredCommandLine: [
-            "don't call me"
-        ])
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Localizable.xcstrings": [  // input
+                    "en.lproj/Localizable.strings",
+                    "en.lproj/Localizable.stringsdict",
+                    "de.lproj/Localizable.strings",
+                    "de.lproj/Localizable.stringsdict",
+                ]
+            ],
+            requiredCommandLine: [
+                "don't call me"
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -1272,22 +1441,28 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "XCSTRINGS_FORCE_BUILD_ALL_STRINGS": "YES"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "XCSTRINGS_FORCE_BUILD_ALL_STRINGS": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -1295,7 +1470,7 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
             ],
@@ -1303,18 +1478,23 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
         )
 
         // Pretend our xcstrings file contains English and German strings, and that they have variations.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [ "/tmp/Test/Project/Sources/Localizable.xcstrings" : [ // input
-            "en.lproj/Localizable.strings",
-            "en.lproj/Localizable.stringsdict",
-            "de.lproj/Localizable.strings",
-            "de.lproj/Localizable.stringsdict",
-                                                                                                                             ]], requiredCommandLine: [
-                                                                                                                                "xcstringstool", "compile",
-                                                                                                                                "--dry-run",
-                                                                                                                                "--force-build-all-strings",
-                                                                                                                                "--output-directory", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build",
-                                                                                                                                "/tmp/Test/Project/Sources/Localizable.xcstrings" // input file
-                                                                                                                             ])
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/Localizable.xcstrings": [  // input
+                    "en.lproj/Localizable.strings",
+                    "en.lproj/Localizable.stringsdict",
+                    "de.lproj/Localizable.strings",
+                    "de.lproj/Localizable.stringsdict",
+                ]
+            ],
+            requiredCommandLine: [
+                "xcstringstool", "compile",
+                "--dry-run",
+                "--force-build-all-strings",
+                "--output-directory", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build",
+                "/tmp/Test/Project/Sources/Localizable.xcstrings",  // input file
+            ]
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -1343,11 +1523,10 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                         "xcstringstool", "compile",
                         "--force-build-all-strings",
                         "--output-directory", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build",
-                        "/tmp/Test/Project/Sources/Localizable.xcstrings" // input file
+                        "/tmp/Test/Project/Sources/Localizable.xcstrings",  // input file
                     ])
                 }
 
-
                 // Then we need the standard CopyStringsFile tasks to have the compiled .strings/dict as input.
                 results.checkTask(.matchTarget(target), .matchRule(["CopyStringsFile", "/tmp/Test/Project/build/Debug/MyFramework.framework/Versions/A/Resources/en.lproj/Localizable.strings", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/en.lproj/Localizable.strings"])) { _ in }
                 results.checkTask(.matchTarget(target), .matchRule(["CopyStringsFile", "/tmp/Test/Project/build/Debug/MyFramework.framework/Versions/A/Resources/en.lproj/Localizable.stringsdict", "/tmp/Test/Project/build/Project.build/Debug/MyFramework.build/en.lproj/Localizable.stringsdict"])) { _ in }
@@ -1369,42 +1548,60 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 path: "Sources",
                 children: [
                     TestFile("MyFramework.swift"),
-                    TestVariantGroup("LegacyView.xib", children: [
-                        TestFile("Base.lproj/LegacyView.xib", regionVariantName: "Base"),
-                        TestFile("fr.lproj/LegacyView.strings", regionVariantName: "fr"),
-                        TestFile("de.lproj/LegacyView.strings", regionVariantName: "de"),
-                    ]),
-                    TestVariantGroup("View.xib", children: [
-                        TestFile("Base.lproj/View.xib", regionVariantName: "Base"),
-                        TestFile("mul.lproj/View.xcstrings", regionVariantName: "mul"), // mul is the ISO code for multi-lingual
-                    ]),
-                    TestVariantGroup("OtherView.nib", children: [
-                        TestFile("Base.lproj/OtherView.nib", regionVariantName: "Base"),
-                        TestFile("mul.lproj/OtherView.xcstrings", regionVariantName: "mul"),
-                    ]),
-                    TestVariantGroup("Main.storyboard", children: [
-                        TestFile("Base.lproj/Main.storyboard", regionVariantName: "Base"),
-                        TestFile("mul.lproj/Main.xcstrings", regionVariantName: "mul"),
-                    ])
+                    TestVariantGroup(
+                        "LegacyView.xib",
+                        children: [
+                            TestFile("Base.lproj/LegacyView.xib", regionVariantName: "Base"),
+                            TestFile("fr.lproj/LegacyView.strings", regionVariantName: "fr"),
+                            TestFile("de.lproj/LegacyView.strings", regionVariantName: "de"),
+                        ]
+                    ),
+                    TestVariantGroup(
+                        "View.xib",
+                        children: [
+                            TestFile("Base.lproj/View.xib", regionVariantName: "Base"),
+                            TestFile("mul.lproj/View.xcstrings", regionVariantName: "mul"),  // mul is the ISO code for multi-lingual
+                        ]
+                    ),
+                    TestVariantGroup(
+                        "OtherView.nib",
+                        children: [
+                            TestFile("Base.lproj/OtherView.nib", regionVariantName: "Base"),
+                            TestFile("mul.lproj/OtherView.xcstrings", regionVariantName: "mul"),
+                        ]
+                    ),
+                    TestVariantGroup(
+                        "Main.storyboard",
+                        children: [
+                            TestFile("Base.lproj/Main.storyboard", regionVariantName: "Base"),
+                            TestFile("mul.lproj/Main.xcstrings", regionVariantName: "mul"),
+                        ]
+                    ),
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "IBC_EXEC": ibtoolPath.str,
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "IBC_EXEC": ibtoolPath.str,
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -1415,7 +1612,7 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                             "View.xib",
                             "OtherView.nib",
                             "Main.storyboard",
-                        ])
+                        ]),
                     ]
                 )
             ],
@@ -1424,20 +1621,23 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
 
         // Pretend our xcstrings file contains French and German strings.
         // We won't have English because those are in the IB file itself and not typically overridden by xcstrings.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [
-            "/tmp/Test/Project/Sources/mul.lproj/View.xcstrings" : [
-                "fr.lproj/View.strings",
-                "de.lproj/View.strings",
-            ],
-            "/tmp/Test/Project/Sources/mul.lproj/OtherView.xcstrings" : [
-                "fr.lproj/OtherView.strings",
-                "de.lproj/OtherView.strings",
-            ],
-            "/tmp/Test/Project/Sources/mul.lproj/Main.xcstrings" : [
-                "fr.lproj/Main.strings",
-                "de.lproj/Main.strings",
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/mul.lproj/View.xcstrings": [
+                    "fr.lproj/View.strings",
+                    "de.lproj/View.strings",
+                ],
+                "/tmp/Test/Project/Sources/mul.lproj/OtherView.xcstrings": [
+                    "fr.lproj/OtherView.strings",
+                    "de.lproj/OtherView.strings",
+                ],
+                "/tmp/Test/Project/Sources/mul.lproj/Main.xcstrings": [
+                    "fr.lproj/Main.strings",
+                    "de.lproj/Main.strings",
+                ],
             ],
-        ], requiredCommandLine: nil)
+            requiredCommandLine: nil
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -1485,41 +1685,59 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 path: "Sources",
                 children: [
                     TestFile("MyFramework.swift"),
-                    TestVariantGroup("LegacyView.xib", children: [
-                        TestFile("Base.lproj/LegacyView.xib", regionVariantName: "Base"),
-                        TestFile("fr.lproj/LegacyView.strings", regionVariantName: "fr"),
-                        TestFile("de.lproj/LegacyView.strings", regionVariantName: "de"),
-                    ]),
-                    TestVariantGroup("View.xib", children: [
-                        TestFile("Base.lproj/View.xib", regionVariantName: "Base"),
-                        TestFile("mul.lproj/View.xcstrings", regionVariantName: "mul"), // mul is the ISO code for multi-lingual
-                    ]),
-                    TestVariantGroup("OtherView.nib", children: [
-                        TestFile("Base.lproj/OtherView.nib", regionVariantName: "Base"),
-                        TestFile("mul.lproj/OtherView.xcstrings", regionVariantName: "mul"),
-                    ]),
-                    TestVariantGroup("Main.storyboard", children: [
-                        TestFile("Base.lproj/Main.storyboard", regionVariantName: "Base"),
-                        TestFile("mul.lproj/Main.xcstrings", regionVariantName: "mul"),
-                    ])
+                    TestVariantGroup(
+                        "LegacyView.xib",
+                        children: [
+                            TestFile("Base.lproj/LegacyView.xib", regionVariantName: "Base"),
+                            TestFile("fr.lproj/LegacyView.strings", regionVariantName: "fr"),
+                            TestFile("de.lproj/LegacyView.strings", regionVariantName: "de"),
+                        ]
+                    ),
+                    TestVariantGroup(
+                        "View.xib",
+                        children: [
+                            TestFile("Base.lproj/View.xib", regionVariantName: "Base"),
+                            TestFile("mul.lproj/View.xcstrings", regionVariantName: "mul"),  // mul is the ISO code for multi-lingual
+                        ]
+                    ),
+                    TestVariantGroup(
+                        "OtherView.nib",
+                        children: [
+                            TestFile("Base.lproj/OtherView.nib", regionVariantName: "Base"),
+                            TestFile("mul.lproj/OtherView.xcstrings", regionVariantName: "mul"),
+                        ]
+                    ),
+                    TestVariantGroup(
+                        "Main.storyboard",
+                        children: [
+                            TestFile("Base.lproj/Main.storyboard", regionVariantName: "Base"),
+                            TestFile("mul.lproj/Main.xcstrings", regionVariantName: "mul"),
+                        ]
+                    ),
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Release", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Release",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Release", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Release",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -1530,7 +1748,7 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                             "View.xib",
                             "OtherView.nib",
                             "Main.storyboard",
-                        ])
+                        ]),
                     ]
                 )
             ],
@@ -1538,20 +1756,23 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
         )
 
         // Pretend our xcstrings file contains English and German strings, and that they have variations.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [
-            "/tmp/Test/Project/Sources/mul.lproj/View.xcstrings" : [
-                "fr.lproj/View.strings",
-                "de.lproj/View.strings",
-            ],
-            "/tmp/Test/Project/Sources/mul.lproj/OtherView.xcstrings" : [
-                "fr.lproj/OtherView.strings",
-                "de.lproj/OtherView.strings",
-            ],
-            "/tmp/Test/Project/Sources/mul.lproj/Main.xcstrings" : [
-                "fr.lproj/Main.strings",
-                "de.lproj/Main.strings",
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/mul.lproj/View.xcstrings": [
+                    "fr.lproj/View.strings",
+                    "de.lproj/View.strings",
+                ],
+                "/tmp/Test/Project/Sources/mul.lproj/OtherView.xcstrings": [
+                    "fr.lproj/OtherView.strings",
+                    "de.lproj/OtherView.strings",
+                ],
+                "/tmp/Test/Project/Sources/mul.lproj/Main.xcstrings": [
+                    "fr.lproj/Main.strings",
+                    "de.lproj/Main.strings",
+                ],
             ],
-        ], requiredCommandLine: nil)
+            requiredCommandLine: nil
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -1630,38 +1851,47 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 path: "Sources",
                 children: [
                     TestFile("MyFramework.swift"),
-                    TestVariantGroup("View.xib", children: [
-                        TestFile("Base.lproj/View.xib", regionVariantName: "Base"),
-                        TestFile("fr.lproj/View.strings", regionVariantName: "fr"),
-                        TestFile("mul.lproj/View.xcstrings", regionVariantName: "mul"),
-                    ]),
+                    TestVariantGroup(
+                        "View.xib",
+                        children: [
+                            TestFile("Base.lproj/View.xib", regionVariantName: "Base"),
+                            TestFile("fr.lproj/View.strings", regionVariantName: "fr"),
+                            TestFile("mul.lproj/View.xcstrings", regionVariantName: "mul"),
+                        ]
+                    ),
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "IBC_EXEC": ibtoolPath.str,
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "IBC_EXEC": ibtoolPath.str,
+                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyFramework.swift"
                         ]),
                         TestResourcesBuildPhase([
-                            "View.xib",
-                        ])
+                            "View.xib"
+                        ]),
                     ]
                 )
             ],
@@ -1669,11 +1899,14 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
         )
 
         // Pretend our xcstrings files contain English and German strings, without variation.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [
-            "/tmp/Test/Project/Sources/mul.lproj/View.xcstrings" : [
-                "fr.lproj/View.strings",
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/mul.lproj/View.xcstrings": [
+                    "fr.lproj/View.strings"
+                ]
             ],
-        ], requiredCommandLine: nil)
+            requiredCommandLine: nil
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -1693,37 +1926,46 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                 path: "Sources",
                 children: [
                     TestFile("MyFramework.swift"),
-                    TestVariantGroup("View.xib", children: [
-                        TestFile("Base.lproj/View.xib", regionVariantName: "Base"),
-                        TestFile("fr.lproj/View.xib", regionVariantName: "fr"),
-                        TestFile("mul.lproj/View.xcstrings", regionVariantName: "mul"),
-                    ]),
+                    TestVariantGroup(
+                        "View.xib",
+                        children: [
+                            TestFile("Base.lproj/View.xib", regionVariantName: "Base"),
+                            TestFile("fr.lproj/View.xib", regionVariantName: "fr"),
+                            TestFile("mul.lproj/View.xcstrings", regionVariantName: "mul"),
+                        ]
+                    ),
                 ]
             ),
             buildConfigurations: [
-                TestBuildConfiguration("Debug", buildSettings: [
-                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                ])
+                TestBuildConfiguration(
+                    "Debug",
+                    buildSettings: [
+                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_EXEC": swiftCompilerPath.str,
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyFramework.swift"
                         ]),
                         TestResourcesBuildPhase([
-                            "View.xib",
-                        ])
+                            "View.xib"
+                        ]),
                     ]
                 )
             ],
@@ -1731,11 +1973,14 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
         )
 
         // Pretend our xcstrings files contain English and German strings, without variation.
-        let xcstringsTool = MockXCStringsTool(relativeOutputFilePaths: [
-            "/tmp/Test/Project/Sources/mul.lproj/View.xcstrings" : [
-                "fr.lproj/View.strings",
+        let xcstringsTool = MockXCStringsTool(
+            relativeOutputFilePaths: [
+                "/tmp/Test/Project/Sources/mul.lproj/View.xcstrings": [
+                    "fr.lproj/View.strings"
+                ]
             ],
-        ], requiredCommandLine: nil)
+            requiredCommandLine: nil
+        )
 
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
@@ -1754,14 +1999,19 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
         let testProject = TestProject(
             "aProject",
             groupTree: TestGroup(
-                "SomeFiles", path: "Sources",
+                "SomeFiles",
+                path: "Sources",
                 children: [
                     TestFile("Localizable.xcstrings"),
-                    TestVariantGroup("Localizable.strings", children: [
-                        TestFile("en.lproj/Localizable.strings", regionVariantName: "English"),
-                        TestFile("de.lproj/Localizable.strings", regionVariantName: "German"),
-                    ]),
-                ]),
+                    TestVariantGroup(
+                        "Localizable.strings",
+                        children: [
+                            TestFile("en.lproj/Localizable.strings", regionVariantName: "English"),
+                            TestFile("de.lproj/Localizable.strings", regionVariantName: "German"),
+                        ]
+                    ),
+                ]
+            ),
             buildConfigurations: [
                 TestBuildConfiguration(
                     "Debug",
@@ -1769,20 +2019,23 @@ fileprivate struct XCStringsTaskConstructionTests: CoreBasedTests {
                         "GENERATE_INFOPLIST_FILE": "YES",
                         "CODE_SIGN_IDENTITY": "",
                         "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT" : "macosx",
-                    ]),
+                        "SDKROOT": "macosx",
+                    ]
+                )
             ],
             targets: [
                 TestStandardTarget(
-                    "Application", type: .application,
+                    "Application",
+                    type: .application,
                     buildPhases: [
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings",
                             "Localizable.strings",
-                        ]),
+                        ])
                     ]
                 )
-            ])
+            ]
+        )
         let tester = try await TaskConstructionTester(getCore(), testProject)
 
         await tester.checkBuild(runDestination: .macOS) { results in
diff --git a/Tests/SWBTaskExecutionTests/BuildDescriptionTests.swift b/Tests/SWBTaskExecutionTests/BuildDescriptionTests.swift
index 2ca487ef..a5f15dec 100644
--- a/Tests/SWBTaskExecutionTests/BuildDescriptionTests.swift
+++ b/Tests/SWBTaskExecutionTests/BuildDescriptionTests.swift
@@ -72,33 +72,47 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
                     TestProject(
                         "aProject",
                         groupTree: TestGroup(
-                            "Sources", children: [TestFile("a.c"), TestFile("b.c"), TestFile("d.c"), TestFile("e.c")]),
+                            "Sources",
+                            children: [TestFile("a.c"), TestFile("b.c"), TestFile("d.c"), TestFile("e.c")]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
-                                buildSettings: ["INFOPLIST_FILE": "Info.plist"])],
+                                buildSettings: ["INFOPLIST_FILE": "Info.plist"]
+                            )
+                        ],
                         targets: [
                             TestStandardTarget(
-                                "Foo", type: .framework,
+                                "Foo",
+                                type: .framework,
                                 buildConfigurations: [
                                     TestBuildConfiguration(
                                         "Debug",
-                                        buildSettings: ["OBJROOT": "/a", "SYMROOT": "/a", "DSTROOT": "/a"])],
+                                        buildSettings: ["OBJROOT": "/a", "SYMROOT": "/a", "DSTROOT": "/a"]
+                                    )
+                                ],
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["a.c", "b.c"]),
-                                ]),
+                                    TestSourcesBuildPhase(["a.c", "b.c"])
+                                ]
+                            ),
                             TestStandardTarget(
-                                "Bar", type: .framework,
+                                "Bar",
+                                type: .framework,
                                 buildConfigurations: [
                                     TestBuildConfiguration(
                                         "Debug",
-                                        buildSettings: ["OBJROOT": "/b", "SYMROOT": "/b", "DSTROOT": "/b"])],
+                                        buildSettings: ["OBJROOT": "/b", "SYMROOT": "/b", "DSTROOT": "/b"]
+                                    )
+                                ],
                                 buildPhases: [
-                                    TestSourcesBuildPhase(["d.c", "e.c"]),
+                                    TestSourcesBuildPhase(["d.c", "e.c"])
                                 ],
-                                dependencies: [TestTargetDependency("Foo")]),
-                        ])
-                ])
+                                dependencies: [TestTargetDependency("Foo")]
+                            ),
+                        ]
+                    )
+                ]
+            )
             let workspace1 = try testWorkspace.load(core)
 
             let taskActionRegistry = try await TaskActionRegistry(pluginManager: core.pluginManager)
@@ -113,7 +127,7 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
             }()
 
             // We do several iterations to increase probability of hitting issues.
-            for _ in 0 ..< 10 {
+            for _ in 0..<10 {
                 let workspace2 = try await testWorkspace.load(getCore())
                 let fs2 = PseudoFS()
                 let (description2, _) = try await buildDescription(for: workspace2, activeRunDestination: .macOS, fs: fs2)
@@ -149,14 +163,18 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "SomeFiles",
                             children: [
-                                TestFile("Foo.cpp"),
-                            ]),
+                                TestFile("Foo.cpp")
+                            ]
+                        ),
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "INFOPLIST_FILE": "Info.plist",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "ONLY_ACTIVE_ARCH": "YES",
-                            ]),
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "INFOPLIST_FILE": "Info.plist",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "ONLY_ACTIVE_ARCH": "YES",
+                                ]
+                            )
                         ],
                         targets: [
                             TestAggregateTarget(
@@ -167,29 +185,46 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
                             TestStandardTarget(
                                 "App1",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: [
-                                    "PRODUCT_NAME": "App",
-                                ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "PRODUCT_NAME": "App"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [TestSourcesBuildPhase(["Foo.cpp"])]
                             ),
                             TestStandardTarget(
                                 "App2",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: [
-                                    "PRODUCT_NAME": "App",
-                                ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "PRODUCT_NAME": "App"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [TestSourcesBuildPhase(["Foo.cpp"])]
                             ),
                             TestStandardTarget(
                                 "App3",
                                 type: .framework,
-                                buildConfigurations: [TestBuildConfiguration("Debug", buildSettings: [
-                                    "PRODUCT_NAME": "App",
-                                ])],
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "PRODUCT_NAME": "App"
+                                        ]
+                                    )
+                                ],
                                 buildPhases: [TestSourcesBuildPhase(["Foo.cpp"])]
-                            )
-                        ])
-                ])
+                            ),
+                        ]
+                    )
+                ]
+            )
 
             let workspace1 = try await testWorkspace.load(getCore())
 
@@ -202,20 +237,23 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
 
             #expect(interestingDiagnostics.count == 2)
 
+            #expect(
+                interestingDiagnostics[safe: 0] == """
+                    Multiple commands produce \'\(tmpDirPath.str)/aProject/build/Debug/App.framework/Versions/A\'
+                    Target \'App1\' (project \'aProject\') has create directory command with output \'\(tmpDirPath.str)/aProject/build/Debug/App.framework/Versions/A\'
+                    Target \'App2\' (project \'aProject\') has create directory command with output \'\(tmpDirPath.str)/aProject/build/Debug/App.framework/Versions/A\'
+                    Target \'App3\' (project \'aProject\') has create directory command with output \'\(tmpDirPath.str)/aProject/build/Debug/App.framework/Versions/A\'
+                    """
+            )
 
-            #expect(interestingDiagnostics[safe: 0] == """
-    Multiple commands produce \'\(tmpDirPath.str)/aProject/build/Debug/App.framework/Versions/A\'
-    Target \'App1\' (project \'aProject\') has create directory command with output \'\(tmpDirPath.str)/aProject/build/Debug/App.framework/Versions/A\'
-    Target \'App2\' (project \'aProject\') has create directory command with output \'\(tmpDirPath.str)/aProject/build/Debug/App.framework/Versions/A\'
-    Target \'App3\' (project \'aProject\') has create directory command with output \'\(tmpDirPath.str)/aProject/build/Debug/App.framework/Versions/A\'
-    """)
-
-            #expect(interestingDiagnostics[safe: 1] == """
-    Multiple commands produce \'\(tmpDirPath.str)/aProject/build/Debug/App.framework/Versions/A/App\'
-    Target \'App1\' (project \'aProject\') has link command with output \'\(tmpDirPath.str)/aProject/build/Debug/App.framework/Versions/A/App\'
-    Target \'App2\' (project \'aProject\') has link command with output \'\(tmpDirPath.str)/aProject/build/Debug/App.framework/Versions/A/App\'
-    Target \'App3\' (project \'aProject\') has link command with output \'\(tmpDirPath.str)/aProject/build/Debug/App.framework/Versions/A/App\'
-    """)
+            #expect(
+                interestingDiagnostics[safe: 1] == """
+                    Multiple commands produce \'\(tmpDirPath.str)/aProject/build/Debug/App.framework/Versions/A/App\'
+                    Target \'App1\' (project \'aProject\') has link command with output \'\(tmpDirPath.str)/aProject/build/Debug/App.framework/Versions/A/App\'
+                    Target \'App2\' (project \'aProject\') has link command with output \'\(tmpDirPath.str)/aProject/build/Debug/App.framework/Versions/A/App\'
+                    Target \'App3\' (project \'aProject\') has link command with output \'\(tmpDirPath.str)/aProject/build/Debug/App.framework/Versions/A/App\'
+                    """
+            )
         }
     }
 
@@ -261,7 +299,8 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
                         dependencies: ["PackageLibProduct"]
                     ),
                     TestStandardTarget(
-                        "TestApp2", type: .dynamicLibrary,
+                        "TestApp2",
+                        type: .dynamicLibrary,
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -269,13 +308,15 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
                                     "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
                                     "CODE_SIGN_IDENTITY": "foo",
                                     "CODE_SIGN_ENTITLEMENTS": "Entitlements.plist",
-                                ])
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["File.c"]),
                             TestFrameworksBuildPhase([TestBuildFile(.target("PackageLibProduct"))]),
                         ],
-                        dependencies: ["PackageLibProduct"]),
+                        dependencies: ["PackageLibProduct"]
+                    ),
                     TestPackageProductTarget(
                         "PackageLibProduct",
                         frameworksBuildPhase: TestFrameworksBuildPhase([TestBuildFile(.target("PackageLib"))]),
@@ -288,12 +329,14 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
                                     "SDKROOT": "auto",
                                     "SDK_VARIANT": "auto",
                                     "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                ])
+                                ]
+                            )
                         ],
                         dependencies: ["PackageLib"]
                     ),
                     TestStandardTarget(
-                        "PackageLibProduct-dynamic", type: .framework,
+                        "PackageLibProduct-dynamic",
+                        type: .framework,
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -301,7 +344,8 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
                                     "SDKROOT": "auto",
                                     "SDK_VARIANT": "auto",
                                     "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                                ])
+                                ]
+                            )
                         ],
                         buildPhases: [TestFrameworksBuildPhase([TestBuildFile(.target("PackageLib"))])],
                         dependencies: ["PackageLib"]
@@ -313,8 +357,8 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
             let tester = try await TaskConstructionTester(getCore(), project)
             let fs1 = PseudoFS()
             let (results, _) =
-            try await buildDescription(for: tester.workspace, activeRunDestination: .macOS, overrides: ["PACKAGE_BUILD_DYNAMICALLY": "YES"], fs: fs1)
-            as (BuildDescriptionDiagnosticResults, WorkspaceContext)
+                try await buildDescription(for: tester.workspace, activeRunDestination: .macOS, overrides: ["PACKAGE_BUILD_DYNAMICALLY": "YES"], fs: fs1)
+                as (BuildDescriptionDiagnosticResults, WorkspaceContext)
             let interestingDiagnostics = results.errors.filter({ message -> Bool in
                 message.hasPrefix("Multiple commands produce")
             }).sorted()
@@ -335,7 +379,9 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
                         TestProject(
                             "aProject",
                             groupTree: TestGroup(
-                                "Sources", children: [TestFile("a.c"), TestFile("b.c")]),
+                                "Sources",
+                                children: [TestFile("a.c"), TestFile("b.c")]
+                            ),
                             buildConfigurations: [
                                 TestBuildConfiguration(
                                     "Debug",
@@ -343,15 +389,22 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
                                         "USE_HEADERMAP": "NO",
                                         "ALWAYS_SEARCH_USER_PATHS": "NO",
                                         "USER_HEADER_SEARCH_PATHS": Path.root.join("User/**").strWithPosixSlashes,
-                                        "CLANG_USE_RESPONSE_FILE": "NO"])],
+                                        "CLANG_USE_RESPONSE_FILE": "NO",
+                                    ]
+                                )
+                            ],
                             targets: [
                                 TestStandardTarget(
-                                    "Tool", type: .commandLineTool,
+                                    "Tool",
+                                    type: .commandLineTool,
                                     buildPhases: [
-                                        TestSourcesBuildPhase(["a.c", "b.c"]),
-                                    ]),
-                            ])
-                    ])
+                                        TestSourcesBuildPhase(["a.c", "b.c"])
+                                    ]
+                                )
+                            ]
+                        )
+                    ]
+                )
                 let workspace = try await testWorkspace.load(getCore())
 
                 // Use a shared manager.
@@ -364,7 +417,7 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
                     #expect(info.source == expectedSource)
 
                     let description = info.buildDescription
-                    let compileTasks = description.tasks.filter{ $0.ruleInfo[0] == "CompileC" }
+                    let compileTasks = description.tasks.filter { $0.ruleInfo[0] == "CompileC" }
                     guard compileTasks.count > 0 else {
                         Issue.record("unexpected build description")
                         return
@@ -373,7 +426,7 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
                     let task = compileTasks[0]
                     let iQuoteArgs = task.commandLine.enumerated().filter { (i, arg) in
                         (task.commandLine[safe: i - 1]?.asString ?? "") == "-iquote"
-                    }.map{ $0.1.asString }
+                    }.map { $0.1.asString }
                     #expect(iQuoteArgs == expected)
 
                     // We should only see one cached result.
@@ -408,23 +461,32 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
                     "SomeFiles",
                     children: [
                         TestFile("SomeFile.txt"),
-                        TestFile("Info.plist")
-                    ]),
+                        TestFile("Info.plist"),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ALWAYS_SEARCH_USER_PATHS": "NO",
-                        "INFOPLIST_FILE": "Info.plist",
-                        "CODE_SIGN_IDENTITY": "Apple Development",
-                        "BUILD_VARIANTS": "normal extra"
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ALWAYS_SEARCH_USER_PATHS": "NO",
+                            "INFOPLIST_FILE": "Info.plist",
+                            "CODE_SIGN_IDENTITY": "Apple Development",
+                            "BUILD_VARIANTS": "normal extra",
+                        ]
+                    )
                 ],
                 targets: [
-                    TestStandardTarget("NoSources",
-                                       type: .bundle,
-                                       buildConfigurations: [TestBuildConfiguration("Debug")],
-                                       buildPhases: [
-                                        TestResourcesBuildPhase(["SomeFile.txt"])])])
+                    TestStandardTarget(
+                        "NoSources",
+                        type: .bundle,
+                        buildConfigurations: [TestBuildConfiguration("Debug")],
+                        buildPhases: [
+                            TestResourcesBuildPhase(["SomeFile.txt"])
+                        ]
+                    )
+                ]
+            )
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath, projects: [testProject])
             let workspace = try await testWorkspace.load(getCore())
 
@@ -443,26 +505,35 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
                     children: [
                         TestFile("File.c"),
                         TestFile("SomeFile.txt"),
-                        TestFile("Info.plist")
-                    ]),
+                        TestFile("Info.plist"),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ALWAYS_SEARCH_USER_PATHS": "NO",
-                        "INFOPLIST_FILE": "Info.plist",
-                        "CODE_SIGN_IDENTITY": "Apple Development",
-                        "BUILD_VARIANTS": "normal extra",
-                        "ARCHS": "foo",
-                        "VALID_ARCHS": "bar"
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ALWAYS_SEARCH_USER_PATHS": "NO",
+                            "INFOPLIST_FILE": "Info.plist",
+                            "CODE_SIGN_IDENTITY": "Apple Development",
+                            "BUILD_VARIANTS": "normal extra",
+                            "ARCHS": "foo",
+                            "VALID_ARCHS": "bar",
+                        ]
+                    )
                 ],
                 targets: [
-                    TestStandardTarget("NoArchs",
-                                       type: .bundle,
-                                       buildConfigurations: [TestBuildConfiguration("Debug")],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase([]),
-                                        TestResourcesBuildPhase(["SomeFile.txt"])])])
+                    TestStandardTarget(
+                        "NoArchs",
+                        type: .bundle,
+                        buildConfigurations: [TestBuildConfiguration("Debug")],
+                        buildPhases: [
+                            TestSourcesBuildPhase([]),
+                            TestResourcesBuildPhase(["SomeFile.txt"]),
+                        ]
+                    )
+                ]
+            )
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath, projects: [testProject])
             let workspace = try await testWorkspace.load(getCore())
 
@@ -481,26 +552,35 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
                     children: [
                         TestFile("File.c"),
                         TestFile("SomeFile.txt"),
-                        TestFile("Info.plist")
-                    ]),
+                        TestFile("Info.plist"),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ALWAYS_SEARCH_USER_PATHS": "NO",
-                        "INFOPLIST_FILE": "Info.plist",
-                        "CODE_SIGN_IDENTITY": "Apple Development",
-                        "BUILD_VARIANTS": "normal extra",
-                        "ARCHS": "foo",
-                        "VALID_ARCHS": "bar"
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ALWAYS_SEARCH_USER_PATHS": "NO",
+                            "INFOPLIST_FILE": "Info.plist",
+                            "CODE_SIGN_IDENTITY": "Apple Development",
+                            "BUILD_VARIANTS": "normal extra",
+                            "ARCHS": "foo",
+                            "VALID_ARCHS": "bar",
+                        ]
+                    )
                 ],
                 targets: [
-                    TestStandardTarget("NoArchs",
-                                       type: .bundle,
-                                       buildConfigurations: [TestBuildConfiguration("Debug")],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase(["File.c"]),
-                                        TestResourcesBuildPhase(["SomeFile.txt"])])])
+                    TestStandardTarget(
+                        "NoArchs",
+                        type: .bundle,
+                        buildConfigurations: [TestBuildConfiguration("Debug")],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["File.c"]),
+                            TestResourcesBuildPhase(["SomeFile.txt"]),
+                        ]
+                    )
+                ]
+            )
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath, projects: [testProject])
             let workspace = try await testWorkspace.load(getCore())
 
@@ -517,27 +597,36 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
                     children: [
                         TestFile("File.c"),
                         TestFile("SomeFile.txt"),
-                        TestFile("Info.plist")
-                    ]),
+                        TestFile("Info.plist"),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ALWAYS_SEARCH_USER_PATHS": "NO",
-                        "INFOPLIST_FILE": "Info.plist",
-                        "CODE_SIGN_IDENTITY": "Apple Development",
-                        "BUILD_VARIANTS": "normal extra",
-                        "ARCHS": "foo",
-                        "VALID_ARCHS": "bar",
-                        "ONLY_ACTIVE_ARCH": "YES"
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ALWAYS_SEARCH_USER_PATHS": "NO",
+                            "INFOPLIST_FILE": "Info.plist",
+                            "CODE_SIGN_IDENTITY": "Apple Development",
+                            "BUILD_VARIANTS": "normal extra",
+                            "ARCHS": "foo",
+                            "VALID_ARCHS": "bar",
+                            "ONLY_ACTIVE_ARCH": "YES",
+                        ]
+                    )
                 ],
                 targets: [
-                    TestStandardTarget("NoArchs",
-                                       type: .bundle,
-                                       buildConfigurations: [TestBuildConfiguration("Debug")],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase(["File.c"]),
-                                        TestResourcesBuildPhase(["SomeFile.txt"])])])
+                    TestStandardTarget(
+                        "NoArchs",
+                        type: .bundle,
+                        buildConfigurations: [TestBuildConfiguration("Debug")],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["File.c"]),
+                            TestResourcesBuildPhase(["SomeFile.txt"]),
+                        ]
+                    )
+                ]
+            )
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath, projects: [testProject])
             let workspace = try await testWorkspace.load(getCore())
 
@@ -554,28 +643,37 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
                     children: [
                         TestFile("File.c"),
                         TestFile("SomeFile.txt"),
-                        TestFile("Info.plist")
-                    ]),
+                        TestFile("Info.plist"),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "arch": "foo",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ALWAYS_SEARCH_USER_PATHS": "NO",
-                        "INFOPLIST_FILE": "Info.plist",
-                        "CODE_SIGN_IDENTITY": "Apple Development",
-                        "BUILD_VARIANTS": "normal extra",
-                        "ARCHS": "foo",
-                        "VALID_ARCHS": "bar",
-                        "ONLY_ACTIVE_ARCH": "YES"
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "arch": "foo",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ALWAYS_SEARCH_USER_PATHS": "NO",
+                            "INFOPLIST_FILE": "Info.plist",
+                            "CODE_SIGN_IDENTITY": "Apple Development",
+                            "BUILD_VARIANTS": "normal extra",
+                            "ARCHS": "foo",
+                            "VALID_ARCHS": "bar",
+                            "ONLY_ACTIVE_ARCH": "YES",
+                        ]
+                    )
                 ],
                 targets: [
-                    TestStandardTarget("NoArchs",
-                                       type: .bundle,
-                                       buildConfigurations: [TestBuildConfiguration("Debug")],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase(["File.c"]),
-                                        TestResourcesBuildPhase(["SomeFile.txt"])])])
+                    TestStandardTarget(
+                        "NoArchs",
+                        type: .bundle,
+                        buildConfigurations: [TestBuildConfiguration("Debug")],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["File.c"]),
+                            TestResourcesBuildPhase(["SomeFile.txt"]),
+                        ]
+                    )
+                ]
+            )
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath, projects: [testProject])
             let workspace = try await testWorkspace.load(getCore())
 
@@ -592,26 +690,35 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
                     children: [
                         TestFile("File.c"),
                         TestFile("SomeFile.txt"),
-                        TestFile("Info.plist")
-                    ]),
+                        TestFile("Info.plist"),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ALWAYS_SEARCH_USER_PATHS": "NO",
-                        "INFOPLIST_FILE": "Info.plist",
-                        "CODE_SIGN_IDENTITY": "Apple Development",
-                        "BUILD_VARIANTS": "normal extra",
-                        "ARCHS": "foo",
-                        "VALID_ARCHS": " "
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ALWAYS_SEARCH_USER_PATHS": "NO",
+                            "INFOPLIST_FILE": "Info.plist",
+                            "CODE_SIGN_IDENTITY": "Apple Development",
+                            "BUILD_VARIANTS": "normal extra",
+                            "ARCHS": "foo",
+                            "VALID_ARCHS": " ",
+                        ]
+                    )
                 ],
                 targets: [
-                    TestStandardTarget("NoArchs",
-                                       type: .bundle,
-                                       buildConfigurations: [TestBuildConfiguration("Debug")],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase(["File.c"]),
-                                        TestResourcesBuildPhase(["SomeFile.txt"])])])
+                    TestStandardTarget(
+                        "NoArchs",
+                        type: .bundle,
+                        buildConfigurations: [TestBuildConfiguration("Debug")],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["File.c"]),
+                            TestResourcesBuildPhase(["SomeFile.txt"]),
+                        ]
+                    )
+                ]
+            )
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath, projects: [testProject])
             let workspace = try await testWorkspace.load(getCore())
 
@@ -628,26 +735,35 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
                     children: [
                         TestFile("File.c"),
                         TestFile("SomeFile.txt"),
-                        TestFile("Info.plist")
-                    ]),
+                        TestFile("Info.plist"),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ALWAYS_SEARCH_USER_PATHS": "NO",
-                        "INFOPLIST_FILE": "Info.plist",
-                        "CODE_SIGN_IDENTITY": "Apple Development",
-                        "BUILD_VARIANTS": "normal extra",
-                        "ARCHS": " ",
-                        "VALID_ARCHS": "bar"
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ALWAYS_SEARCH_USER_PATHS": "NO",
+                            "INFOPLIST_FILE": "Info.plist",
+                            "CODE_SIGN_IDENTITY": "Apple Development",
+                            "BUILD_VARIANTS": "normal extra",
+                            "ARCHS": " ",
+                            "VALID_ARCHS": "bar",
+                        ]
+                    )
                 ],
                 targets: [
-                    TestStandardTarget("NoArchs",
-                                       type: .bundle,
-                                       buildConfigurations: [TestBuildConfiguration("Debug")],
-                                       buildPhases: [
-                                        TestSourcesBuildPhase(["File.c"]),
-                                        TestResourcesBuildPhase(["SomeFile.txt"])])])
+                    TestStandardTarget(
+                        "NoArchs",
+                        type: .bundle,
+                        buildConfigurations: [TestBuildConfiguration("Debug")],
+                        buildPhases: [
+                            TestSourcesBuildPhase(["File.c"]),
+                            TestResourcesBuildPhase(["SomeFile.txt"]),
+                        ]
+                    )
+                ]
+            )
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath, projects: [testProject])
             let workspace = try await testWorkspace.load(getCore())
 
@@ -746,7 +862,7 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
 
             let diagnostics: [ConfiguredTarget?: [Diagnostic]] = [
                 nil: [
-                    Diagnostic(behavior: .error, location: .unknown, data: DiagnosticData("Test")),
+                    Diagnostic(behavior: .error, location: .unknown, data: DiagnosticData("Test"))
                 ]
             ]
             guard let description = try await BuildDescription.construct(workspace: testWorkspace, tasks: [], path: Path.root.join("tmp"), signature: ByteString([]), diagnostics: diagnostics, fs: PseudoFS())?.buildDescription else {
@@ -810,7 +926,7 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
 }
 
 private extension BuildDescription {
-    static func construct(workspace: Workspace, tasks: [any PlannedTask], path: Path, signature: BuildDescriptionSignature, buildCommand: BuildCommand? = nil, diagnostics: [ConfiguredTarget?: [Diagnostic]] = [:], indexingInfo: [(forTarget: ConfiguredTarget?, path: Path, indexingInfo: any SourceFileIndexingInfo)] = [], fs: any FSProxy = localFS, bypassActualTasks: Bool = false, moduleSessionFilePath: Path? = nil, invalidationPaths: [Path] = [], recursiveSearchPathResults: [RecursiveSearchPathResolver.CachedResult] = [], copiedPathMap: [String: String] = [:], rootPathsPerTarget: [ConfiguredTarget:[Path]] = [:], moduleCachePathsPerTarget: [ConfiguredTarget: [Path]] = [:], artifactInfoPerTarget: [ConfiguredTarget: ArtifactInfo] = [:], staleFileRemovalIdentifierPerTarget: [ConfiguredTarget: String] = [:], settingsPerTarget: [ConfiguredTarget: Settings] = [:], targetDependencies: [TargetDependencyRelationship] = [], definingTargetsByModuleName: [String: OrderedSet<ConfiguredTarget>] = [:]) async throws -> BuildDescriptionDiagnosticResults? {
+    static func construct(workspace: Workspace, tasks: [any PlannedTask], path: Path, signature: BuildDescriptionSignature, buildCommand: BuildCommand? = nil, diagnostics: [ConfiguredTarget?: [Diagnostic]] = [:], indexingInfo: [(forTarget: ConfiguredTarget?, path: Path, indexingInfo: any SourceFileIndexingInfo)] = [], fs: any FSProxy = localFS, bypassActualTasks: Bool = false, moduleSessionFilePath: Path? = nil, invalidationPaths: [Path] = [], recursiveSearchPathResults: [RecursiveSearchPathResolver.CachedResult] = [], copiedPathMap: [String: String] = [:], rootPathsPerTarget: [ConfiguredTarget: [Path]] = [:], moduleCachePathsPerTarget: [ConfiguredTarget: [Path]] = [:], artifactInfoPerTarget: [ConfiguredTarget: ArtifactInfo] = [:], staleFileRemovalIdentifierPerTarget: [ConfiguredTarget: String] = [:], settingsPerTarget: [ConfiguredTarget: Settings] = [:], targetDependencies: [TargetDependencyRelationship] = [], definingTargetsByModuleName: [String: OrderedSet<ConfiguredTarget>] = [:]) async throws -> BuildDescriptionDiagnosticResults? {
         let buildDescription = try await construct(workspace: workspace, tasks: tasks, path: path, signature: signature, buildCommand: buildCommand ?? .build(style: .buildOnly, skipDependencies: false), diagnostics: diagnostics, indexingInfo: indexingInfo, fs: fs, bypassActualTasks: bypassActualTasks, moduleSessionFilePath: moduleSessionFilePath, invalidationPaths: invalidationPaths, recursiveSearchPathResults: recursiveSearchPathResults, copiedPathMap: copiedPathMap, rootPathsPerTarget: rootPathsPerTarget, moduleCachePathsPerTarget: moduleCachePathsPerTarget, artifactInfoPerTarget: artifactInfoPerTarget, staleFileRemovalIdentifierPerTarget: staleFileRemovalIdentifierPerTarget, settingsPerTarget: settingsPerTarget, delegate: MockTestBuildDescriptionConstructionDelegate(), targetDependencies: targetDependencies, definingTargetsByModuleName: definingTargetsByModuleName, userPreferences: .defaultForTesting)
         return buildDescription.map { BuildDescriptionDiagnosticResults(buildDescription: $0, workspace: workspace) } ?? nil
     }
diff --git a/Tests/SWBTaskExecutionTests/ClangModuleVerifierTaskTests.swift b/Tests/SWBTaskExecutionTests/ClangModuleVerifierTaskTests.swift
index bd325b36..4cf12372 100644
--- a/Tests/SWBTaskExecutionTests/ClangModuleVerifierTaskTests.swift
+++ b/Tests/SWBTaskExecutionTests/ClangModuleVerifierTaskTests.swift
@@ -105,71 +105,92 @@ fileprivate struct ClangModuleVerifierTaskTests: CoreBasedTests {
             try localFS.createDirectory(tmp.join("A.framework/Headers"), recursive: true)
             try localFS.write(tmp.join("A.framework/Headers/A.h"), contents: "")
             try localFS.write(tmp.join("A.framework/Headers/B.h"), contents: "")
-            try localFS.write(tmp.join("A.framework/Modules/module.modulemap"), contents: """
-            framework module A {
-                umbrella header "A.h"
-            }
-            """)
+            try localFS.write(
+                tmp.join("A.framework/Modules/module.modulemap"),
+                contents: """
+                    framework module A {
+                        umbrella header "A.h"
+                    }
+                    """
+            )
 
             do {
-                let (result, outputDelegate) = try await generateInput(fs: localFS, commandLine: [
-                    "exe",
-                    tmp.join("A.framework").str,
-                    "--language", "c",
-                    "--main-output", tmp.join("Test.c").str,
-                    "--header-output", tmp.join("Test.h").str,
-                    "--module-map-output", tmp.join("Test.modulemap").str
-                ])
+                let (result, outputDelegate) = try await generateInput(
+                    fs: localFS,
+                    commandLine: [
+                        "exe",
+                        tmp.join("A.framework").str,
+                        "--language", "c",
+                        "--main-output", tmp.join("Test.c").str,
+                        "--header-output", tmp.join("Test.h").str,
+                        "--module-map-output", tmp.join("Test.modulemap").str,
+                    ]
+                )
 
                 #expect(result == .succeeded)
                 #expect(outputDelegate.messages == [])
 
-                #expect(try localFS.read(tmp.join("Test.c")) == """
-                #include <Test/Test.h>
-                """)
-                #expect(try localFS.read(tmp.join("Test.h")) == """
-                #include <A/A.h>
-                #include <A/B.h>
-
-                """)
-                #expect(try localFS.read(tmp.join("Test.modulemap")) == """
-                framework module Test {
-                    umbrella header "Test.h"
-
-                    export *
-                    module * { export * }
-                }
-                """)
+                #expect(
+                    try localFS.read(tmp.join("Test.c")) == """
+                        #include <Test/Test.h>
+                        """
+                )
+                #expect(
+                    try localFS.read(tmp.join("Test.h")) == """
+                        #include <A/A.h>
+                        #include <A/B.h>
+
+                        """
+                )
+                #expect(
+                    try localFS.read(tmp.join("Test.modulemap")) == """
+                        framework module Test {
+                            umbrella header "Test.h"
+
+                            export *
+                            module * { export * }
+                        }
+                        """
+                )
             }
             do {
-                let (result, outputDelegate) = try await generateInput(fs: localFS, commandLine: [
-                    "exe",
-                    tmp.join("A.framework").str,
-                    "--language", "objective-c++",
-                    "--main-output", tmp.join("Test.c").str,
-                    "--header-output", tmp.join("Test.h").str,
-                    "--module-map-output", tmp.join("Test.modulemap").str
-                ])
+                let (result, outputDelegate) = try await generateInput(
+                    fs: localFS,
+                    commandLine: [
+                        "exe",
+                        tmp.join("A.framework").str,
+                        "--language", "objective-c++",
+                        "--main-output", tmp.join("Test.c").str,
+                        "--header-output", tmp.join("Test.h").str,
+                        "--module-map-output", tmp.join("Test.modulemap").str,
+                    ]
+                )
 
                 #expect(result == .succeeded)
                 #expect(outputDelegate.messages == [])
 
-                #expect(try localFS.read(tmp.join("Test.c")) == """
-                #import <Test/Test.h>
-                """)
-                #expect(try localFS.read(tmp.join("Test.h")) == """
-                #import <A/A.h>
-                #import <A/B.h>
-
-                """)
-                #expect(try localFS.read(tmp.join("Test.modulemap")) == """
-                framework module Test {
-                    umbrella header "Test.h"
-
-                    export *
-                    module * { export * }
-                }
-                """)
+                #expect(
+                    try localFS.read(tmp.join("Test.c")) == """
+                        #import <Test/Test.h>
+                        """
+                )
+                #expect(
+                    try localFS.read(tmp.join("Test.h")) == """
+                        #import <A/A.h>
+                        #import <A/B.h>
+
+                        """
+                )
+                #expect(
+                    try localFS.read(tmp.join("Test.modulemap")) == """
+                        framework module Test {
+                            umbrella header "Test.h"
+
+                            export *
+                            module * { export * }
+                        }
+                        """
+                )
             }
         }
     }
@@ -182,47 +203,62 @@ fileprivate struct ClangModuleVerifierTaskTests: CoreBasedTests {
             try localFS.createDirectory(tmp.join("A.framework/PrivateHeaders"), recursive: true)
             try localFS.write(tmp.join("A.framework/Headers/A.h"), contents: "")
             try localFS.write(tmp.join("A.framework/PrivateHeaders/B.h"), contents: "")
-            try localFS.write(tmp.join("A.framework/Modules/module.modulemap"), contents: """
-            framework module A {
-                header "A.h"
-            }
-            """)
-            try localFS.write(tmp.join("A.framework/Modules/module.private.modulemap"), contents: """
-            framework module A_Private {
-                header "B.h"
-            }
-            """)
-
-            let (result, outputDelegate) = try await generateInput(fs: localFS, commandLine: [
-                "exe",
-                tmp.join("A.framework").str,
-                "--language", "c",
-                "--main-output", tmp.join("Test.c").str,
-                "--header-output", tmp.join("Test.h").str,
-                "--module-map-output", tmp.join("Test.modulemap").str
-            ])
+            try localFS.write(
+                tmp.join("A.framework/Modules/module.modulemap"),
+                contents: """
+                    framework module A {
+                        header "A.h"
+                    }
+                    """
+            )
+            try localFS.write(
+                tmp.join("A.framework/Modules/module.private.modulemap"),
+                contents: """
+                    framework module A_Private {
+                        header "B.h"
+                    }
+                    """
+            )
+
+            let (result, outputDelegate) = try await generateInput(
+                fs: localFS,
+                commandLine: [
+                    "exe",
+                    tmp.join("A.framework").str,
+                    "--language", "c",
+                    "--main-output", tmp.join("Test.c").str,
+                    "--header-output", tmp.join("Test.h").str,
+                    "--module-map-output", tmp.join("Test.modulemap").str,
+                ]
+            )
 
             #expect(result == .succeeded)
             #expect(outputDelegate.messages == [])
 
-            #expect(try localFS.read(tmp.join("Test.c")) == """
-            #include <Test/Test.h>
-            """)
-            #expect(try localFS.read(tmp.join("Test.h")) == """
-            #include <A/A.h>
-
-            // Private
-            #include <A/B.h>
-
-            """)
-            #expect(try localFS.read(tmp.join("Test.modulemap")) == """
-            framework module Test {
-                umbrella header "Test.h"
-
-                export *
-                module * { export * }
-            }
-            """)
+            #expect(
+                try localFS.read(tmp.join("Test.c")) == """
+                    #include <Test/Test.h>
+                    """
+            )
+            #expect(
+                try localFS.read(tmp.join("Test.h")) == """
+                    #include <A/A.h>
+
+                    // Private
+                    #include <A/B.h>
+
+                    """
+            )
+            #expect(
+                try localFS.read(tmp.join("Test.modulemap")) == """
+                    framework module Test {
+                        umbrella header "Test.h"
+
+                        export *
+                        module * { export * }
+                    }
+                    """
+            )
         }
     }
 
@@ -234,29 +270,39 @@ fileprivate struct ClangModuleVerifierTaskTests: CoreBasedTests {
             try localFS.createDirectory(tmp.join("A.framework/PrivateHeaders"), recursive: true)
             try localFS.write(tmp.join("A.framework/Headers/A.h"), contents: "")
             try localFS.write(tmp.join("A.framework/PrivateHeaders/B.h"), contents: "")
-            try localFS.write(tmp.join("A.framework/Modules/module.modulemap"), contents: """
-            framework module A {
-                header "A.h"
-            }
-            """)
-
-            let (result, outputDelegate) = try await generateInput(fs: localFS, commandLine: [
-                "exe",
-                tmp.join("A.framework").str,
-                "--language", "c",
-                "--main-output", tmp.join("Test.c").str,
-                "--header-output", tmp.join("Test.h").str,
-                "--module-map-output", tmp.join("Test.modulemap").str
-            ])
+            try localFS.write(
+                tmp.join("A.framework/Modules/module.modulemap"),
+                contents: """
+                    framework module A {
+                        header "A.h"
+                    }
+                    """
+            )
+
+            let (result, outputDelegate) = try await generateInput(
+                fs: localFS,
+                commandLine: [
+                    "exe",
+                    tmp.join("A.framework").str,
+                    "--language", "c",
+                    "--main-output", tmp.join("Test.c").str,
+                    "--header-output", tmp.join("Test.h").str,
+                    "--module-map-output", tmp.join("Test.modulemap").str,
+                ]
+            )
 
             #expect(result == .succeeded)
-            #expect(try localFS.read(tmp.join("Test.h")) == """
-                #include <A/A.h>
-
-                """)
-            #expect(outputDelegate.warnings == [
-                "warning: \(tmp.join("A.framework/Modules/module.private.modulemap").str): module map is missing; there are private headers but no module map"
-            ])
+            #expect(
+                try localFS.read(tmp.join("Test.h")) == """
+                    #include <A/A.h>
+
+                    """
+            )
+            #expect(
+                outputDelegate.warnings == [
+                    "warning: \(tmp.join("A.framework/Modules/module.private.modulemap").str): module map is missing; there are private headers but no module map"
+                ]
+            )
         }
     }
 
@@ -268,30 +314,40 @@ fileprivate struct ClangModuleVerifierTaskTests: CoreBasedTests {
             try localFS.createDirectory(tmp.join("A.framework/PrivateHeaders"), recursive: true)
             try localFS.write(tmp.join("A.framework/Headers/A.h"), contents: "")
             try localFS.write(tmp.join("A.framework/PrivateHeaders/B.h"), contents: "")
-            try localFS.write(tmp.join("A.framework/Modules/module.private.modulemap"), contents: """
-                framework module A_Private {
-                  header "B.h"
-                }
-                """)
-
-            let (result, outputDelegate) = try await generateInput(fs: localFS, commandLine: [
-                "exe",
-                tmp.join("A.framework").str,
-                "--language", "c",
-                "--main-output", tmp.join("Test.c").str,
-                "--header-output", tmp.join("Test.h").str,
-                "--module-map-output", tmp.join("Test.modulemap").str
-            ])
+            try localFS.write(
+                tmp.join("A.framework/Modules/module.private.modulemap"),
+                contents: """
+                    framework module A_Private {
+                      header "B.h"
+                    }
+                    """
+            )
+
+            let (result, outputDelegate) = try await generateInput(
+                fs: localFS,
+                commandLine: [
+                    "exe",
+                    tmp.join("A.framework").str,
+                    "--language", "c",
+                    "--main-output", tmp.join("Test.c").str,
+                    "--header-output", tmp.join("Test.h").str,
+                    "--module-map-output", tmp.join("Test.modulemap").str,
+                ]
+            )
 
             #expect(result == .succeeded)
-            #expect(try localFS.read(tmp.join("Test.h")) == """
-                // Private
-                #include <A/B.h>
-
-                """)
-            #expect(outputDelegate.warnings == [
-                "warning: \(tmp.join("A.framework/Modules/module.modulemap").str): module map is missing; there are public headers but no module map"
-            ])
+            #expect(
+                try localFS.read(tmp.join("Test.h")) == """
+                    // Private
+                    #include <A/B.h>
+
+                    """
+            )
+            #expect(
+                outputDelegate.warnings == [
+                    "warning: \(tmp.join("A.framework/Modules/module.modulemap").str): module map is missing; there are public headers but no module map"
+                ]
+            )
         }
     }
 
@@ -303,50 +359,68 @@ fileprivate struct ClangModuleVerifierTaskTests: CoreBasedTests {
             try localFS.createDirectory(tmp.join("A.framework/PrivateHeaders"), recursive: true)
             try localFS.write(tmp.join("A.framework/Headers/A.h"), contents: "")
             try localFS.write(tmp.join("A.framework/PrivateHeaders/Priv.h"), contents: "")
-            try localFS.write(tmp.join("A.framework/Modules/module.modulemap"), contents: """
-            framework module A {
-            }
-            """)
-
-            let (result, outputDelegate) = try await generateInput(fs: localFS, commandLine: [
-                "exe",
-                tmp.join("A.framework").str,
-                "--language", "c",
-                "--main-output", tmp.join("Test.c").str,
-                "--header-output", tmp.join("Test.h").str,
-                "--module-map-output", tmp.join("Test.modulemap").str
-            ])
+            try localFS.write(
+                tmp.join("A.framework/Modules/module.modulemap"),
+                contents: """
+                    framework module A {
+                    }
+                    """
+            )
+
+            let (result, outputDelegate) = try await generateInput(
+                fs: localFS,
+                commandLine: [
+                    "exe",
+                    tmp.join("A.framework").str,
+                    "--language", "c",
+                    "--main-output", tmp.join("Test.c").str,
+                    "--header-output", tmp.join("Test.h").str,
+                    "--module-map-output", tmp.join("Test.modulemap").str,
+                ]
+            )
 
             #expect(result == .failed)
-            #expect(outputDelegate.errors == [
-                "error: \(tmp.join("A.framework/Modules/module.modulemap").str): module map does not declare a module"
-            ])
-            #expect(outputDelegate.warnings == [
-                "warning: \(tmp.join("A.framework/Modules/module.private.modulemap").str): module map is missing; there are private headers but no module map"
-            ])
+            #expect(
+                outputDelegate.errors == [
+                    "error: \(tmp.join("A.framework/Modules/module.modulemap").str): module map does not declare a module"
+                ]
+            )
+            #expect(
+                outputDelegate.warnings == [
+                    "warning: \(tmp.join("A.framework/Modules/module.private.modulemap").str): module map is missing; there are private headers but no module map"
+                ]
+            )
         }
         try await withTemporaryDirectory(fs: localFS) { tmp in
             try localFS.createDirectory(tmp.join("A.framework/Modules"), recursive: true)
             try localFS.createDirectory(tmp.join("A.framework/Headers"), recursive: true)
-            try localFS.write(tmp.join("A.framework/Modules/module.private.modulemap"), contents: """
-            framework module A {
-                module Sub {}
-            }
-            """)
-
-            let (result, outputDelegate) = try await generateInput(fs: localFS, commandLine: [
-                "exe",
-                tmp.join("A.framework").str,
-                "--language", "c",
-                "--main-output", tmp.join("Test.c").str,
-                "--header-output", tmp.join("Test.h").str,
-                "--module-map-output", tmp.join("Test.modulemap").str
-            ])
+            try localFS.write(
+                tmp.join("A.framework/Modules/module.private.modulemap"),
+                contents: """
+                    framework module A {
+                        module Sub {}
+                    }
+                    """
+            )
+
+            let (result, outputDelegate) = try await generateInput(
+                fs: localFS,
+                commandLine: [
+                    "exe",
+                    tmp.join("A.framework").str,
+                    "--language", "c",
+                    "--main-output", tmp.join("Test.c").str,
+                    "--header-output", tmp.join("Test.h").str,
+                    "--module-map-output", tmp.join("Test.modulemap").str,
+                ]
+            )
 
             #expect(result == .failed)
-            #expect(outputDelegate.errors == [
-                "error: \(tmp.join("A.framework/Modules/module.private.modulemap").str): private module exists but no private headers"
-            ])
+            #expect(
+                outputDelegate.errors == [
+                    "error: \(tmp.join("A.framework/Modules/module.private.modulemap").str): private module exists but no private headers"
+                ]
+            )
             #expect(outputDelegate.warnings == [])
         }
     }
diff --git a/Tests/SWBTaskExecutionTests/ConcatenateTaskTests.swift b/Tests/SWBTaskExecutionTests/ConcatenateTaskTests.swift
index a0d7597f..1ab73547 100644
--- a/Tests/SWBTaskExecutionTests/ConcatenateTaskTests.swift
+++ b/Tests/SWBTaskExecutionTests/ConcatenateTaskTests.swift
@@ -36,7 +36,7 @@ fileprivate struct ConcatenateTaskTests {
         let outputDelegate = MockTaskOutputDelegate()
 
         // Test creating a new file.
-        var commandLine = ["builtin-concatenate", output.str, inputOne.str, inputTwo.str, inputThree.str].map{ ByteString(encodingAsUTF8: $0) }
+        var commandLine = ["builtin-concatenate", output.str, inputOne.str, inputTwo.str, inputThree.str].map { ByteString(encodingAsUTF8: $0) }
         var inputs = [inputOne, inputTwo, inputThree].map { MakePlannedPathNode($0) }
         var builder = PlannedTaskBuilder(type: mockTaskType, ruleInfo: [], commandLine: commandLine.map { .literal($0) }, inputs: inputs, outputs: [MakePlannedPathNode(output)])
         var task = Task(&builder)
@@ -49,7 +49,7 @@ fileprivate struct ConcatenateTaskTests {
         #expect("onetwothree" == outputContents)
 
         // Test overwriting the file.
-        commandLine = ["builtin-concatenate", output.str, inputThree.str, inputTwo.str, inputOne.str].map{ ByteString(encodingAsUTF8: $0) }
+        commandLine = ["builtin-concatenate", output.str, inputThree.str, inputTwo.str, inputOne.str].map { ByteString(encodingAsUTF8: $0) }
         inputs = [inputThree, inputTwo, inputOne].map { MakePlannedPathNode($0) }
         builder = PlannedTaskBuilder(type: mockTaskType, ruleInfo: [], commandLine: commandLine.map { .literal($0) }, inputs: inputs, outputs: [MakePlannedPathNode(output)])
         task = Task(&builder)
diff --git a/Tests/SWBTaskExecutionTests/CopyPlistTaskTests.swift b/Tests/SWBTaskExecutionTests/CopyPlistTaskTests.swift
index 6ba5c3d1..26c8cd79 100644
--- a/Tests/SWBTaskExecutionTests/CopyPlistTaskTests.swift
+++ b/Tests/SWBTaskExecutionTests/CopyPlistTaskTests.swift
@@ -177,7 +177,7 @@ fileprivate struct CopyPlistTaskTests {
             let input = Path.root.join("settings.plist")
             let output = Path.root.join("dst").join("settings.plist")
             let executionDelegate = MockExecutionDelegate()
-            let inputContents = ByteString(encodingAsUTF8: "{ \"key\" a= \"value\"; ")      // Missing closing curly brace
+            let inputContents = ByteString(encodingAsUTF8: "{ \"key\" a= \"value\"; ")  // Missing closing curly brace
             try executionDelegate.fs.createDirectory(output.dirname)
             try executionDelegate.fs.write(input, contents: inputContents)
             let action = CopyPlistTaskAction()
@@ -202,7 +202,7 @@ fileprivate struct CopyPlistTaskTests {
             let input = Path.root.join("settings.plist")
             let output = Path.root.join("dst").join("settings.plist")
             let executionDelegate = MockExecutionDelegate()
-            let inputContents = ByteString(encodingAsUTF8: "{ \"key\" = \"value\"; ")      // Missing closing curly brace
+            let inputContents = ByteString(encodingAsUTF8: "{ \"key\" = \"value\"; ")  // Missing closing curly brace
             try executionDelegate.fs.createDirectory(output.dirname)
             try executionDelegate.fs.write(input, contents: inputContents)
             let action = CopyPlistTaskAction()
diff --git a/Tests/SWBTaskExecutionTests/CopyStringsFileTaskTests.swift b/Tests/SWBTaskExecutionTests/CopyStringsFileTaskTests.swift
index fbb7dd97..a0bfcbb9 100644
--- a/Tests/SWBTaskExecutionTests/CopyStringsFileTaskTests.swift
+++ b/Tests/SWBTaskExecutionTests/CopyStringsFileTaskTests.swift
@@ -19,7 +19,7 @@ import SWBTaskExecution
 
 import SWBCore
 
-@Suite(.requireHostOS(.macOS)) // many tests here crash or fail on Linux
+@Suite(.requireHostOS(.macOS))  // many tests here crash or fail on Linux
 fileprivate struct CopyStringsFileTaskTests {
     static let bom_utf8 = [UInt8]([0xEF, 0xBB, 0xBF])
     static let bom_utf16be = [UInt8]([0xFE, 0xFF])
@@ -28,33 +28,32 @@ fileprivate struct CopyStringsFileTaskTests {
     static let bom_utf32le = [UInt8]([0xFF, 0xFE, 0x00, 0x00])
 
     #if canImport(Darwin)
-    static let bom_utf16_host: [UInt8] = {
-        switch __CFByteOrder(UInt32(CFByteOrderGetCurrent())) {
-        case CFByteOrderBigEndian:
-            return bom_utf16be
-        case CFByteOrderLittleEndian:
-            return bom_utf16le
-        default:
-            return []
-        }
-    }()
-
-    static let bom_utf32_host: [UInt8] = {
-        switch __CFByteOrder(UInt32(CFByteOrderGetCurrent())) {
-        case CFByteOrderBigEndian:
-            return bom_utf32be
-        case CFByteOrderLittleEndian:
-            return bom_utf32le
-        default:
-            return []
-        }
-    }()
+        static let bom_utf16_host: [UInt8] = {
+            switch __CFByteOrder(UInt32(CFByteOrderGetCurrent())) {
+            case CFByteOrderBigEndian:
+                return bom_utf16be
+            case CFByteOrderLittleEndian:
+                return bom_utf16le
+            default:
+                return []
+            }
+        }()
+
+        static let bom_utf32_host: [UInt8] = {
+            switch __CFByteOrder(UInt32(CFByteOrderGetCurrent())) {
+            case CFByteOrderBigEndian:
+                return bom_utf32be
+            case CFByteOrderLittleEndian:
+                return bom_utf32le
+            default:
+                return []
+            }
+        }()
     #endif
 
     @Test
     func diagnostics() async {
-        func checkDiagnostics(_ commandLine: [String], errors: [String] = [], warnings: [String] = [], notes: [String] = [], sourceLocation: SourceLocation = #_sourceLocation) async
-        {
+        func checkDiagnostics(_ commandLine: [String], errors: [String] = [], warnings: [String] = [], notes: [String] = [], sourceLocation: SourceLocation = #_sourceLocation) async {
             let action = CopyStringsFileTaskAction()
             let task = Task(forTarget: nil, ruleInfo: [], commandLine: commandLine, workingDirectory: .root, outputs: [], action: action, execDescription: "Copy Localization Strings File")
             let executionDelegate = MockExecutionDelegate()
@@ -82,17 +81,8 @@ fileprivate struct CopyStringsFileTaskTests {
         await checkDiagnostics(["copyStrings", "--what", "--outdir", "/", "--", "foo.plist"], errors: ["unrecognized argument: --what"])
     }
 
-
     let inputContents =
-    "//\n" +
-    "// input.strings\n" +
-    "//\n" +
-    "\n" +
-    "// SomeValue\n" +
-    "\"SomeValue\" = \"This is the first value.\";\n" +
-    "\n" +
-    "// Another Value\n" +
-    "\"Another Value\" = \"This is the second value.\";\n"
+        "//\n" + "// input.strings\n" + "//\n" + "\n" + "// SomeValue\n" + "\"SomeValue\" = \"This is the first value.\";\n" + "\n" + "// Another Value\n" + "\"Another Value\" = \"This is the second value.\";\n"
 
     @Test
     func uTF8ImpliedToUTF16() async throws {
@@ -141,13 +131,11 @@ fileprivate struct CopyStringsFileTaskTests {
     @Test
     func keepInfoPlistStrings() async throws {
         let action = CopyStringsFileTaskAction()
-        let task = Task(forTarget: nil, ruleInfo: [], commandLine: ["builtin-copyStrings", "--validate","--outputencoding", "UTF-16", "--outdir", "/tmp/outputs", "--", "/tmp/inputs/input-InfoPlist.strings"], workingDirectory: Path("/tmp"), outputs: [], action: action, execDescription: "Copy Localization Strings File")
+        let task = Task(forTarget: nil, ruleInfo: [], commandLine: ["builtin-copyStrings", "--validate", "--outputencoding", "UTF-16", "--outdir", "/tmp/outputs", "--", "/tmp/inputs/input-InfoPlist.strings"], workingDirectory: Path("/tmp"), outputs: [], action: action, execDescription: "Copy Localization Strings File")
 
         let executionDelegate = MockExecutionDelegate()
         let outputDelegate = MockTaskOutputDelegate()
 
-
-
         // Create the input file, in UTF-8 encoding.
         do {
             try executionDelegate.fs.createDirectory(Path("/tmp"))
@@ -411,49 +399,49 @@ fileprivate struct CopyStringsFileTaskTests {
     }
 
     #if canImport(Darwin)
-    @Test func UTF16ToUTF16() async throws {
-        let action = CopyStringsFileTaskAction()
-        let task = Task(forTarget: nil, ruleInfo: [], commandLine: ["builtin-copyStrings", "--validate", "--inputencoding", "utf-16", "--outputencoding", "UTF-16", "--outdir", "/tmp/outputs", "--", "/tmp/inputs/input.strings"], workingDirectory: Path("/tmp"), outputs: [], action: action, execDescription: "Copy Localization Strings File")
+        @Test func UTF16ToUTF16() async throws {
+            let action = CopyStringsFileTaskAction()
+            let task = Task(forTarget: nil, ruleInfo: [], commandLine: ["builtin-copyStrings", "--validate", "--inputencoding", "utf-16", "--outputencoding", "UTF-16", "--outdir", "/tmp/outputs", "--", "/tmp/inputs/input.strings"], workingDirectory: Path("/tmp"), outputs: [], action: action, execDescription: "Copy Localization Strings File")
 
-        let executionDelegate = MockExecutionDelegate()
-        let outputDelegate = MockTaskOutputDelegate()
+            let executionDelegate = MockExecutionDelegate()
+            let outputDelegate = MockTaskOutputDelegate()
 
-        // Create the input file, in UTF-16 encoding.
-        let inputByteString: ByteString
-        do {
-            try executionDelegate.fs.createDirectory(Path("/tmp"))
-            try executionDelegate.fs.createDirectory(Path("/tmp/inputs"))
-            try executionDelegate.fs.createDirectory(Path("/tmp/outputs"))
+            // Create the input file, in UTF-16 encoding.
+            let inputByteString: ByteString
+            do {
+                try executionDelegate.fs.createDirectory(Path("/tmp"))
+                try executionDelegate.fs.createDirectory(Path("/tmp/inputs"))
+                try executionDelegate.fs.createDirectory(Path("/tmp/outputs"))
 
-            let data = inputContents.data(using: String.Encoding.utf16)!
-            #expect(data.starts(with: CopyStringsFileTaskTests.bom_utf16_host))
-            let byteString = ByteString(data)
-            inputByteString = byteString
-            try executionDelegate.fs.write(Path("/tmp/inputs/input.strings"), contents: byteString)
-        }
+                let data = inputContents.data(using: String.Encoding.utf16)!
+                #expect(data.starts(with: CopyStringsFileTaskTests.bom_utf16_host))
+                let byteString = ByteString(data)
+                inputByteString = byteString
+                try executionDelegate.fs.write(Path("/tmp/inputs/input.strings"), contents: byteString)
+            }
 
-        let result = await action.performTaskAction(
-            task,
-            dynamicExecutionDelegate: MockDynamicTaskExecutionDelegate(),
-            executionDelegate: executionDelegate,
-            clientDelegate: MockTaskExecutionClientDelegate(),
-            outputDelegate: outputDelegate
-        )
+            let result = await action.performTaskAction(
+                task,
+                dynamicExecutionDelegate: MockDynamicTaskExecutionDelegate(),
+                executionDelegate: executionDelegate,
+                clientDelegate: MockTaskExecutionClientDelegate(),
+                outputDelegate: outputDelegate
+            )
 
-        // Check the exit state.
-        #expect(result == .succeeded)
-        #expect(outputDelegate.errors == [])
-        #expect(outputDelegate.warnings == [])
-        #expect(outputDelegate.notes == [])
+            // Check the exit state.
+            #expect(result == .succeeded)
+            #expect(outputDelegate.errors == [])
+            #expect(outputDelegate.warnings == [])
+            #expect(outputDelegate.notes == [])
 
-        // Check the output.
-        do {
-            let outputContents = try executionDelegate.fs.read(Path("/tmp/outputs/input.strings"))
+            // Check the output.
+            do {
+                let outputContents = try executionDelegate.fs.read(Path("/tmp/outputs/input.strings"))
 
-            // Compare what the tool emitted to the UTF-16-encoded version of the input content.
-            #expect(outputContents == inputByteString)
+                // Compare what the tool emitted to the UTF-16-encoded version of the input content.
+                #expect(outputContents == inputByteString)
+            }
         }
-    }
     #endif
 
     @Test
@@ -548,51 +536,51 @@ fileprivate struct CopyStringsFileTaskTests {
         }
     }
 
-#if canImport(Darwin)
-    func testUTF32ToUTF16() async throws {
-        let action = CopyStringsFileTaskAction()
-        let task = Task(forTarget: nil, ruleInfo: [], commandLine: ["builtin-copyStrings", "--validate", "--inputencoding", "utf-32", "--outputencoding", "UTF-16", "--outdir", "/tmp/outputs", "--", "/tmp/inputs/input.strings"], workingDirectory: Path("/tmp"), outputs: [], action: action, execDescription: "Copy Localization Strings File")
+    #if canImport(Darwin)
+        func testUTF32ToUTF16() async throws {
+            let action = CopyStringsFileTaskAction()
+            let task = Task(forTarget: nil, ruleInfo: [], commandLine: ["builtin-copyStrings", "--validate", "--inputencoding", "utf-32", "--outputencoding", "UTF-16", "--outdir", "/tmp/outputs", "--", "/tmp/inputs/input.strings"], workingDirectory: Path("/tmp"), outputs: [], action: action, execDescription: "Copy Localization Strings File")
 
-        let executionDelegate = MockExecutionDelegate()
-        let outputDelegate = MockTaskOutputDelegate()
+            let executionDelegate = MockExecutionDelegate()
+            let outputDelegate = MockTaskOutputDelegate()
 
-        // Create the input file, in UTF-32 encoding.
-        do {
-            try executionDelegate.fs.createDirectory(Path("/tmp"))
-            try executionDelegate.fs.createDirectory(Path("/tmp/inputs"))
-            try executionDelegate.fs.createDirectory(Path("/tmp/outputs"))
+            // Create the input file, in UTF-32 encoding.
+            do {
+                try executionDelegate.fs.createDirectory(Path("/tmp"))
+                try executionDelegate.fs.createDirectory(Path("/tmp/inputs"))
+                try executionDelegate.fs.createDirectory(Path("/tmp/outputs"))
 
-            let data = inputContents.data(using: String.Encoding.utf32)!
-            #expect(data.starts(with: CopyStringsFileTaskTests.bom_utf32_host))
-            let byteString = ByteString(data)
-            try executionDelegate.fs.write(Path("/tmp/inputs/input.strings"), contents: byteString)
-        }
+                let data = inputContents.data(using: String.Encoding.utf32)!
+                #expect(data.starts(with: CopyStringsFileTaskTests.bom_utf32_host))
+                let byteString = ByteString(data)
+                try executionDelegate.fs.write(Path("/tmp/inputs/input.strings"), contents: byteString)
+            }
 
-        let result = await action.performTaskAction(
-            task,
-            dynamicExecutionDelegate: MockDynamicTaskExecutionDelegate(),
-            executionDelegate: executionDelegate,
-            clientDelegate: MockTaskExecutionClientDelegate(),
-            outputDelegate: outputDelegate
-        )
+            let result = await action.performTaskAction(
+                task,
+                dynamicExecutionDelegate: MockDynamicTaskExecutionDelegate(),
+                executionDelegate: executionDelegate,
+                clientDelegate: MockTaskExecutionClientDelegate(),
+                outputDelegate: outputDelegate
+            )
 
-        // Check the exit state.
-        #expect(result == .succeeded)
-        #expect(outputDelegate.errors == [])
-        #expect(outputDelegate.warnings == [])
-        #expect(outputDelegate.notes == [])
+            // Check the exit state.
+            #expect(result == .succeeded)
+            #expect(outputDelegate.errors == [])
+            #expect(outputDelegate.warnings == [])
+            #expect(outputDelegate.notes == [])
 
-        // Check the output.
-        do {
-            // Get the input strings in UTF-16 encoding.
-            let data = inputContents.data(using: String.Encoding.utf16)!
-            let byteString = ByteString(data)
+            // Check the output.
+            do {
+                // Get the input strings in UTF-16 encoding.
+                let data = inputContents.data(using: String.Encoding.utf16)!
+                let byteString = ByteString(data)
 
-            // Compare what the tool emitted to the UTF-32-encoded version of the input content.
-            #expect(try executionDelegate.fs.read(Path("/tmp/outputs/input.strings")) == byteString)
+                // Compare what the tool emitted to the UTF-32-encoded version of the input content.
+                #expect(try executionDelegate.fs.read(Path("/tmp/outputs/input.strings")) == byteString)
+            }
         }
-    }
-#endif
+    #endif
 
     @Test
     func UTF32BEToUTF16() async throws {
@@ -847,15 +835,7 @@ fileprivate struct CopyStringsFileTaskTests {
     }
 
     let badInputContents =
-    "//\n" +
-    "// input.strings\n" +
-    "//\n" +
-    "\n" +
-    "// SomeValue\n" +
-    "\"SomeValue\" = \"This is the first value.\"\n" +
-    "\n" +
-    "// Another Value\n" +
-    "\"Another Value\" =| \"This is the second value.\"\n"
+        "//\n" + "// input.strings\n" + "//\n" + "\n" + "// SomeValue\n" + "\"SomeValue\" = \"This is the first value.\"\n" + "\n" + "// Another Value\n" + "\"Another Value\" =| \"This is the second value.\"\n"
 
     @Test
     func validationFailure() async throws {
diff --git a/Tests/SWBTaskExecutionTests/CopyTiffTaskTests.swift b/Tests/SWBTaskExecutionTests/CopyTiffTaskTests.swift
index dd88aeff..1db7097c 100644
--- a/Tests/SWBTaskExecutionTests/CopyTiffTaskTests.swift
+++ b/Tests/SWBTaskExecutionTests/CopyTiffTaskTests.swift
@@ -18,7 +18,7 @@ import SWBTaskExecution
 import SWBTestSupport
 import SWBUtil
 
-@Suite(.requireHostOS(.macOS)) // `tiffutil` only exists on macOS
+@Suite(.requireHostOS(.macOS))  // `tiffutil` only exists on macOS
 fileprivate struct CopyTiffTaskTests {
     @Test
     func diagnostics() async {
diff --git a/Tests/SWBTaskExecutionTests/FileCopyTaskTests.swift b/Tests/SWBTaskExecutionTests/FileCopyTaskTests.swift
index d27708d8..c24f8a9d 100644
--- a/Tests/SWBTaskExecutionTests/FileCopyTaskTests.swift
+++ b/Tests/SWBTaskExecutionTests/FileCopyTaskTests.swift
@@ -123,9 +123,9 @@ fileprivate struct FileCopyTaskTests {
 
             // Examine the error messages.
             #if canImport(Darwin)
-            XCTAssertMatch(outputDelegate.errors, [.suffix("The file “MissingFile.bogus” couldn’t be opened because there is no such file.")])
+                XCTAssertMatch(outputDelegate.errors, [.suffix("The file “MissingFile.bogus” couldn’t be opened because there is no such file.")])
             #else
-            XCTAssertMatch(outputDelegate.errors, [.suffix("The operation could not be completed. The file doesn’t exist.")])
+                XCTAssertMatch(outputDelegate.errors, [.suffix("The operation could not be completed. The file doesn’t exist.")])
             #endif
         }
     }
diff --git a/Tests/SWBTaskExecutionTests/InProcessTaskTestSupport.swift b/Tests/SWBTaskExecutionTests/InProcessTaskTestSupport.swift
index 319f91a1..6a0fba57 100644
--- a/Tests/SWBTaskExecutionTests/InProcessTaskTestSupport.swift
+++ b/Tests/SWBTaskExecutionTests/InProcessTaskTestSupport.swift
@@ -60,7 +60,7 @@ struct MockExecutionDelegate: TaskExecutionDelegate {
 }
 
 struct MockTaskExecutionClientDelegate: TaskExecutionClientDelegate {
-    func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String : String]) async throws -> ExternalToolResult {
+    func executeExternalTool(commandLine: [String], workingDirectory: Path?, environment: [String: String]) async throws -> ExternalToolResult {
         .deferred
     }
 }
@@ -84,17 +84,17 @@ final class MockTaskOutputDelegate: TaskOutputDelegate {
         }
     }
 
-    var counters: [SWBProtocol.BuildOperationMetrics.Counter : Int] {
+    var counters: [SWBProtocol.BuildOperationMetrics.Counter: Int] {
         state.state.withLock { $0.counters }
     }
 
-    var taskCounters: [SWBProtocol.BuildOperationMetrics.TaskCounter : Int] {
+    var taskCounters: [SWBProtocol.BuildOperationMetrics.TaskCounter: Int] {
         state.state.withLock { $0.taskCounters }
     }
 
     struct State {
-        var counters: [BuildOperationMetrics.Counter : Int] = [:]
-        var taskCounters: [BuildOperationMetrics.TaskCounter : Int] = [:]
+        var counters: [BuildOperationMetrics.Counter: Int] = [:]
+        var taskCounters: [BuildOperationMetrics.TaskCounter: Int] = [:]
         var messages: [String] = []
         var errors: [String] = []
         var warnings: [String] = []
@@ -225,7 +225,7 @@ final class MockTaskOutputDelegate: TaskOutputDelegate {
 final class MockTaskTypeDescription: TaskTypeDescription {
     let isUnsafeToInterrupt: Bool = false
 
-    init() { }
+    init() {}
 
     let payloadType: (any TaskPayload.Type)? = nil
     var toolBasenameAliases: [String] { return [] }
diff --git a/Tests/SWBTaskExecutionTests/InfoPlistProcessorTaskTests.swift b/Tests/SWBTaskExecutionTests/InfoPlistProcessorTaskTests.swift
index c099461c..b31fe428 100644
--- a/Tests/SWBTaskExecutionTests/InfoPlistProcessorTaskTests.swift
+++ b/Tests/SWBTaskExecutionTests/InfoPlistProcessorTaskTests.swift
@@ -134,11 +134,14 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
             let action = InfoPlistProcessorTaskAction(try prepareContext(InfoPlistProcessorTaskActionContext(scope: scope, productType: nil, platform: platform, sdk: sdk, sdkVariant: nil, cleanupRequiredArchitectures: []), fs: executionDelegate.fs))
 
             try executionDelegate.fs.createDirectory(Path.root.join("tmp"))
-            try await executionDelegate.fs.writePlist(Path("/tmp/input.plist"), [
-                "CFBundleDevelopmentRegion": "en",
-                "Integer": 1,
-                "Array": [1, 2],
-            ])
+            try await executionDelegate.fs.writePlist(
+                Path("/tmp/input.plist"),
+                [
+                    "CFBundleDevelopmentRegion": "en",
+                    "Integer": 1,
+                    "Array": [1, 2],
+                ]
+            )
             try await setup(executionDelegate.fs)
 
             var commandLine = ["builtin-infoPlistUtility", "-platform", platformName, "/tmp/input.plist"]
@@ -164,14 +167,20 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
 
         // Test trying to merge incompatible types.
         try await checkAdditionalContentDiagnostics(["/tmp/bad.plist"], errors: ["tried to merge array value for key \'Integer\' onto integer value"]) { fs in
-            try await fs.writePlist(Path("/tmp/bad.plist"), [
-                "Integer": [1, 2],
-            ])
+            try await fs.writePlist(
+                Path("/tmp/bad.plist"),
+                [
+                    "Integer": [1, 2]
+                ]
+            )
         }
         try await checkAdditionalContentDiagnostics(["/tmp/bad.plist"], errors: ["tried to merge string value for key \'Array\' onto array value"]) { fs in
-            try await fs.writePlist(Path("/tmp/bad.plist"), [
-                "Array": "string",
-            ])
+            try await fs.writePlist(
+                Path("/tmp/bad.plist"),
+                [
+                    "Array": "string"
+                ]
+            )
         }
     }
 
@@ -225,63 +234,74 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
         let action = InfoPlistProcessorTaskAction(try prepareContext(InfoPlistProcessorTaskActionContext(scope: scope, productType: nil, platform: platform, sdk: sdk, sdkVariant: nil, cleanupRequiredArchitectures: []), fs: executionDelegate.fs))
         let task = Task(forTarget: nil, ruleInfo: [], commandLine: ["builtin-infoPlistUtility", "-enforceminimumos", "-genpkginfo", "/tmp/PkgInfo", "-expandbuildsettings", "-platform", platformName, "/tmp/input.plist", "-additionalcontentfile", "/tmp/newcontent.plist", "-additionalcontentfile", "/tmp/mergecontent.plist", "-additionalcontentfile", "/tmp/required.plist", "-o", "/tmp/output.plist"], workingDirectory: Path.root.join("tmp"), outputs: [], action: action, execDescription: "Copy Info.plist")
 
-
         // Write the test files.
         try executionDelegate.fs.createDirectory(Path.root.join("tmp"))
         do {
-            try await executionDelegate.fs.writePlist(Path("/tmp/input.plist"), [
-                "CFBundleDevelopmentRegion": "en",
-                "CFBundleExecutable": "$(EXECUTABLE_NAME)",
-                "CFBundleIdentifier": "$(PRODUCT_BUNDLE_IDENTIFIER)",
-                "CFBundleName": "$(PRODUCT_NAME)",
-                "CFBundlePackageType": "APPL",
-                "CFBundleSignature": "FOOZ",
-                "CFBundleVersion": "1",
-                // "LSMinimumSystemVersion": "$(MACOSX_DEPLOYMENT_TARGET)", this is commented out to test that -enforceminimumos works
-                "NSMainNibFile": "MainMenu",
-                "NSPrincipalClass": "NSApplication",
-                "CFBundleResourceSpecification": "",                // To test eliding empty string values
-                "DoNotElide": "",                                   // To test *not* eliding empty string values which are not among keys we should elide
-                "AsideBundleIdentifier": "$(CFBundleIdentifier)",   // To test evaluating $(CFBundleIdentifier)
-                "TestVersionString": "$(VERSION_STRING)",           // To test that quotes are preserved when evaluating a user-defined macro in string form
-
-                // Content that will get merged with content from the additional content files.
-                "IntToInt": 1,
-                "IntToString": 2,
-                "MergeArray": [1, 2],
-                "MergeDict": ["one": "one", "two": "two"],
-                "UIRequiredDeviceCapabilities": ["arm64"],
-            ])
+            try await executionDelegate.fs.writePlist(
+                Path("/tmp/input.plist"),
+                [
+                    "CFBundleDevelopmentRegion": "en",
+                    "CFBundleExecutable": "$(EXECUTABLE_NAME)",
+                    "CFBundleIdentifier": "$(PRODUCT_BUNDLE_IDENTIFIER)",
+                    "CFBundleName": "$(PRODUCT_NAME)",
+                    "CFBundlePackageType": "APPL",
+                    "CFBundleSignature": "FOOZ",
+                    "CFBundleVersion": "1",
+                    // "LSMinimumSystemVersion": "$(MACOSX_DEPLOYMENT_TARGET)", this is commented out to test that -enforceminimumos works
+                    "NSMainNibFile": "MainMenu",
+                    "NSPrincipalClass": "NSApplication",
+                    "CFBundleResourceSpecification": "",  // To test eliding empty string values
+                    "DoNotElide": "",  // To test *not* eliding empty string values which are not among keys we should elide
+                    "AsideBundleIdentifier": "$(CFBundleIdentifier)",  // To test evaluating $(CFBundleIdentifier)
+                    "TestVersionString": "$(VERSION_STRING)",  // To test that quotes are preserved when evaluating a user-defined macro in string form
+
+                    // Content that will get merged with content from the additional content files.
+                    "IntToInt": 1,
+                    "IntToString": 2,
+                    "MergeArray": [1, 2],
+                    "MergeDict": ["one": "one", "two": "two"],
+                    "UIRequiredDeviceCapabilities": ["arm64"],
+                ]
+            )
         }
         do {
-            try await executionDelegate.fs.writePlist(Path("/tmp/newcontent.plist"), [
-                "Integer": 1,
-                "String": "string",
-                "Array": [1, 2],
-                "Dict": [
-                    "one": "one",
-                    "two": "two",
-                ],
-            ])
+            try await executionDelegate.fs.writePlist(
+                Path("/tmp/newcontent.plist"),
+                [
+                    "Integer": 1,
+                    "String": "string",
+                    "Array": [1, 2],
+                    "Dict": [
+                        "one": "one",
+                        "two": "two",
+                    ],
+                ]
+            )
         }
         do {
-            try await executionDelegate.fs.writePlist(Path("/tmp/mergecontent.plist"), [
-                "IntToInt": 5,
-                "IntToString": "string",
-                "MergeArray": [1, 4],
-                "MergeDict": [
-                    "two": "three",
-                    "four": "four",
-                ],
-            ])
+            try await executionDelegate.fs.writePlist(
+                Path("/tmp/mergecontent.plist"),
+                [
+                    "IntToInt": 5,
+                    "IntToString": "string",
+                    "MergeArray": [1, 4],
+                    "MergeDict": [
+                        "two": "three",
+                        "four": "four",
+                    ],
+                ]
+            )
         }
         do {
             // This will cause the array form in the base Info.plist to be promoted to a dictionary.
-            try await executionDelegate.fs.writePlist(Path("/tmp/required.plist"), [
-                "UIRequiredDeviceCapabilities": [
-                    "armv7": true,
-                ],
-            ])
+            try await executionDelegate.fs.writePlist(
+                Path("/tmp/required.plist"),
+                [
+                    "UIRequiredDeviceCapabilities": [
+                        "armv7": true
+                    ]
+                ]
+            )
         }
 
         let outputDelegate = MockTaskOutputDelegate()
@@ -330,8 +350,7 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
             if let supportedPlatformsArray = dict["CFBundleSupportedPlatforms"]?.arrayValue {
                 let supportedPlatforms = supportedPlatformsArray.map { $0.stringValue }
                 #expect(supportedPlatforms == ["MacOSX"])
-            }
-            else {
+            } else {
                 Issue.record("CFBundleSupportedPlatforms is not an array.")
             }
             #expect(dict["BuildMachineOSBuild"]?.stringValue == "15E35")
@@ -382,18 +401,21 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
 
             // Write the test files.
             try executionDelegate.fs.createDirectory(Path.root.join("tmp"))
-            try await executionDelegate.fs.writePlist(Path("/tmp/input.plist"), [
-                "CFBundleDevelopmentRegion": "en",
-                "CFBundleExecutable": "$(EXECUTABLE_NAME)",
-                "CFBundleIdentifier": "$(PRODUCT_BUNDLE_IDENTIFIER)",
-                "CFBundleName": "$(PRODUCT_NAME)",
-                "CFBundlePackageType": "APPL",
-                "CFBundleSignature": "FOOZ",
-                "CFBundleVersion": "1",
-                "LSMinimumSystemVersion": "$(MINIMUM_SYSTEM_VERSION)",      // To check that the value of this key from the platform does not replace this value.
-                "NSMainNibFile": "MainMenu",
-                "NSPrincipalClass": "NSApplication",
-            ])
+            try await executionDelegate.fs.writePlist(
+                Path("/tmp/input.plist"),
+                [
+                    "CFBundleDevelopmentRegion": "en",
+                    "CFBundleExecutable": "$(EXECUTABLE_NAME)",
+                    "CFBundleIdentifier": "$(PRODUCT_BUNDLE_IDENTIFIER)",
+                    "CFBundleName": "$(PRODUCT_NAME)",
+                    "CFBundlePackageType": "APPL",
+                    "CFBundleSignature": "FOOZ",
+                    "CFBundleVersion": "1",
+                    "LSMinimumSystemVersion": "$(MINIMUM_SYSTEM_VERSION)",  // To check that the value of this key from the platform does not replace this value.
+                    "NSMainNibFile": "MainMenu",
+                    "NSPrincipalClass": "NSApplication",
+                ]
+            )
 
             let outputDelegate = MockTaskOutputDelegate()
             let result = await action.performTaskAction(
@@ -423,8 +445,7 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
                 if let supportedPlatformsArray = dict["CFBundleSupportedPlatforms"]?.arrayValue {
                     let supportedPlatforms = supportedPlatformsArray.map { $0.stringValue }
                     #expect(supportedPlatforms == ["MacOSX"])
-                }
-                else {
+                } else {
                     Issue.record("CFBundleSupportedPlatforms is not an array.")
                 }
                 #expect(dict["DTCompiler"]?.stringValue == "com.apple.compilers.llvm.clang.1_0")
@@ -451,14 +472,14 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
         ]
 
         let INFOPLIST_FILE_CONTENTS = """
-        <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-        <plist version="1.0">
-            <dict>
-                <key>Key2</key><string>NewValue2</string>
-                <key>Key3</key><string>NewValue3</string>
-            </dict>
-        </plist>
-        """
+            <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+            <plist version="1.0">
+                <dict>
+                    <key>Key2</key><string>NewValue2</string>
+                    <key>Key3</key><string>NewValue3</string>
+                </dict>
+            </plist>
+            """
 
         // Test building for iOS.
         do {
@@ -489,20 +510,19 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
             minimumSystemVersionKey = "MinimumOSVersion"
         }
         let plistData: [String: PropertyListItem] = [
-            minimumSystemVersionKey: .plString(minimumSystemVersion),
+            minimumSystemVersionKey: .plString(minimumSystemVersion)
         ]
         let scope = try createMockScope(debugDescription: "\(#function)_\(platformName)") { namespace, table in
             let sdkName = sdkName ?? platformName
             table.push(try #require(namespace.lookupMacroDeclaration("SDKROOT") as? PathMacroDeclaration), literal: sdkName)
-            table.push(try #require(namespace.lookupMacroDeclaration("SDK_NAME") as? StringMacroDeclaration), literal: "")                         // This is wrong but we don't have a good way to override this with the real version
+            table.push(try #require(namespace.lookupMacroDeclaration("SDK_NAME") as? StringMacroDeclaration), literal: "")  // This is wrong but we don't have a good way to override this with the real version
             table.push(try #require(namespace.lookupMacroDeclaration("SDK_VARIANT") as? StringMacroDeclaration), literal: sdkVariant)
             table.push(try #require(namespace.lookupMacroDeclaration("DEPLOYMENT_TARGET_SETTING_NAME") as? StringMacroDeclaration), literal: deploymentTargetName)
             table.push(try #require(namespace.lookupMacroDeclaration(deploymentTargetName) as? StringMacroDeclaration), literal: deploymentTarget)
             // I'm not sure why createMockScope() includes a particular and strange value for TARGET_DEVICE_FAMILY, but we override it here.
             if sdkVariant == MacCatalystInfo.sdkVariantName {
-                table.push(try #require(namespace.lookupMacroDeclaration("TARGETED_DEVICE_FAMILY") as? StringMacroDeclaration), literal: "6")      // 6 is Mac
-            }
-            else {
+                table.push(try #require(namespace.lookupMacroDeclaration("TARGETED_DEVICE_FAMILY") as? StringMacroDeclaration), literal: "6")  // 6 is Mac
+            } else {
                 table.push(try #require(namespace.lookupMacroDeclaration("TARGETED_DEVICE_FAMILY") as? StringMacroDeclaration), literal: "")
             }
         }
@@ -646,13 +666,13 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
         let services: [[String: PropertyListItem]] = [
             [
                 "NSMenuItem": [
-                    "default": "Stuff",
+                    "default": "Stuff"
                 ],
                 "NSMessage": "This doesn't work",
             ],
             [
                 "NSMenuItem": [
-                    "default": "More",
+                    "default": "More"
                 ],
                 "NSMessage": "This one does",
             ],
@@ -709,7 +729,6 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
                 #expect(dict["Foo"]?.stringValue ?? "" == "Bar")
                 #expect(dict["LSApplicationCategoryType"]?.stringValue == "public.app-category.entertainment")
 
-
                 // Check that macOS-specific keys are present.
                 #expect(dict["NSSupportsAutomaticTermination"]?.boolValue == true)
                 #expect(dict["NSSupportsSuddenTermination"]?.boolValue == false)
@@ -735,7 +754,7 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
     func processingInfoPlistForMacCatalyst() async throws {
         do {
             let plistData: [String: PropertyListItem] = [
-                "Foo": "Bar",
+                "Foo": "Bar"
             ]
             let scope = try createMockScope(debugDescription: "\(#function)_app_macCatalyst_missing") { namespace, table in
                 table.push(try #require(namespace.lookupMacroDeclaration("SDK_VARIANT") as? StringMacroDeclaration), literal: MacCatalystInfo.sdkVariantName)
@@ -775,14 +794,12 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
                 #expect(dict["Foo"]?.stringValue == "Bar")
                 if let autoTerm = dict["NSSupportsAutomaticTermination"]?.boolValue {
                     #expect(!autoTerm)
-                }
-                else {
+                } else {
                     Issue.record("NSSupportsAutomaticTermination not found")
                 }
                 if let suddenTerm = dict["NSSupportsSuddenTermination"]?.boolValue {
                     #expect(!suddenTerm)
-                }
-                else {
+                } else {
                     Issue.record("NSSupportsSuddenTermination not found")
                 }
 
@@ -800,7 +817,7 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
         // Test that keys are not added if absent when building a non-application for macCatalyst.
         do {
             let plistData: [String: PropertyListItem] = [
-                "Foo": "Bar",
+                "Foo": "Bar"
             ]
             let scope = try createMockScope(debugDescription: "\(#function)_nonapp_macCatalyst_present") { namespace, table in
                 table.push(try #require(namespace.lookupMacroDeclaration("SDK_VARIANT") as? StringMacroDeclaration), literal: MacCatalystInfo.sdkVariantName)
@@ -826,7 +843,7 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
         // Test that keys are not added if absent when building an application for iOS.
         do {
             let plistData: [String: PropertyListItem] = [
-                "Foo": "Bar",
+                "Foo": "Bar"
             ]
             let scope = try createMockScope(debugDescription: "\(#function)_app_ios_missing") { namespace, table in
                 table.push(try #require(namespace.lookupMacroDeclaration("SDK_VARIANT") as? StringMacroDeclaration), literal: MacCatalystInfo.sdkVariantName)
@@ -852,7 +869,7 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
         // Test that keys are not added if absent when building an application for macOS (not macCatalyst).
         do {
             let plistData: [String: PropertyListItem] = [
-                "Foo": "Bar",
+                "Foo": "Bar"
             ]
             let scope = try createMockScope(debugDescription: "\(#function)_app_ios_missing") { namespace, table in
                 table.push(try #require(namespace.lookupMacroDeclaration("TARGETED_DEVICE_FAMILY") as? StringMacroDeclaration), literal: "2")
@@ -894,7 +911,7 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
             "nearby-interaction",
             "processing",
             "push-to-talk",
-        ]
+        ],
     ]
 
     /// When processing an Info.plist configured to build for iOS.
@@ -1262,9 +1279,12 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
 
         // Write the test files.
         try executionDelegate.fs.createDirectory(Path.root.join("tmp"))
-        try await executionDelegate.fs.writePlist(Path("/tmp/input.plist"), [
-            "UIRequiredDeviceCapabilities": ["arm64"],
-        ])
+        try await executionDelegate.fs.writePlist(
+            Path("/tmp/input.plist"),
+            [
+                "UIRequiredDeviceCapabilities": ["arm64"]
+            ]
+        )
 
         let outputDelegate = MockTaskOutputDelegate()
         let result = await action.performTaskAction(
@@ -1306,11 +1326,14 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
 
         // Write the test files.
         try executionDelegate.fs.createDirectory(Path.root.join("tmp"))
-        try await executionDelegate.fs.writePlist(Path("/tmp/input.plist"), [
-            "UIRequiredDeviceCapabilities": [
-                "arm64": true
+        try await executionDelegate.fs.writePlist(
+            Path("/tmp/input.plist"),
+            [
+                "UIRequiredDeviceCapabilities": [
+                    "arm64": true
+                ]
             ]
-        ])
+        )
 
         let outputDelegate = MockTaskOutputDelegate()
         let result = await action.performTaskAction(
@@ -1352,11 +1375,14 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
 
         // Write the test files.
         try executionDelegate.fs.createDirectory(Path.root.join("tmp"))
-        try await executionDelegate.fs.writePlist(Path("/tmp/input.plist"), [
-            "UIRequiredDeviceCapabilities": [
-                "armv6": true
-            ],
-        ])
+        try await executionDelegate.fs.writePlist(
+            Path("/tmp/input.plist"),
+            [
+                "UIRequiredDeviceCapabilities": [
+                    "armv6": true
+                ]
+            ]
+        )
 
         let outputDelegate = MockTaskOutputDelegate()
         let result = await action.performTaskAction(
@@ -1403,9 +1429,12 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
 
         // Write the test files.
         try executionDelegate.fs.createDirectory(Path.root.join("tmp"))
-        try await executionDelegate.fs.writePlist(Path("/tmp/input.plist"), .plDict([
-            "CFBundleShortVersionString": .plString("1.0"),
-        ]))
+        try await executionDelegate.fs.writePlist(
+            Path("/tmp/input.plist"),
+            .plDict([
+                "CFBundleShortVersionString": .plString("1.0")
+            ])
+        )
 
         let outputDelegate = MockTaskOutputDelegate()
         let result = await action.performTaskAction(
@@ -1448,9 +1477,12 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
         let action = InfoPlistProcessorTaskAction(try prepareContext(InfoPlistProcessorTaskActionContext(scope: scope, productType: nil, platform: platform, sdk: core.sdkRegistry.lookup(platformName), sdkVariant: nil, cleanupRequiredArchitectures: []), fs: executionDelegate.fs))
         let task = Task(forTarget: nil, ruleInfo: [], commandLine: ["builtin-infoPlistUtility", "-platform", platformName, "/tmp/input.plist", "-o", "/tmp/output.plist"], workingDirectory: Path.root.join("tmp"), outputs: [], action: action, execDescription: "Copy Info.plist")
         try executionDelegate.fs.createDirectory(Path.root.join("tmp"))
-        try await executionDelegate.fs.writePlist(Path("/tmp/input.plist"), [
-            "CFBundleIdentifier": "abcdefghijklmnopqrstuvwxyz-0123456789.ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-        ])
+        try await executionDelegate.fs.writePlist(
+            Path("/tmp/input.plist"),
+            [
+                "CFBundleIdentifier": "abcdefghijklmnopqrstuvwxyz-0123456789.ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+            ]
+        )
         let outputDelegate = MockTaskOutputDelegate()
         let result = await action.performTaskAction(
             task,
@@ -1478,9 +1510,12 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
         let action = InfoPlistProcessorTaskAction(try prepareContext(InfoPlistProcessorTaskActionContext(scope: scope, productType: nil, platform: platform, sdk: core.sdkRegistry.lookup(platformName), sdkVariant: nil, cleanupRequiredArchitectures: []), fs: executionDelegate.fs))
         let task = Task(forTarget: nil, ruleInfo: [], commandLine: ["builtin-infoPlistUtility", "-platform", platformName, "/tmp/input.plist", "-o", "/tmp/output.plist"], workingDirectory: Path.root.join("tmp"), outputs: [], action: action, execDescription: "Copy Info.plist")
         try executionDelegate.fs.createDirectory(Path.root.join("tmp"))
-        try await executionDelegate.fs.writePlist(Path("/tmp/input.plist"), [
-            "CFBundleIdentifier": "32XN53XSGF.com.apple.foo"
-        ])
+        try await executionDelegate.fs.writePlist(
+            Path("/tmp/input.plist"),
+            [
+                "CFBundleIdentifier": "32XN53XSGF.com.apple.foo"
+            ]
+        )
         let outputDelegate = MockTaskOutputDelegate()
         let result = await action.performTaskAction(
             task,
@@ -1546,10 +1581,13 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
         let action = InfoPlistProcessorTaskAction(try prepareContext(InfoPlistProcessorTaskActionContext(scope: scope, productType: nil, platform: platform, sdk: core.sdkRegistry.lookup(platformName), sdkVariant: nil, cleanupRequiredArchitectures: []), fs: executionDelegate.fs))
         let task = Task(forTarget: nil, ruleInfo: [], commandLine: ["builtin-infoPlistUtility", "-expandbuildsettings", "-platform", platformName, "/tmp/input.plist", "-o", "/tmp/output.plist", "-genpkginfo", "/tmp/PkgInfo"], workingDirectory: Path.root.join("tmp"), outputs: [], action: action, execDescription: "Copy Info.plist")
         try executionDelegate.fs.createDirectory(Path.root.join("tmp"))
-        try await executionDelegate.fs.writePlist(Path("/tmp/input.plist"), [
-            "CFBundlePackageType": "$(package_type)",
-            "CFBundleSignature": "$(package_signature)"
-        ])
+        try await executionDelegate.fs.writePlist(
+            Path("/tmp/input.plist"),
+            [
+                "CFBundlePackageType": "$(package_type)",
+                "CFBundleSignature": "$(package_signature)",
+            ]
+        )
         let outputDelegate = MockTaskOutputDelegate()
         let result = await action.performTaskAction(
             task,
@@ -1588,10 +1626,13 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
 
         // Write the test files.
         try executionDelegate.fs.createDirectory(Path.root.join("tmp"))
-        try await executionDelegate.fs.writePlist(Path("/tmp/input.plist"), [
-            "CFBundlePackageType": "package_type",
-            "CFBundleSignature": "package_signature"
-        ])
+        try await executionDelegate.fs.writePlist(
+            Path("/tmp/input.plist"),
+            [
+                "CFBundlePackageType": "package_type",
+                "CFBundleSignature": "package_signature",
+            ]
+        )
 
         let outputDelegate = MockTaskOutputDelegate()
         let result = await action.performTaskAction(
@@ -1606,10 +1647,12 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
             return
         }
 
-        #expect(outputDelegate.warnings == [
-            "warning: value 'package_type' for 'CFBundlePackageType' in 'Info.plist' must be a four character string",
-            "warning: value 'package_signature' for 'CFBundleSignature' in 'Info.plist' must be a four character string",
-        ])
+        #expect(
+            outputDelegate.warnings == [
+                "warning: value 'package_type' for 'CFBundlePackageType' in 'Info.plist' must be a four character string",
+                "warning: value 'package_signature' for 'CFBundleSignature' in 'Info.plist' must be a four character string",
+            ]
+        )
     }
 
     @Test
@@ -1788,9 +1831,11 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
             table.push(try namespace.declareStringMacro("DEPLOYMENT_TARGET_SETTING_NAME"), literal: deploymentTargetSettingName)
             let scope = MacroEvaluationScope(table: table)
             try await createAndRunTaskAction(inputPlistData: testNSExceptionMinimumTLSVersionDeprecationWarningPlistData, scope: scope, platformName: platformName) { result, dict, outputDelegate in
-                #expect(outputDelegate.warnings == [
-                    "warning: The value \"TLSv1.0\" for 'NSAppTransportSecurity' => 'NSExceptionDomains' => 'apple.com' => 'NSExceptionMinimumTLSVersion' has been deprecated starting in \(platformFamilyName) \(newDeploymentTarget), use TLSv1.2 or TLSv1.3 instead."
-                ])
+                #expect(
+                    outputDelegate.warnings == [
+                        "warning: The value \"TLSv1.0\" for 'NSAppTransportSecurity' => 'NSExceptionDomains' => 'apple.com' => 'NSExceptionMinimumTLSVersion' has been deprecated starting in \(platformFamilyName) \(newDeploymentTarget), use TLSv1.2 or TLSv1.3 instead."
+                    ]
+                )
             }
         }
     }
@@ -1831,10 +1876,13 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
             let action = InfoPlistProcessorTaskAction(try prepareContext(InfoPlistProcessorTaskActionContext(scope: scope, productType: nil, platform: platform, sdk: core.sdkRegistry.lookup(platformName), sdkVariant: nil, cleanupRequiredArchitectures: []), fs: executionDelegate.fs))
             let task = Task(forTarget: nil, ruleInfo: [], commandLine: ["builtin-infoPlistUtility", "-platform", platformName, "/tmp/input.plist", "-o", "/tmp/output.plist"], workingDirectory: Path.root.join("tmp"), outputs: [], action: action, execDescription: "Copy Info.plist")
             try executionDelegate.fs.createDirectory(Path.root.join("tmp"))
-            try await executionDelegate.fs.writePlist(Path("/tmp/input.plist"), [
-                "CFBundleIdentifier": "a.b.c",
-                "CFBundleDocumentTypes": [] as PropertyListItem
-            ])
+            try await executionDelegate.fs.writePlist(
+                Path("/tmp/input.plist"),
+                [
+                    "CFBundleIdentifier": "a.b.c",
+                    "CFBundleDocumentTypes": [] as PropertyListItem,
+                ]
+            )
             let outputDelegate = MockTaskOutputDelegate()
             let result = await action.performTaskAction(
                 task,
@@ -1856,14 +1904,18 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
             let action = InfoPlistProcessorTaskAction(try prepareContext(InfoPlistProcessorTaskActionContext(scope: scope, productType: nil, platform: platform, sdk: core.sdkRegistry.lookup(platformName), sdkVariant: nil, cleanupRequiredArchitectures: []), fs: executionDelegate.fs))
             let task = Task(forTarget: nil, ruleInfo: [], commandLine: ["builtin-infoPlistUtility", "-platform", platformName, "/tmp/input.plist", "-o", "/tmp/output.plist"], workingDirectory: Path.root.join("tmp"), outputs: [], action: action, execDescription: "Copy Info.plist")
             try executionDelegate.fs.createDirectory(Path.root.join("tmp"))
-            try await executionDelegate.fs.writePlist(Path("/tmp/input.plist"), [
-                "CFBundleIdentifier": "a.b.c",
-                "CFBundleDocumentTypes": [
-                    [   "CFBundleTypeRole": "Viewer",
-                        "CFBundleTypeExtensions": [ "dat" ]
-                    ] as PropertyListItem
+            try await executionDelegate.fs.writePlist(
+                Path("/tmp/input.plist"),
+                [
+                    "CFBundleIdentifier": "a.b.c",
+                    "CFBundleDocumentTypes": [
+                        [
+                            "CFBundleTypeRole": "Viewer",
+                            "CFBundleTypeExtensions": ["dat"],
+                        ] as PropertyListItem
+                    ],
                 ]
-            ])
+            )
             let outputDelegate = MockTaskOutputDelegate()
             let result = await action.performTaskAction(
                 task,
@@ -1885,15 +1937,19 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
             let action = InfoPlistProcessorTaskAction(try prepareContext(InfoPlistProcessorTaskActionContext(scope: scope, productType: nil, platform: platform, sdk: core.sdkRegistry.lookup(platformName), sdkVariant: nil, cleanupRequiredArchitectures: []), fs: executionDelegate.fs))
             let task = Task(forTarget: nil, ruleInfo: [], commandLine: ["builtin-infoPlistUtility", "-platform", platformName, "/tmp/input.plist", "-o", "/tmp/output.plist"], workingDirectory: Path.root.join("tmp"), outputs: [], action: action, execDescription: "Copy Info.plist")
             try executionDelegate.fs.createDirectory(Path.root.join("tmp"))
-            try await executionDelegate.fs.writePlist(Path("/tmp/input.plist"), [
-                "CFBundleIdentifier": "a.b.c",
-                "CFBundleDocumentTypes": [
-                    [   "CFBundleTypeRole": "Viewer",
-                        "CFBundleTypeExtensions": [ "dat" ]
-                    ] as PropertyListItem
-                ],
-                "LSSupportsOpeningDocumentsInPlace": false
-            ])
+            try await executionDelegate.fs.writePlist(
+                Path("/tmp/input.plist"),
+                [
+                    "CFBundleIdentifier": "a.b.c",
+                    "CFBundleDocumentTypes": [
+                        [
+                            "CFBundleTypeRole": "Viewer",
+                            "CFBundleTypeExtensions": ["dat"],
+                        ] as PropertyListItem
+                    ],
+                    "LSSupportsOpeningDocumentsInPlace": false,
+                ]
+            )
             let outputDelegate = MockTaskOutputDelegate()
             let result = await action.performTaskAction(
                 task,
@@ -1915,15 +1971,19 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
             let action = InfoPlistProcessorTaskAction(try prepareContext(InfoPlistProcessorTaskActionContext(scope: scope, productType: nil, platform: platform, sdk: core.sdkRegistry.lookup(platformName), sdkVariant: nil, cleanupRequiredArchitectures: []), fs: executionDelegate.fs))
             let task = Task(forTarget: nil, ruleInfo: [], commandLine: ["builtin-infoPlistUtility", "-platform", platformName, "/tmp/input.plist", "-o", "/tmp/output.plist"], workingDirectory: Path.root.join("tmp"), outputs: [], action: action, execDescription: "Copy Info.plist")
             try executionDelegate.fs.createDirectory(Path.root.join("tmp"))
-            try await executionDelegate.fs.writePlist(Path("/tmp/input.plist"), [
-                "CFBundleIdentifier": "a.b.c",
-                "CFBundleDocumentTypes": [
-                    [   "CFBundleTypeRole": "Viewer",
-                        "CFBundleTypeExtensions": [ "dat" ]
-                    ] as PropertyListItem
-                ],
-                "UISupportsDocumentBrowser": false
-            ])
+            try await executionDelegate.fs.writePlist(
+                Path("/tmp/input.plist"),
+                [
+                    "CFBundleIdentifier": "a.b.c",
+                    "CFBundleDocumentTypes": [
+                        [
+                            "CFBundleTypeRole": "Viewer",
+                            "CFBundleTypeExtensions": ["dat"],
+                        ] as PropertyListItem
+                    ],
+                    "UISupportsDocumentBrowser": false,
+                ]
+            )
             let outputDelegate = MockTaskOutputDelegate()
             let result = await action.performTaskAction(
                 task,
@@ -1945,14 +2005,18 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
             let action = InfoPlistProcessorTaskAction(try prepareContext(InfoPlistProcessorTaskActionContext(scope: scope, productType: nil, platform: platform, sdk: core.sdkRegistry.lookup(platformName), sdkVariant: nil, cleanupRequiredArchitectures: []), fs: executionDelegate.fs))
             let task = Task(forTarget: nil, ruleInfo: [], commandLine: ["builtin-infoPlistUtility", "-platform", platformName, "/tmp/input.plist", "-o", "/tmp/output.plist"], workingDirectory: Path.root.join("tmp"), outputs: [], action: action, execDescription: "Copy Info.plist")
             try executionDelegate.fs.createDirectory(Path.root.join("tmp"))
-            try await executionDelegate.fs.writePlist(Path("/tmp/input.plist"), [
-                "CFBundleIdentifier": "a.b.c",
-                "CFBundleDocumentTypes": [
-                    [   "CFBundleTypeRole": "Viewer",
-                        "CFBundleTypeExtensions": [ "dat" ]
-                    ] as PropertyListItem
-                ],
-            ])
+            try await executionDelegate.fs.writePlist(
+                Path("/tmp/input.plist"),
+                [
+                    "CFBundleIdentifier": "a.b.c",
+                    "CFBundleDocumentTypes": [
+                        [
+                            "CFBundleTypeRole": "Viewer",
+                            "CFBundleTypeExtensions": ["dat"],
+                        ] as PropertyListItem
+                    ],
+                ]
+            )
             let outputDelegate = MockTaskOutputDelegate()
             let result = await action.performTaskAction(
                 task,
@@ -1980,8 +2044,9 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
             let plistData: [String: PropertyListItem] = [
                 "CFBundleIdentifier": "a.b.c",
                 "CFBundleDocumentTypes": [
-                    [   "CFBundleTypeRole": "Viewer",
-                        "CFBundleTypeExtensions": [ "dat" ]
+                    [
+                        "CFBundleTypeRole": "Viewer",
+                        "CFBundleTypeExtensions": ["dat"],
                     ] as PropertyListItem
                 ],
                 "LSSupportsOpeningDocumentsInPlace": false,
@@ -2016,8 +2081,9 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
             let plistData: [String: PropertyListItem] = [
                 "CFBundleIdentifier": "a.b.c",
                 "CFBundleDocumentTypes": [
-                    [   "CFBundleTypeRole": "Viewer",
-                        "CFBundleTypeExtensions": [ "dat" ]
+                    [
+                        "CFBundleTypeRole": "Viewer",
+                        "CFBundleTypeExtensions": ["dat"],
                     ] as PropertyListItem
                 ],
                 "LSSupportsOpeningDocumentsInPlace": true,
@@ -2105,10 +2171,12 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
             let table = MacroValueAssignmentTable(namespace: namespace)
             let scope = MacroEvaluationScope(table: table)
             try await createAndRunTaskAction(inputPlistData: plistData, scope: scope, platformName: "iphoneos", productTypeId: "com.apple.product-type.application.on-demand-install-capable") { result, dict, outputDelegate in
-                #expect(outputDelegate.warnings == [
-                    "warning: 'CFBundleDocumentTypes' has no effect for App Clip targets and will be ignored.",
-                    "warning: 'LSApplicationQueriesSchemes' has no effect for App Clip targets and will be ignored.",
-                ])
+                #expect(
+                    outputDelegate.warnings == [
+                        "warning: 'CFBundleDocumentTypes' has no effect for App Clip targets and will be ignored.",
+                        "warning: 'LSApplicationQueriesSchemes' has no effect for App Clip targets and will be ignored.",
+                    ]
+                )
             }
         }
     }
@@ -2141,7 +2209,7 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
             if !domains.isEmpty {
                 if let dict = appPlist.dictValue {
                     var dict = dict
-                    dict["NSPrivacyTrackingDomains"] = .plArray(domains.map { .plString($0)} )
+                    dict["NSPrivacyTrackingDomains"] = .plArray(domains.map { .plString($0) })
                     appPlist = .plDict(dict)
                 }
             }
@@ -2151,32 +2219,41 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
             try await executionDelegate.fs.writePlist(Path("/tmp/input.plist"), appPlist)
 
             try executionDelegate.fs.createDirectory(Path("/tmp/frameworkA.framework"))
-            try await executionDelegate.fs.writePlist(Path("/tmp/frameworkA.framework/PrivacyInfo.xcprivacy"), [
-                "NSPrivacyTracking": "YES",
-                "NSPrivacyTrackingDomains": [
-                    "www.frameworka.com",
-                    "internal.frameworka.com",
-                    "www.allframeworks.com",
+            try await executionDelegate.fs.writePlist(
+                Path("/tmp/frameworkA.framework/PrivacyInfo.xcprivacy"),
+                [
+                    "NSPrivacyTracking": "YES",
+                    "NSPrivacyTrackingDomains": [
+                        "www.frameworka.com",
+                        "internal.frameworka.com",
+                        "www.allframeworks.com",
+                    ],
                 ]
-            ])
+            )
 
             try executionDelegate.fs.createDirectory(Path("/tmp/frameworkB.framework/Resources"), recursive: true)
-            try await executionDelegate.fs.writePlist(Path("/tmp/frameworkB.framework/Resources/PrivacyInfo.xcprivacy"), [
-                "NSPrivacyTracking": "YES",
-                "NSPrivacyTrackingDomains": [
-                    "www.allframeworks.com",
-                    "internal.frameworkb.com",
-                    "www.frameworkb.com",
+            try await executionDelegate.fs.writePlist(
+                Path("/tmp/frameworkB.framework/Resources/PrivacyInfo.xcprivacy"),
+                [
+                    "NSPrivacyTracking": "YES",
+                    "NSPrivacyTrackingDomains": [
+                        "www.allframeworks.com",
+                        "internal.frameworkb.com",
+                        "www.frameworkb.com",
+                    ],
                 ]
-            ])
+            )
             // Generic *.xcprivacy files are not supported, they must be named `PrivacyInfo.xcprivacy`; this is currently by convention.
             try executionDelegate.fs.createDirectory(Path("/tmp/frameworkC.framework/Resources"), recursive: true)
-            try await executionDelegate.fs.writePlist(Path("/tmp/frameworkC.framework/Resources/Nope.privacy"), [
-                "NSPrivacyTracking": "YES",
-                "NSPrivacyTrackingDomains": [
-                    "www.nope.com",
+            try await executionDelegate.fs.writePlist(
+                Path("/tmp/frameworkC.framework/Resources/Nope.privacy"),
+                [
+                    "NSPrivacyTracking": "YES",
+                    "NSPrivacyTrackingDomains": [
+                        "www.nope.com"
+                    ],
                 ]
-            ])
+            )
 
             let outputDelegate = MockTaskOutputDelegate()
             let result = await action.performTaskAction(
@@ -2262,10 +2339,10 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
         let inputContent = PropertyListItem.plDict([
             "CFBundleAlternateIcons": [
                 "AppIcon2": [
-                    "NSAppIconComplementingColorName": "AppIcon2-ComplementingColorName",
+                    "NSAppIconComplementingColorName": "AppIcon2-ComplementingColorName"
                 ],
                 "AppIcon3": [
-                    "NSAppIconComplementingColorName": "AppIcon3-ComplementingColorName",
+                    "NSAppIconComplementingColorName": "AppIcon3-ComplementingColorName"
                 ],
             ],
             "CFBundlePrimaryIcon": [
@@ -2275,24 +2352,27 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
                 ],
                 // Overwrite conflicting keys with generated values.
                 "CFBundleIconFiles": PropertyListItem.plArray([
-                    "ReplaceMe",
+                    "ReplaceMe"
                 ]),
                 "CFBundleIconName": "ReplaceMe",
             ],
         ])
-        try await executionDelegate.fs.writePlist(Path("/tmp/input.plist"), .plDict([
-            "CFBundleIcons": inputContent,
-            "CFBundleIcons~ipad": inputContent,
-        ]))
+        try await executionDelegate.fs.writePlist(
+            Path("/tmp/input.plist"),
+            .plDict([
+                "CFBundleIcons": inputContent,
+                "CFBundleIcons~ipad": inputContent,
+            ])
+        )
 
         // `actool` generates a partial Info.plist similar to this for app icons.
         let mergeContent = PropertyListItem.plDict([
             "CFBundleAlternateIcons": [
                 "AppIcon2": [
-                    "CFBundleIconName": "AppIcon2",
+                    "CFBundleIconName": "AppIcon2"
                 ],
                 "AppIcon3": [
-                    "CFBundleIconName": "AppIcon3",
+                    "CFBundleIconName": "AppIcon3"
                 ],
                 "PreserveMe": [
                     "Key": "Value"
@@ -2300,7 +2380,7 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
             ],
             "CFBundlePrimaryIcon": [
                 "CFBundleIconFiles": PropertyListItem.plArray([
-                    "AppIcon60x60",
+                    "AppIcon60x60"
                 ]),
                 "CFBundleIconName": "AppIcon",
             ],
@@ -2309,10 +2389,13 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
                 "Key": "Value"
             ],
         ])
-        try await executionDelegate.fs.writePlist(Path("/tmp/mergecontent.plist"), [
-            "CFBundleIcons": mergeContent,
-            "CFBundleIcons~ipad": mergeContent,
-        ])
+        try await executionDelegate.fs.writePlist(
+            Path("/tmp/mergecontent.plist"),
+            [
+                "CFBundleIcons": mergeContent,
+                "CFBundleIcons~ipad": mergeContent,
+            ]
+        )
 
         let outputDelegate = MockTaskOutputDelegate()
         let result = await action.performTaskAction(
@@ -2357,7 +2440,7 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
                         "NSAppIconComplementingColorName": "AppIcon-ComplementingColorName",
                     ],
                     "CFBundleIconFiles": PropertyListItem.plArray([
-                        "AppIcon60x60",
+                        "AppIcon60x60"
                     ]),
                     "CFBundleIconName": "AppIcon",
                 ],
@@ -2389,12 +2472,15 @@ fileprivate struct InfoPlistProcessorTaskTests: CoreBasedTests {
 
         // Write the test files.
         try executionDelegate.fs.createDirectory(Path.root.join("tmp"))
-        try await executionDelegate.fs.writePlist(Path("/tmp/input.plist"), .plDict([
-            "CFBundleIconName": .plString(""),
-            "NSHomeKitUsageDescription": .plString(""),
-            "NSSiriUsageDescription": .plBool(true),
-            "NSFaceIDUsageDescription": .plString("Used for authentication."),
-        ]))
+        try await executionDelegate.fs.writePlist(
+            Path("/tmp/input.plist"),
+            .plDict([
+                "CFBundleIconName": .plString(""),
+                "NSHomeKitUsageDescription": .plString(""),
+                "NSSiriUsageDescription": .plBool(true),
+                "NSFaceIDUsageDescription": .plString("Used for authentication."),
+            ])
+        )
 
         let outputDelegate = MockTaskOutputDelegate()
         let result = await action.performTaskAction(
diff --git a/Tests/SWBTaskExecutionTests/LSRegisterURLTaskTests.swift b/Tests/SWBTaskExecutionTests/LSRegisterURLTaskTests.swift
index 0861a740..1728865b 100644
--- a/Tests/SWBTaskExecutionTests/LSRegisterURLTaskTests.swift
+++ b/Tests/SWBTaskExecutionTests/LSRegisterURLTaskTests.swift
@@ -18,7 +18,7 @@ import SWBTaskExecution
 import SWBTestSupport
 import SWBUtil
 
-@Suite(.requireHostOS(.macOS)) // `LSRegisterURL` only exists on macOS
+@Suite(.requireHostOS(.macOS))  // `LSRegisterURL` only exists on macOS
 fileprivate struct LSRegisterURLTests {
     @Test
     func diagnostics() async {
@@ -50,7 +50,12 @@ fileprivate struct LSRegisterURLTests {
         let task = Task(forTarget: nil, ruleInfo: [], commandLine: ["/System/Library/Frameworks/CoreServices.framework/Versions/Current/Frameworks/LaunchServices.framework/Versions/Current/Support/lsregister", "-f", "-R", "-trusted", Path.null.str], workingDirectory: .root, outputs: [], action: action, execDescription: "")
         let executionDelegate = MockExecutionDelegate()
         let outputDelegate = MockTaskOutputDelegate()
-        let result = await action.performTaskAction(task, dynamicExecutionDelegate: MockDynamicTaskExecutionDelegate(), executionDelegate: executionDelegate, clientDelegate: MockTaskExecutionClientDelegate(), outputDelegate: outputDelegate
+        let result = await action.performTaskAction(
+            task,
+            dynamicExecutionDelegate: MockDynamicTaskExecutionDelegate(),
+            executionDelegate: executionDelegate,
+            clientDelegate: MockTaskExecutionClientDelegate(),
+            outputDelegate: outputDelegate
         )
         #expect(result == .succeeded)
         #expect(outputDelegate.messages == [])
diff --git a/Tests/SWBTaskExecutionTests/PBXCpTests.swift b/Tests/SWBTaskExecutionTests/PBXCpTests.swift
index a2c7a7eb..9af84ad7 100644
--- a/Tests/SWBTaskExecutionTests/PBXCpTests.swift
+++ b/Tests/SWBTaskExecutionTests/PBXCpTests.swift
@@ -17,9 +17,9 @@ import SWBTestSupport
 import SWBCore
 
 #if canImport(System)
-import System
+    import System
 #else
-import SystemPackage
+    import SystemPackage
 #endif
 
 @Suite
@@ -64,10 +64,7 @@ fileprivate struct PBXCpTests: CoreBasedTests {
                 let dst = tmp.join("dst1")
                 let result = await pbxcp(["builtin-copy", "-exclude", "exclude*", "-v", src.str + Path.pathSeparatorString, src.join("exclude").str, dst.str], cwd: Path("/"))
                 #expect(result.success == true)
-                #expect(result.output == (
-                    "copying src/...\n" +
-                    "copying exclude...\n" +
-                    " 7 bytes\n"))
+                #expect(result.output == ("copying src/...\n" + "copying exclude...\n" + " 7 bytes\n"))
                 #expect(try fs.listdir(dst).sorted() == ["a", "exclude", "subdir"])
                 #expect(try fs.listdir(dst.join("subdir")).sorted() == ["nonexclude"])
                 #expect(try fs.read(dst.join("a")) == "A")
@@ -109,8 +106,7 @@ fileprivate struct PBXCpTests: CoreBasedTests {
                 try fs.createDirectory(dst)
                 let result = await pbxcp(["builtin-copy", "-exclude_subpath", "Any", "-v", src.join("Any.framework").str, dst.str], cwd: Path("/"))
                 #expect(result.success == true)
-                #expect(result.output == (
-                    "copying Any.framework/...\n"))
+                #expect(result.output == ("copying Any.framework/...\n"))
                 #expect(try fs.listdir(dst).sorted() == ["Any.framework"])
                 #expect(try fs.listdir(dst.join("Any.framework")).sorted() == ["Many", "Resources"])
                 #expect(try fs.listdir(dst.join("Any.framework").join("Resources")).sorted() == ["A", "B"])
@@ -122,8 +118,7 @@ fileprivate struct PBXCpTests: CoreBasedTests {
                 try fs.createDirectory(dst)
                 let result = await pbxcp(["builtin-copy", "-exclude_subpath", "Resources", "-v", src.join("Any.framework").str, dst.str], cwd: Path("/"))
                 #expect(result.success == true)
-                #expect(result.output == (
-                    "copying Any.framework/...\n"))
+                #expect(result.output == ("copying Any.framework/...\n"))
                 #expect(try fs.listdir(dst).sorted() == ["Any.framework"])
                 #expect(try fs.listdir(dst.join("Any.framework")).sorted() == ["Any", "Many"])
             }
@@ -133,8 +128,7 @@ fileprivate struct PBXCpTests: CoreBasedTests {
                 try fs.createDirectory(dst)
                 let result = await pbxcp(["builtin-copy", "-exclude_subpath", "Resources/A", "-v", src.join("Any.framework").str, dst.str], cwd: Path("/"))
                 #expect(result.success == true)
-                #expect(result.output == (
-                    "copying Any.framework/...\n"))
+                #expect(result.output == ("copying Any.framework/...\n"))
                 #expect(try fs.listdir(dst).sorted() == ["Any.framework"])
                 #expect(try fs.listdir(dst.join("Any.framework")).sorted() == ["Any", "Many", "Resources"])
                 #expect(try fs.listdir(dst.join("Any.framework").join("Resources")).sorted() == ["B"])
@@ -145,8 +139,7 @@ fileprivate struct PBXCpTests: CoreBasedTests {
                 try fs.createDirectory(dst)
                 let result = await pbxcp(["builtin-copy", "-exclude_subpath", "Resources/A", "-exclude_subpath", "Many", "-v", src.join("Any.framework").str, dst.str], cwd: Path("/"))
                 #expect(result.success == true)
-                #expect(result.output == (
-                    "copying Any.framework/...\n"))
+                #expect(result.output == ("copying Any.framework/...\n"))
                 #expect(try fs.listdir(dst).sorted() == ["Any.framework"])
                 #expect(try fs.listdir(dst.join("Any.framework")).sorted() == ["Any", "Resources"])
                 #expect(try fs.listdir(dst.join("Any.framework").join("Resources")).sorted() == ["B"])
@@ -154,8 +147,6 @@ fileprivate struct PBXCpTests: CoreBasedTests {
         }
     }
 
-
-
     /// Test the `-resolve-src-symlink` option.
     @Test
     func symlinkedFileWithResolvedSym() async throws {
@@ -178,8 +169,7 @@ fileprivate struct PBXCpTests: CoreBasedTests {
                 #expect(result.success == true)
                 #expect(fs.exists(dst.join("SymLinked")))
                 #expect(try fs.read(dst.join("SymLinked")) == "Anything")
-                #expect(result.output == (
-                    "copying File...\n 8 bytes\n"))
+                #expect(result.output == ("copying File...\n 8 bytes\n"))
             }
 
             do {
@@ -196,8 +186,7 @@ fileprivate struct PBXCpTests: CoreBasedTests {
                 #expect(result.success == true)
                 #expect(fs.exists(dst.join("SymLinked")))
                 #expect(try fs.read(dst.join("SymLinked")) == "Anything")
-                #expect(result.output == (
-                    "copying File...\n 8 bytes\n"))
+                #expect(result.output == ("copying File...\n 8 bytes\n"))
             }
         }
     }
@@ -231,8 +220,7 @@ fileprivate struct PBXCpTests: CoreBasedTests {
                 try fs.createDirectory(dst)
                 let result = await pbxcp(["builtin-copy", "-include_only_subpath", "Versions/A/Any", "-v", src.join("Any.framework").str, dst.str], cwd: Path("/"))
                 #expect(result.success == true)
-                #expect(result.output == (
-                    "copying Any.framework/...\n"))
+                #expect(result.output == ("copying Any.framework/...\n"))
                 #expect(try fs.listdir(dst).sorted() == ["Any.framework"])
                 #expect(try fs.listdir(dst.join("Any.framework")).sorted() == ["Versions"])
                 #expect(try fs.listdir(dst.join("Any.framework").join("Versions")).sorted() == ["A"])
@@ -246,8 +234,7 @@ fileprivate struct PBXCpTests: CoreBasedTests {
                 try fs.createDirectory(dst)
                 let result = await pbxcp(["builtin-copy", "-include_only_subpath", "Versions/A/Any", "-include_only_subpath", "Versions/A/_CodeSignature", "-v", src.join("Any.framework").str, dst.str], cwd: Path("/"))
                 #expect(result.success == true)
-                #expect(result.output == (
-                    "copying Any.framework/...\n"))
+                #expect(result.output == ("copying Any.framework/...\n"))
                 #expect(try fs.listdir(dst).sorted() == ["Any.framework"])
                 #expect(try fs.listdir(dst.join("Any.framework")).sorted() == ["Versions"])
                 #expect(try fs.listdir(dst.join("Any.framework").join("Versions")).sorted() == ["A"])
@@ -262,8 +249,7 @@ fileprivate struct PBXCpTests: CoreBasedTests {
                 try fs.createDirectory(dst)
                 let result = await pbxcp(["builtin-copy", "-include_only_subpath", "Versions/A/Any", "-include_only_subpath", "Versions/A/_CodeSignature", "-include_only_subpath", "Any", "-include_only_subpath", "Versions/Current", "-v", src.join("Any.framework").str, dst.str], cwd: Path("/"))
                 #expect(result.success == true)
-                #expect(result.output == (
-                    "copying Any.framework/...\n"))
+                #expect(result.output == ("copying Any.framework/...\n"))
                 #expect(try fs.listdir(dst).sorted() == ["Any.framework"])
                 #expect(try fs.listdir(dst.join("Any.framework")).sorted() == ["Any", "Versions"])
                 #expect(try fs.listdir(dst.join("Any.framework").join("Versions")).sorted() == ["A", "Current"])
@@ -274,7 +260,7 @@ fileprivate struct PBXCpTests: CoreBasedTests {
             // Create an iOS-style framework bundle so we can test copying (or not copying) things at the same level as the binary.
             try fs.createDirectory(src.join("Again.framework"))
             try fs.write(src.join("Again.framework").join("Again"), contents: "Something")
-            try fs.write(src.join("Again.framework").join("Again.car"), contents: "Assets")         // Should not be copied
+            try fs.write(src.join("Again.framework").join("Again.car"), contents: "Assets")  // Should not be copied
             try fs.createDirectory(src.join("Again.framework").join("_CodeSignature"))
             try fs.write(src.join("Again.framework").join("_CodeSignature").join("CodeResources"), contents: "Signing Resources")
             try fs.createDirectory(src.join("Again.framework").join("Resources"))
@@ -288,8 +274,7 @@ fileprivate struct PBXCpTests: CoreBasedTests {
                 try fs.createDirectory(dst)
                 let result = await pbxcp(["builtin-copy", "-include_only_subpath", "Again", "-include_only_subpath", "_CodeSignature", "-v", src.join("Again.framework").str, dst.str], cwd: Path("/"))
                 #expect(result.success == true)
-                #expect(result.output == (
-                    "copying Again.framework/...\n"))
+                #expect(result.output == ("copying Again.framework/...\n"))
                 #expect(try fs.listdir(dst).sorted() == ["Again.framework"])
                 #expect(try fs.listdir(dst.join("Again.framework")).sorted() == ["Again", "_CodeSignature"])
                 #expect(try fs.listdir(dst.join("Again.framework").join("_CodeSignature")).sorted() == ["CodeResources"])
@@ -317,14 +302,12 @@ fileprivate struct PBXCpTests: CoreBasedTests {
                 // Check that we run the strip tool and capture its output.
                 let result = await pbxcp(["builtin-copy", "-dry-run", "-strip-tool", "echo", "-strip-unsigned-binaries", "-v", src.str + Path.pathSeparatorString, dst.str], cwd: Path("/"))
                 #expect(result.success == true)
-                #expect(result.output == (
-                    "copying src/...\n" +
-                    "echo -S -no_atom_info \(src.join("fake-bin").str) -o \(dst.join("fake-bin").str)\n"))
+                #expect(result.output == ("copying src/...\n" + "echo -S -no_atom_info \(src.join("fake-bin").str) -o \(dst.join("fake-bin").str)\n"))
             }
         }
     }
 
-     @Test
+    @Test
     func relativeDestinationToCWD() async throws {
         try await withTemporaryDirectory { tmp in
             let src = tmp.join("src")
@@ -341,23 +324,18 @@ fileprivate struct PBXCpTests: CoreBasedTests {
                 // Check that we run the strip tool and capture its output.
                 let result = await pbxcp(["builtin-copy", "-dry-run", "-strip-tool", "echo", "-strip-unsigned-binaries", "-v", src.str + Path.pathSeparatorString, ""], cwd: dst)
                 #expect(result.success == true)
-                #expect(result.output == (
-                    "copying src/...\n" +
-                    "echo -S -no_atom_info \(src.join("fake-bin").str) -o \(dst.join("fake-bin").str)\n"))
+                #expect(result.output == ("copying src/...\n" + "echo -S -no_atom_info \(src.join("fake-bin").str) -o \(dst.join("fake-bin").str)\n"))
             }
 
             do {
                 // Check that we run the strip tool and capture its output.
                 let result = await pbxcp(["builtin-copy", "-dry-run", "-strip-tool", "echo", "-strip-unsigned-binaries", "-v", src.str + Path.pathSeparatorString, ""], cwd: dst)
                 #expect(result.success == true)
-                #expect(result.output == (
-                    "copying src/...\n" +
-                    "echo -S -no_atom_info \(src.join("fake-bin").str) -o \(dst.join("fake-bin").str)\n"))
+                #expect(result.output == ("copying src/...\n" + "echo -S -no_atom_info \(src.join("fake-bin").str) -o \(dst.join("fake-bin").str)\n"))
             }
         }
     }
 
-
     /// Check that we can invoke `strip` to copy a specific subopath and nothing else.
     @Test
     func stripSubpath() async throws {
@@ -380,9 +358,7 @@ fileprivate struct PBXCpTests: CoreBasedTests {
             do {
                 let result = await pbxcp(["builtin-copy", "-dry-run", "-strip-tool", "echo", "-strip_subpath", "\(fwkName)/fwk", "-v", fwk.str + Path.pathSeparatorString, dst.join(fwkName).str], cwd: Path("/"))
                 #expect(result.success == true)
-                #expect(result.output == (
-                    "copying \(fwkName)/...\n" +
-                    "echo -S -no_atom_info \(fwk.join("fwk").str) -o \(dst.join(fwkName).join("fwk").str)\n"                ))
+                #expect(result.output == ("copying \(fwkName)/...\n" + "echo -S -no_atom_info \(fwk.join("fwk").str) -o \(dst.join(fwkName).join("fwk").str)\n"))
             }
 
             // Test stripping a standalone binary.
@@ -395,11 +371,7 @@ fileprivate struct PBXCpTests: CoreBasedTests {
             do {
                 let result = await pbxcp(["builtin-copy", "-dry-run", "-strip-tool", "echo", "-strip_subpath", binaryName, "-v", bin.str + Path.pathSeparatorString, dst.join(binaryName).str], cwd: Path("/"))
                 #expect(result.success == true)
-                #expect(result.output == (
-                    "copying and stripping \(binaryName)...\n" +
-                    "echo -S -no_atom_info \(bin.str) -o \(dst.join(binaryName).str)\n" +
-                    " 12 bytes\n"
-                ))
+                #expect(result.output == ("copying and stripping \(binaryName)...\n" + "echo -S -no_atom_info \(bin.str) -o \(dst.join(binaryName).str)\n" + " 12 bytes\n"))
             }
         }
     }
@@ -428,12 +400,10 @@ fileprivate struct PBXCpTests: CoreBasedTests {
             do {
                 let result = await pbxcp(["builtin-copy", "-strip-tool", "/bin/echo", "-v", fwk.str + Path.pathSeparatorString, dst.join(fwkName).str], cwd: Path("/"))
                 #expect(result.success == true)
-                #expect(result.output == (
-                    "copying \(fwkName)/...\n"
-                ))
+                #expect(result.output == ("copying \(fwkName)/...\n"))
                 if try ProcessInfo.processInfo.hostOperatingSystem() != .windows {
                     let dstPerm = try fs.getFilePermissions(dst.join(fwkName).join(fName))
-                    #expect(dstPerm == 0o755) // files are created with u+rw, g+wr, o+rw (and +x if src is executable) permissions and umask will adjust
+                    #expect(dstPerm == 0o755)  // files are created with u+rw, g+wr, o+rw (and +x if src is executable) permissions and umask will adjust
                 }
             }
         }
@@ -463,7 +433,6 @@ fileprivate struct PBXCpTests: CoreBasedTests {
             let dst = tmp.join("dst")
             let dName = dst.join("file")
 
-
             try fs.createDirectory(src, recursive: true)
             var size = 0
             try await fs.write(sName) { fd in
@@ -477,20 +446,17 @@ fileprivate struct PBXCpTests: CoreBasedTests {
             do {
                 let result = await pbxcp(["builtin-copy", "-V", src.str + Path.pathSeparatorString, dst.str], cwd: Path("/"))
                 #expect(result.success == true)
-                #expect(result.output == (
-                    "copying src/...\n   copying file...\n    \(size) bytes\n"
-                ))
+                #expect(result.output == ("copying src/...\n   copying file...\n    \(size) bytes\n"))
                 // Check permissions
                 if try ProcessInfo.processInfo.hostOperatingSystem() != .windows {
                     let dstPerm = try fs.getFilePermissions(dName)
-                    #expect(dstPerm == 0o644) // files are created with u+rw, g+wr, o+rw (and +x if src is executable) permissions and umask will adjust
+                    #expect(dstPerm == 0o644)  // files are created with u+rw, g+wr, o+rw (and +x if src is executable) permissions and umask will adjust
                 }
                 #expect(FileManager.default.contentsEqual(atPath: sName.str, andPath: dName.str))
             }
         }
     }
 
-
     /// Check that we can invoke `bitcode_strip`.
     @Test
     func bitcodeStrip() async throws {
@@ -511,9 +477,7 @@ fileprivate struct PBXCpTests: CoreBasedTests {
             // Note that we always strip all bitcode (-r), even if 'replace-with-marker' is passed.
             let result = await pbxcp(["builtin-copy", "-dry-run", "-bitcode-strip", "replace-with-marker", "-bitcode-strip-tool", bitcodeStripPath.str, src.str + Path.pathSeparatorString, dst.str], cwd: Path("/"))
             #expect(result.success == true)
-            #expect(result.output == (
-                bitcodeStripPath.str +
-                " \(src.join("fake-bin").str) -r -o \(dst.join("fake-bin").str)\n"))
+            #expect(result.output == (bitcodeStripPath.str + " \(src.join("fake-bin").str) -r -o \(dst.join("fake-bin").str)\n"))
         }
     }
 
@@ -536,9 +500,11 @@ fileprivate struct PBXCpTests: CoreBasedTests {
             // Note that we always strip all bitcode (-r), even if 'replace-with-marker' is passed.
             let result = await pbxcp(["builtin-copy", "-dry-run", "-strip-unsigned-binaries", "-bitcode-strip", "replace-with-marker", "-bitcode-strip-tool", bitcodeStripPath.str, src.str + Path.pathSeparatorString, dst.str], cwd: Path("/"))
             #expect(result.success == true)
-            #expect(result.output.contains(
-                bitcodeStripPath.str +
-                " \(dst.join("fake-bin").str) -r -o \(dst.join("fake-bin").str)\n"))
+            #expect(
+                result.output.contains(
+                    bitcodeStripPath.str + " \(dst.join("fake-bin").str) -r -o \(dst.join("fake-bin").str)\n"
+                )
+            )
         }
     }
 
@@ -561,8 +527,7 @@ fileprivate struct PBXCpTests: CoreBasedTests {
 
             let successResult = await pbxcp(["builtin-copy", "-ignore-missing-inputs", missingFile.str + Path.pathSeparatorString, dst.str], cwd: Path("/"))
             #expect(successResult.success == true)
-            #expect(successResult.output == (
-                "note: ignoring missing input \'\(missingFile.str)\'\n"))
+            #expect(successResult.output == ("note: ignoring missing input \'\(missingFile.str)\'\n"))
         }
     }
 
@@ -635,17 +600,27 @@ fileprivate struct PBXCpTests: CoreBasedTests {
             try fs.createDirectory(srcDir)
             let srcFile = srcDir.join("fndr-and-rsrc")
             try fs.write(srcFile, contents: "abcdef")
-#if canImport(Darwin)
-            try fs.setExtendedAttribute(srcFile, key: XATTR_FINDERINFO_NAME, value: [
-                0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            ])
-            try fs.setExtendedAttribute(srcFile, key: XATTR_RESOURCEFORK_NAME, value:
-                                            "fake"
-            )
-#endif
-            try fs.setExtendedAttribute(srcFile, key: "foo.bar", value:
-                                            "should-not-be-copied"
+            #if canImport(Darwin)
+                try fs.setExtendedAttribute(
+                    srcFile,
+                    key: XATTR_FINDERINFO_NAME,
+                    value: [
+                        0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    ]
+                )
+                try fs.setExtendedAttribute(
+                    srcFile,
+                    key: XATTR_RESOURCEFORK_NAME,
+                    value:
+                        "fake"
+                )
+            #endif
+            try fs.setExtendedAttribute(
+                srcFile,
+                key: "foo.bar",
+                value:
+                    "should-not-be-copied"
             )
 
             // Create the empty destination directory.
@@ -662,10 +637,10 @@ fileprivate struct PBXCpTests: CoreBasedTests {
             #expect(try localFS.read(dstFile) == localFS.read(srcFile))
 
             // Make sure that the Finder Info and Resource Fork were copied.
-#if canImport(Darwin)
-            #expect(try localFS.getExtendedAttribute(dstFile, key: XATTR_FINDERINFO_NAME) == localFS.getExtendedAttribute(srcFile, key: XATTR_FINDERINFO_NAME))
-            #expect(try localFS.getExtendedAttribute(dstFile, key: XATTR_RESOURCEFORK_NAME) == localFS.getExtendedAttribute(srcFile, key: XATTR_RESOURCEFORK_NAME))
-#endif
+            #if canImport(Darwin)
+                #expect(try localFS.getExtendedAttribute(dstFile, key: XATTR_FINDERINFO_NAME) == localFS.getExtendedAttribute(srcFile, key: XATTR_FINDERINFO_NAME))
+                #expect(try localFS.getExtendedAttribute(dstFile, key: XATTR_RESOURCEFORK_NAME) == localFS.getExtendedAttribute(srcFile, key: XATTR_RESOURCEFORK_NAME))
+            #endif
 
             // Make sure that arbitrary extended attributes were not copied.
             #expect(try localFS.getExtendedAttribute(dstFile, key: "foo.bar") == nil)
diff --git a/Tests/SWBTaskExecutionTests/ProcessProductEntitlementsTaskActionTests.swift b/Tests/SWBTaskExecutionTests/ProcessProductEntitlementsTaskActionTests.swift
index 27a66ec7..61fda8b5 100644
--- a/Tests/SWBTaskExecutionTests/ProcessProductEntitlementsTaskActionTests.swift
+++ b/Tests/SWBTaskExecutionTests/ProcessProductEntitlementsTaskActionTests.swift
@@ -20,7 +20,7 @@ import SWBTestSupport
 
 @Suite
 fileprivate struct ProcessProductEntitlementsTaskActionTests {
-    @Test(.requireHostOS(.macOS)) // crashes on Linux
+    @Test(.requireHostOS(.macOS))  // crashes on Linux
     func performTaskAction() async throws {
         let directory = Path("/temp")
         let entitlementsPath = directory.join("foobar.entitlements")
@@ -30,7 +30,6 @@ fileprivate struct ProcessProductEntitlementsTaskActionTests {
         try fs.createDirectory(directory, recursive: false)
         try fs.write(entitlementsPath, contents: entitlements.asJSONFragment())
 
-
         let startTimestamp = try fs.getFileInfo(entitlementsPath).modificationTimestamp
         #expect(startTimestamp == 3)
 
@@ -40,13 +39,15 @@ fileprivate struct ProcessProductEntitlementsTaskActionTests {
         /// - Parameter expected: the returned status code of the task action that is expected for the given input
         /// - Parameter checkOutput: optional handler to check emitted output
         func testPerformTaskAction(commandLine: [String], expected expectedResult: CommandResult, entitlementsVariant: EntitlementsVariant = .signed, allowEntitlementsModification: Bool = false, entitlementsDestination: EntitlementsDestination = .none, destinationPlatformName: String = "platformname", schemeCommand: SchemeCommand = .launch, modifications: (() throws -> Void)? = nil, checkOutput: ((MockTaskOutputDelegate) throws -> Void)? = nil) async rethrows {
-            let action = ProcessProductEntitlementsTaskAction(fs: fs,
-                                                              entitlements: entitlements,
-                                                              entitlementsVariant: entitlementsVariant,
-                                                              allowEntitlementsModification: allowEntitlementsModification,
-                                                              entitlementsDestination: entitlementsDestination,
-                                                              destinationPlatformName: destinationPlatformName,
-                                                              entitlementsFilePath: entitlementsPath)
+            let action = ProcessProductEntitlementsTaskAction(
+                fs: fs,
+                entitlements: entitlements,
+                entitlementsVariant: entitlementsVariant,
+                allowEntitlementsModification: allowEntitlementsModification,
+                entitlementsDestination: entitlementsDestination,
+                destinationPlatformName: destinationPlatformName,
+                entitlementsFilePath: entitlementsPath
+            )
 
             try modifications?()
 
@@ -69,111 +70,131 @@ fileprivate struct ProcessProductEntitlementsTaskActionTests {
         await testPerformTaskAction(commandLine: [], expected: .failed)
 
         // giving an invalid output path should fail the build
-        await testPerformTaskAction(commandLine: ["programName", "-entitlements", "-o", "/nonExistingDirectory/foobar.output"], expected: .failed, checkOutput: { output in
-            #expect(output.warnings.isEmpty, "No warnings should be emitted")
-            #expect(output.errors.count == 1)
-            #expect(output.errors.first == "error: could not write entitlements file '/nonExistingDirectory/foobar.output': No such file or directory (2)")
-        })
+        await testPerformTaskAction(
+            commandLine: ["programName", "-entitlements", "-o", "/nonExistingDirectory/foobar.output"],
+            expected: .failed,
+            checkOutput: { output in
+                #expect(output.warnings.isEmpty, "No warnings should be emitted")
+                #expect(output.errors.count == 1)
+                #expect(output.errors.first == "error: could not write entitlements file '/nonExistingDirectory/foobar.output': No such file or directory (2)")
+            }
+        )
 
         // Necessary command line arguments passed, entitlements not edited should succeed.
         await testPerformTaskAction(commandLine: ["programName", "-entitlements", "-o", "/temp/foobar.output"], expected: .succeeded)
 
         // Modifying the entitlements during creation of action and execution should fail the build.
-        try await testPerformTaskAction(commandLine: ["programName", "-entitlements", "-o", "/temp/foobar.output"],
-                                        expected: .failed,
-                                        modifications: {
-            try fs.write(entitlementsPath, contents: ByteString(encodingAsUTF8: "some arbitrary string"))
-        },
-                                        checkOutput: { output in
-            #expect(output.warnings.isEmpty, "Warnings shouldn't be emitted")
-            #expect(output.errors.count == 1)
-
-            #expect(output.errors.first == "error: Entitlements file \"foobar.entitlements\" was modified during the build, which is not supported. You can disable this error by setting 'CODE_SIGN_ALLOW_ENTITLEMENTS_MODIFICATION' to 'YES', however this may cause the built product's code signature or provisioning profile to contain incorrect entitlements.")
-        })
+        try await testPerformTaskAction(
+            commandLine: ["programName", "-entitlements", "-o", "/temp/foobar.output"],
+            expected: .failed,
+            modifications: {
+                try fs.write(entitlementsPath, contents: ByteString(encodingAsUTF8: "some arbitrary string"))
+            },
+            checkOutput: { output in
+                #expect(output.warnings.isEmpty, "Warnings shouldn't be emitted")
+                #expect(output.errors.count == 1)
+
+                #expect(output.errors.first == "error: Entitlements file \"foobar.entitlements\" was modified during the build, which is not supported. You can disable this error by setting 'CODE_SIGN_ALLOW_ENTITLEMENTS_MODIFICATION' to 'YES', however this may cause the built product's code signature or provisioning profile to contain incorrect entitlements.")
+            }
+        )
 
         // No error if we opt out
-        try await testPerformTaskAction(commandLine: ["programName", "-entitlements", "-o", "/temp/foobar.output"],
-                                        expected: .succeeded,
-                                        allowEntitlementsModification: true,
-                                        modifications: { try fs.write(entitlementsPath, contents: ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml))) },
-                                        checkOutput: { output in
-            #expect(output.warnings.isEmpty, "Warnings shouldn't be emitted")
-            #expect(output.errors.isEmpty, "Errors shouldn't be emitted")
-            try #require(try fs.read(Path("/temp/foobar.output")) == ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml)))
-        })
+        try await testPerformTaskAction(
+            commandLine: ["programName", "-entitlements", "-o", "/temp/foobar.output"],
+            expected: .succeeded,
+            allowEntitlementsModification: true,
+            modifications: { try fs.write(entitlementsPath, contents: ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml))) },
+            checkOutput: { output in
+                #expect(output.warnings.isEmpty, "Warnings shouldn't be emitted")
+                #expect(output.errors.isEmpty, "Errors shouldn't be emitted")
+                try #require(try fs.read(Path("/temp/foobar.output")) == ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml)))
+            }
+        )
 
         // No error if we opt out; modification should be ignored for signed entitlements when ENTITLEMENTS_DESTINATION == __entitlements
-        try await testPerformTaskAction(commandLine: ["programName", "-entitlements", "-o", "/temp/foobar.output"],
-                                        expected: .succeeded,
-                                        entitlementsVariant: .signed,
-                                        allowEntitlementsModification: true,
-                                        entitlementsDestination: .entitlementsSection,
-                                        modifications: { try fs.write(entitlementsPath, contents: ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml))) },
-                                        checkOutput: { output in
-            #expect(output.warnings.isEmpty, "Warnings shouldn't be emitted")
-            #expect(output.errors.isEmpty, "Errors shouldn't be emitted")
-            try #require(try fs.read(Path("/temp/foobar.output")) == ByteString(PropertyListItem.plDict(["key": .plString("value")]).asBytes(.xml))) // note this is still the original plist
-        })
+        try await testPerformTaskAction(
+            commandLine: ["programName", "-entitlements", "-o", "/temp/foobar.output"],
+            expected: .succeeded,
+            entitlementsVariant: .signed,
+            allowEntitlementsModification: true,
+            entitlementsDestination: .entitlementsSection,
+            modifications: { try fs.write(entitlementsPath, contents: ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml))) },
+            checkOutput: { output in
+                #expect(output.warnings.isEmpty, "Warnings shouldn't be emitted")
+                #expect(output.errors.isEmpty, "Errors shouldn't be emitted")
+                try #require(try fs.read(Path("/temp/foobar.output")) == ByteString(PropertyListItem.plDict(["key": .plString("value")]).asBytes(.xml)))  // note this is still the original plist
+            }
+        )
 
         // ENTITLEMENTS_DESTINATION == Signature allows the modification
-        try await testPerformTaskAction(commandLine: ["programName", "-entitlements", "-o", "/temp/foobar.output"],
-                                        expected: .succeeded,
-                                        entitlementsVariant: .signed,
-                                        allowEntitlementsModification: true,
-                                        entitlementsDestination: .codeSignature,
-                                        modifications: { try fs.write(entitlementsPath, contents: ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml))) },
-                                        checkOutput: { output in
-            #expect(output.warnings.isEmpty, "Warnings shouldn't be emitted")
-            #expect(output.errors.isEmpty, "Errors shouldn't be emitted")
-            try #require(try fs.read(Path("/temp/foobar.output")) == ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml))) // note this is still the modified plist
-        })
+        try await testPerformTaskAction(
+            commandLine: ["programName", "-entitlements", "-o", "/temp/foobar.output"],
+            expected: .succeeded,
+            entitlementsVariant: .signed,
+            allowEntitlementsModification: true,
+            entitlementsDestination: .codeSignature,
+            modifications: { try fs.write(entitlementsPath, contents: ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml))) },
+            checkOutput: { output in
+                #expect(output.warnings.isEmpty, "Warnings shouldn't be emitted")
+                #expect(output.errors.isEmpty, "Errors shouldn't be emitted")
+                try #require(try fs.read(Path("/temp/foobar.output")) == ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml)))  // note this is still the modified plist
+            }
+        )
 
         // ...as do simulated entitlements, regardless of destination
-        try await testPerformTaskAction(commandLine: ["programName", "-entitlements", "-o", "/temp/foobar.output"],
-                                        expected: .succeeded,
-                                        entitlementsVariant: .simulated,
-                                        allowEntitlementsModification: true,
-                                        entitlementsDestination: .entitlementsSection,
-                                        modifications: { try fs.write(entitlementsPath, contents: ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml))) },
-                                        checkOutput: { output in
-            #expect(output.warnings.isEmpty, "Warnings shouldn't be emitted")
-            #expect(output.errors.isEmpty, "Errors shouldn't be emitted")
-            try #require(try fs.read(Path("/temp/foobar.output")) == ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml))) // note this is still the modified plist
-        })
-        try await testPerformTaskAction(commandLine: ["programName", "-entitlements", "-o", "/temp/foobar.output"],
-                                        expected: .succeeded,
-                                        entitlementsVariant: .simulated,
-                                        allowEntitlementsModification: true,
-                                        entitlementsDestination: .codeSignature,
-                                        modifications: { try fs.write(entitlementsPath, contents: ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml))) },
-                                        checkOutput: { output in
-            #expect(output.warnings.isEmpty, "Warnings shouldn't be emitted")
-            #expect(output.errors.isEmpty, "Errors shouldn't be emitted")
-            try #require(try fs.read(Path("/temp/foobar.output")) == ByteString(PropertyListItem.plDict(["key": .plString("value")]).asBytes(.xml))) // note this is still the modified plist
-        })
+        try await testPerformTaskAction(
+            commandLine: ["programName", "-entitlements", "-o", "/temp/foobar.output"],
+            expected: .succeeded,
+            entitlementsVariant: .simulated,
+            allowEntitlementsModification: true,
+            entitlementsDestination: .entitlementsSection,
+            modifications: { try fs.write(entitlementsPath, contents: ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml))) },
+            checkOutput: { output in
+                #expect(output.warnings.isEmpty, "Warnings shouldn't be emitted")
+                #expect(output.errors.isEmpty, "Errors shouldn't be emitted")
+                try #require(try fs.read(Path("/temp/foobar.output")) == ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml)))  // note this is still the modified plist
+            }
+        )
+        try await testPerformTaskAction(
+            commandLine: ["programName", "-entitlements", "-o", "/temp/foobar.output"],
+            expected: .succeeded,
+            entitlementsVariant: .simulated,
+            allowEntitlementsModification: true,
+            entitlementsDestination: .codeSignature,
+            modifications: { try fs.write(entitlementsPath, contents: ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml))) },
+            checkOutput: { output in
+                #expect(output.warnings.isEmpty, "Warnings shouldn't be emitted")
+                #expect(output.errors.isEmpty, "Errors shouldn't be emitted")
+                try #require(try fs.read(Path("/temp/foobar.output")) == ByteString(PropertyListItem.plDict(["key": .plString("value")]).asBytes(.xml)))  // note this is still the modified plist
+            }
+        )
 
         // ...and finally we also let the modifications through for any other value for ENTITLEMENTS_DESTINATION
-        try await testPerformTaskAction(commandLine: ["programName", "-entitlements", "-o", "/temp/foobar.output"],
-                                        expected: .succeeded,
-                                        entitlementsVariant: .simulated,
-                                        allowEntitlementsModification: true,
-                                        entitlementsDestination: .none,
-                                        modifications: { try fs.write(entitlementsPath, contents: ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml))) },
-                                        checkOutput: { output in
-            #expect(output.warnings.isEmpty, "Warnings shouldn't be emitted")
-            #expect(output.errors.isEmpty, "Errors shouldn't be emitted")
-            try #require(try fs.read(Path("/temp/foobar.output")) == ByteString(PropertyListItem.plDict(["key": .plString("value")]).asBytes(.xml))) // note this is still the modified plist
-        })
-        try await testPerformTaskAction(commandLine: ["programName", "-entitlements", "-o", "/temp/foobar.output"],
-                                        expected: .succeeded,
-                                        entitlementsVariant: .signed,
-                                        allowEntitlementsModification: true,
-                                        entitlementsDestination: .none,
-                                        modifications: { try fs.write(entitlementsPath, contents: ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml))) },
-                                        checkOutput: { output in
-            #expect(output.warnings.isEmpty, "Warnings shouldn't be emitted")
-            #expect(output.errors.isEmpty, "Errors shouldn't be emitted")
-            try #require(try fs.read(Path("/temp/foobar.output")) == ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml))) // note this is still the modified plist
-        })
+        try await testPerformTaskAction(
+            commandLine: ["programName", "-entitlements", "-o", "/temp/foobar.output"],
+            expected: .succeeded,
+            entitlementsVariant: .simulated,
+            allowEntitlementsModification: true,
+            entitlementsDestination: .none,
+            modifications: { try fs.write(entitlementsPath, contents: ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml))) },
+            checkOutput: { output in
+                #expect(output.warnings.isEmpty, "Warnings shouldn't be emitted")
+                #expect(output.errors.isEmpty, "Errors shouldn't be emitted")
+                try #require(try fs.read(Path("/temp/foobar.output")) == ByteString(PropertyListItem.plDict(["key": .plString("value")]).asBytes(.xml)))  // note this is still the modified plist
+            }
+        )
+        try await testPerformTaskAction(
+            commandLine: ["programName", "-entitlements", "-o", "/temp/foobar.output"],
+            expected: .succeeded,
+            entitlementsVariant: .signed,
+            allowEntitlementsModification: true,
+            entitlementsDestination: .none,
+            modifications: { try fs.write(entitlementsPath, contents: ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml))) },
+            checkOutput: { output in
+                #expect(output.warnings.isEmpty, "Warnings shouldn't be emitted")
+                #expect(output.errors.isEmpty, "Errors shouldn't be emitted")
+                try #require(try fs.read(Path("/temp/foobar.output")) == ByteString(PropertyListItem.plDict(["key": .plString("value2")]).asBytes(.xml)))  // note this is still the modified plist
+            }
+        )
     }
 }
diff --git a/Tests/SWBTaskExecutionTests/ProcessProductPackagingTaskTests.swift b/Tests/SWBTaskExecutionTests/ProcessProductPackagingTaskTests.swift
index 92403287..866b4d99 100644
--- a/Tests/SWBTaskExecutionTests/ProcessProductPackagingTaskTests.swift
+++ b/Tests/SWBTaskExecutionTests/ProcessProductPackagingTaskTests.swift
@@ -27,8 +27,7 @@ import SWBMacro
 fileprivate struct ProcessProductEntitlementsTaskTests {
     @Test
     func diagnostics() async {
-        func checkDiagnostics(_ commandLine: [String], errors: [String] = [], warnings: [String] = [], notes: [String] = [], sourceLocation: SourceLocation = #_sourceLocation) async
-        {
+        func checkDiagnostics(_ commandLine: [String], errors: [String] = [], warnings: [String] = [], notes: [String] = [], sourceLocation: SourceLocation = #_sourceLocation) async {
             let action = ProcessProductEntitlementsTaskAction(fs: PseudoFS(), entitlements: .plDict([:]), entitlementsVariant: .signed, allowEntitlementsModification: false, entitlementsDestination: .none, destinationPlatformName: "iphoneos", entitlementsFilePath: nil)
             let task = Task(forTarget: nil, ruleInfo: [], commandLine: commandLine, workingDirectory: Path(""), action: action)
             let executionDelegate = MockExecutionDelegate()
@@ -89,7 +88,7 @@ fileprivate struct ProcessProductEntitlementsTaskTests {
         try executionDelegate.fs.createDirectory(output.dirname)
 
         let action = ProcessProductEntitlementsTaskAction(fs: PseudoFS(), entitlements: entitlements, entitlementsVariant: .signed, allowEntitlementsModification: false, entitlementsDestination: .none, destinationPlatformName: "iphoneos", entitlementsFilePath: nil)
-        var builder = PlannedTaskBuilder(type: mockTaskType, ruleInfo: [], commandLine: ["productPackagingUtility", "-entitlements", "-format", "xml", input.str, "-o", output.str].map{ .literal(ByteString(encodingAsUTF8: $0)) })
+        var builder = PlannedTaskBuilder(type: mockTaskType, ruleInfo: [], commandLine: ["productPackagingUtility", "-entitlements", "-format", "xml", input.str, "-o", output.str].map { .literal(ByteString(encodingAsUTF8: $0)) })
         let task = Task(&builder)
         let result = await action.performTaskAction(
             task,
@@ -118,14 +117,12 @@ fileprivate struct ProcessProductEntitlementsTaskTests {
         #expect(dict.count == 4)
         if case .plString(let appId)? = dict["application-identifier"] {
             #expect(appId == appIdentifier)
-        }
-        else {
+        } else {
             Issue.record("missing 'application-identifier'")
         }
         if case .plString(let teamId)? = dict["com.apple.developer.team-identifier"] {
             #expect(teamId == teamIdentifierPrefix)
-        }
-        else {
+        } else {
             Issue.record("missing 'com.apple.developer.team-identifier'")
         }
 
@@ -135,12 +132,10 @@ fileprivate struct ProcessProductEntitlementsTaskTests {
             #expect(kcGroups.count == 1)
             if case .plString(let kcGroup) = kcGroups[0] {
                 #expect(kcGroup == appIdentifier)
-            }
-            else {
+            } else {
                 Issue.record("empty 'keychain-access-groups'")
             }
-        }
-        else {
+        } else {
             Issue.record("missing 'keychain-access-groups'")
         }
     }
@@ -177,7 +172,7 @@ fileprivate struct ProcessProductEntitlementsTaskTests {
             try executionDelegate.fs.createDirectory(output.dirname)
 
             let action = ProcessProductEntitlementsTaskAction(fs: PseudoFS(), entitlements: .plDict(entitlements), entitlementsVariant: .signed, allowEntitlementsModification: false, entitlementsDestination: .none, destinationPlatformName: destinationPlatformName, entitlementsFilePath: nil)
-            var builder = PlannedTaskBuilder(type: mockTaskType, ruleInfo: [], commandLine: ["productPackagingUtility", "-entitlements", "-format", "xml", input.str, "-o", output.str].map{ .literal(ByteString(encodingAsUTF8: $0)) })
+            var builder = PlannedTaskBuilder(type: mockTaskType, ruleInfo: [], commandLine: ["productPackagingUtility", "-entitlements", "-format", "xml", input.str, "-o", output.str].map { .literal(ByteString(encodingAsUTF8: $0)) })
             let task = Task(&builder)
             let result = await action.performTaskAction(
                 task,
@@ -233,8 +228,7 @@ fileprivate struct ProcessProductEntitlementsTaskTests {
                         Issue.record("missing '\(expectedMachLookupEntitlementKey)', test inputs: \(testInputs)", sourceLocation: sourceLocation)
                     }
                 }
-            }
-            else {
+            } else {
                 func assertKeyUnmodified(_ key: String, sourceLocation: SourceLocation = #_sourceLocation) {
                     let oldValue = entitlements[key]
                     let newValue = dict[key]
@@ -269,20 +263,32 @@ fileprivate struct ProcessProductEntitlementsTaskTests {
         // Perform test above with varying inputs
         for schemeCommand: SchemeCommand in [.launch, .test, .profile] {
             try await performTest(schemeCommand, "macosx")
-            try await performTest(schemeCommand, "macosx", additionalEntitlements: [
-                "com.apple.security.temporary-exception.files.absolute-path.read-only": "/some/path", // single string value
-                "com.apple.security.temporary-exception.mach-lookup.global-name": "com.apple.some-port", // single string value
-            ])
-            try await performTest(schemeCommand, "macosx", additionalEntitlements: [
-                "com.apple.security.temporary-exception.files.absolute-path.read-only": ["/some/path"], // array of strings value
-                "com.apple.security.temporary-exception.mach-lookup.global-name": ["com.apple.some-port"], // array of strings value
-            ])
+            try await performTest(
+                schemeCommand,
+                "macosx",
+                additionalEntitlements: [
+                    "com.apple.security.temporary-exception.files.absolute-path.read-only": "/some/path",  // single string value
+                    "com.apple.security.temporary-exception.mach-lookup.global-name": "com.apple.some-port",  // single string value
+                ]
+            )
+            try await performTest(
+                schemeCommand,
+                "macosx",
+                additionalEntitlements: [
+                    "com.apple.security.temporary-exception.files.absolute-path.read-only": ["/some/path"],  // array of strings value
+                    "com.apple.security.temporary-exception.mach-lookup.global-name": ["com.apple.some-port"],  // array of strings value
+                ]
+            )
 
             try await performTest(schemeCommand, "iphoneos")
-            try await performTest(schemeCommand, "iphoneos", additionalEntitlements: [
-                "com.apple.security.exception.files.absolute-path.read-only": ["/some/path"],
-                "com.apple.security.exception.mach-lookup.global-name": ["com.apple.some-port"],
-            ])
+            try await performTest(
+                schemeCommand,
+                "iphoneos",
+                additionalEntitlements: [
+                    "com.apple.security.exception.files.absolute-path.read-only": ["/some/path"],
+                    "com.apple.security.exception.mach-lookup.global-name": ["com.apple.some-port"],
+                ]
+            )
         }
     }
 }
@@ -291,8 +297,7 @@ fileprivate struct ProcessProductEntitlementsTaskTests {
 fileprivate struct ProcessProductProvisioningProfileTaskTests {
     @Test
     func diagnostics() async {
-        func checkDiagnostics(_ commandLine: [String], errors: [String] = [], warnings: [String] = [], notes: [String] = [], sourceLocation: SourceLocation = #_sourceLocation) async
-        {
+        func checkDiagnostics(_ commandLine: [String], errors: [String] = [], warnings: [String] = [], notes: [String] = [], sourceLocation: SourceLocation = #_sourceLocation) async {
             let action = ProcessProductProvisioningProfileTaskAction()
             let task = Task(forTarget: nil, ruleInfo: [], commandLine: commandLine, workingDirectory: Path(""), action: action)
             let executionDelegate = MockExecutionDelegate()
diff --git a/Tests/SWBTaskExecutionTests/ProcessXCFrameworkLibraryTaskActionTests.swift b/Tests/SWBTaskExecutionTests/ProcessXCFrameworkLibraryTaskActionTests.swift
index 9e7570aa..818862fa 100644
--- a/Tests/SWBTaskExecutionTests/ProcessXCFrameworkLibraryTaskActionTests.swift
+++ b/Tests/SWBTaskExecutionTests/ProcessXCFrameworkLibraryTaskActionTests.swift
@@ -17,7 +17,7 @@ import SWBTestSupport
 import SWBUtil
 import SWBTaskExecution
 
-@Suite(.requireHostOS(.macOS)) // Core isn't working on Linux yet
+@Suite(.requireHostOS(.macOS))  // Core isn't working on Linux yet
 fileprivate struct ProcessXCFrameworkLibraryTaskActionTests: CoreBasedTests {
     let infoLookup: any PlatformInfoLookup
 
@@ -37,10 +37,13 @@ fileprivate struct ProcessXCFrameworkLibraryTaskActionTests: CoreBasedTests {
 
             try fs.createDirectory(Path(SRCROOT), recursive: true)
 
-            let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil, debugSymbolsPath: Path("debugSymbols")),
-                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos13.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework"), headersPath: nil, debugSymbolsPath: Path("debugSymbols")),
-            ])
+            let supportXCFramework = try XCFramework(
+                version: Version(1, 0),
+                libraries: [
+                    XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil, debugSymbolsPath: Path("debugSymbols")),
+                    XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos13.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework"), headersPath: nil, debugSymbolsPath: Path("debugSymbols")),
+                ]
+            )
             let supportXCFrameworkPath = Path(SRCROOT).join("Support.xcframework")
             try fs.createDirectory(supportXCFrameworkPath, recursive: true)
             try await XCFrameworkTestSupport.writeXCFramework(supportXCFramework, fs: fs, path: supportXCFrameworkPath, infoLookup: infoLookup)
@@ -82,10 +85,13 @@ fileprivate struct ProcessXCFrameworkLibraryTaskActionTests: CoreBasedTests {
 
             try fs.createDirectory(Path(SRCROOT), recursive: true)
 
-            let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
-                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos13.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
-            ])
+            let supportXCFramework = try XCFramework(
+                version: Version(1, 0),
+                libraries: [
+                    XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
+                    XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos13.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("libsample.a"), binaryPath: Path("libsample.a"), headersPath: Path("Headers"), debugSymbolsPath: Path("dSYMs")),
+                ]
+            )
             let supportXCFrameworkPath = Path(SRCROOT).join("libsample.xcframework")
             try fs.createDirectory(supportXCFrameworkPath, recursive: true)
             try await XCFrameworkTestSupport.writeXCFramework(supportXCFramework, fs: fs, path: supportXCFrameworkPath, infoLookup: infoLookup)
@@ -127,10 +133,13 @@ fileprivate struct ProcessXCFrameworkLibraryTaskActionTests: CoreBasedTests {
 
             try fs.createDirectory(Path(SRCROOT), recursive: true)
 
-            let supportXCFramework = try XCFramework(version: Version(1, 0), libraries: [
-                XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil, debugSymbolsPath: nil),
-                XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos13.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil, debugSymbolsPath: nil),
-            ])
+            let supportXCFramework = try XCFramework(
+                version: Version(1, 0),
+                libraries: [
+                    XCFramework.Library(libraryIdentifier: "x86_64-apple-macos10.15", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil, debugSymbolsPath: nil),
+                    XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos13.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil, debugSymbolsPath: nil),
+                ]
+            )
             let supportXCFrameworkPath = Path(SRCROOT).join("Support.xcframework")
             try fs.createDirectory(supportXCFrameworkPath, recursive: true)
             try await XCFrameworkTestSupport.writeXCFramework(supportXCFramework, fs: fs, path: supportXCFrameworkPath, infoLookup: infoLookup)
@@ -149,9 +158,11 @@ fileprivate struct ProcessXCFrameworkLibraryTaskActionTests: CoreBasedTests {
 
             // Check the command succeeded with no errors.
             #expect(result == .failed)
-            #expect(outputDelegate.messages == [
-                "error: When building for macOS, the expected library \(expectedLibraryPath.str) was not found in \(supportXCFrameworkPath.str)"
-            ])
+            #expect(
+                outputDelegate.messages == [
+                    "error: When building for macOS, the expected library \(expectedLibraryPath.str) was not found in \(supportXCFrameworkPath.str)"
+                ]
+            )
 
             // Check the file was NOT copied, and is the same as the source contents.
             #expect(!fs.exists(Path("\(DSTROOT)/Support.framework")))
diff --git a/Tests/SWBTaskExecutionTests/SignatureCollectionActionTests.swift b/Tests/SWBTaskExecutionTests/SignatureCollectionActionTests.swift
index 3c11b2cf..37f23207 100644
--- a/Tests/SWBTaskExecutionTests/SignatureCollectionActionTests.swift
+++ b/Tests/SWBTaskExecutionTests/SignatureCollectionActionTests.swift
@@ -24,8 +24,7 @@ fileprivate struct SignatureCollectionActionTests {
         let fs = PseudoFS()
         try fs.createDirectory(.root)
 
-        func checkDiagnostics(_ commandLine: [String], errors: [String] = [], warnings: [String] = [], notes: [String] = [], sourceLocation: SourceLocation = #_sourceLocation) async
-        {
+        func checkDiagnostics(_ commandLine: [String], errors: [String] = [], warnings: [String] = [], notes: [String] = [], sourceLocation: SourceLocation = #_sourceLocation) async {
             let action = SignatureCollectionTaskAction()
             let task = Task(forTarget: nil, ruleInfo: [], commandLine: commandLine, workingDirectory: .root, outputs: [], action: action, execDescription: "Signature Collection")
             let executionDelegate = MockExecutionDelegate(fs: fs)
@@ -207,7 +206,7 @@ fileprivate struct SignatureCollectionActionTests {
 
     @Test
     func SHA256HexString() {
-        let bytes: [UInt8] = [ 0xDE, 0xAD, 0xBE, 0xEF ]
+        let bytes: [UInt8] = [0xDE, 0xAD, 0xBE, 0xEF]
         let data = Data(bytes)
         let sha = data.sha256HexString
         #expect("5F78C33274E43FA9DE5659265C1D917E25C03722DCB0B8D27DB8D5FEAA813953" == sha)
diff --git a/Tests/SWBTaskExecutionTests/StaleFileRemovalTests.swift b/Tests/SWBTaskExecutionTests/StaleFileRemovalTests.swift
index f0b164fd..b0e7f2ef 100644
--- a/Tests/SWBTaskExecutionTests/StaleFileRemovalTests.swift
+++ b/Tests/SWBTaskExecutionTests/StaleFileRemovalTests.swift
@@ -73,13 +73,13 @@ fileprivate struct StaleFileRemovalTests: CoreBasedTests {
                                 TestBuildConfiguration(
                                     "Debug",
                                     buildSettings: [
-                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
                                     ]
                                 ),
                                 TestBuildConfiguration(
                                     "Release",
                                     buildSettings: [
-                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
                                     ]
                                 ),
                             ],
@@ -93,14 +93,14 @@ fileprivate struct StaleFileRemovalTests: CoreBasedTests {
                                     ],
                                     buildPhases: [
                                         TestSourcesBuildPhase([
-                                            "main.m",
+                                            "main.m"
                                         ]),
                                         TestFrameworksBuildPhase([
-                                            "foo.xcframework",
+                                            "foo.xcframework"
                                         ]),
                                     ],
                                     dependencies: [
-                                        "Framework",
+                                        "Framework"
                                     ]
                                 ),
                                 TestStandardTarget(
@@ -112,15 +112,17 @@ fileprivate struct StaleFileRemovalTests: CoreBasedTests {
                                     ],
                                     buildPhases: [
                                         TestSourcesBuildPhase([
-                                            "ClassOne.m",
+                                            "ClassOne.m"
                                         ]),
                                         TestFrameworksBuildPhase([
-                                            "foo.xcframework",
+                                            "foo.xcframework"
                                         ]),
                                     ]
                                 ),
-                            ])
-                    ])
+                            ]
+                        )
+                    ]
+                )
                 let workspace = try await testWorkspace.load(getCore())
                 let numTargets = workspace.projects.first?.targets.count ?? 0
                 guard numTargets > 0 else {
@@ -130,13 +132,16 @@ fileprivate struct StaleFileRemovalTests: CoreBasedTests {
 
                 let fs = PseudoFS()
 
-                let xcframework = try XCFramework(version: Version(1, 0), libraries: [
-                    XCFramework.Library(libraryIdentifier: "x86_64-apple-macos11.0", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
-                    XCFramework.Library(libraryIdentifier: "x86_64-apple-ios14.0-maccatalyst", supportedPlatform: "ios", supportedArchitectures: ["x86_64"], platformVariant: "macabi", libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
-                    XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos11.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
-                    XCFramework.Library(libraryIdentifier: "arm64-apple-iphonesimulator11.0", supportedPlatform: "ios", supportedArchitectures: ["x86_64"], platformVariant: "simulator", libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
-                    XCFramework.Library(libraryIdentifier: "x86_64-apple-driverkit19.0", supportedPlatform: "driverkit", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
-                ])
+                let xcframework = try XCFramework(
+                    version: Version(1, 0),
+                    libraries: [
+                        XCFramework.Library(libraryIdentifier: "x86_64-apple-macos11.0", supportedPlatform: "macos", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Versions/A/Support"), headersPath: nil),
+                        XCFramework.Library(libraryIdentifier: "x86_64-apple-ios14.0-maccatalyst", supportedPlatform: "ios", supportedArchitectures: ["x86_64"], platformVariant: "macabi", libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
+                        XCFramework.Library(libraryIdentifier: "arm64-apple-iphoneos11.0", supportedPlatform: "ios", supportedArchitectures: ["arm64", "arm64e"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
+                        XCFramework.Library(libraryIdentifier: "arm64-apple-iphonesimulator11.0", supportedPlatform: "ios", supportedArchitectures: ["x86_64"], platformVariant: "simulator", libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
+                        XCFramework.Library(libraryIdentifier: "x86_64-apple-driverkit19.0", supportedPlatform: "driverkit", supportedArchitectures: ["x86_64"], platformVariant: nil, libraryPath: Path("Support.framework"), binaryPath: Path("Support.framework/Support"), headersPath: nil),
+                    ]
+                )
                 let xcframeworkPath = tmpDirPath.join("aProject").join("foo.xcframework")
                 try fs.createDirectory(xcframeworkPath, recursive: true)
                 try await fs.writeXCFramework(xcframeworkPath, xcframework, infoLookup: getCore())
diff --git a/Tests/SWBTaskExecutionTests/SwiftHeaderToolTaskActionTests.swift b/Tests/SWBTaskExecutionTests/SwiftHeaderToolTaskActionTests.swift
index 85787754..c6e3ddf8 100644
--- a/Tests/SWBTaskExecutionTests/SwiftHeaderToolTaskActionTests.swift
+++ b/Tests/SWBTaskExecutionTests/SwiftHeaderToolTaskActionTests.swift
@@ -48,7 +48,7 @@ struct SwiftHeaderToolTaskActionTests: CoreBasedTests {
         }
         let outputPath = outputDir.join("GeneratedHeader-Swift.h")
         commandLine.append(contentsOf: [
-            "-o", outputPath.str
+            "-o", outputPath.str,
         ])
 
         // Construct and run the task action.
@@ -87,14 +87,7 @@ struct SwiftHeaderToolTaskActionTests: CoreBasedTests {
         let archs = ["arm64", "x86_64"]
         try await testSwiftHeaderToolTaskAction(archs: archs) { outputFileContents in
             let expectedFileContents =
-                "#if 0\n" +
-                "#elif defined(__arm64__) && __arm64__\n" +
-                "Contents of file for arm64\n\n" +
-                "#elif defined(__x86_64__) && __x86_64__\n" +
-                "Contents of file for x86_64\n\n" +
-                "#else\n" +
-                "#error unsupported Swift architecture\n" +
-                "#endif\n"
+                "#if 0\n" + "#elif defined(__arm64__) && __arm64__\n" + "Contents of file for arm64\n\n" + "#elif defined(__x86_64__) && __x86_64__\n" + "Contents of file for x86_64\n\n" + "#else\n" + "#error unsupported Swift architecture\n" + "#endif\n"
             #expect(outputFileContents == expectedFileContents)
         }
     }
@@ -105,14 +98,7 @@ struct SwiftHeaderToolTaskActionTests: CoreBasedTests {
         let archs = ["arm64e", "x86_64"]
         try await testSwiftHeaderToolTaskAction(archs: archs) { outputFileContents in
             let expectedFileContents =
-                "#if 0\n" +
-                "#elif defined(__arm64__) && __arm64__\n" +
-                "Contents of file for arm64e\n\n" +
-                "#elif defined(__x86_64__) && __x86_64__\n" +
-                "Contents of file for x86_64\n\n" +
-                "#else\n" +
-                "#error unsupported Swift architecture\n" +
-                "#endif\n"
+                "#if 0\n" + "#elif defined(__arm64__) && __arm64__\n" + "Contents of file for arm64e\n\n" + "#elif defined(__x86_64__) && __x86_64__\n" + "Contents of file for x86_64\n\n" + "#else\n" + "#error unsupported Swift architecture\n" + "#endif\n"
             #expect(outputFileContents == expectedFileContents)
         }
     }
@@ -123,14 +109,7 @@ struct SwiftHeaderToolTaskActionTests: CoreBasedTests {
         let archs = ["arm64", "arm64e"]
         try await testSwiftHeaderToolTaskAction(archs: archs) { outputFileContents in
             let expectedFileContents =
-                "#if 0\n" +
-                "#elif defined(__arm64e__) && __arm64e__\n" +
-                "Contents of file for arm64e\n\n" +
-                "#elif defined(__arm64__) && __arm64__\n" +
-                "Contents of file for arm64\n\n" +
-                "#else\n" +
-                "#error unsupported Swift architecture\n" +
-                "#endif\n"
+                "#if 0\n" + "#elif defined(__arm64e__) && __arm64e__\n" + "Contents of file for arm64e\n\n" + "#elif defined(__arm64__) && __arm64__\n" + "Contents of file for arm64\n\n" + "#else\n" + "#error unsupported Swift architecture\n" + "#endif\n"
             #expect(outputFileContents == expectedFileContents)
         }
     }
diff --git a/Tests/SWBTaskExecutionTests/TaskTestSupport.swift b/Tests/SWBTaskExecutionTests/TaskTestSupport.swift
index ba202ff0..8ec960d5 100644
--- a/Tests/SWBTaskExecutionTests/TaskTestSupport.swift
+++ b/Tests/SWBTaskExecutionTests/TaskTestSupport.swift
@@ -102,7 +102,7 @@ class MockDynamicTaskExecutionDelegate: DynamicTaskExecutionDelegate {
 extension Task {
     // FIXME: Eliminate this.
     public convenience init(type: any TaskTypeDescription = mockTaskType, dependencyInfo: DependencyDataStyle? = nil, payload: (any TaskPayload)? = nil, forTarget: ConfiguredTarget?, ruleInfo: [String], commandLine: [String], environment: EnvironmentBindings = EnvironmentBindings(), workingDirectory: Path, outputs: [any PlannedNode] = [], action: TaskAction?, execDescription: String? = nil, preparesForIndexing: Bool = false) {
-        var builder = PlannedTaskBuilder(type: type, ruleInfo: ruleInfo, commandLine: commandLine.map{ .literal(ByteString(encodingAsUTF8: $0)) }, environment: environment, outputs: outputs)
+        var builder = PlannedTaskBuilder(type: type, ruleInfo: ruleInfo, commandLine: commandLine.map { .literal(ByteString(encodingAsUTF8: $0)) }, environment: environment, outputs: outputs)
         builder.forTarget = forTarget
         builder.dependencyData = dependencyInfo
         builder.payload = payload
diff --git a/Tests/SWBTaskExecutionTests/TestValidateProductTaskAction.swift b/Tests/SWBTaskExecutionTests/TestValidateProductTaskAction.swift
index 59d5d9d5..11dca2c0 100644
--- a/Tests/SWBTaskExecutionTests/TestValidateProductTaskAction.swift
+++ b/Tests/SWBTaskExecutionTests/TestValidateProductTaskAction.swift
@@ -47,12 +47,14 @@ fileprivate struct TestValidateProductTaskAction {
         let delegate = MockTaskOutputDelegate()
         let result = ValidateProductTaskAction().validateiPadMultiTaskingSplitViewSupport(infoDict, outputDelegate: delegate)
         #expect(result == expectedResult, "unexpected result for test #\(idx) (\(testName))", sourceLocation: sourceLocation)
-        let warnings = Set(delegate.diagnostics.compactMap { diag -> String? in
-            if diag.behavior == .warning {
-                return diag.formatLocalizedDescription(.debugWithoutBehavior)
+        let warnings = Set(
+            delegate.diagnostics.compactMap { diag -> String? in
+                if diag.behavior == .warning {
+                    return diag.formatLocalizedDescription(.debugWithoutBehavior)
+                }
+                return nil
             }
-            return nil
-        })
+        )
         #expect(warnings == Set(expectedWarnings), "unexpected warnings for test #\(idx) (\(testName))", sourceLocation: sourceLocation)
     }
 
@@ -141,9 +143,12 @@ fileprivate struct TestValidateProductTaskAction {
             let frameworkPath = tmp.join(Self.shallowEmbeddedFrameworkPath)
             let delegate = MockTaskOutputDelegate()
             try localFS.createDirectory(frameworkPath, recursive: true)
-            try await localFS.writePlist(frameworkPath.join("Info.plist"), .plDict([
-                "CFBundleIdentifier": "com.apple.Lunch",
-            ]))
+            try await localFS.writePlist(
+                frameworkPath.join("Info.plist"),
+                .plDict([
+                    "CFBundleIdentifier": "com.apple.Lunch"
+                ])
+            )
             let result = try ValidateProductTaskAction().validateFrameworks(at: tmp.join("MyApp.app"), isShallow: true, outputDelegate: delegate)
             #expect(result, "validation unexpectedly failed")
             #expect(delegate.errors.isEmpty)
@@ -165,9 +170,12 @@ fileprivate struct TestValidateProductTaskAction {
         let delegate = MockTaskOutputDelegate()
         let fs = PseudoFS()
         try fs.createDirectory(Self.deepEmbeddedFrameworkPath, recursive: true)
-        try await fs.writePlist(Self.deepEmbeddedFrameworkPath.join("Info.plist"), .plDict([
-            "CFBundleIdentifier": "com.apple.Lunch",
-        ]))
+        try await fs.writePlist(
+            Self.deepEmbeddedFrameworkPath.join("Info.plist"),
+            .plDict([
+                "CFBundleIdentifier": "com.apple.Lunch"
+            ])
+        )
         let result = try ValidateProductTaskAction().validateFrameworks(at: Path.root.join("MyApp.app"), isShallow: false, outputDelegate: delegate, fs: fs)
         #expect(result == false, "validation unexpectedly succeeded")
         #expect(delegate.errors == ["error: Framework \(Self.deepEmbeddedFrameworkPath.str) contains Info.plist, expected Versions/Current/Resources/Info.plist since the platform does not use shallow bundles"])
@@ -179,15 +187,18 @@ fileprivate struct TestValidateProductTaskAction {
         let fs = PseudoFS()
         let path = Path.root.join(Self.shallowEmbeddedFrameworkPath)
         try fs.createDirectory(path, recursive: true)
-        try await fs.writePlist(path.join("Versions/Current/Resources/Info.plist"), .plDict([
-            "CFBundleIdentifier": "com.apple.Lunch",
-        ]))
+        try await fs.writePlist(
+            path.join("Versions/Current/Resources/Info.plist"),
+            .plDict([
+                "CFBundleIdentifier": "com.apple.Lunch"
+            ])
+        )
         let result = try ValidateProductTaskAction().validateFrameworks(at: Path.root.join("MyApp.app"), isShallow: true, outputDelegate: delegate, fs: fs)
         #expect(result == false, "validation unexpectedly succeeded")
         #expect(delegate.errors == ["error: Framework \(path.str) contains Versions/Current/Resources/Info.plist, expected Info.plist at the root level since the platform uses shallow bundles"])
     }
 
-    @Test(.requireSDKs(.macOS)) // `PropertyListSerialization` crashes with an invalid plist on non-Darwin platforms.
+    @Test(.requireSDKs(.macOS))  // `PropertyListSerialization` crashes with an invalid plist on non-Darwin platforms.
     func embeddedFrameworksValidationInvalidInfoPlist() throws {
         try withTemporaryDirectory { tmp in
             let frameworkPath = tmp.join(Self.shallowEmbeddedFrameworkPath)
@@ -206,9 +217,12 @@ fileprivate struct TestValidateProductTaskAction {
             let frameworkPath = tmp.join(Self.shallowEmbeddedFrameworkPath)
             let delegate = MockTaskOutputDelegate()
             try localFS.createDirectory(frameworkPath, recursive: true)
-            try await localFS.writePlist(frameworkPath.join("Info.plist"), .plDict([
-                "SomeKey": "Value",
-            ]))
+            try await localFS.writePlist(
+                frameworkPath.join("Info.plist"),
+                .plDict([
+                    "SomeKey": "Value"
+                ])
+            )
             let result = try ValidateProductTaskAction().validateFrameworks(at: tmp.join("MyApp.app"), isShallow: true, outputDelegate: delegate)
             #expect(result == false, "validation unexpectedly succeeded")
             #expect(delegate.errors == ["error: Framework \(frameworkPath.str) did not have a CFBundleIdentifier in its Info.plist"])
@@ -221,9 +235,12 @@ fileprivate struct TestValidateProductTaskAction {
             let frameworkPath = tmp.join(Self.shallowEmbeddedFrameworkPath)
             let delegate = MockTaskOutputDelegate()
             try localFS.createDirectory(frameworkPath, recursive: true)
-            try await localFS.writePlist(frameworkPath.join("Info.plist"), .plDict([
-                "CFBundleIdentifier": "/Lunch",
-            ]))
+            try await localFS.writePlist(
+                frameworkPath.join("Info.plist"),
+                .plDict([
+                    "CFBundleIdentifier": "/Lunch"
+                ])
+            )
             let result = try ValidateProductTaskAction().validateFrameworks(at: tmp.join("MyApp.app"), isShallow: true, outputDelegate: delegate)
             #expect(result == false, "validation unexpectedly succeeded")
             #expect(delegate.errors == ["error: Framework \(frameworkPath.str) had an invalid CFBundleIdentifier in its Info.plist: /Lunch"])
diff --git a/Tests/SWBTestSupportTests/TestSupportTests.swift b/Tests/SWBTestSupportTests/TestSupportTests.swift
index 18157b48..07346198 100644
--- a/Tests/SWBTestSupportTests/TestSupportTests.swift
+++ b/Tests/SWBTestSupportTests/TestSupportTests.swift
@@ -44,26 +44,37 @@ import SWBUtil
     @Test(.requireSDKs(.host))
     func ensureTaskBelongToCorrectBuild() async throws {
         try await withTemporaryDirectory { tmpDir in
-            let testWorkspace = TestWorkspace("TestWorkspace", sourceRoot: tmpDir, projects: [
-                TestProject("TestProject",
-                    groupTree: TestGroup("Root", children: [TestFile("test.c")]),
-                    buildConfigurations: [
-                        TestBuildConfiguration(
-                            "Debug",
-                            buildSettings: [
-                                "GENERATE_INFOPLIST_FILE": "YES",
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                "CODE_SIGN_IDENTITY": "-",
-                            ]),
-                    ],
-                    targets: [
-                        TestStandardTarget("TestTarget", type: .commandLineTool, buildPhases: [
-                            TestSourcesBuildPhase([
-                                TestBuildFile("test.c")
-                            ])
-                        ])
-                    ])
-                ])
+            let testWorkspace = TestWorkspace(
+                "TestWorkspace",
+                sourceRoot: tmpDir,
+                projects: [
+                    TestProject(
+                        "TestProject",
+                        groupTree: TestGroup("Root", children: [TestFile("test.c")]),
+                        buildConfigurations: [
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "GENERATE_INFOPLIST_FILE": "YES",
+                                    "PRODUCT_NAME": "$(TARGET_NAME)",
+                                    "CODE_SIGN_IDENTITY": "-",
+                                ]
+                            )
+                        ],
+                        targets: [
+                            TestStandardTarget(
+                                "TestTarget",
+                                type: .commandLineTool,
+                                buildPhases: [
+                                    TestSourcesBuildPhase([
+                                        TestBuildFile("test.c")
+                                    ])
+                                ]
+                            )
+                        ]
+                    )
+                ]
+            )
 
             let core = try await getCore()
             let buildA = try TaskConstructionTester(core, testWorkspace)
diff --git a/Tests/SWBUniversalPlatformTests/SWBUniversalPlatformTests.swift b/Tests/SWBUniversalPlatformTests/SWBUniversalPlatformTests.swift
index 380508dc..bc8ac41a 100644
--- a/Tests/SWBUniversalPlatformTests/SWBUniversalPlatformTests.swift
+++ b/Tests/SWBUniversalPlatformTests/SWBUniversalPlatformTests.swift
@@ -9,4 +9,3 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-
diff --git a/Tests/SWBUtilPerfTests/GraphAlgorithmsPerfTests.swift b/Tests/SWBUtilPerfTests/GraphAlgorithmsPerfTests.swift
index 45b835d8..6d5f923a 100644
--- a/Tests/SWBUtilPerfTests/GraphAlgorithmsPerfTests.swift
+++ b/Tests/SWBUtilPerfTests/GraphAlgorithmsPerfTests.swift
@@ -38,8 +38,8 @@ fileprivate struct GraphAlgorithmsPerfTests: PerfTests {
         let N = 100
         let width = N + 1
         let height = N + 1
-        for y in 0 ..< height {
-            for x in 0 ..< width {
+        for y in 0..<height {
+            for x in 0..<width {
                 if x > 0 {
                     addDep(from: Point(x, y), to: Point(x - 1, y))
                 }
@@ -59,7 +59,7 @@ fileprivate struct GraphAlgorithmsPerfTests: PerfTests {
             var rowCount = 0
             var columnCount = 0
             var diagCount = 0
-            for _ in 0 ..< numIterations {
+            for _ in 0..<numIterations {
                 rowCount += minimumDistance(from: Point(width - 1, 0), to: Point(0, 0))!
                 columnCount += minimumDistance(from: Point(0, height - 1), to: Point(0, 0))!
                 diagCount += minimumDistance(from: Point(width - 1, height - 1), to: Point(0, 0))!
diff --git a/Tests/SWBUtilPerfTests/MsgPackSerializationPerfTests.swift b/Tests/SWBUtilPerfTests/MsgPackSerializationPerfTests.swift
index dd005c7e..fbe73961 100644
--- a/Tests/SWBUtilPerfTests/MsgPackSerializationPerfTests.swift
+++ b/Tests/SWBUtilPerfTests/MsgPackSerializationPerfTests.swift
@@ -42,8 +42,7 @@ fileprivate struct MsgPackSerializationPerfTests: PerfTests {
         let iterations = 100000
 
         await measure {
-            for _ in 1...iterations
-            {
+            for _ in 1...iterations {
                 #expect(!self.serializeScalarData().byteString.isEmpty)
             }
         }
@@ -114,8 +113,7 @@ fileprivate struct MsgPackSerializationPerfTests: PerfTests {
         }
     }
 
-    private func serializeArrayData() -> MsgPackSerializer
-    {
+    private func serializeArrayData() -> MsgPackSerializer {
         let sz = MsgPackSerializer()
         sz.serialize([-2, -1, 0, 1, 2] as [Int])
         sz.serialize([0, 1, 2, 3, 4] as [UInt])
@@ -131,8 +129,7 @@ fileprivate struct MsgPackSerializationPerfTests: PerfTests {
         let iterations = 100000
 
         await measure {
-            for _ in 1...iterations
-            {
+            for _ in 1...iterations {
                 #expect(!self.serializeArrayData().byteString.isEmpty)
             }
         }
@@ -157,8 +154,7 @@ fileprivate struct MsgPackSerializationPerfTests: PerfTests {
         }
     }
 
-    private func serializeDictionaryData() -> MsgPackSerializer
-    {
+    private func serializeDictionaryData() -> MsgPackSerializer {
         let sz = MsgPackSerializer()
         sz.serialize(["minusone": -1, "zero": 0, "one": 1] as [String: Int])
         sz.serialize([-1.3: false, 0.0: true, 1.2: false] as [Float32: Bool])
@@ -193,8 +189,7 @@ fileprivate struct MsgPackSerializationPerfTests: PerfTests {
 
     private func customElementData() -> [TestLogMessage] {
         var elements = [TestLogMessage]()
-        for i in 1...100
-        {
+        for i in 1...100 {
             let element = TestLogMessage(type: .error, message: "error: Message #\(i)")
             elements.append(element)
         }
@@ -203,8 +198,7 @@ fileprivate struct MsgPackSerializationPerfTests: PerfTests {
 
     private func serializeCustomElementData(_ elements: [TestLogMessage]) -> MsgPackSerializer {
         let sz = MsgPackSerializer()
-        for element in elements
-        {
+        for element in elements {
             sz.serialize(element)
         }
         return sz
@@ -216,10 +210,8 @@ fileprivate struct MsgPackSerializationPerfTests: PerfTests {
 
         let elements = customElementData()
 
-        await measure
-        {
-            for _ in 1...iterations
-            {
+        await measure {
+            for _ in 1...iterations {
                 #expect(!self.serializeCustomElementData(elements).byteString.isEmpty)
             }
         }
@@ -235,8 +227,7 @@ fileprivate struct MsgPackSerializationPerfTests: PerfTests {
         try await measure {
             for _ in 1...iterations {
                 let dsz = MsgPackDeserializer(sz.byteString)
-                for element in elements
-                {
+                for element in elements {
                     let dszElement = try dsz.deserialize() as TestLogMessage
                     #expect(dszElement.message == element.message)
                 }
@@ -244,23 +235,19 @@ fileprivate struct MsgPackSerializationPerfTests: PerfTests {
         }
     }
 
-    private func customElementHierarchy(_ numElements: UInt) -> TestLogHeader
-    {
+    private func customElementHierarchy(_ numElements: UInt) -> TestLogHeader {
         // The top-level log element.
         let log = TestLogHeader("Log")
 
         // Add 100 framework targets, each with 100 source file compilations, each of which emits 100 warnings.
-        for i in 1...numElements
-        {
+        for i in 1...numElements {
             let fwkTarget = TestLogHeader("Framework-\(i)")
             log.addEntry(fwkTarget)
-            for j in 1...numElements
-            {
+            for j in 1...numElements {
                 fwkTarget.addEntry(TestLogSection("Copy Foo_\(j).h"))
 
                 let compile = TestLogSection("Compile Foo_\(j).m")
-                for k in 1...numElements
-                {
+                for k in 1...numElements {
                     compile.addMessage(TestLogMessage(type: .warning, message: "Warning number \(k)"))
                 }
                 fwkTarget.addEntry(compile)
@@ -285,8 +272,7 @@ fileprivate struct MsgPackSerializationPerfTests: PerfTests {
         return log
     }
 
-    private func serializeCustomElementHierarchy(_ log: TestLogHeader) -> MsgPackSerializer
-    {
+    private func serializeCustomElementHierarchy(_ log: TestLogHeader) -> MsgPackSerializer {
         let sz = MsgPackSerializer()
         sz.serialize(log)
         return sz
@@ -300,11 +286,9 @@ fileprivate struct MsgPackSerializationPerfTests: PerfTests {
         var didEmitSerializedSize = false
 
         await measure {
-            for _ in 1...iterations
-            {
+            for _ in 1...iterations {
                 let sz = self.serializeCustomElementHierarchy(log)
-                if !didEmitSerializedSize
-                {
+                if !didEmitSerializedSize {
                     let mb = Float64(sz.byteString.bytes.count) / (1000.0 * 1000.0)
                     perfPrint("Serialized \(mb) megabytes")
                     didEmitSerializedSize = true
@@ -335,10 +319,8 @@ fileprivate struct MsgPackSerializationPerfTests: PerfTests {
     }
 }
 
-
 // MARK: Classes to test serializing a log structure
 
-
 private class TestLogEntry: PolymorphicSerializable, Equatable {
     let title: String
 
@@ -357,7 +339,7 @@ private class TestLogEntry: PolymorphicSerializable, Equatable {
         self.title = try deserializer.deserialize()
     }
 
-    static let implementations: [SerializableTypeCode : any PolymorphicSerializable.Type] = [
+    static let implementations: [SerializableTypeCode: any PolymorphicSerializable.Type] = [
         0: TestLogEntry.self,
         1: TestLogHeader.self,
         2: TestLogSection.self,
@@ -368,7 +350,7 @@ private class TestLogEntry: PolymorphicSerializable, Equatable {
     }
 }
 
-private func ==(lhs: TestLogEntry, rhs: TestLogEntry) -> Bool {
+private func == (lhs: TestLogEntry, rhs: TestLogEntry) -> Bool {
     return lhs.equals(rhs)
 }
 
@@ -399,8 +381,7 @@ private final class TestLogHeader: TestLogEntry {
 
     override func equals(_ other: TestLogEntry) -> Bool {
         guard super.equals(other) else { return false }
-        if let otherHeader = other as? TestLogHeader
-        {
+        if let otherHeader = other as? TestLogHeader {
             return subsections == otherHeader.subsections
         }
         return false
@@ -434,8 +415,7 @@ private final class TestLogSection: TestLogEntry {
 
     override func equals(_ other: TestLogEntry) -> Bool {
         guard super.equals(other) else { return false }
-        if let otherSection = other as? TestLogSection
-        {
+        if let otherSection = other as? TestLogSection {
             return messages == otherSection.messages
         }
         return false
@@ -452,22 +432,19 @@ private final class TestLogMessage: Serializable, Equatable {
     let type: TestLogMessageType
     let message: String
 
-    init(type: TestLogMessageType, message: String)
-    {
+    init(type: TestLogMessageType, message: String) {
         self.type = type
         self.message = message
     }
 
-    func serialize<T: Serializer>(to serializer: T)
-    {
+    func serialize<T: Serializer>(to serializer: T) {
         serializer.beginAggregate(2)
         serializer.serialize(type.rawValue)
         serializer.serialize(message)
         serializer.endAggregate()
     }
 
-    init(from deserializer: any Deserializer) throws
-    {
+    init(from deserializer: any Deserializer) throws {
         try deserializer.beginAggregate(2)
         guard let type = TestLogMessageType(rawValue: try deserializer.deserialize()) else { throw DeserializerError.deserializationFailed("Invalid TestLogMessageType.") }
         self.type = type
@@ -475,6 +452,6 @@ private final class TestLogMessage: Serializable, Equatable {
     }
 }
 
-private func ==(lhs: TestLogMessage, rhs: TestLogMessage) -> Bool {
+private func == (lhs: TestLogMessage, rhs: TestLogMessage) -> Bool {
     return lhs.type == rhs.type && lhs.message == rhs.message
 }
diff --git a/Tests/SWBUtilPerfTests/OrderedSetPerfTests.swift b/Tests/SWBUtilPerfTests/OrderedSetPerfTests.swift
index bcb9868c..becab541 100644
--- a/Tests/SWBUtilPerfTests/OrderedSetPerfTests.swift
+++ b/Tests/SWBUtilPerfTests/OrderedSetPerfTests.swift
@@ -26,17 +26,17 @@ fileprivate struct OrderedSetPerfTests: PerfTests {
         #expect(halfN * 2 == N)
 
         await measure {
-            for _ in 0 ..< numIterations {
+            for _ in 0..<numIterations {
                 // Test many inserts followed by many duplicates.
                 var insertCount = 0
                 do {
                     var set = OrderedSet<Int>()
-                    for i in 0 ..< halfN {
+                    for i in 0..<halfN {
                         if set.append(i).inserted {
                             insertCount += 1
                         }
                     }
-                    for i in 0 ..< halfN {
+                    for i in 0..<halfN {
                         if set.append(i).inserted {
                             insertCount += 1
                         }
@@ -45,7 +45,7 @@ fileprivate struct OrderedSetPerfTests: PerfTests {
                 // Test interleaved insert & duplicate.
                 do {
                     var set = OrderedSet<Int>()
-                    for i in 0 ..< halfN {
+                    for i in 0..<halfN {
                         if set.append(i).inserted {
                             insertCount += 1
                         }
diff --git a/Tests/SWBUtilPerfTests/PathPerfTests.swift b/Tests/SWBUtilPerfTests/PathPerfTests.swift
index 4a6820f7..0e6143d0 100644
--- a/Tests/SWBUtilPerfTests/PathPerfTests.swift
+++ b/Tests/SWBUtilPerfTests/PathPerfTests.swift
@@ -22,7 +22,7 @@ fileprivate struct PathPerfTests: PerfTests {
         let N = 100000
         await measure {
             var lengths = 0
-            for _ in 0 ..< N {
+            for _ in 0..<N {
                 let result = path.split()
                 lengths = lengths &+ result.0.str.utf8.count &+ 1 &+ result.1.utf8.count
             }
@@ -36,7 +36,7 @@ fileprivate struct PathPerfTests: PerfTests {
         let N = 100000
         await measure {
             var lengths = 0
-            for _ in 0 ..< N {
+            for _ in 0..<N {
                 let result = path.dirname
                 lengths = lengths &+ result.str.utf8.count
             }
@@ -50,7 +50,7 @@ fileprivate struct PathPerfTests: PerfTests {
         let N = 100000
         await measure {
             var lengths = 0
-            for _ in 0 ..< N {
+            for _ in 0..<N {
                 let result = path.basename
                 lengths = lengths &+ result.utf8.count
             }
@@ -64,7 +64,7 @@ fileprivate struct PathPerfTests: PerfTests {
         let N = 100000
         await measure {
             var lengths = 0
-            for _ in 0 ..< N {
+            for _ in 0..<N {
                 let result = path.basenameWithoutSuffix
                 lengths = lengths &+ result.utf8.count
             }
@@ -78,7 +78,7 @@ fileprivate struct PathPerfTests: PerfTests {
         let N = 100000
         await measure {
             var lengths = 0
-            for _ in 0 ..< N {
+            for _ in 0..<N {
                 let result = path.withoutSuffix
                 lengths = lengths &+ result.utf8.count
             }
@@ -92,7 +92,7 @@ fileprivate struct PathPerfTests: PerfTests {
         let N = 100000
         await measure {
             var lengths = 0
-            for _ in 0 ..< N {
+            for _ in 0..<N {
                 let result = path.fileSuffix
                 lengths = lengths &+ result.utf8.count
             }
@@ -106,7 +106,7 @@ fileprivate struct PathPerfTests: PerfTests {
         let N = 100000
         await measure {
             var lengths = 0
-            for _ in 0 ..< N {
+            for _ in 0..<N {
                 let result = path.fileExtension
                 lengths = lengths &+ result.utf8.count
             }
@@ -120,7 +120,7 @@ fileprivate struct PathPerfTests: PerfTests {
         let N = 100000
         await measure {
             var lengths = 0
-            for _ in 0 ..< N {
+            for _ in 0..<N {
                 let result = path.normalize()
                 lengths = lengths &+ result.str.utf8.count
             }
@@ -135,7 +135,7 @@ fileprivate struct PathPerfTests: PerfTests {
         let N = 100000
         await measure {
             var lengths = 0
-            for _ in 0 ..< N {
+            for _ in 0..<N {
                 let result = path.join(path2)
                 lengths = lengths &+ result.str.utf8.count
             }
diff --git a/Tests/SWBUtilPerfTests/QueuePerfTests.swift b/Tests/SWBUtilPerfTests/QueuePerfTests.swift
index f2d16715..0f27221c 100644
--- a/Tests/SWBUtilPerfTests/QueuePerfTests.swift
+++ b/Tests/SWBUtilPerfTests/QueuePerfTests.swift
@@ -26,15 +26,15 @@ fileprivate struct QueuePerfTests: PerfTests {
         #expect(halfN * 2 == N)
 
         await measure {
-            for _ in 0 ..< numIterations {
+            for _ in 0..<numIterations {
                 var q = Queue<Int>()
 
-                for i in 0 ..< N {
+                for i in 0..<N {
                     q.append(i)
                     q.append(i)
                     if q.popFirst() != i / 2 { fatalError() }
                 }
-                for i in 0 ..< N {
+                for i in 0..<N {
                     if q.popFirst() != halfN + i / 2 { fatalError() }
                 }
             }
diff --git a/Tests/SWBUtilPerfTests/StringPerfTests.swift b/Tests/SWBUtilPerfTests/StringPerfTests.swift
index 2428ebed..910ec20d 100644
--- a/Tests/SWBUtilPerfTests/StringPerfTests.swift
+++ b/Tests/SWBUtilPerfTests/StringPerfTests.swift
@@ -16,7 +16,7 @@ import SWBUtil
 
 /// A sequence of `count` random UInt8 numbers drawn from `range`.  [Note: it would be preferable to make this struct generic over all types of integers, but I haven’t found a way to do so that lets it compile. Perhaps declaring a new protocol and then making Integers adopt it would work?].
 fileprivate struct RandomUInt8Sequence: Sequence {
-    struct RandomUInt8Generator : IteratorProtocol {
+    struct RandomUInt8Generator: IteratorProtocol {
         var range: CountableClosedRange<UInt8>
         var count: Int
         mutating func next() -> UInt8? {
diff --git a/Tests/SWBUtilPerfTests/UtilPerfTests.swift b/Tests/SWBUtilPerfTests/UtilPerfTests.swift
index ada00192..a726ef1b 100644
--- a/Tests/SWBUtilPerfTests/UtilPerfTests.swift
+++ b/Tests/SWBUtilPerfTests/UtilPerfTests.swift
@@ -25,8 +25,8 @@ fileprivate struct UtilPerfTests: PerfTests {
                 "value2.key0": .plString("value2.value0"),
                 "value2.key1": .plString("value2.value1"),
                 "value2.key2": .plString("value2.value2"),
-                "value2.key3": .plString("value2.value3")
-            ])
+                "value2.key3": .plString("value2.value3"),
+            ]),
         ])
 
         let iterations = 10000
diff --git a/Tests/SWBUtilTests/ArchitectureTests.swift b/Tests/SWBUtilTests/ArchitectureTests.swift
index 84785df9..fe223f02 100644
--- a/Tests/SWBUtilTests/ArchitectureTests.swift
+++ b/Tests/SWBUtilTests/ArchitectureTests.swift
@@ -18,27 +18,27 @@ import SWBTestSupport
 @Suite fileprivate struct ArchitectureTests {
     @Test func hostArchitecture() async throws {
         #if canImport(Darwin)
-        #if arch(arm64)
-        #expect(Architecture.host.stringValue == "arm64")
-        #expect(Architecture.host.as32bit.stringValue == "arm")
-        #expect(Architecture.host.as64bit.stringValue == "arm64")
-        #endif
+            #if arch(arm64)
+                #expect(Architecture.host.stringValue == "arm64")
+                #expect(Architecture.host.as32bit.stringValue == "arm")
+                #expect(Architecture.host.as64bit.stringValue == "arm64")
+            #endif
 
-        #if arch(x86_64)
-        #expect(Architecture.host.stringValue == "x86_64")
-        #expect(Architecture.host.as32bit.stringValue == "i386")
-        #expect(Architecture.host.as64bit.stringValue == "x86_64")
-        #endif
+            #if arch(x86_64)
+                #expect(Architecture.host.stringValue == "x86_64")
+                #expect(Architecture.host.as32bit.stringValue == "i386")
+                #expect(Architecture.host.as64bit.stringValue == "x86_64")
+            #endif
         #else
-        #expect(Architecture.host.stringValue == nil)
+            #expect(Architecture.host.stringValue == nil)
 
-        #if arch(arm64)
-        #expect(Architecture.hostStringValue == "aarch64")
-        #endif
+            #if arch(arm64)
+                #expect(Architecture.hostStringValue == "aarch64")
+            #endif
 
-        #if arch(x86_64)
-        #expect(Architecture.hostStringValue == "x86_64")
-        #endif
+            #if arch(x86_64)
+                #expect(Architecture.hostStringValue == "x86_64")
+            #endif
         #endif
     }
 }
diff --git a/Tests/SWBUtilTests/ArrayTests.swift b/Tests/SWBUtilTests/ArrayTests.swift
index d77a6615..8bbc1214 100644
--- a/Tests/SWBUtilTests/ArrayTests.swift
+++ b/Tests/SWBUtilTests/ArrayTests.swift
@@ -18,59 +18,71 @@ import Testing
     @Test
     func nWayMerge() {
         #expect(SWBUtil.nWayMerge([] as [[Int]]) == [])
-        #expect(SWBUtil.nWayMerge([[1, 2]]) == [NWayMergeElement(element: 1, elementOf: [0]),
-                                        NWayMergeElement(element: 2, elementOf: [0])])
-        #expect(SWBUtil.nWayMerge([
-            [1, 2, 3],
-            [2, 3, 4],
-            [3, 4, 5]
-        ]) == [
-            NWayMergeElement(element: 1, elementOf: [0]),
-            NWayMergeElement(element: 2, elementOf: [0, 1]),
-            NWayMergeElement(element: 3, elementOf: [0, 1, 2]),
-            NWayMergeElement(element: 4, elementOf: [1, 2]),
-            NWayMergeElement(element: 5, elementOf: [2])
-        ])
+        #expect(
+            SWBUtil.nWayMerge([[1, 2]]) == [
+                NWayMergeElement(element: 1, elementOf: [0]),
+                NWayMergeElement(element: 2, elementOf: [0]),
+            ]
+        )
+        #expect(
+            SWBUtil.nWayMerge([
+                [1, 2, 3],
+                [2, 3, 4],
+                [3, 4, 5],
+            ]) == [
+                NWayMergeElement(element: 1, elementOf: [0]),
+                NWayMergeElement(element: 2, elementOf: [0, 1]),
+                NWayMergeElement(element: 3, elementOf: [0, 1, 2]),
+                NWayMergeElement(element: 4, elementOf: [1, 2]),
+                NWayMergeElement(element: 5, elementOf: [2]),
+            ]
+        )
 
-        #expect(SWBUtil.nWayMerge([
-            [1, 2],
-            [3, 4],
-            [5]
-        ]) == [
-            NWayMergeElement(element: 1, elementOf: [0]),
-            NWayMergeElement(element: 5, elementOf: [2]),
-            NWayMergeElement(element: 3, elementOf: [1]),
-            NWayMergeElement(element: 2, elementOf: [0]),
-            NWayMergeElement(element: 4, elementOf: [1])
-        ])
+        #expect(
+            SWBUtil.nWayMerge([
+                [1, 2],
+                [3, 4],
+                [5],
+            ]) == [
+                NWayMergeElement(element: 1, elementOf: [0]),
+                NWayMergeElement(element: 5, elementOf: [2]),
+                NWayMergeElement(element: 3, elementOf: [1]),
+                NWayMergeElement(element: 2, elementOf: [0]),
+                NWayMergeElement(element: 4, elementOf: [1]),
+            ]
+        )
 
-        #expect(SWBUtil.nWayMerge([
-            [1, 6, 3, 4],
-            [2, 3, 4],
-            [0, 3, 4, 5]
-        ]) == [
-            NWayMergeElement(element: 1, elementOf: [0]),
-            NWayMergeElement(element: 0, elementOf: [2]),
-            NWayMergeElement(element: 2, elementOf: [1]),
-            NWayMergeElement(element: 6, elementOf: [0]),
-            NWayMergeElement(element: 3, elementOf: [0, 1, 2]),
-            NWayMergeElement(element: 4, elementOf: [0, 1, 2]),
-            NWayMergeElement(element: 5, elementOf: [2]),
-        ])
+        #expect(
+            SWBUtil.nWayMerge([
+                [1, 6, 3, 4],
+                [2, 3, 4],
+                [0, 3, 4, 5],
+            ]) == [
+                NWayMergeElement(element: 1, elementOf: [0]),
+                NWayMergeElement(element: 0, elementOf: [2]),
+                NWayMergeElement(element: 2, elementOf: [1]),
+                NWayMergeElement(element: 6, elementOf: [0]),
+                NWayMergeElement(element: 3, elementOf: [0, 1, 2]),
+                NWayMergeElement(element: 4, elementOf: [0, 1, 2]),
+                NWayMergeElement(element: 5, elementOf: [2]),
+            ]
+        )
 
-        #expect(SWBUtil.nWayMerge([
-            [1, 0, 0, 1],
-            [2, 0, 0, 1],
-            [0, 0, 0, 2]
-        ]) == [
-            NWayMergeElement(element: 1, elementOf: [0]),
-            NWayMergeElement(element: 2, elementOf: [1]),
-            NWayMergeElement(element: 0, elementOf: [0, 1, 2]),
-            NWayMergeElement(element: 0, elementOf: [0, 1, 2]),
-            NWayMergeElement(element: 0, elementOf: [2]),
-            NWayMergeElement(element: 2, elementOf: [2]),
-            NWayMergeElement(element: 1, elementOf: [0, 1]),
-        ])
+        #expect(
+            SWBUtil.nWayMerge([
+                [1, 0, 0, 1],
+                [2, 0, 0, 1],
+                [0, 0, 0, 2],
+            ]) == [
+                NWayMergeElement(element: 1, elementOf: [0]),
+                NWayMergeElement(element: 2, elementOf: [1]),
+                NWayMergeElement(element: 0, elementOf: [0, 1, 2]),
+                NWayMergeElement(element: 0, elementOf: [0, 1, 2]),
+                NWayMergeElement(element: 0, elementOf: [2]),
+                NWayMergeElement(element: 2, elementOf: [2]),
+                NWayMergeElement(element: 1, elementOf: [0, 1]),
+            ]
+        )
     }
 
 }
diff --git a/Tests/SWBUtilTests/ByteStringTests.swift b/Tests/SWBUtilTests/ByteStringTests.swift
index 2a857a72..8648c7e9 100644
--- a/Tests/SWBUtilTests/ByteStringTests.swift
+++ b/Tests/SWBUtilTests/ByteStringTests.swift
@@ -48,8 +48,8 @@ extension ByteString {
     @Test
     func asString() {
         #expect(ByteString("hello").stringValue == "hello")
-        #expect(ByteString([0xFF,0xFF]).unsafeStringValue == "\u{FFFD}\u{FFFD}")
-        #expect(ByteString([0xFF,0xFF]).stringValue == nil)
+        #expect(ByteString([0xFF, 0xFF]).unsafeStringValue == "\u{FFFD}\u{FFFD}")
+        #expect(ByteString([0xFF, 0xFF]).stringValue == nil)
     }
 
     @Test
@@ -65,7 +65,7 @@ extension ByteString {
         #expect(!s.contains(ByteString([3])))
 
         // Insert a long string which tests overflow in the hash function.
-        let long = ByteString([UInt8](0 ..< 100))
+        let long = ByteString([UInt8](0..<100))
         #expect(!s.contains(long))
         s.insert(long)
         #expect(s.contains(long))
@@ -90,7 +90,7 @@ extension ByteString {
         #expect(!s.hasPrefix("bar"))
         #expect(s.hasPrefix("foobar"))
         #expect(!s.hasPrefix("foobars"))
-        #expect(s.hasPrefix("")) // same behavior as String.hasPrefix
+        #expect(s.hasPrefix(""))  // same behavior as String.hasPrefix
         #expect(!s.hasPrefix("what"))
 
         let string: String = "foobar"
@@ -104,7 +104,7 @@ extension ByteString {
         #expect(!s.hasSuffix("foo"))
         #expect(s.hasSuffix("foobar"))
         #expect(!s.hasSuffix("afoobar"))
-        #expect(s.hasSuffix("")) // same behavior as String.hasSuffix
+        #expect(s.hasSuffix(""))  // same behavior as String.hasSuffix
         #expect(!s.hasSuffix("what"))
 
         let string: String = "foobar"
diff --git a/Tests/SWBUtilTests/CSVTests.swift b/Tests/SWBUtilTests/CSVTests.swift
index c2ac78ad..29574627 100644
--- a/Tests/SWBUtilTests/CSVTests.swift
+++ b/Tests/SWBUtilTests/CSVTests.swift
@@ -30,11 +30,13 @@ import SWBUtil
         builder.writeRow(["col1", "col2", "col3"])
         builder.writeRow(["v1", "v2", "v3"])
         builder.writeRow(["has whitespace", "has,comma", "has\"quote"])
-        #expect(builder.output == """
-        col1,col2,col3\r
-        v1,v2,v3\r
-        "has whitespace","has,comma","has""quote"\r
+        #expect(
+            builder.output == """
+                col1,col2,col3\r
+                v1,v2,v3\r
+                "has whitespace","has,comma","has""quote"\r
 
-        """)
+                """
+        )
     }
 }
diff --git a/Tests/SWBUtilTests/DependencyInfoTests.swift b/Tests/SWBUtilTests/DependencyInfoTests.swift
index e856cc44..e2bc2818 100644
--- a/Tests/SWBUtilTests/DependencyInfoTests.swift
+++ b/Tests/SWBUtilTests/DependencyInfoTests.swift
@@ -19,25 +19,41 @@ import Testing
     func roundTrip() throws {
         let depInfo = DependencyInfo(version: "foo", inputs: ["/bar", "/bazz"], missing: [], outputs: ["/cool-output"])
         let bytes = try depInfo.asBytes()
-        #expect(bytes == [0x00, 102, 111, 111, 0,
-                          0x10, 47, 98, 97, 114, 0,
-                          0x10, 47, 98, 97, 122, 122, 0,
-                          0x40, 47, 99, 111, 111, 108, 45, 111, 117, 116, 112, 117, 116, 0])
+        #expect(
+            bytes == [
+                0x00, 102, 111, 111, 0,
+                0x10, 47, 98, 97, 114, 0,
+                0x10, 47, 98, 97, 122, 122, 0,
+                0x40, 47, 99, 111, 111, 108, 45, 111, 117, 116, 112, 117, 116, 0,
+            ]
+        )
         #expect(try depInfo == DependencyInfo(bytes: bytes))
     }
 
     @Test
     func encoding() throws {
         let depInfo1 = DependencyInfo(version: "foo", inputs: ["/bar"])
-        #expect(try depInfo1.asBytes() == [0x00, 102, 111, 111, 0,
-                                           0x10, 47, 98, 97, 114, 0])
+        #expect(
+            try depInfo1.asBytes() == [
+                0x00, 102, 111, 111, 0,
+                0x10, 47, 98, 97, 114, 0,
+            ]
+        )
         let depInfo2 = DependencyInfo(version: "foo", missing: ["/bar", "/bar"])
-        #expect(try depInfo2.asBytes() == [0x00, 102, 111, 111, 0,
-                                           0x11, 47, 98, 97, 114, 0,
-                                           0x11, 47, 98, 97, 114, 0])
+        #expect(
+            try depInfo2.asBytes() == [
+                0x00, 102, 111, 111, 0,
+                0x11, 47, 98, 97, 114, 0,
+                0x11, 47, 98, 97, 114, 0,
+            ]
+        )
         let depInfo3 = DependencyInfo(version: "foo", outputs: ["/bar"])
-        #expect(try depInfo3.asBytes() == [0x00, 102, 111, 111, 0,
-                                           0x40, 47, 98, 97, 114, 0])
+        #expect(
+            try depInfo3.asBytes() == [
+                0x00, 102, 111, 111, 0,
+                0x40, 47, 98, 97, 114, 0,
+            ]
+        )
     }
 
     @Test
@@ -69,16 +85,28 @@ import Testing
 
     @Test
     func decoding() throws {
-        #expect(try DependencyInfo(bytes: [0x00, 102, 111, 111, 0,
-                                           0x10, 47, 98, 97, 114, 0,
-                                           0x10, 47, 98, 97, 115, 0]) == DependencyInfo(version: "foo", inputs: ["/bar", "/bas"]))
-
-        #expect(try DependencyInfo(bytes: [0x00, 102, 111, 111, 0,
-                                           0x11, 47, 98, 97, 114, 0]) == DependencyInfo(version: "foo", missing: ["/bar"]))
-
-        #expect(try DependencyInfo(bytes: [0x00, 102, 111, 111, 0,
-                                           0x40, 47, 98, 97, 114, 0,
-                                           0x40, 47, 98, 97, 113, 0]) == DependencyInfo(version: "foo", outputs: ["/bar", "/baq"]))
+        #expect(
+            try DependencyInfo(bytes: [
+                0x00, 102, 111, 111, 0,
+                0x10, 47, 98, 97, 114, 0,
+                0x10, 47, 98, 97, 115, 0,
+            ]) == DependencyInfo(version: "foo", inputs: ["/bar", "/bas"])
+        )
+
+        #expect(
+            try DependencyInfo(bytes: [
+                0x00, 102, 111, 111, 0,
+                0x11, 47, 98, 97, 114, 0,
+            ]) == DependencyInfo(version: "foo", missing: ["/bar"])
+        )
+
+        #expect(
+            try DependencyInfo(bytes: [
+                0x00, 102, 111, 111, 0,
+                0x40, 47, 98, 97, 114, 0,
+                0x40, 47, 98, 97, 113, 0,
+            ]) == DependencyInfo(version: "foo", outputs: ["/bar", "/baq"])
+        )
     }
 
     @Test
diff --git a/Tests/SWBUtilTests/DictionaryTests.swift b/Tests/SWBUtilTests/DictionaryTests.swift
index ae1cc4fe..29899275 100644
--- a/Tests/SWBUtilTests/DictionaryTests.swift
+++ b/Tests/SWBUtilTests/DictionaryTests.swift
@@ -23,16 +23,16 @@ import SWBUtil
 
     @Test
     func addContentsOf() {
-        var firstDict = [ "a": 1, "b": 2, "c": 3 ]
+        var firstDict = ["a": 1, "b": 2, "c": 3]
 
-        firstDict.addContents(of:  [ "d": 4, "e": 5 ])
-        #expect(firstDict == [ "a": 1, "b": 2, "c": 3 , "d": 4, "e": 5 ])
+        firstDict.addContents(of: ["d": 4, "e": 5])
+        #expect(firstDict == ["a": 1, "b": 2, "c": 3, "d": 4, "e": 5])
 
-        firstDict.addContents(of:  [ "b": 6 ] )
-        #expect(firstDict == [ "a": 1, "b": 6, "c": 3 , "d": 4, "e": 5 ])
+        firstDict.addContents(of: ["b": 6])
+        #expect(firstDict == ["a": 1, "b": 6, "c": 3, "d": 4, "e": 5])
 
-        firstDict.addContents(of:  [ "a": 7, "f": 8 ] )
-        #expect(firstDict == [ "a": 7, "b": 6, "c": 3 , "d": 4, "e": 5, "f": 8 ])
+        firstDict.addContents(of: ["a": 7, "f": 8])
+        #expect(firstDict == ["a": 7, "b": 6, "c": 3, "d": 4, "e": 5, "f": 8])
     }
 
     @Test
@@ -70,7 +70,7 @@ import SWBUtil
     func filterKeys() {
         let inDict = [
             "CFFoo": 1,
-            "NSBar": 2
+            "NSBar": 2,
         ]
 
         let emptyDict: [String: Int] = [:]
diff --git a/Tests/SWBUtilTests/EnvironmentTests.swift b/Tests/SWBUtilTests/EnvironmentTests.swift
index d5eb91f8..fdd8b55e 100644
--- a/Tests/SWBUtilTests/EnvironmentTests.swift
+++ b/Tests/SWBUtilTests/EnvironmentTests.swift
@@ -41,7 +41,7 @@ import Testing
         let environment = Environment(dictionary)
 
         if isCaseInsensitive {
-            #expect(environment["TestKey"] == "TestValue2") // uppercase sorts before lowercase, so the second value overwrites the first
+            #expect(environment["TestKey"] == "TestValue2")  // uppercase sorts before lowercase, so the second value overwrites the first
             #expect(environment.count == 1)
         } else {
             #expect(environment["TestKey"] == "TestValue")
diff --git a/Tests/SWBUtilTests/FSProxyTests.swift b/Tests/SWBUtilTests/FSProxyTests.swift
index 2b69e22f..b8ead752 100644
--- a/Tests/SWBUtilTests/FSProxyTests.swift
+++ b/Tests/SWBUtilTests/FSProxyTests.swift
@@ -18,27 +18,27 @@ import SWBTestSupport
 @_spi(TestSupport) import SWBUtil
 
 #if canImport(System)
-import System
+    import System
 #else
-import SystemPackage
+    import SystemPackage
 #endif
 
 @Suite fileprivate struct FSProxyTests {
 
-#if !os(Windows)
-    /// Utility method to check the modes of an item at the given path.
-    private func checkModes(_ path: Path, modes: [mode_t], sourceLocation: SourceLocation = #_sourceLocation) {
-        var sbuf = stat()
-        let rv = stat(path.str, &sbuf)
-        guard rv == 0 else {
-            Issue.record("Invalid stat return value \(rv) for \(path)", sourceLocation: sourceLocation)
-            return
-        }
-        for mode in modes {
-            #expect(mode_t(sbuf.st_mode) & mode > 0, "mode \(mode) not found on \(path)", sourceLocation: sourceLocation)
+    #if !os(Windows)
+        /// Utility method to check the modes of an item at the given path.
+        private func checkModes(_ path: Path, modes: [mode_t], sourceLocation: SourceLocation = #_sourceLocation) {
+            var sbuf = stat()
+            let rv = stat(path.str, &sbuf)
+            guard rv == 0 else {
+                Issue.record("Invalid stat return value \(rv) for \(path)", sourceLocation: sourceLocation)
+                return
+            }
+            for mode in modes {
+                #expect(mode_t(sbuf.st_mode) & mode > 0, "mode \(mode) not found on \(path)", sourceLocation: sourceLocation)
+            }
         }
-    }
-#endif
+    #endif
 
     // MARK: LocalFS Tests
 
@@ -50,9 +50,9 @@ import SystemPackage
                 let testPath = tmpDir.join("new-dir")
                 #expect(!localFS.exists(testPath))
                 try localFS.createDirectory(testPath)
-#if !os(Windows)
-                checkModes(testPath, modes: [S_IRWXU, S_IRWXG, S_IRWXO])
-#endif
+                #if !os(Windows)
+                    checkModes(testPath, modes: [S_IRWXU, S_IRWXG, S_IRWXO])
+                #endif
                 #expect(localFS.exists(testPath))
                 #expect(localFS.isDirectory(testPath))
             }
@@ -102,8 +102,7 @@ import SystemPackage
                 var didThrow = false
                 do {
                     try localFS.createDirectory(filePath)
-                }
-                catch {
+                } catch {
                     didThrow = true
                     #expect(error.localizedDescription == "File exists but is not a directory: \(filePath.str)")
                 }
@@ -114,13 +113,12 @@ import SystemPackage
                 didThrow = false
                 do {
                     try localFS.createDirectory(dirPath, recursive: true)
-                }
-                catch {
+                } catch {
                     didThrow = true
                     #if os(Windows)
-                    #expect(error.localizedDescription == "File exists but is not a directory: \(filePath.str)")
+                        #expect(error.localizedDescription == "File exists but is not a directory: \(filePath.str)")
                     #else
-                    #expect(error.localizedDescription == "File exists but is not a directory: \(dirPath.str)")
+                        #expect(error.localizedDescription == "File exists but is not a directory: \(dirPath.str)")
                     #endif
                 }
                 #expect(didThrow)
@@ -137,8 +135,7 @@ import SystemPackage
                 var didThrow = false
                 do {
                     try localFS.createDirectory(symlinkPath)
-                }
-                catch {
+                } catch {
                     didThrow = true
                     #expect(error.localizedDescription == "File is a broken symbolic link: \(symlinkPath.str)")
                 }
@@ -149,8 +146,7 @@ import SystemPackage
                 didThrow = false
                 do {
                     try localFS.createDirectory(dirPath, recursive: true)
-                }
-                catch {
+                } catch {
                     didThrow = true
                     #expect(error.localizedDescription == "File is a broken symbolic link: \(symlinkPath.str)")
                 }
@@ -174,8 +170,7 @@ import SystemPackage
                 var didThrow = false
                 do {
                     try localFS.createDirectory(symlinkPath)
-                }
-                catch {
+                } catch {
                     didThrow = true
                     #expect(error.localizedDescription == "File is a symbolic link which references a path which is not a directory: \(symlinkPath.str)")
                 }
@@ -186,13 +181,12 @@ import SystemPackage
                 didThrow = false
                 do {
                     try localFS.createDirectory(dirPath, recursive: true)
-                }
-                catch {
+                } catch {
                     didThrow = true
                     #if os(Windows)
-                    #expect(error.localizedDescription == "File is a symbolic link which references a path which is not a directory: \(symlinkPath.str)")
+                        #expect(error.localizedDescription == "File is a symbolic link which references a path which is not a directory: \(symlinkPath.str)")
                     #else
-                    #expect(error.localizedDescription == "File exists but is not a directory: \(dirPath.str)")
+                        #expect(error.localizedDescription == "File exists but is not a directory: \(dirPath.str)")
                     #endif
                 }
                 #expect(didThrow)
@@ -313,7 +307,7 @@ import SystemPackage
         }
     }
 
-    @Test(.requireHostOS(.macOS)) // `moveInSameVolume` just does nothing on Linux, apparently
+    @Test(.requireHostOS(.macOS))  // `moveInSameVolume` just does nothing on Linux, apparently
     func localMoveInSameVolume() throws {
         let fs = localFS
         try withTemporaryDirectory(fs: fs) { tmpDirPath in
@@ -350,7 +344,7 @@ import SystemPackage
         }
     }
 
-    @Test(.skipHostOS(.windows)) // POSIX permissions model is inapplicable to Windows
+    @Test(.skipHostOS(.windows))  // POSIX permissions model is inapplicable to Windows
     func localSetPermissions() throws {
         try withTemporaryDirectory { tmpDir in
             // Test setting file permissions.
@@ -437,11 +431,14 @@ import SystemPackage
                 #expect(symLinkFileInfo.isSymlink)
             }
 
-            #expect(performing: {
-                _ = try localFS.realpath(realTmpPath.join("nonexistent"))
-            }, throws: { error in
-                (error as? SWBUtil.POSIXError)?.code == ENOENT
-            })
+            #expect(
+                performing: {
+                    _ = try localFS.realpath(realTmpPath.join("nonexistent"))
+                },
+                throws: { error in
+                    (error as? SWBUtil.POSIXError)?.code == ENOENT
+                }
+            )
         }
     }
 
@@ -1088,7 +1085,7 @@ import SystemPackage
         try _testFileSignatureHonorIgnoreDeviceInodeChangesSetting(simulated: true, at: Path.root.join("base"))
     }
 
-    @Test(.requireHostOS(.macOS)) // copying the file doesn't guarantee a new inode on Windows or Linux
+    @Test(.requireHostOS(.macOS))  // copying the file doesn't guarantee a new inode on Windows or Linux
     func fileSignatureHonorIgnoreDeviceInodeChangesSettingLocalFS() throws {
         try withTemporaryDirectory { tmpDir in
             try _testFileSignatureHonorIgnoreDeviceInodeChangesSetting(simulated: false, at: tmpDir)
diff --git a/Tests/SWBUtilTests/FileHandleTests.swift b/Tests/SWBUtilTests/FileHandleTests.swift
index 06423953..1803f618 100644
--- a/Tests/SWBUtilTests/FileHandleTests.swift
+++ b/Tests/SWBUtilTests/FileHandleTests.swift
@@ -16,9 +16,9 @@ import SWBTestSupport
 import Testing
 
 #if canImport(System)
-import System
+    import System
 #else
-import SystemPackage
+    import SystemPackage
 #endif
 
 @Suite fileprivate struct FileHandleTests {
diff --git a/Tests/SWBUtilTests/FnmatchTests.swift b/Tests/SWBUtilTests/FnmatchTests.swift
index fc388083..e0adcb65 100644
--- a/Tests/SWBUtilTests/FnmatchTests.swift
+++ b/Tests/SWBUtilTests/FnmatchTests.swift
@@ -238,9 +238,16 @@ import SWBUtil
         try assertFnmatch(pattern: "fo[ob]", input: "foO", options: [.caseInsensitive])
         try assertFnmatch(pattern: "fo[!BA]", input: "foO", options: [.caseInsensitive])
         try assertFnmatch(
-            pattern: "foO[ba]", input: "foo", shouldMatch: false, options: [.caseInsensitive])
+            pattern: "foO[ba]",
+            input: "foo",
+            shouldMatch: false,
+            options: [.caseInsensitive]
+        )
         try assertFnmatch(
-            pattern: "fo[oO]/???/*/baz", input: "foO/bar/baz/baz", options: [.caseInsensitive])
+            pattern: "fo[oO]/???/*/baz",
+            input: "foO/bar/baz/baz",
+            options: [.caseInsensitive]
+        )
         try assertFnmatch(pattern: "[A-Z]", input: "m", options: [.caseInsensitive])
         try assertFnmatch(pattern: "[a-z]", input: "M", options: [.caseInsensitive])
     }
@@ -272,7 +279,13 @@ import SWBUtil
     }
 
     func assertFnmatch(
-        pattern: String, input: String, shouldMatch: Bool = true, options: FnmatchOptions = .default, separators: (some Collection<Character>)? = ([Character]?).none, sourceLocation: SourceLocation = #_sourceLocation) throws {
+        pattern: String,
+        input: String,
+        shouldMatch: Bool = true,
+        options: FnmatchOptions = .default,
+        separators: (some Collection<Character>)? = ([Character]?).none,
+        sourceLocation: SourceLocation = #_sourceLocation
+    ) throws {
         let comment = Comment(stringLiteral: "\(pattern) \(shouldMatch ? "should" : "should not") match \(input)")
         let result = try fnmatch(pattern: pattern, input: input, options: options, pathSeparators: separators)
         shouldMatch ? #expect(result, comment, sourceLocation: sourceLocation) : #expect(!result, comment, sourceLocation: sourceLocation)
diff --git a/Tests/SWBUtilTests/GraphAlgorithmsTests.swift b/Tests/SWBUtilTests/GraphAlgorithmsTests.swift
index a7bb06e1..f8a11109 100644
--- a/Tests/SWBUtilTests/GraphAlgorithmsTests.swift
+++ b/Tests/SWBUtilTests/GraphAlgorithmsTests.swift
@@ -55,7 +55,7 @@ import SWBUtil
         let diamond: [Int: [Int]] = [
             1: [3, 2],
             2: [4],
-            3: [4]
+            3: [4],
         ]
         #expect([2, 3, 4] == SWBUtilTests.transitiveClosure(1, diamond))
         #expect([4] == SWBUtilTests.transitiveClosure([3, 2], diamond))
@@ -71,7 +71,7 @@ import SWBUtil
         let diamond: [Int: [Int]] = [
             1: [3, 2],
             2: [4],
-            3: [4]
+            3: [4],
         ]
         let dupes = SWBUtil.transitiveClosure([4, 3, 2, 1], successors: { diamond[$0] ?? [] }).1
         #expect([4] == dupes)
@@ -80,19 +80,23 @@ import SWBUtil
 }
 
 private func minimumDistance<T>(
-    from source: T, to destination: T, in graph: [T: [T]]
+    from source: T,
+    to destination: T,
+    in graph: [T: [T]]
 ) -> Int? {
     return minimumDistance(from: source, to: destination, successors: { graph[$0] ?? [] })
 }
 
 private func shortestPath<T>(
-    from source: T, to destination: T, in graph: [T: [T]]
+    from source: T,
+    to destination: T,
+    in graph: [T: [T]]
 ) -> [T]? {
     return shortestPath(from: source, to: destination, successors: { graph[$0] ?? [] })
 }
 
 private func transitiveClosure(_ nodes: [Int], _ successors: [Int: [Int]]) -> [Int] {
-    return transitiveClosure(nodes, successors: { successors[$0] ?? [] }).0.map{$0}.sorted()
+    return transitiveClosure(nodes, successors: { successors[$0] ?? [] }).0.map { $0 }.sorted()
 }
 private func transitiveClosure(_ node: Int, _ successors: [Int: [Int]]) -> [Int] {
     return transitiveClosure([node], successors)
diff --git a/Tests/SWBUtilTests/HeadermapTests.swift b/Tests/SWBUtilTests/HeadermapTests.swift
index f86d9b7b..fde4f4c8 100644
--- a/Tests/SWBUtilTests/HeadermapTests.swift
+++ b/Tests/SWBUtilTests/HeadermapTests.swift
@@ -28,37 +28,37 @@ extension Headermap {
 
         // Manually construct the expected output, so we have at least one test based on the fixed output.
         var expected = [UInt8]()
-        expected += [112, 97, 109, 104]                  // magic
-        expected += [1, 0]                               // version
-        expected += [0, 0]                               // reserved
-        expected += [36, 0, 0, 0]                        // string table offset (== header size (24) + bucket size (12) * bucket count (1))
-        expected += [0, 0, 0, 0]                         // num entries
-        expected += [1, 0, 0, 0]                         // num buckets
-        expected += [0, 0, 0, 0]                         // max value length
-        expected += [UInt8](repeating: 0, count: 12) // bucket
-        expected += [0]                                  // string table
+        expected += [112, 97, 109, 104]  // magic
+        expected += [1, 0]  // version
+        expected += [0, 0]  // reserved
+        expected += [36, 0, 0, 0]  // string table offset (== header size (24) + bucket size (12) * bucket count (1))
+        expected += [0, 0, 0, 0]  // num entries
+        expected += [1, 0, 0, 0]  // num buckets
+        expected += [0, 0, 0, 0]  // max value length
+        expected += [UInt8](repeating: 0, count: 12)  // bucket
+        expected += [0]  // string table
         #expect(hmap.toBytes() == ByteString(expected))
     }
 
     @Test
     func readMinimalHmap() throws {
         var input = [UInt8]()
-        input += [112, 97, 109, 104]                  // magic
-        input += [1, 0]                               // version
-        input += [0, 0]                               // reserved
-        input += [72, 0, 0, 0]                        // string table offset (== header size (24) + bucket size (12) * bucket count (4))
-        input += [1, 0, 0, 0]                         // num entries
-        input += [4, 0, 0, 0]                         // num buckets
-        input += [8, 0, 0, 0]                         // max value length
-        input += [UInt8](repeating: 0, count: 12) // bucket
-        input += [UInt8](repeating: 0, count: 12) // bucket
-        input += [UInt8](repeating: 0, count: 12) // bucket
-        input += [1, 0, 0, 0]                         // bucket (key index)
-        input += [5, 0, 0, 0]                         // bucket (prefix index)
-        input += [1, 0, 0, 0]                         // bucket (suffix index)
-        input += [0]                                  // string-table (offset: 0, "")
-        input += [UInt8]("a.h".utf8) + [0]            // string-table (offset: 1, "")
-        input += [UInt8]("/tmp/".utf8) + [0]          // string-table (offset: 5, "")
+        input += [112, 97, 109, 104]  // magic
+        input += [1, 0]  // version
+        input += [0, 0]  // reserved
+        input += [72, 0, 0, 0]  // string table offset (== header size (24) + bucket size (12) * bucket count (4))
+        input += [1, 0, 0, 0]  // num entries
+        input += [4, 0, 0, 0]  // num buckets
+        input += [8, 0, 0, 0]  // max value length
+        input += [UInt8](repeating: 0, count: 12)  // bucket
+        input += [UInt8](repeating: 0, count: 12)  // bucket
+        input += [UInt8](repeating: 0, count: 12)  // bucket
+        input += [1, 0, 0, 0]  // bucket (key index)
+        input += [5, 0, 0, 0]  // bucket (prefix index)
+        input += [1, 0, 0, 0]  // bucket (suffix index)
+        input += [0]  // string-table (offset: 0, "")
+        input += [UInt8]("a.h".utf8) + [0]  // string-table (offset: 1, "")
+        input += [UInt8]("/tmp/".utf8) + [0]  // string-table (offset: 5, "")
         let hmap = try Headermap(bytes: input)
         #expect(hmap.debugBindings == ["a.h -> /tmp/a.h"])
     }
diff --git a/Tests/SWBUtilTests/HeavyCacheTests.swift b/Tests/SWBUtilTests/HeavyCacheTests.swift
index e4f0c9fb..76704885 100644
--- a/Tests/SWBUtilTests/HeavyCacheTests.swift
+++ b/Tests/SWBUtilTests/HeavyCacheTests.swift
@@ -76,7 +76,7 @@ fileprivate struct HeavyCacheTests {
         do {
             let max = 4
             await withHeavyCache(maximumSize: max) { cache in
-                for i in 0 ..< 100 {
+                for i in 0..<100 {
                     if i < 50 {
                         _ = cache.getOrInsert(i) { i }
                     } else {
@@ -91,7 +91,7 @@ fileprivate struct HeavyCacheTests {
         // Check max set after the fact.
         do {
             await withHeavyCache { cache in
-                for i in 0 ..< 100 {
+                for i in 0..<100 {
                     if i < 50 {
                         _ = cache.getOrInsert(i) { i }
                     } else {
@@ -111,7 +111,7 @@ fileprivate struct HeavyCacheTests {
         let fudgeFactor = 10.0
         let ttl = Duration.seconds(0.01)
         try await withHeavyCache(timeToLive: ttl) { cache in
-            for i in 0 ..< 100 {
+            for i in 0..<100 {
                 if i < 50 {
                     _ = cache.getOrInsert(i) { i }
                 } else {
@@ -130,7 +130,7 @@ fileprivate struct HeavyCacheTests {
         let fudgeFactor = 10.0
         let ttl = Duration.seconds(0.01)
         try await withHeavyCache { cache in
-            for i in 0 ..< 100 {
+            for i in 0..<100 {
                 _ = cache.getOrInsert(i) { i }
             }
             #expect(cache.count == 100, "Expected cache to contain all 100 items that were inserted")
@@ -173,7 +173,7 @@ fileprivate struct HeavyCacheTests {
         try await withHeavyCache(maximumSize: 3) { cache in
             cache[0] = 0
             cache[1] = 1
-            for i in 2 ..< 100 {
+            for i in 2..<100 {
                 try await Task.sleep(for: .microseconds(1))
                 cache[i] = i
                 _ = cache[0]
diff --git a/Tests/SWBUtilTests/LinuxDistributionTests.swift b/Tests/SWBUtilTests/LinuxDistributionTests.swift
index 62d24cd4..ebc16ef7 100644
--- a/Tests/SWBUtilTests/LinuxDistributionTests.swift
+++ b/Tests/SWBUtilTests/LinuxDistributionTests.swift
@@ -45,19 +45,19 @@ fileprivate struct LinuxDistributionTests {
     @Test
     func detectUbuntuFromOSRelease() async throws {
         let osReleaseContent = """
-        NAME="Ubuntu"
-        VERSION="22.04.3 LTS (Jammy Jellyfish)"
-        ID=ubuntu
-        ID_LIKE=debian
-        PRETTY_NAME="Ubuntu 22.04.3 LTS"
-        VERSION_ID="22.04"
-        HOME_URL="https://www.ubuntu.com/"
-        SUPPORT_URL="https://help.ubuntu.com/"
-        BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"
-        PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
-        VERSION_CODENAME=jammy
-        UBUNTU_CODENAME=jammy
-        """
+            NAME="Ubuntu"
+            VERSION="22.04.3 LTS (Jammy Jellyfish)"
+            ID=ubuntu
+            ID_LIKE=debian
+            PRETTY_NAME="Ubuntu 22.04.3 LTS"
+            VERSION_ID="22.04"
+            HOME_URL="https://www.ubuntu.com/"
+            SUPPORT_URL="https://help.ubuntu.com/"
+            BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"
+            PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
+            VERSION_CODENAME=jammy
+            UBUNTU_CODENAME=jammy
+            """
 
         try await withMockLinuxDistribution(osReleaseContent: osReleaseContent) { fs in
             let operatingSystem = OperatingSystem.linux
@@ -73,16 +73,16 @@ fileprivate struct LinuxDistributionTests {
     @Test
     func detectDebianFromOSRelease() async throws {
         let osReleaseContent = """
-        PRETTY_NAME="Debian GNU/Linux 12 (bookworm)"
-        NAME="Debian GNU/Linux"
-        VERSION_ID="12"
-        VERSION="12 (bookworm)"
-        VERSION_CODENAME=bookworm
-        ID=debian
-        HOME_URL="https://www.debian.org/"
-        SUPPORT_URL="https://www.debian.org/support"
-        BUG_REPORT_URL="https://bugs.debian.org/"
-        """
+            PRETTY_NAME="Debian GNU/Linux 12 (bookworm)"
+            NAME="Debian GNU/Linux"
+            VERSION_ID="12"
+            VERSION="12 (bookworm)"
+            VERSION_CODENAME=bookworm
+            ID=debian
+            HOME_URL="https://www.debian.org/"
+            SUPPORT_URL="https://www.debian.org/support"
+            BUG_REPORT_URL="https://bugs.debian.org/"
+            """
 
         try await withMockLinuxDistribution(osReleaseContent: osReleaseContent) { fs in
             let operatingSystem = OperatingSystem.linux
@@ -98,29 +98,29 @@ fileprivate struct LinuxDistributionTests {
     @Test
     func detectFedoraFromOSRelease() async throws {
         let osReleaseContent = """
-        NAME="Fedora Linux"
-        VERSION="39 (Workstation Edition)"
-        ID=fedora
-        VERSION_ID=39
-        VERSION_CODENAME=""
-        PLATFORM_ID="platform:f39"
-        PRETTY_NAME="Fedora Linux 39 (Workstation Edition)"
-        ANSI_COLOR="0;38;2;60;110;180"
-        LOGO=fedora-logo-icon
-        CPE_NAME="cpe:/o:fedoraproject:fedora:39"
-        DEFAULT_HOSTNAME="fedora"
-        HOME_URL="https://fedoraproject.org/"
-        DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/f39/system-administrators-guide/"
-        SUPPORT_URL="https://ask.fedoraproject.org/"
-        BUG_REPORT_URL="https://bugzilla.redhat.com/"
-        REDHAT_BUGZILLA_PRODUCT="Fedora"
-        REDHAT_BUGZILLA_PRODUCT_VERSION=39
-        REDHAT_SUPPORT_PRODUCT="Fedora"
-        REDHAT_SUPPORT_PRODUCT_VERSION=39
-        SUPPORT_END=2024-11-12
-        VARIANT="Workstation Edition"
-        VARIANT_ID=workstation
-        """
+            NAME="Fedora Linux"
+            VERSION="39 (Workstation Edition)"
+            ID=fedora
+            VERSION_ID=39
+            VERSION_CODENAME=""
+            PLATFORM_ID="platform:f39"
+            PRETTY_NAME="Fedora Linux 39 (Workstation Edition)"
+            ANSI_COLOR="0;38;2;60;110;180"
+            LOGO=fedora-logo-icon
+            CPE_NAME="cpe:/o:fedoraproject:fedora:39"
+            DEFAULT_HOSTNAME="fedora"
+            HOME_URL="https://fedoraproject.org/"
+            DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/f39/system-administrators-guide/"
+            SUPPORT_URL="https://ask.fedoraproject.org/"
+            BUG_REPORT_URL="https://bugzilla.redhat.com/"
+            REDHAT_BUGZILLA_PRODUCT="Fedora"
+            REDHAT_BUGZILLA_PRODUCT_VERSION=39
+            REDHAT_SUPPORT_PRODUCT="Fedora"
+            REDHAT_SUPPORT_PRODUCT_VERSION=39
+            SUPPORT_END=2024-11-12
+            VARIANT="Workstation Edition"
+            VARIANT_ID=workstation
+            """
 
         try await withMockLinuxDistribution(osReleaseContent: osReleaseContent) { fs in
             let operatingSystem = OperatingSystem.linux
@@ -136,19 +136,19 @@ fileprivate struct LinuxDistributionTests {
     @Test
     func detectAmazonLinuxFromOSRelease() async throws {
         let osReleaseContent = """
-        NAME="Amazon Linux"
-        VERSION="2023"
-        ID="amzn"
-        ID_LIKE="fedora"
-        VERSION_ID="2023"
-        PLATFORM_ID="platform:al2023"
-        PRETTY_NAME="Amazon Linux 2023"
-        ANSI_COLOR="0;33"
-        CPE_NAME="cpe:2.3:o:amazon:amazon_linux:2023"
-        HOME_URL="https://aws.amazon.com/linux/"
-        BUG_REPORT_URL="https://github.com/amazonlinux/amazon-linux-2023"
-        SUPPORT_END="2028-03-15"
-        """
+            NAME="Amazon Linux"
+            VERSION="2023"
+            ID="amzn"
+            ID_LIKE="fedora"
+            VERSION_ID="2023"
+            PLATFORM_ID="platform:al2023"
+            PRETTY_NAME="Amazon Linux 2023"
+            ANSI_COLOR="0;33"
+            CPE_NAME="cpe:2.3:o:amazon:amazon_linux:2023"
+            HOME_URL="https://aws.amazon.com/linux/"
+            BUG_REPORT_URL="https://github.com/amazonlinux/amazon-linux-2023"
+            SUPPORT_END="2028-03-15"
+            """
 
         try await withMockLinuxDistribution(osReleaseContent: osReleaseContent) { fs in
             let operatingSystem = OperatingSystem.linux
@@ -164,23 +164,23 @@ fileprivate struct LinuxDistributionTests {
     @Test
     func detectRHELFromOSRelease() async throws {
         let osReleaseContent = """
-        NAME="Red Hat Enterprise Linux"
-        VERSION="9.3 (Plow)"
-        ID="rhel"
-        ID_LIKE="fedora"
-        VERSION_ID="9.3"
-        PLATFORM_ID="platform:el9"
-        PRETTY_NAME="Red Hat Enterprise Linux 9.3 (Plow)"
-        ANSI_COLOR="0;31"
-        CPE_NAME="cpe:/o:redhat:enterprise_linux:9::baseos"
-        HOME_URL="https://www.redhat.com/"
-        DOCUMENTATION_URL="https://access.redhat.com/documentation/red_hat_enterprise_linux/9/"
-        BUG_REPORT_URL="https://bugzilla.redhat.com/"
-        REDHAT_BUGZILLA_PRODUCT="Red Hat Enterprise Linux 9"
-        REDHAT_BUGZILLA_PRODUCT_VERSION=9.3
-        REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux"
-        REDHAT_SUPPORT_PRODUCT_VERSION="9.3"
-        """
+            NAME="Red Hat Enterprise Linux"
+            VERSION="9.3 (Plow)"
+            ID="rhel"
+            ID_LIKE="fedora"
+            VERSION_ID="9.3"
+            PLATFORM_ID="platform:el9"
+            PRETTY_NAME="Red Hat Enterprise Linux 9.3 (Plow)"
+            ANSI_COLOR="0;31"
+            CPE_NAME="cpe:/o:redhat:enterprise_linux:9::baseos"
+            HOME_URL="https://www.redhat.com/"
+            DOCUMENTATION_URL="https://access.redhat.com/documentation/red_hat_enterprise_linux/9/"
+            BUG_REPORT_URL="https://bugzilla.redhat.com/"
+            REDHAT_BUGZILLA_PRODUCT="Red Hat Enterprise Linux 9"
+            REDHAT_BUGZILLA_PRODUCT_VERSION=9.3
+            REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux"
+            REDHAT_SUPPORT_PRODUCT_VERSION="9.3"
+            """
 
         try await withMockLinuxDistribution(osReleaseContent: osReleaseContent) { fs in
             let operatingSystem = OperatingSystem.linux
@@ -196,20 +196,20 @@ fileprivate struct LinuxDistributionTests {
     @Test
     func detectOpenSUSEFromOSRelease() async throws {
         let osReleaseContent = """
-        NAME="openSUSE Tumbleweed"
-        # VERSION="20231201"
-        ID="opensuse-tumbleweed"
-        ID_LIKE="opensuse suse"
-        VERSION_ID="20231201"
-        PRETTY_NAME="openSUSE Tumbleweed"
-        ANSI_COLOR="0;32"
-        CPE_NAME="cpe:2.3:o:opensuse:tumbleweed:20231201:*:*:*:*:*:*:*"
-        BUG_REPORT_URL="https://bugs.opensuse.org"
-        SUPPORT_URL="https://bugs.opensuse.org"
-        HOME_URL="https://www.opensuse.org/"
-        DOCUMENTATION_URL="https://en.opensuse.org/Portal:Tumbleweed"
-        LOGO="distributor-logo-Tumbleweed"
-        """
+            NAME="openSUSE Tumbleweed"
+            # VERSION="20231201"
+            ID="opensuse-tumbleweed"
+            ID_LIKE="opensuse suse"
+            VERSION_ID="20231201"
+            PRETTY_NAME="openSUSE Tumbleweed"
+            ANSI_COLOR="0;32"
+            CPE_NAME="cpe:2.3:o:opensuse:tumbleweed:20231201:*:*:*:*:*:*:*"
+            BUG_REPORT_URL="https://bugs.opensuse.org"
+            SUPPORT_URL="https://bugs.opensuse.org"
+            HOME_URL="https://www.opensuse.org/"
+            DOCUMENTATION_URL="https://en.opensuse.org/Portal:Tumbleweed"
+            LOGO="distributor-logo-Tumbleweed"
+            """
 
         try await withMockLinuxDistribution(osReleaseContent: osReleaseContent) { fs in
             let operatingSystem = OperatingSystem.linux
@@ -225,13 +225,13 @@ fileprivate struct LinuxDistributionTests {
     @Test
     func detectAlpineFromOSRelease() async throws {
         let osReleaseContent = """
-        NAME="Alpine Linux"
-        ID=alpine
-        VERSION_ID=3.18.4
-        PRETTY_NAME="Alpine Linux v3.18"
-        HOME_URL="https://alpinelinux.org/"
-        BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues"
-        """
+            NAME="Alpine Linux"
+            ID=alpine
+            VERSION_ID=3.18.4
+            PRETTY_NAME="Alpine Linux v3.18"
+            HOME_URL="https://alpinelinux.org/"
+            BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues"
+            """
 
         try await withMockLinuxDistribution(osReleaseContent: osReleaseContent) { fs in
             let operatingSystem = OperatingSystem.linux
@@ -247,18 +247,18 @@ fileprivate struct LinuxDistributionTests {
     @Test
     func detectArchFromOSRelease() async throws {
         let osReleaseContent = """
-        NAME="Arch Linux"
-        PRETTY_NAME="Arch Linux"
-        ID=arch
-        BUILD_ID=rolling
-        ANSI_COLOR="38;2;23;147;209"
-        HOME_URL="https://archlinux.org/"
-        DOCUMENTATION_URL="https://wiki.archlinux.org/"
-        SUPPORT_URL="https://bbs.archlinux.org/"
-        BUG_REPORT_URL="https://bugs.archlinux.org/"
-        PRIVACY_POLICY_URL="https://terms.archlinux.org/docs/privacy-policy/"
-        LOGO=archlinux-logo
-        """
+            NAME="Arch Linux"
+            PRETTY_NAME="Arch Linux"
+            ID=arch
+            BUILD_ID=rolling
+            ANSI_COLOR="38;2;23;147;209"
+            HOME_URL="https://archlinux.org/"
+            DOCUMENTATION_URL="https://wiki.archlinux.org/"
+            SUPPORT_URL="https://bbs.archlinux.org/"
+            BUG_REPORT_URL="https://bugs.archlinux.org/"
+            PRIVACY_POLICY_URL="https://terms.archlinux.org/docs/privacy-policy/"
+            LOGO=archlinux-logo
+            """
 
         try await withMockLinuxDistribution(osReleaseContent: osReleaseContent) { fs in
             let operatingSystem = OperatingSystem.linux
@@ -266,7 +266,7 @@ fileprivate struct LinuxDistributionTests {
 
             let archDist = try #require(distribution)
             #expect(archDist.kind == .arch)
-            #expect(archDist.version == nil) // Arch doesn't typically have VERSION_ID
+            #expect(archDist.version == nil)  // Arch doesn't typically have VERSION_ID
             #expect(archDist.displayName == "Arch Linux")
         }
     }
@@ -274,20 +274,20 @@ fileprivate struct LinuxDistributionTests {
     @Test
     func detectFromIDLikeFallback() async throws {
         let osReleaseContent = """
-        NAME="Custom Ubuntu Derivative"
-        VERSION="1.0"
-        ID=customubuntu
-        ID_LIKE="ubuntu debian"
-        VERSION_ID="1.0"
-        PRETTY_NAME="Custom Ubuntu Derivative 1.0"
-        """
+            NAME="Custom Ubuntu Derivative"
+            VERSION="1.0"
+            ID=customubuntu
+            ID_LIKE="ubuntu debian"
+            VERSION_ID="1.0"
+            PRETTY_NAME="Custom Ubuntu Derivative 1.0"
+            """
 
         try await withMockLinuxDistribution(osReleaseContent: osReleaseContent) { fs in
             let operatingSystem = OperatingSystem.linux
             let distribution = operatingSystem.detectHostLinuxDistribution(fs: fs)
 
             let customDist: LinuxDistribution = try #require(distribution)
-            #expect(customDist.kind == .ubuntu) // Should detect ubuntu first from ID_LIKE
+            #expect(customDist.kind == .ubuntu)  // Should detect ubuntu first from ID_LIKE
             #expect(customDist.version == "1.0")
         }
     }
@@ -295,12 +295,12 @@ fileprivate struct LinuxDistributionTests {
     @Test
     func handleMalformedOSRelease() async throws {
         let malformedContent = """
-        NAME=Ubuntu without quotes
-        ID=ubuntu
-        VERSION_ID=22.04
-        INVALID_LINE_WITHOUT_EQUALS
-        =INVALID_LINE_STARTING_WITH_EQUALS
-        """
+            NAME=Ubuntu without quotes
+            ID=ubuntu
+            VERSION_ID=22.04
+            INVALID_LINE_WITHOUT_EQUALS
+            =INVALID_LINE_STARTING_WITH_EQUALS
+            """
 
         try await withMockLinuxDistribution(osReleaseContent: malformedContent) { fs in
             let operatingSystem = OperatingSystem.linux
@@ -340,7 +340,7 @@ fileprivate struct LinuxDistributionTests {
 
             let ubuntuDist = try #require(distribution)
             #expect(ubuntuDist.kind == .ubuntu)
-            #expect(ubuntuDist.version == nil) // Fallback files don't provide version parsing
+            #expect(ubuntuDist.version == nil)  // Fallback files don't provide version parsing
             #expect(ubuntuDist.displayName == "Ubuntu")
         }
     }
@@ -368,14 +368,14 @@ fileprivate struct LinuxDistributionTests {
             distributionFiles: [
                 "/etc/ubuntu-release": "Ubuntu 20.04.6 LTS",
                 "/etc/debian_version": "12.2",
-                "/etc/fedora-release": "Fedora release 39"
+                "/etc/fedora-release": "Fedora release 39",
             ]
         ) { fs in
             let operatingSystem = OperatingSystem.linux
             let distribution = operatingSystem.detectHostLinuxDistribution(fs: fs)
 
             let ubuntuDist = try #require(distribution)
-            #expect(ubuntuDist.kind == .ubuntu) // Should be Ubuntu, not Debian or Fedora
+            #expect(ubuntuDist.kind == .ubuntu)  // Should be Ubuntu, not Debian or Fedora
         }
     }
 
@@ -390,18 +390,18 @@ fileprivate struct LinuxDistributionTests {
             let operatingSystem = OperatingSystem.linux
             let distribution = operatingSystem.detectHostLinuxDistribution(fs: fs)
 
-            #expect(distribution == nil) // Should return nil when no files are found
+            #expect(distribution == nil)  // Should return nil when no files are found
         }
     }
 
     @Test
     func osReleaseWithoutIDField() async throws {
         let osReleaseContent = """
-        NAME="Custom Linux Distribution"
-        VERSION="1.0"
-        PRETTY_NAME="Custom Linux Distribution 1.0"
-        VERSION_ID="1.0"
-        """
+            NAME="Custom Linux Distribution"
+            VERSION="1.0"
+            PRETTY_NAME="Custom Linux Distribution 1.0"
+            VERSION_ID="1.0"
+            """
 
         try await withMockLinuxDistribution(osReleaseContent: osReleaseContent) { fs in
             let operatingSystem = OperatingSystem.linux
@@ -415,12 +415,12 @@ fileprivate struct LinuxDistributionTests {
     @Test
     func osReleaseWithUnknownID() async throws {
         let osReleaseContent = """
-        NAME="Unknown Linux Distribution"
-        VERSION="1.0"
-        ID=unknowndistro
-        VERSION_ID="1.0"
-        PRETTY_NAME="Unknown Linux Distribution 1.0"
-        """
+            NAME="Unknown Linux Distribution"
+            VERSION="1.0"
+            ID=unknowndistro
+            VERSION_ID="1.0"
+            PRETTY_NAME="Unknown Linux Distribution 1.0"
+            """
 
         try await withMockLinuxDistribution(osReleaseContent: osReleaseContent) { fs in
             let operatingSystem = OperatingSystem.linux
diff --git a/Tests/SWBUtilTests/MachOTests.swift b/Tests/SWBUtilTests/MachOTests.swift
index 06f9554f..58b1b57d 100644
--- a/Tests/SWBUtilTests/MachOTests.swift
+++ b/Tests/SWBUtilTests/MachOTests.swift
@@ -17,271 +17,216 @@ import SWBTestSupport
 @_spi(Testing) import SWBUtil
 
 #if canImport(Darwin)
-import MachO
+    import MachO
 
-@Suite
-fileprivate struct MachOTests {
-    let fs = localFS
+    @Suite
+    fileprivate struct MachOTests {
+        let fs = localFS
 
-    func allReaders(_ path: Path, sourceLocation: SourceLocation = #_sourceLocation) throws -> [BinaryReader] {
-        return try [
-            BinaryReader(data: fs.read(path)),
-            BinaryReader(data: #require(FileHandle(forReadingAtPath: path.str), sourceLocation: sourceLocation)),
-        ]
-    }
+        func allReaders(_ path: Path, sourceLocation: SourceLocation = #_sourceLocation) throws -> [BinaryReader] {
+            return try [
+                BinaryReader(data: fs.read(path)),
+                BinaryReader(data: #require(FileHandle(forReadingAtPath: path.str), sourceLocation: sourceLocation)),
+            ]
+        }
 
-    func allReaders(_ contents: ByteString) throws -> [BinaryReader] {
-        let tmpDir = try NamedTemporaryDirectory()
+        func allReaders(_ contents: ByteString) throws -> [BinaryReader] {
+            let tmpDir = try NamedTemporaryDirectory()
 
-        let path = tmpDir.path.join("machO")
-        try fs.write(path, contents: contents)
-        return try allReaders(path)
-    }
+            let path = tmpDir.path.join("machO")
+            try fs.write(path, contents: contents)
+            return try allReaders(path)
+        }
 
-    @Test
-    func fatMachO() async throws {
-        try await testMachO(archs: ["arm64", "x86_64"])
-        try await testMachO(archs: ["arm64", "arm64e"])
-    }
+        @Test
+        func fatMachO() async throws {
+            try await testMachO(archs: ["arm64", "x86_64"])
+            try await testMachO(archs: ["arm64", "arm64e"])
+        }
 
-    @Test
-    func thinMachO() async throws {
-        try await testMachO(archs: ["x86_64"])
-        try await testMachO(archs: ["arm64"])
-    }
+        @Test
+        func thinMachO() async throws {
+            try await testMachO(archs: ["x86_64"])
+            try await testMachO(archs: ["arm64"])
+        }
 
-    func testMachO(archs: [String], platform: BuildVersion.Platform = .macOS, hideARM64: Bool = false) async throws {
-        try await withTemporaryDirectory { (tmpDir: Path) in
-            struct Lookup: PlatformInfoLookup {
-                func lookupPlatformInfo(platform: BuildVersion.Platform) -> (any PlatformInfoProvider)? {
-                    nil
+        func testMachO(archs: [String], platform: BuildVersion.Platform = .macOS, hideARM64: Bool = false) async throws {
+            try await withTemporaryDirectory { (tmpDir: Path) in
+                struct Lookup: PlatformInfoLookup {
+                    func lookupPlatformInfo(platform: BuildVersion.Platform) -> (any PlatformInfoProvider)? {
+                        nil
+                    }
                 }
-            }
 
-            let machOPath = try await InstalledXcode.currentlySelected().compileExecutable(path: tmpDir, platform: platform, infoLookup: Lookup(), archs: archs, hideARM64: hideARM64)
+                let machOPath = try await InstalledXcode.currentlySelected().compileExecutable(path: tmpDir, platform: platform, infoLookup: Lookup(), archs: archs, hideARM64: hideARM64)
 
-            if hideARM64 {
-                let reader = try BinaryReader(data: fs.read(machOPath))
-                let magic: UInt32 = try reader.read()
-                let count: UInt32 = try reader.read()
-                let presumedArchs = archs.filter({ !$0.hasPrefix("arm64") })
-                #expect((magic == FAT_CIGAM || magic == FAT_CIGAM_64 ? count.byteSwapped : count) == UInt32(presumedArchs.count))
-            }
+                if hideARM64 {
+                    let reader = try BinaryReader(data: fs.read(machOPath))
+                    let magic: UInt32 = try reader.read()
+                    let count: UInt32 = try reader.read()
+                    let presumedArchs = archs.filter({ !$0.hasPrefix("arm64") })
+                    #expect((magic == FAT_CIGAM || magic == FAT_CIGAM_64 ? count.byteSwapped : count) == UInt32(presumedArchs.count))
+                }
 
-            let files: [BinaryReader] = try allReaders(machOPath)
+                let files: [BinaryReader] = try allReaders(machOPath)
 
-            for file in files {
-                let machOReader = BinaryReader(other: file)
-                let machO = try MachO(reader: machOReader)
-                let (machOSlices, linkage) = try machO.slicesIncludingLinkage()
-                #expect(linkage == .macho(.execute))
+                for file in files {
+                    let machOReader = BinaryReader(other: file)
+                    let machO = try MachO(reader: machOReader)
+                    let (machOSlices, linkage) = try machO.slicesIncludingLinkage()
+                    #expect(linkage == .macho(.execute))
 
-                func containsArm64(_ arch: String, _ effectiveArchs: [String]) -> Bool {
-                    !arch.hasPrefix("arm64") || !effectiveArchs.contains(where: { $0.hasPrefix("arm64") })
-                }
+                    func containsArm64(_ arch: String, _ effectiveArchs: [String]) -> Bool {
+                        !arch.hasPrefix("arm64") || !effectiveArchs.contains(where: { $0.hasPrefix("arm64") })
+                    }
 
-                var effectiveArchs: [String] = []
-                if hideARM64 {
-                    // lipo will hide multiple arm64 slices, but it will only be able to read the first one (us too).
-                    // Also, lipo sorts archs.
-                    for arch in archs.sorted() {
-                        if containsArm64(arch, effectiveArchs) {
-                            effectiveArchs.append(arch)
+                    var effectiveArchs: [String] = []
+                    if hideARM64 {
+                        // lipo will hide multiple arm64 slices, but it will only be able to read the first one (us too).
+                        // Also, lipo sorts archs.
+                        for arch in archs.sorted() {
+                            if containsArm64(arch, effectiveArchs) {
+                                effectiveArchs.append(arch)
+                            }
                         }
+                    } else {
+                        effectiveArchs = archs
                     }
-                } else {
-                    effectiveArchs = archs
-                }
 
-                #expect(machOSlices.count == effectiveArchs.count)
-                #expect(machOSlices.compactMap { $0.arch }.sorted() == effectiveArchs.sorted())
+                    #expect(machOSlices.count == effectiveArchs.count)
+                    #expect(machOSlices.compactMap { $0.arch }.sorted() == effectiveArchs.sorted())
 
-                let uuids = try Set(machOSlices.compactMap { (slice) -> NSUUID? in
-                    if let uuidString = try slice.uuid()?.description {
-                        return NSUUID(uuidString: uuidString)
-                    }
-                    return nil
-                })
-                #expect(uuids.count == effectiveArchs.count)
+                    let uuids = try Set(
+                        machOSlices.compactMap { (slice) -> NSUUID? in
+                            if let uuidString = try slice.uuid()?.description {
+                                return NSUUID(uuidString: uuidString)
+                            }
+                            return nil
+                        }
+                    )
+                    #expect(uuids.count == effectiveArchs.count)
 
-                for slice in machOSlices {
-                    let libs = try slice.linkedLibraryPaths()
-                    #expect(libs == ["/usr/lib/libSystem.B.dylib"])
+                    for slice in machOSlices {
+                        let libs = try slice.linkedLibraryPaths()
+                        #expect(libs == ["/usr/lib/libSystem.B.dylib"])
 
-                    let loadCommands = try slice.loadCommands()
-                    #expect(loadCommands.filter { $0.base.cmd == LC_MAIN }.count == 1)
-                    #expect(loadCommands.filter { $0.base.cmd == LC_SYMTAB }.count == 1)
+                        let loadCommands = try slice.loadCommands()
+                        #expect(loadCommands.filter { $0.base.cmd == LC_MAIN }.count == 1)
+                        #expect(loadCommands.filter { $0.base.cmd == LC_SYMTAB }.count == 1)
 
-                    let _ = try slice.segments()
-                    let _ = try slice.segments().map { try $0.sections() }
+                        let _ = try slice.segments()
+                        let _ = try slice.segments().map { try $0.sections() }
 
-                    #expect(try slice.swiftABIVersion() == nil)
+                        #expect(try slice.swiftABIVersion() == nil)
+                    }
                 }
             }
         }
-    }
-
-    @Test
-    func fatStaticArchive_MachO() async throws {
-        try await testFatStaticArchive_MachO(archs: ["arm64", "arm64e", "x86_64", "x86_64h"])
-        try await testFatStaticArchive_MachO(archs: ["x86_64", "x86_64h"])
-        try await testFatStaticArchive_MachO(archs: ["arm64", "arm64e"])
-    }
 
-    func testFatStaticArchive_MachO(archs: [String]) async throws {
-        try await withTemporaryDirectory { tmpDir in
-            let sourcePath = tmpDir.join("source.c")
-            try fs.write(sourcePath, contents: ByteString("extern int main(){}".data(using: String.Encoding.utf8)!))
-
-            let archs = ["x86_64", "x86_64h"]
-
-            let objectPaths = [tmpDir.join("你好.o"), tmpDir.join("hello.o"), tmpDir.join("path_that_is_longer_than_16_bytes.o")]
-            let machOPath = tmpDir.join("machO.a")
-            for objectPath in objectPaths {
-                _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "clang"] + archs.flatMap { ["-arch", $0] } + ["-o", objectPath.str, "-c", sourcePath.str])
-            }
-            _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "libtool", "-static", "-o", machOPath.str] + objectPaths.map { $0.str })
-
-            let files: [BinaryReader] = try allReaders(machOPath)
-
-            for file in files {
-                let machOReader = BinaryReader(other: file)
-                let archiveReader = BinaryReader(other: file)
-
-                let machO = try MachO(reader: machOReader)
-                let archive = try StaticArchive(reader: archiveReader)
-
-                let machOSlices = try machO.slices()
-                let archiveSlices = try archive.machOs().flatMap { try $0.slices() }
-
-                #expect(machOSlices.count == archs.count * objectPaths.count)
-                #expect(machOSlices.count == archiveSlices.count)
-
-                let uuids = try Set(machOSlices.compactMap { (slice) -> NSUUID? in
-                    if let uuidString = try slice.uuid()?.description {
-                        return NSUUID(uuidString: uuidString)
-                    }
-                    return nil
-                })
-                #expect(uuids.isEmpty)
-
-                for slice in machOSlices {
-                    let libs = try slice.linkedLibraryPaths()
-                    #expect(libs.isEmpty)
-
-                    let loadCommands = try slice.loadCommands()
-                    #expect(loadCommands.filter { [LC_SEGMENT, LC_SEGMENT_64].contains(Int32($0.base.cmd)) }.count == 1)
-                    #expect(loadCommands.filter { $0.base.cmd == LC_SYMTAB }.count == 1)
-
-                    let _ = try slice.segments()
-                    let _ = try slice.segments().map { try $0.sections() }
-
-                    #expect(try slice.swiftABIVersion() == nil)
-                }
-            }
+        @Test
+        func fatStaticArchive_MachO() async throws {
+            try await testFatStaticArchive_MachO(archs: ["arm64", "arm64e", "x86_64", "x86_64h"])
+            try await testFatStaticArchive_MachO(archs: ["x86_64", "x86_64h"])
+            try await testFatStaticArchive_MachO(archs: ["arm64", "arm64e"])
         }
-    }
 
-    @Test
-    func thinStaticArchive_MachO() async throws {
-        try await withTemporaryDirectory { tmpDir in
-            let sourcePath = tmpDir.join("source.c")
-            try fs.write(sourcePath, contents: ByteString("extern int main(){}".data(using: String.Encoding.utf8)!))
+        func testFatStaticArchive_MachO(archs: [String]) async throws {
+            try await withTemporaryDirectory { tmpDir in
+                let sourcePath = tmpDir.join("source.c")
+                try fs.write(sourcePath, contents: ByteString("extern int main(){}".data(using: String.Encoding.utf8)!))
 
-            let archs = ["x86_64"]
+                let archs = ["x86_64", "x86_64h"]
 
-            let objectPaths = [tmpDir.join("你好.o"), tmpDir.join("hello.o"), tmpDir.join("path_that_is_longer_than_16_bytes.o")]
-            let machOPath = tmpDir.join("machO.a")
-            for objectPath in objectPaths {
-                _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "clang"] + archs.flatMap { ["-arch", $0] } + ["-o", objectPath.str, "-c", sourcePath.str])
-            }
-            _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "libtool", "-static", "-o", machOPath.str] + objectPaths.map { $0.str })
+                let objectPaths = [tmpDir.join("你好.o"), tmpDir.join("hello.o"), tmpDir.join("path_that_is_longer_than_16_bytes.o")]
+                let machOPath = tmpDir.join("machO.a")
+                for objectPath in objectPaths {
+                    _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "clang"] + archs.flatMap { ["-arch", $0] } + ["-o", objectPath.str, "-c", sourcePath.str])
+                }
+                _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "libtool", "-static", "-o", machOPath.str] + objectPaths.map { $0.str })
 
-            let files: [BinaryReader] = try allReaders(machOPath)
+                let files: [BinaryReader] = try allReaders(machOPath)
 
-            for file in files {
-                let machOReader = BinaryReader(other: file)
-                let archiveReader = BinaryReader(other: file)
+                for file in files {
+                    let machOReader = BinaryReader(other: file)
+                    let archiveReader = BinaryReader(other: file)
 
-                let machO = try MachO(reader: machOReader)
-                let archive = try StaticArchive(reader: archiveReader)
+                    let machO = try MachO(reader: machOReader)
+                    let archive = try StaticArchive(reader: archiveReader)
 
-                let machOSlices = try machO.slices()
-                let archiveSlices = try archive.machOs().flatMap { try $0.slices() }
+                    let machOSlices = try machO.slices()
+                    let archiveSlices = try archive.machOs().flatMap { try $0.slices() }
 
-                #expect(machOSlices.count == archs.count * objectPaths.count)
-                #expect(machOSlices.count == archiveSlices.count)
+                    #expect(machOSlices.count == archs.count * objectPaths.count)
+                    #expect(machOSlices.count == archiveSlices.count)
 
-                let uuids = try Set(machOSlices.compactMap { (slice) -> NSUUID? in
-                    if let uuidString = try slice.uuid()?.description {
-                        return NSUUID(uuidString: uuidString)
-                    }
-                    return nil
-                })
-                #expect(uuids.isEmpty)
+                    let uuids = try Set(
+                        machOSlices.compactMap { (slice) -> NSUUID? in
+                            if let uuidString = try slice.uuid()?.description {
+                                return NSUUID(uuidString: uuidString)
+                            }
+                            return nil
+                        }
+                    )
+                    #expect(uuids.isEmpty)
 
-                for slice in machOSlices {
-                    let libs = try slice.linkedLibraryPaths()
-                    #expect(libs.isEmpty)
+                    for slice in machOSlices {
+                        let libs = try slice.linkedLibraryPaths()
+                        #expect(libs.isEmpty)
 
-                    let loadCommands = try slice.loadCommands()
-                    #expect(loadCommands.filter { [LC_SEGMENT, LC_SEGMENT_64].contains(Int32($0.base.cmd)) }.count == 1)
-                    #expect(loadCommands.filter { $0.base.cmd == LC_SYMTAB }.count == 1)
+                        let loadCommands = try slice.loadCommands()
+                        #expect(loadCommands.filter { [LC_SEGMENT, LC_SEGMENT_64].contains(Int32($0.base.cmd)) }.count == 1)
+                        #expect(loadCommands.filter { $0.base.cmd == LC_SYMTAB }.count == 1)
 
-                    let _ = try slice.segments()
-                    let _ = try slice.segments().map { try $0.sections() }
+                        let _ = try slice.segments()
+                        let _ = try slice.segments().map { try $0.sections() }
 
-                    #expect(try slice.swiftABIVersion() == nil)
+                        #expect(try slice.swiftABIVersion() == nil)
+                    }
                 }
             }
         }
-    }
 
-    @Test
-    func fatStaticArchives() async throws {
-        try await testFatStaticArchives(archs: ["arm64", "arm64e", "x86_64", "x86_64h"])
-        try await testFatStaticArchives(archs: ["x86_64", "x86_64h"])
-        try await testFatStaticArchives(archs: ["arm64", "arm64e"])
-    }
+        @Test
+        func thinStaticArchive_MachO() async throws {
+            try await withTemporaryDirectory { tmpDir in
+                let sourcePath = tmpDir.join("source.c")
+                try fs.write(sourcePath, contents: ByteString("extern int main(){}".data(using: String.Encoding.utf8)!))
 
-    func testFatStaticArchives(archs: [String]) async throws {
-        try await withTemporaryDirectory { tmpDir in
-            let sourcePath = tmpDir.join("source.c")
-            try fs.write(sourcePath, contents: ByteString("extern int main(){}".data(using: String.Encoding.utf8)!))
+                let archs = ["x86_64"]
 
-            let objectPaths = [tmpDir.join("你好.o"), tmpDir.join("hello.o"), tmpDir.join("path_that_is_longer_than_16_bytes.o")]
-            let machOPath = tmpDir.join("machO.a")
-            for objectPath in objectPaths {
-                _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "clang"] + archs.flatMap { ["-arch", $0] } + ["-o", objectPath.str, "-c", sourcePath.str])
-            }
-            _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "libtool", "-static", "-o", machOPath.str] + objectPaths.map { $0.str })
+                let objectPaths = [tmpDir.join("你好.o"), tmpDir.join("hello.o"), tmpDir.join("path_that_is_longer_than_16_bytes.o")]
+                let machOPath = tmpDir.join("machO.a")
+                for objectPath in objectPaths {
+                    _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "clang"] + archs.flatMap { ["-arch", $0] } + ["-o", objectPath.str, "-c", sourcePath.str])
+                }
+                _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "libtool", "-static", "-o", machOPath.str] + objectPaths.map { $0.str })
 
-            let files: [BinaryReader] = try allReaders(machOPath)
+                let files: [BinaryReader] = try allReaders(machOPath)
 
-            for file in files {
-                let machO = try MachO(reader: file)
-                let linkage = try machO.slicesIncludingLinkage().linkage
-                #expect(linkage == .static)
+                for file in files {
+                    let machOReader = BinaryReader(other: file)
+                    let archiveReader = BinaryReader(other: file)
 
-                let archive = try StaticArchive(reader: file)
-                #expect(archive.archiveType.isFatArchive)
-                let machOs = try archive.machOs()
+                    let machO = try MachO(reader: machOReader)
+                    let archive = try StaticArchive(reader: archiveReader)
 
-                #expect(machOs.count == archs.count * objectPaths.count)
+                    let machOSlices = try machO.slices()
+                    let archiveSlices = try archive.machOs().flatMap { try $0.slices() }
 
-                let slices = try machOs.flatMap { try $0.slices() }
-                #expect(slices.count == archs.count * objectPaths.count)
+                    #expect(machOSlices.count == archs.count * objectPaths.count)
+                    #expect(machOSlices.count == archiveSlices.count)
 
-                let uuids = try Set(slices.compactMap { (slice) -> NSUUID? in
-                    if let uuidString = try slice.uuid()?.description {
-                        return NSUUID(uuidString: uuidString)
-                    }
-                    return nil
-                })
-                #expect(uuids.isEmpty)
+                    let uuids = try Set(
+                        machOSlices.compactMap { (slice) -> NSUUID? in
+                            if let uuidString = try slice.uuid()?.description {
+                                return NSUUID(uuidString: uuidString)
+                            }
+                            return nil
+                        }
+                    )
+                    #expect(uuids.isEmpty)
 
-                for machO in machOs {
-                    for slice in try machO.slices() {
+                    for slice in machOSlices {
                         let libs = try slice.linkedLibraryPaths()
                         #expect(libs.isEmpty)
 
@@ -297,500 +242,586 @@ fileprivate struct MachOTests {
                 }
             }
         }
-    }
 
-    @Test
-    func staticArchives() async throws {
-        try await withTemporaryDirectory { tmpDir in
-            let sourcePath = tmpDir.join("source.c")
-            try fs.write(sourcePath, contents: ByteString("extern int main(){}".data(using: String.Encoding.utf8)!))
+        @Test
+        func fatStaticArchives() async throws {
+            try await testFatStaticArchives(archs: ["arm64", "arm64e", "x86_64", "x86_64h"])
+            try await testFatStaticArchives(archs: ["x86_64", "x86_64h"])
+            try await testFatStaticArchives(archs: ["arm64", "arm64e"])
+        }
 
-            let archs = ["x86_64"]
+        func testFatStaticArchives(archs: [String]) async throws {
+            try await withTemporaryDirectory { tmpDir in
+                let sourcePath = tmpDir.join("source.c")
+                try fs.write(sourcePath, contents: ByteString("extern int main(){}".data(using: String.Encoding.utf8)!))
 
-            let objectPaths = [tmpDir.join("你好.o"), tmpDir.join("hello.o"), tmpDir.join("path_that_is_longer_than_16_bytes.o")]
-            let machOPath = tmpDir.join("machO.a")
-            for objectPath in objectPaths {
-                _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "clang"] + archs.flatMap { ["-arch", $0] } + ["-o", objectPath.str, "-c", sourcePath.str])
-            }
-            _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "libtool", "-static", "-o", machOPath.str] + objectPaths.map { $0.str })
+                let objectPaths = [tmpDir.join("你好.o"), tmpDir.join("hello.o"), tmpDir.join("path_that_is_longer_than_16_bytes.o")]
+                let machOPath = tmpDir.join("machO.a")
+                for objectPath in objectPaths {
+                    _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "clang"] + archs.flatMap { ["-arch", $0] } + ["-o", objectPath.str, "-c", sourcePath.str])
+                }
+                _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "libtool", "-static", "-o", machOPath.str] + objectPaths.map { $0.str })
 
-            let files: [BinaryReader] = try allReaders(machOPath)
+                let files: [BinaryReader] = try allReaders(machOPath)
 
-            for file in files {
-                let machO = try MachO(reader: file)
-                let linkage = try machO.slicesIncludingLinkage().linkage
-                #expect(linkage == .static)
+                for file in files {
+                    let machO = try MachO(reader: file)
+                    let linkage = try machO.slicesIncludingLinkage().linkage
+                    #expect(linkage == .static)
 
-                let archive = try StaticArchive(reader: file)
-                #expect(!archive.archiveType.isFatArchive)
-                let machOs = try archive.machOs()
+                    let archive = try StaticArchive(reader: file)
+                    #expect(archive.archiveType.isFatArchive)
+                    let machOs = try archive.machOs()
 
-                #expect(machOs.count == archs.count * objectPaths.count)
+                    #expect(machOs.count == archs.count * objectPaths.count)
 
-                let slices = try machOs.flatMap { try $0.slices() }
-                let uuids = try Set(slices.compactMap { (slice) -> NSUUID? in
-                    if let uuidString = try slice.uuid()?.description {
-                        return NSUUID(uuidString: uuidString)
-                    }
-                    return nil
-                })
-                #expect(uuids.isEmpty)
+                    let slices = try machOs.flatMap { try $0.slices() }
+                    #expect(slices.count == archs.count * objectPaths.count)
 
-                for machO in machOs {
-                    for slice in try machO.slices() {
-                        let libs = try slice.linkedLibraryPaths()
-                        #expect(libs.isEmpty)
+                    let uuids = try Set(
+                        slices.compactMap { (slice) -> NSUUID? in
+                            if let uuidString = try slice.uuid()?.description {
+                                return NSUUID(uuidString: uuidString)
+                            }
+                            return nil
+                        }
+                    )
+                    #expect(uuids.isEmpty)
 
-                        let loadCommands = try slice.loadCommands()
-                        #expect(loadCommands.filter { [LC_SEGMENT, LC_SEGMENT_64].contains(Int32($0.base.cmd)) }.count == 1)
-                        #expect(loadCommands.filter { $0.base.cmd == LC_SYMTAB }.count == 1)
+                    for machO in machOs {
+                        for slice in try machO.slices() {
+                            let libs = try slice.linkedLibraryPaths()
+                            #expect(libs.isEmpty)
 
-                        let _ = try slice.segments()
-                        let _ = try slice.segments().map { try $0.sections() }
+                            let loadCommands = try slice.loadCommands()
+                            #expect(loadCommands.filter { [LC_SEGMENT, LC_SEGMENT_64].contains(Int32($0.base.cmd)) }.count == 1)
+                            #expect(loadCommands.filter { $0.base.cmd == LC_SYMTAB }.count == 1)
 
-                        #expect(try slice.swiftABIVersion() == nil)
+                            let _ = try slice.segments()
+                            let _ = try slice.segments().map { try $0.sections() }
+
+                            #expect(try slice.swiftABIVersion() == nil)
+                        }
                     }
                 }
             }
         }
-    }
 
-    @Test
-    func nonSwift() async throws {
-        try await withTemporaryDirectory { tmpDir in
-            let sourcePath = tmpDir.join("source.c")
-            try fs.write(sourcePath, contents: ByteString("int main(){}".data(using: String.Encoding.utf8)!))
-
-            let archs = [
-                // "armv7", // TODO: how should we determine which archs to test against?
-                // We could read libSystem from the iOS SDK but still need to
-                // map arch names to cputype/cpusubtype constants
-                "arm64"
-            ]
-            #expect(!archs.isEmpty)
+        @Test
+        func staticArchives() async throws {
+            try await withTemporaryDirectory { tmpDir in
+                let sourcePath = tmpDir.join("source.c")
+                try fs.write(sourcePath, contents: ByteString("extern int main(){}".data(using: String.Encoding.utf8)!))
 
-            let machOPath = tmpDir.join("machO")
-            let _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "iphoneos", "clang"] + archs.flatMap { ["-arch", $0] } + ["-framework", "Foundation", "-o", machOPath.str, sourcePath.str])
+                let archs = ["x86_64"]
 
-            let expectedUUIDs: Set<NSUUID> = try await Set(
-                archs.asyncMap({ try await InstalledXcode.currentlySelected().xcrun(["otool", "-arch", $0, "-l", machOPath.str]) }).reduce("", { $0 + $1 })
-                    .components(separatedBy: "\n")
-                    .filter{ $0.contains("    uuid ") }
-                    .map{ $0.replacingOccurrences(of: "    uuid ", with: "").trimmingCharacters(in: CharacterSet.whitespacesAndNewlines) }
-                    .map{ NSUUID(uuidString: $0)! })
+                let objectPaths = [tmpDir.join("你好.o"), tmpDir.join("hello.o"), tmpDir.join("path_that_is_longer_than_16_bytes.o")]
+                let machOPath = tmpDir.join("machO.a")
+                for objectPath in objectPaths {
+                    _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "clang"] + archs.flatMap { ["-arch", $0] } + ["-o", objectPath.str, "-c", sourcePath.str])
+                }
+                _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "libtool", "-static", "-o", machOPath.str] + objectPaths.map { $0.str })
 
-            let files: [BinaryReader] = try allReaders(machOPath)
+                let files: [BinaryReader] = try allReaders(machOPath)
 
-            for file in files {
-                let machO = try MachO(reader: file)
-                let slices = try machO.slices()
+                for file in files {
+                    let machO = try MachO(reader: file)
+                    let linkage = try machO.slicesIncludingLinkage().linkage
+                    #expect(linkage == .static)
 
-                #expect(slices.count == archs.count)
-                let uuids = try Set(slices.map{ NSUUID(uuidString: try $0.uuid()!.description)! })
-                #expect(expectedUUIDs == uuids)
+                    let archive = try StaticArchive(reader: file)
+                    #expect(!archive.archiveType.isFatArchive)
+                    let machOs = try archive.machOs()
 
-                for slice in slices {
-                    let libs = try slice.linkedLibraryPaths()
-                    #expect(libs.contains("/System/Library/Frameworks/Foundation.framework/Foundation"), "libs: \(libs)")
+                    #expect(machOs.count == archs.count * objectPaths.count)
 
-                    #expect(try slice.swiftABIVersion() == nil)
+                    let slices = try machOs.flatMap { try $0.slices() }
+                    let uuids = try Set(
+                        slices.compactMap { (slice) -> NSUUID? in
+                            if let uuidString = try slice.uuid()?.description {
+                                return NSUUID(uuidString: uuidString)
+                            }
+                            return nil
+                        }
+                    )
+                    #expect(uuids.isEmpty)
+
+                    for machO in machOs {
+                        for slice in try machO.slices() {
+                            let libs = try slice.linkedLibraryPaths()
+                            #expect(libs.isEmpty)
+
+                            let loadCommands = try slice.loadCommands()
+                            #expect(loadCommands.filter { [LC_SEGMENT, LC_SEGMENT_64].contains(Int32($0.base.cmd)) }.count == 1)
+                            #expect(loadCommands.filter { $0.base.cmd == LC_SYMTAB }.count == 1)
+
+                            let _ = try slice.segments()
+                            let _ = try slice.segments().map { try $0.sections() }
+
+                            #expect(try slice.swiftABIVersion() == nil)
+                        }
+                    }
                 }
             }
         }
-    }
 
-    // Extract the expected Swift ABI version from the test bundle itself.
-    private func expectedBinaryInfo(infoLookup: any PlatformInfoLookup) throws -> ([String], SwiftABIVersion?) {
-        final class BundleType {}
-        let testBundle = Bundle(for: BundleType.self)
-        let files: [BinaryReader] = try allReaders(Path(testBundle.executablePath!))
-        #expect(files.count > 0)
-        let machO = try MachO(reader: files.first!)
-
-        let slices = try machO.slices()
-        #expect(slices.count > 0)
-        return (try slices[0].targetTripleStrings(infoLookup: infoLookup), try slices[0].swiftABIVersion())
-    }
+        @Test
+        func nonSwift() async throws {
+            try await withTemporaryDirectory { tmpDir in
+                let sourcePath = tmpDir.join("source.c")
+                try fs.write(sourcePath, contents: ByteString("int main(){}".data(using: String.Encoding.utf8)!))
+
+                let archs = [
+                    // "armv7", // TODO: how should we determine which archs to test against?
+                    // We could read libSystem from the iOS SDK but still need to
+                    // map arch names to cputype/cpusubtype constants
+                    "arm64"
+                ]
+                #expect(!archs.isEmpty)
+
+                let machOPath = tmpDir.join("machO")
+                let _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "iphoneos", "clang"] + archs.flatMap { ["-arch", $0] } + ["-framework", "Foundation", "-o", machOPath.str, sourcePath.str])
+
+                let expectedUUIDs: Set<NSUUID> = try await Set(
+                    archs.asyncMap({ try await InstalledXcode.currentlySelected().xcrun(["otool", "-arch", $0, "-l", machOPath.str]) }).reduce("", { $0 + $1 })
+                        .components(separatedBy: "\n")
+                        .filter { $0.contains("    uuid ") }
+                        .map { $0.replacingOccurrences(of: "    uuid ", with: "").trimmingCharacters(in: CharacterSet.whitespacesAndNewlines) }
+                        .map { NSUUID(uuidString: $0)! }
+                )
+
+                let files: [BinaryReader] = try allReaders(machOPath)
+
+                for file in files {
+                    let machO = try MachO(reader: file)
+                    let slices = try machO.slices()
+
+                    #expect(slices.count == archs.count)
+                    let uuids = try Set(slices.map { NSUUID(uuidString: try $0.uuid()!.description)! })
+                    #expect(expectedUUIDs == uuids)
+
+                    for slice in slices {
+                        let libs = try slice.linkedLibraryPaths()
+                        #expect(libs.contains("/System/Library/Frameworks/Foundation.framework/Foundation"), "libs: \(libs)")
 
-    @Test
-    func swiftABIVersion() async throws {
-        struct Lookup: PlatformInfoLookup {
-            func lookupPlatformInfo(platform: BuildVersion.Platform) -> (any PlatformInfoProvider)? {
-                nil
+                        #expect(try slice.swiftABIVersion() == nil)
+                    }
+                }
             }
         }
-        let (expectedTargets, expectedSwiftABIVersion) = try expectedBinaryInfo(infoLookup: Lookup())
-        #expect(!expectedTargets.isEmpty)
-        #expect(expectedSwiftABIVersion != nil)
-        try await withTemporaryDirectory { tmpDir in
-            let sourcePath = tmpDir.join("main.swift")
-            try fs.write(sourcePath, contents: ByteString([]))
 
-            let machOPath = tmpDir.join("machO")
-            let _ = try await InstalledXcode.currentlySelected().xcrun(["swiftc", "-target", expectedTargets[0], "-o", machOPath.str, sourcePath.str])
+        // Extract the expected Swift ABI version from the test bundle itself.
+        private func expectedBinaryInfo(infoLookup: any PlatformInfoLookup) throws -> ([String], SwiftABIVersion?) {
+            final class BundleType {}
+            let testBundle = Bundle(for: BundleType.self)
+            let files: [BinaryReader] = try allReaders(Path(testBundle.executablePath!))
+            #expect(files.count > 0)
+            let machO = try MachO(reader: files.first!)
 
-            let files: [BinaryReader] = try allReaders(machOPath)
+            let slices = try machO.slices()
+            #expect(slices.count > 0)
+            return (try slices[0].targetTripleStrings(infoLookup: infoLookup), try slices[0].swiftABIVersion())
+        }
 
-            for file in files {
-                let machO = try MachO(reader: file)
-                let slices = try machO.slices()
-                #expect(slices.count > 0)
+        @Test
+        func swiftABIVersion() async throws {
+            struct Lookup: PlatformInfoLookup {
+                func lookupPlatformInfo(platform: BuildVersion.Platform) -> (any PlatformInfoProvider)? {
+                    nil
+                }
+            }
+            let (expectedTargets, expectedSwiftABIVersion) = try expectedBinaryInfo(infoLookup: Lookup())
+            #expect(!expectedTargets.isEmpty)
+            #expect(expectedSwiftABIVersion != nil)
+            try await withTemporaryDirectory { tmpDir in
+                let sourcePath = tmpDir.join("main.swift")
+                try fs.write(sourcePath, contents: ByteString([]))
+
+                let machOPath = tmpDir.join("machO")
+                let _ = try await InstalledXcode.currentlySelected().xcrun(["swiftc", "-target", expectedTargets[0], "-o", machOPath.str, sourcePath.str])
+
+                let files: [BinaryReader] = try allReaders(machOPath)
 
-                for slice in slices {
-                    #expect(try slice.swiftABIVersion() == expectedSwiftABIVersion)
+                for file in files {
+                    let machO = try MachO(reader: file)
+                    let slices = try machO.slices()
+                    #expect(slices.count > 0)
+
+                    for slice in slices {
+                        #expect(try slice.swiftABIVersion() == expectedSwiftABIVersion)
+                    }
                 }
             }
         }
-    }
 
-    @Test
-    func deploymentTarget() async throws {
-        try await withTemporaryDirectory { path in
-            let expectedVersion = Version(11, 2, 3)
-            try localFS.write(path.join("main.c"), contents: "int main() { return 0; }")
-            _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "clang", "-target", "\(#require(Architecture.host.stringValue))-apple-macos\(expectedVersion)", "main.c"], workingDirectory: path)
-            let machOPath = path.join("a.out")
+        @Test
+        func deploymentTarget() async throws {
+            try await withTemporaryDirectory { path in
+                let expectedVersion = Version(11, 2, 3)
+                try localFS.write(path.join("main.c"), contents: "int main() { return 0; }")
+                _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "clang", "-target", "\(#require(Architecture.host.stringValue))-apple-macos\(expectedVersion)", "main.c"], workingDirectory: path)
+                let machOPath = path.join("a.out")
 
-            let files: [BinaryReader] = try allReaders(machOPath)
-            #expect(files.count > 0)
+                let files: [BinaryReader] = try allReaders(machOPath)
+                #expect(files.count > 0)
 
-            for file in files {
-                let machO = try MachO(reader: file)
-                let slices = try machO.slices()
-                #expect(slices.count > 0)
+                for file in files {
+                    let machO = try MachO(reader: file)
+                    let slices = try machO.slices()
+                    #expect(slices.count > 0)
 
-                for slice in slices {
-                    let buildVersions = try slice.buildVersions()
-                    #expect(buildVersions.count > 0)
+                    for slice in slices {
+                        let buildVersions = try slice.buildVersions()
+                        #expect(buildVersions.count > 0)
 
-                    for buildVersion in buildVersions {
-                        #expect(buildVersion.minOSVersion == expectedVersion)
+                        for buildVersion in buildVersions {
+                            #expect(buildVersion.minOSVersion == expectedVersion)
+                        }
                     }
                 }
             }
         }
-    }
-
-    @Test
-    func rPaths() async throws {
-        try await withTemporaryDirectory { path in
-            try localFS.write(path.join("main.c"), contents: "int main() { return 0; }")
-            _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "clang", "-target", "\(#require(Architecture.host.stringValue))-apple-macos11.0", "-rpath", "@loader_path/Frameworks", "-rpath", "@loader_path/../Frameworks", "main.c"], workingDirectory: path)
-            let machOPath = path.join("a.out")
 
-            let files: [BinaryReader] = try allReaders(machOPath)
-            #expect(files.count > 0)
-
-            for file in files {
-                let machO = try MachO(reader: file)
-                let slices = try machO.slices()
-                #expect(slices.count > 0)
-
-                for slice in slices {
-                    let rpaths = try slice.rpaths()
-                    #expect(rpaths == [
-                        "@loader_path/Frameworks",
-                        "@loader_path/../Frameworks"
-                    ])
+        @Test
+        func rPaths() async throws {
+            try await withTemporaryDirectory { path in
+                try localFS.write(path.join("main.c"), contents: "int main() { return 0; }")
+                _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "clang", "-target", "\(#require(Architecture.host.stringValue))-apple-macos11.0", "-rpath", "@loader_path/Frameworks", "-rpath", "@loader_path/../Frameworks", "main.c"], workingDirectory: path)
+                let machOPath = path.join("a.out")
+
+                let files: [BinaryReader] = try allReaders(machOPath)
+                #expect(files.count > 0)
+
+                for file in files {
+                    let machO = try MachO(reader: file)
+                    let slices = try machO.slices()
+                    #expect(slices.count > 0)
+
+                    for slice in slices {
+                        let rpaths = try slice.rpaths()
+                        #expect(
+                            rpaths == [
+                                "@loader_path/Frameworks",
+                                "@loader_path/../Frameworks",
+                            ]
+                        )
+                    }
                 }
             }
         }
-    }
 
-    @Test
-    func atomInfo() async throws {
-        try await withTemporaryDirectory { path in
-            try localFS.write(path.join("file.c"), contents: "const int foo = 0;")
-            _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "clang", "-target", "\(#require(Architecture.host.stringValue))-apple-macos11.0", "-dynamiclib", "-Xlinker", "-make_mergeable", "file.c"], workingDirectory: path)
-            let machOPath = path.join("a.out")
+        @Test
+        func atomInfo() async throws {
+            try await withTemporaryDirectory { path in
+                try localFS.write(path.join("file.c"), contents: "const int foo = 0;")
+                _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "clang", "-target", "\(#require(Architecture.host.stringValue))-apple-macos11.0", "-dynamiclib", "-Xlinker", "-make_mergeable", "file.c"], workingDirectory: path)
+                let machOPath = path.join("a.out")
 
-            let files: [BinaryReader] = try allReaders(machOPath)
-            #expect(files.count > 0)
+                let files: [BinaryReader] = try allReaders(machOPath)
+                #expect(files.count > 0)
 
-            for file in files {
-                let machO = try MachO(reader: file)
-                let slices = try machO.slices()
-                #expect(slices.count > 0)
+                for file in files {
+                    let machO = try MachO(reader: file)
+                    let slices = try machO.slices()
+                    #expect(slices.count > 0)
 
-                for slice in slices {
-                    #expect(try slice.containsAtomInfo())
+                    for slice in slices {
+                        #expect(try slice.containsAtomInfo())
+                    }
                 }
             }
         }
-    }
 
-    @Test
-    func nonMachO() throws {
-        let files: [BinaryReader] = try [
-            // Wrong header
-            ByteString("foobar".data(using: String.Encoding.utf8)!),
+        @Test
+        func nonMachO() throws {
+            let files: [BinaryReader] = try [
+                // Wrong header
+                ByteString("foobar".data(using: String.Encoding.utf8)!),
 
-            // Too short
-            ByteString("".data(using: String.Encoding.utf8)!),
-        ].flatMap{ try allReaders($0) }
+                // Too short
+                ByteString("".data(using: String.Encoding.utf8)!),
+            ].flatMap { try allReaders($0) }
 
-        for file in files {
-            #expect(throws: (any Error).self) {
-                try MachO(reader: file)
+            for file in files {
+                #expect(throws: (any Error).self) {
+                    try MachO(reader: file)
+                }
             }
         }
-    }
 
-    @Test
-    func errors() throws {
-        // Thin Mach-O with no content should throw an error when being inspected.
-        do {
-            func checkError(_ error: any Error) -> Bool {
-                switch error {
-                case BinaryReaderError.invalidPeek:
-                    return String(describing: error) == "Invalid read request. startingAt: 0, offsetBy: 0, typeSize: 28 (mach_header), dataSize: 4"
-                default:
-                    Issue.record("Unexpected error thrown: \(error)")
-                    return false
+        @Test
+        func errors() throws {
+            // Thin Mach-O with no content should throw an error when being inspected.
+            do {
+                func checkError(_ error: any Error) -> Bool {
+                    switch error {
+                    case BinaryReaderError.invalidPeek:
+                        return String(describing: error) == "Invalid read request. startingAt: 0, offsetBy: 0, typeSize: 28 (mach_header), dataSize: 4"
+                    default:
+                        Issue.record("Unexpected error thrown: \(error)")
+                        return false
+                    }
                 }
-            }
 
-            let machO = try MachO(data: ByteString([0xfe, 0xed, 0xfa, 0xce]))
-            #expect("Reading the data from an empty Mach-O should have thrown", performing: { try machO.slices() }, throws: { (error) in
-                checkError(error)
-            })
-        }
+                let machO = try MachO(data: ByteString([0xfe, 0xed, 0xfa, 0xce]))
+                #expect(
+                    "Reading the data from an empty Mach-O should have thrown",
+                    performing: { try machO.slices() },
+                    throws: { (error) in
+                        checkError(error)
+                    }
+                )
+            }
 
-        // A fat Mach-O with no content should throw an error when being inspected..
-        do {
-            func checkError(_ error: any Error) -> Bool {
-                switch error {
-                case BinaryReaderError.invalidPeek:
-                    return String(describing: error) == "Invalid read request. startingAt: 0, offsetBy: 0, typeSize: 8 (fat_header), dataSize: 4"
-                default:
-                    Issue.record("Unexpected error thrown: \(error)")
-                    return false
+            // A fat Mach-O with no content should throw an error when being inspected..
+            do {
+                func checkError(_ error: any Error) -> Bool {
+                    switch error {
+                    case BinaryReaderError.invalidPeek:
+                        return String(describing: error) == "Invalid read request. startingAt: 0, offsetBy: 0, typeSize: 8 (fat_header), dataSize: 4"
+                    default:
+                        Issue.record("Unexpected error thrown: \(error)")
+                        return false
+                    }
                 }
-            }
 
-            let machO = try MachO(data: ByteString([0xca, 0xfe, 0xba, 0xbe]))
-            #expect("Reading the data from an empty fat-archive should have thrown", performing: { try machO.slices() }, throws: { (error) in
-                checkError(error)
-            })
-        }
+                let machO = try MachO(data: ByteString([0xca, 0xfe, 0xba, 0xbe]))
+                #expect(
+                    "Reading the data from an empty fat-archive should have thrown",
+                    performing: { try machO.slices() },
+                    throws: { (error) in
+                        checkError(error)
+                    }
+                )
+            }
 
-        // A fat Mach-O that contains a static archive should error when there is no further data`.
-        do {
-            func checkError(_ error: any Error) -> Bool {
-                switch error {
-                case BinaryReaderError.invalidRead:
-                    return String(describing: error) == "Attempting to read past the size of the binary data. startingAt: 56, typeSize: 60 (ar_hdr), dataSize: 56"
-                default:
-                    Issue.record("Unexpected error thrown: \(error)")
-                    return false
+            // A fat Mach-O that contains a static archive should error when there is no further data`.
+            do {
+                func checkError(_ error: any Error) -> Bool {
+                    switch error {
+                    case BinaryReaderError.invalidRead:
+                        return String(describing: error) == "Attempting to read past the size of the binary data. startingAt: 56, typeSize: 60 (ar_hdr), dataSize: 56"
+                    default:
+                        Issue.record("Unexpected error thrown: \(error)")
+                        return false
+                    }
                 }
-            }
 
-            let machO = try MachO(data: ByteString([
-                0xCA, 0xFE, 0xBA, 0xBE, // [0x0000,  0] fat_header.magic
-                0x00, 0x00, 0x00, 0x02, // [0x0004,  4] fat_header.nfat_arch (2)
-
-                0x01, 0x00, 0x00, 0x07, // [0x0008,  8] fat_arch.cputype (0x01000007 == CPU_TYPE_X86_64)
-                0x00, 0x00, 0x00, 0x03, // [0x000C, 12] fat_arch.cpusubtype (0x00000003 == CPU_SUBTYPE_I386_ALL)
-                0x00, 0x00, 0x00, 0x30, // [0x0010, 16] fat_arch.offset (0x30 == 48)
-                0x00, 0x00, 0x05, 0xF8, // [0x0014, 20] fat_arch.size (0x05F8 == 1528)
-                0x00, 0x00, 0x00, 0x03, // [0x0018, 24] fat_arch.align (0x03 == 3)
-
-                0x01, 0x00, 0x00, 0x07, // [0x001C, 28] fat_arch.cputype (0x01000007 == CPU_TYPE_X86_64)
-                0x00, 0x00, 0x00, 0x08, // [0x0020, 32] fat_arch.cpusubtype (0x00000008 == CPU_SUBTYPE_X86_64_H)
-                0x00, 0x00, 0x06, 0x28, // [0x0024, 36] fat_arch.offset (0x0628 == 1576)
-                0x00, 0x00, 0x06, 0x08, // [0x0028, 40] fat_arch.size (0x0608 == 1544)
-                0x00, 0x00, 0x00, 0x03, // [0x002C, 44] fat_arch.align (0x03 == 3)
-
-                0x21, 0x3C, 0x61, 0x72, // [0x0030, 48] // ARMAG1
-                0x63, 0x68, 0x3E, 0x0A, // [0x0034, 52] // ARMAG2
-            ]))
-            #expect("Reading the data from an empty fat-archive should have thrown", performing: { try machO.slices() }, throws: { (error) in
-                checkError(error)
-            })
-        }
+                let machO = try MachO(
+                    data: ByteString([
+                        0xCA, 0xFE, 0xBA, 0xBE,  // [0x0000,  0] fat_header.magic
+                        0x00, 0x00, 0x00, 0x02,  // [0x0004,  4] fat_header.nfat_arch (2)
+
+                        0x01, 0x00, 0x00, 0x07,  // [0x0008,  8] fat_arch.cputype (0x01000007 == CPU_TYPE_X86_64)
+                        0x00, 0x00, 0x00, 0x03,  // [0x000C, 12] fat_arch.cpusubtype (0x00000003 == CPU_SUBTYPE_I386_ALL)
+                        0x00, 0x00, 0x00, 0x30,  // [0x0010, 16] fat_arch.offset (0x30 == 48)
+                        0x00, 0x00, 0x05, 0xF8,  // [0x0014, 20] fat_arch.size (0x05F8 == 1528)
+                        0x00, 0x00, 0x00, 0x03,  // [0x0018, 24] fat_arch.align (0x03 == 3)
+
+                        0x01, 0x00, 0x00, 0x07,  // [0x001C, 28] fat_arch.cputype (0x01000007 == CPU_TYPE_X86_64)
+                        0x00, 0x00, 0x00, 0x08,  // [0x0020, 32] fat_arch.cpusubtype (0x00000008 == CPU_SUBTYPE_X86_64_H)
+                        0x00, 0x00, 0x06, 0x28,  // [0x0024, 36] fat_arch.offset (0x0628 == 1576)
+                        0x00, 0x00, 0x06, 0x08,  // [0x0028, 40] fat_arch.size (0x0608 == 1544)
+                        0x00, 0x00, 0x00, 0x03,  // [0x002C, 44] fat_arch.align (0x03 == 3)
+
+                        0x21, 0x3C, 0x61, 0x72,  // [0x0030, 48] // ARMAG1
+                        0x63, 0x68, 0x3E, 0x0A,  // [0x0034, 52] // ARMAG2
+                    ])
+                )
+                #expect(
+                    "Reading the data from an empty fat-archive should have thrown",
+                    performing: { try machO.slices() },
+                    throws: { (error) in
+                        checkError(error)
+                    }
+                )
+            }
 
-        // A fat Mach-O that contains a static archive should error when there is no further data`.
-        // It should fail to read past the archive header, though, NOT fail attempting to read a hidden fat_arch because there isn't enough space to read one between the end of the fat_arch list and the start of the first slice (size of fat_arch is 20, or 24 for fat_arch_64).
-        do {
-            func checkError(_ error: any Error) -> Bool {
-                switch error {
-                case BinaryReaderError.invalidRead:
-                    return String(describing: error) == "Attempting to read past the size of the binary data. startingAt: 60, typeSize: 60 (ar_hdr), dataSize: 60"
-                default:
-                    Issue.record("Unexpected error thrown: \(error)")
-                    return false
+            // A fat Mach-O that contains a static archive should error when there is no further data`.
+            // It should fail to read past the archive header, though, NOT fail attempting to read a hidden fat_arch because there isn't enough space to read one between the end of the fat_arch list and the start of the first slice (size of fat_arch is 20, or 24 for fat_arch_64).
+            do {
+                func checkError(_ error: any Error) -> Bool {
+                    switch error {
+                    case BinaryReaderError.invalidRead:
+                        return String(describing: error) == "Attempting to read past the size of the binary data. startingAt: 60, typeSize: 60 (ar_hdr), dataSize: 60"
+                    default:
+                        Issue.record("Unexpected error thrown: \(error)")
+                        return false
+                    }
                 }
-            }
 
-            let machO = try MachO(data: ByteString([
-                0xCA, 0xFE, 0xBA, 0xBE, // [0x0000,  0] fat_header.magic
-                0x00, 0x00, 0x00, 0x02, // [0x0004,  4] fat_header.nfat_arch (2)
-
-                0x01, 0x00, 0x00, 0x07, // [0x0008,  8] fat_arch.cputype (0x01000007 == CPU_TYPE_X86_64)
-                0x00, 0x00, 0x00, 0x03, // [0x000C, 12] fat_arch.cpusubtype (0x00000003 == CPU_SUBTYPE_I386_ALL)
-                0x00, 0x00, 0x00, 0x34, // [0x0010, 16] fat_arch.offset (0x34 == 52)
-                0x00, 0x00, 0x05, 0xF8, // [0x0014, 20] fat_arch.size (0x05F8 == 1528)
-                0x00, 0x00, 0x00, 0x03, // [0x0018, 24] fat_arch.align (0x03 == 3)
-
-                0x01, 0x00, 0x00, 0x07, // [0x001C, 28] fat_arch.cputype (0x01000007 == CPU_TYPE_X86_64)
-                0x00, 0x00, 0x00, 0x08, // [0x0020, 32] fat_arch.cpusubtype (0x00000008 == CPU_SUBTYPE_X86_64_H)
-                0x00, 0x00, 0x06, 0x28, // [0x0024, 36] fat_arch.offset (0x0628 == 1576)
-                0x00, 0x00, 0x06, 0x08, // [0x0028, 40] fat_arch.size (0x0608 == 1544)
-                0x00, 0x00, 0x00, 0x03, // [0x002C, 44] fat_arch.align (0x03 == 3)
-
-                0x00, 0x00, 0x00, 0x00, // [0x0030, 48] (zero padding)
-
-                0x21, 0x3C, 0x61, 0x72, // [0x0034, 52] ARMAG1
-                0x63, 0x68, 0x3E, 0x0A, // [0x0038, 56] ARMAG2
-            ]))
-            #expect("Reading the data from an empty fat-archive should have thrown", performing: { try machO.slices() }, throws: { (error) in
-                checkError(error)
-            })
+                let machO = try MachO(
+                    data: ByteString([
+                        0xCA, 0xFE, 0xBA, 0xBE,  // [0x0000,  0] fat_header.magic
+                        0x00, 0x00, 0x00, 0x02,  // [0x0004,  4] fat_header.nfat_arch (2)
+
+                        0x01, 0x00, 0x00, 0x07,  // [0x0008,  8] fat_arch.cputype (0x01000007 == CPU_TYPE_X86_64)
+                        0x00, 0x00, 0x00, 0x03,  // [0x000C, 12] fat_arch.cpusubtype (0x00000003 == CPU_SUBTYPE_I386_ALL)
+                        0x00, 0x00, 0x00, 0x34,  // [0x0010, 16] fat_arch.offset (0x34 == 52)
+                        0x00, 0x00, 0x05, 0xF8,  // [0x0014, 20] fat_arch.size (0x05F8 == 1528)
+                        0x00, 0x00, 0x00, 0x03,  // [0x0018, 24] fat_arch.align (0x03 == 3)
+
+                        0x01, 0x00, 0x00, 0x07,  // [0x001C, 28] fat_arch.cputype (0x01000007 == CPU_TYPE_X86_64)
+                        0x00, 0x00, 0x00, 0x08,  // [0x0020, 32] fat_arch.cpusubtype (0x00000008 == CPU_SUBTYPE_X86_64_H)
+                        0x00, 0x00, 0x06, 0x28,  // [0x0024, 36] fat_arch.offset (0x0628 == 1576)
+                        0x00, 0x00, 0x06, 0x08,  // [0x0028, 40] fat_arch.size (0x0608 == 1544)
+                        0x00, 0x00, 0x00, 0x03,  // [0x002C, 44] fat_arch.align (0x03 == 3)
+
+                        0x00, 0x00, 0x00, 0x00,  // [0x0030, 48] (zero padding)
+
+                        0x21, 0x3C, 0x61, 0x72,  // [0x0034, 52] ARMAG1
+                        0x63, 0x68, 0x3E, 0x0A,  // [0x0038, 56] ARMAG2
+                    ])
+                )
+                #expect(
+                    "Reading the data from an empty fat-archive should have thrown",
+                    performing: { try machO.slices() },
+                    throws: { (error) in
+                        checkError(error)
+                    }
+                )
+            }
         }
-    }
 
-    @Test
-    func fixedSizeCArrayStringParsing() throws {
-        // Some MachO structs include arrays of chars with a fixed size known at compile time. We need to know to parse no more than necessary even if there's no nil-terminator.
+        @Test
+        func fixedSizeCArrayStringParsing() throws {
+            // Some MachO structs include arrays of chars with a fixed size known at compile time. We need to know to parse no more than necessary even if there's no nil-terminator.
 
-        let expectedName = Array<String>(repeating: "x", count: 16).joined()
+            let expectedName = Array<String>(repeating: "x", count: 16).joined()
 
-        var cmd = segment_command()
-        let _ = withUnsafeMutableBytes(of: &cmd) { memset($0.baseAddress!, Int32(expectedName.unicodeScalars.first!.value), MemoryLayout<segment_command>.size) }
+            var cmd = segment_command()
+            let _ = withUnsafeMutableBytes(of: &cmd) { memset($0.baseAddress!, Int32(expectedName.unicodeScalars.first!.value), MemoryLayout<segment_command>.size) }
 
-        #expect(try expectedName == cmd.segname())
-    }
+            #expect(try expectedName == cmd.segname())
+        }
 
-    @Test
-    func binaryReader() throws {
-        let data = ByteString([0xCA, 0xFE, 0xBA, 0xBE, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x05, 0xF8, 0x00, 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x06, 0x28, 0x00, 0x00, 0x06, 0x08, 0x00, 0x00, 0x00, 0x03, 0x21, 0x3C, 0x61, 0x72, 0x63, 0x68, 0x3E, 0x0A])
-        let reader = BinaryReader(data: data)
-
-        let value1: UInt8 = try reader.read()
-        #expect(value1 == 0xCA)
-        #expect(reader.cursor.startingOffset == 0)
-        #expect(reader.cursor.offset == 1)
-
-        let value2: UInt32 = try reader.peek()
-        #expect(value2 == 0x00BEBAFE)
-        #expect(reader.cursor.startingOffset == 0)
-        #expect(reader.cursor.offset == 1)
-
-        let value3: UInt32 = try reader.read()
-        #expect(value3 == 0x00BEBAFE)
-        #expect(reader.cursor.startingOffset == 0)
-        #expect(reader.cursor.offset == 5)
-
-        reader.push()
-        #expect(reader.cursor.startingOffset == 5)
-        #expect(reader.cursor.offset == 0)
-
-        let value4: UInt32 = try reader.read()
-        #expect(value4 == 0x01020000)
-        #expect(reader.cursor.startingOffset == 5)
-        #expect(reader.cursor.offset == 4)
-
-        reader.push()
-        #expect(reader.cursor.startingOffset == 9)
-        #expect(reader.cursor.offset == 0)
-
-        let value5: UInt32 = try reader.read()
-        #expect(value5 == 0x00070000)
-        #expect(reader.cursor.startingOffset == 9)
-        #expect(reader.cursor.offset == 4)
-
-        reader.pop()
-        #expect(reader.cursor.startingOffset == 5)
-        #expect(reader.cursor.offset == 4)
-
-        let value6: UInt32 = try reader.read()
-        #expect(value6 == 0x00070000)
-        #expect(reader.cursor.startingOffset == 5)
-        #expect(reader.cursor.offset == 8)
-
-        reader.pop()
-        #expect(reader.cursor.startingOffset == 0)
-        #expect(reader.cursor.offset == 5)
-
-        let value7: UInt32 = try reader.read()
-        #expect(value7 == 0x01020000)
-        #expect(reader.cursor.startingOffset == 0)
-        #expect(reader.cursor.offset == 9)
-    }
+        @Test
+        func binaryReader() throws {
+            let data = ByteString([0xCA, 0xFE, 0xBA, 0xBE, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x05, 0xF8, 0x00, 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x06, 0x28, 0x00, 0x00, 0x06, 0x08, 0x00, 0x00, 0x00, 0x03, 0x21, 0x3C, 0x61, 0x72, 0x63, 0x68, 0x3E, 0x0A])
+            let reader = BinaryReader(data: data)
+
+            let value1: UInt8 = try reader.read()
+            #expect(value1 == 0xCA)
+            #expect(reader.cursor.startingOffset == 0)
+            #expect(reader.cursor.offset == 1)
+
+            let value2: UInt32 = try reader.peek()
+            #expect(value2 == 0x00BEBAFE)
+            #expect(reader.cursor.startingOffset == 0)
+            #expect(reader.cursor.offset == 1)
+
+            let value3: UInt32 = try reader.read()
+            #expect(value3 == 0x00BEBAFE)
+            #expect(reader.cursor.startingOffset == 0)
+            #expect(reader.cursor.offset == 5)
+
+            reader.push()
+            #expect(reader.cursor.startingOffset == 5)
+            #expect(reader.cursor.offset == 0)
+
+            let value4: UInt32 = try reader.read()
+            #expect(value4 == 0x01020000)
+            #expect(reader.cursor.startingOffset == 5)
+            #expect(reader.cursor.offset == 4)
+
+            reader.push()
+            #expect(reader.cursor.startingOffset == 9)
+            #expect(reader.cursor.offset == 0)
+
+            let value5: UInt32 = try reader.read()
+            #expect(value5 == 0x00070000)
+            #expect(reader.cursor.startingOffset == 9)
+            #expect(reader.cursor.offset == 4)
+
+            reader.pop()
+            #expect(reader.cursor.startingOffset == 5)
+            #expect(reader.cursor.offset == 4)
+
+            let value6: UInt32 = try reader.read()
+            #expect(value6 == 0x00070000)
+            #expect(reader.cursor.startingOffset == 5)
+            #expect(reader.cursor.offset == 8)
+
+            reader.pop()
+            #expect(reader.cursor.startingOffset == 0)
+            #expect(reader.cursor.offset == 5)
+
+            let value7: UInt32 = try reader.read()
+            #expect(value7 == 0x01020000)
+            #expect(reader.cursor.startingOffset == 0)
+            #expect(reader.cursor.offset == 9)
+        }
 
-    @Test
-    func byteString() throws {
-        let bytes = ByteString([0xCA, 0xFE, 0xBA, 0xBE, 0x00, 0xDA, 0x0F, 0x02, 0x01])
+        @Test
+        func byteString() throws {
+            let bytes = ByteString([0xCA, 0xFE, 0xBA, 0xBE, 0x00, 0xDA, 0x0F, 0x02, 0x01])
 
-        let value1: UInt8 = try bytes.read(from: 0)
-        #expect(value1 == 0xCA)
+            let value1: UInt8 = try bytes.read(from: 0)
+            #expect(value1 == 0xCA)
 
-        let value2: UInt32 = try bytes.read(from: 0)
-        #expect(value2 == 0xBEBAFECA)
+            let value2: UInt32 = try bytes.read(from: 0)
+            #expect(value2 == 0xBEBAFECA)
 
-        let value3: UInt8 = try bytes.read(from: 5)
-        #expect(value3 == 0xDA)
+            let value3: UInt8 = try bytes.read(from: 5)
+            #expect(value3 == 0xDA)
 
-        let value4: UInt32 = try bytes.read(from: 5)
-        #expect(value4 == 0x01020FDA)
+            let value4: UInt32 = try bytes.read(from: 5)
+            #expect(value4 == 0x01020FDA)
 
-        do {
-            let _ = try bytes.read(from: 6) as UInt32
-            Issue.record("this should throw")
-        }
-        catch {
+            do {
+                let _ = try bytes.read(from: 6) as UInt32
+                Issue.record("this should throw")
+            } catch {
+            }
         }
-    }
 
-    @Test
-    func byteStringReader() throws {
-        let bytes = ByteString([0xCA, 0xFE, 0xBA, 0xBE, 0x00, 0xDA, 0x0F, 0x02, 0x01])
-        let reader = BinaryReader(data: bytes)
+        @Test
+        func byteStringReader() throws {
+            let bytes = ByteString([0xCA, 0xFE, 0xBA, 0xBE, 0x00, 0xDA, 0x0F, 0x02, 0x01])
+            let reader = BinaryReader(data: bytes)
 
-        let value1: UInt8 = try reader.read()
-        #expect(value1 == 0xCA)
+            let value1: UInt8 = try reader.read()
+            #expect(value1 == 0xCA)
 
-        let value2: UInt32 = try reader.read()
-        #expect(value2 == 0x00BEBAFE)
+            let value2: UInt32 = try reader.read()
+            #expect(value2 == 0x00BEBAFE)
 
-        try reader.seek(by: -4)
-        let value3: UInt32 = try reader.read()
-        #expect(value3 == 0x00BEBAFE)
+            try reader.seek(by: -4)
+            let value3: UInt32 = try reader.read()
+            #expect(value3 == 0x00BEBAFE)
 
-        let value4: UInt32 = try reader.seek(to: 5).read()
-        #expect(value4 == 0x01020FDA)
+            let value4: UInt32 = try reader.seek(to: 5).read()
+            #expect(value4 == 0x01020FDA)
 
-        do {
-            let _ = try reader.read() as UInt32
-            Issue.record("this should throw")
-        }
-        catch {
+            do {
+                let _ = try reader.read() as UInt32
+                Issue.record("this should throw")
+            } catch {
+            }
         }
-    }
 
-    @Test
-    func buildVersionPlatformInit() {
-        // This test is to ensure that all of the supported platforms can be converted to from their platform/environment representation.
-
-        let versions: [BuildVersion.Platform: (platform: String, environment: String?)] = [
-            BuildVersion.Platform.driverKit: (platform: "driverkit", environment: nil),
-            BuildVersion.Platform.iOS: (platform: "ios", environment: nil),
-            BuildVersion.Platform.iOSSimulator: (platform: "ios", environment: "simulator"),
-            BuildVersion.Platform.macCatalyst: (platform: "ios", environment: "macabi"),
-            BuildVersion.Platform.macOS: (platform: "macos", environment: nil),
-            BuildVersion.Platform.tvOS: (platform: "tvos", environment: nil),
-            BuildVersion.Platform.tvOSSimulator: (platform: "tvos", environment: "simulator"),
-            BuildVersion.Platform.watchOS: (platform: "watchos", environment: nil),
-            BuildVersion.Platform.watchOSSimulator: (platform: "watchos", environment: "simulator"),
-            BuildVersion.Platform.xrOS: (platform: "xros", environment: nil),
-            BuildVersion.Platform.xrOSSimulator: (platform: "xros", environment: "simulator"),
-        ]
-
-        for (input, data) in versions {
-            let converted = BuildVersion.Platform(platform: data.platform, environment: data.environment)
-            #expect(input == converted)
+        @Test
+        func buildVersionPlatformInit() {
+            // This test is to ensure that all of the supported platforms can be converted to from their platform/environment representation.
+
+            let versions: [BuildVersion.Platform: (platform: String, environment: String?)] = [
+                BuildVersion.Platform.driverKit: (platform: "driverkit", environment: nil),
+                BuildVersion.Platform.iOS: (platform: "ios", environment: nil),
+                BuildVersion.Platform.iOSSimulator: (platform: "ios", environment: "simulator"),
+                BuildVersion.Platform.macCatalyst: (platform: "ios", environment: "macabi"),
+                BuildVersion.Platform.macOS: (platform: "macos", environment: nil),
+                BuildVersion.Platform.tvOS: (platform: "tvos", environment: nil),
+                BuildVersion.Platform.tvOSSimulator: (platform: "tvos", environment: "simulator"),
+                BuildVersion.Platform.watchOS: (platform: "watchos", environment: nil),
+                BuildVersion.Platform.watchOSSimulator: (platform: "watchos", environment: "simulator"),
+                BuildVersion.Platform.xrOS: (platform: "xros", environment: nil),
+                BuildVersion.Platform.xrOSSimulator: (platform: "xros", environment: "simulator"),
+            ]
+
+            for (input, data) in versions {
+                let converted = BuildVersion.Platform(platform: data.platform, environment: data.environment)
+                #expect(input == converted)
+            }
         }
     }
-}
 #endif
diff --git a/Tests/SWBUtilTests/MiscTests.swift b/Tests/SWBUtilTests/MiscTests.swift
index f93094a4..8620930a 100644
--- a/Tests/SWBUtilTests/MiscTests.swift
+++ b/Tests/SWBUtilTests/MiscTests.swift
@@ -33,19 +33,19 @@ import SWBUtil
     @Test
     func parsingUmbrellaHeaderFromModuleMap() {
         let contentWithUmbrellaHeader = """
-        framework module FrameworkName [extern_c] {
-          umbrella header "TheUmbrellaHeader.h"
-          export *
-        }
-        """
+            framework module FrameworkName [extern_c] {
+              umbrella header "TheUmbrellaHeader.h"
+              export *
+            }
+            """
         #expect(parseUmbrellaHeaderName(contentWithUmbrellaHeader) == "TheUmbrellaHeader.h")
 
         let contentWithoutUmbrellaHeader = """
-        framework module FrameworkName [extern_c] {
-          header "NonUmbrellaHeader.h"
-          export *
-        }
-        """
+            framework module FrameworkName [extern_c] {
+              header "NonUmbrellaHeader.h"
+              export *
+            }
+            """
         #expect(parseUmbrellaHeaderName(contentWithoutUmbrellaHeader) == nil)
     }
 
diff --git a/Tests/SWBUtilTests/MsgPackSerializationTests.swift b/Tests/SWBUtilTests/MsgPackSerializationTests.swift
index 6212edcd..ac4ff0ed 100644
--- a/Tests/SWBUtilTests/MsgPackSerializationTests.swift
+++ b/Tests/SWBUtilTests/MsgPackSerializationTests.swift
@@ -102,12 +102,12 @@ import SWBUtil
         #expect(try dsz.deserialize() == Int.max)
         #expect(throws: (any Error).self) {
             try dsz.deserialize() as Int
-        }                  // Next element is not an Int
+        }  // Next element is not an Int
         // Bool
         #expect(try dsz.deserialize())
         #expect(throws: (any Error).self) {
             try dsz.deserialize() as Bool
-        }                 // Next element is not a Bool
+        }  // Next element is not a Bool
         // UInt
         #expect(try dsz.deserialize() == 6 as UInt)
         #expect(try dsz.deserialize() == 0 as UInt)
@@ -115,7 +115,7 @@ import SWBUtil
         #expect(try dsz.deserialize() == UInt.max)
         #expect(throws: (any Error).self) {
             try dsz.deserialize() as UInt
-        }                 // Next element is not a UInt
+        }  // Next element is not a UInt
         // Int32
         #expect(try dsz.deserialize() as Int32 == Int32.min)
         #expect(try dsz.deserialize() as Int32 == 0 as Int32)
@@ -139,12 +139,12 @@ import SWBUtil
         #expect(try dsz.deserialize() as Float32 == 2.71828)
         #expect(throws: (any Error).self) {
             try dsz.deserialize() as Float32
-        }              // Next element is not a Float32
+        }  // Next element is not a Float32
         // Bool again
         #expect(try !dsz.deserialize())
         #expect(throws: (any Error).self) {
             try dsz.deserialize() as Bool
-        }                 // Next element is not a Bool
+        }  // Next element is not a Bool
         // Float64
         #expect(try dsz.deserialize() as Float64 == 6.1)
         #expect(try dsz.deserialize() as Float64 == 0.0)
@@ -152,7 +152,7 @@ import SWBUtil
         #expect(try dsz.deserialize() as Float64 == 3.1415926535)
         #expect(throws: (any Error).self) {
             try dsz.deserialize() as Float64
-        }              // Next element is not a Float64
+        }  // Next element is not a Float64
         // String
         #expect(try dsz.deserialize() == "Something")
         #expect(try dsz.deserialize() == "")
@@ -162,7 +162,7 @@ import SWBUtil
         #expect(try dsz.deserialize() == [UInt8]("".utf8))
         #expect(throws: (any Error).self) {
             try dsz.deserialize() as String
-        }               // Next element is not a String
+        }  // Next element is not a String
         // Array
         #expect(try dsz.deserialize() == [1, 2, 3])
 
@@ -178,7 +178,7 @@ import SWBUtil
         #expect(try dsz.deserialize() as IntRawValueType == .that)
         #expect(throws: (any Error).self) {
             try dsz.deserialize() as IntRawValueType
-        }      // Next element is not a IntRawValueType
+        }  // Next element is not a IntRawValueType
         #expect(try dsz.deserialize() as StringRawValueType == .thisString)
         #expect(try dsz.deserialize() as StringRawValueType == .thatString)
         // Range
@@ -191,9 +191,8 @@ import SWBUtil
     /// This also exercises the individual simple types' deserialization and init methods.
     @Test
     func simpleArraySerialization() throws {
-        do
-        {
-            let array: [Int] = [13, 6, -6,-33231, 14, 242432, 0, -83]
+        do {
+            let array: [Int] = [13, 6, -6, -33231, 14, 242432, 0, -83]
 
             // Serialize!
             let sz = MsgPackSerializer()
@@ -205,11 +204,10 @@ import SWBUtil
             #expect(dszArray == array)
             #expect(throws: (any Error).self) {
                 try dsz.deserialize() as [Int]
-            }                // Next element is not an Array
+            }  // Next element is not an Array
             // Nothing left to deserialize.
         }
-        do
-        {
+        do {
             let array: [UInt] = [21, 7, 0, 3322, 1]
 
             // Serialize!
@@ -222,11 +220,10 @@ import SWBUtil
             #expect(dszArray == array)
             #expect(throws: (any Error).self) {
                 try dsz.deserialize() as [UInt]
-            }               // Next element is not an Array
+            }  // Next element is not an Array
             // Nothing left to deserialize.
         }
-        do
-        {
+        do {
             let array: [Bool] = [true, true, false, true, false, false, false, false, false]
 
             // Serialize!
@@ -239,11 +236,10 @@ import SWBUtil
             #expect(dszArray == array)
             #expect(throws: (any Error).self) {
                 try dsz.deserialize() as [Bool]
-            }               // Next element is not an Array
+            }  // Next element is not an Array
             // Nothing left to deserialize.
         }
-        do
-        {
+        do {
             let array: [Float32] = [19.0, -66.2, 1.9, 0, -0.00003, 34222.6]
 
             // Serialize!
@@ -256,11 +252,10 @@ import SWBUtil
             #expect(dszArray == array)
             #expect(throws: (any Error).self) {
                 try dsz.deserialize() as [Float32]
-            }               // Next element is not an Array
+            }  // Next element is not an Array
             // Nothing left to deserialize.
         }
-        do
-        {
+        do {
             let array: [Float64] = [-2323.1, 44, 0.0, -0.999999991, 0.0000000072, 23222218, 3]
 
             // Serialize!
@@ -273,11 +268,10 @@ import SWBUtil
             #expect(dszArray == array)
             #expect(throws: (any Error).self) {
                 try dsz.deserialize() as [Float64]
-            }               // Next element is not an Array
+            }  // Next element is not an Array
             // Nothing left to deserialize.
         }
-        do
-        {
+        do {
             let array = ["One thing", "Something else", "Anything", "", "Nothing"]
 
             // Serialize!
@@ -290,7 +284,7 @@ import SWBUtil
             #expect(dszArray == array)
             #expect(throws: (any Error).self) {
                 try dsz.deserialize() as [String]
-            }             // Next element is not an Array
+            }  // Next element is not an Array
             // Nothing left to deserialize.
         }
     }
@@ -310,14 +304,13 @@ import SWBUtil
         #expect(dszDict == dict)
         #expect(throws: (any Error).self) {
             try dsz.deserialize() as [String: Int]
-        }        // Next element is not a Dictionary
+        }  // Next element is not a Dictionary
     }
 
     /// Test serializing Range objects.
     @Test
     func simpleObjectSerialization() throws {
-        do
-        {
+        do {
             let r1 = IntRange(uncheckedBounds: (0, 5))
             let r2 = IntRange(uncheckedBounds: (-16, -4))
             let r3 = IntRange(uncheckedBounds: (-6, 6))
@@ -335,13 +328,12 @@ import SWBUtil
             #expect(try dsz.deserialize() as IntRange == r3)
             #expect(throws: (any Error).self) {
                 try dsz.deserialize() as IntRange
-            }                 // Next element is not an IntRange
+            }  // Next element is not an IntRange
             // Nothing left to deserialize.
         }
 
         // Next serialize an array of Range objects.
-        do
-        {
+        do {
             let array = [
                 IntRange(uncheckedBounds: (-3, 2)),
                 IntRange(uncheckedBounds: (14, 19)),
@@ -360,13 +352,12 @@ import SWBUtil
             #expect(dszArray == array)
             #expect(throws: (any Error).self) {
                 try dsz.deserialize() as [IntRange]
-            }               // Next element is not an Array
+            }  // Next element is not an Array
             // Nothing left to deserialize.
         }
 
         // Serialize a dictionary whose values are Range objects.
-        do
-        {
+        do {
             let dict = [
                 "one": IntRange(uncheckedBounds: (1, 4)),
                 "two": IntRange(uncheckedBounds: (-13, -2)),
@@ -384,13 +375,12 @@ import SWBUtil
             #expect(dszDict == dict)
             #expect(throws: (any Error).self) {
                 try dsz.deserialize() as [String: IntRange]
-            }       // Next element is not a Dictionary
+            }  // Next element is not a Dictionary
             // Nothing left to deserialize.
         }
 
         // Serialize a dictionary whose keys are Range objects.
-        do
-        {
+        do {
             let dict = [
                 IntRange(uncheckedBounds: (4, 9)): 13,
                 IntRange(uncheckedBounds: (-6, 14)): 8,
@@ -407,7 +397,7 @@ import SWBUtil
             #expect(dszDict == dict)
             #expect(throws: (any Error).self) {
                 try dsz.deserialize() as [IntRange: Int]
-            }          // Next element is not a Dictionary
+            }  // Next element is not a Dictionary
             // Nothing left to deserialize.
         }
     }
@@ -433,20 +423,19 @@ import SWBUtil
         #expect(dszArray == array)
         #expect(throws: (any Error).self) {
             try dsz.deserialize() as [A]
-        }                  // Next element is not an Array
+        }  // Next element is not an Array
     }
 
     /// Test serializing dictionaries with polymorphic values.
     @Test
     func polymorphicDictionarySerialization() throws {
-        do
-        {
+        do {
             let dict = [
-                "one":      A(name: "one"),
-                "two":      B(name: "two", number: 21),
-                "three":    C(name: "three", truth: true),
-                "four":     A(name: "four"),
-                "five":     C(name: "five", truth: false),
+                "one": A(name: "one"),
+                "two": B(name: "two", number: 21),
+                "three": C(name: "three", truth: true),
+                "four": A(name: "four"),
+                "five": C(name: "five", truth: false),
             ]
 
             // Serialize!
@@ -459,13 +448,12 @@ import SWBUtil
             #expect(dszDict == dict)
             #expect(throws: (any Error).self) {
                 try dsz.deserialize() as [String: A]
-            }      // Next element is not a Dictionary
+            }  // Next element is not a Dictionary
             // Nothing left to deserialize.
         }
 
         // Keys are PolymorphicSerializable, values are Serializable.
-        do
-        {
+        do {
             let dict = [
                 A(name: "ten"): "tenth",
                 B(name: "twenty", number: -27): "twentieth",
@@ -484,13 +472,12 @@ import SWBUtil
             #expect(dszDict == dict)
             #expect(throws: (any Error).self) {
                 try dsz.deserialize() as [String: A]
-            }      // Next element is not a Dictionary
+            }  // Next element is not a Dictionary
             // Nothing left to deserialize.
         }
 
         // Keys and values are PolymorphicSerializable.
-        do
-        {
+        do {
             let dict = [
                 A(name: "umpteen"): C(name: "argl", truth: true),
                 B(name: "vumpteen", number: 666): A(name: "bargl"),
@@ -510,7 +497,7 @@ import SWBUtil
             #expect(dszDict == dict)
             #expect(throws: (any Error).self) {
                 try dsz.deserialize() as [String: A]
-            }      // Next element is not a Dictionary
+            }  // Next element is not a Dictionary
             // Nothing left to deserialize.
         }
     }
@@ -519,8 +506,7 @@ import SWBUtil
     @Test
     func optionalSerialization() throws {
         var optionality = OptionalTester()
-        do
-        {
+        do {
             // Serialize!
             let sz = MsgPackSerializer()
             sz.serialize(optionality)
@@ -531,21 +517,20 @@ import SWBUtil
             #expect(dszOpt == optionality)
             #expect(throws: (any Error).self) {
                 try dsz.deserialize() as OptionalTester
-            }       // Next element is not an OptionalTester
+            }  // Next element is not an OptionalTester
             // Nothing left to deserialize.
         }
 
         // Now set up data in some - but not all - of our test object's properties and try that.
         optionality.stringOne = "Some string!"
-        optionality.arrayOne = [ 1, 1, 2, 3, 5, 8, 13, 21 ]
-        optionality.dictOne = [ "a": 4, "b": 19, "c": 0, "dee": -5 ]
+        optionality.arrayOne = [1, 1, 2, 3, 5, 8, 13, 21]
+        optionality.dictOne = ["a": 4, "b": 19, "c": 0, "dee": -5]
         optionality.objectOne = A(name: "ayyyy")
-        optionality.objArrayOne = [ A(name: "aye"), B(name: "bee", number: 7) ]
-        optionality.objDictOne = [ "yes": C(name: "see", truth: true), "no": C(name: "no see", truth: false), "maybe": A(name: "maybe not") ]
-        optionality.objDictThree = [ A(name: "some"): 1, A(name: "none"): 0 ]
-        optionality.objDictFive = [ A(name: "any"): B(name: "many", number: 46), C(name: "nany", truth: false): A(name: "nope") ]
-        do
-        {
+        optionality.objArrayOne = [A(name: "aye"), B(name: "bee", number: 7)]
+        optionality.objDictOne = ["yes": C(name: "see", truth: true), "no": C(name: "no see", truth: false), "maybe": A(name: "maybe not")]
+        optionality.objDictThree = [A(name: "some"): 1, A(name: "none"): 0]
+        optionality.objDictFive = [A(name: "any"): B(name: "many", number: 46), C(name: "nany", truth: false): A(name: "nope")]
+        do {
             // Serialize!
             let sz = MsgPackSerializer()
             sz.serialize(optionality)
@@ -556,7 +541,7 @@ import SWBUtil
             #expect(dszOpt == optionality)
             #expect(throws: (any Error).self) {
                 try dsz.deserialize() as OptionalTester
-            }       // Next element is not an OptionalTester
+            }  // Next element is not an OptionalTester
             // Nothing left to deserialize.
         }
     }
@@ -576,7 +561,7 @@ import SWBUtil
         #expect(dszMsg == msg)
         #expect(throws: (any Error).self) {
             try dsz.deserialize() as TestLogMessage
-        }       // Next element is not a TestLogMessage
+        }  // Next element is not a TestLogMessage
     }
 
     /// Test serializing our log objects.
@@ -608,13 +593,12 @@ import SWBUtil
         #expect(dszLog == log)
         #expect(throws: (any Error).self) {
             try dsz.deserialize() as TestLogHeader
-        }        // Next element is not a TestLogHeader
+        }  // Next element is not a TestLogHeader
     }
 
-
     // Uniquing serialization
 
-    let uniqueSerializationTestValue = (1..<10).map{ "\($0)" }.joined()
+    let uniqueSerializationTestValue = (1..<10).map { "\($0)" }.joined()
 
     class UniquingSerializerDelegateImpl: UniquingSerializerDelegate {
         let uniquingCoordinator = UniquingSerializationCoordinator()
@@ -643,7 +627,7 @@ import SWBUtil
 
     @Test
     func uniqueSerializationSizeWin() {
-        let value = (1..<1000).map{ "\($0)" }.joined()
+        let value = (1..<1000).map { "\($0)" }.joined()
 
         let s0 = MsgPackSerializer()
         s0.serialize(value)
@@ -659,32 +643,26 @@ import SWBUtil
     }
 }
 
-
 // MARK: Classes for testing simple objects.
 
-
-private class IntRange: Serializable, Equatable, Hashable, Comparable
-{
+private class IntRange: Serializable, Equatable, Hashable, Comparable {
     let range: Range<Int>
 
-    init(uncheckedBounds bounds: (lower: Int, upper: Int))
-    {
+    init(uncheckedBounds bounds: (lower: Int, upper: Int)) {
         self.range = Range(uncheckedBounds: (bounds.lower, bounds.upper))
     }
 
     var lowerBound: Int { return self.range.lowerBound }
     var upperBound: Int { return self.range.upperBound }
 
-    func serialize<T: Serializer>(to serializer: T)
-    {
+    func serialize<T: Serializer>(to serializer: T) {
         serializer.beginAggregate(2)
         serializer.serialize(lowerBound)
         serializer.serialize(upperBound)
         serializer.endAggregate()
     }
 
-    required init(from deserializer: any Deserializer) throws
-    {
+    required init(from deserializer: any Deserializer) throws {
         try deserializer.beginAggregate(2)
         let lower: Int = try deserializer.deserialize()
         let upper: Int = try deserializer.deserialize()
@@ -701,39 +679,31 @@ private class IntRange: Serializable, Equatable, Hashable, Comparable
     }
 }
 
-
-private func ==(lhs: IntRange, rhs: IntRange) -> Bool
-{
+private func == (lhs: IntRange, rhs: IntRange) -> Bool {
     return lhs.range == rhs.range
 }
 
-
 // MARK: Classes for testing polymorphic collections.
 
-
-private class A: PolymorphicSerializable, Hashable, Comparable, Equatable, CustomStringConvertible
-{
+private class A: PolymorphicSerializable, Hashable, Comparable, Equatable, CustomStringConvertible {
     let name: String
 
-    init(name: String)
-    {
+    init(name: String) {
         self.name = name
     }
 
-    func serialize<T: Serializer>(to serializer: T)
-    {
+    func serialize<T: Serializer>(to serializer: T) {
         serializer.beginAggregate(1)
         serializer.serialize(name)
         serializer.endAggregate()
     }
 
-    required init(from deserializer: any Deserializer) throws
-    {
+    required init(from deserializer: any Deserializer) throws {
         try deserializer.beginAggregate(1)
         self.name = try deserializer.deserialize()
     }
 
-    static let implementations: [SerializableTypeCode : any PolymorphicSerializable.Type] = [
+    static let implementations: [SerializableTypeCode: any PolymorphicSerializable.Type] = [
         0: A.self,
         1: B.self,
         2: C.self,
@@ -743,8 +713,7 @@ private class A: PolymorphicSerializable, Hashable, Comparable, Equatable, Custo
         hasher.combine(name)
     }
 
-    func equals(_ other: A) -> Bool
-    {
+    func equals(_ other: A) -> Bool {
         return self.name == other.name
     }
 
@@ -755,31 +724,26 @@ private class A: PolymorphicSerializable, Hashable, Comparable, Equatable, Custo
     public var description: String { return "<A:\(name)>" }
 }
 
-private func ==(lhs: A, rhs: A) -> Bool
-{
+private func == (lhs: A, rhs: A) -> Bool {
     return lhs.equals(rhs)
 }
 
-private final class B: A
-{
+private final class B: A {
     let number: Int
 
-    init(name: String, number: Int)
-    {
+    init(name: String, number: Int) {
         self.number = number
         super.init(name: name)
     }
 
-    override func serialize<T: Serializer>(to serializer: T)
-    {
+    override func serialize<T: Serializer>(to serializer: T) {
         serializer.beginAggregate(2)
         serializer.serialize(number)
         super.serialize(to: serializer)
         serializer.endAggregate()
     }
 
-    required init(from deserializer: any Deserializer) throws
-    {
+    required init(from deserializer: any Deserializer) throws {
         try deserializer.beginAggregate(2)
         self.number = try deserializer.deserialize()
         try super.init(from: deserializer)
@@ -790,8 +754,7 @@ private final class B: A
         hasher.combine(number)
     }
 
-    func equals(_ other: B) -> Bool
-    {
+    func equals(_ other: B) -> Bool {
         guard super.equals(other) else { return false }
         return self.number == other.number
     }
@@ -799,26 +762,22 @@ private final class B: A
     public override var description: String { return "<B:\(name):\(number)>" }
 }
 
-private final class C: A
-{
+private final class C: A {
     let truth: Bool
 
-    init(name: String, truth: Bool)
-    {
+    init(name: String, truth: Bool) {
         self.truth = truth
         super.init(name: name)
     }
 
-    override func serialize<T: Serializer>(to serializer: T)
-    {
+    override func serialize<T: Serializer>(to serializer: T) {
         serializer.beginAggregate(2)
         serializer.serialize(truth)
         super.serialize(to: serializer)
         serializer.endAggregate()
     }
 
-    required init(from deserializer: any Deserializer) throws
-    {
+    required init(from deserializer: any Deserializer) throws {
         try deserializer.beginAggregate(2)
         self.truth = try deserializer.deserialize()
         try super.init(from: deserializer)
@@ -829,8 +788,7 @@ private final class C: A
         hasher.combine(truth)
     }
 
-    func equals(_ other: C) -> Bool
-    {
+    func equals(_ other: C) -> Bool {
         guard super.equals(other) else { return false }
         return self.truth == other.truth
     }
@@ -838,12 +796,9 @@ private final class C: A
     public override var description: String { return "<C:\(name):\(truth)>" }
 }
 
-
 // MARK: Class to test serializing optional values.
 
-
-private struct OptionalTester: Serializable, Equatable
-{
+private struct OptionalTester: Serializable, Equatable {
     // Serializable?
     var stringOne: String?
     var stringTwo: String?
@@ -876,16 +831,24 @@ private struct OptionalTester: Serializable, Equatable
     var objDictFive: [A: A]?
     var objDictSix: [A: A]?
 
-    init(_ stringOne: String? = nil, _ stringTwo: String? = nil,
-         _ arrayOne: [Int]? = nil, _ arrayTwo: [Int]? = nil,
-         _ dictOne: [String: Int]? = nil, _ dictTwo: [String: Int]? = nil,
-         _ objectOne: A? = nil, _ objectTwo: A? = nil,
-         _ objArrayOne: [A]? = nil, _ objArrayTwo: [A]? = nil,
-         _ objDictOne: [String: A]? = nil, _ objDictTwo: [String: A]? = nil,
-         _ objDictThree: [A: Int]? = nil, _ objDictFour: [A: Int]? = nil,
-         _ objDictFive: [A: A]? = nil, _ objDictSix: [A: A]? = nil
-    )
-    {
+    init(
+        _ stringOne: String? = nil,
+        _ stringTwo: String? = nil,
+        _ arrayOne: [Int]? = nil,
+        _ arrayTwo: [Int]? = nil,
+        _ dictOne: [String: Int]? = nil,
+        _ dictTwo: [String: Int]? = nil,
+        _ objectOne: A? = nil,
+        _ objectTwo: A? = nil,
+        _ objArrayOne: [A]? = nil,
+        _ objArrayTwo: [A]? = nil,
+        _ objDictOne: [String: A]? = nil,
+        _ objDictTwo: [String: A]? = nil,
+        _ objDictThree: [A: Int]? = nil,
+        _ objDictFour: [A: Int]? = nil,
+        _ objDictFive: [A: A]? = nil,
+        _ objDictSix: [A: A]? = nil
+    ) {
         self.stringOne = stringOne
         self.stringTwo = stringTwo
         self.arrayOne = arrayOne
@@ -904,8 +867,7 @@ private struct OptionalTester: Serializable, Equatable
         self.objDictSix = objDictSix
     }
 
-    func serialize<T: Serializer>(to serializer: T)
-    {
+    func serialize<T: Serializer>(to serializer: T) {
         serializer.beginAggregate(16)
         serializer.serialize(stringOne)
         serializer.serialize(stringTwo)
@@ -926,8 +888,7 @@ private struct OptionalTester: Serializable, Equatable
         serializer.endAggregate()
     }
 
-    init(from deserializer: any Deserializer) throws
-    {
+    init(from deserializer: any Deserializer) throws {
         try deserializer.beginAggregate(16)
         self.stringOne = try deserializer.deserialize()
         self.stringTwo = try deserializer.deserialize()
@@ -948,10 +909,8 @@ private struct OptionalTester: Serializable, Equatable
     }
 }
 
-private func ==(lhs: OptionalTester, rhs: OptionalTester) -> Bool
-{
-    func optionalArraysAreEqual<T: Equatable>(_ lhoa: [T]?, _ rhoa: [T]?) -> Bool
-    {
+private func == (lhs: OptionalTester, rhs: OptionalTester) -> Bool {
+    func optionalArraysAreEqual<T: Equatable>(_ lhoa: [T]?, _ rhoa: [T]?) -> Bool {
         switch (lhoa, rhoa)
         {
         case let (lha?, rha?): return lha == rha
@@ -960,8 +919,7 @@ private func ==(lhs: OptionalTester, rhs: OptionalTester) -> Bool
         }
     }
 
-    func optionalDictionariesAreEqual<T, U: Equatable>(_ lhod: [T: U]?, _ rhod: [T: U]?) -> Bool
-    {
+    func optionalDictionariesAreEqual<T, U: Equatable>(_ lhod: [T: U]?, _ rhod: [T: U]?) -> Bool {
         switch (lhod, rhod)
         {
         case let (lhd?, rhd?): return lhd == rhd
@@ -989,155 +947,130 @@ private func ==(lhs: OptionalTester, rhs: OptionalTester) -> Bool
     return true
 }
 
-
 // MARK: Classes to test serializing custom objects.
 // Conceptually this is a simple log hierarchy.
 // FIXME: I would like to get a Dictionary in here too.
 
-
-private class TestLogEntry: PolymorphicSerializable, Equatable
-{
+private class TestLogEntry: PolymorphicSerializable, Equatable {
     let title: String
 
-    init(_ title: String)
-    {
+    init(_ title: String) {
         self.title = title
     }
 
-    func serialize<T: Serializer>(to serializer: T)
-    {
+    func serialize<T: Serializer>(to serializer: T) {
         serializer.beginAggregate(1)
         serializer.serialize(title)
         serializer.endAggregate()
     }
 
-    required init(from deserializer: any Deserializer) throws
-    {
+    required init(from deserializer: any Deserializer) throws {
         try deserializer.beginAggregate(1)
         self.title = try deserializer.deserialize()
     }
 
-    static let implementations: [SerializableTypeCode : any PolymorphicSerializable.Type] = [
+    static let implementations: [SerializableTypeCode: any PolymorphicSerializable.Type] = [
         0: TestLogEntry.self,
         1: TestLogHeader.self,
         2: TestLogSection.self,
     ]
 
-    func equals(_ other: TestLogEntry) -> Bool
-    {
+    func equals(_ other: TestLogEntry) -> Bool {
         return self.title == other.title
     }
 }
 
-private func ==(lhs: TestLogEntry, rhs: TestLogEntry) -> Bool
-{
+private func == (lhs: TestLogEntry, rhs: TestLogEntry) -> Bool {
     return lhs.equals(rhs)
 }
 
-private final class TestLogHeader: TestLogEntry
-{
+private final class TestLogHeader: TestLogEntry {
     var subsections: [TestLogEntry]
 
-    override init(_ title: String)
-    {
+    override init(_ title: String) {
         subsections = [TestLogEntry]()
         super.init(title)
     }
 
     func addEntry(_ entry: TestLogEntry) { subsections.append(entry) }
 
-    override func serialize<T: Serializer>(to serializer: T)
-    {
+    override func serialize<T: Serializer>(to serializer: T) {
         serializer.beginAggregate(2)
         serializer.serialize(subsections)
         super.serialize(to: serializer)
         serializer.endAggregate()
     }
 
-    required init(from deserializer: any Deserializer) throws
-    {
+    required init(from deserializer: any Deserializer) throws {
         try deserializer.beginAggregate(2)
         self.subsections = try deserializer.deserialize()
         try super.init(from: deserializer)
     }
 
-    override func equals(_ other: TestLogEntry) -> Bool
-    {
+    override func equals(_ other: TestLogEntry) -> Bool {
         guard super.equals(other) else { return false }
-        if let otherHeader = other as? TestLogHeader
-        {
+        if let otherHeader = other as? TestLogHeader {
             return subsections == otherHeader.subsections
         }
         return false
     }
 }
 
-private final class TestLogSection: TestLogEntry
-{
+private final class TestLogSection: TestLogEntry {
     var messages: [TestLogMessage]
 
-    override init(_ title: String)
-    {
+    override init(_ title: String) {
         messages = [TestLogMessage]()
         super.init(title)
     }
 
     func addMessage(_ message: TestLogMessage) { messages.append(message) }
 
-    override func serialize<T: Serializer>(to serializer: T)
-    {
+    override func serialize<T: Serializer>(to serializer: T) {
         serializer.beginAggregate(2)
         serializer.serialize(messages)
         super.serialize(to: serializer)
         serializer.endAggregate()
     }
 
-    required init(from deserializer: any Deserializer) throws
-    {
+    required init(from deserializer: any Deserializer) throws {
         try deserializer.beginAggregate(2)
         self.messages = try deserializer.deserialize()
         try super.init(from: deserializer)
     }
 
-    override func equals(_ other: TestLogEntry) -> Bool
-    {
+    override func equals(_ other: TestLogEntry) -> Bool {
         guard super.equals(other) else { return false }
-        if let otherSection = other as? TestLogSection
-        {
+        if let otherSection = other as? TestLogSection {
             return messages == otherSection.messages
         }
         return false
     }
 }
 
-private enum TestLogMessageType: String
-{
+private enum TestLogMessageType: String {
     case error
     case warning
     case note
 }
 
-private final class TestLogMessage: Serializable, Equatable
-{
+private final class TestLogMessage: Serializable, Equatable {
     let type: TestLogMessageType
     let message: String
 
-    init(type: TestLogMessageType, message: String)
-    {
+    init(type: TestLogMessageType, message: String) {
         self.type = type
         self.message = message
     }
 
-    func serialize<T: Serializer>(to serializer: T)
-    {
+    func serialize<T: Serializer>(to serializer: T) {
         serializer.beginAggregate(2)
         serializer.serialize(type.rawValue)
         serializer.serialize(message)
         serializer.endAggregate()
     }
 
-    init(from deserializer: any Deserializer) throws
-    {
+    init(from deserializer: any Deserializer) throws {
         try deserializer.beginAggregate(2)
         guard let type = TestLogMessageType(rawValue: try deserializer.deserialize()) else { throw DeserializerError.deserializationFailed("Invalid TestLogMessageType.") }
         self.type = type
@@ -1145,7 +1078,6 @@ private final class TestLogMessage: Serializable, Equatable
     }
 }
 
-private func ==(lhs: TestLogMessage, rhs: TestLogMessage) -> Bool
-{
+private func == (lhs: TestLogMessage, rhs: TestLogMessage) -> Bool {
     return lhs.type == rhs.type && lhs.message == rhs.message
 }
diff --git a/Tests/SWBUtilTests/OrderedSetTests.swift b/Tests/SWBUtilTests/OrderedSetTests.swift
index dca44d42..4e94eab0 100644
--- a/Tests/SWBUtilTests/OrderedSetTests.swift
+++ b/Tests/SWBUtilTests/OrderedSetTests.swift
@@ -122,8 +122,7 @@ import struct SWBUtil.OrderedSet
 
         // Iterate over the objects and add them to an array.
         var array = [String]()
-        for str in set
-        {
+        for str in set {
             array.append(str)
         }
         #expect(array == ["two", "six", "five", "seven", "one"])
diff --git a/Tests/SWBUtilTests/PathTests.swift b/Tests/SWBUtilTests/PathTests.swift
index 3d704983..6e601b2c 100644
--- a/Tests/SWBUtilTests/PathTests.swift
+++ b/Tests/SWBUtilTests/PathTests.swift
@@ -214,8 +214,7 @@ fileprivate struct PathTests {
         #expect(Path("/foo").isAncestorOrEqual(of: Path("/foo/bar")))
 
         // Array<Path>.ancestors
-        #expect([Path("/path/to/input/one"), Path("/path/to/input/two"), Path("/path/to/input/two/subfolder")].ancestors ==
-                Set([Path("/"), Path("/path"), Path("/path/to"), Path("/path/to/input"), Path("/path/to/input/two")]))
+        #expect([Path("/path/to/input/one"), Path("/path/to/input/two"), Path("/path/to/input/two/subfolder")].ancestors == Set([Path("/"), Path("/path"), Path("/path/to"), Path("/path/to/input"), Path("/path/to/input/two")]))
         #expect([Path("/")].ancestors == [])
         #expect([Path("/path"), Path("/secondPath")].ancestors == [Path("/")])
         let emptyList: [Path] = []
@@ -294,12 +293,12 @@ fileprivate struct PathTests {
         #expect(!Path("/foo/bar/baz").ends(with: "/baz"))
         #expect(Path("foo/bar/baz").ends(with: "bar/baz"))
         #expect(!Path("foo/bar/baz").ends(with: "/bar/baz"))
-        #expect(!Path("foo/bar/baz").ends(with: "/baz"))            // A relative path can't end with an absolute path
+        #expect(!Path("foo/bar/baz").ends(with: "/baz"))  // A relative path can't end with an absolute path
         #expect(Path("foo/bar/baz").ends(with: "foo/bar/baz"))
         #expect(!Path("foo/bar/baz").ends(with: "/foo/bar/baz"))
         #expect(!Path("foo/bar/baz").ends(with: "foo/bar"))
         #expect(!Path("foo/bar/baz").ends(with: "quux"))
-        #expect(Path("foo/bar/baz").ends(with: "baz/"))             // The trailing slash is removed
+        #expect(Path("foo/bar/baz").ends(with: "baz/"))  // The trailing slash is removed
         #expect(!Path("foo/bar/baz").ends(with: "bar/"))
     }
 
@@ -394,7 +393,7 @@ fileprivate struct PathTestsPlatformSpecific {
     }
     @Test(.requireHostOS(.windows))
     func conformantPathsWindows() {
-        let reservedCharacterString = "<>:|*?" + String((00...31).map({Character(UnicodeScalar($0))}))
+        let reservedCharacterString = "<>:|*?" + String((00...31).map({ Character(UnicodeScalar($0)) }))
         var conformantRoots = ["C:\\", "Z:\\", "\\\\server\\", "\\\\?\\Volume{123456789}\\"]
         // Windows path separators
         conformantRoots.forEach { root in
diff --git a/Tests/SWBUtilTests/ProcessTests.swift b/Tests/SWBUtilTests/ProcessTests.swift
index 9c7e837d..282871ed 100644
--- a/Tests/SWBUtilTests/ProcessTests.swift
+++ b/Tests/SWBUtilTests/ProcessTests.swift
@@ -70,10 +70,10 @@ fileprivate struct ProcessTests {
         #expect(String(decoding: output3, as: UTF8.self) == previous + .newline)
 
         // Failing on Windows due to https://github.com/apple/swift-corelibs-foundation/issues/5071
-#if !os(Windows)
-        let (_, output4, _) = try await Process.getShellOutput({ host in host == .windows ? "echo %CD%" : "echo $PWD" }, currentDirectoryURL: URL(fileURLWithPath: Path.root.str))
-        #expect(String(decoding: output4, as: UTF8.self) == Path.root.str + .newline)
-#endif
+        #if !os(Windows)
+            let (_, output4, _) = try await Process.getShellOutput({ host in host == .windows ? "echo %CD%" : "echo $PWD" }, currentDirectoryURL: URL(fileURLWithPath: Path.root.str))
+            #expect(String(decoding: output4, as: UTF8.self) == Path.root.str + .newline)
+        #endif
 
         try await withThrowingTaskGroup(of: Void.self) { group in
             for i in 0..<100 {
@@ -83,10 +83,10 @@ fileprivate struct ProcessTests {
                         #expect(String(decoding: output3, as: UTF8.self) == previous + .newline)
                     } else {
                         // Failing on Windows due to https://github.com/apple/swift-corelibs-foundation/issues/5071
-#if !os(Windows)
-                        let (_, output4, _) = try await Process.getShellOutput({ host in host == .windows ? "echo %CD%" : "echo $PWD" }, currentDirectoryURL: URL(fileURLWithPath: Path.root.str))
-                        #expect(String(decoding: output4, as: UTF8.self) == Path.root.str + .newline)
-#endif
+                        #if !os(Windows)
+                            let (_, output4, _) = try await Process.getShellOutput({ host in host == .windows ? "echo %CD%" : "echo $PWD" }, currentDirectoryURL: URL(fileURLWithPath: Path.root.str))
+                            #expect(String(decoding: output4, as: UTF8.self) == Path.root.str + .newline)
+                        #endif
                     }
                 }
             }
@@ -111,24 +111,24 @@ fileprivate struct ProcessTests {
             let mainCPath = tmpDir.join("main.c").str
             let exePath = tmpDir.join("exe").str
             let source =
-            """
-            #ifdef _WIN32
-            #include <windows.h>
-            #include <processthreadsapi.h>
-            #else
-            #include <sys/types.h>
-            #include <signal.h>
-            #include <unistd.h>
-            #endif
-            int main() {
+                """
                 #ifdef _WIN32
-                TerminateProcess(GetCurrentProcess(), 0xC0000009); // STATUS_BAD_INITIAL_STACK
+                #include <windows.h>
+                #include <processthreadsapi.h>
                 #else
-                kill(getpid(), SIGKILL); // ignore-unacceptable-language; POSIX API
+                #include <sys/types.h>
+                #include <signal.h>
+                #include <unistd.h>
                 #endif
-                return 0;
-            }
-            """
+                int main() {
+                    #ifdef _WIN32
+                    TerminateProcess(GetCurrentProcess(), 0xC0000009); // STATUS_BAD_INITIAL_STACK
+                    #else
+                    kill(getpid(), SIGKILL); // ignore-unacceptable-language; POSIX API
+                    #endif
+                    return 0;
+                }
+                """
             try source.write(to: URL(fileURLWithPath: mainCPath), atomically: true, encoding: .utf8)
             let _ = try await runHostProcess(["clang", "-o", exePath, mainCPath])
 
@@ -146,57 +146,57 @@ fileprivate struct ProcessTests {
 
     @Test
     func exitStatus() throws {
-#if !os(Windows)
-        #expect(Processes.ExitStatus(rawValue: -2) == .uncaughtSignal(126))
-        #expect(Processes.ExitStatus(rawValue: -1) == nil)
-        #expect(Processes.ExitStatus(rawValue: 0) == .exit(0))
-        #expect(Processes.ExitStatus(rawValue: 1) == .uncaughtSignal(SIGHUP))
-
-        #expect(Processes.ExitStatus(rawValue: 126) == .uncaughtSignal(126))
-        #expect(Processes.ExitStatus(rawValue: 127) == nil)
-        #expect(Processes.ExitStatus(rawValue: 128) == .exit(0))
-
-        // POSIX
-        #expect(Processes.ExitStatus(rawValue: 129) == .uncaughtSignal(SIGHUP))    // 1
-        #expect(Processes.ExitStatus(rawValue: 130) == .uncaughtSignal(SIGINT))    // 2
-        #expect(Processes.ExitStatus(rawValue: 131) == .uncaughtSignal(SIGQUIT))   // 3
-        #expect(Processes.ExitStatus(rawValue: 132) == .uncaughtSignal(SIGILL))    // 4
-        #expect(Processes.ExitStatus(rawValue: 133) == .uncaughtSignal(SIGTRAP))   // 5
-        #expect(Processes.ExitStatus(rawValue: 134) == .uncaughtSignal(SIGABRT))   // 6; aka SIGIOT
-        #expect(Processes.ExitStatus(rawValue: 136) == .uncaughtSignal(SIGFPE))    // 8
-        #expect(Processes.ExitStatus(rawValue: 137) == .uncaughtSignal(SIGKILL))   // 9
-        #expect(Processes.ExitStatus(rawValue: 139) == .uncaughtSignal(SIGSEGV))   // 11
-        #expect(Processes.ExitStatus(rawValue: 141) == .uncaughtSignal(SIGPIPE))   // 13
-        #expect(Processes.ExitStatus(rawValue: 142) == .uncaughtSignal(SIGALRM))   // 14
-        #expect(Processes.ExitStatus(rawValue: 143) == .uncaughtSignal(SIGTERM))   // 15
-
-        #expect(Processes.ExitStatus(rawValue: 160) == .uncaughtSignal(32))
-
-        #expect(Processes.ExitStatus(rawValue: 254) == .uncaughtSignal(126))
-        #expect(Processes.ExitStatus(rawValue: 255) == nil)
-        #expect(Processes.ExitStatus(rawValue: 256) == .exit(1))
-        #expect(Processes.ExitStatus(rawValue: 257) == .uncaughtSignal(1))
-
-        #expect(Processes.ExitStatus(rawValue: 510) == .uncaughtSignal(126))
-        #expect(Processes.ExitStatus(rawValue: 511) == nil)
-        #expect(Processes.ExitStatus(rawValue: 512) == .exit(2))
-        #expect(Processes.ExitStatus(rawValue: 513) == .uncaughtSignal(1))
-
-        #expect(Processes.ExitStatus(rawValue: 766) == .uncaughtSignal(126))
-        #expect(Processes.ExitStatus(rawValue: 767) == nil)
-        #expect(Processes.ExitStatus(rawValue: 768) == .exit(3))
-        #expect(Processes.ExitStatus(rawValue: 769) == .uncaughtSignal(1))
-
-        #expect(Processes.ExitStatus(rawValue: 1022) == .uncaughtSignal(126))
-        #expect(Processes.ExitStatus(rawValue: 1023) == nil)
-        #expect(Processes.ExitStatus(rawValue: 1024) == .exit(4))
-        #expect(Processes.ExitStatus(rawValue: 1025) == .uncaughtSignal(1))
-
-        #expect(Processes.ExitStatus(rawValue: 65278) == .uncaughtSignal(126))
-        #expect(Processes.ExitStatus(rawValue: 65279) == nil)
-        #expect(Processes.ExitStatus(rawValue: 65280) == .exit(255))
-        #expect(Processes.ExitStatus(rawValue: 65281) == .uncaughtSignal(1))
-#endif
+        #if !os(Windows)
+            #expect(Processes.ExitStatus(rawValue: -2) == .uncaughtSignal(126))
+            #expect(Processes.ExitStatus(rawValue: -1) == nil)
+            #expect(Processes.ExitStatus(rawValue: 0) == .exit(0))
+            #expect(Processes.ExitStatus(rawValue: 1) == .uncaughtSignal(SIGHUP))
+
+            #expect(Processes.ExitStatus(rawValue: 126) == .uncaughtSignal(126))
+            #expect(Processes.ExitStatus(rawValue: 127) == nil)
+            #expect(Processes.ExitStatus(rawValue: 128) == .exit(0))
+
+            // POSIX
+            #expect(Processes.ExitStatus(rawValue: 129) == .uncaughtSignal(SIGHUP))  // 1
+            #expect(Processes.ExitStatus(rawValue: 130) == .uncaughtSignal(SIGINT))  // 2
+            #expect(Processes.ExitStatus(rawValue: 131) == .uncaughtSignal(SIGQUIT))  // 3
+            #expect(Processes.ExitStatus(rawValue: 132) == .uncaughtSignal(SIGILL))  // 4
+            #expect(Processes.ExitStatus(rawValue: 133) == .uncaughtSignal(SIGTRAP))  // 5
+            #expect(Processes.ExitStatus(rawValue: 134) == .uncaughtSignal(SIGABRT))  // 6; aka SIGIOT
+            #expect(Processes.ExitStatus(rawValue: 136) == .uncaughtSignal(SIGFPE))  // 8
+            #expect(Processes.ExitStatus(rawValue: 137) == .uncaughtSignal(SIGKILL))  // 9
+            #expect(Processes.ExitStatus(rawValue: 139) == .uncaughtSignal(SIGSEGV))  // 11
+            #expect(Processes.ExitStatus(rawValue: 141) == .uncaughtSignal(SIGPIPE))  // 13
+            #expect(Processes.ExitStatus(rawValue: 142) == .uncaughtSignal(SIGALRM))  // 14
+            #expect(Processes.ExitStatus(rawValue: 143) == .uncaughtSignal(SIGTERM))  // 15
+
+            #expect(Processes.ExitStatus(rawValue: 160) == .uncaughtSignal(32))
+
+            #expect(Processes.ExitStatus(rawValue: 254) == .uncaughtSignal(126))
+            #expect(Processes.ExitStatus(rawValue: 255) == nil)
+            #expect(Processes.ExitStatus(rawValue: 256) == .exit(1))
+            #expect(Processes.ExitStatus(rawValue: 257) == .uncaughtSignal(1))
+
+            #expect(Processes.ExitStatus(rawValue: 510) == .uncaughtSignal(126))
+            #expect(Processes.ExitStatus(rawValue: 511) == nil)
+            #expect(Processes.ExitStatus(rawValue: 512) == .exit(2))
+            #expect(Processes.ExitStatus(rawValue: 513) == .uncaughtSignal(1))
+
+            #expect(Processes.ExitStatus(rawValue: 766) == .uncaughtSignal(126))
+            #expect(Processes.ExitStatus(rawValue: 767) == nil)
+            #expect(Processes.ExitStatus(rawValue: 768) == .exit(3))
+            #expect(Processes.ExitStatus(rawValue: 769) == .uncaughtSignal(1))
+
+            #expect(Processes.ExitStatus(rawValue: 1022) == .uncaughtSignal(126))
+            #expect(Processes.ExitStatus(rawValue: 1023) == nil)
+            #expect(Processes.ExitStatus(rawValue: 1024) == .exit(4))
+            #expect(Processes.ExitStatus(rawValue: 1025) == .uncaughtSignal(1))
+
+            #expect(Processes.ExitStatus(rawValue: 65278) == .uncaughtSignal(126))
+            #expect(Processes.ExitStatus(rawValue: 65279) == nil)
+            #expect(Processes.ExitStatus(rawValue: 65280) == .exit(255))
+            #expect(Processes.ExitStatus(rawValue: 65281) == .uncaughtSignal(1))
+        #endif
     }
 }
 
diff --git a/Tests/SWBUtilTests/PropertyListTests.swift b/Tests/SWBUtilTests/PropertyListTests.swift
index 3bd3f5e1..b1dfc174 100644
--- a/Tests/SWBUtilTests/PropertyListTests.swift
+++ b/Tests/SWBUtilTests/PropertyListTests.swift
@@ -191,8 +191,7 @@ import SWBUtil
             let bytes: [UInt8]
             do {
                 bytes = try plist.asBytes(.xml)
-            }
-            catch {
+            } catch {
                 Issue.record()
                 return
             }
@@ -214,8 +213,7 @@ import SWBUtil
             let bytes: [UInt8]
             do {
                 bytes = try plist.asBytes(.binary)
-            }
-            catch {
+            } catch {
                 Issue.record()
                 return
             }
@@ -440,7 +438,7 @@ import SWBUtil
             "double": .plDouble(5.3),
             "array": .plArray([
                 .plString("foo"),
-                .plString("bar")
+                .plString("bar"),
             ]),
             "dict": .plDict([
                 "bar": .plString("trap!"),
@@ -458,16 +456,16 @@ import SWBUtil
                     "d": .plDict([
                         "z": .plInt(2),
                         "a": .plInt(1),
-                    ])
+                    ]),
                 ]),
                 .plArray([
                     .plDict([
                         "n": .plInt(1),
                         "s": .plInt(3),
                         "q": .plInt(2),
-                    ]),
+                    ])
                 ]),
-            ]),
+            ])
         ])
         #expect(nestedPlistDict.deterministicDescription == "PLDict<[\"array\": PLArray<[PLDict<[\"d\": PLDict<[\"a\": 1, \"z\": 2]>, \"m\": 2, \"x\": 3]>, PLArray<[PLDict<[\"n\": 1, \"q\": 2, \"s\": 3]>]>]>]>")
     }
@@ -496,7 +494,7 @@ import SWBUtil
                     ]),
                     "localhost": .plDict([
                         "NSExceptionMinimumTLSVersion": .plString("TLSv1.2")
-                    ])
+                    ]),
                 ])
             ])
         ])
diff --git a/Tests/SWBUtilTests/RegistryTests.swift b/Tests/SWBUtilTests/RegistryTests.swift
index f21dd22c..39bd3a40 100644
--- a/Tests/SWBUtilTests/RegistryTests.swift
+++ b/Tests/SWBUtilTests/RegistryTests.swift
@@ -14,7 +14,7 @@ import Foundation
 import Testing
 import SWBUtil
 
-@Suite fileprivate struct RegistryTests  {
+@Suite fileprivate struct RegistryTests {
 
     // Basic test class for use as a registry value.
     final class TestValueClass: Equatable, Sendable {
@@ -23,14 +23,14 @@ import SWBUtil
             self.label = label
         }
 
-        static func ==(lhs: TestValueClass, rhs: TestValueClass) -> Bool {
+        static func == (lhs: TestValueClass, rhs: TestValueClass) -> Bool {
             return lhs.label == rhs.label
         }
     }
 
     @Test
     func registryFunctionality() {
-        let registry = Registry<String,TestValueClass>()
+        let registry = Registry<String, TestValueClass>()
         #expect(registry["missing"] == nil)
 
         // Do a lookup-and-insert of a key that shouldn't already be in the registry.
diff --git a/Tests/SWBUtilTests/ResponseFileTests.swift b/Tests/SWBUtilTests/ResponseFileTests.swift
index 9dfe569b..3bb14884 100644
--- a/Tests/SWBUtilTests/ResponseFileTests.swift
+++ b/Tests/SWBUtilTests/ResponseFileTests.swift
@@ -58,12 +58,15 @@ import SWBUtil
             try localFS.write(tmpDir.join("a.resp"), contents: "-foo -bar -baz")
             try localFS.write(tmpDir.join("b.resp"), contents: "-b @a.resp")
             try localFS.write(tmpDir.join("c.resp"), contents: "-foo @c.resp")
-            try localFS.write(tmpDir.join("d.resp"), contents: """
-            // comment
-            -foo -bar -baz
-            // comment two
-            -path '/path/with space' @b.resp
-            """)
+            try localFS.write(
+                tmpDir.join("d.resp"),
+                contents: """
+                    // comment
+                    -foo -bar -baz
+                    // comment two
+                    -path '/path/with space' @b.resp
+                    """
+            )
             try #expect(ResponseFiles.expandResponseFiles(["-first", "@a.resp", "-last"], fileSystem: localFS, relativeTo: tmpDir, format: .unixShellQuotedSpaceSeparated) == ["-first", "-foo", "-bar", "-baz", "-last"])
             try #expect(ResponseFiles.expandResponseFiles(["-first", "@b.resp", "-last"], fileSystem: localFS, relativeTo: tmpDir, format: .unixShellQuotedSpaceSeparated) == ["-first", "-b", "-foo", "-bar", "-baz", "-last"])
             #expect(throws: (any Error).self) {
diff --git a/Tests/SWBUtilTests/SignaturesTests.swift b/Tests/SWBUtilTests/SignaturesTests.swift
index ca93d8fd..f12ca3c0 100644
--- a/Tests/SWBUtilTests/SignaturesTests.swift
+++ b/Tests/SWBUtilTests/SignaturesTests.swift
@@ -62,12 +62,14 @@ fileprivate struct SignaturesTests {
                 Issue.record("Expected an error to be thrown, but it was not.")
             } catch let CodeSignatureInfo.Error.codesignVerificationFailed(description, output) {
                 #expect(description == "A sealed resource is missing or invalid")
-                #expect(try output.split(separator: "\n").filter { line in
-                    try #/--(prepared|validated):/.+/Contents/Frameworks/libclang_rt\.(asan|tsan|ubsan)_osx_dynamic\.dylib/#.wholeMatch(in: line) == nil
-                } == [
-                    "\(bundlePath.str): a sealed resource is missing or invalid",
-                    "file added: \(bundlePath.str)/Info-Copy.plist"
-                ])
+                #expect(
+                    try output.split(separator: "\n").filter { line in
+                        try #/--(prepared|validated):/.+/Contents/Frameworks/libclang_rt\.(asan|tsan|ubsan)_osx_dynamic\.dylib/#.wholeMatch(in: line) == nil
+                    } == [
+                        "\(bundlePath.str): a sealed resource is missing or invalid",
+                        "file added: \(bundlePath.str)/Info-Copy.plist",
+                    ]
+                )
             } catch {
                 Issue.record(error)
             }
diff --git a/Tests/SWBUtilTests/StringTests.swift b/Tests/SWBUtilTests/StringTests.swift
index b14d0d34..1c0b51f9 100644
--- a/Tests/SWBUtilTests/StringTests.swift
+++ b/Tests/SWBUtilTests/StringTests.swift
@@ -42,7 +42,7 @@ import SWBUtil
         }
 
         do {
-            let array = [UInt8]([0xc3, 0x28]) // invalid UTF-8
+            let array = [UInt8]([0xc3, 0x28])  // invalid UTF-8
             let slice = array[...]
             #expect(array.asReadableString() == "[195, 40]")
             #expect(slice.asReadableString() == "[195, 40]")
@@ -158,8 +158,8 @@ import SWBUtil
         #expect("|a^b&c|".asLegalCIdentifier == "_a_b_c_")
 
         // String with combining characters whose representations differ in NFC and NFD forms.
-        #expect(String(bytes: [0x6F, 0x6F, 0xCC, 0x84, 0x6F], encoding: .utf8)?.asLegalCIdentifier == "o_o") // oōo, NFD (decomposed) form
-        #expect(String(bytes: [0x6F, 0xC5, 0x8D,       0x6F], encoding: .utf8)?.asLegalCIdentifier == "o_o") // oōo, NFC (precomposed) form
+        #expect(String(bytes: [0x6F, 0x6F, 0xCC, 0x84, 0x6F], encoding: .utf8)?.asLegalCIdentifier == "o_o")  // oōo, NFD (decomposed) form
+        #expect(String(bytes: [0x6F, 0xC5, 0x8D, 0x6F], encoding: .utf8)?.asLegalCIdentifier == "o_o")  // oōo, NFC (precomposed) form
     }
 
     @Test
@@ -183,8 +183,8 @@ import SWBUtil
         #expect("|a^b&c|".asLegalRfc1034Identifier == "-a-b-c-")
 
         // String with combining characters whose representations differ in NFC and NFD forms.
-        #expect(String(bytes: [0x6F, 0x6F, 0xCC, 0x84, 0x6F], encoding: .utf8)?.asLegalRfc1034Identifier == "o-o") // oōo, NFD (decomposed) form
-        #expect(String(bytes: [0x6F, 0xC5, 0x8D,       0x6F], encoding: .utf8)?.asLegalRfc1034Identifier == "o-o") // oōo, NFC (precomposed) form
+        #expect(String(bytes: [0x6F, 0x6F, 0xCC, 0x84, 0x6F], encoding: .utf8)?.asLegalRfc1034Identifier == "o-o")  // oōo, NFD (decomposed) form
+        #expect(String(bytes: [0x6F, 0xC5, 0x8D, 0x6F], encoding: .utf8)?.asLegalRfc1034Identifier == "o-o")  // oōo, NFC (precomposed) form
     }
 
     @Test
@@ -210,8 +210,8 @@ import SWBUtil
         #expect("|a^b&c|".asLegalBundleIdentifier == "-a-b-c-")
 
         // String with combining characters whose representations differ in NFC and NFD forms.
-        #expect(String(bytes: [0x6F, 0x6F, 0xCC, 0x84, 0x6F], encoding: .utf8)?.asLegalBundleIdentifier == "o-o") // oōo, NFD (decomposed) form
-        #expect(String(bytes: [0x6F, 0xC5, 0x8D,       0x6F], encoding: .utf8)?.asLegalBundleIdentifier == "o-o") // oōo, NFC (precomposed) form
+        #expect(String(bytes: [0x6F, 0x6F, 0xCC, 0x84, 0x6F], encoding: .utf8)?.asLegalBundleIdentifier == "o-o")  // oōo, NFD (decomposed) form
+        #expect(String(bytes: [0x6F, 0xC5, 0x8D, 0x6F], encoding: .utf8)?.asLegalBundleIdentifier == "o-o")  // oōo, NFC (precomposed) form
     }
 
     @Test
@@ -237,8 +237,8 @@ import SWBUtil
         #expect("|a^b&c|".mangledToC99ExtendedIdentifier() == "_a_b_c_")
 
         // String with combining characters whose representations differ in NFC and NFD forms.
-        #expect(String(bytes: [0x6F, 0x6F, 0xCC, 0x84, 0x6F], encoding: .utf8)?.mangledToC99ExtendedIdentifier() == "oōo") // oōo, NFD (decomposed) form
-        #expect(String(bytes: [0x6F, 0xC5, 0x8D,       0x6F], encoding: .utf8)?.mangledToC99ExtendedIdentifier() == "oōo") // oōo, NFC (precomposed) form
+        #expect(String(bytes: [0x6F, 0x6F, 0xCC, 0x84, 0x6F], encoding: .utf8)?.mangledToC99ExtendedIdentifier() == "oōo")  // oōo, NFD (decomposed) form
+        #expect(String(bytes: [0x6F, 0xC5, 0x8D, 0x6F], encoding: .utf8)?.mangledToC99ExtendedIdentifier() == "oōo")  // oōo, NFC (precomposed) form
 
         // Test the mutating version...
         var s = "-ab"
@@ -265,8 +265,8 @@ import SWBUtil
         // String with combining characters whose representations differ in NFC and NFD forms.
         // Note that it doesn't matter which form the literal "o\\ōo" that we check against is in;
         // (though it happens to be NFC) that's the whole point of Unicode canonical equivalence.
-        #expect(String(bytes: [0x6F, 0x6F, 0xCC, 0x84, 0x6F], encoding: .utf8)?.escaped == "o\\ōo") // oōo, NFD (decomposed) form
-        #expect(String(bytes: [0x6F, 0xC5, 0x8D,       0x6F], encoding: .utf8)?.escaped == "o\\ōo") // oōo, NFC (precomposed) form
+        #expect(String(bytes: [0x6F, 0x6F, 0xCC, 0x84, 0x6F], encoding: .utf8)?.escaped == "o\\ōo")  // oōo, NFD (decomposed) form
+        #expect(String(bytes: [0x6F, 0xC5, 0x8D, 0x6F], encoding: .utf8)?.escaped == "o\\ōo")  // oōo, NFC (precomposed) form
     }
 
     @Test
@@ -293,14 +293,14 @@ import SWBUtil
         #expect(String(decodingBytes: [], as: Unicode.UTF32.self) == "")
 
         // Wrong length
-        #expect(String(decodingBytes: [0x00], as: Unicode.UTF16.self) == nil) // not a multiple of UTF16.CodeUnit byte width (2)
-        #expect(String(decodingBytes: [0x00], as: Unicode.UTF32.self) == nil) // not a multiple of UTF32.CodeUnit byte width (4)
+        #expect(String(decodingBytes: [0x00], as: Unicode.UTF16.self) == nil)  // not a multiple of UTF16.CodeUnit byte width (2)
+        #expect(String(decodingBytes: [0x00], as: Unicode.UTF32.self) == nil)  // not a multiple of UTF32.CodeUnit byte width (4)
 
         // Invalid content
-        #expect(String(decodingBytes: [0xD8, 0x00], as: Unicode.UTF16.self) == nil) // unpaired surrogate
-        #expect(String(decodingBytes: [0x00, 0x41, 0xD8, 0x00], as: Unicode.UTF16.self) == nil) // unpaired surrogate
-        #expect(String(decodingBytes: [0x00, 0x00, 0xD8, 0x00], as: Unicode.UTF32.self) == nil) // unpaired surrogate
-        #expect(String(decodingBytes: [0x00, 0x11, 0x00, 0x00], as: Unicode.UTF32.self) == nil) // out of range (max scalar = U+10FFFF)
+        #expect(String(decodingBytes: [0xD8, 0x00], as: Unicode.UTF16.self) == nil)  // unpaired surrogate
+        #expect(String(decodingBytes: [0x00, 0x41, 0xD8, 0x00], as: Unicode.UTF16.self) == nil)  // unpaired surrogate
+        #expect(String(decodingBytes: [0x00, 0x00, 0xD8, 0x00], as: Unicode.UTF32.self) == nil)  // unpaired surrogate
+        #expect(String(decodingBytes: [0x00, 0x11, 0x00, 0x00], as: Unicode.UTF32.self) == nil)  // out of range (max scalar = U+10FFFF)
 
         // BOMs are still valid text and shouldn't be stripped
         #expect(String(decodingBytes: [0xEF, 0xBB, 0xBF], as: Unicode.UTF8.self) == "\u{FEFF}")
@@ -309,7 +309,7 @@ import SWBUtil
         #expect(String(decodingBytes: [0xFF, 0xFE], as: Unicode.UTF16.self) == "\u{FFFE}")
         #expect(String(decodingBytes: [0x00, 0x00, 0xFE, 0xFF], as: Unicode.UTF32.self) == "\u{FEFF}")
         #expect(String(decodingBytes: [0xFF, 0xFE, 0x00, 0x00], as: Unicode.UTF32.self, byteSwap: true) == "\u{FEFF}")
-        #expect(String(decodingBytes: [0xFF, 0xFE, 0x00, 0x00], as: Unicode.UTF32.self) == nil) // out of Unicode range
+        #expect(String(decodingBytes: [0xFF, 0xFE, 0x00, 0x00], as: Unicode.UTF32.self) == nil)  // out of Unicode range
 
         // Trailing NULLs preserved
         #expect(String(decodingBytes: [0x41, 0x00], as: Unicode.UTF8.self) == "A\0")
diff --git a/Tests/SWBUtilTests/TAPIFileListTests.swift b/Tests/SWBUtilTests/TAPIFileListTests.swift
index e6d23370..23dd204f 100644
--- a/Tests/SWBUtilTests/TAPIFileListTests.swift
+++ b/Tests/SWBUtilTests/TAPIFileListTests.swift
@@ -17,112 +17,138 @@ import Testing
 @Suite fileprivate struct TAPIFileListTests {
     @Test
     func basics() throws {
-        #expect(ByteString(try TAPIFileList(version: .v1, headers: []).asBytes()) == """
-{
-  "headers" : [
+        #expect(
+            ByteString(try TAPIFileList(version: .v1, headers: []).asBytes()) == """
+                {
+                  "headers" : [
 
-  ],
-  "version" : "1"
-}
-""")
+                  ],
+                  "version" : "1"
+                }
+                """
+        )
 
-        #expect(ByteString(try TAPIFileList(version: .v2, headers: []).asBytes()) == """
-{
-  "headers" : [
+        #expect(
+            ByteString(try TAPIFileList(version: .v2, headers: []).asBytes()) == """
+                {
+                  "headers" : [
 
-  ],
-  "version" : "2"
-}
-""")
+                  ],
+                  "version" : "2"
+                }
+                """
+        )
 
-        let listNoProject = try TAPIFileList(version: .v1, headers: [
-            (.public, Path.root.join("usr/include/public.h").str),
-            (.private, Path.root.join("usr/local/include/private.h").str),
-        ])
-        #expect(ByteString(try listNoProject.asBytes()) == """
-{
-  "headers" : [
-    {
-      "path" : "\(Path.root.join("usr/include/public.h").str.escapedForJSON)",
-      "type" : "public"
-    },
-    {
-      "path" : "\(Path.root.join("usr/local/include/private.h").str.escapedForJSON)",
-      "type" : "private"
-    }
-  ],
-  "version" : "1"
-}
-""")
+        let listNoProject = try TAPIFileList(
+            version: .v1,
+            headers: [
+                (.public, Path.root.join("usr/include/public.h").str),
+                (.private, Path.root.join("usr/local/include/private.h").str),
+            ]
+        )
+        #expect(
+            ByteString(try listNoProject.asBytes()) == """
+                {
+                  "headers" : [
+                    {
+                      "path" : "\(Path.root.join("usr/include/public.h").str.escapedForJSON)",
+                      "type" : "public"
+                    },
+                    {
+                      "path" : "\(Path.root.join("usr/local/include/private.h").str.escapedForJSON)",
+                      "type" : "private"
+                    }
+                  ],
+                  "version" : "1"
+                }
+                """
+        )
     }
 
     /// Tests that file lists are serialized with their headers in the same order as they are given.
     @Test
     func preserveDeclarationOrder() throws {
-        let list = try TAPIFileList(version: .v2, headers: [
-            (.project, Path.root.join("foo/car").str),
-            (.public, Path.root.join("foo/bar").str),
-            (.private, Path.root.join("foo/aar").str),
-        ])
-        #expect(ByteString(try list.asBytes()) == """
-{
-  "headers" : [
-    {
-      "path" : "\(Path.root.join("foo/car").str.escapedForJSON)",
-      "type" : "project"
-    },
-    {
-      "path" : "\(Path.root.join("foo/bar").str.escapedForJSON)",
-      "type" : "public"
-    },
-    {
-      "path" : "\(Path.root.join("foo/aar").str.escapedForJSON)",
-      "type" : "private"
-    }
-  ],
-  "version" : "2"
-}
-""")
+        let list = try TAPIFileList(
+            version: .v2,
+            headers: [
+                (.project, Path.root.join("foo/car").str),
+                (.public, Path.root.join("foo/bar").str),
+                (.private, Path.root.join("foo/aar").str),
+            ]
+        )
+        #expect(
+            ByteString(try list.asBytes()) == """
+                {
+                  "headers" : [
+                    {
+                      "path" : "\(Path.root.join("foo/car").str.escapedForJSON)",
+                      "type" : "project"
+                    },
+                    {
+                      "path" : "\(Path.root.join("foo/bar").str.escapedForJSON)",
+                      "type" : "public"
+                    },
+                    {
+                      "path" : "\(Path.root.join("foo/aar").str.escapedForJSON)",
+                      "type" : "private"
+                    }
+                  ],
+                  "version" : "2"
+                }
+                """
+        )
     }
 
     @Test
     func errorHandling() throws {
         #expect {
-            try TAPIFileList(version: .v1, headers: [
-                (.public, Path.root.join("usr/include/public.h").str),
-                (.private, Path.root.join("usr/local/include/private.h").str),
-                (.project, Path.root.join("Users/$USER/include/project.h").str),
-            ])
+            try TAPIFileList(
+                version: .v1,
+                headers: [
+                    (.public, Path.root.join("usr/include/public.h").str),
+                    (.private, Path.root.join("usr/local/include/private.h").str),
+                    (.project, Path.root.join("Users/$USER/include/project.h").str),
+                ]
+            )
         } throws: { error in
             error as? TAPIFileListError == TAPIFileListError.unsupportedHeaderVisibility
         }
 
         // OK in v2
-        let _ = try TAPIFileList(version: .v2, headers: [
-            (.public, Path.root.join("usr/include/public.h").str),
-            (.private, Path.root.join("usr/local/include/private.h").str),
-            (.project, Path.root.join("Users/$USER/include/project.h").str),
-        ])
+        let _ = try TAPIFileList(
+            version: .v2,
+            headers: [
+                (.public, Path.root.join("usr/include/public.h").str),
+                (.private, Path.root.join("usr/local/include/private.h").str),
+                (.project, Path.root.join("Users/$USER/include/project.h").str),
+            ]
+        )
 
         // Same path with different visibilities is an error
         #expect {
-            try TAPIFileList(version: .v2, headers: [
-                (.public, Path.root.join("usr/include/public.h").str),
-                (.private, Path.root.join("usr/include/public.h").str),
-                (.private, Path.root.join("usr/include/private.h").str),
-                (.project, Path.root.join("Users/$USER/include/project.h").str),
-            ])
+            try TAPIFileList(
+                version: .v2,
+                headers: [
+                    (.public, Path.root.join("usr/include/public.h").str),
+                    (.private, Path.root.join("usr/include/public.h").str),
+                    (.private, Path.root.join("usr/include/private.h").str),
+                    (.project, Path.root.join("Users/$USER/include/project.h").str),
+                ]
+            )
         } throws: { error in
             error as? TAPIFileListError == TAPIFileListError.duplicateEntry(path: Path.root.join("usr/include/public.h").str, visibilities: Set([.public, .private]))
         }
 
         // These have set semantics; duplicate entries aren't a problem if they aren't ambiguous
-        let _ = try TAPIFileList(version: .v2, headers: [
-            (.public, Path.root.join("usr/include/public.h").str),
-            (.public, Path.root.join("usr/include/public.h").str),
-            (.private, Path.root.join("usr/local/include/private.h").str),
-            (.project, Path.root.join("Users/$USER/include/project.h").str),
-        ])
+        let _ = try TAPIFileList(
+            version: .v2,
+            headers: [
+                (.public, Path.root.join("usr/include/public.h").str),
+                (.public, Path.root.join("usr/include/public.h").str),
+                (.private, Path.root.join("usr/local/include/private.h").str),
+                (.project, Path.root.join("Users/$USER/include/project.h").str),
+            ]
+        )
     }
 
     @Test
@@ -133,7 +159,7 @@ import Testing
 
     @Test
     func versioning() throws {
-        #expect(try TAPIFileList.FormatVersion.v1.requiredTAPIVersion == FuzzyVersion("0")) // v1 supported since "forever"
+        #expect(try TAPIFileList.FormatVersion.v1.requiredTAPIVersion == FuzzyVersion("0"))  // v1 supported since "forever"
         #expect(try TAPIFileList.FormatVersion.v2.requiredTAPIVersion == FuzzyVersion("1100.*.2.1"))
 
         #expect(TAPIFileList.FormatVersion.latestSupported(forTAPIVersion: Version(1100, 0, 2, 1)) == .v2)
diff --git a/Tests/SWBUtilTests/VFSTests.swift b/Tests/SWBUtilTests/VFSTests.swift
index 57613090..604d5647 100644
--- a/Tests/SWBUtilTests/VFSTests.swift
+++ b/Tests/SWBUtilTests/VFSTests.swift
@@ -28,40 +28,47 @@ import Testing
             vfs.addMapping(path, externalContents: target)
         }
 
-        #expect(try vfs.toVFSOverlay().propertyListItem.asJSONFragment().asString == PropertyList.fromJSONData(ByteString("""
-            {
-              "version": 0,
-              "case-sensitive": "false",
-              "roots": [
-                {
-                  "type": "directory",
-                  "name": "\(Path.root.join("tmp/A/Z").str.escapedForJSON)",
-                  "contents": [
-                    {
-                      "type": "file",
-                      "name": "module.modulemap",
-                      "external-contents": "\(Path.root.join("tmp/module.modulemap").str.escapedForJSON)"
-                    }
-                  ]
-                },
-                {
-                  "type": "directory",
-                  "name": "\(Path.root.join("tmp/A").str.escapedForJSON)",
-                  "contents": [
-                    {
-                      "type": "file",
-                      "name": "Bar.h",
-                      "external-contents": "\(Path.root.join("tmp/Bar.h").str.escapedForJSON)"
-                    },
-                    {
-                      "type": "file",
-                      "name": "Foo.h",
-                      "external-contents": "\(Path.root.join("tmp/Foo.h").str.escapedForJSON)"
-                    }
-                  ]
-                }
-              ]
-            }\n
-            """)).asJSONFragment().asString)
+        #expect(
+            try vfs.toVFSOverlay().propertyListItem.asJSONFragment().asString
+                == PropertyList.fromJSONData(
+                    ByteString(
+                        """
+                        {
+                          "version": 0,
+                          "case-sensitive": "false",
+                          "roots": [
+                            {
+                              "type": "directory",
+                              "name": "\(Path.root.join("tmp/A/Z").str.escapedForJSON)",
+                              "contents": [
+                                {
+                                  "type": "file",
+                                  "name": "module.modulemap",
+                                  "external-contents": "\(Path.root.join("tmp/module.modulemap").str.escapedForJSON)"
+                                }
+                              ]
+                            },
+                            {
+                              "type": "directory",
+                              "name": "\(Path.root.join("tmp/A").str.escapedForJSON)",
+                              "contents": [
+                                {
+                                  "type": "file",
+                                  "name": "Bar.h",
+                                  "external-contents": "\(Path.root.join("tmp/Bar.h").str.escapedForJSON)"
+                                },
+                                {
+                                  "type": "file",
+                                  "name": "Foo.h",
+                                  "external-contents": "\(Path.root.join("tmp/Foo.h").str.escapedForJSON)"
+                                }
+                              ]
+                            }
+                          ]
+                        }\n
+                        """
+                    )
+                ).asJSONFragment().asString
+        )
     }
 }
diff --git a/Tests/SWBUtilTests/VersionTests.swift b/Tests/SWBUtilTests/VersionTests.swift
index 96c46f88..ae91a84d 100644
--- a/Tests/SWBUtilTests/VersionTests.swift
+++ b/Tests/SWBUtilTests/VersionTests.swift
@@ -271,7 +271,7 @@ import SWBTestSupport
         }
     }
 
-    @Test(.requireHostOS(.macOS)) // swift-foundation has "Unsupported until __PlistDictionaryDecoder is available", which seems to apply only to top-level dictionaries (but not arrays)
+    @Test(.requireHostOS(.macOS))  // swift-foundation has "Unsupported until __PlistDictionaryDecoder is available", which seems to apply only to top-level dictionaries (but not arrays)
     func decodable() throws {
         func checkError(_ error: any Error) -> Bool {
             switch error {
@@ -287,11 +287,15 @@ import SWBTestSupport
         #expect(try decoder.decode(Version.self, from: "15".data(using: .utf8)!) == Version("15"))
         #expect(try decoder.decode(Version.self, from: "15.2.1".data(using: .utf8)!) == Version("15.2.1"))
 
-        #expect("Version should have thrown an error decoding.", performing: {
-            try decoder.decode(Version.self, from: "15a.wer".data(using: .utf8)!)
-        }, throws: { error in
-            checkError(error)
-        })
+        #expect(
+            "Version should have thrown an error decoding.",
+            performing: {
+                try decoder.decode(Version.self, from: "15a.wer".data(using: .utf8)!)
+            },
+            throws: { error in
+                checkError(error)
+            }
+        )
     }
 
     @Test
diff --git a/Tests/SWBUtilTests/XCBuildDataArchiveTests.swift b/Tests/SWBUtilTests/XCBuildDataArchiveTests.swift
index 4e1fbed6..30741f3d 100644
--- a/Tests/SWBUtilTests/XCBuildDataArchiveTests.swift
+++ b/Tests/SWBUtilTests/XCBuildDataArchiveTests.swift
@@ -16,55 +16,55 @@ import SWBUtil
 import Testing
 
 #if canImport(AppleArchive)
-@Suite fileprivate struct XCBuildDataArchiveTests {
-    @Test
-    func appendBuildDataSerial() async throws {
-        try await withTemporaryDirectory { tmpDir in
-            let archive = XCBuildDataArchive(filePath: tmpDir.join("XCBuildData.aar"))
+    @Suite fileprivate struct XCBuildDataArchiveTests {
+        @Test
+        func appendBuildDataSerial() async throws {
+            try await withTemporaryDirectory { tmpDir in
+                let archive = XCBuildDataArchive(filePath: tmpDir.join("XCBuildData.aar"))
 
-            let uuids = try (0..<3).map { _ -> UUID in
-                let uuid = UUID()
-                let dir = tmpDir.join(UUID().description).join("XCBuildData")
-                try localFS.createDirectory(dir, recursive: true)
-                try localFS.write(dir.join("manifest.json"), contents: "manifest")
-                try archive.appendBuildDataDirectory(from: dir, uuid: uuid)
-                return uuid
-            }
+                let uuids = try (0..<3).map { _ -> UUID in
+                    let uuid = UUID()
+                    let dir = tmpDir.join(UUID().description).join("XCBuildData")
+                    try localFS.createDirectory(dir, recursive: true)
+                    try localFS.write(dir.join("manifest.json"), contents: "manifest")
+                    try archive.appendBuildDataDirectory(from: dir, uuid: uuid)
+                    return uuid
+                }
 
-            let output = try await runProcess(["/usr/bin/yaa", "list", "-i", archive.archiveFilePath.str])
-            #expect(output.split(separator: "\n").map(String.init) == uuids.flatMap { [$0.description, "\($0)/manifest.json"] })
+                let output = try await runProcess(["/usr/bin/yaa", "list", "-i", archive.archiveFilePath.str])
+                #expect(output.split(separator: "\n").map(String.init) == uuids.flatMap { [$0.description, "\($0)/manifest.json"] })
+            }
         }
-    }
 
-    @Test
-    func appendBuildDataConcurrent() async throws {
-        try await withTemporaryDirectory { tmpDir in
-            let archive = XCBuildDataArchive(filePath: tmpDir.join("XCBuildData.aar"))
+        @Test
+        func appendBuildDataConcurrent() async throws {
+            try await withTemporaryDirectory { tmpDir in
+                let archive = XCBuildDataArchive(filePath: tmpDir.join("XCBuildData.aar"))
 
-            let uuids = try await Array(0..<3).asyncMap { _ -> UUID in
-                let uuid = UUID()
-                let dir = tmpDir.join(UUID().description).join("XCBuildData")
-                try localFS.createDirectory(dir, recursive: true)
-                try localFS.write(dir.join("manifest.json"), contents: "manifest")
-                try archive.appendBuildDataDirectory(from: dir, uuid: uuid)
-                return uuid
-            }
+                let uuids = try await Array(0..<3).asyncMap { _ -> UUID in
+                    let uuid = UUID()
+                    let dir = tmpDir.join(UUID().description).join("XCBuildData")
+                    try localFS.createDirectory(dir, recursive: true)
+                    try localFS.write(dir.join("manifest.json"), contents: "manifest")
+                    try archive.appendBuildDataDirectory(from: dir, uuid: uuid)
+                    return uuid
+                }
 
-            let output = try await runProcess(["/usr/bin/yaa", "list", "-i", archive.archiveFilePath.str])
-            #expect(output.split(separator: "\n").map(String.init).sorted() == uuids.flatMap { [$0.description, "\($0)/manifest.json"] }.sorted())
+                let output = try await runProcess(["/usr/bin/yaa", "list", "-i", archive.archiveFilePath.str])
+                #expect(output.split(separator: "\n").map(String.init).sorted() == uuids.flatMap { [$0.description, "\($0)/manifest.json"] }.sorted())
+            }
         }
-    }
 
-    @Test
-    func badInput() throws {
-        #expect {
-            try withTemporaryDirectory { tmpDir in
-                let archive = XCBuildDataArchive(filePath: tmpDir.join("XCBuildData.aar"))
-                try archive.appendBuildDataDirectory(from: Path("/tmp"), uuid: UUID())
+        @Test
+        func badInput() throws {
+            #expect {
+                try withTemporaryDirectory { tmpDir in
+                    let archive = XCBuildDataArchive(filePath: tmpDir.join("XCBuildData.aar"))
+                    try archive.appendBuildDataDirectory(from: Path("/tmp"), uuid: UUID())
+                }
+            } throws: { error in
+                error as? StubError == .error("/tmp is not an XCBuildData directory")
             }
-        } throws: { error in
-            error as? StubError == .error("/tmp is not an XCBuildData directory")
         }
     }
-}
 #endif
diff --git a/Tests/SWBWebAssemblyPlatformTests/SWBWebAssemblyPlatformTests.swift b/Tests/SWBWebAssemblyPlatformTests/SWBWebAssemblyPlatformTests.swift
index 3f1eddc1..a4a66546 100644
--- a/Tests/SWBWebAssemblyPlatformTests/SWBWebAssemblyPlatformTests.swift
+++ b/Tests/SWBWebAssemblyPlatformTests/SWBWebAssemblyPlatformTests.swift
@@ -22,7 +22,8 @@ fileprivate struct SWBWebAssemblyPlatformTests: CoreBasedTests {
     @Test(
         .requireSDKs(.wasi),
         .skipXcodeToolchain,
-        arguments: ["wasm32"], [true, false]
+        arguments: ["wasm32"],
+        [true, false]
     )
     func wasiCommandWithSwift(arch: String, enableTestability: Bool) async throws {
         let sdkroot = try await #require(getCore().loadSDK(llvmTargetTripleSys: "wasi")).path.str
@@ -36,18 +37,22 @@ fileprivate struct SWBWebAssemblyPlatformTests: CoreBasedTests {
                     children: [
                         TestFile("main.swift"),
                         TestFile("static.swift"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ARCHS": arch,
-                        "CODE_SIGNING_ALLOWED": "NO",
-                        "DEFINES_MODULE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": sdkroot,
-                        "SWIFT_VERSION": "6.0",
-                        "SUPPORTED_PLATFORMS": "webassembly",
-                        "ENABLE_TESTABILITY": enableTestability ? "YES" : "NO"
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ARCHS": arch,
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "DEFINES_MODULE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": sdkroot,
+                            "SWIFT_VERSION": "6.0",
+                            "SUPPORTED_PLATFORMS": "webassembly",
+                            "ENABLE_TESTABILITY": enableTestability ? "YES" : "NO",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -59,27 +64,31 @@ fileprivate struct SWBWebAssemblyPlatformTests: CoreBasedTests {
                         buildPhases: [
                             TestSourcesBuildPhase(["main.swift"]),
                             TestFrameworksBuildPhase([
-                                TestBuildFile(.target("staticlib")),
-                            ])
+                                TestBuildFile(.target("staticlib"))
+                            ]),
                         ],
                         dependencies: [
-                            "staticlib",
+                            "staticlib"
                         ]
                     ),
                     TestStandardTarget(
                         "staticlib",
                         type: .staticLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                // FIXME: Find a way to make these default
-                                "EXECUTABLE_PREFIX": "lib",
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    // FIXME: Find a way to make these default
+                                    "EXECUTABLE_PREFIX": "lib"
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["static.swift"]),
+                            TestSourcesBuildPhase(["static.swift"])
                         ]
                     ),
-                ])
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
@@ -124,7 +133,7 @@ fileprivate struct SWBWebAssemblyPlatformTests: CoreBasedTests {
                         "-resource-dir", .suffix("usr/lib/swift_static/clang"),
                         .suffix("usr/lib/swift_static/wasi/static-executable-args.lnk"),
                         "-lstaticlib",
-                        "-o", .path(tmpDir.join("build/Debug-webassembly/tool"))
+                        "-o", .path(tmpDir.join("build/Debug-webassembly/tool")),
                     ])
                 }
             }
@@ -145,17 +154,21 @@ fileprivate struct SWBWebAssemblyPlatformTests: CoreBasedTests {
                         TestFile("main.c"),
                         TestFile("static1.c"),
                         TestFile("static2.cpp"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ARCHS": arch,
-                        "CODE_SIGNING_ALLOWED": "NO",
-                        "DEFINES_MODULE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": sdkroot,
-                        "SWIFT_VERSION": "6.0",
-                        "SUPPORTED_PLATFORMS": "webassembly",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ARCHS": arch,
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "DEFINES_MODULE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": sdkroot,
+                            "SWIFT_VERSION": "6.0",
+                            "SUPPORTED_PLATFORMS": "webassembly",
+                        ]
+                    )
                 ],
                 targets: [
                     // FIXME: C-based executable targets are not yet supported due to
@@ -183,16 +196,20 @@ fileprivate struct SWBWebAssemblyPlatformTests: CoreBasedTests {
                         "Cstaticlib",
                         type: .staticLibrary,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                // FIXME: Find a way to make these default
-                                "EXECUTABLE_PREFIX": "lib",
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    // FIXME: Find a way to make these default
+                                    "EXECUTABLE_PREFIX": "lib"
+                                ]
+                            )
                         ],
                         buildPhases: [
-                            TestSourcesBuildPhase(["static1.c", "static2.cpp"]),
+                            TestSourcesBuildPhase(["static1.c", "static2.cpp"])
                         ]
-                    ),
-                ])
+                    )
+                ]
+            )
             let core = try await getCore()
             let tester = try await BuildOperationTester(core, testProject, simulated: false)
 
diff --git a/Tests/SWBWindowsPlatformTests/SWBWindowsPlatformTests.swift b/Tests/SWBWindowsPlatformTests/SWBWindowsPlatformTests.swift
index 23140d3e..05b4a6c1 100644
--- a/Tests/SWBWindowsPlatformTests/SWBWindowsPlatformTests.swift
+++ b/Tests/SWBWindowsPlatformTests/SWBWindowsPlatformTests.swift
@@ -19,9 +19,9 @@ import SWBMacro
 
 @Suite fileprivate struct CommandLineToolSpecDiscoveredInfoTests: CoreBasedTests {
     // Linker tool discovery is a bit more complex as it afffected by the ALTERNATE_LINKER build setting.
-    func ldMacroTable() async throws ->  MacroValueAssignmentTable {
-            let core = try await getCore()
-            return MacroValueAssignmentTable(namespace: core.specRegistry.internalMacroNamespace)
+    func ldMacroTable() async throws -> MacroValueAssignmentTable {
+        let core = try await getCore()
+        return MacroValueAssignmentTable(namespace: core.specRegistry.internalMacroNamespace)
     }
 
     @Test(.requireSDKs(.windows))
diff --git a/Tests/SwiftBuildPerfTests/BuildOperationPerfTests.swift b/Tests/SwiftBuildPerfTests/BuildOperationPerfTests.swift
index 48654582..6df934d4 100644
--- a/Tests/SwiftBuildPerfTests/BuildOperationPerfTests.swift
+++ b/Tests/SwiftBuildPerfTests/BuildOperationPerfTests.swift
@@ -42,39 +42,49 @@ fileprivate struct BuildOperationPerfTests: PerfTests {
                     }
                 }
 
-                let targets = (0 ..< numTargets).map { i in
+                let targets = (0..<numTargets).map { i in
                     return TestStandardTarget(
-                        "Tool-\(i)", type: .commandLineTool,
+                        "Tool-\(i)",
+                        type: .commandLineTool,
                         buildPhases: [
-                            TestSourcesBuildPhase((0 ..< numFiles).map{ TestBuildFile("File-\($0).c") }),
-                            TestFrameworksBuildPhase()
+                            TestSourcesBuildPhase((0..<numFiles).map { TestBuildFile("File-\($0).c") }),
+                            TestFrameworksBuildPhase(),
                         ],
                         provisioningSourceData: [
                             SWBProtocol.ProvisioningSourceData(
                                 configurationName: "Debug",
                                 provisioningStyle: .manual,
-                                bundleIdentifierFromInfoPlist: "$(PRODUCT_BUNDLE_IDENTIFIER)")])
+                                bundleIdentifierFromInfoPlist: "$(PRODUCT_BUNDLE_IDENTIFIER)"
+                            )
+                        ]
+                    )
                 }
-                let allTarget = TestAggregateTarget("ALL", dependencies: targets.map{ $0.name })
+                let allTarget = TestAggregateTarget("ALL", dependencies: targets.map { $0.name })
                 let testProject = TestProject(
                     "aProject",
                     defaultConfigurationName: "Debug",
-                    groupTree: TestGroup("Root", children: (0 ..< numFiles).map{ TestFile("File-\($0).c") }),
-                    buildConfigurations: [TestBuildConfiguration(
-                        "Debug",
-                        buildSettings: [
-                            "USE_HEADERMAP": "NO",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                        ])],
-                    targets: [allTarget] + targets)
-                let testWorkspace = TestWorkspace("aWorkspace",
-                                                  sourceRoot: tmpDir.join("Test"),
-                                                  projects: [testProject])
+                    groupTree: TestGroup("Root", children: (0..<numFiles).map { TestFile("File-\($0).c") }),
+                    buildConfigurations: [
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "USE_HEADERMAP": "NO",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                            ]
+                        )
+                    ],
+                    targets: [allTarget] + targets
+                )
+                let testWorkspace = TestWorkspace(
+                    "aWorkspace",
+                    sourceRoot: tmpDir.join("Test"),
+                    projects: [testProject]
+                )
                 let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
                 // Write the header files.
                 if !separateHeaders {
-                    for i in 0 ..< numHeaders {
+                    for i in 0..<numHeaders {
                         try await localFS.writeFileContents(SRCROOT.join("Header-\(i).h")) { contents in
                             if i + 1 < numHeaders {
                                 contents <<< "#include \"Header-\(i + 1).h\"\n"
@@ -84,9 +94,9 @@ fileprivate struct BuildOperationPerfTests: PerfTests {
                 }
 
                 // Write the source files.
-                for i in 0 ..< numFiles {
+                for i in 0..<numFiles {
                     if separateHeaders {
-                        for j in 0 ..< numHeaders {
+                        for j in 0..<numHeaders {
                             try await localFS.writeFileContents(SRCROOT.join("File-\(i)-\(j).h")) { contents in
                                 if j + 1 < numHeaders {
                                     contents <<< "#include \"File-\(i)-\(j + 1).h\"\n"
@@ -136,12 +146,15 @@ fileprivate struct BuildOperationPerfTests: PerfTests {
                 do {
                     let events = try await testSession.runBuildOperation(request: request, delegate: TestBuildOperationDelegate())
                     let reportedBuildDescriptionID = try #require(events.reportBuildDescriptionMessage?.buildDescriptionID)
-                    #expect(events.allOutput().bytes.unsafeStringValue.hasPrefix(
-                """
-                Build description signature: \(reportedBuildDescriptionID)
-                Build description path: \(SRCROOT.str)/build/XCBuildData/\(reportedBuildDescriptionID).xcbuilddata
+                    #expect(
+                        events.allOutput().bytes.unsafeStringValue.hasPrefix(
+                            """
+                            Build description signature: \(reportedBuildDescriptionID)
+                            Build description path: \(SRCROOT.str)/build/XCBuildData/\(reportedBuildDescriptionID).xcbuilddata
 
-                """))
+                            """
+                        )
+                    )
 
                     try await tester.checkResults(events: events) { results in
                         results.checkTasks { tasks in
@@ -154,19 +167,21 @@ fileprivate struct BuildOperationPerfTests: PerfTests {
                         results.checkNoFailedTasks()
                     }
 
-                    #expect(events.filter { event in
-                        switch event {
-                        case .targetUpToDate:
-                            return true
-                        default:
-                            return false
-                        }
-                    }.count == 0)
+                    #expect(
+                        events.filter { event in
+                            switch event {
+                            case .targetUpToDate:
+                                return true
+                            default:
+                                return false
+                            }
+                        }.count == 0
+                    )
                 }
 
                 // Check the performance of the null build.
                 try await measure {
-                    for _ in 0 ..< (getEnvironmentVariable("CI")?.boolValue == true ? 1 : iterations) {
+                    for _ in 0..<(getEnvironmentVariable("CI")?.boolValue == true ? 1 : iterations) {
                         let events = try await testSession.runBuildOperation(request: request, delegate: TestBuildOperationDelegate())
 
                         try await tester.checkResults(events: events) { results in
@@ -180,14 +195,16 @@ fileprivate struct BuildOperationPerfTests: PerfTests {
                         }
 
                         #expect(events.allOutput().bytes == "")
-                        #expect(events.filter { event in
-                            switch event {
-                            case .targetUpToDate:
-                                return true
-                            default:
-                                return false
-                            }
-                        }.count == numTargets)
+                        #expect(
+                            events.filter { event in
+                                switch event {
+                                case .targetUpToDate:
+                                    return true
+                                default:
+                                    return false
+                                }
+                            }.count == numTargets
+                        )
                     }
                 }
             }
diff --git a/Tests/SwiftBuildPerfTests/BuildServicePerfTests.swift b/Tests/SwiftBuildPerfTests/BuildServicePerfTests.swift
index ac958d74..e9fa803c 100644
--- a/Tests/SwiftBuildPerfTests/BuildServicePerfTests.swift
+++ b/Tests/SwiftBuildPerfTests/BuildServicePerfTests.swift
@@ -96,7 +96,7 @@ fileprivate struct BuildServicePerfTests: PerfTests {
                 "guid": "W1",
                 "name": "aWorkspace",
                 "path": "/tmp/aWorkspace.xcworkspace/contents.xcworkspacedata",
-                "projects": ["P1"]
+                "projects": ["P1"],
             ]
             let projectPIF: SWBPropertyListItem = [
                 "guid": "P1",
@@ -106,7 +106,7 @@ fileprivate struct BuildServicePerfTests: PerfTests {
                     "type": "group",
                     "name": "SomeFiles",
                     "sourceTree": "PROJECT_DIR",
-                    "path": "/tmp/SomeProject/SomeFiles"
+                    "path": "/tmp/SomeProject/SomeFiles",
                 ],
                 "buildConfigurations": [
                     [
@@ -114,12 +114,12 @@ fileprivate struct BuildServicePerfTests: PerfTests {
                         "name": "Config1",
                         "buildSettings": [
                             "USER_PROJECT_SETTING": "USER_PROJECT_VALUE"
-                        ]
+                        ],
                     ]
                 ],
                 "targets": ["T1"],
                 "defaultConfigurationName": "Config1",
-                "developmentRegion": "English"
+                "developmentRegion": "English",
             ]
             let targetPIF: SWBPropertyListItem = [
                 "guid": "T1",
@@ -128,7 +128,7 @@ fileprivate struct BuildServicePerfTests: PerfTests {
                 "productTypeIdentifier": "com.apple.product-type.application",
                 "productReference": [
                     "guid": "PR1",
-                    "name": "MyApp.app"
+                    "name": "MyApp.app",
                 ],
                 "buildPhases": [],
                 "buildConfigurations": [
@@ -137,28 +137,28 @@ fileprivate struct BuildServicePerfTests: PerfTests {
                         "name": "Config1",
                         "buildSettings": [
                             "PRODUCT_NAME": "MyApp"
-                        ]
+                        ],
                     ]
                 ],
                 "dependencies": [],
-                "buildRules": []
+                "buildRules": [],
             ]
             let topLevelPIF: SWBPropertyListItem = [
                 [
                     "type": "workspace",
                     "signature": "W1",
-                    "contents": workspacePIF
+                    "contents": workspacePIF,
                 ],
                 [
                     "type": "project",
                     "signature": "P1",
-                    "contents": projectPIF
+                    "contents": projectPIF,
                 ],
                 [
                     "type": "target",
                     "signature": "T1",
-                    "contents": targetPIF
-                ]
+                    "contents": targetPIF,
+                ],
             ]
 
             try await session.sendPIF(topLevelPIF)
diff --git a/Tests/SwiftBuildPerfTests/XCFrameworkPerfTests.swift b/Tests/SwiftBuildPerfTests/XCFrameworkPerfTests.swift
index 3dde134d..305b9566 100644
--- a/Tests/SwiftBuildPerfTests/XCFrameworkPerfTests.swift
+++ b/Tests/SwiftBuildPerfTests/XCFrameworkPerfTests.swift
@@ -97,7 +97,7 @@ fileprivate struct XCFrameworkCreationPerfTests: CoreBasedTests, PerfTests {
                     "App",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug"),
+                        TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["main.swift"]),
@@ -113,26 +113,33 @@ fileprivate struct XCFrameworkCreationPerfTests: CoreBasedTests, PerfTests {
                         children: [
                             TestFile("main.swift"),
                             TestFile("sample.xcframework"),
-                            TestFile("Info.plist")
-                        ]),
+                            TestFile("Info.plist"),
+                        ]
+                    ),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ALWAYS_SEARCH_USER_PATHS": "NO",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "CODE_SIGN_IDENTITY": "-",
-                            "ARCHS": "x86_64",
-                            "SWIFT_VERSION": "5",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "CODE_SIGN_IDENTITY": "-",
+                                "ARCHS": "x86_64",
+                                "SWIFT_VERSION": "5",
+                            ]
+                        )
                     ],
                     targets: [
                         // Test building an app which links and embeds an xcframework.
-                        testTarget,
-                    ])
+                        testTarget
+                    ]
+                )
 
-                let testWorkspace = TestWorkspace("aWorkspace",
-                                                  sourceRoot: tmpDir.join("Test"),
-                                                  projects: [testProject])
+                let testWorkspace = TestWorkspace(
+                    "aWorkspace",
+                    sourceRoot: tmpDir.join("Test"),
+                    projects: [testProject]
+                )
                 let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
                 let tester = try await CoreQualificationTester(testWorkspace, testSession, fs: fs)
@@ -175,14 +182,16 @@ fileprivate struct XCFrameworkCreationPerfTests: CoreBasedTests, PerfTests {
                         results.checkNoFailedTasks()
                     }
 
-                    #expect(events.filter { event in
-                        switch event {
-                        case .targetUpToDate:
-                            return true
-                        default:
-                            return false
-                        }
-                    }.count == 0)
+                    #expect(
+                        events.filter { event in
+                            switch event {
+                            case .targetUpToDate:
+                                return true
+                            default:
+                                return false
+                            }
+                        }.count == 0
+                    )
 
                     // completely remove the build folder to ensure all of the tasks are run again
                     try? fs.removeDirectory(SRCROOT.join("build"))
diff --git a/Tests/SwiftBuildTests/AppClipsTests.swift b/Tests/SwiftBuildTests/AppClipsTests.swift
index 603db8dc..53c992e4 100644
--- a/Tests/SwiftBuildTests/AppClipsTests.swift
+++ b/Tests/SwiftBuildTests/AppClipsTests.swift
@@ -114,10 +114,12 @@ fileprivate struct AppClipsTests: CoreBasedTests {
                         results.checkError(.equal("App Clips are not available when building for Mac Catalyst."))
                         results.checkNoFailedTasks()
                     } else {
-                        results.checkError(.or(
-                            .prefix("Your target is built for macOS but contains embedded content built for the iOS platform (BarClip.app), which is not allowed."),
-                            .prefix("This target is built for macOS but contains embedded content (BarClip.app) built for iOS, which is not allowed.")
-                        ))
+                        results.checkError(
+                            .or(
+                                .prefix("Your target is built for macOS but contains embedded content built for the iOS platform (BarClip.app), which is not allowed."),
+                                .prefix("This target is built for macOS but contains embedded content (BarClip.app) built for iOS, which is not allowed.")
+                            )
+                        )
                     }
                     results.checkNoDiagnostics()
                 }
@@ -146,15 +148,17 @@ fileprivate struct AppClipsTests: CoreBasedTests {
         // Simulated implementation of the provisioning system which ad-hoc signs with the product type + project entitlements
         // FIXME: Find a way to call the real thing, perhaps in the future this is `xcsigningtool`
         func provisioningTaskInputs(targetGUID: String, provisioningSourceData: SWBProvisioningTaskInputsSourceData) async -> SWBProvisioningTaskInputs {
-            let signedEntitlements = provisioningSourceData.entitlementsDestination == "Signature"
-            ? provisioningSourceData.productTypeEntitlements.merging(["application-identifier": .plString(provisioningSourceData.bundleIdentifier)], uniquingKeysWith: { _, new in new }).merging(provisioningSourceData.projectEntitlements ?? [:], uniquingKeysWith: { _, new in new })
-            : [:]
+            let signedEntitlements =
+                provisioningSourceData.entitlementsDestination == "Signature"
+                ? provisioningSourceData.productTypeEntitlements.merging(["application-identifier": .plString(provisioningSourceData.bundleIdentifier)], uniquingKeysWith: { _, new in new }).merging(provisioningSourceData.projectEntitlements ?? [:], uniquingKeysWith: { _, new in new })
+                : [:]
 
-            let simulatedEntitlements = provisioningSourceData.entitlementsDestination == "__entitlements"
-            ? provisioningSourceData.productTypeEntitlements.merging(["application-identifier": .plString(provisioningSourceData.bundleIdentifier)], uniquingKeysWith: { _, new in new }).merging(provisioningSourceData.projectEntitlements ?? [:], uniquingKeysWith: { _, new in new })
-            : [:]
+            let simulatedEntitlements =
+                provisioningSourceData.entitlementsDestination == "__entitlements"
+                ? provisioningSourceData.productTypeEntitlements.merging(["application-identifier": .plString(provisioningSourceData.bundleIdentifier)], uniquingKeysWith: { _, new in new }).merging(provisioningSourceData.projectEntitlements ?? [:], uniquingKeysWith: { _, new in new })
+                : [:]
 
-            return SWBProvisioningTaskInputs(identityHash: "-", identityName: "-", profileName: nil, profileUUID: nil, profilePath: nil, designatedRequirements: nil, signedEntitlements: signedEntitlements.merging(provisioningSourceData.sdkRoot.contains("simulator") ? ["get-task-allow": .plBool(true)] : [:], uniquingKeysWith: { _, new  in new }), simulatedEntitlements: simulatedEntitlements, appIdentifierPrefix: nil, teamIdentifierPrefix: nil, isEnterpriseTeam: isEnterpriseTeam, keychainPath: nil, errors: [], warnings: [])
+            return SWBProvisioningTaskInputs(identityHash: "-", identityName: "-", profileName: nil, profileUUID: nil, profilePath: nil, designatedRequirements: nil, signedEntitlements: signedEntitlements.merging(provisioningSourceData.sdkRoot.contains("simulator") ? ["get-task-allow": .plBool(true)] : [:], uniquingKeysWith: { _, new in new }), simulatedEntitlements: simulatedEntitlements, appIdentifierPrefix: nil, teamIdentifierPrefix: nil, isEnterpriseTeam: isEnterpriseTeam, keychainPath: nil, errors: [], warnings: [])
         }
 
         func executeExternalTool(commandLine: [String], workingDirectory: String?, environment: [String: String]) async throws -> SWBExternalToolResult {
diff --git a/Tests/SwiftBuildTests/ArenaIndexingInfoTests.swift b/Tests/SwiftBuildTests/ArenaIndexingInfoTests.swift
index d8072525..2dca242f 100644
--- a/Tests/SwiftBuildTests/ArenaIndexingInfoTests.swift
+++ b/Tests/SwiftBuildTests/ArenaIndexingInfoTests.swift
@@ -28,34 +28,41 @@ struct ArenaIndexingInfoTests: CoreBasedTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let macApp = TestStandardTarget(
                     "macApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "macosx",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx"
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.c",]),
+                        TestSourcesBuildPhase(["main.c"]),
                         TestFrameworksBuildPhase(["FwkTarget.framework"]),
-                    ])
+                    ]
+                )
 
                 let fwkTarget_mac = TestStandardTarget(
                     "FwkTarget_mac",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "macosx",
-                            "PRODUCT_NAME": "FwkTarget",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "PRODUCT_NAME": "FwkTarget",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.c",]),
+                        TestSourcesBuildPhase(["main.c"])
                     ]
                 )
 
@@ -63,37 +70,48 @@ struct ArenaIndexingInfoTests: CoreBasedTests {
                     "FwkTarget_ios",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "iphoneos",
-                            "PRODUCT_NAME": "FwkTarget",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "iphoneos",
+                                "PRODUCT_NAME": "FwkTarget",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.c",]),
+                        TestSourcesBuildPhase(["main.c"])
                     ]
                 )
 
-                let testWorkspace = TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "aProject",
-                        groupTree: TestGroup(
-                            "SomeFiles",
-                            children: [
-                                TestFile("main.c"),
-                            ]),
-                        buildConfigurations: [
-                            TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                ])],
-                        targets: [
-                            macApp,
-                            fwkTarget_mac,
-                            fwkTarget_ios,
-                        ])
-                ])
+                let testWorkspace = TestWorkspace(
+                    "Test",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "aProject",
+                            groupTree: TestGroup(
+                                "SomeFiles",
+                                children: [
+                                    TestFile("main.c")
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                macApp,
+                                fwkTarget_mac,
+                                fwkTarget_ios,
+                            ]
+                        )
+                    ]
+                )
 
                 let infoProducer = try await IndexInfoProducer(testWorkspace, testSession: testSession)
                 do {
@@ -150,34 +168,41 @@ struct ArenaIndexingInfoTests: CoreBasedTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let macApp = TestStandardTarget(
                     "macApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "macosx",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx"
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.c",]),
+                        TestSourcesBuildPhase(["main.c"]),
                         TestFrameworksBuildPhase(["FwkTarget.framework"]),
-                    ])
+                    ]
+                )
 
                 let fwkTarget_mac = TestStandardTarget(
                     "FwkTarget_mac",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "macosx",
-                            "PRODUCT_NAME": "FwkTarget",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "macosx",
+                                "PRODUCT_NAME": "FwkTarget",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.c",]),
+                        TestSourcesBuildPhase(["main.c"])
                     ]
                 )
 
@@ -185,37 +210,48 @@ struct ArenaIndexingInfoTests: CoreBasedTests {
                     "FwkTarget_ios",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SDKROOT": "iphoneos",
-                            "PRODUCT_NAME": "FwkTarget",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "iphoneos",
+                                "PRODUCT_NAME": "FwkTarget",
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.c",]),
+                        TestSourcesBuildPhase(["main.c"])
                     ]
                 )
 
-                let testWorkspace = TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "aProject",
-                        groupTree: TestGroup(
-                            "SomeFiles",
-                            children: [
-                                TestFile("main.c"),
-                            ]),
-                        buildConfigurations: [
-                            TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                ])],
-                        targets: [
-                            macApp,
-                            fwkTarget_mac,
-                            fwkTarget_ios,
-                        ])
-                ])
+                let testWorkspace = TestWorkspace(
+                    "Test",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "aProject",
+                            groupTree: TestGroup(
+                                "SomeFiles",
+                                children: [
+                                    TestFile("main.c")
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                macApp,
+                                fwkTarget_mac,
+                                fwkTarget_ios,
+                            ]
+                        )
+                    ]
+                )
 
                 let infoProducer = try await IndexInfoProducer(testWorkspace, testSession: testSession, targets: [macApp])
                 let buildDescInfo = try await infoProducer.generateBuildDescriptionTargetInfo(.macOS)
@@ -232,40 +268,51 @@ struct ArenaIndexingInfoTests: CoreBasedTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let appTarget1 = TestStandardTarget(
                     "AppTarget",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "SDKROOT": "iphoneos",
-                                                "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator macosx",
-                                               ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SDKROOT": "iphoneos",
+                                "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator macosx",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["main.c"])
-                    ])
-                let testWorkspace1 = TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "aProject",
-                        groupTree: TestGroup(
-                            "SomeFiles",
-                            children: [ TestFile("main.c") ]),
-                        buildConfigurations: [
-                            TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                ])],
-                        targets: [
-                            appTarget1,
-                        ])
-                ])
+                    ]
+                )
+                let testWorkspace1 = TestWorkspace(
+                    "Test",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "aProject",
+                            groupTree: TestGroup(
+                                "SomeFiles",
+                                children: [TestFile("main.c")]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                appTarget1
+                            ]
+                        )
+                    ]
+                )
 
                 let SRCROOT = testWorkspace1.sourceRoot.join("aProject")
                 try await localFS.writeFileContents(SRCROOT.join("main.c")) { contents in
@@ -308,24 +355,33 @@ struct ArenaIndexingInfoTests: CoreBasedTests {
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase(["main.c", "second.c"])
-                    ])
-                let testWorkspace2 = TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "aProject",
-                        groupTree: TestGroup(
-                            "SomeFiles",
-                            children: [ TestFile("main.c"), TestFile("second.c") ]),
-                        buildConfigurations: [
-                            TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                ])],
-                        targets: [
-                            appTarget2,
-                        ])
-                ])
+                    ]
+                )
+                let testWorkspace2 = TestWorkspace(
+                    "Test",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "aProject",
+                            groupTree: TestGroup(
+                                "SomeFiles",
+                                children: [TestFile("main.c"), TestFile("second.c")]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                appTarget2
+                            ]
+                        )
+                    ]
+                )
 
                 try await localFS.writeFileContents(SRCROOT.join("second.c")) { contents in
                     contents <<< ""
@@ -369,8 +425,8 @@ struct ArenaIndexingInfoTests: CoreBasedTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let appTarget = TestStandardTarget(
@@ -380,27 +436,36 @@ struct ArenaIndexingInfoTests: CoreBasedTests {
                         TestBuildConfiguration("Debug")
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase([ "main.swift" ])
-                    ])
-
-                let testWorkspace = TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "aProject",
-                        groupTree: TestGroup(
-                            "SomeFiles",
-                            children: [ TestFile("main.swift") ]),
-                        buildConfigurations: [
-                            TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                    "SWIFT_INCLUDE_PATHS": "/tmp/some-dir",
-                                ])],
-                        targets: [
-                            appTarget,
-                        ])
-                ])
+                        TestSourcesBuildPhase(["main.swift"])
+                    ]
+                )
+
+                let testWorkspace = TestWorkspace(
+                    "Test",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "aProject",
+                            groupTree: TestGroup(
+                                "SomeFiles",
+                                children: [TestFile("main.swift")]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                        "SWIFT_INCLUDE_PATHS": "/tmp/some-dir",
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                appTarget
+                            ]
+                        )
+                    ]
+                )
 
                 let infoProducer = try await IndexInfoProducer(testWorkspace, testSession: testSession)
                 let info = try await IndexingInfoResults(infoProducer.generateIndexingInfo(appTarget, .macOS))
@@ -421,8 +486,8 @@ struct ArenaIndexingInfoTests: CoreBasedTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let appTarget = TestStandardTarget(
@@ -435,30 +500,39 @@ struct ArenaIndexingInfoTests: CoreBasedTests {
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "f1.swift",
-                            "f2.m"
+                            "f2.m",
                         ])
-                    ])
-
-                let testWorkspace = TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "aProject",
-                        groupTree: TestGroup(
-                            "SomeFiles",
-                            children: [
-                                TestFile("f1.swift"),
-                                TestFile("f2.m"),
-                            ]),
-                        buildConfigurations: [
-                            TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "COMPILER_INDEX_STORE_ENABLE": "YES",
-                                ])],
-                        targets: [
-                            appTarget,
-                        ])
-                ])
+                    ]
+                )
+
+                let testWorkspace = TestWorkspace(
+                    "Test",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "aProject",
+                            groupTree: TestGroup(
+                                "SomeFiles",
+                                children: [
+                                    TestFile("f1.swift"),
+                                    TestFile("f2.m"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "COMPILER_INDEX_STORE_ENABLE": "YES",
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                appTarget
+                            ]
+                        )
+                    ]
+                )
 
                 let projectDir = tmpDir.join("aProject")
                 let infoProducer = try await IndexInfoProducer(testWorkspace, testSession: testSession)
@@ -485,12 +559,14 @@ struct ArenaIndexingInfoTests: CoreBasedTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let target = TestStandardTarget(
-                    "Foo", guid: "Foo", type: .staticLibrary,
+                    "Foo",
+                    guid: "Foo",
+                    type: .staticLibrary,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -505,29 +581,36 @@ struct ArenaIndexingInfoTests: CoreBasedTests {
                             "foo.m",
                             "bar.swift",
                         ])
-                    ])
-
-                let testWorkspace = TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "aProject",
-                        groupTree: TestGroup(
-                            "Files",
-                            children: [
-                                TestFile("foo.m"),
-                                TestFile("bar.swift"),
+                    ]
+                )
+
+                let testWorkspace = TestWorkspace(
+                    "Test",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "aProject",
+                            groupTree: TestGroup(
+                                "Files",
+                                children: [
+                                    TestFile("foo.m"),
+                                    TestFile("bar.swift"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                target
                             ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                ])
-                        ],
-                        targets: [
-                            target
-                        ])
-                ])
+                        )
+                    ]
+                )
 
                 let projectDir = tmpDir.join("aProject")
                 let infoProducer = try await IndexInfoProducer(testWorkspace, testSession: testSession)
@@ -564,62 +647,76 @@ struct ArenaIndexingInfoTests: CoreBasedTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let precompiledPCHTarget = TestStandardTarget(
-                    "Foo", guid: "Foo", type: .staticLibrary,
+                    "Foo",
+                    guid: "Foo",
+                    type: .staticLibrary,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
                                 "GCC_PREFIX_HEADER": "prefix.h",
-                                "GCC_PRECOMPILE_PREFIX_HEADER": "YES"
-                            ])
+                                "GCC_PRECOMPILE_PREFIX_HEADER": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "foo.c",
+                            "foo.c"
                         ])
-                    ])
+                    ]
+                )
 
                 let regularTarget = TestStandardTarget(
-                    "Bar", guid: "Bar", type: .staticLibrary,
+                    "Bar",
+                    guid: "Bar",
+                    type: .staticLibrary,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
                                 "GCC_PREFIX_HEADER": "prefix.h"
-                            ])
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "foo.c",
+                            "foo.c"
                         ])
-                    ])
-
-                let testWorkspace = TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "aProject",
-                        groupTree: TestGroup(
-                            "Files",
-                            children: [
-                                TestFile("foo.c"),
-                                TestFile("prefix.h"),
+                    ]
+                )
+
+                let testWorkspace = TestWorkspace(
+                    "Test",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "aProject",
+                            groupTree: TestGroup(
+                                "Files",
+                                children: [
+                                    TestFile("foo.c"),
+                                    TestFile("prefix.h"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                precompiledPCHTarget, regularTarget,
                             ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                ])
-                        ],
-                        targets: [
-                            precompiledPCHTarget, regularTarget
-                        ])
-                ])
+                        )
+                    ]
+                )
 
                 let projectDir = tmpDir.join("aProject")
                 let infoProducer = try await IndexInfoProducer(testWorkspace, testSession: testSession)
@@ -658,42 +755,52 @@ struct ArenaIndexingInfoTests: CoreBasedTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let quotedTarget = TestStandardTarget(
                     "quotedTarget",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "GCC_PREPROCESSOR_DEFINITIONS": #"SOME_DEFINE=\"Some:\ Super\ \\\ Name\'s\""#,
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "GCC_PREPROCESSOR_DEFINITIONS": #"SOME_DEFINE=\"Some:\ Super\ \\\ Name\'s\""#
+                            ]
+                        )
                     ],
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.c"]),
-                    ])
-
-                let testWorkspace = TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "aProject",
-                        groupTree: TestGroup(
-                            "Files",
-                            children: [
-                                TestFile("main.c"),
+                        TestSourcesBuildPhase(["main.c"])
+                    ]
+                )
+
+                let testWorkspace = TestWorkspace(
+                    "Test",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "aProject",
+                            groupTree: TestGroup(
+                                "Files",
+                                children: [
+                                    TestFile("main.c")
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                quotedTarget
                             ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                ])
-                        ],
-                        targets: [
-                            quotedTarget,
-                        ])
-                ])
+                        )
+                    ]
+                )
 
                 let projectDir = tmpDir.join("aProject")
                 let infoProducer = try await IndexInfoProducer(testWorkspace, testSession: testSession)
@@ -714,37 +821,44 @@ struct ArenaIndexingInfoTests: CoreBasedTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let target = TestStandardTarget(
                     "quotedTarget",
                     type: .framework,
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.c"]),
-                    ])
-
-                let testWorkspace = TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "aProject",
-                        groupTree: TestGroup(
-                            "Files",
-                            children: [
-                                TestFile("main.c"),
+                        TestSourcesBuildPhase(["main.c"])
+                    ]
+                )
+
+                let testWorkspace = TestWorkspace(
+                    "Test",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "aProject",
+                            groupTree: TestGroup(
+                                "Files",
+                                children: [
+                                    TestFile("main.c")
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                target
                             ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                ])
-                        ],
-                        targets: [
-                            target
-                        ])
-                ])
+                        )
+                    ]
+                )
 
                 let projectDir = tmpDir.join("aProject")
 
@@ -796,38 +910,45 @@ struct ArenaIndexingInfoTests: CoreBasedTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let target = TestStandardTarget(
                     "quotedTarget",
                     type: .framework,
                     buildPhases: [
-                        TestSourcesBuildPhase(["main.swift"]),
-                    ])
-
-                let testWorkspace = try await TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "aProject",
-                        groupTree: TestGroup(
-                            "Files",
-                            children: [
-                                TestFile("main.swift"),
+                        TestSourcesBuildPhase(["main.swift"])
+                    ]
+                )
+
+                let testWorkspace = try await TestWorkspace(
+                    "Test",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "aProject",
+                            groupTree: TestGroup(
+                                "Files",
+                                children: [
+                                    TestFile("main.swift")
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)",
+                                        "SWIFT_VERSION": swiftVersion,
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                target
                             ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration(
-                                "Debug",
-                                buildSettings: [
-                                    "PRODUCT_NAME": "$(TARGET_NAME)",
-                                    "SWIFT_VERSION": swiftVersion
-                                ])
-                        ],
-                        targets: [
-                            target
-                        ])
-                ])
+                        )
+                    ]
+                )
 
                 let projectDir = tmpDir.join("aProject")
 
@@ -877,9 +998,9 @@ func createIndexBuildDescription(_ workspace: TestWorkspace, session: TestSWBSes
     let buildParameters = SWBBuildParameters(action: "indexbuild", configuration: "Debug", overrides: ["ONLY_ACTIVE_ARCH": "YES"])
     var request = SWBBuildRequest()
     if let targets {
-        request.configuredTargets = targets.map{ SWBConfiguredTarget(guid: $0.guid, parameters: buildParameters) }
+        request.configuredTargets = targets.map { SWBConfiguredTarget(guid: $0.guid, parameters: buildParameters) }
     } else {
-        request.configuredTargets = workspace.projects.flatMap{ $0.targets.map{ SWBConfiguredTarget(guid: $0.guid, parameters: buildParameters) } }
+        request.configuredTargets = workspace.projects.flatMap { $0.targets.map { SWBConfiguredTarget(guid: $0.guid, parameters: buildParameters) } }
     }
     request.buildCommand = .prepareForIndexing(buildOnlyTheseTargets: nil, enableIndexBuildArena: true)
     request.parameters = buildParameters
diff --git a/Tests/SwiftBuildTests/BuildLogTests.swift b/Tests/SwiftBuildTests/BuildLogTests.swift
index a52a079c..136603d2 100644
--- a/Tests/SwiftBuildTests/BuildLogTests.swift
+++ b/Tests/SwiftBuildTests/BuildLogTests.swift
@@ -31,13 +31,14 @@ struct BuildLogTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let srcroot = tmpDirPath.join("Test")
                 let testTarget = TestStandardTarget(
-                    "Tool", type: .commandLineTool,
+                    "Tool",
+                    type: .commandLineTool,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -48,25 +49,36 @@ struct BuildLogTests {
                                 // FIXME: There should be a way to automatically populate the version here, but since these tests are not CoreBasedTests, there isn't a good way to do so right now.
                                 "SWIFT_VERSION": "4.2",
                                 "SWIFT_OBJC_BRIDGING_HEADER": "Bridging Header.h",
-                            ])],
+                            ]
+                        )
+                    ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("File With Space.c"),
                             TestBuildFile("File 1.swift"),
-                            TestBuildFile("File 2.swift")]),
-                    ])
+                            TestBuildFile("File 2.swift"),
+                        ])
+                    ]
+                )
                 let testProject = TestProject(
                     "aProject",
                     defaultConfigurationName: "Release",
-                    groupTree: TestGroup("Foo", children: [
-                        TestFile("File With Space.c"),
-                        TestFile("File 1.swift"),
-                        TestFile("File 2.swift"),
-                        TestFile("Bridging Header.h")]),
-                    targets: [testTarget])
-                let testWorkspace = TestWorkspace("aWorkspace",
-                                                  sourceRoot: srcroot,
-                                                  projects: [testProject])
+                    groupTree: TestGroup(
+                        "Foo",
+                        children: [
+                            TestFile("File With Space.c"),
+                            TestFile("File 1.swift"),
+                            TestFile("File 2.swift"),
+                            TestFile("Bridging Header.h"),
+                        ]
+                    ),
+                    targets: [testTarget]
+                )
+                let testWorkspace = TestWorkspace(
+                    "aWorkspace",
+                    sourceRoot: srcroot,
+                    projects: [testProject]
+                )
                 let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
                 let fs = localFS
@@ -132,11 +144,14 @@ struct BuildLogTests {
                 let allOutput = events.allOutput().bytes
                 if !allOutput.isEmpty {
                     let reportedBuildDescriptionID = try #require(events.reportBuildDescriptionMessage?.buildDescriptionID)
-                    #expect(allOutput.unsafeStringValue.hasPrefix(
-                    """
-                    Build description signature: \(reportedBuildDescriptionID)
-                    Build description path: \(tmpDirPath.str)/Test/aProject/build/XCBuildData/\(reportedBuildDescriptionID).xcbuilddata
-                    """))
+                    #expect(
+                        allOutput.unsafeStringValue.hasPrefix(
+                            """
+                            Build description signature: \(reportedBuildDescriptionID)
+                            Build description path: \(tmpDirPath.str)/Test/aProject/build/XCBuildData/\(reportedBuildDescriptionID).xcbuilddata
+                            """
+                        )
+                    )
                 }
             }
         }
@@ -150,14 +165,15 @@ struct BuildLogTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let srcroot = tmpDirPath.join("Test")
 
                 let dependencyTarget = TestStandardTarget(
-                    "Dependency", type: .objectFile,
+                    "Dependency",
+                    type: .objectFile,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -167,16 +183,18 @@ struct BuildLogTests {
                                 "ALWAYS_SEARCH_USER_PATHS": "NO",
                                 // FIXME: There should be a way to automatically populate the version here, but since these tests are not CoreBasedTests, there isn't a good way to do so right now.
                                 "SWIFT_VERSION": "5.0",
-                            ]),
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("Dependency.swift"),
-                        ]),
+                            TestBuildFile("Dependency.swift")
+                        ])
                     ]
                 )
                 let dylibTarget = TestStandardTarget(
-                    "Dylib", type: .dynamicLibrary,
+                    "Dylib",
+                    type: .dynamicLibrary,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -186,29 +204,34 @@ struct BuildLogTests {
                                 "ALWAYS_SEARCH_USER_PATHS": "NO",
                                 // FIXME: There should be a way to automatically populate the version here, but since these tests are not CoreBasedTests, there isn't a good way to do so right now.
                                 "SWIFT_VERSION": "5.0",
-                            ]),
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("Dylib.swift"),
+                            TestBuildFile("Dylib.swift")
                         ]),
                         TestFrameworksBuildPhase([
-                            TestBuildFile(.target("Dependency")),
+                            TestBuildFile(.target("Dependency"))
                         ]),
                     ],
                     dependencies: [
-                        "Dependency",
+                        "Dependency"
                     ]
                 )
 
                 let testProject = TestProject(
                     "aProject",
                     defaultConfigurationName: "Release",
-                    groupTree: TestGroup("Foo", children: [
-                        TestFile("Dependency.swift"),
-                        TestFile("Dylib.swift"),
-                    ]),
-                    targets: [dependencyTarget, dylibTarget])
+                    groupTree: TestGroup(
+                        "Foo",
+                        children: [
+                            TestFile("Dependency.swift"),
+                            TestFile("Dylib.swift"),
+                        ]
+                    ),
+                    targets: [dependencyTarget, dylibTarget]
+                )
 
                 let testWorkspace = TestWorkspace(
                     "aWorkspace",
@@ -259,13 +282,14 @@ struct BuildLogTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let srcroot = tmpDirPath.join("Test")
                 let testTarget = TestStandardTarget(
-                    "Tool", type: .framework,
+                    "Tool",
+                    type: .framework,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -278,22 +302,33 @@ struct BuildLogTests {
                                 "GENERATE_INFOPLIST_FILE": "YES",
                                 "USE_HEADERMAP": "NO",
                                 "ALWAYS_SEARCH_USER_PATHS": "NO",
-                            ])],
+                            ]
+                        )
+                    ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("File1.swift"),
-                            TestBuildFile("File2.swift")]),
-                    ])
+                            TestBuildFile("File2.swift"),
+                        ])
+                    ]
+                )
                 let testProject = TestProject(
                     "aProject",
                     defaultConfigurationName: "Release",
-                    groupTree: TestGroup("Foo", children: [
-                        TestFile("File1.swift"),
-                        TestFile("File2.swift")]),
-                    targets: [testTarget])
-                let testWorkspace = TestWorkspace("aWorkspace",
-                                                  sourceRoot: srcroot,
-                                                  projects: [testProject])
+                    groupTree: TestGroup(
+                        "Foo",
+                        children: [
+                            TestFile("File1.swift"),
+                            TestFile("File2.swift"),
+                        ]
+                    ),
+                    targets: [testTarget]
+                )
+                let testWorkspace = TestWorkspace(
+                    "aWorkspace",
+                    sourceRoot: srcroot,
+                    projects: [testProject]
+                )
                 let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
                 let fs = localFS
@@ -323,11 +358,14 @@ struct BuildLogTests {
                 let events = try await testSession.runBuildOperation(request: request, delegate: TestBuildOperationDelegate())
 
                 // Check that nothing which looks like Swift parseable output appears in the build log.
-                #expect(!events.allOutput().bytes.description.contains(
-                """
-                {
-                  "kind":
-                """))
+                #expect(
+                    !events.allOutput().bytes.description.contains(
+                        """
+                        {
+                          "kind":
+                        """
+                    )
+                )
             }
         }
     }
@@ -341,21 +379,23 @@ struct BuildLogTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let srcroot = tmpDirPath.join("Test")
                 let appTarget = TestStandardTarget(
-                    "App", type: .application,
+                    "App",
+                    type: .application,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [:]
-                        )],
+                        )
+                    ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("main.swift"),
+                            TestBuildFile("main.swift")
                         ]),
                         TestFrameworksBuildPhase([
                             TestBuildFile("Fwk1.framework"),
@@ -363,45 +403,62 @@ struct BuildLogTests {
                         ]),
                     ],
                     dependencies: [
-                        TestTargetDependency("Fwk1"),
+                        TestTargetDependency("Fwk1")
                     ]
                 )
                 let fwk1Target = TestStandardTarget(
-                    "Fwk1", type: .framework,
+                    "Fwk1",
+                    type: .framework,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
-                            buildSettings: [:])],
+                            buildSettings: [:]
+                        )
+                    ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("ClassOne.swift"),
-                        ]),
-                    ])
+                            TestBuildFile("ClassOne.swift")
+                        ])
+                    ]
+                )
                 let fwk2Target = TestStandardTarget(
-                    "Fwk2", type: .framework,
+                    "Fwk2",
+                    type: .framework,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
-                            buildSettings: [:])],
+                            buildSettings: [:]
+                        )
+                    ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("ClassTwo.swift"),
-                        ]),
-                    ])
+                            TestBuildFile("ClassTwo.swift")
+                        ])
+                    ]
+                )
                 let testProject = TestProject(
                     "Project",
                     defaultConfigurationName: "Release",
-                    groupTree: TestGroup("Project", children: [
-                        TestGroup("Sources", children: [
-                            TestFile("main.swift"),
-                            TestFile("ClassOne.swift"),
-                            TestFile("ClassTwo.swift"),
-                        ]),
-                        TestGroup("Frameworks", children: [
-                            TestFile("Fwk1.framework"),
-                            TestFile("Fwk2.framework"),
-                        ]),
-                    ]),
+                    groupTree: TestGroup(
+                        "Project",
+                        children: [
+                            TestGroup(
+                                "Sources",
+                                children: [
+                                    TestFile("main.swift"),
+                                    TestFile("ClassOne.swift"),
+                                    TestFile("ClassTwo.swift"),
+                                ]
+                            ),
+                            TestGroup(
+                                "Frameworks",
+                                children: [
+                                    TestFile("Fwk1.framework"),
+                                    TestFile("Fwk2.framework"),
+                                ]
+                            ),
+                        ]
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -414,15 +471,20 @@ struct BuildLogTests {
                                 "SWIFT_VERSION": "5.2",
                                 "MACOSX_DEPLOYMENT_TARGET": "10.15",
                                 "SWIFT_STDLIB_TOOL_STRIP_BITCODE": "NO",
-                            ])],
+                            ]
+                        )
+                    ],
                     targets: [
                         appTarget,
                         fwk1Target,
                         fwk2Target,
-                    ])
-                let testWorkspace = TestWorkspace("Workspace",
-                                                  sourceRoot: srcroot,
-                                                  projects: [testProject])
+                    ]
+                )
+                let testWorkspace = TestWorkspace(
+                    "Workspace",
+                    sourceRoot: srcroot,
+                    projects: [testProject]
+                )
                 let SRCROOT = testWorkspace.sourceRoot.join("Project")
 
                 let fs = localFS
@@ -482,12 +544,15 @@ struct BuildLogTests {
 
                     let reportedBuildDescriptionID = try #require(events.reportBuildDescriptionMessage?.buildDescriptionID)
                     // TODO: Revert to .equal once appintentsmetadataprocessor output is removed
-                    XCTAssertMatch(events.allOutput().bytes.unsafeStringValue, .contains(
-                    """
-                    Build description signature: \(reportedBuildDescriptionID)
-                    Build description path: \(tmpDirPath.str)/Test/Project/build/XCBuildData/\(reportedBuildDescriptionID).xcbuilddata
-
-                    """)
+                    XCTAssertMatch(
+                        events.allOutput().bytes.unsafeStringValue,
+                        .contains(
+                            """
+                            Build description signature: \(reportedBuildDescriptionID)
+                            Build description path: \(tmpDirPath.str)/Test/Project/build/XCBuildData/\(reportedBuildDescriptionID).xcbuilddata
+
+                            """
+                        )
                     )
                 }
 
@@ -528,12 +593,15 @@ struct BuildLogTests {
 
                     let reportedBuildDescriptionID = try #require(events.reportBuildDescriptionMessage?.buildDescriptionID)
                     // TODO: Revert to .equals once appintentsmetadataprocessor output is removed
-                    XCTAssertMatch(events.allOutput().bytes.unsafeStringValue, .prefix(
-                    """
-                    Build description signature: \(reportedBuildDescriptionID)
-                    Build description path: \(tmpDirPath.str)/Test/Project/build/XCBuildData/\(reportedBuildDescriptionID).xcbuilddata
-
-                    """)
+                    XCTAssertMatch(
+                        events.allOutput().bytes.unsafeStringValue,
+                        .prefix(
+                            """
+                            Build description signature: \(reportedBuildDescriptionID)
+                            Build description path: \(tmpDirPath.str)/Test/Project/build/XCBuildData/\(reportedBuildDescriptionID).xcbuilddata
+
+                            """
+                        )
                     )
                 }
             }
@@ -555,7 +623,9 @@ struct BuildLogTests {
                     "aProject",
                     sourceRoot: tmpDir.path,
                     groupTree: TestGroup(
-                        "Sources", children: []),
+                        "Sources",
+                        children: []
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -564,16 +634,17 @@ struct BuildLogTests {
                                 "CODE_SIGNING_ALLOWED": "NO",
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                             ]
-                        )],
+                        )
+                    ],
                     targets: [
                         TestStandardTarget(
                             "FwkTarget",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: [:]),
+                                TestBuildConfiguration("Debug", buildSettings: [:])
                             ],
-                            buildPhases: [
-                            ], dependencies: [
+                            buildPhases: [],
+                            dependencies: [
                                 "FwkTarget2"
                             ]
                         ),
@@ -581,12 +652,12 @@ struct BuildLogTests {
                             "FwkTarget2",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: [:]),
+                                TestBuildConfiguration("Debug", buildSettings: [:])
                             ],
-                            buildPhases: [
-                            ]
+                            buildPhases: []
                         ),
-                    ])
+                    ]
+                )
                 let fs = localFS
                 let tester = try await CoreQualificationTester(testProject, testSession, fs: fs)
 
@@ -663,7 +734,9 @@ struct BuildLogTests {
                     "aProject",
                     sourceRoot: tmpDir.path,
                     groupTree: TestGroup(
-                        "Sources", children: []),
+                        "Sources",
+                        children: []
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -672,18 +745,19 @@ struct BuildLogTests {
                                 "CODE_SIGNING_ALLOWED": "NO",
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                             ]
-                        )],
+                        )
+                    ],
                     targets: [
                         TestStandardTarget(
                             "FwkTarget",
                             type: .framework,
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: [:]),
+                                TestBuildConfiguration("Debug", buildSettings: [:])
                             ],
-                            buildPhases: [
-                            ]
-                        ),
-                    ])
+                            buildPhases: []
+                        )
+                    ]
+                )
                 let fs = localFS
                 let tester = try await CoreQualificationTester(testProject, testSession, fs: fs)
 
diff --git a/Tests/SwiftBuildTests/BuildOperationTests.swift b/Tests/SwiftBuildTests/BuildOperationTests.swift
index 077da084..1b9a6acd 100644
--- a/Tests/SwiftBuildTests/BuildOperationTests.swift
+++ b/Tests/SwiftBuildTests/BuildOperationTests.swift
@@ -42,10 +42,13 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                     "aProject",
                     defaultConfigurationName: "Release",
                     groupTree: TestGroup("Foo"),
-                    targets: [])
-                let testWorkspace = TestWorkspace("aWorkspace",
-                                                  sourceRoot: srcroot,
-                                                  projects: [testProject])
+                    targets: []
+                )
+                let testWorkspace = TestWorkspace(
+                    "aWorkspace",
+                    sourceRoot: srcroot,
+                    projects: [testProject]
+                )
 
                 try await testSession.sendPIF(testWorkspace)
 
@@ -80,10 +83,13 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                     "aProject",
                     defaultConfigurationName: "Release",
                     groupTree: TestGroup("Foo"),
-                    targets: [])
-                let testWorkspace = TestWorkspace("aWorkspace",
-                                                  sourceRoot: srcroot,
-                                                  projects: [testProject])
+                    targets: []
+                )
+                let testWorkspace = TestWorkspace(
+                    "aWorkspace",
+                    sourceRoot: srcroot,
+                    projects: [testProject]
+                )
 
                 try await testSession.sendPIF(testWorkspace)
 
@@ -117,10 +123,13 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                     "aProject",
                     defaultConfigurationName: "Release",
                     groupTree: TestGroup("Foo"),
-                    targets: [])
-                let testWorkspace = TestWorkspace("aWorkspace",
-                                                  sourceRoot: srcroot,
-                                                  projects: [testProject])
+                    targets: []
+                )
+                let testWorkspace = TestWorkspace(
+                    "aWorkspace",
+                    sourceRoot: srcroot,
+                    projects: [testProject]
+                )
 
                 try await testSession.sendPIF(testWorkspace)
 
@@ -158,10 +167,13 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                         TestAggregateTarget("All", dependencies: ["aFramework", "bFramework"]),
                         TestStandardTarget("aFramework", type: .application, buildPhases: [TestSourcesBuildPhase([TestBuildFile("Test.c")])]),
                         TestStandardTarget("bFramework", type: .application, buildPhases: [TestSourcesBuildPhase([TestBuildFile("Test.c")])]),
-                    ])
-                let testWorkspace = TestWorkspace("aWorkspace",
-                                                  sourceRoot: srcroot,
-                                                  projects: [testProject])
+                    ]
+                )
+                let testWorkspace = TestWorkspace(
+                    "aWorkspace",
+                    sourceRoot: srcroot,
+                    projects: [testProject]
+                )
 
                 try await testSession.sendPIF(testWorkspace)
 
@@ -175,14 +187,16 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
 
                 let events = try await testSession.runBuildOperation(request: request, delegate: TestBuildOperationDelegate())
 
-                let pathMap = try #require(events.compactMap({ msg in
-                    switch msg {
-                    case let .reportPathMap(msg):
-                        return msg.generatedFilesPathMap
-                    default:
-                        return nil
-                    }
-                }).only)
+                let pathMap = try #require(
+                    events.compactMap({ msg in
+                        switch msg {
+                        case let .reportPathMap(msg):
+                            return msg.generatedFilesPathMap
+                        default:
+                            return nil
+                        }
+                    }).only
+                )
                 #expect(pathMap.count == 4)
                 for arch in ["arm64", "x86_64"] {
                     for target in ["aFramework", "bFramework"] {
@@ -196,7 +210,7 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
     }
 
     /// Check the basic behavior of a build operation's messages.
-    @Test(.requireSDKs(.macOS), .skipHostOS(.windows)) // relies on UNIX shell, consider adding Windows command shell support for script phases?
+    @Test(.requireSDKs(.macOS), .skipHostOS(.windows))  // relies on UNIX shell, consider adding Windows command shell support for script phases?
     func basics() async throws {
         try await withTemporaryDirectory { temporaryDirectory in
             try await withAsyncDeferrable { deferrable in
@@ -209,38 +223,54 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 }
 
                 let srcroot = tmpDir.join("Test")
-                let testTarget = TestAggregateTarget("A",
-                                                     buildPhases: [
-                                                        TestShellScriptBuildPhase(
-                                                            name: "A.Script", originalObjectID: "A.Script", contents: (OutputByteStream()
-                                                                                                                       <<< "/usr/bin/touch ${SCRIPT_OUTPUT_FILE_0}"
-                                                                                                                      ).bytes.asString, inputs: [], outputs: ["$(DERIVED_FILE_DIR)/stamp"])
-                                                     ],
-                                                     dependencies: ["B"]
+                let testTarget = TestAggregateTarget(
+                    "A",
+                    buildPhases: [
+                        TestShellScriptBuildPhase(
+                            name: "A.Script",
+                            originalObjectID: "A.Script",
+                            contents: (OutputByteStream()
+                                <<< "/usr/bin/touch ${SCRIPT_OUTPUT_FILE_0}").bytes.asString,
+                            inputs: [],
+                            outputs: ["$(DERIVED_FILE_DIR)/stamp"]
+                        )
+                    ],
+                    dependencies: ["B"]
                 )
                 let testProject = TestProject(
                     "aProject",
                     defaultConfigurationName: "Release",
                     groupTree: TestGroup("Foo"),
-                    targets: [testTarget,
-                              TestAggregateTarget("B",
-                                                  buildPhases: [
-                                                    // This task will be up-to-date after the first build
-                                                    TestShellScriptBuildPhase(
-                                                        name: "B.Once", originalObjectID: "B.Once",
-                                                        contents: "/usr/bin/touch ${SCRIPT_OUTPUT_FILE_0}",
-                                                        inputs: [], outputs: ["$(DERIVED_FILE_DIR)/stamp"]),
-                                                    // This task will always run.
-                                                    TestShellScriptBuildPhase(
-                                                        name: "B.Always", originalObjectID: "B.Always",
-                                                        contents: "true",
-                                                        inputs: [], outputs: [])
-                                                  ]
-                                                 )
-                             ])
-                let testWorkspace = TestWorkspace("aWorkspace",
-                                                  sourceRoot: srcroot,
-                                                  projects: [testProject])
+                    targets: [
+                        testTarget,
+                        TestAggregateTarget(
+                            "B",
+                            buildPhases: [
+                                // This task will be up-to-date after the first build
+                                TestShellScriptBuildPhase(
+                                    name: "B.Once",
+                                    originalObjectID: "B.Once",
+                                    contents: "/usr/bin/touch ${SCRIPT_OUTPUT_FILE_0}",
+                                    inputs: [],
+                                    outputs: ["$(DERIVED_FILE_DIR)/stamp"]
+                                ),
+                                // This task will always run.
+                                TestShellScriptBuildPhase(
+                                    name: "B.Always",
+                                    originalObjectID: "B.Always",
+                                    contents: "true",
+                                    inputs: [],
+                                    outputs: []
+                                ),
+                            ]
+                        ),
+                    ]
+                )
+                let testWorkspace = TestWorkspace(
+                    "aWorkspace",
+                    sourceRoot: srcroot,
+                    projects: [testProject]
+                )
 
                 try await testSession.sendPIF(testWorkspace)
 
@@ -288,7 +318,7 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
         }
     }
 
-    @Test(.requireSDKs(.macOS), .skipHostOS(.windows)) // version info discovery isn't working on Windows
+    @Test(.requireSDKs(.macOS), .skipHostOS(.windows))  // version info discovery isn't working on Windows
     func onlyCreateBuildDescription() async throws {
         try await withTemporaryDirectory { temporaryDirectory in
             try await withAsyncDeferrable { deferrable in
@@ -301,7 +331,8 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 }
 
                 let testTarget = TestStandardTarget(
-                    "Foo", type: .framework,
+                    "Foo",
+                    type: .framework,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -310,13 +341,17 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "USE_HEADERMAP": "YES",
                                 "ALWAYS_SEARCH_USER_PATHS": "NO",
-                            ])],
+                            ]
+                        )
+                    ],
                     buildPhases: [
                         TestSourcesBuildPhase([TestBuildFile("foo.c")]),
                         TestHeadersBuildPhase([TestBuildFile("foo.h")]),
-                    ])
+                    ]
+                )
                 let otherTargetWithHeader = TestStandardTarget(
-                    "Bar", type: .framework,
+                    "Bar",
+                    type: .framework,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -325,21 +360,30 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "USE_HEADERMAP": "YES",
                                 "ALWAYS_SEARCH_USER_PATHS": "NO",
-                            ])],
+                            ]
+                        )
+                    ],
                     buildPhases: [
                         TestSourcesBuildPhase([TestBuildFile("foo.c")]),
                         TestHeadersBuildPhase([TestBuildFile("foo.h")]),
-                    ])
+                    ]
+                )
                 let testProject = TestProject(
                     "aProject",
                     defaultConfigurationName: "Release",
-                    groupTree: TestGroup("Foo", children: [
-                        TestFile("foo.c"), TestFile("foo.h")]),
-                    targets: [testTarget, otherTargetWithHeader])
+                    groupTree: TestGroup(
+                        "Foo",
+                        children: [
+                            TestFile("foo.c"), TestFile("foo.h"),
+                        ]
+                    ),
+                    targets: [testTarget, otherTargetWithHeader]
+                )
                 let testWorkspace = TestWorkspace(
                     "aWorkspace",
                     sourceRoot: tmpDir.join("Test"),
-                    projects: [testProject])
+                    projects: [testProject]
+                )
                 let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
                 // Run a test build.
@@ -364,29 +408,35 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 do {
                     let (events, _) = try await testSession.runBuildDescriptionCreationOperation(request: request, delegate: TestBuildOperationDelegate())
 
-                    try await tester.checkResults(events: events, { results in
-                        results.checkTask(.matchRule(["ComputeTargetDependencyGraph"])) { task in
-                            #expect(task.executionDescription == "Compute target dependency graph")
-                        }
-                        results.checkTask(.matchRule(["GatherProvisioningInputs"])) { task in
-                            #expect(task.executionDescription == "Gather provisioning inputs")
-                        }
-                        results.checkTask(.matchRule(["CreateBuildDescription"])) { task in
-                            #expect(task.executionDescription == "Create build description")
-
-                            // FIXME: Check the hierarchical relationship when we have infrastructure to do so.
-                            results.checkTasks(.matchRuleType("ExecuteExternalTool")) { tasks in
-                                XCTAssertEqualSequences(Set(tasks.map(\.executionDescription)).sorted(), [
-                                    "Discovering version info for clang",
-                                    "Discovering version info for ld"
-                                ])
+                    try await tester.checkResults(
+                        events: events,
+                        { results in
+                            results.checkTask(.matchRule(["ComputeTargetDependencyGraph"])) { task in
+                                #expect(task.executionDescription == "Compute target dependency graph")
                             }
-                        }
-                        results.checkNoTask()
+                            results.checkTask(.matchRule(["GatherProvisioningInputs"])) { task in
+                                #expect(task.executionDescription == "Gather provisioning inputs")
+                            }
+                            results.checkTask(.matchRule(["CreateBuildDescription"])) { task in
+                                #expect(task.executionDescription == "Create build description")
+
+                                // FIXME: Check the hierarchical relationship when we have infrastructure to do so.
+                                results.checkTasks(.matchRuleType("ExecuteExternalTool")) { tasks in
+                                    XCTAssertEqualSequences(
+                                        Set(tasks.map(\.executionDescription)).sorted(),
+                                        [
+                                            "Discovering version info for clang",
+                                            "Discovering version info for ld",
+                                        ]
+                                    )
+                                }
+                            }
+                            results.checkNoTask()
 
-                        results.checkNoDiagnostics()
-                        results.checkNoFailedTasks()
-                    })
+                            results.checkNoDiagnostics()
+                            results.checkNoFailedTasks()
+                        }
+                    )
                 }
 
                 // Check that we can invoke build description creation operation concurrently while a normal build is in progress.
@@ -395,24 +445,30 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 try await withThrowingTaskGroup(of: Void.self) { group in
                     group.addTask {
                         let events = try await testSession.runBuildOperation(request: request, delegate: TestBuildOperationDelegate())
-                        try await tester.checkResults(events: events, { results in
-                            results.checkTasks { tasks in
-                                #expect(!tasks.isEmpty)
+                        try await tester.checkResults(
+                            events: events,
+                            { results in
+                                results.checkTasks { tasks in
+                                    #expect(!tasks.isEmpty)
+                                }
                             }
-                        })
+                        )
                     }
 
                     group.addTask {
                         let (events, _) = try await testSession.runBuildDescriptionCreationOperation(request: request, delegate: TestBuildOperationDelegate())
-                        try await tester.checkResults(events: events, { results in
-                            results.checkTask(.matchRule(["ComputeTargetDependencyGraph"])) { task in
-                                #expect(task.executionDescription == "Compute target dependency graph")
+                        try await tester.checkResults(
+                            events: events,
+                            { results in
+                                results.checkTask(.matchRule(["ComputeTargetDependencyGraph"])) { task in
+                                    #expect(task.executionDescription == "Compute target dependency graph")
+                                }
+                                results.checkTask(.matchRule(["GatherProvisioningInputs"])) { task in
+                                    #expect(task.executionDescription == "Gather provisioning inputs")
+                                }
+                                results.checkNoTask()
                             }
-                            results.checkTask(.matchRule(["GatherProvisioningInputs"])) { task in
-                                #expect(task.executionDescription == "Gather provisioning inputs")
-                            }
-                            results.checkNoTask()
-                        })
+                        )
                     }
 
                     try await group.waitForAll()
@@ -422,15 +478,18 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 try await withThrowingTaskGroup(of: Void.self) { group in
                     group.addTask {
                         let (events, _) = try await testSession.runBuildDescriptionCreationOperation(request: request, delegate: TestBuildOperationDelegate())
-                        try await tester.checkResults(events: events, { results in
-                            results.checkTask(.matchRule(["ComputeTargetDependencyGraph"])) { task in
-                                #expect(task.executionDescription == "Compute target dependency graph")
+                        try await tester.checkResults(
+                            events: events,
+                            { results in
+                                results.checkTask(.matchRule(["ComputeTargetDependencyGraph"])) { task in
+                                    #expect(task.executionDescription == "Compute target dependency graph")
+                                }
+                                results.checkTask(.matchRule(["GatherProvisioningInputs"])) { task in
+                                    #expect(task.executionDescription == "Gather provisioning inputs")
+                                }
+                                results.checkNoTask()
                             }
-                            results.checkTask(.matchRule(["GatherProvisioningInputs"])) { task in
-                                #expect(task.executionDescription == "Gather provisioning inputs")
-                            }
-                            results.checkNoTask()
-                        })
+                        )
                     }
 
                     group.addTask {
@@ -461,7 +520,8 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 }
 
                 let testTarget = TestStandardTarget(
-                    "Foo", type: .framework,
+                    "Foo",
+                    type: .framework,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -470,13 +530,17 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "USE_HEADERMAP": "YES",
                                 "ALWAYS_SEARCH_USER_PATHS": "NO",
-                            ])],
+                            ]
+                        )
+                    ],
                     buildPhases: [
                         TestSourcesBuildPhase([TestBuildFile("foo.c")]),
                         TestHeadersBuildPhase([TestBuildFile("foo.h")]),
-                    ])
+                    ]
+                )
                 let otherTargetWithHeader = TestStandardTarget(
-                    "Bar", type: .framework,
+                    "Bar",
+                    type: .framework,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -485,21 +549,30 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "USE_HEADERMAP": "YES",
                                 "ALWAYS_SEARCH_USER_PATHS": "NO",
-                            ])],
+                            ]
+                        )
+                    ],
                     buildPhases: [
                         TestSourcesBuildPhase([TestBuildFile("foo.c")]),
                         TestHeadersBuildPhase([TestBuildFile("foo.h")]),
-                    ])
+                    ]
+                )
                 let testProject = TestProject(
                     "aProject",
                     defaultConfigurationName: "Release",
-                    groupTree: TestGroup("Foo", children: [
-                        TestFile("foo.c"), TestFile("foo.h")]),
-                    targets: [testTarget, otherTargetWithHeader])
+                    groupTree: TestGroup(
+                        "Foo",
+                        children: [
+                            TestFile("foo.c"), TestFile("foo.h"),
+                        ]
+                    ),
+                    targets: [testTarget, otherTargetWithHeader]
+                )
                 let testWorkspace = TestWorkspace(
                     "aWorkspace",
                     sourceRoot: tmpDir.join("Test"),
-                    projects: [testProject])
+                    projects: [testProject]
+                )
                 let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
                 // Run a test build.
@@ -535,23 +608,29 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
 
                             // FIXME: Check the hierarchical relationship when we have infrastructure to do so.
                             results.checkTasks(.matchRuleType("ExecuteExternalTool")) { tasks in
-                                XCTAssertEqualSequences(Set(tasks.map(\.executionDescription)).sorted(), [
-                                    "Discovering version info for clang",
-                                    "Discovering version info for ld"
-                                ])
+                                XCTAssertEqualSequences(
+                                    Set(tasks.map(\.executionDescription)).sorted(),
+                                    [
+                                        "Discovering version info for clang",
+                                        "Discovering version info for ld",
+                                    ]
+                                )
                             }
                         }
                         results.checkNoTask()
                     }
 
-                    #expect(events.contains { event in
-                        switch event {
-                        case .planningOperationStarted, .planningOperationCompleted:
-                            return true
-                        default:
-                            return false
-                        }
-                    }, "unexpected events: \(events)")
+                    #expect(
+                        events.contains { event in
+                            switch event {
+                            case .planningOperationStarted, .planningOperationCompleted:
+                                return true
+                            default:
+                                return false
+                            }
+                        },
+                        "unexpected events: \(events)"
+                    )
                 }
 
                 // Check that passing a `buildDescriptionID` will avoid planning.
@@ -566,14 +645,17 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                         results.checkNoTask()
                     }
 
-                    #expect(!events.contains { event in
-                        switch event {
-                        case .planningOperationStarted, .planningOperationCompleted:
-                            return true
-                        default:
-                            return false
-                        }
-                    }, "unexpected events: \(events)")
+                    #expect(
+                        !events.contains { event in
+                            switch event {
+                            case .planningOperationStarted, .planningOperationCompleted:
+                                return true
+                            default:
+                                return false
+                            }
+                        },
+                        "unexpected events: \(events)"
+                    )
                     #expect(events.reportBuildDescriptionMessage?.buildDescriptionID == buildDescriptionID)
                 }
             }
@@ -593,7 +675,8 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 }
 
                 let testTarget = TestStandardTarget(
-                    "Foo", type: .framework,
+                    "Foo",
+                    type: .framework,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -602,13 +685,17 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "USE_HEADERMAP": "YES",
                                 "ALWAYS_SEARCH_USER_PATHS": "NO",
-                            ])],
+                            ]
+                        )
+                    ],
                     buildPhases: [
                         TestSourcesBuildPhase([TestBuildFile("foo.c")]),
                         TestHeadersBuildPhase([TestBuildFile("foo.h")]),
-                    ])
+                    ]
+                )
                 let otherTargetWithHeader = TestStandardTarget(
-                    "Bar", type: .framework,
+                    "Bar",
+                    type: .framework,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -617,21 +704,30 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "USE_HEADERMAP": "YES",
                                 "ALWAYS_SEARCH_USER_PATHS": "NO",
-                            ])],
+                            ]
+                        )
+                    ],
                     buildPhases: [
                         TestSourcesBuildPhase([TestBuildFile("foo.c")]),
                         TestHeadersBuildPhase([TestBuildFile("foo.h")]),
-                    ])
+                    ]
+                )
                 let testProject = TestProject(
                     "aProject",
                     defaultConfigurationName: "Release",
-                    groupTree: TestGroup("Foo", children: [
-                        TestFile("foo.c"), TestFile("foo.h")]),
-                    targets: [testTarget, otherTargetWithHeader])
+                    groupTree: TestGroup(
+                        "Foo",
+                        children: [
+                            TestFile("foo.c"), TestFile("foo.h"),
+                        ]
+                    ),
+                    targets: [testTarget, otherTargetWithHeader]
+                )
                 let testWorkspace = TestWorkspace(
                     "aWorkspace",
                     sourceRoot: tmpDir.join("Test"),
-                    projects: [testProject])
+                    projects: [testProject]
+                )
                 let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
                 let fs = localFS
@@ -710,12 +806,20 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 let testWorkspace = TestWorkspace(
                     "aWorkspace",
                     sourceRoot: tmpDir.join("Test"),
-                    projects: [TestProject(
-                        "aProject",
-                        defaultConfigurationName: "Release",
-                        groupTree: TestGroup("Foo", children: [
-                            TestFile("foo.c"), TestFile("foo.h")]),
-                        targets: [TestExternalTarget("Sleeper", toolPath: "/bin/sleep", arguments: "10")])])
+                    projects: [
+                        TestProject(
+                            "aProject",
+                            defaultConfigurationName: "Release",
+                            groupTree: TestGroup(
+                                "Foo",
+                                children: [
+                                    TestFile("foo.c"), TestFile("foo.h"),
+                                ]
+                            ),
+                            targets: [TestExternalTarget("Sleeper", toolPath: "/bin/sleep", arguments: "10")]
+                        )
+                    ]
+                )
                 let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
                 try await testSession.sendPIF(testWorkspace)
@@ -734,11 +838,14 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                     _ = try await operation.start()
 
                     // Starting a second build operation concurrently with the first should fail.
-                    await #expect(performing: {
-                        try await testSession.session.createBuildOperation(request: buildRequest, delegate: TestBuildOperationDelegate())
-                    }, throws: { error in
-                        (error as (any Error)).localizedDescription == "unexpected attempt to have multiple concurrent normal build operations"
-                    })
+                    await #expect(
+                        performing: {
+                            try await testSession.session.createBuildOperation(request: buildRequest, delegate: TestBuildOperationDelegate())
+                        },
+                        throws: { error in
+                            (error as (any Error)).localizedDescription == "unexpected attempt to have multiple concurrent normal build operations"
+                        }
+                    )
 
                     operation.cancel()
 
@@ -761,22 +868,29 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 }
 
                 let frameTarget = TestStandardTarget(
-                    "Frame", type: .framework,
+                    "Frame",
+                    type: .framework,
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("frame.swift")]),
-                    ])
+                        TestSourcesBuildPhase([TestBuildFile("frame.swift")])
+                    ]
+                )
                 let toolTarget = TestStandardTarget(
-                    "Tool", type: .commandLineTool,
+                    "Tool",
+                    type: .commandLineTool,
                     buildPhases: [
                         TestSourcesBuildPhase([TestBuildFile("tool.swift")]),
                         TestFrameworksBuildPhase(["Frame.framework"]),
-                    ])
+                    ]
+                )
                 let testProject = TestProject(
                     "aProject",
-                    groupTree: TestGroup("Files", children: [
-                        TestFile("frame.swift"),
-                        TestFile("tool.swift")
-                    ]),
+                    groupTree: TestGroup(
+                        "Files",
+                        children: [
+                            TestFile("frame.swift"),
+                            TestFile("tool.swift"),
+                        ]
+                    ),
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -785,12 +899,16 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "SWIFT_VERSION": "5",
                                 "ALWAYS_SEARCH_USER_PATHS": "NO",
-                            ])],
-                    targets: [frameTarget, toolTarget])
+                            ]
+                        )
+                    ],
+                    targets: [frameTarget, toolTarget]
+                )
                 let testWorkspace = TestWorkspace(
                     "aWorkspace",
                     sourceRoot: tmpDir.join("Test"),
-                    projects: [testProject])
+                    projects: [testProject]
+                )
                 let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
                 let fs = localFS
@@ -898,7 +1016,8 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 }
 
                 let testTarget = TestStandardTarget(
-                    "Foo", type: .framework,
+                    "Foo",
+                    type: .framework,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -907,13 +1026,17 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "USE_HEADERMAP": "YES",
                                 "ALWAYS_SEARCH_USER_PATHS": "NO",
-                            ])],
+                            ]
+                        )
+                    ],
                     buildPhases: [
                         TestSourcesBuildPhase([TestBuildFile("foo.c")]),
                         TestHeadersBuildPhase([TestBuildFile("foo.h")]),
-                    ])
+                    ]
+                )
                 let otherTargetWithHeader = TestStandardTarget(
-                    "Bar", type: .framework,
+                    "Bar",
+                    type: .framework,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -922,21 +1045,30 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "USE_HEADERMAP": "YES",
                                 "ALWAYS_SEARCH_USER_PATHS": "NO",
-                            ])],
+                            ]
+                        )
+                    ],
                     buildPhases: [
                         TestSourcesBuildPhase([TestBuildFile("foo.c")]),
                         TestHeadersBuildPhase([TestBuildFile("foo.h")]),
-                    ])
+                    ]
+                )
                 let testProject = TestProject(
                     "aProject",
                     defaultConfigurationName: "Release",
-                    groupTree: TestGroup("Foo", children: [
-                        TestFile("foo.c"), TestFile("foo.h")]),
-                    targets: [testTarget, otherTargetWithHeader])
+                    groupTree: TestGroup(
+                        "Foo",
+                        children: [
+                            TestFile("foo.c"), TestFile("foo.h"),
+                        ]
+                    ),
+                    targets: [testTarget, otherTargetWithHeader]
+                )
                 let testWorkspace = TestWorkspace(
                     "aWorkspace",
                     sourceRoot: tmpDir.join("Test"),
-                    projects: [testProject])
+                    projects: [testProject]
+                )
                 let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
                 // Run a test build.
@@ -972,11 +1104,14 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                     }
 
                     let reportedBuildDescriptionID = try #require(events.reportBuildDescriptionMessage?.buildDescriptionID)
-                    #expect(events.allOutput().bytes.unsafeStringValue.hasPrefix(
-                """
-                Build description signature: \(reportedBuildDescriptionID)
-                Build description path: \(tmpDir.str)/Test/aProject/build/XCBuildData/\(reportedBuildDescriptionID).xcbuilddata
-                """))
+                    #expect(
+                        events.allOutput().bytes.unsafeStringValue.hasPrefix(
+                            """
+                            Build description signature: \(reportedBuildDescriptionID)
+                            Build description path: \(tmpDir.str)/Test/aProject/build/XCBuildData/\(reportedBuildDescriptionID).xcbuilddata
+                            """
+                        )
+                    )
                 }
 
                 // Check that we get a null build.
@@ -1045,7 +1180,7 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
         }
     }
 
-    @Test(.skipHostOS(.windows)) // Windows: $PRODUCT_NAME-preparedForIndex-target node is missing?
+    @Test(.skipHostOS(.windows))  // Windows: $PRODUCT_NAME-preparedForIndex-target node is missing?
     func prepareForIndexAvoidsProvisioning() async throws {
         try await withTemporaryDirectory { temporaryDirectory in
             try await withAsyncDeferrable { deferrable in
@@ -1058,31 +1193,41 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 }
 
                 let testTarget = TestStandardTarget(
-                    "Foo", type: .framework,
+                    "Foo",
+                    type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug",
-                                               buildSettings: [
-                                                "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                                               ])],
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                            ]
+                        )
+                    ],
                     buildPhases: [
                         TestSourcesBuildPhase([TestBuildFile("foo.c")]),
                         TestHeadersBuildPhase([TestBuildFile("foo.h")]),
                     ],
                     provisioningSourceData: [
-                        ProvisioningSourceData(configurationName: "Debug", provisioningStyle: .automatic, bundleIdentifierFromInfoPlist: "AppTarget"),
+                        ProvisioningSourceData(configurationName: "Debug", provisioningStyle: .automatic, bundleIdentifierFromInfoPlist: "AppTarget")
                     ]
                 )
                 let testProject = TestProject(
                     "aProject",
                     defaultConfigurationName: "Release",
-                    groupTree: TestGroup("Foo", children: [
-                        TestFile("foo.c"), TestFile("foo.h")]),
-                    targets: [testTarget])
+                    groupTree: TestGroup(
+                        "Foo",
+                        children: [
+                            TestFile("foo.c"), TestFile("foo.h"),
+                        ]
+                    ),
+                    targets: [testTarget]
+                )
                 let testWorkspace = TestWorkspace(
                     "aWorkspace",
                     sourceRoot: tmpDir.join("Test"),
-                    projects: [testProject])
+                    projects: [testProject]
+                )
                 let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
                 let fs = localFS
@@ -1134,10 +1279,13 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                     "aProject",
                     defaultConfigurationName: "Release",
                     groupTree: TestGroup("Foo"),
-                    targets: [testTarget])
-                let testWorkspace = TestWorkspace("aWorkspace",
-                                                  sourceRoot: srcroot,
-                                                  projects: [testProject])
+                    targets: [testTarget]
+                )
+                let testWorkspace = TestWorkspace(
+                    "aWorkspace",
+                    sourceRoot: srcroot,
+                    projects: [testProject]
+                )
 
                 try await testSession.sendPIF(testWorkspace)
 
@@ -1173,10 +1321,13 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                     "aProject",
                     defaultConfigurationName: "Release",
                     groupTree: TestGroup("Foo"),
-                    targets: [])
-                let testWorkspace = TestWorkspace("aWorkspace",
-                                                  sourceRoot: srcroot,
-                                                  projects: [testProject])
+                    targets: []
+                )
+                let testWorkspace = TestWorkspace(
+                    "aWorkspace",
+                    sourceRoot: srcroot,
+                    projects: [testProject]
+                )
 
                 try await testSession.sendPIF(testWorkspace)
 
@@ -1207,10 +1358,13 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 "aProject",
                 defaultConfigurationName: "Release",
                 groupTree: TestGroup("Foo"),
-                targets: [testTarget])
-            let testWorkspace = TestWorkspace("aWorkspace",
-                                              sourceRoot: srcroot,
-                                              projects: [testProject])
+                targets: [testTarget]
+            )
+            let testWorkspace = TestWorkspace(
+                "aWorkspace",
+                sourceRoot: srcroot,
+                projects: [testProject]
+            )
 
             try await testSession.sendPIF(testWorkspace)
 
@@ -1229,11 +1383,14 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
 
             await testSession.service.terminate()
 
-            await #expect(performing: {
-                try await testSession.close()
-            }, throws: { error in
-                error.localizedDescription == "The Xcode build system has crashed. Build again to continue."
-            })
+            await #expect(
+                performing: {
+                    try await testSession.close()
+                },
+                throws: { error in
+                    error.localizedDescription == "The Xcode build system has crashed. Build again to continue."
+                }
+            )
         }
     }
 
@@ -1252,7 +1409,8 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
 
                 let srcroot = tmpDir.join("Test")
                 let testTarget = TestStandardTarget(
-                    "Foo", type: .staticLibrary,
+                    "Foo",
+                    type: .staticLibrary,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -1261,19 +1419,24 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                 "USE_HEADERMAP": "NO",
                                 // We run a task which will never finish.
                                 "CC": "/usr/bin/yes",
-                            ])],
+                            ]
+                        )
+                    ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("foo.c")]),
-                    ])
+                        TestSourcesBuildPhase([TestBuildFile("foo.c")])
+                    ]
+                )
                 let testProject = TestProject(
                     "aProject",
                     defaultConfigurationName: "Release",
                     groupTree: TestGroup("Foo", children: [TestFile("foo.c")]),
-                    targets: [testTarget])
+                    targets: [testTarget]
+                )
                 let testWorkspace = TestWorkspace(
                     "aWorkspace",
                     sourceRoot: srcroot,
-                    projects: [testProject])
+                    projects: [testProject]
+                )
 
                 let fs = localFS
                 let tester = try await CoreQualificationTester(testWorkspace, testSession, fs: fs)
@@ -1323,7 +1486,8 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
 
                 let srcroot = tmpDir.join("Test")
                 let testTarget = TestStandardTarget(
-                    "Foo", type: .staticLibrary,
+                    "Foo",
+                    type: .staticLibrary,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -1332,19 +1496,24 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                 "USE_HEADERMAP": "NO",
                                 // We run a task which will never finish.
                                 "CC": "/usr/bin/yes",
-                            ])],
+                            ]
+                        )
+                    ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("foo.c")]),
-                    ])
+                        TestSourcesBuildPhase([TestBuildFile("foo.c")])
+                    ]
+                )
                 let testProject = TestProject(
                     "aProject",
                     defaultConfigurationName: "Release",
                     groupTree: TestGroup("Foo", children: [TestFile("foo.c")]),
-                    targets: [testTarget])
+                    targets: [testTarget]
+                )
                 let testWorkspace = TestWorkspace(
                     "aWorkspace",
                     sourceRoot: srcroot,
-                    projects: [testProject])
+                    projects: [testProject]
+                )
 
                 let fs = localFS
                 let tester = try await CoreQualificationTester(testWorkspace, testSession, fs: fs)
@@ -1395,7 +1564,8 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
 
                 let srcroot = tmpDir.join("Test")
                 let testTarget = TestStandardTarget(
-                    "Foo", type: .staticLibrary,
+                    "Foo",
+                    type: .staticLibrary,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -1404,19 +1574,24 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                 "USE_HEADERMAP": "NO",
                                 // We run a task which will never finish.
                                 "CC": "/usr/bin/yes",
-                            ])],
+                            ]
+                        )
+                    ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("foo.c")]),
-                    ])
+                        TestSourcesBuildPhase([TestBuildFile("foo.c")])
+                    ]
+                )
                 let testProject = TestProject(
                     "aProject",
                     defaultConfigurationName: "Release",
                     groupTree: TestGroup("Foo", children: [TestFile("foo.c")]),
-                    targets: [testTarget])
+                    targets: [testTarget]
+                )
                 let testWorkspace = TestWorkspace(
                     "aWorkspace",
                     sourceRoot: srcroot,
-                    projects: [testProject])
+                    projects: [testProject]
+                )
 
                 let fs = localFS
                 let tester = try await CoreQualificationTester(testWorkspace, testSession, fs: fs)
@@ -1477,7 +1652,8 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
 
                 let srcroot = tmpDir.join("Test")
                 let testTarget = TestStandardTarget(
-                    "Foo", type: .staticLibrary,
+                    "Foo",
+                    type: .staticLibrary,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -1486,19 +1662,24 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                 "USE_HEADERMAP": "NO",
                                 // We run a task which will never finish.
                                 "CC": "/usr/bin/yes",
-                            ])],
+                            ]
+                        )
+                    ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("foo.c")]),
-                    ])
+                        TestSourcesBuildPhase([TestBuildFile("foo.c")])
+                    ]
+                )
                 let testProject = TestProject(
                     "aProject",
                     defaultConfigurationName: "Release",
                     groupTree: TestGroup("Foo", children: [TestFile("foo.c")]),
-                    targets: [testTarget])
+                    targets: [testTarget]
+                )
                 let testWorkspace = TestWorkspace(
                     "aWorkspace",
                     sourceRoot: srcroot,
-                    projects: [testProject])
+                    projects: [testProject]
+                )
 
                 let fs = localFS
                 let tester = try await CoreQualificationTester(testWorkspace, testSession, fs: fs)
@@ -1557,7 +1738,8 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
 
                 let srcroot = tmpDir.join("Test")
                 let testTarget = TestStandardTarget(
-                    "Foo", type: .staticLibrary,
+                    "Foo",
+                    type: .staticLibrary,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -1566,19 +1748,24 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                 "USE_HEADERMAP": "NO",
                                 // We run a task which will never finish.
                                 "CC": "/usr/bin/yes",
-                            ])],
+                            ]
+                        )
+                    ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("foo.c")]),
-                    ])
+                        TestSourcesBuildPhase([TestBuildFile("foo.c")])
+                    ]
+                )
                 let testProject = TestProject(
                     "aProject",
                     defaultConfigurationName: "Release",
                     groupTree: TestGroup("Foo", children: [TestFile("foo.c")]),
-                    targets: [testTarget])
+                    targets: [testTarget]
+                )
                 let testWorkspace = TestWorkspace(
                     "aWorkspace",
                     sourceRoot: srcroot,
-                    projects: [testProject])
+                    projects: [testProject]
+                )
 
                 let fs = localFS
                 let tester = try await CoreQualificationTester(testWorkspace, testSession, fs: fs)
@@ -1631,26 +1818,32 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
 
                 let srcroot = tmpDir.join("Test")
                 let testTarget = TestStandardTarget(
-                    "Foo", type: .staticLibrary,
+                    "Foo",
+                    type: .staticLibrary,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "USE_HEADERMAP": "NO",
-                            ])],
+                            ]
+                        )
+                    ],
                     buildPhases: [
-                        TestSourcesBuildPhase([TestBuildFile("foo.c")]),
-                    ])
+                        TestSourcesBuildPhase([TestBuildFile("foo.c")])
+                    ]
+                )
                 let testProject = TestProject(
                     "aProject",
                     defaultConfigurationName: "Release",
                     groupTree: TestGroup("Foo", children: [TestFile("foo.c")]),
-                    targets: [testTarget])
+                    targets: [testTarget]
+                )
                 let testWorkspace = TestWorkspace(
                     "aWorkspace",
                     sourceRoot: srcroot,
-                    projects: [testProject])
+                    projects: [testProject]
+                )
 
                 try await testSession.sendPIF(testWorkspace)
 
@@ -1716,7 +1909,8 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                     do {
                         let srcroot = tmpDir.join("Test")
                         testTarget = TestStandardTarget(
-                            "Foo", type: .staticLibrary,
+                            "Foo",
+                            type: .staticLibrary,
                             buildConfigurations: [
                                 TestBuildConfiguration(
                                     "Debug",
@@ -1725,19 +1919,24 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                         "USE_HEADERMAP": "NO",
                                         // We run a task which will never finish.
                                         "CC": "/usr/bin/yes",
-                                    ])],
+                                    ]
+                                )
+                            ],
                             buildPhases: [
-                                TestSourcesBuildPhase([TestBuildFile("foo.c")]),
-                            ])
+                                TestSourcesBuildPhase([TestBuildFile("foo.c")])
+                            ]
+                        )
                         let testProject = TestProject(
                             "aProject",
                             defaultConfigurationName: "Release",
                             groupTree: TestGroup("Foo", children: [TestFile("foo.c")]),
-                            targets: [testTarget])
+                            targets: [testTarget]
+                        )
                         let testWorkspace = TestWorkspace(
                             "aWorkspace",
                             sourceRoot: srcroot,
-                            projects: [testProject])
+                            projects: [testProject]
+                        )
 
                         // Write the test file.
                         try localFS.createDirectory(testWorkspace.sourceRoot.join("aProject"), recursive: true)
@@ -1774,7 +1973,7 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
     }
 
     /// Check scraped build issues.
-    @Test(.requireSDKs(.macOS), .skipHostOS(.windows)) // relies on UNIX shell, consider adding Windows command shell support for script phases?
+    @Test(.requireSDKs(.macOS), .skipHostOS(.windows))  // relies on UNIX shell, consider adding Windows command shell support for script phases?
     func buildScriptIssues() async throws {
         try await withTemporaryDirectory { temporaryDirectory in
             try await withAsyncDeferrable { deferrable in
@@ -1791,24 +1990,32 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                     "Target",
                     buildPhases: [
                         TestShellScriptBuildPhase(
-                            name: "Script1", originalObjectID: "Script1", contents: (OutputByteStream()
-                                                                                     <<< "echo 'foo:1:1: error: bar'\n"
-                                                                                     <<< "echo 'foo:1:1: warning: bar'\n"
-                                                                                     <<< "echo 'foo:1:1: note: bar'\n"
-                                                                                     <<< "echo 'foo: error: bar'\n"
-                                                                                     <<< "echo 'foo: warning: bar'\n"
-                                                                                     <<< "echo 'foo: note: bar'\n"
-                                                                                    ).bytes.asString, inputs: [], outputs: [], alwaysOutOfDate: true)
+                            name: "Script1",
+                            originalObjectID: "Script1",
+                            contents: (OutputByteStream()
+                                <<< "echo 'foo:1:1: error: bar'\n"
+                                <<< "echo 'foo:1:1: warning: bar'\n"
+                                <<< "echo 'foo:1:1: note: bar'\n"
+                                <<< "echo 'foo: error: bar'\n"
+                                <<< "echo 'foo: warning: bar'\n"
+                                <<< "echo 'foo: note: bar'\n").bytes.asString,
+                            inputs: [],
+                            outputs: [],
+                            alwaysOutOfDate: true
+                        )
                     ]
                 )
                 let testProject = TestProject(
                     "aProject",
                     defaultConfigurationName: "Release",
                     groupTree: TestGroup("Foo"),
-                    targets: [testTarget])
-                let testWorkspace = TestWorkspace("aWorkspace",
-                                                  sourceRoot: srcroot,
-                                                  projects: [testProject])
+                    targets: [testTarget]
+                )
+                let testWorkspace = TestWorkspace(
+                    "aWorkspace",
+                    sourceRoot: srcroot,
+                    projects: [testProject]
+                )
 
                 let tester = try await CoreQualificationTester(testWorkspace, testSession)
 
@@ -1838,17 +2045,19 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 }
 
                 let reportedBuildDescriptionID = try #require(events.reportBuildDescriptionMessage?.buildDescriptionID)
-                #expect(events.allOutput().bytes.unsafeStringValue == """
-            Build description signature: \(reportedBuildDescriptionID)
-            Build description path: \(tmpDir.str)/Test/aProject/build/XCBuildData/\(reportedBuildDescriptionID).xcbuilddata
-            foo:1:1: error: bar
-            foo:1:1: warning: bar
-            foo:1:1: note: bar
-            foo: error: bar
-            foo: warning: bar
-            foo: note: bar
-
-            """)
+                #expect(
+                    events.allOutput().bytes.unsafeStringValue == """
+                        Build description signature: \(reportedBuildDescriptionID)
+                        Build description path: \(tmpDir.str)/Test/aProject/build/XCBuildData/\(reportedBuildDescriptionID).xcbuilddata
+                        foo:1:1: error: bar
+                        foo:1:1: warning: bar
+                        foo:1:1: note: bar
+                        foo: error: bar
+                        foo: warning: bar
+                        foo: note: bar
+
+                        """
+                )
             }
         }
     }
@@ -1869,7 +2078,8 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 }
 
                 let testTargetA = TestStandardTarget(
-                    "aTarget", type: .framework,
+                    "aTarget",
+                    type: .framework,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -1878,15 +2088,21 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "USE_HEADERMAP": "YES",
                                 "ALWAYS_SEARCH_USER_PATHS": "NO",
-                            ])],
-                    buildPhases: [TestSourcesBuildPhase(["foo.c"])])
+                            ]
+                        )
+                    ],
+                    buildPhases: [TestSourcesBuildPhase(["foo.c"])]
+                )
                 let testProject1 = TestProject(
                     "aProject",
                     groupTree: TestGroup("Sources", children: [TestFile("foo.c")]),
-                    targets: [testTargetA])
-                let testWorkspace1 = TestWorkspace("aWorkspace",
-                                                   sourceRoot: tmpDir.join("Test"),
-                                                   projects: [testProject1])
+                    targets: [testTargetA]
+                )
+                let testWorkspace1 = TestWorkspace(
+                    "aWorkspace",
+                    sourceRoot: tmpDir.join("Test"),
+                    projects: [testProject1]
+                )
                 let SRCROOT = testWorkspace1.sourceRoot.join("aProject")
 
                 let fs = localFS
@@ -1897,8 +2113,11 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 }
 
                 let transferred1 = try await testSession.sendPIFIncrementally(testWorkspace1)
-                #expect(transferred1 == [
-                    testWorkspace1.signature, testProject1.signature, testTargetA.signature])
+                #expect(
+                    transferred1 == [
+                        testWorkspace1.signature, testProject1.signature, testTargetA.signature,
+                    ]
+                )
 
                 // Run a test build.
                 var request = SWBBuildRequest()
@@ -1922,14 +2141,20 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 let testProject2 = TestProject(
                     "aProject",
                     groupTree: TestGroup("Sources", children: [TestFile("foo.c"), TestFile("baz.c")]),
-                    targets: [testTargetA])
-                let testWorkspace2 = TestWorkspace("aWorkspace",
-                                                   sourceRoot: tmpDir.join("Test"),
-                                                   projects: [testProject2])
+                    targets: [testTargetA]
+                )
+                let testWorkspace2 = TestWorkspace(
+                    "aWorkspace",
+                    sourceRoot: tmpDir.join("Test"),
+                    projects: [testProject2]
+                )
 
                 let transferred2 = try await testSession.sendPIFIncrementally(testWorkspace2)
-                #expect(transferred2 == [
-                    testWorkspace2.signature, testProject2.signature])
+                #expect(
+                    transferred2 == [
+                        testWorkspace2.signature, testProject2.signature,
+                    ]
+                )
                 do {
                     let events = try await testSession.runBuildOperation(request: request, delegate: TestBuildOperationDelegate())
 
@@ -1943,12 +2168,17 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                 }
 
                 // Build once again with a new workspace but shared project, but a new build request (to force task reconstruction).
-                let testWorkspace3 = TestWorkspace("aWorkspace",
-                                                   sourceRoot: tmpDir.join("Test"),
-                                                   projects: [testProject1])
+                let testWorkspace3 = TestWorkspace(
+                    "aWorkspace",
+                    sourceRoot: tmpDir.join("Test"),
+                    projects: [testProject1]
+                )
                 let transferred3 = try await testSession.sendPIFIncrementally(testWorkspace3)
-                #expect(transferred3 == [
-                    testWorkspace3.signature])
+                #expect(
+                    transferred3 == [
+                        testWorkspace3.signature
+                    ]
+                )
                 do {
                     let events = try await testSession.runBuildOperation(request: request, delegate: TestBuildOperationDelegate())
 
@@ -1988,11 +2218,11 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                 "G1",
                                 children: [
                                     TestFile("aFramework.framework"),
-                                    TestFile("bFramework", path: "bFramework.framework/Versions/A/bFramework", fileType: "compiled.mach-o.executable", sourceTree: .buildSetting("BUILT_PRODUCTS_DIR"))
+                                    TestFile("bFramework", path: "bFramework.framework/Versions/A/bFramework", fileType: "compiled.mach-o.executable", sourceTree: .buildSetting("BUILT_PRODUCTS_DIR")),
                                 ]
                             ),
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: [:]),
+                                TestBuildConfiguration("Debug", buildSettings: [:])
                             ],
                             targets: [
                                 TestStandardTarget(
@@ -2000,13 +2230,13 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                     guid: "Foo",
                                     type: .application,
                                     buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"]),
+                                        TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "anApp"])
                                     ],
                                     buildPhases: [
                                         TestFrameworksBuildPhase([
                                             "aFramework.framework",
                                             "bFramework",
-                                        ]),
+                                        ])
                                     ]
                                 )
                             ]
@@ -2015,39 +2245,38 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                             "P2",
                             groupTree: TestGroup(
                                 "G2",
-                                children:[
-                                ]
+                                children: []
                             ),
                             buildConfigurations: [
-                                TestBuildConfiguration("Debug", buildSettings: [:]),
+                                TestBuildConfiguration("Debug", buildSettings: [:])
                             ],
                             targets: [
                                 TestStandardTarget(
                                     "aFramework1",
                                     type: .framework,
                                     buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"]),
+                                        TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"])
                                     ]
                                 ),
                                 TestStandardTarget(
                                     "aFramework2",
                                     type: .framework,
                                     buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"]),
+                                        TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "aFramework"])
                                     ]
                                 ),
                                 TestStandardTarget(
                                     "bFramework1",
                                     type: .framework,
                                     buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "bFramework"]),
+                                        TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "bFramework"])
                                     ]
                                 ),
                                 TestStandardTarget(
                                     "bFramework2",
                                     type: .framework,
                                     buildConfigurations: [
-                                        TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "bFramework"]),
+                                        TestBuildConfiguration("Debug", buildSettings: ["PRODUCT_NAME": "bFramework"])
                                     ]
                                 ),
                             ]
@@ -2105,10 +2334,10 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                             guid: "BS1",
                             originalObjectID: "A.Script",
                             contents: (OutputByteStream()
-                                       <<< "echo test"
-                                      ).bytes.asString,
+                                <<< "echo test").bytes.asString,
                             inputs: [],
-                            outputs: [])
+                            outputs: []
+                        )
                     ]
                 )
 
@@ -2116,18 +2345,21 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                     "aWorkspace",
                     guid: "W1",
                     sourceRoot: srcroot,
-                    projects: [TestProject(
-                        "aProject",
-                        guid: "P1",
-                        defaultConfigurationName: "Debug",
-                        groupTree: TestGroup(
-                            "Foo",
-                            guid: "G1"
-                        ),
-                        targets: [
-                            testTarget,
-                        ]
-                    )])
+                    projects: [
+                        TestProject(
+                            "aProject",
+                            guid: "P1",
+                            defaultConfigurationName: "Debug",
+                            groupTree: TestGroup(
+                                "Foo",
+                                guid: "G1"
+                            ),
+                            targets: [
+                                testTarget
+                            ]
+                        )
+                    ]
+                )
 
                 var request = SWBBuildRequest()
                 request.parameters = SWBBuildParameters()
@@ -2165,8 +2397,9 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                         TestSourcesBuildPhase([
                             "file1.swift",
                             "file2.swift",
-                        ]),
-                    ])
+                        ])
+                    ]
+                )
 
                 let testWorkspace = try await TestWorkspace(
                     "Test",
@@ -2180,7 +2413,8 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                 children: [
                                     TestFile("file1.swift"),
                                     TestFile("file2.swift"),
-                                ]),
+                                ]
+                            ),
                             buildConfigurations: [
                                 TestBuildConfiguration(
                                     "Debug",
@@ -2193,11 +2427,14 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                         "ARCHS": "arm64e",
 
                                         // This file does not exist and should fail the build
-                                        "SWIFT_OBJC_BRIDGING_HEADER": "foo.h"
-                                    ])
+                                        "SWIFT_OBJC_BRIDGING_HEADER": "foo.h",
+                                    ]
+                                )
                             ],
-                            targets: [ testTarget ])
-                    ])
+                            targets: [testTarget]
+                        )
+                    ]
+                )
 
                 let fs = localFS
                 let tester = try await CoreQualificationTester(testWorkspace, testSession, fs: fs)
@@ -2245,7 +2482,8 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
 
                 let srcroot = tmpDirPath.join("Test")
                 let testTarget = TestStandardTarget(
-                    "Tool", type: .framework,
+                    "Tool",
+                    type: .framework,
                     buildConfigurations: [
                         TestBuildConfiguration(
                             "Debug",
@@ -2256,23 +2494,34 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
                                 "GENERATE_INFOPLIST_FILE": "YES",
                                 "USE_HEADERMAP": "NO",
                                 "ALWAYS_SEARCH_USER_PATHS": "NO",
-                                "SWIFT_ENABLE_EXPLICIT_MODULES": "NO"
-                            ])],
+                                "SWIFT_ENABLE_EXPLICIT_MODULES": "NO",
+                            ]
+                        )
+                    ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("File1.swift"),
-                            TestBuildFile("File2.swift")]),
-                    ])
+                            TestBuildFile("File2.swift"),
+                        ])
+                    ]
+                )
                 let testProject = TestProject(
                     "aProject",
                     defaultConfigurationName: "Release",
-                    groupTree: TestGroup("Foo", children: [
-                        TestFile("File1.swift"),
-                        TestFile("File2.swift")]),
-                    targets: [testTarget])
-                let testWorkspace = TestWorkspace("aWorkspace",
-                                                  sourceRoot: srcroot,
-                                                  projects: [testProject])
+                    groupTree: TestGroup(
+                        "Foo",
+                        children: [
+                            TestFile("File1.swift"),
+                            TestFile("File2.swift"),
+                        ]
+                    ),
+                    targets: [testTarget]
+                )
+                let testWorkspace = TestWorkspace(
+                    "aWorkspace",
+                    sourceRoot: srcroot,
+                    projects: [testProject]
+                )
                 let SRCROOT = testWorkspace.sourceRoot.join("aProject")
 
                 let fs = localFS
diff --git a/Tests/SwiftBuildTests/ConsoleCommands/BuildCommandTests.swift b/Tests/SwiftBuildTests/ConsoleCommands/BuildCommandTests.swift
index 7bb4e1f5..98173780 100644
--- a/Tests/SwiftBuildTests/ConsoleCommands/BuildCommandTests.swift
+++ b/Tests/SwiftBuildTests/ConsoleCommands/BuildCommandTests.swift
@@ -26,7 +26,7 @@ fileprivate struct BuildCommandTests {
             "guid": "W1",
             "name": "aWorkspace",
             "path": .plString(basePath.join("aWorkspace.xcworkspace").join("contents.xcworkspacedata").str),
-            "projects": ["P1"]
+            "projects": ["P1"],
         ]
         let projectPIF: SWBPropertyListItem = [
             "guid": "P1",
@@ -37,7 +37,7 @@ fileprivate struct BuildCommandTests {
                 "type": "group",
                 "name": "SomeFiles",
                 "sourceTree": "PROJECT_DIR",
-                "path": .plString(basePath.join("SomeProject").join("SomeFiles").str)
+                "path": .plString(basePath.join("SomeProject").join("SomeFiles").str),
             ],
             "buildConfigurations": [
                 [
@@ -45,11 +45,11 @@ fileprivate struct BuildCommandTests {
                     "name": "Config1",
                     "buildSettings": [
                         "USER_PROJECT_SETTING": "USER_PROJECT_VALUE"
-                    ]
+                    ],
                 ]
             ],
             "defaultConfigurationName": "Config1",
-            "developmentRegion": "English"
+            "developmentRegion": "English",
         ]
         let targetPIF: SWBPropertyListItem = [
             "guid": "T1",
@@ -63,37 +63,37 @@ fileprivate struct BuildCommandTests {
                     "name": "Config1",
                     "buildSettings": [
                         "USER_PROJECT_SETTING": "USER_PROJECT_VALUE"
-                    ]
+                    ],
                 ]
             ],
             "dependencies": [],
             "productTypeIdentifier": "com.apple.product-type.tool",
             "productReference": [
                 "guid": "PR1",
-                "name": "aTarget"
-            ]
+                "name": "aTarget",
+            ],
         ]
         let topLevelPIF: SWBPropertyListItem = [
             [
                 "type": "workspace",
                 "signature": "W1",
-                "contents": workspacePIF
+                "contents": workspacePIF,
             ],
             [
                 "type": "project",
                 "signature": "P1",
-                "contents": projectPIF
+                "contents": projectPIF,
             ],
             [
                 "type": "target",
                 "signature": "T1",
-                "contents": targetPIF
-            ]
+                "contents": targetPIF,
+            ],
         ]
         return topLevelPIF
     }
 
-    @Test(.skipHostOS(.windows)) // PTY not supported on Windows
+    @Test(.skipHostOS(.windows))  // PTY not supported on Windows
     func buildCommandWithPIF() async throws {
         let supportedPIFFileExtensions = ["json", "pif"]
         for fileExtension in supportedPIFFileExtensions {
@@ -116,7 +116,7 @@ fileprivate struct BuildCommandTests {
         }
     }
 
-    @Test(.skipHostOS(.windows)) // PTY not supported on Windows
+    @Test(.skipHostOS(.windows))  // PTY not supported on Windows
     func buildCommandWithPIFRelativePath() async throws {
         let supportedPIFFileExtensions = ["json", "pif"]
         for fileExtension in supportedPIFFileExtensions {
@@ -143,7 +143,7 @@ fileprivate struct BuildCommandTests {
         }
     }
 
-    @Test(.skipHostOS(.windows)) // PTY not supported on Windows
+    @Test(.skipHostOS(.windows))  // PTY not supported on Windows
     func buildCommandWithPIFAndTargetOverride() async throws {
         let supportedPIFFileExtensions = ["json", "pif"]
         for fileExtension in supportedPIFFileExtensions {
@@ -166,10 +166,14 @@ fileprivate struct BuildCommandTests {
                     // for the build request _and_ the build request's targets,
                     // otherwise the targets will fall back to the default SYMROOT
                     // of $PROJECT_DIR/build
-                    #expect(!localFS.exists(tmp.join("build")),
-                            "unexpectedly built into the default SYMROOT instead of the build arena")
-                    #expect(localFS.exists(tmp.join(".buildData/Products/Config1\(SWBRunDestinationInfo.host.builtProductsDirSuffix)")),
-                            "could not find configuration build directory in build arena")
+                    #expect(
+                        !localFS.exists(tmp.join("build")),
+                        "unexpectedly built into the default SYMROOT instead of the build arena"
+                    )
+                    #expect(
+                        localFS.exists(tmp.join(".buildData/Products/Config1\(SWBRunDestinationInfo.host.builtProductsDirSuffix)")),
+                        "could not find configuration build directory in build arena"
+                    )
                 }
             }
         }
@@ -189,7 +193,7 @@ fileprivate struct BuildCommandTests {
         }
     }
 
-    @Test(.requireHostOS(.macOS)) // uses xcodebuild
+    @Test(.requireHostOS(.macOS))  // uses xcodebuild
     func buildCommandWithXcodeProject() async throws {
         let projectPath = try #require(Bundle.module.resourceURL)
             .appendingPathComponent("TestData")
@@ -209,7 +213,7 @@ fileprivate struct BuildCommandTests {
         }
     }
 
-    @Test(.requireHostOS(.macOS)) // uses xcodebuild
+    @Test(.requireHostOS(.macOS))  // uses xcodebuild
     func buildCommandWithXcodeWorkspace() async throws {
         let workspacePath = try #require(Bundle.module.resourceURL)
             .appendingPathComponent("TestData")
@@ -229,7 +233,7 @@ fileprivate struct BuildCommandTests {
         }
     }
 
-    @Test(.requireHostOS(.macOS)) // uses xcodebuild
+    @Test(.requireHostOS(.macOS))  // uses xcodebuild
     func buildCommandWithSwiftPackage() async throws {
         let packagePath = try #require(Bundle.module.resourceURL)
             .appendingPathComponent("TestData")
diff --git a/Tests/SwiftBuildTests/ConsoleCommands/CLIConnection.swift b/Tests/SwiftBuildTests/ConsoleCommands/CLIConnection.swift
index 7de7fb62..4c800598 100644
--- a/Tests/SwiftBuildTests/ConsoleCommands/CLIConnection.swift
+++ b/Tests/SwiftBuildTests/ConsoleCommands/CLIConnection.swift
@@ -18,12 +18,12 @@ import SWBLibc
 import SwiftBuild
 
 #if os(Windows)
-import WinSDK
-#if canImport(System)
-import System
-#else
-import SystemPackage
-#endif
+    import WinSDK
+    #if canImport(System)
+        import System
+    #else
+        import SystemPackage
+    #endif
 #endif
 
 /// Helper class for talking to 'swbuild' the tool
@@ -62,8 +62,8 @@ final class CLIConnection {
         }
 
         #if SWIFT_PACKAGE
-        // Add the parent directory of the bundle containing the build service (the package build directory)
-        searchPaths.append(Bundle(for: SWBBuildService.self).bundleURL.deletingLastPathComponent())
+            // Add the parent directory of the bundle containing the build service (the package build directory)
+            searchPaths.append(Bundle(for: SWBBuildService.self).bundleURL.deletingLastPathComponent())
         #endif
 
         return searchPaths
@@ -82,16 +82,18 @@ final class CLIConnection {
 
     static var environment: Environment {
         var env = Environment.current.filter(keys: [
-            "PATH", // important to allow swift to be looked up in PATH on Windows/Linux
+            "PATH",  // important to allow swift to be looked up in PATH on Windows/Linux
             "DEVELOPER_DIR",
             "DYLD_FRAMEWORK_PATH",
             "DYLD_LIBRARY_PATH",
             "LLVM_PROFILE_FILE",
-            "MallocNanoZone"
-        ]).addingContents(of: Environment([
-            // Prevent locally-enabled MSL from failing several tests because MSL prints messages to standard output streams.
-            "EnableMallocStackLoggingLiteOnStart": "0"
-        ]))
+            "MallocNanoZone",
+        ]).addingContents(
+            of: Environment([
+                // Prevent locally-enabled MSL from failing several tests because MSL prints messages to standard output streams.
+                "EnableMallocStackLoggingLiteOnStart": "0"
+            ])
+        )
         // For Windows when running in an IDE like VS Code
         if env[.path] == nil, let swiftRuntimePath = try? swiftRuntimePath() {
             env[.path] = swiftRuntimePath.str
@@ -105,41 +107,41 @@ final class CLIConnection {
 
     fileprivate init(currentDirectory: Path? = nil) async throws {
         #if os(Windows)
-        throw StubError.error("PTY not supported on Windows")
+            throw StubError.error("PTY not supported on Windows")
         #else
-        temporaryDirectory = try NamedTemporaryDirectory()
+            temporaryDirectory = try NamedTemporaryDirectory()
 
-        // Allocate a PTY we can use to talk to the tool.
-        var monitorFD = Int32(0)
-        var sessionFD = Int32(0)
-        if openpty(&monitorFD, &sessionFD, nil, nil, nil) != 0 {
-            throw POSIXError(errno, context: "openpty")
-        }
-        _ = fcntl(monitorFD, F_SETFD, FD_CLOEXEC)
-        _ = fcntl(sessionFD, F_SETFD, FD_CLOEXEC)
-
-        monitorHandle = FileHandle(fileDescriptor: monitorFD, closeOnDealloc: true)
-        let sessionHandle = FileHandle(fileDescriptor: sessionFD, closeOnDealloc: true)
-
-        // Launch the tool.
-        task = Process()
-        task.executableURL = try CLIConnection.swiftbuildToolURL
-        task.currentDirectoryURL = URL(fileURLWithPath: (currentDirectory ?? temporaryDirectory.path).str)
-        task.standardInput = sessionHandle
-        task.standardOutput = sessionHandle
-        task.standardError = sessionHandle
-        task.environment = .init(Self.environment)
-        do {
-            exitPromise = try task.launch()
-        } catch {
-            throw StubError.error("Failed to launch the CLI connection: \(error)")
-        }
+            // Allocate a PTY we can use to talk to the tool.
+            var monitorFD = Int32(0)
+            var sessionFD = Int32(0)
+            if openpty(&monitorFD, &sessionFD, nil, nil, nil) != 0 {
+                throw POSIXError(errno, context: "openpty")
+            }
+            _ = fcntl(monitorFD, F_SETFD, FD_CLOEXEC)
+            _ = fcntl(sessionFD, F_SETFD, FD_CLOEXEC)
+
+            monitorHandle = FileHandle(fileDescriptor: monitorFD, closeOnDealloc: true)
+            let sessionHandle = FileHandle(fileDescriptor: sessionFD, closeOnDealloc: true)
+
+            // Launch the tool.
+            task = Process()
+            task.executableURL = try CLIConnection.swiftbuildToolURL
+            task.currentDirectoryURL = URL(fileURLWithPath: (currentDirectory ?? temporaryDirectory.path).str)
+            task.standardInput = sessionHandle
+            task.standardOutput = sessionHandle
+            task.standardError = sessionHandle
+            task.environment = .init(Self.environment)
+            do {
+                exitPromise = try task.launch()
+            } catch {
+                throw StubError.error("Failed to launch the CLI connection: \(error)")
+            }
 
-        // Close the session handle, so the FD will close once the service stops.
-        try sessionHandle.close()
+            // Close the session handle, so the FD will close once the service stops.
+            try sessionHandle.close()
 
-        outputStream = monitorHandle._bytes()
-        outputStreamIterator = outputStream.flattened.cliResponses.makeAsyncIterator()
+            outputStream = monitorHandle._bytes()
+            outputStreamIterator = outputStream.flattened.cliResponses.makeAsyncIterator()
         #endif
     }
 
@@ -164,27 +166,27 @@ final class CLIConnection {
 
     static func terminate(processIdentifier: Int32) throws {
         #if os(Windows)
-        guard let proc = OpenProcess(DWORD(PROCESS_TERMINATE), false, DWORD(processIdentifier)) else {
-            throw Win32Error(GetLastError())
-        }
-        defer { CloseHandle(proc) }
-        if !TerminateProcess(proc, UINT(0xC0000000 | DWORD(9))) {
-            throw Win32Error(GetLastError())
-        }
+            guard let proc = OpenProcess(DWORD(PROCESS_TERMINATE), false, DWORD(processIdentifier)) else {
+                throw Win32Error(GetLastError())
+            }
+            defer { CloseHandle(proc) }
+            if !TerminateProcess(proc, UINT(0xC0000000 | DWORD(9))) {
+                throw Win32Error(GetLastError())
+            }
         #else
-        if SWBLibc.kill(processIdentifier, SIGKILL) != 0 { // ignore-unacceptable-language; POSIX API
-            throw POSIXError(errno, context: "kill", String(processIdentifier), String(SIGKILL)) // ignore-unacceptable-language; POSIX API
-        }
+            if SWBLibc.kill(processIdentifier, SIGKILL) != 0 {  // ignore-unacceptable-language; POSIX API
+                throw POSIXError(errno, context: "kill", String(processIdentifier), String(SIGKILL))  // ignore-unacceptable-language; POSIX API
+            }
         #endif
     }
 
     func send(command: String) throws {
         #if !os(Windows)
-        // Give readline a chance to disable the terminal echo attribute by
-        // waiting for a few ms. This works around a non-deterministic issue
-        // where the user input may be echoed back to the terminal twice on
-        // occasion, prompting test failures <rdar://51241102>.
-        usleep(10)
+            // Give readline a chance to disable the terminal echo attribute by
+            // waiting for a few ms. This works around a non-deterministic issue
+            // where the user input may be echoed back to the terminal twice on
+            // occasion, prompting test failures <rdar://51241102>.
+            usleep(10)
         #endif
         try monitorHandle.write(contentsOf: Data(command.appending("\n").utf8))
     }
@@ -252,12 +254,12 @@ public struct AsyncCLIConnectionResponseSequence<Base: AsyncSequence>: AsyncSequ
                         // The result of a read operation when pty session is closed is platform-dependent.
                         // BSDs send EOF, Linux raises EIO...
                         #if os(Linux) || os(Android)
-                        if error.code == EIO {
-                            if reply.isEmpty {
-                                return nil
+                            if error.code == EIO {
+                                if reply.isEmpty {
+                                    return nil
+                                }
+                                break
                             }
-                            break
-                        }
                         #endif
                         throw error
                     }
@@ -284,12 +286,12 @@ public struct AsyncCLIConnectionResponseSequence<Base: AsyncSequence>: AsyncSequ
                     // The result of a read operation when pty session is closed is platform-dependent.
                     // BSDs send EOF, Linux raises EIO...
                     #if os(Linux) || os(Android)
-                    if error.code == EIO {
-                        if reply.isEmpty {
-                            return nil
+                        if error.code == EIO {
+                            if reply.isEmpty {
+                                return nil
+                            }
+                            break
                         }
-                        break
-                    }
                     #endif
                     throw error
                 }
@@ -313,29 +315,29 @@ extension AsyncSequence where Self.Element == UInt8 {
     }
 }
 
-extension AsyncCLIConnectionResponseSequence: Sendable where Base: Sendable { }
+extension AsyncCLIConnectionResponseSequence: Sendable where Base: Sendable {}
 
 @available(*, unavailable)
-extension AsyncCLIConnectionResponseSequence.AsyncIterator: Sendable { }
+extension AsyncCLIConnectionResponseSequence.AsyncIterator: Sendable {}
 
 fileprivate func swiftRuntimePath() throws -> Path? {
     #if os(Windows)
-    let name = "swiftCore.dll"
-    return try name.withCString(encodedAs: CInterop.PlatformUnicodeEncoding.self) { wName in
-        guard let handle = GetModuleHandleW(wName) else {
-            throw Win32Error(GetLastError())
+        let name = "swiftCore.dll"
+        return try name.withCString(encodedAs: CInterop.PlatformUnicodeEncoding.self) { wName in
+            guard let handle = GetModuleHandleW(wName) else {
+                throw Win32Error(GetLastError())
+            }
+            return try Path(SWB_GetModuleFileNameW(handle)).dirname
         }
-        return try Path(SWB_GetModuleFileNameW(handle)).dirname
-    }
     #else
-    return nil
+        return nil
     #endif
 }
 
 fileprivate func systemRoot() throws -> Path? {
     #if os(Windows)
-    return try Path(SWB_GetWindowsDirectoryW())
+        return try Path(SWB_GetWindowsDirectoryW())
     #else
-    return nil
+        return nil
     #endif
 }
diff --git a/Tests/SwiftBuildTests/ConsoleCommands/CreateXCFrameworkCommandTests.swift b/Tests/SwiftBuildTests/ConsoleCommands/CreateXCFrameworkCommandTests.swift
index ba17164f..998e10a3 100644
--- a/Tests/SwiftBuildTests/ConsoleCommands/CreateXCFrameworkCommandTests.swift
+++ b/Tests/SwiftBuildTests/ConsoleCommands/CreateXCFrameworkCommandTests.swift
@@ -35,7 +35,7 @@ fileprivate struct CreateXCFrameworkCommandTests {
         #expect(String(decoding: executionResult.stdout, as: UTF8.self) == "error: at least one framework or library must be specified." + String.newline + String.newline)
     }
 
-    @Test(.skipHostOS(.windows)) // PTY not supported on Windows
+    @Test(.skipHostOS(.windows))  // PTY not supported on Windows
     func commandInvocationInProcess() async throws {
         try await withCLIConnection { cli in
             try cli.send(command: "createXCFramework -help")
diff --git a/Tests/SwiftBuildTests/ConsoleCommands/GeneralCommandsTests.swift b/Tests/SwiftBuildTests/ConsoleCommands/GeneralCommandsTests.swift
index af1c9b8d..4d15e80f 100644
--- a/Tests/SwiftBuildTests/ConsoleCommands/GeneralCommandsTests.swift
+++ b/Tests/SwiftBuildTests/ConsoleCommands/GeneralCommandsTests.swift
@@ -17,8 +17,10 @@ import SWBUtil
 
 @Suite(.skipHostOS(.windows))
 fileprivate struct GeneralCommandsTests {
-    @Test(.skipHostOS(.windows), // PTY not supported on Windows
-        .requireHostOS(.macOS)) // something with terminal echo is different on macOS vs Linux
+    @Test(
+        .skipHostOS(.windows),  // PTY not supported on Windows
+        .requireHostOS(.macOS)
+    )  // something with terminal echo is different on macOS vs Linux
     func generalCommands() async throws {
         // Test the basic functioning of the swbuild command line tool.
         try await withCLIConnection { cli in
@@ -41,7 +43,7 @@ fileprivate struct GeneralCommandsTests {
                 "setConfig a b",
                 "showStatistics",
                 "version",
-                "quit"
+                "quit",
             ]
             for command in commands {
                 try cli.send(command: command)
@@ -64,41 +66,46 @@ fileprivate struct GeneralCommandsTests {
                 case "headermap", "serializedDiagnostics":
                     XCTAssertMatch(reply, .suffix("\(command)\r\nerror: no path specified\r\n\r\nusage: \(command) --dump path\r\nswbuild> "))
                 case "help":
-                    XCTAssertMatch(reply, .suffix("""
-                    help\r
-                    build\r
-                    clang-scan\r
-                    clearAllCaches\r
-                    createBuildDescription\r
-                    createSession\r
-                    createXCFramework\r
-                    deleteSession\r
-                    describeBuildSettings\r
-                    dumpDependencyInfo\r
-                    dumpMsgPack\r
-                    dumpPID\r
-                    exit\r
-                    generateDependencyInfo\r
-                    headermap\r
-                    help\r
-                    isAlive\r
-                    listSessions\r
-                    openIDEConsole\r
-                    prepareForIndex\r
-                    quit\r
-                    selectSession\r
-                    sendMockPIF\r
-                    serializedDiagnostics\r
-                    setConfig\r
-                    showPlatforms\r
-                    showSDKs\r
-                    showSession\r
-                    showSpecs\r
-                    showStatistics\r
-                    showToolchains\r
-                    version\r
-                    swbuild>
-                    """ + " "))
+                    XCTAssertMatch(
+                        reply,
+                        .suffix(
+                            """
+                            help\r
+                            build\r
+                            clang-scan\r
+                            clearAllCaches\r
+                            createBuildDescription\r
+                            createSession\r
+                            createXCFramework\r
+                            deleteSession\r
+                            describeBuildSettings\r
+                            dumpDependencyInfo\r
+                            dumpMsgPack\r
+                            dumpPID\r
+                            exit\r
+                            generateDependencyInfo\r
+                            headermap\r
+                            help\r
+                            isAlive\r
+                            listSessions\r
+                            openIDEConsole\r
+                            prepareForIndex\r
+                            quit\r
+                            selectSession\r
+                            sendMockPIF\r
+                            serializedDiagnostics\r
+                            setConfig\r
+                            showPlatforms\r
+                            showSDKs\r
+                            showSession\r
+                            showSpecs\r
+                            showStatistics\r
+                            showToolchains\r
+                            version\r
+                            swbuild>
+                            """ + " "
+                        )
+                    )
                 case "isAlive":
                     XCTAssertMatch(reply, .contains("is alive? yes"))
                 case "sendMockPIF":
@@ -110,10 +117,10 @@ fileprivate struct GeneralCommandsTests {
                     XCTAssertMatch(reply, .contains("swift-build.Service.messagesReceived:"))
                 case "version":
                     #if SWIFT_PACKAGE
-                    break
+                        break
                     #else
-                    let version = try SwiftBuildGetVersion()
-                    XCTAssertMatch(reply, .contains(version))
+                        let version = try SwiftBuildGetVersion()
+                        XCTAssertMatch(reply, .contains(version))
                     #endif
                 default:
                     XCTAssertMatch(reply, .suffix("quit\r\n"))
@@ -160,19 +167,21 @@ fileprivate struct GeneralCommandsTests {
             "showSpecs",
             "showStatistics",
             "showToolchains",
-            "version"
+            "version",
         ].sorted()
 
-        let commands = output.split(separator: String.newline).filter({ !$0.isEmpty }).map({ String($0)}).sorted()
+        let commands = output.split(separator: String.newline).filter({ !$0.isEmpty }).map({ String($0) }).sorted()
 
         if commands != allCommands.sorted() {
-            Issue.record("""
-                    The list of commands is incorrect.
-                    actual:
-                    \(commands.joined(separator: String.newline))
-                    expected:
-                    \(allCommands.joined(separator: String.newline))"
-                    """)
+            Issue.record(
+                """
+                The list of commands is incorrect.
+                actual:
+                \(commands.joined(separator: String.newline))
+                expected:
+                \(allCommands.joined(separator: String.newline))"
+                """
+            )
         }
     }
 
diff --git a/Tests/SwiftBuildTests/ConsoleCommands/ServiceConsoleTests.swift b/Tests/SwiftBuildTests/ConsoleCommands/ServiceConsoleTests.swift
index f0f84f26..ff08955d 100644
--- a/Tests/SwiftBuildTests/ConsoleCommands/ServiceConsoleTests.swift
+++ b/Tests/SwiftBuildTests/ConsoleCommands/ServiceConsoleTests.swift
@@ -16,13 +16,13 @@ import SWBTestSupport
 import SWBUtil
 
 #if os(Windows)
-import WinSDK
+    import WinSDK
 #endif
 
 #if canImport(System)
-import System
+    import System
 #else
-import SystemPackage
+    import SystemPackage
 #endif
 
 import SWBLibc
@@ -133,97 +133,97 @@ fileprivate struct ServiceConsoleTests {
 }
 
 #if os(Windows)
-private var SYNCHRONIZE: DWORD {
-    DWORD(WinSDK.SYNCHRONIZE)
-}
+    private var SYNCHRONIZE: DWORD {
+        DWORD(WinSDK.SYNCHRONIZE)
+    }
 
-extension HANDLE: @retroactive @unchecked Sendable {}
+    extension HANDLE: @retroactive @unchecked Sendable {}
 
-func WaitForSingleObjectAsync(_ handle: HANDLE) async throws {
-    var waitHandle: HANDLE?
-    defer {
-        if let waitHandle {
-            _ = UnregisterWait(waitHandle)
+    func WaitForSingleObjectAsync(_ handle: HANDLE) async throws {
+        var waitHandle: HANDLE?
+        defer {
+            if let waitHandle {
+                _ = UnregisterWait(waitHandle)
+            }
         }
-    }
 
-    try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Void, any Error>) in
-        if !RegisterWaitForSingleObject(
-            &waitHandle,
-            handle,
-            { context, _ in
-                let continuation = Unmanaged<AnyObject>.fromOpaque(context!).takeRetainedValue() as! CheckedContinuation<Void, any Error>
-                continuation.resume()
-            },
-            Unmanaged.passRetained(continuation as AnyObject).toOpaque(),
-            INFINITE,
-            ULONG(WT_EXECUTEONLYONCE | WT_EXECUTELONGFUNCTION)
-        ) {
-            continuation.resume(throwing: Win32Error(GetLastError()))
+        try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Void, any Error>) in
+            if !RegisterWaitForSingleObject(
+                &waitHandle,
+                handle,
+                { context, _ in
+                    let continuation = Unmanaged<AnyObject>.fromOpaque(context!).takeRetainedValue() as! CheckedContinuation<Void, any Error>
+                    continuation.resume()
+                },
+                Unmanaged.passRetained(continuation as AnyObject).toOpaque(),
+                INFINITE,
+                ULONG(WT_EXECUTEONLYONCE | WT_EXECUTELONGFUNCTION)
+            ) {
+                continuation.resume(throwing: Win32Error(GetLastError()))
+            }
         }
     }
-}
 #endif
 
 extension Processes {
     fileprivate static func exitPromise(pid: pid_t) throws -> Promise<Void, any Error> {
         let promise = Promise<Void, any Error>()
         #if os(Windows)
-        guard let proc: HANDLE = OpenProcess(SYNCHRONIZE, false, DWORD(pid)) else {
-            throw Win32Error(GetLastError())
-        }
-        defer { CloseHandle(proc) }
-        Task<Void, Never> {
-            await promise.fulfill(with: Result.catching { try await WaitForSingleObjectAsync(proc) })
-        }
+            guard let proc: HANDLE = OpenProcess(SYNCHRONIZE, false, DWORD(pid)) else {
+                throw Win32Error(GetLastError())
+            }
+            defer { CloseHandle(proc) }
+            Task<Void, Never> {
+                await promise.fulfill(with: Result.catching { try await WaitForSingleObjectAsync(proc) })
+            }
         #else
-        Task<Void, Never> {
-            func wait(pid: pid_t) throws -> Bool {
-                repeat {
+            Task<Void, Never> {
+                func wait(pid: pid_t) throws -> Bool {
+                    repeat {
+                        do {
+                            var siginfo = siginfo_t()
+                            if waitid(P_PID, id_t(pid), &siginfo, WEXITED | WNOWAIT | WNOHANG) != 0 {
+                                throw Errno(rawValue: errno)
+                            }
+                            return siginfo.si_pid == pid
+                        } catch Errno.noChildProcess {
+                            return true
+                        } catch Errno.interrupted {
+                            // ignore
+                        }
+                    } while true
+                }
+                while !Task.isCancelled {
                     do {
-                        var siginfo = siginfo_t()
-                        if waitid(P_PID, id_t(pid), &siginfo, WEXITED | WNOWAIT | WNOHANG) != 0 {
-                            throw Errno(rawValue: errno)
+                        if try wait(pid: pid) {
+                            promise.fulfill(with: ())
+                            return
                         }
-                        return siginfo.si_pid == pid
-                    } catch Errno.noChildProcess {
-                        return true
-                    } catch Errno.interrupted {
-                        // ignore
-                    }
-                } while true
-            }
-            while !Task.isCancelled {
-                do {
-                    if try wait(pid: pid) {
-                        promise.fulfill(with: ())
+                        try await Task.sleep(for: .microseconds(1000))
+                    } catch {
+                        promise.fail(throwing: error)
                         return
                     }
-                    try await Task.sleep(for: .microseconds(1000))
-                } catch {
-                    promise.fail(throwing: error)
-                    return
                 }
+                promise.fail(throwing: CancellationError())
             }
-            promise.fail(throwing: CancellationError())
-        }
         #endif
         return promise
     }
 }
 
 #if !os(Windows) && !canImport(Darwin) && !os(FreeBSD)
-fileprivate extension siginfo_t {
-    var si_pid: pid_t {
-        #if os(OpenBSD)
-        return _data._proc._pid
-        #elseif canImport(Glibc)
-        return _sifields._sigchld.si_pid
-        #elseif canImport(Musl)
-        return __si_fields.__si_common.__first.__piduid.si_pid
-        #elseif canImport(Bionic)
-        return _sifields._kill._pid
-        #endif
+    fileprivate extension siginfo_t {
+        var si_pid: pid_t {
+            #if os(OpenBSD)
+                return _data._proc._pid
+            #elseif canImport(Glibc)
+                return _sifields._sigchld.si_pid
+            #elseif canImport(Musl)
+                return __si_fields.__si_common.__first.__piduid.si_pid
+            #elseif canImport(Bionic)
+                return _sifields._kill._pid
+            #endif
+        }
     }
-}
 #endif
diff --git a/Tests/SwiftBuildTests/ConsoleCommands/SessionCommandsTests.swift b/Tests/SwiftBuildTests/ConsoleCommands/SessionCommandsTests.swift
index 73dc40f4..179c435a 100644
--- a/Tests/SwiftBuildTests/ConsoleCommands/SessionCommandsTests.swift
+++ b/Tests/SwiftBuildTests/ConsoleCommands/SessionCommandsTests.swift
@@ -16,8 +16,10 @@ import SWBUtil
 
 @Suite(.skipHostOS(.windows))
 fileprivate struct SessionCommandsTests {
-    @Test(.skipHostOS(.windows), // PTY not supported on Windows
-        .requireHostOS(.macOS)) // something with terminal echo is different on macOS vs Linux
+    @Test(
+        .skipHostOS(.windows),  // PTY not supported on Windows
+        .requireHostOS(.macOS)
+    )  // something with terminal echo is different on macOS vs Linux
     func sessionCommands() async throws {
         try await withCLIConnection { cli in
             // Create a session and send a mock PIF.
@@ -30,7 +32,7 @@ fileprivate struct SessionCommandsTests {
                 "selectSession x",
                 "selectSession S0",
                 "deleteSession S0",
-                "exit"
+                "exit",
             ]
             for command in commands {
                 try cli.send(command: command)
diff --git a/Tests/SwiftBuildTests/ConsoleCommands/XcodeCommandsTests.swift b/Tests/SwiftBuildTests/ConsoleCommands/XcodeCommandsTests.swift
index c481896e..724039b3 100644
--- a/Tests/SwiftBuildTests/ConsoleCommands/XcodeCommandsTests.swift
+++ b/Tests/SwiftBuildTests/ConsoleCommands/XcodeCommandsTests.swift
@@ -16,8 +16,10 @@ import SWBUtil
 
 @Suite(.skipHostOS(.windows))
 fileprivate struct XcodeCommandsTests {
-    @Test(.skipHostOS(.windows), // PTY not supported on Windows
-        .requireHostOS(.macOS)) // something with terminal echo is different on macOS vs Linux
+    @Test(
+        .skipHostOS(.windows),  // PTY not supported on Windows
+        .requireHostOS(.macOS)
+    )  // something with terminal echo is different on macOS vs Linux
     func XcodeCommands() async throws {
         try await withCLIConnection { cli in
             // Send the test commands.
@@ -29,7 +31,7 @@ fileprivate struct XcodeCommandsTests {
                 "showSDKs",
                 "showSpecs",
                 "showToolchains",
-                "quit"
+                "quit",
             ]
             for command in commands {
                 try cli.send(command: command)
diff --git a/Tests/SwiftBuildTests/DeferredExecutionTests.swift b/Tests/SwiftBuildTests/DeferredExecutionTests.swift
index 04a6daf8..44121b6f 100644
--- a/Tests/SwiftBuildTests/DeferredExecutionTests.swift
+++ b/Tests/SwiftBuildTests/DeferredExecutionTests.swift
@@ -29,29 +29,34 @@ fileprivate struct DeferredExecutionTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "Sources", children: [
+                    "Sources",
+                    children: [
                         TestFile("assets.xcassets"),
                         TestFile("foo.c"),
                         TestFile("foo.swift"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS": "NO",
-                        "ALWAYS_SEARCH_USER_PATHS": "NO",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ONLY_ACTIVE_ARCH": "YES",
-                        "SDKROOT": "macosx",
-                        "SWIFT_VERSION": "5.0",
-                        // Disable explicit modules here so we generate a consistent number of swift-frontend invocations that doesn't depend on the structure of the SDK
-                        "SWIFT_ENABLE_EXPLICIT_MODULES": "NO",
-                        "_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES": "NO",
-
-                        // TAPI can't read the "world's smallest dylib", so don't run that
-                        "GENERATE_INTERMEDIATE_TEXT_BASED_STUBS": "NO",
-                        // Since we don't get the linker's SDK imports output here, skip it.
-                        "ENABLE_SDK_IMPORTS": "NO",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS": "NO",
+                            "ALWAYS_SEARCH_USER_PATHS": "NO",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ONLY_ACTIVE_ARCH": "YES",
+                            "SDKROOT": "macosx",
+                            "SWIFT_VERSION": "5.0",
+                            // Disable explicit modules here so we generate a consistent number of swift-frontend invocations that doesn't depend on the structure of the SDK
+                            "SWIFT_ENABLE_EXPLICIT_MODULES": "NO",
+                            "_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES": "NO",
+
+                            // TAPI can't read the "world's smallest dylib", so don't run that
+                            "GENERATE_INTERMEDIATE_TEXT_BASED_STUBS": "NO",
+                            // Since we don't get the linker's SDK imports output here, skip it.
+                            "ENABLE_SDK_IMPORTS": "NO",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -66,8 +71,10 @@ fileprivate struct DeferredExecutionTests: CoreBasedTests {
                                 "foo.c",
                                 "foo.swift",
                             ])
-                        ]),
-                ])
+                        ]
+                    )
+                ]
+            )
 
             let SRCROOT = tmpDir.str
 
@@ -98,15 +105,17 @@ fileprivate struct DeferredExecutionTests: CoreBasedTests {
                     }
 
                     func provisioningTaskInputs(targetGUID: String, provisioningSourceData: SWBProvisioningTaskInputsSourceData) async -> SWBProvisioningTaskInputs {
-                        let signedEntitlements = provisioningSourceData.entitlementsDestination == "Signature"
-                        ? provisioningSourceData.productTypeEntitlements.merging(["application-identifier": .plString(provisioningSourceData.bundleIdentifier)], uniquingKeysWith: { _, new in new }).merging(provisioningSourceData.projectEntitlements ?? [:], uniquingKeysWith: { _, new in new })
-                        : [:]
+                        let signedEntitlements =
+                            provisioningSourceData.entitlementsDestination == "Signature"
+                            ? provisioningSourceData.productTypeEntitlements.merging(["application-identifier": .plString(provisioningSourceData.bundleIdentifier)], uniquingKeysWith: { _, new in new }).merging(provisioningSourceData.projectEntitlements ?? [:], uniquingKeysWith: { _, new in new })
+                            : [:]
 
-                        let simulatedEntitlements = provisioningSourceData.entitlementsDestination == "__entitlements"
-                        ? provisioningSourceData.productTypeEntitlements.merging(["application-identifier": .plString(provisioningSourceData.bundleIdentifier)], uniquingKeysWith: { _, new in new }).merging(provisioningSourceData.projectEntitlements ?? [:], uniquingKeysWith: { _, new in new })
-                        : [:]
+                        let simulatedEntitlements =
+                            provisioningSourceData.entitlementsDestination == "__entitlements"
+                            ? provisioningSourceData.productTypeEntitlements.merging(["application-identifier": .plString(provisioningSourceData.bundleIdentifier)], uniquingKeysWith: { _, new in new }).merging(provisioningSourceData.projectEntitlements ?? [:], uniquingKeysWith: { _, new in new })
+                            : [:]
 
-                        return SWBProvisioningTaskInputs(identityHash: "-", identityName: "-", profileName: nil, profileUUID: nil, profilePath: nil, designatedRequirements: nil, signedEntitlements: signedEntitlements.merging(provisioningSourceData.sdkRoot.contains("simulator") ? ["get-task-allow": .plBool(true)] : [:], uniquingKeysWith: { _, new  in new }), simulatedEntitlements: simulatedEntitlements, appIdentifierPrefix: nil, teamIdentifierPrefix: nil, isEnterpriseTeam: false, keychainPath: nil, errors: [], warnings: [])
+                        return SWBProvisioningTaskInputs(identityHash: "-", identityName: "-", profileName: nil, profileUUID: nil, profilePath: nil, designatedRequirements: nil, signedEntitlements: signedEntitlements.merging(provisioningSourceData.sdkRoot.contains("simulator") ? ["get-task-allow": .plBool(true)] : [:], uniquingKeysWith: { _, new in new }), simulatedEntitlements: simulatedEntitlements, appIdentifierPrefix: nil, teamIdentifierPrefix: nil, isEnterpriseTeam: false, keychainPath: nil, errors: [], warnings: [])
                     }
 
                     func executeExternalTool(commandLine: [String], workingDirectory: String?, environment: [String: String]) async throws -> SWBExternalToolResult {
@@ -118,9 +127,9 @@ fileprivate struct DeferredExecutionTests: CoreBasedTests {
                         case "codesign":
                             defer { codeSignExpectation.confirm() }
                             return .result(status: .exit(0), stdout: Data(), stderr: Data())
-                        case "clang" where commandLine.dropFirst().first == "-v": // version info
+                        case "clang" where commandLine.dropFirst().first == "-v":  // version info
                             break
-                        case "clang" where !commandLine.contains("-c"): // linker-as-clang
+                        case "clang" where !commandLine.contains("-c"):  // linker-as-clang
                             defer { linkerExpectation.confirm() }
 
                             let outputBinary = try #require(commandLine.last.map(Path.init))
@@ -202,11 +211,11 @@ fileprivate func withConfirmations(invert: Bool, _ body: (_ assetCatalogExpectat
 }
 
 fileprivate let smallestMachoBytes: [UInt8] = [
-    0xcf, 0xfa, 0xed, 0xfe, // magic
-    0x00, 0x00, 0x00, 0x00, // cputype
-    0x00, 0x00, 0x00, 0x00, // cpusubtype
-    0x06, 0x00, 0x00, 0x00, // filetype
-    0x00, 0x00, 0x00, 0x00, // ncmds
-    0x00, 0x00, 0x00, 0x00, // sizeofcmds
-    0x00, 0x00, 0x00, 0x00, // flags
+    0xcf, 0xfa, 0xed, 0xfe,  // magic
+    0x00, 0x00, 0x00, 0x00,  // cputype
+    0x00, 0x00, 0x00, 0x00,  // cpusubtype
+    0x06, 0x00, 0x00, 0x00,  // filetype
+    0x00, 0x00, 0x00, 0x00,  // ncmds
+    0x00, 0x00, 0x00, 0x00,  // sizeofcmds
+    0x00, 0x00, 0x00, 0x00,  // flags
 ]
diff --git a/Tests/SwiftBuildTests/DependencyRequestTests.swift b/Tests/SwiftBuildTests/DependencyRequestTests.swift
index d203ff6e..c564b970 100644
--- a/Tests/SwiftBuildTests/DependencyRequestTests.swift
+++ b/Tests/SwiftBuildTests/DependencyRequestTests.swift
@@ -28,8 +28,8 @@ fileprivate struct DependencyClosureTests: CoreBasedTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let f1Target = TestStandardTarget(
@@ -41,11 +41,12 @@ fileprivate struct DependencyClosureTests: CoreBasedTests {
                             buildSettings: [
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "SDKROOT": "iphoneos",
-                            ])
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("TestFile1.c"),
+                            TestBuildFile("TestFile1.c")
                         ])
                     ]
                 )
@@ -59,11 +60,12 @@ fileprivate struct DependencyClosureTests: CoreBasedTests {
                             buildSettings: [
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "SDKROOT": "iphoneos",
-                            ])
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("TestFile1.c"),
+                            TestBuildFile("TestFile1.c")
                         ])
                     ],
                     dependencies: [.init("F1")]
@@ -78,11 +80,12 @@ fileprivate struct DependencyClosureTests: CoreBasedTests {
                             buildSettings: [
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "SDKROOT": "iphoneos",
-                            ])
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("TestFile1.c"),
+                            TestBuildFile("TestFile1.c")
                         ])
                     ]
                 )
@@ -96,52 +99,65 @@ fileprivate struct DependencyClosureTests: CoreBasedTests {
                             buildSettings: [
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "SDKROOT": "iphoneos",
-                            ])
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("TestFile1.c"),
+                            TestBuildFile("TestFile1.c")
                         ])
                     ],
                     dependencies: [.init("F2"), .init("F3")]
                 )
 
-                try await testSession.session.sendPIF(.init(TestWorkspace("Test", sourceRoot: tmpDirPath, projects: [
-                    TestProject(
-                        "Test",
-                        groupTree: TestGroup("Test", children: [
-                            TestFile("TestFile1.c"),
-                        ]),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug")
-                        ],
-                        targets: [
-                            f1Target,
-                            f2Target,
-                            f3Target,
-                            appTarget
-                        ]
+                try await testSession.session.sendPIF(
+                    .init(
+                        TestWorkspace(
+                            "Test",
+                            sourceRoot: tmpDirPath,
+                            projects: [
+                                TestProject(
+                                    "Test",
+                                    groupTree: TestGroup(
+                                        "Test",
+                                        children: [
+                                            TestFile("TestFile1.c")
+                                        ]
+                                    ),
+                                    buildConfigurations: [
+                                        TestBuildConfiguration("Debug")
+                                    ],
+                                    targets: [
+                                        f1Target,
+                                        f2Target,
+                                        f3Target,
+                                        appTarget,
+                                    ]
+                                )
+                            ]
+                        ).toObjects().propertyListItem
                     )
-                ]).toObjects().propertyListItem))
+                )
 
-                #expect(try await testSession.session.computeDependencyClosure(targetGUIDs: [appTarget.guid], buildParameters: SWBBuildParameters(), includeImplicitDependencies: true) ==
-                        [f1Target.guid, f2Target.guid, f3Target.guid, appTarget.guid])
-                #expect(try await testSession.session.computeDependencyClosure(targetGUIDs: [f2Target.guid], buildParameters: SWBBuildParameters(), includeImplicitDependencies: true) ==
-                        [f1Target.guid, f2Target.guid])
-                #expect(try await testSession.session.computeDependencyClosure(targetGUIDs: [f3Target.guid], buildParameters: SWBBuildParameters(), includeImplicitDependencies: true) ==
-                        [f3Target.guid])
+                #expect(try await testSession.session.computeDependencyClosure(targetGUIDs: [appTarget.guid], buildParameters: SWBBuildParameters(), includeImplicitDependencies: true) == [f1Target.guid, f2Target.guid, f3Target.guid, appTarget.guid])
+                #expect(try await testSession.session.computeDependencyClosure(targetGUIDs: [f2Target.guid], buildParameters: SWBBuildParameters(), includeImplicitDependencies: true) == [f1Target.guid, f2Target.guid])
+                #expect(try await testSession.session.computeDependencyClosure(targetGUIDs: [f3Target.guid], buildParameters: SWBBuildParameters(), includeImplicitDependencies: true) == [f3Target.guid])
 
-                #expect(try await testSession.session.computeDependencyGraph(targetGUIDs: [SWBTargetGUID(rawValue: appTarget.guid)], buildParameters: SWBBuildParameters(), includeImplicitDependencies: true) ==
-                        [SWBTargetGUID(rawValue: appTarget.guid): [SWBTargetGUID(rawValue: f2Target.guid), SWBTargetGUID(rawValue: f3Target.guid)],
-                         SWBTargetGUID(rawValue: f3Target.guid): [],
-                         SWBTargetGUID(rawValue: f2Target.guid): [SWBTargetGUID(rawValue: f1Target.guid)],
-                         SWBTargetGUID(rawValue: f1Target.guid): []
-                        ])
-                #expect(try await testSession.session.computeDependencyGraph(targetGUIDs: [SWBTargetGUID(rawValue: f2Target.guid)], buildParameters: SWBBuildParameters(), includeImplicitDependencies: true) ==
-                        [SWBTargetGUID(rawValue: f2Target.guid): [SWBTargetGUID(rawValue: f1Target.guid)],
-                         SWBTargetGUID(rawValue: f1Target.guid): []])
-                #expect(try await testSession.session.computeDependencyGraph(targetGUIDs: [SWBTargetGUID(rawValue: f3Target.guid)], buildParameters: SWBBuildParameters(), includeImplicitDependencies: true) ==
-                        [SWBTargetGUID(rawValue: f3Target.guid): []])
+                #expect(
+                    try await testSession.session.computeDependencyGraph(targetGUIDs: [SWBTargetGUID(rawValue: appTarget.guid)], buildParameters: SWBBuildParameters(), includeImplicitDependencies: true) == [
+                        SWBTargetGUID(rawValue: appTarget.guid): [SWBTargetGUID(rawValue: f2Target.guid), SWBTargetGUID(rawValue: f3Target.guid)],
+                        SWBTargetGUID(rawValue: f3Target.guid): [],
+                        SWBTargetGUID(rawValue: f2Target.guid): [SWBTargetGUID(rawValue: f1Target.guid)],
+                        SWBTargetGUID(rawValue: f1Target.guid): [],
+                    ]
+                )
+                #expect(
+                    try await testSession.session.computeDependencyGraph(targetGUIDs: [SWBTargetGUID(rawValue: f2Target.guid)], buildParameters: SWBBuildParameters(), includeImplicitDependencies: true) == [
+                        SWBTargetGUID(rawValue: f2Target.guid): [SWBTargetGUID(rawValue: f1Target.guid)],
+                        SWBTargetGUID(rawValue: f1Target.guid): [],
+                    ]
+                )
+                #expect(try await testSession.session.computeDependencyGraph(targetGUIDs: [SWBTargetGUID(rawValue: f3Target.guid)], buildParameters: SWBBuildParameters(), includeImplicitDependencies: true) == [SWBTargetGUID(rawValue: f3Target.guid): []])
             }
         }
     }
@@ -154,8 +170,8 @@ fileprivate struct DependencyClosureTests: CoreBasedTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let f1Target = TestStandardTarget(
@@ -168,11 +184,12 @@ fileprivate struct DependencyClosureTests: CoreBasedTests {
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "SDKROOT": "auto",
                                 "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                            ])
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("TestFile1.c"),
+                            TestBuildFile("TestFile1.c")
                         ])
                     ]
                 )
@@ -187,11 +204,12 @@ fileprivate struct DependencyClosureTests: CoreBasedTests {
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "SDKROOT": "auto",
                                 "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                            ])
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("TestFile1.c"),
+                            TestBuildFile("TestFile1.c")
                         ])
                     ],
                     dependencies: [.init("F1")]
@@ -207,11 +225,12 @@ fileprivate struct DependencyClosureTests: CoreBasedTests {
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "SDKROOT": "auto",
                                 "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                            ])
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("TestFile1.c"),
+                            TestBuildFile("TestFile1.c")
                         ])
                     ]
                 )
@@ -226,46 +245,62 @@ fileprivate struct DependencyClosureTests: CoreBasedTests {
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "SDKROOT": "auto",
                                 "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                            ])
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("TestFile1.c"),
+                            TestBuildFile("TestFile1.c")
                         ])
                     ],
                     dependencies: [.init("F2", platformFilters: PlatformFilter.macOSFilters), .init("F3", platformFilters: PlatformFilter.iOSFilters)]
                 )
 
-                try await testSession.session.sendPIF(.init(TestWorkspace("Test", sourceRoot: tmpDirPath, projects: [
-                    TestProject(
-                        "Test",
-                        groupTree: TestGroup("Test", children: [
-                            TestFile("TestFile1.c"),
-                        ]),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug")
-                        ],
-                        targets: [
-                            f1Target,
-                            f2Target,
-                            f3Target,
-                            appTarget
-                        ]
+                try await testSession.session.sendPIF(
+                    .init(
+                        TestWorkspace(
+                            "Test",
+                            sourceRoot: tmpDirPath,
+                            projects: [
+                                TestProject(
+                                    "Test",
+                                    groupTree: TestGroup(
+                                        "Test",
+                                        children: [
+                                            TestFile("TestFile1.c")
+                                        ]
+                                    ),
+                                    buildConfigurations: [
+                                        TestBuildConfiguration("Debug")
+                                    ],
+                                    targets: [
+                                        f1Target,
+                                        f2Target,
+                                        f3Target,
+                                        appTarget,
+                                    ]
+                                )
+                            ]
+                        ).toObjects().propertyListItem
                     )
-                ]).toObjects().propertyListItem))
+                )
 
-                #expect(try await testSession.session.computeDependencyClosure(targetGUIDs: [appTarget.guid], buildParameters: SWBBuildParameters(configuration: "Debug", activeRunDestination: .anyMac), includeImplicitDependencies: true) ==
-                        [f1Target.guid, f2Target.guid, appTarget.guid])
-                #expect(try await testSession.session.computeDependencyClosure(targetGUIDs: [appTarget.guid], buildParameters: SWBBuildParameters(configuration: "Debug", activeRunDestination: .anyiOSDevice), includeImplicitDependencies: true) ==
-                        [f3Target.guid, appTarget.guid])
+                #expect(try await testSession.session.computeDependencyClosure(targetGUIDs: [appTarget.guid], buildParameters: SWBBuildParameters(configuration: "Debug", activeRunDestination: .anyMac), includeImplicitDependencies: true) == [f1Target.guid, f2Target.guid, appTarget.guid])
+                #expect(try await testSession.session.computeDependencyClosure(targetGUIDs: [appTarget.guid], buildParameters: SWBBuildParameters(configuration: "Debug", activeRunDestination: .anyiOSDevice), includeImplicitDependencies: true) == [f3Target.guid, appTarget.guid])
 
-                #expect(try await testSession.session.computeDependencyGraph(targetGUIDs: [SWBTargetGUID(rawValue: appTarget.guid)], buildParameters: SWBBuildParameters(configuration: "Debug", activeRunDestination: .anyMac), includeImplicitDependencies: true) ==
-                        [SWBTargetGUID(rawValue: appTarget.guid): [SWBTargetGUID(rawValue: f2Target.guid)],
-                         SWBTargetGUID(rawValue: f2Target.guid): [SWBTargetGUID(rawValue: f1Target.guid)],
-                         SWBTargetGUID(rawValue: f1Target.guid): []])
-                #expect(try await testSession.session.computeDependencyGraph(targetGUIDs: [SWBTargetGUID(rawValue: appTarget.guid)], buildParameters: SWBBuildParameters(configuration: "Debug", activeRunDestination: .anyiOSDevice), includeImplicitDependencies: true) ==
-                        [SWBTargetGUID(rawValue: appTarget.guid): [SWBTargetGUID(rawValue: f3Target.guid)],
-                         SWBTargetGUID(rawValue: f3Target.guid): []])
+                #expect(
+                    try await testSession.session.computeDependencyGraph(targetGUIDs: [SWBTargetGUID(rawValue: appTarget.guid)], buildParameters: SWBBuildParameters(configuration: "Debug", activeRunDestination: .anyMac), includeImplicitDependencies: true) == [
+                        SWBTargetGUID(rawValue: appTarget.guid): [SWBTargetGUID(rawValue: f2Target.guid)],
+                        SWBTargetGUID(rawValue: f2Target.guid): [SWBTargetGUID(rawValue: f1Target.guid)],
+                        SWBTargetGUID(rawValue: f1Target.guid): [],
+                    ]
+                )
+                #expect(
+                    try await testSession.session.computeDependencyGraph(targetGUIDs: [SWBTargetGUID(rawValue: appTarget.guid)], buildParameters: SWBBuildParameters(configuration: "Debug", activeRunDestination: .anyiOSDevice), includeImplicitDependencies: true) == [
+                        SWBTargetGUID(rawValue: appTarget.guid): [SWBTargetGUID(rawValue: f3Target.guid)],
+                        SWBTargetGUID(rawValue: f3Target.guid): [],
+                    ]
+                )
             }
         }
     }
@@ -278,8 +313,8 @@ fileprivate struct DependencyClosureTests: CoreBasedTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let f1Target = TestStandardTarget(
@@ -291,11 +326,12 @@ fileprivate struct DependencyClosureTests: CoreBasedTests {
                             buildSettings: [
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "SDKROOT": "iphoneos",
-                            ])
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("TestFile1.c"),
+                            TestBuildFile("TestFile1.c")
                         ])
                     ]
                 )
@@ -309,13 +345,14 @@ fileprivate struct DependencyClosureTests: CoreBasedTests {
                             buildSettings: [
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "SDKROOT": "iphoneos",
-                            ])
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("TestFile1.c"),
+                            TestBuildFile("TestFile1.c")
                         ]),
-                        TestFrameworksBuildPhase([.init("F1.framework")])
+                        TestFrameworksBuildPhase([.init("F1.framework")]),
                     ]
                 )
 
@@ -328,11 +365,12 @@ fileprivate struct DependencyClosureTests: CoreBasedTests {
                             buildSettings: [
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "SDKROOT": "iphoneos",
-                            ])
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("TestFile1.c"),
+                            TestBuildFile("TestFile1.c")
                         ])
                     ]
                 )
@@ -346,50 +384,64 @@ fileprivate struct DependencyClosureTests: CoreBasedTests {
                             buildSettings: [
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "SDKROOT": "iphoneos",
-                            ])
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("TestFile1.c"),
+                            TestBuildFile("TestFile1.c")
                         ])
                     ],
                     dependencies: [.init("F2"), .init("F3")]
                 )
 
-                try await testSession.session.sendPIF(.init(TestWorkspace("Test", sourceRoot: tmpDirPath, projects: [
-                    TestProject(
-                        "Test",
-                        groupTree: TestGroup("Test", children: [
-                            TestFile("TestFile1.c"),
-                        ]),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug")
-                        ],
-                        targets: [
-                            f1Target,
-                            f2Target,
-                            f3Target,
-                            appTarget
-                        ]
+                try await testSession.session.sendPIF(
+                    .init(
+                        TestWorkspace(
+                            "Test",
+                            sourceRoot: tmpDirPath,
+                            projects: [
+                                TestProject(
+                                    "Test",
+                                    groupTree: TestGroup(
+                                        "Test",
+                                        children: [
+                                            TestFile("TestFile1.c")
+                                        ]
+                                    ),
+                                    buildConfigurations: [
+                                        TestBuildConfiguration("Debug")
+                                    ],
+                                    targets: [
+                                        f1Target,
+                                        f2Target,
+                                        f3Target,
+                                        appTarget,
+                                    ]
+                                )
+                            ]
+                        ).toObjects().propertyListItem
                     )
-                ]).toObjects().propertyListItem))
+                )
 
-                #expect(try await testSession.session.computeDependencyClosure(targetGUIDs: [appTarget.guid], buildParameters: SWBBuildParameters(), includeImplicitDependencies: true) ==
-                        [f1Target.guid, f2Target.guid, f3Target.guid, appTarget.guid])
-                #expect(try await testSession.session.computeDependencyClosure(targetGUIDs: [appTarget.guid], buildParameters: SWBBuildParameters(), includeImplicitDependencies: false) ==
-                        [f2Target.guid, f3Target.guid, appTarget.guid])
+                #expect(try await testSession.session.computeDependencyClosure(targetGUIDs: [appTarget.guid], buildParameters: SWBBuildParameters(), includeImplicitDependencies: true) == [f1Target.guid, f2Target.guid, f3Target.guid, appTarget.guid])
+                #expect(try await testSession.session.computeDependencyClosure(targetGUIDs: [appTarget.guid], buildParameters: SWBBuildParameters(), includeImplicitDependencies: false) == [f2Target.guid, f3Target.guid, appTarget.guid])
 
-                #expect(try await testSession.session.computeDependencyGraph(targetGUIDs: [SWBTargetGUID(rawValue: appTarget.guid)], buildParameters: SWBBuildParameters(), includeImplicitDependencies: true) ==
-                        [SWBTargetGUID(rawValue: appTarget.guid): [SWBTargetGUID(rawValue: f2Target.guid), SWBTargetGUID(rawValue: f3Target.guid)],
-                         SWBTargetGUID(rawValue: f3Target.guid): [],
-                         SWBTargetGUID(rawValue: f2Target.guid): [SWBTargetGUID(rawValue: f1Target.guid)],
-                         SWBTargetGUID(rawValue: f1Target.guid): []
-                        ])
-                #expect(try await testSession.session.computeDependencyGraph(targetGUIDs: [SWBTargetGUID(rawValue: appTarget.guid)], buildParameters: SWBBuildParameters(), includeImplicitDependencies: false) ==
-                        [SWBTargetGUID(rawValue: appTarget.guid): [SWBTargetGUID(rawValue: f2Target.guid), SWBTargetGUID(rawValue: f3Target.guid)],
-                         SWBTargetGUID(rawValue: f3Target.guid): [],
-                         SWBTargetGUID(rawValue: f2Target.guid): [],
-                        ])
+                #expect(
+                    try await testSession.session.computeDependencyGraph(targetGUIDs: [SWBTargetGUID(rawValue: appTarget.guid)], buildParameters: SWBBuildParameters(), includeImplicitDependencies: true) == [
+                        SWBTargetGUID(rawValue: appTarget.guid): [SWBTargetGUID(rawValue: f2Target.guid), SWBTargetGUID(rawValue: f3Target.guid)],
+                        SWBTargetGUID(rawValue: f3Target.guid): [],
+                        SWBTargetGUID(rawValue: f2Target.guid): [SWBTargetGUID(rawValue: f1Target.guid)],
+                        SWBTargetGUID(rawValue: f1Target.guid): [],
+                    ]
+                )
+                #expect(
+                    try await testSession.session.computeDependencyGraph(targetGUIDs: [SWBTargetGUID(rawValue: appTarget.guid)], buildParameters: SWBBuildParameters(), includeImplicitDependencies: false) == [
+                        SWBTargetGUID(rawValue: appTarget.guid): [SWBTargetGUID(rawValue: f2Target.guid), SWBTargetGUID(rawValue: f3Target.guid)],
+                        SWBTargetGUID(rawValue: f3Target.guid): [],
+                        SWBTargetGUID(rawValue: f2Target.guid): [],
+                    ]
+                )
             }
         }
     }
diff --git a/Tests/SwiftBuildTests/DocumentationInfoTests.swift b/Tests/SwiftBuildTests/DocumentationInfoTests.swift
index 4ca576dd..82fc08fa 100644
--- a/Tests/SwiftBuildTests/DocumentationInfoTests.swift
+++ b/Tests/SwiftBuildTests/DocumentationInfoTests.swift
@@ -50,10 +50,10 @@ fileprivate struct DocumentationInfoTests: CoreBasedTests {
                 let projectDir = "\(tmpDirPath)/SomeProject"
                 let projectFilesDir = "\(projectDir)/SomeFiles"
                 let workspacePIF: SWBPropertyListItem = [
-                    "guid":     "some-workspace-guid",
-                    "name":     "aWorkspace",
-                    "path":     .plString("\(tmpDirPath)/aWorkspace.xcworkspace/contents.xcworkspacedata"),
-                    "projects": ["P1"]
+                    "guid": "some-workspace-guid",
+                    "name": "aWorkspace",
+                    "path": .plString("\(tmpDirPath)/aWorkspace.xcworkspace/contents.xcworkspacedata"),
+                    "projects": ["P1"],
                 ]
                 let projectPIF: SWBPropertyListItem = [
                     "guid": "P1",
@@ -70,16 +70,16 @@ fileprivate struct DocumentationInfoTests: CoreBasedTests {
                                 "type": "file",
                                 "sourceTree": "<group>",
                                 "path": "Source.swift",
-                                "fileType": "sourcecode.c.c"
+                                "fileType": "sourcecode.c.c",
                             ],
                             [
                                 "guid": "doc-bundle-fileReference-guid",
                                 "type": "file",
                                 "sourceTree": "<group>",
                                 "path": "DocBundle.docc",
-                                "fileType": "folder.documentationcatalog"
-                            ]
-                        ]
+                                "fileType": "folder.documentationcatalog",
+                            ],
+                        ],
                     ],
                     "buildConfigurations": [
                         [
@@ -88,13 +88,13 @@ fileprivate struct DocumentationInfoTests: CoreBasedTests {
                             "buildSettings": [
                                 "PRODUCT_NAME": "some-product-name",
                                 "PRODUCT_BUNDLE_IDENTIFIER": "some-bundle-identifier",
-                                "RUN_DOCUMENTATION_COMPILER": runDocumentationCompiler ? "YES" : "NO"
-                            ]
+                                "RUN_DOCUMENTATION_COMPILER": runDocumentationCompiler ? "YES" : "NO",
+                            ],
                         ]
                     ],
                     "defaultConfigurationName": "Config1",
                     "developmentRegion": "English",
-                    "targets": ["T1"]
+                    "targets": ["T1"],
                 ]
                 let targetPIF: SWBPropertyListItem = [
                     "guid": "T1",
@@ -119,36 +119,36 @@ fileprivate struct DocumentationInfoTests: CoreBasedTests {
                                     "guid": "BF3",
                                     "name": "DocBundle.docc",
                                     "fileReference": "doc-bundle-fileReference-guid",
-                                ]
-                            ]
+                                ],
+                            ],
                         ]
                     ],
                     "buildConfigurations": [
                         [
                             "guid": "C2",
                             "name": "Config1",
-                            "buildSettings": [:]
+                            "buildSettings": [:],
                         ]
                     ],
                     "buildRules": [],
-                    "dependencies": []
+                    "dependencies": [],
                 ]
                 let PIF: SWBPropertyListItem = [
                     [
                         "type": "workspace",
                         "signature": "W1",
-                        "contents": workspacePIF
+                        "contents": workspacePIF,
                     ],
                     [
                         "type": "project",
                         "signature": "P1",
-                        "contents": projectPIF
+                        "contents": projectPIF,
                     ],
                     [
                         "type": "target",
                         "signature": "T1",
-                        "contents": targetPIF
-                    ]
+                        "contents": targetPIF,
+                    ],
                 ]
 
                 try await session.sendPIF(PIF)
diff --git a/Tests/SwiftBuildTests/DocumentationTests.swift b/Tests/SwiftBuildTests/DocumentationTests.swift
index 49409775..9493799d 100644
--- a/Tests/SwiftBuildTests/DocumentationTests.swift
+++ b/Tests/SwiftBuildTests/DocumentationTests.swift
@@ -29,20 +29,25 @@ fileprivate struct DocumentationBuildTests: CoreBasedTests {
                 "docProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "Sources", children: [
+                    "Sources",
+                    children: [
                         TestFile("test.docc"),
                         TestFile("test.swift"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ALWAYS_SEARCH_USER_PATHS": "NO",
-                        "CODE_SIGNING_ALLOWED": "NO",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "auto",
-                        "SWIFT_VERSION": "5.0",
-                        "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ALWAYS_SEARCH_USER_PATHS": "NO",
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "auto",
+                            "SWIFT_VERSION": "5.0",
+                            "SUPPORTED_PLATFORMS": "$(AVAILABLE_PLATFORMS)",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -56,23 +61,27 @@ fileprivate struct DocumentationBuildTests: CoreBasedTests {
                                 "test.docc",
                                 "test.swift",
                             ])
-                        ]),
-                ])
+                        ]
+                    )
+                ]
+            )
 
             let SRCROOT = tmpDir.str
 
             try fs.write(Path(SRCROOT).join("test.swift"), contents: "")
             try fs.createDirectory(Path(SRCROOT).join("test.docc"))
-            try fs.write(Path(SRCROOT).join("test.docc").join("test.md"), contents:
-                """
-                # Article
+            try fs.write(
+                Path(SRCROOT).join("test.docc").join("test.md"),
+                contents:
+                    """
+                    # Article
 
-                A top-level article in a documentation catalog without any symbols
+                    A top-level article in a documentation catalog without any symbols
 
-                @Metadata {
-                  @TechnologyRoot
-                }
-                """
+                    @Metadata {
+                      @TechnologyRoot
+                    }
+                    """
             )
 
             try await withTester(testProject, fs: fs) { tester in
diff --git a/Tests/SwiftBuildTests/DriverKitTests.swift b/Tests/SwiftBuildTests/DriverKitTests.swift
index 01817d50..1619ccc2 100644
--- a/Tests/SwiftBuildTests/DriverKitTests.swift
+++ b/Tests/SwiftBuildTests/DriverKitTests.swift
@@ -33,8 +33,9 @@ fileprivate struct DriverKitTests: CoreBasedTests {
                         groupTree: TestGroup(
                             "Sources",
                             children: [
-                                TestFile("foo.c"),
-                            ]),
+                                TestFile("foo.c")
+                            ]
+                        ),
                         buildConfigurations: [
                             TestBuildConfiguration(
                                 "Debug",
@@ -44,26 +45,35 @@ fileprivate struct DriverKitTests: CoreBasedTests {
                                     "DEBUG_INFORMATION_FORMAT": "dwarf",
                                     "GENERATE_INFOPLIST_FILE": "YES",
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
-                                ]),
+                                ]
+                            )
                         ],
                         targets: [
                             TestStandardTarget(
                                 "App",
                                 type: .application,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: [
-                                        "PRODUCT_BUNDLE_IDENTIFIER": "com.mycompany.app",
-                                        "SDKROOT": "auto",
-                                        "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
-                                    ])
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "PRODUCT_BUNDLE_IDENTIFIER": "com.mycompany.app",
+                                            "SDKROOT": "auto",
+                                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "foo.c",
+                                        "foo.c"
                                     ]),
-                                    TestCopyFilesBuildPhase([
-                                        "Driver.dext"
-                                    ], destinationSubfolder: .builtProductsDir, destinationSubpath: "$(SYSTEM_EXTENSIONS_FOLDER_PATH)", onlyForDeployment: false)
+                                    TestCopyFilesBuildPhase(
+                                        [
+                                            "Driver.dext"
+                                        ],
+                                        destinationSubfolder: .builtProductsDir,
+                                        destinationSubpath: "$(SYSTEM_EXTENSIONS_FOLDER_PATH)",
+                                        onlyForDeployment: false
+                                    ),
                                 ],
                                 dependencies: ["Driver"]
                             ),
@@ -71,20 +81,25 @@ fileprivate struct DriverKitTests: CoreBasedTests {
                                 "Driver",
                                 type: .driverExtension,
                                 buildConfigurations: [
-                                    TestBuildConfiguration("Debug", buildSettings: [
-                                        "PRODUCT_BUNDLE_IDENTIFIER": "com.mycompany.app.driver",
-                                        "SDKROOT": "driverkit",
-                                        "SUPPORTED_PLATFORMS": "driverkit",
-                                    ])
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "PRODUCT_BUNDLE_IDENTIFIER": "com.mycompany.app.driver",
+                                            "SDKROOT": "driverkit",
+                                            "SUPPORTED_PLATFORMS": "driverkit",
+                                        ]
+                                    )
                                 ],
                                 buildPhases: [
                                     TestSourcesBuildPhase([
-                                        "foo.c",
-                                    ]),
+                                        "foo.c"
+                                    ])
                                 ]
-                            )
-                        ])
-                ])
+                            ),
+                        ]
+                    )
+                ]
+            )
             try await withTester(testWorkspace, fs: fs) { tester in
                 let SRCROOT = tmpDirPath.join("Test")
 
@@ -140,15 +155,17 @@ final class DriverKitBuildOperationDelegate: SWBPlanningOperationDelegate {
     // Simulated implementation of the provisioning system which ad-hoc signs with the product type + project entitlements
     // FIXME: Find a way to call the real thing, perhaps in the future this is `xcsigningtool`
     func provisioningTaskInputs(targetGUID: String, provisioningSourceData: SWBProvisioningTaskInputsSourceData) async -> SWBProvisioningTaskInputs {
-        let signedEntitlements = provisioningSourceData.entitlementsDestination == "Signature"
-        ? provisioningSourceData.productTypeEntitlements.merging(["application-identifier": .plString(provisioningSourceData.bundleIdentifier)], uniquingKeysWith: { _, new in new }).merging(provisioningSourceData.projectEntitlements ?? [:], uniquingKeysWith: { _, new in new })
-        : [:]
+        let signedEntitlements =
+            provisioningSourceData.entitlementsDestination == "Signature"
+            ? provisioningSourceData.productTypeEntitlements.merging(["application-identifier": .plString(provisioningSourceData.bundleIdentifier)], uniquingKeysWith: { _, new in new }).merging(provisioningSourceData.projectEntitlements ?? [:], uniquingKeysWith: { _, new in new })
+            : [:]
 
-        let simulatedEntitlements = provisioningSourceData.entitlementsDestination == "__entitlements"
-        ? provisioningSourceData.productTypeEntitlements.merging(["application-identifier": .plString(provisioningSourceData.bundleIdentifier)], uniquingKeysWith: { _, new in new }).merging(provisioningSourceData.projectEntitlements ?? [:], uniquingKeysWith: { _, new in new })
-        : [:]
+        let simulatedEntitlements =
+            provisioningSourceData.entitlementsDestination == "__entitlements"
+            ? provisioningSourceData.productTypeEntitlements.merging(["application-identifier": .plString(provisioningSourceData.bundleIdentifier)], uniquingKeysWith: { _, new in new }).merging(provisioningSourceData.projectEntitlements ?? [:], uniquingKeysWith: { _, new in new })
+            : [:]
 
-        return SWBProvisioningTaskInputs(identityHash: "-", identityName: "-", profileName: nil, profileUUID: nil, profilePath: nil, designatedRequirements: nil, signedEntitlements: signedEntitlements.merging(provisioningSourceData.sdkRoot.contains("simulator") ? ["get-task-allow": .plBool(true)] : [:], uniquingKeysWith: { _, new  in new }), simulatedEntitlements: simulatedEntitlements, appIdentifierPrefix: nil, teamIdentifierPrefix: nil, isEnterpriseTeam: false, keychainPath: nil, errors: [], warnings: [])
+        return SWBProvisioningTaskInputs(identityHash: "-", identityName: "-", profileName: nil, profileUUID: nil, profilePath: nil, designatedRequirements: nil, signedEntitlements: signedEntitlements.merging(provisioningSourceData.sdkRoot.contains("simulator") ? ["get-task-allow": .plBool(true)] : [:], uniquingKeysWith: { _, new in new }), simulatedEntitlements: simulatedEntitlements, appIdentifierPrefix: nil, teamIdentifierPrefix: nil, isEnterpriseTeam: false, keychainPath: nil, errors: [], warnings: [])
     }
 
     func executeExternalTool(commandLine: [String], workingDirectory: String?, environment: [String: String]) async throws -> SWBExternalToolResult {
diff --git a/Tests/SwiftBuildTests/GeneratePreviewInfoTests.swift b/Tests/SwiftBuildTests/GeneratePreviewInfoTests.swift
index 23c2434d..cf7e7ad9 100644
--- a/Tests/SwiftBuildTests/GeneratePreviewInfoTests.swift
+++ b/Tests/SwiftBuildTests/GeneratePreviewInfoTests.swift
@@ -28,8 +28,8 @@ fileprivate struct GeneratePreviewInfoTests: CoreBasedTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let appTarget = TestStandardTarget(
@@ -55,7 +55,8 @@ fileprivate struct GeneratePreviewInfoTests: CoreBasedTests {
                                 // Test that we strip the flag
                                 "SWIFT_EMIT_LOC_STRINGS": "YES",
                                 "SWIFT_VALIDATE_CLANG_MODULES_ONCE_PER_BUILD_SESSION": "NO",
-                            ].merging(overrides, uniquingKeysWith: { _, new in new }))
+                            ].merging(overrides, uniquingKeysWith: { _, new in new })
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -68,34 +69,46 @@ fileprivate struct GeneratePreviewInfoTests: CoreBasedTests {
                             TestBuildFile("Intents.intentdefinition", intentsCodegenVisibility: .public),
                         ]),
                         TestResourcesBuildPhase([
-                            "Assets.xcassets",
-                        ])
+                            "Assets.xcassets"
+                        ]),
                     ]
                 )
 
-                try await testSession.sendPIF(TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                    TestProject(
+                try await testSession.sendPIF(
+                    TestWorkspace(
                         "Test",
-                        groupTree: TestGroup("Test", children: [
-                            TestFile("TestFile1.c"),
-                            TestFile("TestFile2.c"),
-                            TestFile("TestFile3.c"),
-                            TestFile("TestFile4.swift"),
-                            TestVersionGroup("Foo.xcdatamodeld", children: [TestFile("Foo.xcdatamodeld")]),
-                            TestFile("SmartStuff.mlmodel"),
-                            TestFile("Intents.intentdefinition"),
-                            TestFile("Assets.xcassets"),
-                        ]),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "ENABLE_PREVIEWS": "YES",
-                            ])
-                        ],
-                        targets: [
-                            appTarget
+                        sourceRoot: tmpDir,
+                        projects: [
+                            TestProject(
+                                "Test",
+                                groupTree: TestGroup(
+                                    "Test",
+                                    children: [
+                                        TestFile("TestFile1.c"),
+                                        TestFile("TestFile2.c"),
+                                        TestFile("TestFile3.c"),
+                                        TestFile("TestFile4.swift"),
+                                        TestVersionGroup("Foo.xcdatamodeld", children: [TestFile("Foo.xcdatamodeld")]),
+                                        TestFile("SmartStuff.mlmodel"),
+                                        TestFile("Intents.intentdefinition"),
+                                        TestFile("Assets.xcassets"),
+                                    ]
+                                ),
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "ENABLE_PREVIEWS": "YES"
+                                        ]
+                                    )
+                                ],
+                                targets: [
+                                    appTarget
+                                ]
+                            )
                         ]
                     )
-                ]))
+                )
 
                 try await localFS.writeFileContents(tmpDir.join("Test/TestFile1.c")) { $0 <<< "" }
                 try await localFS.writeFileContents(tmpDir.join("Test/TestFile2.c")) { $0 <<< "" }
@@ -116,17 +129,35 @@ fileprivate struct GeneratePreviewInfoTests: CoreBasedTests {
 
                 if overrides["ENABLE_XOJIT_PREVIEWS"] != "YES" {
                     // Checking dynamic replacement.
-                    #expect(try await testSession.session.generatePreviewInfo(for: request, targetID: appTarget.guid, sourceFile: tmpDir.join("TestFile4.swift").str, thunkVariantSuffix: "canary", delegate: delegate) == [SWBPreviewInfo(sdkRoot: "iphoneos\(sdkVersion)", sdkVariant: "iphoneos", buildVariant: "normal", architecture: activeRunDestination.targetArchitecture, compileCommandLine: [
-                        "\(developerDir)/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc", "-enforce-exclusivity=checked", "-enable-bare-slash-regex", "-enable-experimental-feature", "DebugDescriptionMacro", "-sdk", sdkroot, "-target", "\(activeRunDestination.targetArchitecture)-apple-ios\(deploymentTarget)", "-Xfrontend", "-serialize-debugging-options", "-swift-version", "5", "-I", "\(tmpDir.str)/Test/build/Debug-iphoneos", "-F", "\(tmpDir.str)/Test/build/Debug-iphoneos", "-c", "-j\(compilerParallelismLevel)", "-no-color-diagnostics", "-serialize-diagnostics", "-Xcc", "-I\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/swift-overrides.hmap", "-Xcc", "-iquote", "-Xcc", "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/App-generated-files.hmap", "-Xcc", "-I\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/App-own-target-headers.hmap", "-Xcc", "-I\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/App-all-target-headers.hmap", "-Xcc", "-iquote", "-Xcc", "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/App-project-headers.hmap", "-Xcc", "-I\(tmpDir.str)/Test/build/Debug-iphoneos/include", "-Xcc", "-I\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/DerivedSources-normal/\(activeRunDestination.targetArchitecture)", "-Xcc", "-I\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/DerivedSources/\(activeRunDestination.targetArchitecture)", "-Xcc", "-I\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/DerivedSources", "-working-directory", "\(tmpDir.str)/Test", "-experimental-emit-module-separately", "-disable-cmo", "-disable-bridging-pch", "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/TestFile4.canary.preview-thunk.swift", "-o", "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/TestFile4.canary.preview-thunk.o", "-module-name", "App_PreviewReplacement_TestFile4_canary", "-parse-as-library", "-Onone", "-Xfrontend", "-disable-modules-validate-system-headers"
-                    ], linkCommandLine: [
-                        "\(developerDir)/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang", "-Xlinker", "-reproducible", "-target", "\(activeRunDestination.targetArchitecture)-apple-ios\(deploymentTarget)", "-isysroot", sdkroot, "-Os", "-L\(tmpDir.str)/Test/build/EagerLinkingTBDs/Debug-iphoneos", "-L\(tmpDir.str)/Test/build/Debug-iphoneos", "-F\(tmpDir.str)/Test/build/EagerLinkingTBDs/Debug-iphoneos", "-F\(tmpDir.str)/Test/build/Debug-iphoneos", "-fobjc-link-runtime", "-L\(developerDir)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphoneos", "-L/usr/lib/swift", "-bundle", "-bundle_loader", "\(tmpDir.str)/Test/build/Debug-iphoneos/App.app/App", "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/TestFile4.canary.preview-thunk.o", "-o", "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/TestFile4.canary.preview-thunk.dylib"
-                    ], thunkSourceFile: "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/TestFile4.canary.preview-thunk.swift", thunkObjectFile: "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/TestFile4.canary.preview-thunk.o", thunkLibrary: "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/TestFile4.canary.preview-thunk.dylib", pifGUID: appTarget.guid)])
-
-                    await #expect(performing: {
-                        try await testSession.session.generatePreviewInfo(for: request, targetID: "a", sourceFile: "/", thunkVariantSuffix: "", delegate: delegate)
-                    }, throws: { error in
-                        error.localizedDescription == "could not generate preview info: unableToFindTarget(targetID: \"a\")"
-                    })
+                    #expect(
+                        try await testSession.session.generatePreviewInfo(for: request, targetID: appTarget.guid, sourceFile: tmpDir.join("TestFile4.swift").str, thunkVariantSuffix: "canary", delegate: delegate) == [
+                            SWBPreviewInfo(
+                                sdkRoot: "iphoneos\(sdkVersion)",
+                                sdkVariant: "iphoneos",
+                                buildVariant: "normal",
+                                architecture: activeRunDestination.targetArchitecture,
+                                compileCommandLine: [
+                                    "\(developerDir)/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc", "-enforce-exclusivity=checked", "-enable-bare-slash-regex", "-enable-experimental-feature", "DebugDescriptionMacro", "-sdk", sdkroot, "-target", "\(activeRunDestination.targetArchitecture)-apple-ios\(deploymentTarget)", "-Xfrontend", "-serialize-debugging-options", "-swift-version", "5", "-I", "\(tmpDir.str)/Test/build/Debug-iphoneos", "-F", "\(tmpDir.str)/Test/build/Debug-iphoneos", "-c", "-j\(compilerParallelismLevel)", "-no-color-diagnostics", "-serialize-diagnostics", "-Xcc", "-I\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/swift-overrides.hmap", "-Xcc", "-iquote", "-Xcc", "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/App-generated-files.hmap", "-Xcc", "-I\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/App-own-target-headers.hmap", "-Xcc", "-I\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/App-all-target-headers.hmap", "-Xcc", "-iquote", "-Xcc", "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/App-project-headers.hmap", "-Xcc", "-I\(tmpDir.str)/Test/build/Debug-iphoneos/include", "-Xcc", "-I\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/DerivedSources-normal/\(activeRunDestination.targetArchitecture)", "-Xcc", "-I\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/DerivedSources/\(activeRunDestination.targetArchitecture)", "-Xcc", "-I\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/DerivedSources", "-working-directory", "\(tmpDir.str)/Test", "-experimental-emit-module-separately", "-disable-cmo", "-disable-bridging-pch", "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/TestFile4.canary.preview-thunk.swift", "-o", "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/TestFile4.canary.preview-thunk.o", "-module-name", "App_PreviewReplacement_TestFile4_canary", "-parse-as-library", "-Onone", "-Xfrontend", "-disable-modules-validate-system-headers",
+                                ],
+                                linkCommandLine: [
+                                    "\(developerDir)/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang", "-Xlinker", "-reproducible", "-target", "\(activeRunDestination.targetArchitecture)-apple-ios\(deploymentTarget)", "-isysroot", sdkroot, "-Os", "-L\(tmpDir.str)/Test/build/EagerLinkingTBDs/Debug-iphoneos", "-L\(tmpDir.str)/Test/build/Debug-iphoneos", "-F\(tmpDir.str)/Test/build/EagerLinkingTBDs/Debug-iphoneos", "-F\(tmpDir.str)/Test/build/Debug-iphoneos", "-fobjc-link-runtime", "-L\(developerDir)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphoneos", "-L/usr/lib/swift", "-bundle", "-bundle_loader", "\(tmpDir.str)/Test/build/Debug-iphoneos/App.app/App", "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/TestFile4.canary.preview-thunk.o", "-o", "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/TestFile4.canary.preview-thunk.dylib",
+                                ],
+                                thunkSourceFile: "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/TestFile4.canary.preview-thunk.swift",
+                                thunkObjectFile: "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/TestFile4.canary.preview-thunk.o",
+                                thunkLibrary: "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/TestFile4.canary.preview-thunk.dylib",
+                                pifGUID: appTarget.guid
+                            )
+                        ]
+                    )
+
+                    await #expect(
+                        performing: {
+                            try await testSession.session.generatePreviewInfo(for: request, targetID: "a", sourceFile: "/", thunkVariantSuffix: "", delegate: delegate)
+                        },
+                        throws: { error in
+                            error.localizedDescription == "could not generate preview info: unableToFindTarget(targetID: \"a\")"
+                        }
+                    )
                 } else {
                     // Checking XOJIT.
                     let previewInfo = try await testSession.session.generatePreviewInfo(for: request, targetID: appTarget.guid, sourceFile: tmpDir.join("Test/TestFile4.swift").str, thunkVariantSuffix: "canary", delegate: delegate).only
@@ -152,23 +183,26 @@ fileprivate struct GeneratePreviewInfoTests: CoreBasedTests {
                     compileCommandLine = compileCommandLine.filter { $0 != "-disable-clang-spi" }
 
                     // Validate that the command line contains key arguments (we don't check the command line exactly because it will evolve over time in ways that don't affect XOJIT Previews, thus presenting a maintenance burden).
-                    XCTAssertMatch(compileCommandLine, [
-                        .start,
-                        "\(developerDir)/Toolchains/XcodeDefault.xctoolchain/usr/bin/swift-frontend",
-                        "-frontend", "-c",
-                        "-primary-file", "\(tmpDir.str)/Test/TestFile4.swift", "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/DerivedSources/GeneratedAssetSymbols.swift",
-                        .anySequence,
-                        "-sdk", "\(sdkroot)",
-                        .anySequence,
-                        "-Onone",
-                        .anySequence,
-                        "-module-name", "App",
-                        "-target-sdk-version", "\(deploymentTarget)",
-                        "-target-sdk-name", "iphoneos\(deploymentTarget)",
-                        "-o", "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/TestFile4.canary.preview-thunk.o",
-                        "-vfsoverlay", "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/vfsoverlay-TestFile4.canary.preview-thunk.swift.json",
-                        .end
-                    ])
+                    XCTAssertMatch(
+                        compileCommandLine,
+                        [
+                            .start,
+                            "\(developerDir)/Toolchains/XcodeDefault.xctoolchain/usr/bin/swift-frontend",
+                            "-frontend", "-c",
+                            "-primary-file", "\(tmpDir.str)/Test/TestFile4.swift", "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/DerivedSources/GeneratedAssetSymbols.swift",
+                            .anySequence,
+                            "-sdk", "\(sdkroot)",
+                            .anySequence,
+                            "-Onone",
+                            .anySequence,
+                            "-module-name", "App",
+                            "-target-sdk-version", "\(deploymentTarget)",
+                            "-target-sdk-name", "iphoneos\(deploymentTarget)",
+                            "-o", "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/TestFile4.canary.preview-thunk.o",
+                            "-vfsoverlay", "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/vfsoverlay-TestFile4.canary.preview-thunk.swift.json",
+                            .end,
+                        ]
+                    )
                     // Also spot-check that some options which were removed in SwiftCompilerSpec.generatePreviewInfo() for XOJIT are not present.
                     for option in [
                         "-incremental",
@@ -192,86 +226,94 @@ fileprivate struct GeneratePreviewInfoTests: CoreBasedTests {
                     #expect(previewInfo?.thunkLibrary == "")
                     #expect(previewInfo?.pifGUID == appTarget.guid)
 
-                    await #expect(performing: {
-                        try await testSession.session.generatePreviewInfo(for: request, targetID: "a", sourceFile: "/", thunkVariantSuffix: "", delegate: delegate)
-                    }, throws: { error in
-                        error.localizedDescription == "could not generate preview info: unableToFindTarget(targetID: \"a\")"
-                    })
+                    await #expect(
+                        performing: {
+                            try await testSession.session.generatePreviewInfo(for: request, targetID: "a", sourceFile: "/", thunkVariantSuffix: "", delegate: delegate)
+                        },
+                        throws: { error in
+                            error.localizedDescription == "could not generate preview info: unableToFindTarget(targetID: \"a\")"
+                        }
+                    )
 
                     let info = try await testSession.session.generatePreviewTargetDependencyInfo(for: request, targetIDs: [appTarget.guid], delegate: delegate)
-                    #expect(info == [
-                        SWBPreviewTargetDependencyInfo(
-                            sdkRoot: "iphoneos\(sdkVersion)",
-                            sdkVariant: "iphoneos",
-                            buildVariant: "normal",
-                            architecture: activeRunDestination.targetArchitecture,
-                            pifGUID: appTarget.guid,
-                            productModuleName: "App",
-                            objectFileInputMap: [
-                                "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/TestFile4.o": Set(["\(tmpDir.str)/Test/TestFile4.swift"]),
-                                "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/GeneratedAssetSymbols.o": Set(["\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/DerivedSources/GeneratedAssetSymbols.swift"])
-                            ],
-                            linkCommandLine: [
-                                "\(developerDir)/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang",
-                                "-Xlinker",
-                                "-reproducible",
-                                "-target",
-                                "\(activeRunDestination.targetArchitecture)-apple-ios\(deploymentTarget)",
-                                "-dynamiclib",
-                                "-isysroot",
-                                sdkroot,
-                                "-Os",
-                                "-L\(tmpDir.str)/Test/build/EagerLinkingTBDs/Debug-iphoneos",
-                                "-L\(tmpDir.str)/Test/build/Debug-iphoneos",
-                                "-F\(tmpDir.str)/Test/build/EagerLinkingTBDs/Debug-iphoneos",
-                                "-F\(tmpDir.str)/Test/build/Debug-iphoneos",
-                                "-filelist",
-                                "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/App.LinkFileList",
-                                "-install_name",
-                                "@rpath/App.debug.dylib",
-                                "-Xlinker",
-                                "-dead_strip",
-                                "-Xlinker",
-                                "-object_path_lto",
-                                "-Xlinker",
-                                "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/App_lto.o",
-                                "-rdynamic",
-                                "-Xlinker",
-                                "-dependency_info",
-                                "-Xlinker",
-                                "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/App_dependency_info.dat",
-                                "-fobjc-link-runtime",
-                                "-L\(developerDir)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphoneos",
-                                "-L/usr/lib/swift",
-                                "-Xlinker",
-                                "-add_ast_path",
-                                "-Xlinker",
-                                "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/App.swiftmodule",
-                                "-Xlinker",
-                                "-alias",
-                                "-Xlinker",
-                                "_main",
-                                "-Xlinker",
-                                "___debug_main_executable_dylib_entry_point",
-                                "-o",
-                                "\(tmpDir.str)/Test/build/Debug-iphoneos/App.app/App.debug.dylib"
-                            ],
-                            linkerWorkingDirectory: "\(tmpDir.str)/Test",
-                            swiftEnableOpaqueTypeErasure: false,
-                            swiftUseIntegratedDriver: true,
-                            enableJITPreviews: true,
-                            enableDebugDylib: true,
-                            enableAddressSanitizer: false,
-                            enableThreadSanitizer: false,
-                            enableUndefinedBehaviorSanitizer: false
-                        )
-                    ])
+                    #expect(
+                        info == [
+                            SWBPreviewTargetDependencyInfo(
+                                sdkRoot: "iphoneos\(sdkVersion)",
+                                sdkVariant: "iphoneos",
+                                buildVariant: "normal",
+                                architecture: activeRunDestination.targetArchitecture,
+                                pifGUID: appTarget.guid,
+                                productModuleName: "App",
+                                objectFileInputMap: [
+                                    "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/TestFile4.o": Set(["\(tmpDir.str)/Test/TestFile4.swift"]),
+                                    "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/GeneratedAssetSymbols.o": Set(["\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/DerivedSources/GeneratedAssetSymbols.swift"]),
+                                ],
+                                linkCommandLine: [
+                                    "\(developerDir)/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang",
+                                    "-Xlinker",
+                                    "-reproducible",
+                                    "-target",
+                                    "\(activeRunDestination.targetArchitecture)-apple-ios\(deploymentTarget)",
+                                    "-dynamiclib",
+                                    "-isysroot",
+                                    sdkroot,
+                                    "-Os",
+                                    "-L\(tmpDir.str)/Test/build/EagerLinkingTBDs/Debug-iphoneos",
+                                    "-L\(tmpDir.str)/Test/build/Debug-iphoneos",
+                                    "-F\(tmpDir.str)/Test/build/EagerLinkingTBDs/Debug-iphoneos",
+                                    "-F\(tmpDir.str)/Test/build/Debug-iphoneos",
+                                    "-filelist",
+                                    "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/App.LinkFileList",
+                                    "-install_name",
+                                    "@rpath/App.debug.dylib",
+                                    "-Xlinker",
+                                    "-dead_strip",
+                                    "-Xlinker",
+                                    "-object_path_lto",
+                                    "-Xlinker",
+                                    "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/App_lto.o",
+                                    "-rdynamic",
+                                    "-Xlinker",
+                                    "-dependency_info",
+                                    "-Xlinker",
+                                    "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/App_dependency_info.dat",
+                                    "-fobjc-link-runtime",
+                                    "-L\(developerDir)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphoneos",
+                                    "-L/usr/lib/swift",
+                                    "-Xlinker",
+                                    "-add_ast_path",
+                                    "-Xlinker",
+                                    "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/App.build/Objects-normal/\(activeRunDestination.targetArchitecture)/App.swiftmodule",
+                                    "-Xlinker",
+                                    "-alias",
+                                    "-Xlinker",
+                                    "_main",
+                                    "-Xlinker",
+                                    "___debug_main_executable_dylib_entry_point",
+                                    "-o",
+                                    "\(tmpDir.str)/Test/build/Debug-iphoneos/App.app/App.debug.dylib",
+                                ],
+                                linkerWorkingDirectory: "\(tmpDir.str)/Test",
+                                swiftEnableOpaqueTypeErasure: false,
+                                swiftUseIntegratedDriver: true,
+                                enableJITPreviews: true,
+                                enableDebugDylib: true,
+                                enableAddressSanitizer: false,
+                                enableThreadSanitizer: false,
+                                enableUndefinedBehaviorSanitizer: false
+                            )
+                        ]
+                    )
 
-                    await #expect(performing: {
-                        try await testSession.session.generatePreviewTargetDependencyInfo(for: request, targetIDs: ["a"], delegate: delegate)
-                    }, throws: { error in
-                        error.localizedDescription == "could not generate preview info: unableToFindTarget(targetID: \"a\")"
-                    })
+                    await #expect(
+                        performing: {
+                            try await testSession.session.generatePreviewTargetDependencyInfo(for: request, targetIDs: ["a"], delegate: delegate)
+                        },
+                        throws: { error in
+                            error.localizedDescription == "could not generate preview info: unableToFindTarget(targetID: \"a\")"
+                        }
+                    )
                 }
             }
         }
@@ -295,8 +337,8 @@ fileprivate struct GeneratePreviewInfoTests: CoreBasedTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let libTarget = TestStandardTarget(
@@ -316,7 +358,8 @@ fileprivate struct GeneratePreviewInfoTests: CoreBasedTests {
                                 "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
                                 "SDK_STAT_CACHE_ENABLE": "NO",
                                 "SWIFT_VALIDATE_CLANG_MODULES_ONCE_PER_BUILD_SESSION": "NO",
-                            ])
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -324,34 +367,46 @@ fileprivate struct GeneratePreviewInfoTests: CoreBasedTests {
                             TestBuildFile("TestFile2.c"),
                             TestBuildFile("TestFile3.c"),
                             TestBuildFile("TestFile4.swift"),
-                        ]),
+                        ])
                     ]
                 )
 
-                try await testSession.sendPIF(TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                    TestProject(
+                try await testSession.sendPIF(
+                    TestWorkspace(
                         "Test",
-                        groupTree: TestGroup("Test", children: [
-                            TestFile("TestFile1.c"),
-                            TestFile("TestFile2.c"),
-                            TestFile("TestFile3.c"),
-                            TestFile("TestFile4.swift"),
-                            TestVersionGroup("Foo.xcdatamodeld", children: [TestFile("Foo.xcdatamodeld")]),
-                            TestFile("SmartStuff.mlmodel"),
-                            TestFile("Intents.intentdefinition"),
-                            TestFile("Assets.xcassets"),
-                        ]),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "ENABLE_PREVIEWS": "NO",
-                                "ENABLE_XOJIT_PREVIEWS": "YES",
-                            ])
-                        ],
-                        targets: [
-                            libTarget
+                        sourceRoot: tmpDir,
+                        projects: [
+                            TestProject(
+                                "Test",
+                                groupTree: TestGroup(
+                                    "Test",
+                                    children: [
+                                        TestFile("TestFile1.c"),
+                                        TestFile("TestFile2.c"),
+                                        TestFile("TestFile3.c"),
+                                        TestFile("TestFile4.swift"),
+                                        TestVersionGroup("Foo.xcdatamodeld", children: [TestFile("Foo.xcdatamodeld")]),
+                                        TestFile("SmartStuff.mlmodel"),
+                                        TestFile("Intents.intentdefinition"),
+                                        TestFile("Assets.xcassets"),
+                                    ]
+                                ),
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "ENABLE_PREVIEWS": "NO",
+                                            "ENABLE_XOJIT_PREVIEWS": "YES",
+                                        ]
+                                    )
+                                ],
+                                targets: [
+                                    libTarget
+                                ]
+                            )
                         ]
                     )
-                ]))
+                )
 
                 try await localFS.writeFileContents(tmpDir.join("Test/TestFile1.c")) { $0 <<< "" }
                 try await localFS.writeFileContents(tmpDir.join("Test/TestFile2.c")) { $0 <<< "" }
@@ -374,8 +429,7 @@ fileprivate struct GeneratePreviewInfoTests: CoreBasedTests {
                         for: request,
                         targetIDs: [libTarget.guid],
                         delegate: delegate
-                    ) ==
-                    [
+                    ) == [
                         SWBPreviewTargetDependencyInfo(
                             sdkRoot: "iphoneos\(sdkVersion)",
                             sdkVariant: "iphoneos",
@@ -400,7 +454,7 @@ fileprivate struct GeneratePreviewInfoTests: CoreBasedTests {
                                 "-dependency_info",
                                 "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/StaticLib.build/Objects-normal/arm64/StaticLib_libtool_dependency_info.dat",
                                 "-o",
-                                "\(tmpDir.str)/Test/build/Debug-iphoneos/libStaticLib.a"
+                                "\(tmpDir.str)/Test/build/Debug-iphoneos/libStaticLib.a",
                             ],
                             linkerWorkingDirectory: "\(tmpDir.str)/Test",
                             swiftEnableOpaqueTypeErasure: false,
@@ -425,8 +479,8 @@ fileprivate struct GeneratePreviewInfoTests: CoreBasedTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let target = TestStandardTarget(
@@ -443,40 +497,53 @@ fileprivate struct GeneratePreviewInfoTests: CoreBasedTests {
                                 "ONLY_ACTIVE_ARCH": "YES",
                                 "CLANG_ENABLE_MODULES": "YES",
                                 "SDK_STAT_CACHE_ENABLE": "NO",
-                            ])
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             TestBuildFile("TestFile1.c"),
                             TestBuildFile("TestFile2.c"),
                             TestBuildFile("TestFile3.c"),
-                        ]),
+                        ])
                     ]
                 )
 
-                try await testSession.sendPIF(TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                    TestProject(
+                try await testSession.sendPIF(
+                    TestWorkspace(
                         "Test",
-                        groupTree: TestGroup("Test", children: [
-                            TestFile("TestFile1.c"),
-                            TestFile("TestFile2.c"),
-                            TestFile("TestFile3.c"),
-                            TestVersionGroup("Foo.xcdatamodeld", children: [TestFile("Foo.xcdatamodeld")]),
-                            TestFile("SmartStuff.mlmodel"),
-                            TestFile("Intents.intentdefinition"),
-                            TestFile("Assets.xcassets"),
-                        ]),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "ENABLE_PREVIEWS": "NO",
-                                "ENABLE_XOJIT_PREVIEWS": "YES",
-                            ])
-                        ],
-                        targets: [
-                            target
+                        sourceRoot: tmpDir,
+                        projects: [
+                            TestProject(
+                                "Test",
+                                groupTree: TestGroup(
+                                    "Test",
+                                    children: [
+                                        TestFile("TestFile1.c"),
+                                        TestFile("TestFile2.c"),
+                                        TestFile("TestFile3.c"),
+                                        TestVersionGroup("Foo.xcdatamodeld", children: [TestFile("Foo.xcdatamodeld")]),
+                                        TestFile("SmartStuff.mlmodel"),
+                                        TestFile("Intents.intentdefinition"),
+                                        TestFile("Assets.xcassets"),
+                                    ]
+                                ),
+                                buildConfigurations: [
+                                    TestBuildConfiguration(
+                                        "Debug",
+                                        buildSettings: [
+                                            "ENABLE_PREVIEWS": "NO",
+                                            "ENABLE_XOJIT_PREVIEWS": "YES",
+                                        ]
+                                    )
+                                ],
+                                targets: [
+                                    target
+                                ]
+                            )
                         ]
                     )
-                ]))
+                )
 
                 try await localFS.writeFileContents(tmpDir.join("Test/TestFile1.c")) { $0 <<< "int main(int argc, char **argv) { return 0; }" }
                 try await localFS.writeFileContents(tmpDir.join("Test/TestFile2.c")) { $0 <<< "" }
@@ -499,8 +566,7 @@ fileprivate struct GeneratePreviewInfoTests: CoreBasedTests {
                         for: request,
                         targetIDs: [target.guid],
                         delegate: delegate
-                    ) ==
-                    [
+                    ) == [
                         SWBPreviewTargetDependencyInfo(
                             sdkRoot: "iphoneos\(sdkVersion)",
                             sdkVariant: "iphoneos",
@@ -528,7 +594,7 @@ fileprivate struct GeneratePreviewInfoTests: CoreBasedTests {
                                 "-Xlinker", "-dependency_info",
                                 "-Xlinker", "\(tmpDir.str)/Test/build/Test.build/Debug-iphoneos/CApplication.build/Objects-normal/arm64/CApplication_dependency_info.dat",
                                 "-o",
-                                "\(tmpDir.str)/Test/build/Debug-iphoneos/CApplication.app/CApplication"
+                                "\(tmpDir.str)/Test/build/Debug-iphoneos/CApplication.app/CApplication",
                             ],
                             linkerWorkingDirectory: "\(tmpDir.str)/Test",
                             swiftEnableOpaqueTypeErasure: false,
diff --git a/Tests/SwiftBuildTests/IndexingInfoTests.swift b/Tests/SwiftBuildTests/IndexingInfoTests.swift
index 07ef77b4..293bbf86 100644
--- a/Tests/SwiftBuildTests/IndexingInfoTests.swift
+++ b/Tests/SwiftBuildTests/IndexingInfoTests.swift
@@ -52,10 +52,10 @@ fileprivate struct IndexingInfoTests: CoreBasedTests {
                 let projectFilesDir = "\(projectDir)/SomeFiles"
 
                 let workspacePIF: SWBPropertyListItem = [
-                    "guid":      "some-workspace-guid",
-                    "name":      "aWorkspace",
-                    "path":      .plString("\(tmpDirPath)/aWorkspace.xcworkspace/contents.xcworkspacedata"),
-                    "projects":  ["P1"]
+                    "guid": "some-workspace-guid",
+                    "name": "aWorkspace",
+                    "path": .plString("\(tmpDirPath)/aWorkspace.xcworkspace/contents.xcworkspacedata"),
+                    "projects": ["P1"],
                 ]
                 let projectPIF: SWBPropertyListItem = [
                     "guid": "P1",
@@ -72,27 +72,27 @@ fileprivate struct IndexingInfoTests: CoreBasedTests {
                                 "type": "file",
                                 "sourceTree": "<group>",
                                 "path": "Source.c",
-                                "fileType": "sourcecode.c.c"
+                                "fileType": "sourcecode.c.c",
                             ],
                             [
                                 "guid": "source-file-fileReference-guid2",
                                 "type": "file",
                                 "sourceTree": "<group>",
                                 "path": "Source2.c",
-                                "fileType": "sourcecode.c.c"
-                            ]
-                        ]
+                                "fileType": "sourcecode.c.c",
+                            ],
+                        ],
                     ],
                     "buildConfigurations": [
                         [
                             "guid": "BC1",
                             "name": "Config1",
-                            "buildSettings": [:]
+                            "buildSettings": [:],
                         ]
                     ],
                     "defaultConfigurationName": "Config1",
                     "developmentRegion": "English",
-                    "targets": ["T1"]
+                    "targets": ["T1"],
                 ]
                 let targetPIF: SWBPropertyListItem = [
                     "guid": "T1",
@@ -111,42 +111,42 @@ fileprivate struct IndexingInfoTests: CoreBasedTests {
                                 [
                                     "guid": "BF2",
                                     "name": "Source.c",
-                                    "fileReference": "source-file-fileReference-guid"
+                                    "fileReference": "source-file-fileReference-guid",
                                 ],
                                 [
                                     "guid": "BF3",
                                     "name": "Source2.c",
-                                    "fileReference": "source-file-fileReference-guid2"
-                                ]
-                            ]
+                                    "fileReference": "source-file-fileReference-guid2",
+                                ],
+                            ],
                         ]
                     ],
                     "buildConfigurations": [
                         [
                             "guid": "C2",
                             "name": "Config1",
-                            "buildSettings": [:]
+                            "buildSettings": [:],
                         ]
                     ],
                     "dependencies": [],
-                    "buildRules": []
+                    "buildRules": [],
                 ]
                 let topLevelPIF: SWBPropertyListItem = [
                     [
                         "type": "workspace",
                         "signature": "W1",
-                        "contents": workspacePIF
+                        "contents": workspacePIF,
                     ],
                     [
                         "type": "project",
                         "signature": "P1",
-                        "contents": projectPIF
+                        "contents": projectPIF,
                     ],
                     [
                         "type": "target",
                         "signature": "T1",
-                        "contents": targetPIF
-                    ]
+                        "contents": targetPIF,
+                    ],
                 ]
 
                 try await session.sendPIF(topLevelPIF)
@@ -289,7 +289,8 @@ fileprivate struct IndexingInfoTests: CoreBasedTests {
                                 "SWIFT_VERSION": "5.0",
                                 "CLANG_ENABLE_MODULES": "YES",
                                 "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                            ])
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -305,33 +306,42 @@ fileprivate struct IndexingInfoTests: CoreBasedTests {
                             TestBuildFile("intentsmissing.intentdefinition", intentsCodegenVisibility: .public),
                         ]),
                         TestResourcesBuildPhase([
-                            "Assets.xcassets",
-                        ])
+                            "Assets.xcassets"
+                        ]),
                     ]
                 )
 
-                try await testSession.sendPIF(TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                    TestProject(
+                try await testSession.sendPIF(
+                    TestWorkspace(
                         "Test",
-                        groupTree: TestGroup("Test", children: [
-                            TestFile("TestFile1.c"),
-                            TestFile("TestFile4.swift"),
-                            TestFile("Titanium.metal"),
-                            TestVersionGroup("Foo.xcdatamodeld", children: [TestFile("Foo.xcdatamodeld")]),
-                            TestFile("SmartStuff.mlmodel"),
-                            TestFile("Intents.intentdefinition"),
-                            TestFile("Assets.xcassets"),
-                            TestFile("mlmissing.mlmodel"),
-                            TestFile("intentsmissing.intentdefinition"),
-                        ]),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug")
-                        ],
-                        targets: [
-                            appTarget
+                        sourceRoot: tmpDir,
+                        projects: [
+                            TestProject(
+                                "Test",
+                                groupTree: TestGroup(
+                                    "Test",
+                                    children: [
+                                        TestFile("TestFile1.c"),
+                                        TestFile("TestFile4.swift"),
+                                        TestFile("Titanium.metal"),
+                                        TestVersionGroup("Foo.xcdatamodeld", children: [TestFile("Foo.xcdatamodeld")]),
+                                        TestFile("SmartStuff.mlmodel"),
+                                        TestFile("Intents.intentdefinition"),
+                                        TestFile("Assets.xcassets"),
+                                        TestFile("mlmissing.mlmodel"),
+                                        TestFile("intentsmissing.intentdefinition"),
+                                    ]
+                                ),
+                                buildConfigurations: [
+                                    TestBuildConfiguration("Debug")
+                                ],
+                                targets: [
+                                    appTarget
+                                ]
+                            )
                         ]
                     )
-                ]))
+                )
 
                 try localFS.createDirectory(tmpDir.join("Test"), recursive: true)
 
@@ -451,11 +461,14 @@ fileprivate struct IndexingInfoTests: CoreBasedTests {
 
                 results.checkNoIndexingInfo()
 
-                await #expect(performing: {
-                    try await testSession.session.generateLegacyInfo(for: request, targetID: "missing")
-                }, throws: { error in
-                    error.localizedDescription.contains("could not find target with GUID: 'missing'")
-                })
+                await #expect(
+                    performing: {
+                        try await testSession.session.generateLegacyInfo(for: request, targetID: "missing")
+                    },
+                    throws: { error in
+                        error.localizedDescription.contains("could not find target with GUID: 'missing'")
+                    }
+                )
 
                 // Basic checks that the command line makes sense for indexing. Doesn't check everything, just a few to make sure we've made the calls to add/remove args.
                 func checkClangCommandLine(_ checkable: any CommandLineCheckable, input: String, output: String, sourceLocation: SourceLocation = #_sourceLocation) {
@@ -514,7 +527,8 @@ fileprivate struct IndexingInfoTests: CoreBasedTests {
                                 "SDKROOT": "iphoneos",
                                 "ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOL_INDEX_PATH": "foo.plist",
                                 "ONLY_ACTIVE_ARCH": "YES",
-                            ])
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -522,21 +536,26 @@ fileprivate struct IndexingInfoTests: CoreBasedTests {
                             TestBuildFile("test.swift"),
                         ]),
                         TestResourcesBuildPhase([
-                            "Assets.xcassets",
-                        ])
+                            "Assets.xcassets"
+                        ]),
                     ]
                 )
 
                 try await testSession.sendPIF(
                     TestWorkspace(
-                        "Test", sourceRoot: tmpDir, projects: [
+                        "Test",
+                        sourceRoot: tmpDir,
+                        projects: [
                             TestProject(
                                 "Test",
-                                groupTree: TestGroup("Test", children: [
-                                    TestFile("test.c"),
-                                    TestFile("test.swift"),
-                                    TestFile("Assets.xcassets"),
-                                ]),
+                                groupTree: TestGroup(
+                                    "Test",
+                                    children: [
+                                        TestFile("test.c"),
+                                        TestFile("test.swift"),
+                                        TestFile("Assets.xcassets"),
+                                    ]
+                                ),
                                 buildConfigurations: [
                                     TestBuildConfiguration("Debug")
                                 ],
@@ -544,22 +563,28 @@ fileprivate struct IndexingInfoTests: CoreBasedTests {
                                     appTarget
                                 ]
                             )
-                        ])
+                        ]
+                    )
                 )
 
                 try localFS.createDirectory(tmpDir.join("Test"), recursive: true)
 
                 let activeRunDestination = SWBRunDestinationInfo.iOS
                 let buildParameters = SWBBuildParameters(
-                    configuration: "Debug", activeRunDestination: activeRunDestination
+                    configuration: "Debug",
+                    activeRunDestination: activeRunDestination
                 )
                 var request = SWBBuildRequest()
-                request.add(target: SWBConfiguredTarget(
-                    guid: appTarget.guid, parameters: buildParameters
-                ))
+                request.add(
+                    target: SWBConfiguredTarget(
+                        guid: appTarget.guid,
+                        parameters: buildParameters
+                    )
+                )
 
                 let results = try await testSession.session.generateLegacyInfo(
-                    for: request, targetID: appTarget.guid
+                    for: request,
+                    targetID: appTarget.guid
                 )
 
                 await results.checkIndexingInfo(.matchSourceFilePath(Path("\(tmpDir.str)/Test/test.c"))) { info in
@@ -593,7 +618,8 @@ fileprivate struct IndexingInfoTests: CoreBasedTests {
                     sourceRoot: srcroot,
                     projects: [
                         TestProject(
-                            "aProject", defaultConfigurationName: "Debug",
+                            "aProject",
+                            defaultConfigurationName: "Debug",
                             groupTree: TestGroup(
                                 "Foo",
                                 children: [
@@ -603,17 +629,21 @@ fileprivate struct IndexingInfoTests: CoreBasedTests {
                             ),
                             targets: [
                                 TestStandardTarget(
-                                    "Foo", guid: "Foo", type: .staticLibrary,
+                                    "Foo",
+                                    guid: "Foo",
+                                    type: .staticLibrary,
                                     buildConfigurations: [
                                         TestBuildConfiguration(
                                             "Debug",
                                             buildSettings: [
                                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                                 "USE_HEADERMAP": "NO",
-                                                "GCC_PREFIX_HEADER": "Foo/PrefixHeader.pch"
-                                            ])],
+                                                "GCC_PREFIX_HEADER": "Foo/PrefixHeader.pch",
+                                            ]
+                                        )
+                                    ],
                                     buildPhases: [
-                                        TestSourcesBuildPhase([TestBuildFile("foo.c")]),
+                                        TestSourcesBuildPhase([TestBuildFile("foo.c")])
                                     ]
                                 )
                             ]
@@ -671,7 +701,7 @@ fileprivate struct IndexingInfoTests: CoreBasedTests {
                             info.checkPrefixHeaderPath(.suffix("PrefixHeader.pch"))
                             info.checkPrecompiledHeaderPath(.suffix("PrefixHeader.pch.gch"))
 
-                            info.checkPrecompiledHeaderHashCriteria(nil) // rdar://problem/24469921
+                            info.checkPrecompiledHeaderHashCriteria(nil)  // rdar://problem/24469921
                             info.clangPrecompiledHeader.checkCommandLineDoesNotContain("--serialize-diagnostics")
                             info.clangPrecompiledHeader.checkCommandLineDoesNotContain("-fsyntax-only")
                             info.clangPrecompiledHeader.checkCommandLineMatches([.suffix("PrefixHeader.pch.gch")])
@@ -702,25 +732,30 @@ fileprivate struct IndexingInfoTests: CoreBasedTests {
                     sourceRoot: srcroot,
                     projects: [
                         TestProject(
-                            "aProject", defaultConfigurationName: "Debug",
+                            "aProject",
+                            defaultConfigurationName: "Debug",
                             groupTree: TestGroup(
                                 "Foo",
                                 children: [
-                                    TestFile("foo.c"),
+                                    TestFile("foo.c")
                                 ]
                             ),
                             targets: [
                                 TestStandardTarget(
-                                    "Foo", guid: "Foo", type: .staticLibrary,
+                                    "Foo",
+                                    guid: "Foo",
+                                    type: .staticLibrary,
                                     buildConfigurations: [
                                         TestBuildConfiguration(
                                             "Debug",
                                             buildSettings: [
                                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                                 "ARCHS": "arm64 x86_64 i386",
-                                            ])],
+                                            ]
+                                        )
+                                    ],
                                     buildPhases: [
-                                        TestSourcesBuildPhase([TestBuildFile("foo.c")]),
+                                        TestSourcesBuildPhase([TestBuildFile("foo.c")])
                                     ]
                                 )
                             ]
@@ -781,7 +816,8 @@ fileprivate struct IndexingInfoTests: CoreBasedTests {
                                 "SWIFT_VERSION": "5.0",
                                 "CLANG_ENABLE_MODULES": "YES",
                                 "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-                            ])
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
@@ -792,30 +828,39 @@ fileprivate struct IndexingInfoTests: CoreBasedTests {
                             TestBuildFile("Intents.intentdefinition", intentsCodegenVisibility: .public),
                         ]),
                         TestResourcesBuildPhase([
-                            "Assets.xcassets",
-                        ])
+                            "Assets.xcassets"
+                        ]),
                     ]
                 )
 
-                try await testSession.sendPIF(TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-                    TestProject(
+                try await testSession.sendPIF(
+                    TestWorkspace(
                         "Test",
-                        groupTree: TestGroup("Test", children: [
-                            TestFile("TestFile1.c"),
-                            TestFile("TestFile4.swift"),
-                            TestVersionGroup("Foo.xcdatamodeld", children: [TestFile("Foo.xcdatamodeld")]),
-                            TestFile("SmartStuff.mlmodel"),
-                            TestFile("Intents.intentdefinition"),
-                            TestFile("Assets.xcassets"),
-                        ]),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug")
-                        ],
-                        targets: [
-                            appTarget
+                        sourceRoot: tmpDir,
+                        projects: [
+                            TestProject(
+                                "Test",
+                                groupTree: TestGroup(
+                                    "Test",
+                                    children: [
+                                        TestFile("TestFile1.c"),
+                                        TestFile("TestFile4.swift"),
+                                        TestVersionGroup("Foo.xcdatamodeld", children: [TestFile("Foo.xcdatamodeld")]),
+                                        TestFile("SmartStuff.mlmodel"),
+                                        TestFile("Intents.intentdefinition"),
+                                        TestFile("Assets.xcassets"),
+                                    ]
+                                ),
+                                buildConfigurations: [
+                                    TestBuildConfiguration("Debug")
+                                ],
+                                targets: [
+                                    appTarget
+                                ]
+                            )
                         ]
                     )
-                ]))
+                )
 
                 let activeRunDestination = SWBRunDestinationInfo.iOS
                 let buildParameters = SWBBuildParameters(configuration: "Debug", activeRunDestination: activeRunDestination)
@@ -884,8 +929,10 @@ extension SWBBuildServiceSession {
     fileprivate func generateLegacyInfo(for request: SWBBuildRequest, targetID: String, filePath: String? = nil, outputPathOnly: Bool = false, delegate: (any SWBIndexingDelegate)? = nil) async throws -> IndexingInfoResults {
         let delegate = delegate ?? EmptyBuildOperationDelegate()
         let plists = try await self.generateIndexingFileSettings(for: request, targetID: targetID, filePath: filePath, outputPathOnly: outputPathOnly, delegate: delegate).sourceFileBuildInfos
-        return IndexingInfoResults(plists.map { plist in
-            plist.mapValues { $0.propertyListItem }
-        })
+        return IndexingInfoResults(
+            plists.map { plist in
+                plist.mapValues { $0.propertyListItem }
+            }
+        )
     }
 }
diff --git a/Tests/SwiftBuildTests/InspectBuildDescriptionTests.swift b/Tests/SwiftBuildTests/InspectBuildDescriptionTests.swift
index 342431f0..e6840f8d 100644
--- a/Tests/SwiftBuildTests/InspectBuildDescriptionTests.swift
+++ b/Tests/SwiftBuildTests/InspectBuildDescriptionTests.swift
@@ -90,9 +90,12 @@ fileprivate struct InspectBuildDescriptionTests {
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        .init("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)"
-                        ])
+                        .init(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)"
+                            ]
+                        )
                     ],
                     buildPhases: [TestSourcesBuildPhase([TestBuildFile("Foo.swift")])],
                 )
@@ -101,9 +104,12 @@ fileprivate struct InspectBuildDescriptionTests {
                     "MyStaticLibrary",
                     type: .staticLibrary,
                     buildConfigurations: [
-                        .init("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)"
-                        ])
+                        .init(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)"
+                            ]
+                        )
                     ],
                     buildPhases: [TestSourcesBuildPhase([TestBuildFile("Foo.swift")])],
                 )
@@ -112,9 +118,12 @@ fileprivate struct InspectBuildDescriptionTests {
                     "MyDynamicLibrary",
                     type: .dynamicLibrary,
                     buildConfigurations: [
-                        .init("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)"
-                        ])
+                        .init(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)"
+                            ]
+                        )
                     ],
                     buildPhases: [TestSourcesBuildPhase([TestBuildFile("Foo.swift")])],
                 )
@@ -123,9 +132,12 @@ fileprivate struct InspectBuildDescriptionTests {
                     "MyExecutable",
                     type: .commandLineTool,
                     buildConfigurations: [
-                        .init("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)"
-                        ])
+                        .init(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)"
+                            ]
+                        )
                     ],
                     buildPhases: [TestSourcesBuildPhase([TestBuildFile("Foo.swift")])],
                 )
diff --git a/Tests/SwiftBuildTests/LocalizationInfoSymbolGenTests.swift b/Tests/SwiftBuildTests/LocalizationInfoSymbolGenTests.swift
index 3337a4ab..267400fc 100644
--- a/Tests/SwiftBuildTests/LocalizationInfoSymbolGenTests.swift
+++ b/Tests/SwiftBuildTests/LocalizationInfoSymbolGenTests.swift
@@ -37,50 +37,60 @@ fileprivate struct LocalizationInfoSymbolGenTests {
                     "MyApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "STRING_CATALOG_GENERATE_SYMBOLS": "YES",
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                            "ONLY_ACTIVE_ARCH": "NO",
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "STRING_CATALOG_GENERATE_SYMBOLS": "YES",
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                                "ONLY_ACTIVE_ARCH": "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyApp.swift",
-                            "Supporting.swift"
+                            "Supporting.swift",
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
 
-                let testWorkspace = TestWorkspace("MyWorkspace", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "Project",
-                        groupTree: TestGroup(
-                            "ProjectSources",
-                            path: "Sources",
-                            children: [
-                                TestFile("MyApp.swift"),
-                                TestFile("Supporting.swift"),
-                                TestFile("Localizable.xcstrings"),
-                            ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])
-                        ],
-                        targets: [
-                            target
-                        ],
-                        developmentRegion: "en"
-                    )
-                ])
+                let testWorkspace = TestWorkspace(
+                    "MyWorkspace",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "Project",
+                            groupTree: TestGroup(
+                                "ProjectSources",
+                                path: "Sources",
+                                children: [
+                                    TestFile("MyApp.swift"),
+                                    TestFile("Supporting.swift"),
+                                    TestFile("Localizable.xcstrings"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                target
+                            ],
+                            developmentRegion: "en"
+                        )
+                    ]
+                )
 
                 // Describe the workspace to the build system.
                 try await testSession.sendPIF(testWorkspace)
@@ -97,7 +107,7 @@ fileprivate struct LocalizationInfoSymbolGenTests {
 
                 let info = try await testSession.session.generateLocalizationInfo(for: request, delegate: delegate)
 
-                #expect(info.infoByTarget.count == 1) // 1 target
+                #expect(info.infoByTarget.count == 1)  // 1 target
 
                 let targetInfo = try #require(info.infoByTarget[target.guid])
 
@@ -126,50 +136,60 @@ fileprivate struct LocalizationInfoSymbolGenTests {
                     "MyApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "STRING_CATALOG_GENERATE_SYMBOLS": "YES",
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                            "ONLY_ACTIVE_ARCH": "NO"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "STRING_CATALOG_GENERATE_SYMBOLS": "YES",
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                                "ONLY_ACTIVE_ARCH": "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyApp.swift",
-                            "Supporting.swift"
+                            "Supporting.swift",
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
 
-                let testWorkspace = TestWorkspace("MyWorkspace", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "Project",
-                        groupTree: TestGroup(
-                            "ProjectSources",
-                            path: "Sources",
-                            children: [
-                                TestFile("MyApp.swift"),
-                                TestFile("Supporting.swift"),
-                                TestFile("Localizable.xcstrings"),
-                            ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])
-                        ],
-                        targets: [
-                            target
-                        ],
-                        developmentRegion: "en"
-                    )
-                ])
+                let testWorkspace = TestWorkspace(
+                    "MyWorkspace",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "Project",
+                            groupTree: TestGroup(
+                                "ProjectSources",
+                                path: "Sources",
+                                children: [
+                                    TestFile("MyApp.swift"),
+                                    TestFile("Supporting.swift"),
+                                    TestFile("Localizable.xcstrings"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                target
+                            ],
+                            developmentRegion: "en"
+                        )
+                    ]
+                )
 
                 // Describe the workspace to the build system.
                 try await testSession.sendPIF(testWorkspace)
@@ -188,7 +208,7 @@ fileprivate struct LocalizationInfoSymbolGenTests {
 
                 let info = try await testSession.session.generateLocalizationInfo(for: request, delegate: delegate)
 
-                #expect(info.infoByTarget.count == 1) // 1 target
+                #expect(info.infoByTarget.count == 1)  // 1 target
 
                 let targetInfo = try #require(info.infoByTarget[target.guid])
 
@@ -215,7 +235,7 @@ private final class BuildOperationDelegate: SWBLocalizationDelegate {
         return await delegate.provisioningTaskInputs(targetGUID: targetGUID, provisioningSourceData: provisioningSourceData)
     }
 
-    func executeExternalTool(commandLine: [String], workingDirectory: String?, environment: [String : String]) async throws -> SWBExternalToolResult {
+    func executeExternalTool(commandLine: [String], workingDirectory: String?, environment: [String: String]) async throws -> SWBExternalToolResult {
         guard let command = commandLine.first, command.hasSuffix("xcstringstool") else {
             return .deferred
         }
diff --git a/Tests/SwiftBuildTests/LocalizationInfoTests.swift b/Tests/SwiftBuildTests/LocalizationInfoTests.swift
index 191e2c3f..02909038 100644
--- a/Tests/SwiftBuildTests/LocalizationInfoTests.swift
+++ b/Tests/SwiftBuildTests/LocalizationInfoTests.swift
@@ -36,50 +36,60 @@ fileprivate struct LocalizationInfoTests {
                     "MyApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "SWIFT_EMIT_LOC_STRINGS": "YES",
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                            "ONLY_ACTIVE_ARCH": "NO"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "SWIFT_EMIT_LOC_STRINGS": "YES",
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                                "ONLY_ACTIVE_ARCH": "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyApp.swift",
-                            "Supporting.swift"
+                            "Supporting.swift",
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
 
-                let testWorkspace = TestWorkspace("MyWorkspace", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "Project",
-                        groupTree: TestGroup(
-                            "ProjectSources",
-                            path: "Sources",
-                            children: [
-                                TestFile("MyApp.swift"),
-                                TestFile("Supporting.swift"),
-                                TestFile("Localizable.xcstrings"),
-                            ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])
-                        ],
-                        targets: [
-                            target
-                        ],
-                        developmentRegion: "en"
-                    )
-                ])
+                let testWorkspace = TestWorkspace(
+                    "MyWorkspace",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "Project",
+                            groupTree: TestGroup(
+                                "ProjectSources",
+                                path: "Sources",
+                                children: [
+                                    TestFile("MyApp.swift"),
+                                    TestFile("Supporting.swift"),
+                                    TestFile("Localizable.xcstrings"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                target
+                            ],
+                            developmentRegion: "en"
+                        )
+                    ]
+                )
 
                 // Describe the workspace to the build system.
                 try await testSession.sendPIF(testWorkspace)
@@ -96,7 +106,7 @@ fileprivate struct LocalizationInfoTests {
 
                 let info = try await testSession.session.generateLocalizationInfo(for: request, delegate: delegate)
 
-                #expect(info.infoByTarget.count == 1) // 1 target
+                #expect(info.infoByTarget.count == 1)  // 1 target
 
                 let targetInfo = try #require(info.infoByTarget[target.guid])
 
@@ -137,50 +147,60 @@ fileprivate struct LocalizationInfoTests {
                     "MyApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "SWIFT_EMIT_LOC_STRINGS": "NO",
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                            "ONLY_ACTIVE_ARCH": "NO"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "SWIFT_EMIT_LOC_STRINGS": "NO",
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                                "ONLY_ACTIVE_ARCH": "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyApp.swift",
-                            "Supporting.swift"
+                            "Supporting.swift",
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
 
-                let testWorkspace = TestWorkspace("MyWorkspace", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "Project",
-                        groupTree: TestGroup(
-                            "ProjectSources",
-                            path: "Sources",
-                            children: [
-                                TestFile("MyApp.swift"),
-                                TestFile("Supporting.swift"),
-                                TestFile("Localizable.xcstrings"),
-                            ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])
-                        ],
-                        targets: [
-                            target
-                        ],
-                        developmentRegion: "en"
-                    )
-                ])
+                let testWorkspace = TestWorkspace(
+                    "MyWorkspace",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "Project",
+                            groupTree: TestGroup(
+                                "ProjectSources",
+                                path: "Sources",
+                                children: [
+                                    TestFile("MyApp.swift"),
+                                    TestFile("Supporting.swift"),
+                                    TestFile("Localizable.xcstrings"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                target
+                            ],
+                            developmentRegion: "en"
+                        )
+                    ]
+                )
 
                 // Describe the workspace to the build system.
                 try await testSession.sendPIF(testWorkspace)
@@ -197,7 +217,7 @@ fileprivate struct LocalizationInfoTests {
 
                 let info = try await testSession.session.generateLocalizationInfo(for: request, delegate: delegate)
 
-                #expect(info.infoByTarget.count == 1) // 1 target
+                #expect(info.infoByTarget.count == 1)  // 1 target
 
                 let targetInfo = try #require(info.infoByTarget[target.guid])
 
@@ -206,7 +226,7 @@ fileprivate struct LocalizationInfoTests {
 
                 // Regardless of compiler extraction being off, ExtractedAppShortcutsMetadata.stringsdata produced
                 #expect(targetInfo.producedStringsdataPaths.count == 2)
-                #expect(targetInfo.stringsdataPathsByBuildPortion.count == 2) // 2 archs
+                #expect(targetInfo.stringsdataPathsByBuildPortion.count == 2)  // 2 archs
                 #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("ExtractedAppShortcutsMetadata.stringsdata") }).count == 2)
                 #expect(targetInfo.stringsdataPathsByBuildPortion[.init(effectivePlatformName: "macosx", variant: "normal", architecture: "x86_64")]?.filter({ $0.hasSuffix("x86_64/ExtractedAppShortcutsMetadata.stringsdata") }).count == 1)
                 #expect(targetInfo.stringsdataPathsByBuildPortion[.init(effectivePlatformName: "macosx", variant: "normal", architecture: "x86_64")]?.filter({ $0.hasSuffix("arm64/ExtractedAppShortcutsMetadata.stringsdata") }).count == 0)
@@ -232,50 +252,60 @@ fileprivate struct LocalizationInfoTests {
                     "MyApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "SWIFT_EMIT_LOC_STRINGS": "YES",
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                            "ONLY_ACTIVE_ARCH": "NO"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "SWIFT_EMIT_LOC_STRINGS": "YES",
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                                "ONLY_ACTIVE_ARCH": "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyApp.swift",
-                            "Supporting.swift"
+                            "Supporting.swift",
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
 
-                let testWorkspace = TestWorkspace("MyWorkspace", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "Project",
-                        groupTree: TestGroup(
-                            "ProjectSources",
-                            path: "Sources",
-                            children: [
-                                TestFile("MyApp.swift"),
-                                TestFile("Supporting.swift"),
-                                TestFile("Localizable.xcstrings"),
-                            ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])
-                        ],
-                        targets: [
-                            target
-                        ],
-                        developmentRegion: "en"
-                    )
-                ])
+                let testWorkspace = TestWorkspace(
+                    "MyWorkspace",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "Project",
+                            groupTree: TestGroup(
+                                "ProjectSources",
+                                path: "Sources",
+                                children: [
+                                    TestFile("MyApp.swift"),
+                                    TestFile("Supporting.swift"),
+                                    TestFile("Localizable.xcstrings"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                target
+                            ],
+                            developmentRegion: "en"
+                        )
+                    ]
+                )
 
                 // Describe the workspace to the build system.
                 try await testSession.sendPIF(testWorkspace)
@@ -294,7 +324,7 @@ fileprivate struct LocalizationInfoTests {
 
                 let info = try await testSession.session.generateLocalizationInfo(for: request, delegate: delegate)
 
-                #expect(info.infoByTarget.count == 1) // 1 target
+                #expect(info.infoByTarget.count == 1)  // 1 target
 
                 let targetInfo = try #require(info.infoByTarget[target.guid])
 
@@ -326,50 +356,63 @@ fileprivate struct LocalizationInfoTests {
                     "MyApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "SWIFT_EMIT_LOC_STRINGS": "NO",
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                            "ONLY_ACTIVE_ARCH": "NO"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "SWIFT_EMIT_LOC_STRINGS": "NO",
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                                "ONLY_ACTIVE_ARCH": "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyApp.swift",
-                            "Supporting.swift"
+                            "Supporting.swift",
                         ]),
-                        TestCopyFilesBuildPhase([
-                            "Localizable.xcstrings"
-                        ], destinationSubfolder: .absolute)
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Localizable.xcstrings"
+                            ],
+                            destinationSubfolder: .absolute
+                        ),
                     ]
                 )
 
-                let testWorkspace = TestWorkspace("MyWorkspace", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "Project",
-                        groupTree: TestGroup(
-                            "ProjectSources",
-                            path: "Sources",
-                            children: [
-                                TestFile("MyApp.swift"),
-                                TestFile("Supporting.swift"),
-                                TestFile("Localizable.xcstrings"),
-                            ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])
-                        ],
-                        targets: [
-                            target
-                        ],
-                        developmentRegion: "en"
-                    )
-                ])
+                let testWorkspace = TestWorkspace(
+                    "MyWorkspace",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "Project",
+                            groupTree: TestGroup(
+                                "ProjectSources",
+                                path: "Sources",
+                                children: [
+                                    TestFile("MyApp.swift"),
+                                    TestFile("Supporting.swift"),
+                                    TestFile("Localizable.xcstrings"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                target
+                            ],
+                            developmentRegion: "en"
+                        )
+                    ]
+                )
 
                 // Describe the workspace to the build system.
                 try await testSession.sendPIF(testWorkspace)
@@ -386,7 +429,7 @@ fileprivate struct LocalizationInfoTests {
 
                 let info = try await testSession.session.generateLocalizationInfo(for: request, delegate: delegate)
 
-                #expect(info.infoByTarget.count == 1) // 1 target
+                #expect(info.infoByTarget.count == 1)  // 1 target
 
                 let targetInfo = try #require(info.infoByTarget[target.guid])
 
@@ -416,50 +459,63 @@ fileprivate struct LocalizationInfoTests {
                     "MyApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "SWIFT_EMIT_LOC_STRINGS": "NO",
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                            "ONLY_ACTIVE_ARCH": "NO"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "SWIFT_EMIT_LOC_STRINGS": "NO",
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                                "ONLY_ACTIVE_ARCH": "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyApp.swift",
-                            "Supporting.swift"
+                            "Supporting.swift",
                         ]),
-                        TestCopyFilesBuildPhase([
-                            "Localizable.xcstrings"
-                        ], destinationSubfolder: .absolute)
+                        TestCopyFilesBuildPhase(
+                            [
+                                "Localizable.xcstrings"
+                            ],
+                            destinationSubfolder: .absolute
+                        ),
                     ]
                 )
 
-                let testWorkspace = TestWorkspace("MyWorkspace", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "Project",
-                        groupTree: TestGroup(
-                            "ProjectSources",
-                            path: "Sources",
-                            children: [
-                                TestFile("MyApp.swift"),
-                                TestFile("Supporting.swift"),
-                                TestFile("Localizable.xcstrings"),
-                            ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])
-                        ],
-                        targets: [
-                            target
-                        ],
-                        developmentRegion: "en"
-                    )
-                ])
+                let testWorkspace = TestWorkspace(
+                    "MyWorkspace",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "Project",
+                            groupTree: TestGroup(
+                                "ProjectSources",
+                                path: "Sources",
+                                children: [
+                                    TestFile("MyApp.swift"),
+                                    TestFile("Supporting.swift"),
+                                    TestFile("Localizable.xcstrings"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                target
+                            ],
+                            developmentRegion: "en"
+                        )
+                    ]
+                )
 
                 // Describe the workspace to the build system.
                 try await testSession.sendPIF(testWorkspace)
@@ -478,7 +534,7 @@ fileprivate struct LocalizationInfoTests {
 
                 let info = try await testSession.session.generateLocalizationInfo(for: request, delegate: delegate)
 
-                #expect(info.infoByTarget.count == 1) // 1 target
+                #expect(info.infoByTarget.count == 1)  // 1 target
 
                 let targetInfo = try #require(info.infoByTarget[target.guid])
 
@@ -510,50 +566,60 @@ fileprivate struct LocalizationInfoTests {
                     "MyApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "SWIFT_EMIT_LOC_STRINGS": "YES",
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                            "ONLY_ACTIVE_ARCH": "YES"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "SWIFT_EMIT_LOC_STRINGS": "YES",
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                                "ONLY_ACTIVE_ARCH": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyApp.swift",
-                            "Supporting.swift"
+                            "Supporting.swift",
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
 
-                let testWorkspace = TestWorkspace("MyWorkspace", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "Project",
-                        groupTree: TestGroup(
-                            "ProjectSources",
-                            path: "Sources",
-                            children: [
-                                TestFile("MyApp.swift"),
-                                TestFile("Supporting.swift"),
-                                TestFile("Localizable.xcstrings"),
-                            ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])
-                        ],
-                        targets: [
-                            target
-                        ],
-                        developmentRegion: "en"
-                    )
-                ])
+                let testWorkspace = TestWorkspace(
+                    "MyWorkspace",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "Project",
+                            groupTree: TestGroup(
+                                "ProjectSources",
+                                path: "Sources",
+                                children: [
+                                    TestFile("MyApp.swift"),
+                                    TestFile("Supporting.swift"),
+                                    TestFile("Localizable.xcstrings"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                target
+                            ],
+                            developmentRegion: "en"
+                        )
+                    ]
+                )
 
                 // Describe the workspace to the build system.
                 try await testSession.sendPIF(testWorkspace)
@@ -570,7 +636,7 @@ fileprivate struct LocalizationInfoTests {
 
                 let info = try await testSession.session.generateLocalizationInfo(for: request, delegate: delegate)
 
-                #expect(info.infoByTarget.count == 1) // 1 target
+                #expect(info.infoByTarget.count == 1)  // 1 target
 
                 let targetInfo = try #require(info.infoByTarget[target.guid])
 
@@ -579,10 +645,10 @@ fileprivate struct LocalizationInfoTests {
 
                 #expect(targetInfo.producedStringsdataPaths.count == 3)
                 // Each Swift file should get 1 stringsdata for the active arch
-                #expect(targetInfo.stringsdataPathsByBuildPortion.count == 1) // 1 arch
+                #expect(targetInfo.stringsdataPathsByBuildPortion.count == 1)  // 1 arch
                 #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("MyApp.stringsdata") }).count == 1)
                 #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("Supporting.stringsdata") }).count == 1)
-                #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("ExtractedAppShortcutsMetadata.stringsdata")}).count == 1)
+                #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("ExtractedAppShortcutsMetadata.stringsdata") }).count == 1)
                 #expect(targetInfo.producedStringsdataPaths.allSatisfy({ $0.contains("Debug/") }))
             }
         }
@@ -604,50 +670,60 @@ fileprivate struct LocalizationInfoTests {
                     "MyApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "SWIFT_EMIT_LOC_STRINGS": "YES",
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
-                            "ONLY_ACTIVE_ARCH": "YES"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "SWIFT_EMIT_LOC_STRINGS": "YES",
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
+                                "ONLY_ACTIVE_ARCH": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyApp.swift",
-                            "Supporting.swift"
+                            "Supporting.swift",
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
 
-                let testWorkspace = TestWorkspace("MyWorkspace", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "Project",
-                        groupTree: TestGroup(
-                            "ProjectSources",
-                            path: "Sources",
-                            children: [
-                                TestFile("MyApp.swift"),
-                                TestFile("Supporting.swift"),
-                                TestFile("Localizable.xcstrings"),
-                            ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])
-                        ],
-                        targets: [
-                            target
-                        ],
-                        developmentRegion: "en"
-                    )
-                ])
+                let testWorkspace = TestWorkspace(
+                    "MyWorkspace",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "Project",
+                            groupTree: TestGroup(
+                                "ProjectSources",
+                                path: "Sources",
+                                children: [
+                                    TestFile("MyApp.swift"),
+                                    TestFile("Supporting.swift"),
+                                    TestFile("Localizable.xcstrings"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                target
+                            ],
+                            developmentRegion: "en"
+                        )
+                    ]
+                )
 
                 // Describe the workspace to the build system.
                 try await testSession.sendPIF(testWorkspace)
@@ -664,7 +740,7 @@ fileprivate struct LocalizationInfoTests {
 
                 let info = try await testSession.session.generateLocalizationInfo(for: request, delegate: delegate)
 
-                #expect(info.infoByTarget.count == 1) // 1 target
+                #expect(info.infoByTarget.count == 1)  // 1 target
 
                 let targetInfo = try #require(info.infoByTarget[target.guid])
 
@@ -673,7 +749,7 @@ fileprivate struct LocalizationInfoTests {
 
                 #expect(targetInfo.producedStringsdataPaths.count == 3)
                 // Each Swift file should get 1 stringsdata for the active arch
-                #expect(targetInfo.stringsdataPathsByBuildPortion.count == 1) // 1 arch
+                #expect(targetInfo.stringsdataPathsByBuildPortion.count == 1)  // 1 arch
                 #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("MyApp.stringsdata") }).count == 1)
                 #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("Supporting.stringsdata") }).count == 1)
                 #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("ExtractedAppShortcutsMetadata.stringsdata") }).count == 1)
@@ -698,50 +774,60 @@ fileprivate struct LocalizationInfoTests {
                     "MyApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "SWIFT_EMIT_LOC_STRINGS": "YES",
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
-                            "ONLY_ACTIVE_ARCH": "YES"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "SWIFT_EMIT_LOC_STRINGS": "YES",
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
+                                "ONLY_ACTIVE_ARCH": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyApp.swift",
-                            "Supporting.swift"
+                            "Supporting.swift",
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
 
-                let testWorkspace = TestWorkspace("MyWorkspace", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "Project",
-                        groupTree: TestGroup(
-                            "ProjectSources",
-                            path: "Sources",
-                            children: [
-                                TestFile("MyApp.swift"),
-                                TestFile("Supporting.swift"),
-                                TestFile("Localizable.xcstrings"),
-                            ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])
-                        ],
-                        targets: [
-                            target
-                        ],
-                        developmentRegion: "en"
-                    )
-                ])
+                let testWorkspace = TestWorkspace(
+                    "MyWorkspace",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "Project",
+                            groupTree: TestGroup(
+                                "ProjectSources",
+                                path: "Sources",
+                                children: [
+                                    TestFile("MyApp.swift"),
+                                    TestFile("Supporting.swift"),
+                                    TestFile("Localizable.xcstrings"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                target
+                            ],
+                            developmentRegion: "en"
+                        )
+                    ]
+                )
 
                 // Describe the workspace to the build system.
                 try await testSession.sendPIF(testWorkspace)
@@ -758,7 +844,7 @@ fileprivate struct LocalizationInfoTests {
 
                 let info = try await testSession.session.generateLocalizationInfo(for: request, delegate: delegate)
 
-                #expect(info.infoByTarget.count == 1) // 1 target
+                #expect(info.infoByTarget.count == 1)  // 1 target
 
                 let targetInfo = try #require(info.infoByTarget[target.guid])
 
@@ -767,7 +853,7 @@ fileprivate struct LocalizationInfoTests {
 
                 #expect(targetInfo.producedStringsdataPaths.count == 3)
                 // Each Swift file should get 1 stringsdata for the active arch
-                #expect(targetInfo.stringsdataPathsByBuildPortion.count == 1) // 1 arch
+                #expect(targetInfo.stringsdataPathsByBuildPortion.count == 1)  // 1 arch
                 #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("MyApp.stringsdata") }).count == 1)
                 #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("Supporting.stringsdata") }).count == 1)
                 #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("ExtractedAppShortcutsMetadata.stringsdata") }).count == 1)
@@ -792,51 +878,61 @@ fileprivate struct LocalizationInfoTests {
                     "MyApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "SWIFT_EMIT_LOC_STRINGS": "YES",
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
-                            "SUPPORTS_MACCATALYST": "YES",
-                            "ONLY_ACTIVE_ARCH" : "YES"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "SWIFT_EMIT_LOC_STRINGS": "YES",
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator",
+                                "SUPPORTS_MACCATALYST": "YES",
+                                "ONLY_ACTIVE_ARCH": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyApp.swift",
-                            "Supporting.swift"
+                            "Supporting.swift",
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
 
-                let testWorkspace = TestWorkspace("MyWorkspace", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "Project",
-                        groupTree: TestGroup(
-                            "ProjectSources",
-                            path: "Sources",
-                            children: [
-                                TestFile("MyApp.swift"),
-                                TestFile("Supporting.swift"),
-                                TestFile("Localizable.xcstrings"),
-                            ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])
-                        ],
-                        targets: [
-                            target
-                        ],
-                        developmentRegion: "en"
-                    )
-                ])
+                let testWorkspace = TestWorkspace(
+                    "MyWorkspace",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "Project",
+                            groupTree: TestGroup(
+                                "ProjectSources",
+                                path: "Sources",
+                                children: [
+                                    TestFile("MyApp.swift"),
+                                    TestFile("Supporting.swift"),
+                                    TestFile("Localizable.xcstrings"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                target
+                            ],
+                            developmentRegion: "en"
+                        )
+                    ]
+                )
 
                 // Describe the workspace to the build system.
                 try await testSession.sendPIF(testWorkspace)
@@ -854,7 +950,7 @@ fileprivate struct LocalizationInfoTests {
 
                 let info = try await testSession.session.generateLocalizationInfo(for: request, delegate: delegate)
 
-                #expect(info.infoByTarget.count == 1) // 1 target
+                #expect(info.infoByTarget.count == 1)  // 1 target
 
                 let targetInfo = try #require(info.infoByTarget[target.guid])
 
@@ -863,10 +959,10 @@ fileprivate struct LocalizationInfoTests {
 
                 #expect(targetInfo.producedStringsdataPaths.count == 3)
                 // Each Swift file should get 1 stringsdata for the active arch
-                #expect(targetInfo.stringsdataPathsByBuildPortion.count == 1) // 1 arch
+                #expect(targetInfo.stringsdataPathsByBuildPortion.count == 1)  // 1 arch
                 #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("MyApp.stringsdata") }).count == 1)
                 #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("Supporting.stringsdata") }).count == 1)
-                #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("ExtractedAppShortcutsMetadata.stringsdata")}).count == 1)
+                #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("ExtractedAppShortcutsMetadata.stringsdata") }).count == 1)
                 #expect(targetInfo.producedStringsdataPaths.allSatisfy({ $0.contains("Debug-maccatalyst/") }))
                 #expect(targetInfo.stringsdataPathsByBuildPortion.keys.allSatisfy({ $0.effectivePlatformName == "maccatalyst" }))
             }
@@ -889,50 +985,60 @@ fileprivate struct LocalizationInfoTests {
                     "MyApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "SWIFT_EMIT_LOC_STRINGS": "YES",
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
-                            "ONLY_ACTIVE_ARCH": "YES"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "SWIFT_EMIT_LOC_STRINGS": "YES",
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator",
+                                "ONLY_ACTIVE_ARCH": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyApp.swift",
-                            "Supporting.swift"
+                            "Supporting.swift",
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
 
-                let testWorkspace = TestWorkspace("MyWorkspace", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "Project",
-                        groupTree: TestGroup(
-                            "ProjectSources",
-                            path: "Sources",
-                            children: [
-                                TestFile("MyApp.swift"),
-                                TestFile("Supporting.swift"),
-                                TestFile("Localizable.xcstrings"),
-                            ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])
-                        ],
-                        targets: [
-                            target
-                        ],
-                        developmentRegion: "en"
-                    )
-                ])
+                let testWorkspace = TestWorkspace(
+                    "MyWorkspace",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "Project",
+                            groupTree: TestGroup(
+                                "ProjectSources",
+                                path: "Sources",
+                                children: [
+                                    TestFile("MyApp.swift"),
+                                    TestFile("Supporting.swift"),
+                                    TestFile("Localizable.xcstrings"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                target
+                            ],
+                            developmentRegion: "en"
+                        )
+                    ]
+                )
 
                 // Describe the workspace to the build system.
                 try await testSession.sendPIF(testWorkspace)
@@ -949,7 +1055,7 @@ fileprivate struct LocalizationInfoTests {
 
                 var info = try await testSession.session.generateLocalizationInfo(for: request, delegate: delegate)
 
-                #expect(info.infoByTarget.count == 1) // 1 target
+                #expect(info.infoByTarget.count == 1)  // 1 target
 
                 var targetInfo = try #require(info.infoByTarget[target.guid])
 
@@ -958,7 +1064,7 @@ fileprivate struct LocalizationInfoTests {
 
                 #expect(targetInfo.producedStringsdataPaths.count == 3)
                 // Each Swift file should get 1 stringsdata for the active arch
-                #expect(targetInfo.stringsdataPathsByBuildPortion.count == 1) // 1 arch
+                #expect(targetInfo.stringsdataPathsByBuildPortion.count == 1)  // 1 arch
                 #expect(targetInfo.stringsdataPathsByBuildPortion.keys.first?.effectivePlatformName == "macosx")
                 #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("MyApp.stringsdata") }).count == 1)
                 #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("Supporting.stringsdata") }).count == 1)
@@ -975,7 +1081,7 @@ fileprivate struct LocalizationInfoTests {
 
                 info = try await testSession.session.generateLocalizationInfo(for: request, delegate: delegate)
 
-                #expect(info.infoByTarget.count == 1) // 1 target
+                #expect(info.infoByTarget.count == 1)  // 1 target
 
                 targetInfo = try #require(info.infoByTarget[target.guid])
 
@@ -984,7 +1090,7 @@ fileprivate struct LocalizationInfoTests {
 
                 #expect(targetInfo.producedStringsdataPaths.count == 3)
                 // Each Swift file should get 1 stringsdata for the active arch
-                #expect(targetInfo.stringsdataPathsByBuildPortion.count == 1) // 1 arch
+                #expect(targetInfo.stringsdataPathsByBuildPortion.count == 1)  // 1 arch
                 #expect(targetInfo.stringsdataPathsByBuildPortion.keys.first?.effectivePlatformName == "iphoneos")
                 #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("MyApp.stringsdata") }).count == 1)
                 #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("Supporting.stringsdata") }).count == 1)
@@ -1010,51 +1116,61 @@ fileprivate struct LocalizationInfoTests {
                     "MyApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "SWIFT_EMIT_LOC_STRINGS": "YES",
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                            "ONLY_ACTIVE_ARCH": "NO",
-                            "ENABLE_THREAD_SANITIZER": "YES"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "SWIFT_EMIT_LOC_STRINGS": "YES",
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                                "ONLY_ACTIVE_ARCH": "NO",
+                                "ENABLE_THREAD_SANITIZER": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
                             "MyApp.swift",
-                            "Supporting.swift"
+                            "Supporting.swift",
                         ]),
                         TestResourcesBuildPhase([
                             "Localizable.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
 
-                let testWorkspace = TestWorkspace("MyWorkspace", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "Project",
-                        groupTree: TestGroup(
-                            "ProjectSources",
-                            path: "Sources",
-                            children: [
-                                TestFile("MyApp.swift"),
-                                TestFile("Supporting.swift"),
-                                TestFile("Localizable.xcstrings"),
-                            ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])
-                        ],
-                        targets: [
-                            target
-                        ],
-                        developmentRegion: "en"
-                    )
-                ])
+                let testWorkspace = TestWorkspace(
+                    "MyWorkspace",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "Project",
+                            groupTree: TestGroup(
+                                "ProjectSources",
+                                path: "Sources",
+                                children: [
+                                    TestFile("MyApp.swift"),
+                                    TestFile("Supporting.swift"),
+                                    TestFile("Localizable.xcstrings"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                target
+                            ],
+                            developmentRegion: "en"
+                        )
+                    ]
+                )
 
                 // Describe the workspace to the build system.
                 try await testSession.sendPIF(testWorkspace)
@@ -1071,7 +1187,7 @@ fileprivate struct LocalizationInfoTests {
 
                 let info = try await testSession.session.generateLocalizationInfo(for: request, delegate: delegate)
 
-                #expect(info.infoByTarget.count == 1) // 1 target
+                #expect(info.infoByTarget.count == 1)  // 1 target
 
                 let targetInfo = try #require(info.infoByTarget[target.guid])
 
@@ -1107,24 +1223,27 @@ fileprivate struct LocalizationInfoTests {
                     "MyApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "SWIFT_EMIT_LOC_STRINGS": "YES",
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                            "ONLY_ACTIVE_ARCH": "YES"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "SWIFT_EMIT_LOC_STRINGS": "YES",
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                                "ONLY_ACTIVE_ARCH": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "App.swift",
+                            "App.swift"
                         ]),
                         TestResourcesBuildPhase([
                             "LocalizableApp.xcstrings",
-                            "Other.xcstrings"
-                        ])
+                            "Other.xcstrings",
+                        ]),
                     ],
                     dependencies: [
                         "MyFramework"
@@ -1135,53 +1254,63 @@ fileprivate struct LocalizationInfoTests {
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "SWIFT_EMIT_LOC_STRINGS": "YES",
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                            "ONLY_ACTIVE_ARCH": "YES"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "SWIFT_EMIT_LOC_STRINGS": "YES",
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                                "ONLY_ACTIVE_ARCH": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Framework.swift",
+                            "Framework.swift"
                         ]),
                         TestResourcesBuildPhase([
                             "LocalizableFramework.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
 
-                let testWorkspace = TestWorkspace("MyWorkspace", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "Project",
-                        groupTree: TestGroup(
-                            "ProjectSources",
-                            path: "Sources",
-                            children: [
-                                TestFile("App.swift"),
-                                TestFile("LocalizableApp.xcstrings"),
-                                TestFile("Other.xcstrings"),
-
-                                TestFile("Framework.swift"),
-                                TestFile("LocalizableFramework.xcstrings"),
-                            ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])
-                        ],
-                        targets: [
-                            target1,
-                            target2
-                        ],
-                        developmentRegion: "en"
-                    )
-                ])
+                let testWorkspace = TestWorkspace(
+                    "MyWorkspace",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "Project",
+                            groupTree: TestGroup(
+                                "ProjectSources",
+                                path: "Sources",
+                                children: [
+                                    TestFile("App.swift"),
+                                    TestFile("LocalizableApp.xcstrings"),
+                                    TestFile("Other.xcstrings"),
+
+                                    TestFile("Framework.swift"),
+                                    TestFile("LocalizableFramework.xcstrings"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                target1,
+                                target2,
+                            ],
+                            developmentRegion: "en"
+                        )
+                    ]
+                )
 
                 // Describe the workspace to the build system.
                 try await testSession.sendPIF(testWorkspace)
@@ -1199,7 +1328,7 @@ fileprivate struct LocalizationInfoTests {
 
                 let info = try await testSession.session.generateLocalizationInfo(for: request, delegate: delegate)
 
-                #expect(info.infoByTarget.count == 2) // 2 targets
+                #expect(info.infoByTarget.count == 2)  // 2 targets
 
                 let target1Info = try #require(info.infoByTarget[target1.guid])
                 let target2Info = try #require(info.infoByTarget[target2.guid])
@@ -1212,12 +1341,12 @@ fileprivate struct LocalizationInfoTests {
                 #expect(target2Info.compilableXCStringsPaths.contains(where: { $0.hasSuffix("LocalizableFramework.xcstrings") }))
 
                 #expect(target1Info.producedStringsdataPaths.count == 2)
-                #expect(target1Info.stringsdataPathsByBuildPortion.count == 1) // 1 arch
+                #expect(target1Info.stringsdataPathsByBuildPortion.count == 1)  // 1 arch
                 #expect(target1Info.producedStringsdataPaths.filter({ $0.hasSuffix("App.stringsdata") }).count == 1)
                 #expect(target1Info.producedStringsdataPaths.filter({ $0.hasSuffix("ExtractedAppShortcutsMetadata.stringsdata") }).count == 1)
 
                 #expect(target2Info.producedStringsdataPaths.count == 2)
-                #expect(target2Info.stringsdataPathsByBuildPortion.count == 1) // 1 arch
+                #expect(target2Info.stringsdataPathsByBuildPortion.count == 1)  // 1 arch
                 #expect(target2Info.producedStringsdataPaths.filter({ $0.hasSuffix("Framework.stringsdata") }).count == 1)
                 #expect(target2Info.producedStringsdataPaths.filter({ $0.hasSuffix("ExtractedAppShortcutsMetadata.stringsdata") }).count == 1)
             }
@@ -1240,24 +1369,27 @@ fileprivate struct LocalizationInfoTests {
                     "MyApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "SWIFT_EMIT_LOC_STRINGS": "YES",
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                            "ONLY_ACTIVE_ARCH": "YES"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "SWIFT_EMIT_LOC_STRINGS": "YES",
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                                "ONLY_ACTIVE_ARCH": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "App.swift",
+                            "App.swift"
                         ]),
                         TestResourcesBuildPhase([
                             "LocalizableApp.xcstrings",
-                            "Other.xcstrings"
-                        ])
+                            "Other.xcstrings",
+                        ]),
                     ],
                     dependencies: [
                         "MyFramework"
@@ -1268,53 +1400,63 @@ fileprivate struct LocalizationInfoTests {
                     "MyFramework",
                     type: .framework,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "SWIFT_EMIT_LOC_STRINGS": "YES",
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                            "ONLY_ACTIVE_ARCH": "YES"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "SWIFT_EMIT_LOC_STRINGS": "YES",
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                                "ONLY_ACTIVE_ARCH": "YES",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "Framework.swift",
+                            "Framework.swift"
                         ]),
                         TestResourcesBuildPhase([
                             "LocalizableFramework.xcstrings"
-                        ])
+                        ]),
                     ]
                 )
 
-                let testWorkspace = TestWorkspace("MyWorkspace", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "Project",
-                        groupTree: TestGroup(
-                            "ProjectSources",
-                            path: "Sources",
-                            children: [
-                                TestFile("App.swift"),
-                                TestFile("LocalizableApp.xcstrings"),
-                                TestFile("Other.xcstrings"),
-
-                                TestFile("Framework.swift"),
-                                TestFile("LocalizableFramework.xcstrings"),
-                            ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])
-                        ],
-                        targets: [
-                            target1,
-                            target2
-                        ],
-                        developmentRegion: "en"
-                    )
-                ])
+                let testWorkspace = TestWorkspace(
+                    "MyWorkspace",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "Project",
+                            groupTree: TestGroup(
+                                "ProjectSources",
+                                path: "Sources",
+                                children: [
+                                    TestFile("App.swift"),
+                                    TestFile("LocalizableApp.xcstrings"),
+                                    TestFile("Other.xcstrings"),
+
+                                    TestFile("Framework.swift"),
+                                    TestFile("LocalizableFramework.xcstrings"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                target1,
+                                target2,
+                            ],
+                            developmentRegion: "en"
+                        )
+                    ]
+                )
 
                 // Describe the workspace to the build system.
                 try await testSession.sendPIF(testWorkspace)
@@ -1341,7 +1483,7 @@ fileprivate struct LocalizationInfoTests {
                 #expect(target2Info.compilableXCStringsPaths.contains(where: { $0.hasSuffix("LocalizableFramework.xcstrings") }))
 
                 #expect(target2Info.producedStringsdataPaths.count == 2)
-                #expect(target2Info.stringsdataPathsByBuildPortion.count == 1) // 1 arch
+                #expect(target2Info.stringsdataPathsByBuildPortion.count == 1)  // 1 arch
                 #expect(target2Info.producedStringsdataPaths.filter({ $0.hasSuffix("Framework.stringsdata") }).count == 1)
                 #expect(target2Info.producedStringsdataPaths.filter({ $0.hasSuffix("ExtractedAppShortcutsMetadata.stringsdata") }).count == 1)
 
@@ -1359,7 +1501,7 @@ fileprivate struct LocalizationInfoTests {
                 #expect(target1Info.compilableXCStringsPaths.contains(where: { $0.hasSuffix("Other.xcstrings") }))
 
                 #expect(target1Info.producedStringsdataPaths.count == 2)
-                #expect(target1Info.stringsdataPathsByBuildPortion.count == 1) // 1 arch
+                #expect(target1Info.stringsdataPathsByBuildPortion.count == 1)  // 1 arch
                 #expect(target1Info.producedStringsdataPaths.filter({ $0.hasSuffix("App.stringsdata") }).count == 1)
                 #expect(target1Info.producedStringsdataPaths.filter({ $0.hasSuffix("ExtractedAppShortcutsMetadata.stringsdata") }).count == 1)
             }
@@ -1382,51 +1524,64 @@ fileprivate struct LocalizationInfoTests {
                     "MyApp",
                     type: .application,
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "SKIP_INSTALL": "YES",
-                            "SWIFT_VERSION": "5.5",
-                            "GENERATE_INFOPLIST_FILE": "YES",
-                            "SWIFT_EMIT_LOC_STRINGS": "YES",
-                            "SDKROOT": "auto",
-                            "SUPPORTED_PLATFORMS": "macosx",
-                            "ONLY_ACTIVE_ARCH": "NO"
-                        ]),
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "SKIP_INSTALL": "YES",
+                                "SWIFT_VERSION": "5.5",
+                                "GENERATE_INFOPLIST_FILE": "YES",
+                                "SWIFT_EMIT_LOC_STRINGS": "YES",
+                                "SDKROOT": "auto",
+                                "SUPPORTED_PLATFORMS": "macosx",
+                                "ONLY_ACTIVE_ARCH": "NO",
+                            ]
+                        )
                     ],
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            "MyApp.swift",
+                            "MyApp.swift"
                         ]),
                         TestResourcesBuildPhase([
-                            "MyView.xib",
-                        ])
+                            "MyView.xib"
+                        ]),
                     ]
                 )
 
-                let testWorkspace = TestWorkspace("MyWorkspace", sourceRoot: tmpDir, projects: [
-                    TestProject(
-                        "Project",
-                        groupTree: TestGroup(
-                            "ProjectSources",
-                            path: "Sources",
-                            children: [
-                                TestFile("MyApp.swift"),
-                                TestVariantGroup("MyView.xib", children: [
-                                    TestFile("Base.lproj/MyView.xib", regionVariantName: "Base"),
-                                    TestFile("mul.lproj/MyView.xcstrings", regionVariantName: "mul"), // mul is the ISO code for multi-lingual
-                                ]),
-                            ]
-                        ),
-                        buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "PRODUCT_NAME": "$(TARGET_NAME)",
-                            ])
-                        ],
-                        targets: [
-                            target
-                        ],
-                        developmentRegion: "en"
-                    )
-                ])
+                let testWorkspace = TestWorkspace(
+                    "MyWorkspace",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "Project",
+                            groupTree: TestGroup(
+                                "ProjectSources",
+                                path: "Sources",
+                                children: [
+                                    TestFile("MyApp.swift"),
+                                    TestVariantGroup(
+                                        "MyView.xib",
+                                        children: [
+                                            TestFile("Base.lproj/MyView.xib", regionVariantName: "Base"),
+                                            TestFile("mul.lproj/MyView.xcstrings", regionVariantName: "mul"),  // mul is the ISO code for multi-lingual
+                                        ]
+                                    ),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration(
+                                    "Debug",
+                                    buildSettings: [
+                                        "PRODUCT_NAME": "$(TARGET_NAME)"
+                                    ]
+                                )
+                            ],
+                            targets: [
+                                target
+                            ],
+                            developmentRegion: "en"
+                        )
+                    ]
+                )
 
                 // Describe the workspace to the build system.
                 try await testSession.sendPIF(testWorkspace)
@@ -1443,7 +1598,7 @@ fileprivate struct LocalizationInfoTests {
 
                 let info = try await testSession.session.generateLocalizationInfo(for: request, delegate: delegate)
 
-                #expect(info.infoByTarget.count == 1) // 1 target
+                #expect(info.infoByTarget.count == 1)  // 1 target
 
                 let targetInfo = try #require(info.infoByTarget[target.guid])
 
@@ -1452,7 +1607,7 @@ fileprivate struct LocalizationInfoTests {
 
                 #expect(targetInfo.producedStringsdataPaths.count == 4)
                 // Swift file should get 1 stringsdata file for x86_64 and 1 for arm64
-                #expect(targetInfo.stringsdataPathsByBuildPortion.count == 2) // 2 archs
+                #expect(targetInfo.stringsdataPathsByBuildPortion.count == 2)  // 2 archs
                 #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("MyApp.stringsdata") }).count == 2)
                 #expect(targetInfo.producedStringsdataPaths.filter({ $0.hasSuffix("ExtractedAppShortcutsMetadata.stringsdata") }).count == 2)
             }
@@ -1472,7 +1627,7 @@ private final class BuildOperationDelegate: SWBLocalizationDelegate {
         return await delegate.provisioningTaskInputs(targetGUID: targetGUID, provisioningSourceData: provisioningSourceData)
     }
 
-    func executeExternalTool(commandLine: [String], workingDirectory: String?, environment: [String : String]) async throws -> SWBExternalToolResult {
+    func executeExternalTool(commandLine: [String], workingDirectory: String?, environment: [String: String]) async throws -> SWBExternalToolResult {
         guard let command = commandLine.first, command.hasSuffix("xcstringstool") else {
             return .deferred
         }
diff --git a/Tests/SwiftBuildTests/MacCatalystTests.swift b/Tests/SwiftBuildTests/MacCatalystTests.swift
index c051f13f..1449ef2a 100644
--- a/Tests/SwiftBuildTests/MacCatalystTests.swift
+++ b/Tests/SwiftBuildTests/MacCatalystTests.swift
@@ -26,46 +26,63 @@ fileprivate struct MacCatalystTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDirPath,
                 groupTree: TestGroup(
-                    "Sources", children: [
+                    "Sources",
+                    children: [
                         TestFile("Source.c"),
                         TestFile("Assets.xcassets"),
-                    ]),
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ALWAYS_SEARCH_USER_PATHS": "NO",
-                        "CODE_SIGNING_ALLOWED": "NO",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "iphoneos",
-                        "SUPPORTS_MACCATALYST": "YES",
-                        "TARGETED_DEVICE_FAMILY": "2,6",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ALWAYS_SEARCH_USER_PATHS": "NO",
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "iphoneos",
+                            "SUPPORTS_MACCATALYST": "YES",
+                            "TARGETED_DEVICE_FAMILY": "2,6",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
                         "Foo",
                         type: .application,
                         buildConfigurations: [
-                            TestBuildConfiguration("Debug", buildSettings: [
-                                "SUPPORTS_MACCATALYST": "YES",
-                            ])
+                            TestBuildConfiguration(
+                                "Debug",
+                                buildSettings: [
+                                    "SUPPORTS_MACCATALYST": "YES"
+                                ]
+                            )
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["Source.c"]),
                             TestResourcesBuildPhase(["Assets.xcassets"]),
-                        ]),
-                ])
+                        ]
+                    )
+                ]
+            )
 
             let SRCROOT = tmpDirPath.str
             let testImagePath = Path(SRCROOT).join("Assets.xcassets/foo.imageset/test.png")
 
             let fs: any FSProxy = localFS
             try fs.write(Path(SRCROOT).join("Source.c"), contents: "int main() { return 0; }")
-            try await fs.writeAssetCatalog(Path(SRCROOT).join("Assets.xcassets"), .root, .imageSet("foo", [
-                .init(filename: testImagePath.basename, scale: 2, idiom: .universal),
-                .init(filename: testImagePath.basename, scale: 2, idiom: .ipad),
-                .init(filename: testImagePath.basename, scale: 2, idiom: .mac),
-            ]))
+            try await fs.writeAssetCatalog(
+                Path(SRCROOT).join("Assets.xcassets"),
+                .root,
+                .imageSet(
+                    "foo",
+                    [
+                        .init(filename: testImagePath.basename, scale: 2, idiom: .universal),
+                        .init(filename: testImagePath.basename, scale: 2, idiom: .ipad),
+                        .init(filename: testImagePath.basename, scale: 2, idiom: .mac),
+                    ]
+                )
+            )
             try fs.writeImage(testImagePath, width: 24, height: 24)
 
             try await withTester(testProject, fs: fs) { tester in
diff --git a/Tests/SwiftBuildTests/MacroEvaluationTests.swift b/Tests/SwiftBuildTests/MacroEvaluationTests.swift
index e399b30e..9b4cd7d3 100644
--- a/Tests/SwiftBuildTests/MacroEvaluationTests.swift
+++ b/Tests/SwiftBuildTests/MacroEvaluationTests.swift
@@ -37,7 +37,8 @@ fileprivate struct MacroEvaluationTests {
                     "aProject",
                     defaultConfigurationName: "Release",
                     groupTree: TestGroup("Foo"),
-                    targets: [testTarget])
+                    targets: [testTarget]
+                )
                 let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath, projects: [testProject])
 
                 try await testSession.sendPIF(testWorkspace)
@@ -120,10 +121,10 @@ fileprivate struct MacroEvaluationTests {
                 let projectFilesDir = "\(projectDir)/SomeFiles"
 
                 let workspacePIF: SWBPropertyListItem = [
-                    "guid":     "some-workspace-guid",
-                    "name":     "aWorkspace",
-                    "path":     .plString("\(tmpDirPath)/aWorkspace.xcworkspace/contents.xcworkspacedata"),
-                    "projects": ["P1"]
+                    "guid": "some-workspace-guid",
+                    "name": "aWorkspace",
+                    "path": .plString("\(tmpDirPath)/aWorkspace.xcworkspace/contents.xcworkspacedata"),
+                    "projects": ["P1"],
                 ]
                 let projectPIF: SWBPropertyListItem = [
                     "guid": "P1",
@@ -135,16 +136,18 @@ fileprivate struct MacroEvaluationTests {
                         "sourceTree": "PROJECT_DIR",
                         "path": .plString(projectFilesDir),
                     ],
-                    "buildConfigurations": [[
-                        "guid": "BC1",
-                        "name": "Config1",
-                        "buildSettings": [
-                            "OTHER_CFLAGS": "$(inherited) -DPROJECT",
+                    "buildConfigurations": [
+                        [
+                            "guid": "BC1",
+                            "name": "Config1",
+                            "buildSettings": [
+                                "OTHER_CFLAGS": "$(inherited) -DPROJECT"
+                            ],
                         ]
-                    ]],
+                    ],
                     "defaultConfigurationName": "Config1",
                     "developmentRegion": "English",
-                    "targets": ["T1"]
+                    "targets": ["T1"],
                 ]
                 let targetPIF: SWBPropertyListItem = [
                     "guid": "T1",
@@ -156,20 +159,22 @@ fileprivate struct MacroEvaluationTests {
                         "name": "MyApp",
                     ],
                     "buildPhases": [],
-                    "buildConfigurations": [[
-                        "guid": "C2",
-                        "name": "Config1",
-                        "buildSettings": [
-                            "PRODUCT_NAME": "MyApp",
-                            "IS_TRUE": "YES",
-                            "IS_FALSE": "NO",
-                            "OTHER_CFLAGS": "$(inherited) -DTARGET",
-                            "FLEXIBLE": "$(A) $(B) $(C)",
-                            "A": "A",
-                            "B": "B",
-                            "C": "C",
+                    "buildConfigurations": [
+                        [
+                            "guid": "C2",
+                            "name": "Config1",
+                            "buildSettings": [
+                                "PRODUCT_NAME": "MyApp",
+                                "IS_TRUE": "YES",
+                                "IS_FALSE": "NO",
+                                "OTHER_CFLAGS": "$(inherited) -DTARGET",
+                                "FLEXIBLE": "$(A) $(B) $(C)",
+                                "A": "A",
+                                "B": "B",
+                                "C": "C",
+                            ],
                         ]
-                    ]],
+                    ],
                     "dependencies": [],
                     "buildRules": [],
                 ]
@@ -177,18 +182,18 @@ fileprivate struct MacroEvaluationTests {
                     [
                         "type": "workspace",
                         "signature": "W1",
-                        "contents": workspacePIF
+                        "contents": workspacePIF,
                     ],
                     [
                         "type": "project",
                         "signature": "P1",
-                        "contents": projectPIF
+                        "contents": projectPIF,
                     ],
                     [
                         "type": "target",
                         "signature": "T1",
-                        "contents": targetPIF
-                    ]
+                        "contents": targetPIF,
+                    ],
                 ]
                 try await session.sendPIF(topLevelPIF)
 
diff --git a/Tests/SwiftBuildTests/PIFTests.swift b/Tests/SwiftBuildTests/PIFTests.swift
index 333b74c5..d16f4bb3 100644
--- a/Tests/SwiftBuildTests/PIFTests.swift
+++ b/Tests/SwiftBuildTests/PIFTests.swift
@@ -40,22 +40,28 @@ fileprivate struct PIFTests {
                 }
 
                 // We should get an error and one lookup.
-                await #expect(performing: {
-                    try await testSession.session.sendPIF(workspaceSignature: "FOOBAR", lookupObject: lookup)
-                }, throws: { error in
-                    // TODO: Check specifically for `PIFLoadingError.invalidObject`, but we lose the type information over the wire
-                    (error as? SwiftBuildError)?.errorDescription?.contains("PIF object must be a dictionary") == true
-                })
+                await #expect(
+                    performing: {
+                        try await testSession.session.sendPIF(workspaceSignature: "FOOBAR", lookupObject: lookup)
+                    },
+                    throws: { error in
+                        // TODO: Check specifically for `PIFLoadingError.invalidObject`, but we lose the type information over the wire
+                        (error as? SwiftBuildError)?.errorDescription?.contains("PIF object must be a dictionary") == true
+                    }
+                )
                 #expect(lookups.withLock(\.count) == 1)
 
                 // Perform the request again, it should do the lookup again.
                 lookups.withLock { $0.removeAll() }
-                await #expect(performing: {
-                    try await testSession.session.sendPIF(workspaceSignature: "FOOBAR", lookupObject: lookup)
-                }, throws: { error in
-                    // TODO: Check specifically for `PIFLoadingError.invalidObject`, but we lose the type information over the wire
-                    (error as? SwiftBuildError)?.errorDescription?.contains("PIF object must be a dictionary") == true
-                })
+                await #expect(
+                    performing: {
+                        try await testSession.session.sendPIF(workspaceSignature: "FOOBAR", lookupObject: lookup)
+                    },
+                    throws: { error in
+                        // TODO: Check specifically for `PIFLoadingError.invalidObject`, but we lose the type information over the wire
+                        (error as? SwiftBuildError)?.errorDescription?.contains("PIF object must be a dictionary") == true
+                    }
+                )
                 #expect(lookups.withLock(\.count) == 1)
             }
         }
@@ -69,10 +75,13 @@ fileprivate struct PIFTests {
                     "testWorkspace",
                     sourceRoot: temporaryDirectory.path,
                     projects: [
-                        TestProject("aProject",
-                                    groupTree: TestGroup("foo"),
-                                    targets: [TestStandardTarget("aTarget", type: .application)])
-                    ])
+                        TestProject(
+                            "aProject",
+                            groupTree: TestGroup("foo"),
+                            targets: [TestStandardTarget("aTarget", type: .application)]
+                        )
+                    ]
+                )
 
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
@@ -95,16 +104,20 @@ fileprivate struct PIFTests {
                 let workspace = TestWorkspace(
                     "testWorkspace",
                     sourceRoot: tmpDirPath,
-                    projects: [])
+                    projects: []
+                )
 
                 let auditWorkspace = TestWorkspace(
                     "testWorkspace",
                     sourceRoot: temporaryDirectory.path,
                     projects: [
-                        TestProject("aProject",
-                                    groupTree: TestGroup("foo"),
-                                    targets: [TestStandardTarget("aTarget", type: .application)])
-                    ])
+                        TestProject(
+                            "aProject",
+                            groupTree: TestGroup("foo"),
+                            targets: [TestStandardTarget("aTarget", type: .application)]
+                        )
+                    ]
+                )
 
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
@@ -126,11 +139,14 @@ fileprivate struct PIFTests {
         try await withTemporaryDirectory { temporaryDirectory in
             try await withAsyncDeferrable { deferrable in
                 let signature = "abc"
-                let workspace = [[
-                    "signature": .plString(signature),
-                    "type": "workspace",
-                    "contents": [:]
-                ]] as SWBPropertyListItem
+                let workspace =
+                    [
+                        [
+                            "signature": .plString(signature),
+                            "type": "workspace",
+                            "contents": [:],
+                        ]
+                    ] as SWBPropertyListItem
 
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
@@ -139,22 +155,36 @@ fileprivate struct PIFTests {
                     }
                 }
 
-                await #expect(performing: {
-                    try await testSession.session.sendPIF(workspaceSignature: signature, auditPIF: workspace, lookupObject: { (objectType, signature) async throws -> SWBPropertyListItem in
-                        return workspace
-                    })
-                }, throws: { error in
-                    "\(error)".contains("Required key 'guid' is missing in Workspace dictionary")
-                })
+                await #expect(
+                    performing: {
+                        try await testSession.session.sendPIF(
+                            workspaceSignature: signature,
+                            auditPIF: workspace,
+                            lookupObject: { (objectType, signature) async throws -> SWBPropertyListItem in
+                                return workspace
+                            }
+                        )
+                    },
+                    throws: { error in
+                        "\(error)".contains("Required key 'guid' is missing in Workspace dictionary")
+                    }
+                )
 
                 // Ensure that we properly cancelled the PIF transfer when the error was encountered, and that we get the same error as before, instead of an error that a transfer operation is still in progress
-                await #expect(performing: {
-                    try await testSession.session.sendPIF(workspaceSignature: signature, auditPIF: workspace, lookupObject: { (objectType, signature) async throws -> SWBPropertyListItem in
-                        return workspace
-                    })
-                }, throws: { error in
-                    "\(error)".contains("Required key 'guid' is missing in Workspace dictionary")
-                })
+                await #expect(
+                    performing: {
+                        try await testSession.session.sendPIF(
+                            workspaceSignature: signature,
+                            auditPIF: workspace,
+                            lookupObject: { (objectType, signature) async throws -> SWBPropertyListItem in
+                                return workspace
+                            }
+                        )
+                    },
+                    throws: { error in
+                        "\(error)".contains("Required key 'guid' is missing in Workspace dictionary")
+                    }
+                )
             }
         }
     }
@@ -167,34 +197,36 @@ fileprivate struct PIFTests {
                 let workspaceSignature = "abc"
                 let projectSignature = "proj"
 
-                let workspace = [
-                    "signature": .plString(workspaceSignature),
-                    "type": "workspace",
-                    "contents": [
-                        "guid": "W1",
-                        "name": "WS",
-                        "path": "/foo/bar",
-                        "projects": [
-                            .plString(projectSignature)
+                let workspace =
+                    [
+                        "signature": .plString(workspaceSignature),
+                        "type": "workspace",
+                        "contents": [
+                            "guid": "W1",
+                            "name": "WS",
+                            "path": "/foo/bar",
+                            "projects": [
+                                .plString(projectSignature)
+                            ],
                         ],
-                    ]
-                ] as SWBPropertyListItem
-
-                let project = [
-                    "signature": .plString(projectSignature),
-                    "type": "project",
-                    "contents": [
-                        "guid": "P1",
-                        "path": "/bar/baz",
-                        "groupTree": [
-                            "guid": "G1",
-                            "name": "G",
-                            "type": "group",
+                    ] as SWBPropertyListItem
+
+                let project =
+                    [
+                        "signature": .plString(projectSignature),
+                        "type": "project",
+                        "contents": [
+                            "guid": "P1",
+                            "path": "/bar/baz",
+                            "groupTree": [
+                                "guid": "G1",
+                                "name": "G",
+                                "type": "group",
+                            ],
+                            "targets": [],
+                            "buildConfigurations": [],
                         ],
-                        "targets": [],
-                        "buildConfigurations": [],
-                    ]
-                ] as SWBPropertyListItem
+                    ] as SWBPropertyListItem
 
                 @Sendable func lookup(_ objectType: SwiftBuildServicePIFObjectType, _ signature: String) async throws -> SWBPropertyListItem {
                     switch signature {
@@ -214,11 +246,14 @@ fileprivate struct PIFTests {
                     }
                 }
 
-                await #expect(performing: {
-                    try await testSession.session.sendPIF(workspaceSignature: workspaceSignature, auditPIF: nil, lookupObject: lookup)
-                }, throws: { error in
-                    "\(error)".contains("unable to load transferred PIF: Required key 'defaultConfigurationName' is missing in Project dictionary")
-                })
+                await #expect(
+                    performing: {
+                        try await testSession.session.sendPIF(workspaceSignature: workspaceSignature, auditPIF: nil, lookupObject: lookup)
+                    },
+                    throws: { error in
+                        "\(error)".contains("unable to load transferred PIF: Required key 'defaultConfigurationName' is missing in Project dictionary")
+                    }
+                )
             }
         }
     }
@@ -234,11 +269,11 @@ fileprivate struct PIFTests {
             "type": "workspace",
             "signature": "WORKSPACE@v11_",
             "contents": [
-                "guid":        "some-workspace-guid",
-                "name":        "aWorkspace",
-                "path":        "/tmp/aWorkspace.xcworkspace/contents.xcworkspacedata",
-                "projects":    ["PROJECT-A@v11_", "PROJECT-B@v11_"]
-            ]
+                "guid": "some-workspace-guid",
+                "name": "aWorkspace",
+                "path": "/tmp/aWorkspace.xcworkspace/contents.xcworkspacedata",
+                "projects": ["PROJECT-A@v11_", "PROJECT-B@v11_"],
+            ],
         ]
         let projectAPIFObject: SWBPropertyListItem = [
             "type": "project",
@@ -253,15 +288,17 @@ fileprivate struct PIFTests {
                     "sourceTree": "PROJECT_DIR",
                     "path": "/tmp/SomeProject/SomeFiles",
                 ],
-                "buildConfigurations": [[
-                    "guid": "A_BC1",
-                    "name": "Config1",
-                    "buildSettings": [:]
-                ]],
+                "buildConfigurations": [
+                    [
+                        "guid": "A_BC1",
+                        "name": "Config1",
+                        "buildSettings": [:],
+                    ]
+                ],
                 "defaultConfigurationName": "Config1",
                 "developmentRegion": "English",
                 "targets": [],
-            ]
+            ],
         ]
         let projectBPIFObject: SWBPropertyListItem = [
             "type": "project",
@@ -276,15 +313,17 @@ fileprivate struct PIFTests {
                     "sourceTree": "PROJECT_DIR",
                     "path": "/tmp/SomeProject/SomeFiles",
                 ],
-                "buildConfigurations": [[
-                    "guid": "B_BC1",
-                    "name": "Config1",
-                    "buildSettings": [:]
-                ]],
+                "buildConfigurations": [
+                    [
+                        "guid": "B_BC1",
+                        "name": "Config1",
+                        "buildSettings": [:],
+                    ]
+                ],
                 "defaultConfigurationName": "Config1",
                 "developmentRegion": "English",
                 "targets": [],
-            ]
+            ],
         ]
 
         // Send the initial PIF.
@@ -335,11 +374,11 @@ fileprivate struct PIFTests {
                     "type": "workspace",
                     "signature": "WORKSPACE@v11_",
                     "contents": [
-                        "guid":        "some-workspace-guid",
-                        "name":        "aWorkspace",
-                        "path":        "/tmp/aWorkspace.xcworkspace/contents.xcworkspacedata",
-                        "projects":    []
-                    ]
+                        "guid": "some-workspace-guid",
+                        "name": "aWorkspace",
+                        "path": "/tmp/aWorkspace.xcworkspace/contents.xcworkspacedata",
+                        "projects": [],
+                    ],
                 ]
 
                 let tmpDirPath = tmpDir.str
diff --git a/Tests/SwiftBuildTests/ProductPlannerTests.swift b/Tests/SwiftBuildTests/ProductPlannerTests.swift
index afefeb6b..e5d6db2c 100644
--- a/Tests/SwiftBuildTests/ProductPlannerTests.swift
+++ b/Tests/SwiftBuildTests/ProductPlannerTests.swift
@@ -27,8 +27,8 @@ fileprivate struct ProductPlannerTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let appTarget = try await testSession.session.sendMinimalTestingWorkspace(tmpDir: temporaryDirectory.path)
@@ -43,12 +43,16 @@ fileprivate struct ProductPlannerTests {
                     archive: .init(configurationName: "Debug", targetIdentifiers: []),
                     profile: .init(configurationName: "Debug", targetIdentifiers: []),
                     run: .init(configurationName: "Debug", targetIdentifiers: [appTarget.guid]),
-                    test: .init(configurationName: "Debug", targetIdentifiers: []))
-
-                #expect(try await Set(testSession.session.describeArchivableProducts(input: [scheme])) == Set([
-                    .init(displayName: "App", productName: "App", productType: .app, identifier: appTarget.guid, team: nil, bundleIdentifier: nil, destination: .init(platformName: "iOS", isSimulator: false), containingSchemes: ["Test"], iconPath: nil),
-                    .init(displayName: "App", productName: "App", productType: .app, identifier: appTarget.guid, team: nil, bundleIdentifier: nil, destination: .init(platformName: "iOS Simulator", isSimulator: true), containingSchemes: ["Test"], iconPath: nil)
-                ]))
+                    test: .init(configurationName: "Debug", targetIdentifiers: [])
+                )
+
+                #expect(
+                    try await Set(testSession.session.describeArchivableProducts(input: [scheme]))
+                        == Set([
+                            .init(displayName: "App", productName: "App", productType: .app, identifier: appTarget.guid, team: nil, bundleIdentifier: nil, destination: .init(platformName: "iOS", isSimulator: false), containingSchemes: ["Test"], iconPath: nil),
+                            .init(displayName: "App", productName: "App", productType: .app, identifier: appTarget.guid, team: nil, bundleIdentifier: nil, destination: .init(platformName: "iOS Simulator", isSimulator: true), containingSchemes: ["Test"], iconPath: nil),
+                        ])
+                )
             }
         }
     }
@@ -60,8 +64,8 @@ fileprivate struct ProductPlannerTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let appTarget = try await testSession.session.sendMinimalTestingWorkspace(tmpDir: temporaryDirectory.path)
@@ -76,7 +80,8 @@ fileprivate struct ProductPlannerTests {
                     archive: .init(configurationName: "Debug", targetIdentifiers: []),
                     profile: .init(configurationName: "Debug", targetIdentifiers: []),
                     run: .init(configurationName: "Debug", targetIdentifiers: [appTarget.guid]),
-                    test: .init(configurationName: "Debug", targetIdentifiers: []))
+                    test: .init(configurationName: "Debug", targetIdentifiers: [])
+                )
 
                 #expect(try await testSession.session.describeSchemes(input: [scheme]) == [.init(name: "Test", disambiguatedName: "Test", isShared: true, isAutogenerated: false, actions: .init(analyze: .init(configurationName: "Debug", products: [], testPlans: []), archive: .init(configurationName: "Debug", products: [], testPlans: []), profile: .init(configurationName: "Debug", products: [], testPlans: []), run: .init(configurationName: "Debug", products: [.init(displayName: "App", identifier: appTarget.guid, supportedDestinations: [])], testPlans: []), test: .init(configurationName: "Debug", products: [], testPlans: [])))])
             }
@@ -90,8 +95,8 @@ fileprivate struct ProductPlannerTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let appTarget = try await testSession.session.sendMinimalTestingWorkspace(tmpDir: temporaryDirectory.path)
@@ -115,7 +120,8 @@ extension SWBBuildServiceSession {
                     buildSettings: [
                         "PRODUCT_NAME": "$(TARGET_NAME)",
                         "SDKROOT": "iphoneos",
-                    ])
+                    ]
+                )
             ],
             buildPhases: [
                 TestSourcesBuildPhase([
@@ -127,23 +133,34 @@ extension SWBBuildServiceSession {
             ]
         )
 
-        try await sendPIF(.init(TestWorkspace("Test", sourceRoot: tmpDir, projects: [
-            TestProject(
-                "Test",
-                groupTree: TestGroup("Test", children: [
-                    TestFile("TestFile1.c"),
-                    TestFile("TestFile2.c"),
-                    TestFile("TestFile3.c"),
-                    TestFile("TestFile4.swift"),
-                ]),
-                buildConfigurations: [
-                    TestBuildConfiguration("Debug")
-                ],
-                targets: [
-                    appTarget
-                ]
+        try await sendPIF(
+            .init(
+                TestWorkspace(
+                    "Test",
+                    sourceRoot: tmpDir,
+                    projects: [
+                        TestProject(
+                            "Test",
+                            groupTree: TestGroup(
+                                "Test",
+                                children: [
+                                    TestFile("TestFile1.c"),
+                                    TestFile("TestFile2.c"),
+                                    TestFile("TestFile3.c"),
+                                    TestFile("TestFile4.swift"),
+                                ]
+                            ),
+                            buildConfigurations: [
+                                TestBuildConfiguration("Debug")
+                            ],
+                            targets: [
+                                appTarget
+                            ]
+                        )
+                    ]
+                ).toObjects().propertyListItem
             )
-        ]).toObjects().propertyListItem))
+        )
 
         return appTarget
     }
diff --git a/Tests/SwiftBuildTests/ProjectModel/BuildRuleTests.swift b/Tests/SwiftBuildTests/ProjectModel/BuildRuleTests.swift
index 48423ec2..d469bd71 100644
--- a/Tests/SwiftBuildTests/ProjectModel/BuildRuleTests.swift
+++ b/Tests/SwiftBuildTests/ProjectModel/BuildRuleTests.swift
@@ -47,5 +47,3 @@ extension ProjectModel.BuildRule {
     )
 
 }
-
-
diff --git a/Tests/SwiftBuildTests/ProjectModel/ProjectTests.swift b/Tests/SwiftBuildTests/ProjectModel/ProjectTests.swift
index f671ae9a..3d62e251 100644
--- a/Tests/SwiftBuildTests/ProjectModel/ProjectTests.swift
+++ b/Tests/SwiftBuildTests/ProjectModel/ProjectTests.swift
@@ -72,7 +72,8 @@ fileprivate func testProjectCodable(
     let decoder = JSONDecoder()
     for target in original.targets {
         if let signature = target.common.signature,
-           let key = CodingUserInfoKey(rawValue: signature) {
+            let key = CodingUserInfoKey(rawValue: signature)
+        {
             assert(decoder.userInfo[key] == nil)
             decoder.userInfo[key] = target
         }
@@ -80,4 +81,3 @@ fileprivate func testProjectCodable(
     let obj = try decoder.decode(ProjectModel.Project.self, from: data)
     #expect(original == obj, sourceLocation: SourceLocation(fileID: fileID, filePath: filePath, line: line, column: column))
 }
-
diff --git a/Tests/SwiftBuildTests/ProjectModel/ReferencesTests.swift b/Tests/SwiftBuildTests/ProjectModel/ReferencesTests.swift
index 782ea145..0088ef51 100644
--- a/Tests/SwiftBuildTests/ProjectModel/ReferencesTests.swift
+++ b/Tests/SwiftBuildTests/ProjectModel/ReferencesTests.swift
@@ -49,6 +49,7 @@ extension ProjectModel.Group {
             name: "group",
             subitems: [
                 .file(.example)
-            ])
+            ]
+        )
     }
 }
diff --git a/Tests/SwiftBuildTests/ProjectModel/TargetDependencyTests.swift b/Tests/SwiftBuildTests/ProjectModel/TargetDependencyTests.swift
index 4fc1a053..9559726a 100644
--- a/Tests/SwiftBuildTests/ProjectModel/TargetDependencyTests.swift
+++ b/Tests/SwiftBuildTests/ProjectModel/TargetDependencyTests.swift
@@ -21,7 +21,6 @@ fileprivate struct TargetDependencyTests {
     }
 }
 
-
 extension ProjectModel.TargetDependency {
     static var example: Self {
         return ProjectModel.TargetDependency(
diff --git a/Tests/SwiftBuildTests/ProvisioningTaskInputsTests.swift b/Tests/SwiftBuildTests/ProvisioningTaskInputsTests.swift
index d2b8e28e..39f2580f 100644
--- a/Tests/SwiftBuildTests/ProvisioningTaskInputsTests.swift
+++ b/Tests/SwiftBuildTests/ProvisioningTaskInputsTests.swift
@@ -28,22 +28,26 @@ fileprivate struct ProvisioningTaskInputsTests: CoreBasedTests {
                 "aProject",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "Sources", children: [
-                        TestFile("main.m"),
+                    "Sources",
+                    children: [
+                        TestFile("main.m")
                     ]
                 ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ALWAYS_SEARCH_USER_PATHS": "NO",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "ONLY_ACTIVE_ARCH": "YES",
-                        "SDKROOT": "macosx",
-                        "CODE_SIGN_IDENTITY": "-",
-                        "CODE_SIGN_ENTITLEMENTS": "Entitlements.entitlements",
-                        "CODE_SIGN_ENTITLEMENTS_CONTENTS": ByteString(try PropertyListItem.plDict(["com.apple.entitlement-from-build-setting": true]).asBytes(.xml)).asString,
-                        "PRODUCT_BUNDLE_IDENTIFIER": "com.apple.App",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ALWAYS_SEARCH_USER_PATHS": "NO",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "ONLY_ACTIVE_ARCH": "YES",
+                            "SDKROOT": "macosx",
+                            "CODE_SIGN_IDENTITY": "-",
+                            "CODE_SIGN_ENTITLEMENTS": "Entitlements.entitlements",
+                            "CODE_SIGN_ENTITLEMENTS_CONTENTS": ByteString(try PropertyListItem.plDict(["com.apple.entitlement-from-build-setting": true]).asBytes(.xml)).asString,
+                            "PRODUCT_BUNDLE_IDENTIFIER": "com.apple.App",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -51,10 +55,10 @@ fileprivate struct ProvisioningTaskInputsTests: CoreBasedTests {
                         type: .application,
                         buildPhases: [
                             TestSourcesBuildPhase([
-                                "main.m",
+                                "main.m"
                             ])
                         ]
-                    ),
+                    )
                 ]
             )
 
@@ -89,11 +93,13 @@ fileprivate struct ProvisioningTaskInputsTests: CoreBasedTests {
                         results.checkNoDiagnostics()
 
                         try await results.checkEntitlements(.signed, Path(SRCROOT).join("build/Debug/App.app/Contents/MacOS/App")) { plist in
-                            #expect(plist == [
-                                "application-identifier": "com.apple.App",
-                                "com.apple.entitlement-from-build-setting": true,
-                                "com.apple.entitlement-from-file": true,
-                            ])
+                            #expect(
+                                plist == [
+                                    "application-identifier": "com.apple.App",
+                                    "com.apple.entitlement-from-build-setting": true,
+                                    "com.apple.entitlement-from-file": true,
+                                ]
+                            )
                         }
                     }
                 }
diff --git a/Tests/SwiftBuildTests/ServiceTests.swift b/Tests/SwiftBuildTests/ServiceTests.swift
index f3e67770..419f4062 100644
--- a/Tests/SwiftBuildTests/ServiceTests.swift
+++ b/Tests/SwiftBuildTests/ServiceTests.swift
@@ -41,9 +41,12 @@ fileprivate struct ServiceTests {
         #expect(service.terminated)
 
         // Verify we do not crash if attempting to re-use a closed connection.
-        await #expect(throws: (any Error).self, performing: {
-            try await service.checkAlive()
-        })
+        await #expect(
+            throws: (any Error).self,
+            performing: {
+                try await service.checkAlive()
+            }
+        )
     }
 
     // Regression test for rdar://84997640.
@@ -56,7 +59,7 @@ fileprivate struct ServiceTests {
                     type: .commandLineTool,
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("foo.c"),
+                            TestBuildFile("foo.c")
                         ])
                     ]
                 )
@@ -66,14 +69,18 @@ fileprivate struct ServiceTests {
                     defaultConfigurationName: "Debug",
                     groupTree: TestGroup("Foo", children: [TestFile("foo.c")]),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-                            "USE_HEADERMAP": "YES",
-                            "ALWAYS_SEARCH_USER_PATHS": "NO",
-                            "DEFINES_MODULE": "YES",
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+                                "USE_HEADERMAP": "YES",
+                                "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                "DEFINES_MODULE": "YES",
+                            ]
+                        )
                     ],
-                    targets: [testTarget])
+                    targets: [testTarget]
+                )
                 let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDir, projects: [testProject])
 
                 try localFS.write(tmpDir.join("foo.c"), contents: "int main() { return 0; }")
@@ -138,8 +145,8 @@ fileprivate struct ServiceTests {
                 let testSession = try await TestSWBSession(temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let session = testSession.session
@@ -148,59 +155,86 @@ fileprivate struct ServiceTests {
                     error.localizedDescription.contains("missingWorkspaceContext")
                 }
 
-                await #expect(performing: {
-                    try await session.createBuildOperation(request: SWBBuildRequest(), delegate: EmptyBuildOperationDelegate())
-                }, throws: {
-                    assertErrorIsMissingWorkspaceContext($0)
-                })
-
-                await #expect(performing: {
-                    try await session.generateIndexingFileSettings(for: SWBBuildRequest(), targetID: "", delegate: EmptyBuildOperationDelegate())
-                }, throws: {
-                    assertErrorIsMissingWorkspaceContext($0)
-                })
-
-                await #expect(performing: {
-                    try await session.generatePreviewInfo(for: SWBBuildRequest(), targetID: "", sourceFile: "", thunkVariantSuffix: "", delegate: EmptyBuildOperationDelegate())
-                }, throws: {
-                    assertErrorIsMissingWorkspaceContext($0)
-                })
-
-                await #expect(performing: {
-                    try await session.generatePreviewTargetDependencyInfo(for: SWBBuildRequest(), targetIDs: [""], delegate: EmptyBuildOperationDelegate())
-                }, throws: {
-                    assertErrorIsMissingWorkspaceContext($0)
-                })
-
-                await #expect(performing: {
-                    try await session.describeArchivableProducts(input: [])
-                }, throws: {
-                    assertErrorIsMissingWorkspaceContext($0)
-                })
-
-                await #expect(performing: {
-                    try await session.describeSchemes(input: [])
-                }, throws: {
-                    assertErrorIsMissingWorkspaceContext($0)
-                })
-
-                await #expect(performing: {
-                    try await session.describeProducts(input: .init(configurationName: "Debug", targetIdentifiers: []), platformName: "macosx")
-                }, throws: {
-                    assertErrorIsMissingWorkspaceContext($0)
-                })
-
-                await #expect(performing: {
-                    try await session.setSystemInfo(.defaultForTesting)
-                }, throws: {
-                    assertErrorIsMissingWorkspaceContext($0)
-                })
-
-                await #expect(performing: {
-                    try await session.setUserInfo(.defaultForTesting)
-                }, throws: {
-                    assertErrorIsMissingWorkspaceContext($0)
-                })
+                await #expect(
+                    performing: {
+                        try await session.createBuildOperation(request: SWBBuildRequest(), delegate: EmptyBuildOperationDelegate())
+                    },
+                    throws: {
+                        assertErrorIsMissingWorkspaceContext($0)
+                    }
+                )
+
+                await #expect(
+                    performing: {
+                        try await session.generateIndexingFileSettings(for: SWBBuildRequest(), targetID: "", delegate: EmptyBuildOperationDelegate())
+                    },
+                    throws: {
+                        assertErrorIsMissingWorkspaceContext($0)
+                    }
+                )
+
+                await #expect(
+                    performing: {
+                        try await session.generatePreviewInfo(for: SWBBuildRequest(), targetID: "", sourceFile: "", thunkVariantSuffix: "", delegate: EmptyBuildOperationDelegate())
+                    },
+                    throws: {
+                        assertErrorIsMissingWorkspaceContext($0)
+                    }
+                )
+
+                await #expect(
+                    performing: {
+                        try await session.generatePreviewTargetDependencyInfo(for: SWBBuildRequest(), targetIDs: [""], delegate: EmptyBuildOperationDelegate())
+                    },
+                    throws: {
+                        assertErrorIsMissingWorkspaceContext($0)
+                    }
+                )
+
+                await #expect(
+                    performing: {
+                        try await session.describeArchivableProducts(input: [])
+                    },
+                    throws: {
+                        assertErrorIsMissingWorkspaceContext($0)
+                    }
+                )
+
+                await #expect(
+                    performing: {
+                        try await session.describeSchemes(input: [])
+                    },
+                    throws: {
+                        assertErrorIsMissingWorkspaceContext($0)
+                    }
+                )
+
+                await #expect(
+                    performing: {
+                        try await session.describeProducts(input: .init(configurationName: "Debug", targetIdentifiers: []), platformName: "macosx")
+                    },
+                    throws: {
+                        assertErrorIsMissingWorkspaceContext($0)
+                    }
+                )
+
+                await #expect(
+                    performing: {
+                        try await session.setSystemInfo(.defaultForTesting)
+                    },
+                    throws: {
+                        assertErrorIsMissingWorkspaceContext($0)
+                    }
+                )
+
+                await #expect(
+                    performing: {
+                        try await session.setUserInfo(.defaultForTesting)
+                    },
+                    throws: {
+                        assertErrorIsMissingWorkspaceContext($0)
+                    }
+                )
             }
         }
     }
@@ -257,7 +291,8 @@ fileprivate struct ServiceTests {
                 "aProject",
                 defaultConfigurationName: "Debug",
                 groupTree: TestGroup("Foo", children: [TestFile("tool.c"), TestFile("foo.intentdefinition")]),
-                targets: [])
+                targets: []
+            )
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDir, projects: [testProject])
 
             func testVariant(variant: SWBBuildServiceVariant, _ expectedExecutableFileName: String, file: StaticString = #filePath, line: UInt = #line) async throws {
@@ -288,17 +323,20 @@ fileprivate struct ServiceTests {
             // The default is to launch the _asan service if the currently executing image is an _asan one
             try await testVariant(
                 variant: .default,
-                runningWithASanSupport ? "\(executableName)_asan" : executableName)
+                runningWithASanSupport ? "\(executableName)_asan" : executableName
+            )
 
             // An explicit request for normal always uses normal
             try await testVariant(
                 variant: .normal,
-                executableName)
+                executableName
+            )
 
             // An explicit request for ASan launches the ASan service if it exists, otherwise uses normal
             try await testVariant(
                 variant: .asan,
-                builtWithASanSupport ? "\(executableName)_asan" : executableName)
+                builtWithASanSupport ? "\(executableName)_asan" : executableName
+            )
         }
     }
 
@@ -314,7 +352,7 @@ fileprivate struct ServiceTests {
                     type: .commandLineTool,
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("tool.c"),
+                            TestBuildFile("tool.c")
                         ])
                     ],
                     dependencies: ["Tool2"]
@@ -325,7 +363,7 @@ fileprivate struct ServiceTests {
                     type: .commandLineTool,
                     buildPhases: [
                         TestSourcesBuildPhase([
-                            TestBuildFile("tool.c"),
+                            TestBuildFile("tool.c")
                         ])
                     ]
                 )
@@ -335,26 +373,30 @@ fileprivate struct ServiceTests {
                     defaultConfigurationName: "Debug",
                     groupTree: TestGroup("Foo", children: [TestFile("tool.c")]),
                     buildConfigurations: [
-                        TestBuildConfiguration("Debug", buildSettings: [
-                            "ALWAYS_SEARCH_USER_PATHS": "NO",
-                            "PRODUCT_NAME": "$(TARGET_NAME)",
-
-                            // We need a setting that'll cause a diagnostic to get emitted quite early,
-                            // but not one that's an error and stops the build
-                            "DEVELOPMENT_ASSET_PATHS": "bogus",
-                            "VALIDATE_DEVELOPMENT_ASSET_PATHS": "YES",
-
-                        ])
+                        TestBuildConfiguration(
+                            "Debug",
+                            buildSettings: [
+                                "ALWAYS_SEARCH_USER_PATHS": "NO",
+                                "PRODUCT_NAME": "$(TARGET_NAME)",
+
+                                // We need a setting that'll cause a diagnostic to get emitted quite early,
+                                // but not one that's an error and stops the build
+                                "DEVELOPMENT_ASSET_PATHS": "bogus",
+                                "VALIDATE_DEVELOPMENT_ASSET_PATHS": "YES",
+
+                            ]
+                        )
                     ],
-                    targets: [testTarget, testTarget2])
+                    targets: [testTarget, testTarget2]
+                )
                 let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDir, projects: [testProject])
 
                 // Construct the test session.
                 let testSession = try await TestSWBSession(connectionMode: .outOfProcess, temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let tester = try await CoreQualificationTester(testWorkspace, testSession)
@@ -389,8 +431,8 @@ fileprivate struct ServiceTests {
                 let testSession = try await TestSWBSession(connectionMode: .outOfProcess, temporaryDirectory: temporaryDirectory)
                 await deferrable.addBlock {
                     await #expect(throws: Never.self) {
-                            try await testSession.close()
-                        }
+                        try await testSession.close()
+                    }
                 }
 
                 let developerPath = try await testSession.session.developerPath()
@@ -409,11 +451,14 @@ fileprivate struct ServiceTests {
             _ = try await InstalledXcode.currentlySelected().xcrun(["-sdk", "macosx", "clang", "-target", "\(#require(Architecture.host.stringValue))-apple-macos\(deploymentTarget.canonicalDeploymentTargetForm)", "main.c"], workingDirectory: path)
 
             _ = await withEnvironment(["SWBBUILDSERVICE_PATH": path.join("a.out").str]) {
-                await #expect(performing: {
-                    try await SWBBuildService(connectionMode: .outOfProcess)
-                }, throws: { error in
-                    String(describing: error) == "Couldn't launch the build service process '\(path.str)/a.out' because it requires macOS \(deploymentTarget.canonicalDeploymentTargetForm) or later (running macOS \(osVersion.canonicalDeploymentTargetForm))."
-                })
+                await #expect(
+                    performing: {
+                        try await SWBBuildService(connectionMode: .outOfProcess)
+                    },
+                    throws: { error in
+                        String(describing: error) == "Couldn't launch the build service process '\(path.str)/a.out' because it requires macOS \(deploymentTarget.canonicalDeploymentTargetForm) or later (running macOS \(osVersion.canonicalDeploymentTargetForm))."
+                    }
+                )
             }
         }
     }
@@ -425,7 +470,7 @@ fileprivate struct ServiceTests {
 
         // Create a session, which references the service.
         let (sessionResult, diagnostics) = await service.createSession(name: "Test", cachePath: nil)
-        #expect(diagnostics.filter { $0.kind == .error}.isEmpty)
+        #expect(diagnostics.filter { $0.kind == .error }.isEmpty)
         let session = try sessionResult.get()
 
         // Send a simple session message, which should succeed.
@@ -436,21 +481,27 @@ fileprivate struct ServiceTests {
         #expect(service.terminated)
 
         // Send a simple message, which should now fail due to the underlying service termination.
-        await #expect(performing: {
-            try await session.developerPath()
-        }, throws: { error in
-            (error as? SwiftBuildError) == .requestError(description: "The Xcode build system has crashed. Build again to continue.")
-        })
+        await #expect(
+            performing: {
+                try await session.developerPath()
+            },
+            throws: { error in
+                (error as? SwiftBuildError) == .requestError(description: "The Xcode build system has crashed. Build again to continue.")
+            }
+        )
 
         // Restart the service.
         try await service.restart()
 
         // Send a simple message again, which should fail because the session is no longer valid.
-        await #expect(performing: {
-            try await session.developerPath()
-        }, throws: { error in
-            (error as? SwiftBuildError) == .requestError(description: "unknownSession(handle: \"S0\")")
-        })
+        await #expect(
+            performing: {
+                try await session.developerPath()
+            },
+            throws: { error in
+                (error as? SwiftBuildError) == .requestError(description: "unknownSession(handle: \"S0\")")
+            }
+        )
 
         // The service has already been restart, so it should not be marked terminated.
         #expect(!service.terminated)
@@ -460,10 +511,13 @@ fileprivate struct ServiceTests {
         #expect(session.terminated)
 
         // Closing will also fail because the session is no longer valid, but we need to attempt closing or we'll assert.
-        await #expect(performing: {
-            try await session.close()
-        }, throws: { error in
-            (error as? SwiftBuildError) == .requestError(description: "unknownSession(handle: \"S0\")")
-        })
+        await #expect(
+            performing: {
+                try await session.close()
+            },
+            throws: { error in
+                (error as? SwiftBuildError) == .requestError(description: "unknownSession(handle: \"S0\")")
+            }
+        )
     }
 }
diff --git a/Tests/SwiftBuildTests/TestData/CommandLineToolPackage/Package.swift b/Tests/SwiftBuildTests/TestData/CommandLineToolPackage/Package.swift
index a5e0a402..247ef20e 100644
--- a/Tests/SwiftBuildTests/TestData/CommandLineToolPackage/Package.swift
+++ b/Tests/SwiftBuildTests/TestData/CommandLineToolPackage/Package.swift
@@ -6,11 +6,13 @@ let package = Package(
     products: [
         .executable(
             name: "CommandLineToolPackage",
-            targets: ["CommandLineToolPackage"]),
+            targets: ["CommandLineToolPackage"]
+        )
     ],
     targets: [
         .target(
             name: "CommandLineToolPackage",
-            dependencies: []),
+            dependencies: []
+        )
     ]
 )
diff --git a/Tests/SwiftBuildTests/TestData/CommandLineToolPackage/Sources/CommandLineToolPackage/main.swift b/Tests/SwiftBuildTests/TestData/CommandLineToolPackage/Sources/CommandLineToolPackage/main.swift
index 380508dc..bc8ac41a 100644
--- a/Tests/SwiftBuildTests/TestData/CommandLineToolPackage/Sources/CommandLineToolPackage/main.swift
+++ b/Tests/SwiftBuildTests/TestData/CommandLineToolPackage/Sources/CommandLineToolPackage/main.swift
@@ -9,4 +9,3 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-
diff --git a/Tests/SwiftBuildTests/ValidationTests.swift b/Tests/SwiftBuildTests/ValidationTests.swift
index b58590e2..606283cb 100644
--- a/Tests/SwiftBuildTests/ValidationTests.swift
+++ b/Tests/SwiftBuildTests/ValidationTests.swift
@@ -48,11 +48,14 @@ fileprivate struct ValidationTests: CoreBasedTests {
     func buildProject(_ srcroot: Path, name: String, schemeName: String? = nil, sourceLocation: SourceLocation = #_sourceLocation) async throws {
         try await withTemporaryDirectory { tmpDir in
             do {
-                try await executeXcodebuild([
-                    "-project", srcroot.join("\(name).xcodeproj").str,
-                    "-scheme", schemeName ?? name,
-                    "-derivedDataPath", tmpDir.str,
-                ], in: tmpDir)
+                try await executeXcodebuild(
+                    [
+                        "-project", srcroot.join("\(name).xcodeproj").str,
+                        "-scheme", schemeName ?? name,
+                        "-derivedDataPath", tmpDir.str,
+                    ],
+                    in: tmpDir
+                )
             } catch let error as RunProcessNonZeroExitError {
                 switch error.output {
                 case let .separate(stdout: stdout, stderr: stderr):
diff --git a/Tests/SwiftBuildTests/WatchTests.swift b/Tests/SwiftBuildTests/WatchTests.swift
index e08c70bd..d9e2deda 100644
--- a/Tests/SwiftBuildTests/WatchTests.swift
+++ b/Tests/SwiftBuildTests/WatchTests.swift
@@ -28,18 +28,23 @@ fileprivate struct WatchTests: CoreBasedTests {
                 "App",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "Sources", children: [
-                        TestFile("main.swift"),
-                    ]),
+                    "Sources",
+                    children: [
+                        TestFile("main.swift")
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ALWAYS_SEARCH_USER_PATHS": "NO",
-                        "CODE_SIGNING_ALLOWED": "NO",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "watchos",
-                        "SWIFT_VERSION": "5.0",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ALWAYS_SEARCH_USER_PATHS": "NO",
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "watchos",
+                            "SWIFT_VERSION": "5.0",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -50,8 +55,10 @@ fileprivate struct WatchTests: CoreBasedTests {
                         ],
                         buildPhases: [
                             TestSourcesBuildPhase(["main.swift"])
-                        ]),
-                ])
+                        ]
+                    )
+                ]
+            )
 
             let SRCROOT = tmpDir.str
 
@@ -82,18 +89,23 @@ fileprivate struct WatchTests: CoreBasedTests {
                 "App",
                 sourceRoot: tmpDir,
                 groupTree: TestGroup(
-                    "Sources", children: [
-                        TestFile("main.swift"),
-                    ]),
+                    "Sources",
+                    children: [
+                        TestFile("main.swift")
+                    ]
+                ),
                 buildConfigurations: [
-                    TestBuildConfiguration("Debug", buildSettings: [
-                        "ALWAYS_SEARCH_USER_PATHS": "NO",
-                        "CODE_SIGNING_ALLOWED": "NO",
-                        "GENERATE_INFOPLIST_FILE": "YES",
-                        "PRODUCT_NAME": "$(TARGET_NAME)",
-                        "SDKROOT": "watchos",
-                        "SWIFT_VERSION": "5.0",
-                    ])
+                    TestBuildConfiguration(
+                        "Debug",
+                        buildSettings: [
+                            "ALWAYS_SEARCH_USER_PATHS": "NO",
+                            "CODE_SIGNING_ALLOWED": "NO",
+                            "GENERATE_INFOPLIST_FILE": "YES",
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "SDKROOT": "watchos",
+                            "SWIFT_VERSION": "5.0",
+                        ]
+                    )
                 ],
                 targets: [
                     TestStandardTarget(
@@ -102,9 +114,10 @@ fileprivate struct WatchTests: CoreBasedTests {
                         buildConfigurations: [
                             TestBuildConfiguration("Debug", buildSettings: [:])
                         ],
-                        buildPhases: [
-                        ]),
-                ])
+                        buildPhases: []
+                    )
+                ]
+            )
 
             let SRCROOT = tmpDir.str